code refactor for genericparser1.0.0

Change-Id: I68a128944cde015d767576fc4e159d67db2d6b5d
Issue-ID: VFC-1372
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

8 files changed, 891 insertions, 247 deletions

diff --git a/genericparser/pub/config/config.py b/genericparser/pub/config/config.py
index 60b4836..574d4d7 100644
--- a/genericparser/pub/config/config.py
+++ b/genericparser/pub/config/config.py
@@ -81,3 +81,5 @@ GENERICPARSER_URL_PATH = None
 SDC_BASE_URL = "http://msb-iag/api"
 SDC_USER = "aai"
 SDC_PASSWD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+
+VNFD_SCHEMA_VERSION_DEFAULT = "base"
diff --git a/genericparser/pub/database/admin.py b/genericparser/pub/database/admin.py
new file mode 100644
index 0000000..ec7a92a
--- /dev/null
+++ b/genericparser/pub/database/admin.py
@@ -0,0 +1,361 @@
+# Copyright 2019 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from django.contrib import admin
+
+from genericparser.pub.database.models import NSPackageModel
+from genericparser.pub.database.models import ServicePackageModel
+from genericparser.pub.database.models import VnfPackageModel
+from genericparser.pub.database.models import PnfPackageModel
+from genericparser.pub.database.models import SoftwareImageModel
+from genericparser.pub.database.models import JobModel
+from genericparser.pub.database.models import JobStatusModel
+from genericparser.pub.database.models import NsdmSubscriptionModel
+from genericparser.pub.database.models import VnfPkgSubscriptionModel
+
+
+@admin.register(NSPackageModel)
+class NSPackageModelAdmin(admin.ModelAdmin):
+    list_display_links = ('nsPackageId', 'nsdName')
+    fields = [
+        "nsPackageId",
+        "nsPackageUri",
+        "checksum",
+        "sdcCsarId",
+        "onboardingState",
+        "operationalState",
+        "usageState",
+        "deletionPending",
+        "nsdId",
+        "invariantId",
+        "nsdName",
+        "nsdDesginer",
+        "nsdDescription",
+        "nsdVersion",
+        "userDefinedData",
+        "localFilePath",
+        "nsdModel"
+    ]
+
+    list_display = [
+        "nsPackageId",
+        "nsPackageUri",
+        "checksum",
+        "sdcCsarId",
+        "onboardingState",
+        "operationalState",
+        "usageState",
+        "deletionPending",
+        "nsdId",
+        "invariantId",
+        "nsdName",
+        "nsdDesginer",
+        "nsdDescription",
+        "nsdVersion",
+        "userDefinedData",
+        "localFilePath",
+        "nsdModel"
+    ]
+
+    search_fields = (
+        "nsPackageId",
+        "nsdId",
+        "nsdName",
+        "sdcCsarId"
+    )
+
+
+@admin.register(ServicePackageModel)
+class ServicePackageModelAdmin(admin.ModelAdmin):
+    list_display_links = ('servicePackageId', 'servicedName')
+    fields = [
+        "servicePackageId",
+        "servicePackageUri",
+        "checksum",
+        "sdcCsarId",
+        "onboardingState",
+        "operationalState",
+        "usageState",
+        "deletionPending",
+        "servicedId",
+        "invariantId",
+        "servicedName",
+        "servicedDesigner",
+        "servicedDescription",
+        "servicedVersion",
+        "userDefinedData",
+        "localFilePath",
+        "servicedModel"
+    ]
+
+    list_display = [
+        "servicePackageId",
+        "servicePackageUri",
+        "checksum",
+        "sdcCsarId",
+        "onboardingState",
+        "operationalState",
+        "usageState",
+        "deletionPending",
+        "servicedId",
+        "invariantId",
+        "servicedName",
+        "servicedDesigner",
+        "servicedDescription",
+        "servicedVersion",
+        "userDefinedData",
+        "localFilePath",
+        "servicedModel"
+    ]
+
+    search_fields = (
+        "servicePackageId",
+        "sdcCsarId",
+        "servicedName",
+        "onboardingState"
+    )
+
+
+@admin.register(VnfPackageModel)
+class VnfPackageModelAdmin(admin.ModelAdmin):
+    list_display_links = ('vnfPackageId', 'vnfdId')
+    fields = [
+        "vnfPackageId",
+        "vnfPackageUri",
+        "SdcCSARUri",
+        "checksum",
+        "onboardingState",
+        "operationalState",
+        "usageState",
+        "deletionPending",
+        "vnfdId",
+        "vnfVendor",
+        "vnfdProductName",
+        "vnfdVersion",
+        "vnfSoftwareVersion",
+        "userDefinedData",
+        "localFilePath",
+        "vnfdModel"
+    ]
+
+    list_display = [
+        "vnfPackageId",
+        "vnfPackageUri",
+        "SdcCSARUri",
+        "checksum",
+        "onboardingState",
+        "operationalState",
+        "usageState",
+        "deletionPending",
+        "vnfdId",
+        "vnfVendor",
+        "vnfdProductName",
+        "vnfdVersion",
+        "vnfSoftwareVersion",
+        "userDefinedData",
+        "localFilePath",
+        "vnfdModel"
+    ]
+
+    search_fields = (
+        "vnfPackageId",
+        "onboardingState",
+        "vnfdId"
+    )
+
+
+@admin.register(PnfPackageModel)
+class PnfPackageModelAdmin(admin.ModelAdmin):
+    list_display_links = ('pnfPackageId', 'pnfdId')
+    fields = [
+        "pnfPackageId",
+        "pnfPackageUri",
+        "sdcCSARUri",
+        "checksum",
+        "onboardingState",
+        "usageState",
+        "deletionPending",
+        "pnfdId",
+        "pnfVendor",
+        "pnfdProductName",
+        "pnfdVersion",
+        "pnfSoftwareVersion",
+        "userDefinedData",
+        "localFilePath",
+        "pnfdModel",
+        "pnfdName"
+    ]
+
+    list_display = [
+        "pnfPackageId",
+        "pnfPackageUri",
+        "sdcCSARUri",
+        "checksum",
+        "onboardingState",
+        "usageState",
+        "deletionPending",
+        "pnfdId",
+        "pnfVendor",
+        "pnfdProductName",
+        "pnfdVersion",
+        "pnfSoftwareVersion",
+        "userDefinedData",
+        "localFilePath",
+        "pnfdModel",
+        "pnfdName"
+    ]
+
+    search_fields = (
+        "pnfPackageId",
+        "onboardingState",
+        "pnfdId"
+    )
+
+
+@admin.register(SoftwareImageModel)
+class SoftwareImageModelAdmin(admin.ModelAdmin):
+    list_display_links = ('imageid', 'vnfPackageId')
+    fields = [
+        "imageid",
+        "containerFormat",
+        "diskFormat",
+        "mindisk",
+        "minram",
+        "usermetadata",
+        "vnfPackageId",
+        "filePath",
+        "status",
+        "vimid"
+    ]
+
+    list_display = [
+        "imageid",
+        "containerFormat",
+        "diskFormat",
+        "mindisk",
+        "minram",
+        "usermetadata",
+        "vnfPackageId",
+        "filePath",
+        "status",
+        "vimid"
+    ]
+
+    search_fields = (
+        "imageid",
+        "vnfPackageId",
+        "vimid"
+    )
+
+
+@admin.register(NsdmSubscriptionModel)
+class NsdmSubscriptionModelAdmin(admin.ModelAdmin):
+    list_display_links = ('subscriptionid', 'notificationTypes')
+    fields = [
+        "subscriptionid",
+        "notificationTypes",
+        "auth_info",
+        "callback_uri",
+        "nsdInfoId",
+        "nsdId",
+        "nsdName",
+        "nsdVersion",
+        "nsdDesigner",
+        "nsdInvariantId",
+        "vnfPkgIds",
+        "pnfdInfoIds",
+        "nestedNsdInfoIds",
+        "nsdOnboardingState",
+        "nsdOperationalState",
+        "nsdUsageState",
+        "pnfdId",
+        "pnfdName",
+        "pnfdVersion",
+        "pnfdProvider",
+        "pnfdInvariantId",
+        "pnfdOnboardingState",
+        "pnfdUsageState",
+        "links"
+    ]
+
+    list_display = [
+        "subscriptionid",
+        "notificationTypes",
+        "auth_info",
+        "callback_uri",
+        "nsdInfoId",
+        "nsdId",
+        "nsdName",
+        "nsdVersion",
+        "nsdDesigner",
+        "nsdInvariantId",
+        "vnfPkgIds",
+        "pnfdInfoIds",
+        "nestedNsdInfoIds",
+        "nsdOnboardingState",
+        "nsdOperationalState",
+        "nsdUsageState",
+        "pnfdId",
+        "pnfdName",
+        "pnfdVersion",
+        "pnfdProvider",
+        "pnfdInvariantId",
+        "pnfdOnboardingState",
+        "pnfdUsageState",
+        "links"
+    ]
+
+    search_fields = (
+        "subscriptionid",
+        "notificationTypes"
+    )
+
+
+@admin.register(VnfPkgSubscriptionModel)
+class VnfPkgSubscriptionModelAdmin(admin.ModelAdmin):
+    list_display_links = ('subscription_id', 'notification_types')
+    fields = [
+        "subscription_id",
+        "callback_uri",
+        "auth_info",
+        "usage_states",
+        "notification_types",
+        "vnfd_id",
+        "vnf_pkg_id",
+        "operation_states",
+        "vnf_products_from_provider",
+        "links"
+    ]
+
+    list_display = [
+        "subscription_id",
+        "callback_uri",
+        "auth_info",
+        "usage_states",
+        "notification_types",
+        "vnfd_id",
+        "vnf_pkg_id",
+        "operation_states",
+        "vnf_products_from_provider",
+        "links"
+    ]
+
+    search_fields = (
+        "subscription_id",
+        "notification_types"
+    )
+
+
+admin.site.register(JobModel)
+admin.site.register(JobStatusModel)
diff --git a/genericparser/pub/exceptions.py b/genericparser/pub/exceptions.py
index 626e567..b3c797d 100644
--- a/genericparser/pub/exceptions.py
+++ b/genericparser/pub/exceptions.py
@@ -49,5 +49,9 @@ class NsdmDuplicateSubscriptionException(GenericparserException):
     pass
 
 
+class BadRequestException(GenericparserException):
+    pass
+
+
 class ArtifactNotFoundException(GenericparserException):
     pass
diff --git a/genericparser/pub/utils/toscaparsers/tests.py b/genericparser/pub/utils/toscaparsers/tests.py
index c461790..e28f712 100644
--- a/genericparser/pub/utils/toscaparsers/tests.py
+++ b/genericparser/pub/utils/toscaparsers/tests.py
@@ -35,26 +35,26 @@ class TestToscaparser(TestCase):
     def test_vnfd_parse(self):
         self.remove_temp_dir()
         input_parameters = [{"value": "222222", "key": "sdncontroller"}]
-        vcpe = ["vgw", "infra", "vbng", "vbrgemu", "vgmux"]
+        # vcpe = ["vgw", "infra", "vbng", "vbrgemu", "vgmux"]
+        vcpe_part = 'vgw'
         sriov_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vnf/vcpesriov"
-        for vcpe_part in vcpe:
-            csar_file = ("%s/%s.csar" % (sriov_path, vcpe_part))
-            logger.debug("csar_file:%s", csar_file)
-            vnfd_json = parse_vnfd(csar_file, input_parameters)
-            metadata = json.loads(vnfd_json).get("metadata")
-            logger.debug("sriov metadata:%s", metadata)
-            self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
-            if vcpe_part == "infra":
-                self.assertEqual("b1bb0ce7-1111-4fa7-95ed-4840d70a1177", json.loads(vnfd_json)["vnf"]["properties"]["descriptor_id"])
+        csar_file = ("%s/%s.csar" % (sriov_path, vcpe_part))
+        logger.debug("csar_file:%s", csar_file)
+        vnfd_json = parse_vnfd(csar_file, input_parameters)
+        metadata = json.loads(vnfd_json).get("metadata")
+        logger.debug("sriov metadata:%s", metadata)
+        self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
+        if vcpe_part == "infra":
+            self.assertEqual("b1bb0ce7-1111-4fa7-95ed-4840d70a1177",
+                             json.loads(vnfd_json)["vnf"]["properties"]["descriptor_id"])
 
         dpdk_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vnf/vcpedpdk"
-        for vcpe_part in vcpe:
-            csar_file = ("%s/%s.csar" % (dpdk_path, vcpe_part))
-            logger.debug("csar_file:%s", csar_file)
-            vnfd_json = parse_vnfd(csar_file, input_parameters)
-            metadata = json.loads(vnfd_json).get("metadata")
-            logger.debug("dpdk metadata:%s", metadata)
-            self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
+        csar_file = ("%s/%s.csar" % (dpdk_path, vcpe_part))
+        logger.debug("csar_file:%s", csar_file)
+        vnfd_json = parse_vnfd(csar_file, input_parameters)
+        metadata = json.loads(vnfd_json).get("metadata")
+        logger.debug("dpdk metadata:%s", metadata)
+        self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))
 
     def test_pnfd_parse(self):
         self.remove_temp_dir()
diff --git a/genericparser/pub/utils/toscaparsers/vnfdmodel.py b/genericparser/pub/utils/toscaparsers/vnfdmodel.py
index 7b4423d..37a6472 100644
--- a/genericparser/pub/utils/toscaparsers/vnfdmodel.py
+++ b/genericparser/pub/utils/toscaparsers/vnfdmodel.py
@@ -14,15 +14,13 @@
 
 import functools
 import logging
-import os
+from genericparser.pub.config.config import VNFD_SCHEMA_VERSION_DEFAULT
 from genericparser.pub.utils.toscaparsers.basemodel import BaseInfoModel
+from genericparser.pub.utils.toscaparsers.vnfdparser import CreateVnfdSOLParser
 # from genericparser.pub.exceptions import CatalogException
 
 logger = logging.getLogger(__name__)
 
-SECTIONS = (VDU_COMPUTE_TYPE, VNF_VL_TYPE, VDU_CP_TYPE, VDU_STORAGE_TYPE) = \
-           ('tosca.nodes.nfv.Vdu.Compute', 'tosca.nodes.nfv.VnfVirtualLink', 'tosca.nodes.nfv.VduCp', 'tosca.nodes.nfv.Vdu.VirtualStorage')
-
 NFV_VNF_RELATIONSHIPS = [["tosca.relationships.nfv.VirtualLinksTo", "tosca.relationships.nfv.VduAttachesTo", "tosca.relationships.nfv.AttachesTo", "tosca.relationships.nfv.Vdu.AttachedTo", "tosca.relationships.DependsOn"],
                          ["tosca.nodes.relationships.VirtualBindsTo", "tosca.relationships.nfv.VirtualBindsTo"]]
 
@@ -30,236 +28,21 @@ NFV_VNF_RELATIONSHIPS = [["tosca.relationships.nfv.VirtualLinksTo", "tosca.relat
 class EtsiVnfdInfoModel(BaseInfoModel):
 
     def __init__(self, path, params):
+        self.vnf = {}
         super(EtsiVnfdInfoModel, self).__init__(path, params)
 
     def parseModel(self, tosca):
-        self.vnf = {}
-        self.vnf = self._build_vnf(tosca)
         self.metadata = self.buildMetadata(tosca)
         self.inputs = self.buildInputs(tosca)
-        nodeTemplates = map(functools.partial(self.buildNode, tosca=tosca),
-                            tosca.nodetemplates)
-        node_types = tosca.topology_template.custom_defs
+        nodeTemplates = map(functools.partial(self.buildNode, tosca=tosca), tosca.nodetemplates)
         self.basepath = self.get_base_path(tosca)
-        self.volume_storages = self._get_all_volume_storage(nodeTemplates, node_types)
-        self.vdus = self._get_all_vdu(nodeTemplates, node_types)
-        self.vls = self._get_all_vl(nodeTemplates, node_types)
-        self.cps = self._get_all_cp(nodeTemplates, node_types)
-        self.vnf_exposed = self._get_all_endpoint_exposed()
+        node_types = tosca.topology_template.custom_defs
+        sol_version = self.metadata.get("VNFD_SCHEMA_VERSION", VNFD_SCHEMA_VERSION_DEFAULT) if isinstance(self.metadata, dict) else VNFD_SCHEMA_VERSION_DEFAULT
+        vnfd_sol_parser = CreateVnfdSOLParser(sol_version, self)
+        self.vnf = vnfd_sol_parser.build_vnf(tosca)
+        self.volume_storages = vnfd_sol_parser.get_all_volume_storage(nodeTemplates, node_types)
+        self.vdus = vnfd_sol_parser.get_all_vdu(nodeTemplates, node_types)
+        self.vls = vnfd_sol_parser.get_all_vl(nodeTemplates, node_types)
+        self.cps = vnfd_sol_parser.get_all_cp(nodeTemplates, node_types)
+        self.vnf_exposed = vnfd_sol_parser.get_all_endpoint_exposed()
         self.graph = self.get_deploy_graph(tosca, NFV_VNF_RELATIONSHIPS)
-
-    def _get_all_volume_storage(self, nodeTemplates, node_types):
-        rets = []
-        for node in nodeTemplates:
-            if self.isNodeTypeX(node, node_types, VDU_STORAGE_TYPE):
-                ret = {}
-                ret['volume_storage_id'] = node['name']
-                if 'description' in node:
-                    ret['description'] = node['description']
-                ret['properties'] = node['properties']
-                # image_file should be gotten form artifacts TODO
-                # ret['artifacts'] = self._build_artifacts(node)
-                rets.append(ret)
-        return rets
-
-    def _get_all_vdu(self, nodeTemplates, node_types):
-        rets = []
-        inject_files = []
-        for node in nodeTemplates:
-            logger.debug("nodeTemplates :%s", node)
-            if self.isNodeTypeX(node, node_types, VDU_COMPUTE_TYPE):
-                ret = {}
-                ret['vdu_id'] = node['name']
-                ret['type'] = node['nodeType']
-                if 'description' in node:
-                    ret['description'] = node['description']
-                ret['properties'] = node['properties']
-                if 'inject_files' in node['properties']:
-                    inject_files = node['properties']['inject_files']
-                if inject_files is not None:
-                    if isinstance(inject_files, list):
-                        for inject_file in inject_files:
-                            source_path = os.path.join(self.basepath, inject_file['source_path'])
-                            with open(source_path, "rb") as f:
-                                source_data = f.read()
-                                source_data_base64 = source_data.encode("base64")
-                                inject_file["source_data_base64"] = source_data_base64
-                    if isinstance(inject_files, dict):
-                        source_path = os.path.join(self.basepath, inject_files['source_path'])
-                        with open(source_path, "rb") as f:
-                            source_data = f.read()
-                            source_data_base64 = source_data.encode("base64")
-                            inject_files["source_data_base64"] = source_data_base64
-                virtual_storages = self.getRequirementByName(node, 'virtual_storage')
-                ret['virtual_storages'] = map(functools.partial(self._trans_virtual_storage), virtual_storages)
-                ret['dependencies'] = map(lambda x: self.get_requirement_node_name(x), self.getNodeDependencys(node))
-                virtual_compute = self.getCapabilityByName(node, 'virtual_compute')
-                if virtual_compute is not None and 'properties' in virtual_compute:
-                    ret['virtual_compute'] = virtual_compute['properties']
-                ret['vls'] = self._get_linked_vl_ids(node, nodeTemplates)
-                ret['cps'] = self._get_virtal_binding_cp_ids(node, nodeTemplates)
-                ret['artifacts'] = self.build_artifacts(node)
-                rets.append(ret)
-        logger.debug("rets:%s", rets)
-        return rets
-
-    def _trans_virtual_storage(self, virtual_storage):
-        if isinstance(virtual_storage, str):
-            return {"virtual_storage_id": virtual_storage}
-        else:
-            ret = {}
-            ret['virtual_storage_id'] = self.get_requirement_node_name(virtual_storage)
-            return ret
-
-    def _get_linked_vl_ids(self, node, node_templates):
-        vl_ids = []
-        cps = self._get_virtal_binding_cps(node, node_templates)
-        for cp in cps:
-            vl_reqs = self.getRequirementByName(cp, 'virtual_link')
-            for vl_req in vl_reqs:
-                vl_ids.append(self.get_requirement_node_name(vl_req))
-        return vl_ids
-
-    def _get_virtal_binding_cp_ids(self, node, nodeTemplates):
-        return map(lambda x: x['name'], self._get_virtal_binding_cps(node, nodeTemplates))
-
-    def _get_virtal_binding_cps(self, node, nodeTemplates):
-        cps = []
-        for tmpnode in nodeTemplates:
-            if 'requirements' in tmpnode:
-                for item in tmpnode['requirements']:
-                    for key, value in item.items():
-                        if key.upper().startswith('VIRTUAL_BINDING'):
-                            req_node_name = self.get_requirement_node_name(value)
-                            if req_node_name is not None and req_node_name == node['name']:
-                                cps.append(tmpnode)
-        return cps
-
-    def _get_all_vl(self, nodeTemplates, node_types):
-        vls = []
-        for node in nodeTemplates:
-            if self.isNodeTypeX(node, node_types, VNF_VL_TYPE):
-                vl = dict()
-                vl['vl_id'] = node['name']
-                vl['description'] = node['description']
-                vl['properties'] = node['properties']
-                vls.append(vl)
-        return vls
-
-    def _get_all_cp(self, nodeTemplates, node_types):
-        cps = []
-        for node in nodeTemplates:
-            if self.isNodeTypeX(node, node_types, VDU_CP_TYPE):
-                cp = {}
-                cp['cp_id'] = node['name']
-                cp['cpd_id'] = node['name']
-                cp['description'] = node['description']
-                cp['properties'] = node['properties']
-                cp['vl_id'] = self._get_node_vl_id(node)
-                cp['vdu_id'] = self._get_node_vdu_id(node)
-                vls = self._buil_cp_vls(node)
-                if len(vls) > 1:
-                    cp['vls'] = vls
-                cps.append(cp)
-        return cps
-
-    def _get_node_vdu_id(self, node):
-        vdu_ids = map(lambda x: self.get_requirement_node_name(x), self.getRequirementByName(node, 'virtual_binding'))
-        if len(vdu_ids) > 0:
-            return vdu_ids[0]
-        return ""
-
-    def _get_node_vl_id(self, node):
-        vl_ids = map(lambda x: self.get_requirement_node_name(x), self.getRequirementByName(node, 'virtual_link'))
-        if len(vl_ids) > 0:
-            return vl_ids[0]
-        return ""
-
-    def _buil_cp_vls(self, node):
-        return map(lambda x: self._build_cp_vl(x), self.getRequirementByName(node, 'virtual_link'))
-
-    def _build_cp_vl(self, req):
-        cp_vl = {}
-        cp_vl['vl_id'] = self.get_prop_from_obj(req, 'node')
-        relationship = self.get_prop_from_obj(req, 'relationship')
-        if relationship is not None:
-            properties = self.get_prop_from_obj(relationship, 'properties')
-            if properties is not None and isinstance(properties, dict):
-                for key, value in properties.items():
-                    cp_vl[key] = value
-        return cp_vl
-
-    def _get_all_endpoint_exposed(self):
-        if self.vnf:
-            external_cps = self._get_external_cps(self.vnf.get('requirements', None))
-            forward_cps = self._get_forward_cps(self.vnf.get('capabilities', None))
-            return {"external_cps": external_cps, "forward_cps": forward_cps}
-        return {}
-
-    def _get_external_cps(self, vnf_requirements):
-        external_cps = []
-        if vnf_requirements:
-            if isinstance(vnf_requirements, dict):
-                for key, value in vnf_requirements.items():
-                    if isinstance(value, list) and len(value) > 0:
-                        external_cps.append({"key_name": key, "cpd_id": value[0]})
-                    else:
-                        external_cps.append({"key_name": key, "cpd_id": value})
-            elif isinstance(vnf_requirements, list):
-                for vnf_requirement in vnf_requirements:
-                    for key, value in vnf_requirement.items():
-                        if isinstance(value, list) and len(value) > 0:
-                            external_cps.append({"key_name": key, "cpd_id": value[0]})
-                        else:
-                            external_cps.append({"key_name": key, "cpd_id": value})
-        return external_cps
-
-    def _get_forward_cps(self, vnf_capabilities):
-        forward_cps = []
-        if vnf_capabilities:
-            for key, value in vnf_capabilities.items():
-                if isinstance(value, list) and len(value) > 0:
-                    forward_cps.append({"key_name": key, "cpd_id": value[0]})
-                else:
-                    forward_cps.append({"key_name": key, "cpd_id": value})
-        return forward_cps
-
-    # def get_substitution_mappings(self, tosca):
-    #    node = {}
-    #    substitution_mappings = tosca.tpl['topology_template'].get('substitution_mappings', None)
-    #    if substitution_mappings:
-    #        node = substitution_mappings.get('properties', {})
-    #        node['type'] = substitution_mappings['node_type']
-    #    return node
-
-    def _build_vnf(self, tosca):
-        vnf = self.get_substitution_mappings(tosca)
-        properties = vnf.get("properties", {})
-        metadata = vnf.get("metadata", {})
-        if properties.get("descriptor_id", "") == "":
-            descriptor_id = metadata.get("descriptor_id", "")
-            if descriptor_id == "":
-                descriptor_id = metadata.get("id", "")
-            if descriptor_id == "":
-                descriptor_id = metadata.get("UUID", "")
-            properties["descriptor_id"] = descriptor_id
-
-        if properties.get("descriptor_verison", "") == "":
-            version = metadata.get("template_version", "")
-            if version == "":
-                version = metadata.get("version", "")
-            properties["descriptor_verison"] = version
-
-        if properties.get("provider", "") == "":
-            provider = metadata.get("template_author", "")
-            if provider == "":
-                provider = metadata.get("provider", "")
-            properties["provider"] = provider
-
-        if properties.get("template_name", "") == "":
-            template_name = metadata.get("template_name", "")
-            if template_name == "":
-                template_name = metadata.get("template_name", "")
-            properties["template_name"] = template_name
-
-        return vnf
diff --git a/genericparser/pub/utils/toscaparsers/vnfdparser/__init__.py b/genericparser/pub/utils/toscaparsers/vnfdparser/__init__.py
new file mode 100644
index 0000000..179fb4c
--- /dev/null
+++ b/genericparser/pub/utils/toscaparsers/vnfdparser/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2019 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from genericparser.pub.utils.toscaparsers.vnfdparser.vnfd_sol_base import VnfdSOLBase
+from genericparser.pub.utils.toscaparsers.vnfdparser.vnfd_sol_251 import VnfdSOL251
+
+
+def CreateVnfdSOLParser(sol_version, etsi_vnfd_model):
+    switcher = {
+        "base": VnfdSOLBase(etsi_vnfd_model),
+        "2.5.1+1": VnfdSOL251(etsi_vnfd_model)
+    }
+    return switcher.get(sol_version, lambda: "Invalid Version")
diff --git a/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py
new file mode 100644
index 0000000..d6c15de
--- /dev/null
+++ b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py
@@ -0,0 +1,235 @@
+# Copyright 2019 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import functools
+import logging
+import os
+
+
+logger = logging.getLogger(__name__)
+
+SECTIONS = (VDU_COMPUTE_TYPE, VNF_VL_TYPE, VDU_CP_TYPE, VDU_STORAGE_TYPE) = \
+           ('tosca.nodes.nfv.Vdu.Compute', 'tosca.nodes.nfv.VnfVirtualLink', 'tosca.nodes.nfv.VduCp', 'tosca.nodes.nfv.Vdu.VirtualStorage')
+
+
+class VnfdSOL251():
+
+    def __init__(self, model):
+        self.model = model
+
+    def build_vnf(self, tosca):
+        vnf = self.model.get_substitution_mappings(tosca)
+        properties = vnf.get("properties", {})
+        metadata = vnf.get("metadata", {})
+        if properties.get("descriptor_id", "") == "":
+            descriptor_id = metadata.get("descriptor_id", "")
+            if descriptor_id == "":
+                descriptor_id = metadata.get("id", "")
+            if descriptor_id == "":
+                descriptor_id = metadata.get("UUID", "")
+            properties["descriptor_id"] = descriptor_id
+
+        if properties.get("descriptor_verison", "") == "":
+            version = metadata.get("template_version", "")
+            if version == "":
+                version = metadata.get("version", "")
+            properties["descriptor_verison"] = version
+
+        if properties.get("provider", "") == "":
+            provider = metadata.get("template_author", "")
+            if provider == "":
+                provider = metadata.get("provider", "")
+            properties["provider"] = provider
+
+        if properties.get("template_name", "") == "":
+            template_name = metadata.get("template_name", "")
+            if template_name == "":
+                template_name = metadata.get("template_name", "")
+            properties["template_name"] = template_name
+
+        return vnf
+
+    def get_all_vl(self, nodeTemplates, node_types):
+        vls = []
+        for node in nodeTemplates:
+            if self.model.isNodeTypeX(node, node_types, VNF_VL_TYPE):
+                vl = dict()
+                vl['vl_id'] = node['name']
+                vl['description'] = node['description']
+                vl['properties'] = node['properties']
+                vls.append(vl)
+        return vls
+
+    def get_all_cp(self, nodeTemplates, node_types):
+        cps = []
+        for node in nodeTemplates:
+            if self.model.isNodeTypeX(node, node_types, VDU_CP_TYPE):
+                cp = {}
+                cp['cp_id'] = node['name']
+                cp['cpd_id'] = node['name']
+                cp['description'] = node['description']
+                cp['properties'] = node['properties']
+                cp['vl_id'] = self._get_node_vl_id(node)
+                cp['vdu_id'] = self._get_node_vdu_id(node)
+                vls = self._buil_cp_vls(node)
+                if len(vls) > 1:
+                    cp['vls'] = vls
+                cps.append(cp)
+        return cps
+
+    def get_all_volume_storage(self, nodeTemplates, node_types):
+        rets = []
+        for node in nodeTemplates:
+            if self.model.isNodeTypeX(node, node_types, VDU_STORAGE_TYPE):
+                ret = {}
+                ret['volume_storage_id'] = node['name']
+                if 'description' in node:
+                    ret['description'] = node['description']
+                ret['properties'] = node['properties']
+                rets.append(ret)
+        return rets
+
+    def get_all_vdu(self, nodeTemplates, node_types):
+        rets = []
+        inject_files = []
+        for node in nodeTemplates:
+            logger.debug("nodeTemplates :%s", node)
+            if self.model.isNodeTypeX(node, node_types, VDU_COMPUTE_TYPE):
+                ret = {}
+                ret['vdu_id'] = node['name']
+                ret['type'] = node['nodeType']
+                if 'description' in node:
+                    ret['description'] = node['description']
+                ret['properties'] = node['properties']
+                if 'inject_files' in node['properties']:
+                    inject_files = node['properties']['inject_files']
+                if inject_files is not None:
+                    if isinstance(inject_files, list):
+                        for inject_file in inject_files:
+                            source_path = os.path.join(self.model.basepath, inject_file['source_path'])
+                            with open(source_path, "rb") as f:
+                                source_data = f.read()
+                                source_data_base64 = source_data.encode("base64")
+                                inject_file["source_data_base64"] = source_data_base64
+                    if isinstance(inject_files, dict):
+                        source_path = os.path.join(self.model.basepath, inject_files['source_path'])
+                        with open(source_path, "rb") as f:
+                            source_data = f.read()
+                            source_data_base64 = source_data.encode("base64")
+                            inject_files["source_data_base64"] = source_data_base64
+                virtual_storages = self.model.getRequirementByName(node, 'virtual_storage')
+                ret['virtual_storages'] = map(functools.partial(self._trans_virtual_storage), virtual_storages)
+                ret['dependencies'] = map(lambda x: self.model.get_requirement_node_name(x), self.model.getNodeDependencys(node))
+                virtual_compute = self.model.getCapabilityByName(node, 'virtual_compute')
+                if virtual_compute is not None and 'properties' in virtual_compute:
+                    ret['virtual_compute'] = virtual_compute['properties']
+                ret['vls'] = self._get_linked_vl_ids(node, nodeTemplates)
+                ret['cps'] = self._get_virtal_binding_cp_ids(node, nodeTemplates)
+                ret['artifacts'] = self.model.build_artifacts(node)
+                rets.append(ret)
+        logger.debug("rets:%s", rets)
+        return rets
+
+    def get_all_endpoint_exposed(self):
+        if self.model.vnf:
+            external_cps = self._get_external_cps(self.model.vnf.get('requirements', None))
+            forward_cps = self._get_forward_cps(self.model.vnf.get('capabilities', None))
+            return {"external_cps": external_cps, "forward_cps": forward_cps}
+        return {}
+
+    def _trans_virtual_storage(self, virtual_storage):
+        if isinstance(virtual_storage, str):
+            return {"virtual_storage_id": virtual_storage}
+        else:
+            ret = {}
+            ret['virtual_storage_id'] = self.model.get_requirement_node_name(virtual_storage)
+            return ret
+
+    def _get_linked_vl_ids(self, node, node_templates):
+        vl_ids = []
+        cps = self._get_virtal_binding_cps(node, node_templates)
+        for cp in cps:
+            vl_reqs = self.model.getRequirementByName(cp, 'virtual_link')
+            for vl_req in vl_reqs:
+                vl_ids.append(self.model.get_requirement_node_name(vl_req))
+        return vl_ids
+
+    def _get_virtal_binding_cp_ids(self, node, nodeTemplates):
+        return map(lambda x: x['name'], self._get_virtal_binding_cps(node, nodeTemplates))
+
+    def _get_virtal_binding_cps(self, node, nodeTemplates):
+        cps = []
+        for tmpnode in nodeTemplates:
+            if 'requirements' in tmpnode:
+                for item in tmpnode['requirements']:
+                    for key, value in item.items():
+                        if key.upper().startswith('VIRTUAL_BINDING'):
+                            req_node_name = self.model.get_requirement_node_name(value)
+                            if req_node_name is not None and req_node_name == node['name']:
+                                cps.append(tmpnode)
+        return cps
+
+    def _get_node_vdu_id(self, node):
+        vdu_ids = map(lambda x: self.model.get_requirement_node_name(x), self.model.getRequirementByName(node, 'virtual_binding'))
+        if len(vdu_ids) > 0:
+            return vdu_ids[0]
+        return ""
+
+    def _get_node_vl_id(self, node):
+        vl_ids = map(lambda x: self.model.get_requirement_node_name(x), self.model.getRequirementByName(node, 'virtual_link'))
+        if len(vl_ids) > 0:
+            return vl_ids[0]
+        return ""
+
+    def _buil_cp_vls(self, node):
+        return map(lambda x: self._build_cp_vl(x), self.model.getRequirementByName(node, 'virtual_link'))
+
+    def _build_cp_vl(self, req):
+        cp_vl = {}
+        cp_vl['vl_id'] = self.model.get_prop_from_obj(req, 'node')
+        relationship = self.model.get_prop_from_obj(req, 'relationship')
+        if relationship is not None:
+            properties = self.model.get_prop_from_obj(relationship, 'properties')
+            if properties is not None and isinstance(properties, dict):
+                for key, value in properties.items():
+                    cp_vl[key] = value
+        return cp_vl
+
+    def _get_external_cps(self, vnf_requirements):
+        external_cps = []
+        if vnf_requirements:
+            if isinstance(vnf_requirements, dict):
+                for key, value in vnf_requirements.items():
+                    if isinstance(value, list) and len(value) > 0:
+                        external_cps.append({"key_name": key, "cpd_id": value[0]})
+                    else:
+                        external_cps.append({"key_name": key, "cpd_id": value})
+            elif isinstance(vnf_requirements, list):
+                for vnf_requirement in vnf_requirements:
+                    for key, value in vnf_requirement.items():
+                        if isinstance(value, list) and len(value) > 0:
+                            external_cps.append({"key_name": key, "cpd_id": value[0]})
+                        else:
+                            external_cps.append({"key_name": key, "cpd_id": value})
+        return external_cps
+
+    def _get_forward_cps(self, vnf_capabilities):
+        forward_cps = []
+        if vnf_capabilities:
+            for key, value in vnf_capabilities.items():
+                if isinstance(value, list) and len(value) > 0:
+                    forward_cps.append({"key_name": key, "cpd_id": value[0]})
+                else:
+                    forward_cps.append({"key_name": key, "cpd_id": value})
+        return forward_cps
diff --git a/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_base.py b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_base.py
new file mode 100644
index 0000000..d14b380
--- /dev/null
+++ b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_base.py
@@ -0,0 +1,235 @@
+# Copyright 2019 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import functools
+import logging
+import os
+
+
+logger = logging.getLogger(__name__)
+
+SECTIONS = (VDU_COMPUTE_TYPE, VNF_VL_TYPE, VDU_CP_TYPE, VDU_STORAGE_TYPE) = \
+           ('tosca.nodes.nfv.Vdu.Compute', 'tosca.nodes.nfv.VnfVirtualLink', 'tosca.nodes.nfv.VduCp', 'tosca.nodes.nfv.Vdu.VirtualStorage')
+
+
+class VnfdSOLBase():
+
+    def __init__(self, model):
+        self.model = model
+
+    def build_vnf(self, tosca):
+        vnf = self.model.get_substitution_mappings(tosca)
+        properties = vnf.get("properties", {})
+        metadata = vnf.get("metadata", {})
+        if properties.get("descriptor_id", "") == "":
+            descriptor_id = metadata.get("descriptor_id", "")
+            if descriptor_id == "":
+                descriptor_id = metadata.get("id", "")
+            if descriptor_id == "":
+                descriptor_id = metadata.get("UUID", "")
+            properties["descriptor_id"] = descriptor_id
+
+        if properties.get("descriptor_verison", "") == "":
+            version = metadata.get("template_version", "")
+            if version == "":
+                version = metadata.get("version", "")
+            properties["descriptor_verison"] = version
+
+        if properties.get("provider", "") == "":
+            provider = metadata.get("template_author", "")
+            if provider == "":
+                provider = metadata.get("provider", "")
+            properties["provider"] = provider
+
+        if properties.get("template_name", "") == "":
+            template_name = metadata.get("template_name", "")
+            if template_name == "":
+                template_name = metadata.get("template_name", "")
+            properties["template_name"] = template_name
+        logger.debug("vnf:%s", vnf)
+        return vnf
+
+    def get_all_vl(self, nodeTemplates, node_types):
+        vls = []
+        for node in nodeTemplates:
+            if self.model.isNodeTypeX(node, node_types, VNF_VL_TYPE):
+                vl = dict()
+                vl['vl_id'] = node['name']
+                vl['description'] = node['description']
+                vl['properties'] = node['properties']
+                vls.append(vl)
+        return vls
+
+    def get_all_cp(self, nodeTemplates, node_types):
+        cps = []
+        for node in nodeTemplates:
+            if self.model.isNodeTypeX(node, node_types, VDU_CP_TYPE):
+                cp = {}
+                cp['cp_id'] = node['name']
+                cp['cpd_id'] = node['name']
+                cp['description'] = node['description']
+                cp['properties'] = node['properties']
+                cp['vl_id'] = self._get_node_vl_id(node)
+                cp['vdu_id'] = self._get_node_vdu_id(node)
+                vls = self._buil_cp_vls(node)
+                if len(vls) > 1:
+                    cp['vls'] = vls
+                cps.append(cp)
+        return cps
+
+    def get_all_volume_storage(self, nodeTemplates, node_types):
+        rets = []
+        for node in nodeTemplates:
+            if self.model.isNodeTypeX(node, node_types, VDU_STORAGE_TYPE):
+                ret = {}
+                ret['volume_storage_id'] = node['name']
+                if 'description' in node:
+                    ret['description'] = node['description']
+                ret['properties'] = node['properties']
+                rets.append(ret)
+        return rets
+
+    def get_all_vdu(self, nodeTemplates, node_types):
+        rets = []
+        inject_files = []
+        for node in nodeTemplates:
+            logger.debug("nodeTemplates :%s", node)
+            if self.model.isNodeTypeX(node, node_types, VDU_COMPUTE_TYPE):
+                ret = {}
+                ret['vdu_id'] = node['name']
+                ret['type'] = node['nodeType']
+                if 'description' in node:
+                    ret['description'] = node['description']
+                ret['properties'] = node['properties']
+                if 'inject_files' in node['properties']:
+                    inject_files = node['properties']['inject_files']
+                if inject_files is not None:
+                    if isinstance(inject_files, list):
+                        for inject_file in inject_files:
+                            source_path = os.path.join(self.model.basepath, inject_file['source_path'])
+                            with open(source_path, "rb") as f:
+                                source_data = f.read()
+                                source_data_base64 = source_data.encode("base64")
+                                inject_file["source_data_base64"] = source_data_base64
+                    if isinstance(inject_files, dict):
+                        source_path = os.path.join(self.model.basepath, inject_files['source_path'])
+                        with open(source_path, "rb") as f:
+                            source_data = f.read()
+                            source_data_base64 = source_data.encode("base64")
+                            inject_files["source_data_base64"] = source_data_base64
+                virtual_storages = self.model.getRequirementByName(node, 'virtual_storage')
+                ret['virtual_storages'] = map(functools.partial(self._trans_virtual_storage), virtual_storages)
+                ret['dependencies'] = map(lambda x: self.model.get_requirement_node_name(x), self.model.getNodeDependencys(node))
+                virtual_compute = self.model.getCapabilityByName(node, 'virtual_compute')
+                if virtual_compute is not None and 'properties' in virtual_compute:
+                    ret['virtual_compute'] = virtual_compute['properties']
+                ret['vls'] = self._get_linked_vl_ids(node, nodeTemplates)
+                ret['cps'] = self._get_virtal_binding_cp_ids(node, nodeTemplates)
+                ret['artifacts'] = self.model.build_artifacts(node)
+                rets.append(ret)
+        logger.debug("rets:%s", rets)
+        return rets
+
+    def get_all_endpoint_exposed(self):
+        if self.model.vnf:
+            external_cps = self._get_external_cps(self.model.vnf.get('requirements', None))
+            forward_cps = self._get_forward_cps(self.model.vnf.get('capabilities', None))
+            return {"external_cps": external_cps, "forward_cps": forward_cps}
+        return {}
+
+    def _trans_virtual_storage(self, virtual_storage):
+        if isinstance(virtual_storage, str):
+            return {"virtual_storage_id": virtual_storage}
+        else:
+            ret = {}
+            ret['virtual_storage_id'] = self.model.get_requirement_node_name(virtual_storage)
+            return ret
+
+    def _get_linked_vl_ids(self, node, node_templates):
+        vl_ids = []
+        cps = self._get_virtal_binding_cps(node, node_templates)
+        for cp in cps:
+            vl_reqs = self.model.getRequirementByName(cp, 'virtual_link')
+            for vl_req in vl_reqs:
+                vl_ids.append(self.model.get_requirement_node_name(vl_req))
+        return vl_ids
+
+    def _get_virtal_binding_cp_ids(self, node, nodeTemplates):
+        return map(lambda x: x['name'], self._get_virtal_binding_cps(node, nodeTemplates))
+
+    def _get_virtal_binding_cps(self, node, nodeTemplates):
+        cps = []
+        for tmpnode in nodeTemplates:
+            if 'requirements' in tmpnode:
+                for item in tmpnode['requirements']:
+                    for key, value in item.items():
+                        if key.upper().startswith('VIRTUAL_BINDING'):
+                            req_node_name = self.model.get_requirement_node_name(value)
+                            if req_node_name is not None and req_node_name == node['name']:
+                                cps.append(tmpnode)
+        return cps
+
+    def _get_node_vdu_id(self, node):
+        vdu_ids = map(lambda x: self.model.get_requirement_node_name(x), self.model.getRequirementByName(node, 'virtual_binding'))
+        if len(vdu_ids) > 0:
+            return vdu_ids[0]
+        return ""
+
+    def _get_node_vl_id(self, node):
+        vl_ids = map(lambda x: self.model.get_requirement_node_name(x), self.model.getRequirementByName(node, 'virtual_link'))
+        if len(vl_ids) > 0:
+            return vl_ids[0]
+        return ""
+
+    def _buil_cp_vls(self, node):
+        return map(lambda x: self._build_cp_vl(x), self.model.getRequirementByName(node, 'virtual_link'))
+
+    def _build_cp_vl(self, req):
+        cp_vl = {}
+        cp_vl['vl_id'] = self.model.get_prop_from_obj(req, 'node')
+        relationship = self.model.get_prop_from_obj(req, 'relationship')
+        if relationship is not None:
+            properties = self.model.get_prop_from_obj(relationship, 'properties')
+            if properties is not None and isinstance(properties, dict):
+                for key, value in properties.items():
+                    cp_vl[key] = value
+        return cp_vl
+
+    def _get_external_cps(self, vnf_requirements):
+        external_cps = []
+        if vnf_requirements:
+            if isinstance(vnf_requirements, dict):
+                for key, value in vnf_requirements.items():
+                    if isinstance(value, list) and len(value) > 0:
+                        external_cps.append({"key_name": key, "cpd_id": value[0]})
+                    else:
+                        external_cps.append({"key_name": key, "cpd_id": value})
+            elif isinstance(vnf_requirements, list):
+                for vnf_requirement in vnf_requirements:
+                    for key, value in vnf_requirement.items():
+                        if isinstance(value, list) and len(value) > 0:
+                            external_cps.append({"key_name": key, "cpd_id": value[0]})
+                        else:
+                            external_cps.append({"key_name": key, "cpd_id": value})
+        return external_cps
+
+    def _get_forward_cps(self, vnf_capabilities):
+        forward_cps = []
+        if vnf_capabilities:
+            for key, value in vnf_capabilities.items():
+                if isinstance(value, list) and len(value) > 0:
+                    forward_cps.append({"key_name": key, "cpd_id": value[0]})
+                else:
+                    forward_cps.append({"key_name": key, "cpd_id": value})
+        return forward_cps