Add parse vnfd package logic

In vfc lcm project ,add parse vnfd package logic.

Change-Id: I4de6443d4c4a9c0d7526be025604cfeb73f439ea
Issue-ID: VFC-110
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/pub/utils/toscaparser/__init__.py b/lcm/pub/utils/toscaparser/__init__.py
index 48b1b30..4d9064e 100644 (file)
--- a/lcm/pub/utils/toscaparser/__init__.py
+++ b/lcm/pub/utils/toscaparser/__init__.py
@@ -15,15 +15,11 @@ import json
 
 from lcm.pub.utils.toscaparser.convert import convert_nsd, convert_vnfd
 from lcm.pub.utils.toscaparser.etsinsdinfomodel import EtsiNsdInfoModel
+from lcm.pub.utils.toscaparser.etsivnfdinfomodel import EtsiVnfdInfoModel
 from lcm.pub.utils.toscaparser.parser import parse_nsd_model, parse_vnfd_model
 
 
 def parse_nsd(path, input_parameters=[]):
-    '''
-    nsd_object = parse_nsd_model(path, input_parameters=[])
-    nsd_json = convert_nsd(nsd_object)
-    return nsd_json
-    '''
     tosca_obj = EtsiNsdInfoModel(path, input_parameters)
     strResponse = json.dumps(tosca_obj, default=lambda obj: obj.__dict__)
     strResponse = strResponse.replace(': null', ': ""')
@@ -31,7 +27,8 @@ def parse_nsd(path, input_parameters=[]):
 
 
 def parse_vnfd(path, input_parameters=[]):
-    vnfd_object = parse_vnfd_model(path, input_parameters=[])
-    vnfd_json = convert_vnfd(vnfd_object)
-    return vnfd_json
+    tosca_obj = EtsiVnfdInfoModel(path, input_parameters)
+    strResponse = json.dumps(tosca_obj, default=lambda obj: obj.__dict__)
+    strResponse = strResponse.replace(': null', ': ""')
+    return strResponse
 

diff --git a/lcm/pub/utils/toscaparser/etsivnfdinfomodel.py b/lcm/pub/utils/toscaparser/etsivnfdinfomodel.py
new file mode 100644 (file)
index 0000000..39e9a18
--- /dev/null
+++ b/lcm/pub/utils/toscaparser/etsivnfdinfomodel.py
@@ -0,0 +1,7 @@
+from lcm.pub.utils.toscaparser import EtsiNsdInfoModel
+
+
+class EtsiVnfdInfoModel(EtsiNsdInfoModel):
+
+    def __init__(self, path, params):
+        super(EtsiVnfdInfoModel, self).__init__(path, params)

diff --git a/lcm/pub/utils/toscaparser/parser.py b/lcm/pub/utils/toscaparser/parser.py
index 9b7e655..f6605f6 100644 (file)
--- a/lcm/pub/utils/toscaparser/parser.py
+++ b/lcm/pub/utils/toscaparser/parser.py
@@ -14,6 +14,7 @@
 from os import R_OK, access\r
 \r
 from lcm.pub.exceptions import NSLCMException\r
+from toscaparser.tosca_template import ToscaTemplate\r
 \r
 def parse_nsd_model(path, input_parameters):\r
     isexist = check_file_exist(path)\r
@@ -40,13 +41,11 @@ def check_file_exist(path):
 \r
 def parse_nsd_csar(path, input_parameters=[], a_file=True):\r
     nsd_object = None\r
-    from toscaparser.tosca_template import ToscaTemplate\r
     nsd_object = ToscaTemplate(path, input_parameters)\r
     return nsd_object\r
 \r
 \r
 def parse_vnfd_csar(path, input_parameters=[], a_file=True):\r
     vnfd_object = None\r
-    from toscaparser.tosca_template import ToscaTemplate\r
     vnfd_object = ToscaTemplate(path, input_parameters)\r
     return vnfd_object
\ No newline at end of file

diff --git a/requirements.txt b/requirements.txt
index 2590479..e9f7ce6 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,3 +24,6 @@ python-neutronclient==6.0.0
 coverage==4.2
 mock==2.0.0
 unittest_xml_reporting==1.12.0
+
+# for parser
+nfv-toscaparser==0.5.0.dev95