- raise ValidationException("Error in YAML validation. Not a proper YAML file")
- if 'vnfd:vnfd-catalog' in data:
+ raise ValidationException("Error in YAML validation. Not a proper YAML file: {}".format(e))
+ if 'vnfd:vnfd-catalog' in data or 'vnfd-catalog' in data:
item = "vnfd"
item = "vnfd"
- elif 'nsd:nsd-catalog' in data:
+ elif 'nsd:nsd-catalog' in data or 'nsd-catalog' in data:
item = "nsd"
elif 'nst' in data:
item = "nst"
item = "nsd"
elif 'nst' in data:
item = "nst"
+ elif 'vnfd' in data:
+ item = "etsi_nfv_vnfd"
+ elif 'nsd' in data:
+ item = "etsi_nfv_nsd"
else:
else:
- raise ValidationException("Error in YAML validation. Not possible to determine the type of descriptor in the first line. Expected values: vnfd:vnfd-catalog, nsd:nsd-catalog, nst")
+ raise ValidationException("Error in YAML validation. Not possible to determine the type of descriptor in the first line. Expected values: vnfd:vnfd-catalog, vnfd-catalog, nsd:nsd-catalog, nsd-catalog, nst")