validation error message

circle/dashboard/validators.py

@@ -24,6 +24,7 @@ import yaml
 
 
 from vm.models import Instance
 from vm.models import Instance
 
 
+
 rng_file = "/usr/share/libvirt/schemas/domain.rng"
 rng_file = "/usr/share/libvirt/schemas/domain.rng"
 
 
 # Mandatory xml elements dor parsing
 # Mandatory xml elements dor parsing
@@ -57,14 +58,32 @@ def meta_data_validator(value):
     try:
     try:
         Instance.validate_meta_data(value)
         Instance.validate_meta_data(value)
     except yaml.YAMLError as exc:
     except yaml.YAMLError as exc:
-        raise ValidationError(exc.problem_mark)
+        if hasattr(exc, 'problem_mark'):
+            if exc.context != None:
+                raise ValidationError('  parser says\n' + str(exc.problem_mark) + '\n  ' +
+                    str(exc.problem) + ' ' + str(exc.context) +
+                    '\nPlease correct data and retry.')
+            else:
+                raise ValidationError('  parser says\n' + str(exc.problem_mark) + '\n  ' +
+                    str(exc.problem) + '\nPlease correct data and retry.')
+        else:
+            raise ValidationError("Something went wrong while parsing yaml file")
 
 
 
 
 def user_data_validator(value):
 def user_data_validator(value):
     try:
     try:
         Instance.validate_user_data(value)
         Instance.validate_user_data(value)
     except yaml.YAMLError as exc:
     except yaml.YAMLError as exc:
-        raise ValidationError(exc.problem_mark)
+        if hasattr(exc, 'problem_mark'):
+            if exc.context != None:
+                raise ValidationError('  parser says\n' + str(exc.problem_mark) + '\n  ' +
+                    str(exc.problem) + ' ' + str(exc.context) +
+                    '\nPlease correct data and retry.')
+            else:
+                raise ValidationError('  parser says\n' + str(exc.problem_mark) + '\n  ' +
+                    str(exc.problem) + '\nPlease correct data and retry.')
+        else:
+            raise ValidationError("Something went wrong while parsing yaml file")
 
 
 
 
 def connect_command_template_validator(value):
 def connect_command_template_validator(value):

circle/dashboard/views/vm.py

@@ -70,6 +70,7 @@ from ..forms import (
     VmRemoveInterfaceForm,
     VmRemoveInterfaceForm,
     VmRenameForm,
     VmRenameForm,
 )
 )
+from django.views.generic.edit import FormMixin
 from request.models import TemplateAccessType, LeaseType
 from request.models import TemplateAccessType, LeaseType
 from request.forms import LeaseRequestForm, TemplateRequestForm
 from request.forms import LeaseRequestForm, TemplateRequestForm
 from ..models import Favourite
 from ..models import Favourite