commit 76f6a62b4cc15bc77cf1270d2b1630524fb2879f
author garciaale <agarcia@whitestack.com> Thu Nov 19 17:57:42 2020 -0300
committer garciaale <agarcia@whitestack.com> Thu Nov 26 16:47:14 2020 -0300
tree 054af438895600f059fc704971032d53b64aaeab
parent 10ba9c39b590538a68bdbafce02fee7e0c33954d

Updates branch master with sol006 branch, introducing new SOL006 model classes

Change-Id: Ica385dd2e44a0e72561b450554f7fa9e450f08c9
Signed-off-by: garciaale <agarcia@whitestack.com>

osm_im/validation.py

diff --git a/osm_im/validation.py b/osm_im/validation.py
index 7334fbb..6cc4f0d 100644
--- a/osm_im/validation.py
+++ b/osm_im/validation.py
@@ -14,11 +14,12 @@
 # limitations under the License.
 
 import yaml
-import json
-# import logging
+import importlib
 from osm_im.vnfd import vnfd as vnfd_im
 from osm_im.nsd import nsd as nsd_im
 from osm_im.nst import nst as nst_im
+etsi_nfv_vnfd = importlib.import_module("osm_im.etsi-nfv-vnfd")
+etsi_nfv_nsd = importlib.import_module("osm_im.etsi-nfv-nsd")
 from pyangbind.lib.serialise import pybindJSONDecoder
 import pyangbind.lib.pybindJSON as pybindJSON
 
@@ -39,6 +40,10 @@
             myobj = nsd_im()
         elif item == "nst":
             myobj = nst_im()
+        elif item == "etsi_nfv_vnfd":
+            myobj = etsi_nfv_vnfd.etsi_nfv_vnfd()
+        elif item == "etsi_nfv_nsd":
+            myobj = etsi_nfv_nsd.etsi_nfv_nsd()
         else:
             raise ValidationException("Not possible to validate '{}' item".format(item))
 
@@ -62,6 +67,10 @@
             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:
             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")