update the logic to distribute service from sdc.

1. Call /sdc/v1/catalog/{assetType}/{uuid}/metadata to get service metadata by given uuid.
2. Check if related resources exist before download CSAR package.

Change-Id: I6ea5b9f5d2844b232901ce83eedb574f5bd3d552
Issue-ID: MODELING-189
Signed-off-by: dyh <dengyuanhong@chinamobile.com>

diff --git a/genericparser/packages/biz/sdc_service_package.py b/genericparser/packages/biz/sdc_service_package.py
index 281dd17..0d57ceb 100644 (file)
--- a/genericparser/packages/biz/sdc_service_package.py
+++ b/genericparser/packages/biz/sdc_service_package.py
@@ -19,7 +19,7 @@ from coverage.xmlreport import os
 
 from genericparser.packages.biz.service_descriptor import ServiceDescriptor
 from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH, REG_TO_MSB_REG_PARAM, GENERICPARSER_URL_PATH
-from genericparser.pub.database.models import ServicePackageModel
+from genericparser.pub.database.models import ServicePackageModel, VnfPackageModel, PnfPackageModel
 from genericparser.pub.exceptions import GenericparserException, PackageNotFoundException, \
     PackageHasExistsException
 from genericparser.pub.msapi import sdc
@@ -41,10 +41,20 @@ class ServicePackage(object):
             raise PackageHasExistsException("Service CSAR(%s) already exists." % csar_id)
 
         try:
-            artifact = sdc.get_artifact(sdc.ASSETTYPE_SERVICES, csar_id)
+            service = sdc.get_asset(sdc.ASSETTYPE_SERVICES, csar_id)
+            # check if the related resources exist
+            resources = service.get('resources', None)
+            if resources:
+                for resource in resources:
+                    if not VnfPackageModel.objects.filter(vnfPackageId=resource['resourceUUID']) and \
+                            not PnfPackageModel.objects.filter(pnfPackageId=resource['resourceUUID']):
+                        logger.error("Resource [%s] is not distributed.", resource['resourceUUID'])
+                        raise GenericparserException("Resource (%s) is not distributed." % resource['resourceUUID'])
+
+            # download csar package
             local_path = os.path.join(GENERICPARSER_ROOT_PATH, csar_id)
-            csar_name = "%s.csar" % artifact.get("name", csar_id)
-            local_file_name = sdc.download_artifacts(artifact["toscaModelURL"], local_path, csar_name)
+            csar_name = "%s.csar" % service.get("name", csar_id)
+            local_file_name = sdc.download_artifacts(service["toscaModelURL"], local_path, csar_name)
             if local_file_name.endswith(".csar") or local_file_name.endswith(".zip"):
                 fileutil.unzip_file(local_file_name, local_path, "")
             data = {

diff --git a/genericparser/packages/tests/test_servicepackage.py b/genericparser/packages/tests/test_servicepackage.py
index f7ac8a5..786e34c 100644 (file)
--- a/genericparser/packages/tests/test_servicepackage.py
+++ b/genericparser/packages/tests/test_servicepackage.py
@@ -249,6 +249,37 @@ class TestServicePackage(TestCase):
                 "name": "Enhance_Service"
             }
         }
+        self.asset_data = {
+            "uuid": "1",
+            "invariantUUID": "63eaec39-ffbe-411c-a838-448f2c73f7eb",
+            "name": "underlayvpn",
+            "version": "2.0",
+            "toscaModelURL": "/sdc/v1/catalog/resources/c94490a0-f7ef-48be-b3f8-8d8662a37236/toscaModel",
+            "category": "Volte",
+            "subCategory": "VolteVNF",
+            "resourceType": "VF",
+            "lifecycleState": "CERTIFIED",
+            "distributionStatus": "DISTRIBUTION_APPROVED",
+            "lastUpdaterUserId": "jh0003",
+            "resources": [
+                {
+                    "resourceInstanceName": "contrailV2VLANSubInterface 0",
+                    "resourceName": "contrailV2VLANSubInterface",
+                    "resourceInvariantUUID": "4d31b775-af63-491d-89f1-254e218e7140",
+                    "resourceVersion": "1.0",
+                    "resoucreType": "CP",
+                    "resourceUUID": "cd557883-ac4b-462d-aa01-421b5fa606b1"
+                },
+                {
+                    "resourceInstanceName": "Network 0",
+                    "resourceName": "Network",
+                    "resourceInvariantUUID": "f90f567e-7d7d-4216-af38-6bca0637c59f",
+                    "resourceVersion": "1.0",
+                    "resoucreType": "VL",
+                    "resourceUUID": "m6000_s"
+                }
+            ]
+        }
 
     def tearDown(self):
         pass
@@ -263,9 +294,9 @@ class TestServicePackage(TestCase):
         except PackageHasExistsException as e:
             self.assertEqual("Service CSAR(1) already exists.", e.args[0])
 
-    @mock.patch.object(sdc, 'get_artifact')
-    def test_service_pkg_distribute_when_fail_get_artifacts(self, mock_get_artifact):
-        mock_get_artifact.side_effect = GenericparserException("Failed to query artifact(services,1) from sdc.")
+    @mock.patch.object(sdc, 'get_asset')
+    def test_service_pkg_distribute_when_fail_get_artifacts(self, mock_get_asset):
+        mock_get_asset.side_effect = GenericparserException("Failed to query artifact(services,1) from sdc.")
         csar_id = "1"
         try:
             ServicePackage().on_distribute(csar_id)
@@ -273,51 +304,42 @@ class TestServicePackage(TestCase):
             self.assertTrue(isinstance(e, GenericparserException))
             self.assertEqual("Failed to query artifact(services,1) from sdc.", e.args[0])
 
-    @mock.patch.object(sdc, 'get_artifact')
+    @mock.patch.object(sdc, 'get_asset')
+    def test_service_pkg_distribute_when_resource_not_distribute(self, mock_get_asset):
+        mock_get_asset.return_value = self.asset_data
+        csar_id = "1"
+        try:
+            ServicePackage().on_distribute(csar_id)
+        except Exception as e:
+            self.assertTrue(isinstance(e, GenericparserException))
+            self.assertEqual("Resource (cd557883-ac4b-462d-aa01-421b5fa606b1) is not distributed.", e.args[0])
+
+    @mock.patch.object(sdc, 'get_asset')
     @mock.patch.object(sdc, 'download_artifacts')
-    def test_service_pkg_distribute_when_fail_download_artifacts(self, mock_get_artifact, mock_download_artifacts):
-        mock_get_artifact.return_value = {
-            "uuid": "1",
-            "invariantUUID": "63eaec39-ffbe-411c-a838-448f2c73f7eb",
-            "name": "underlayvpn",
-            "version": "2.0",
-            "toscaModelURL": "/sdc/v1/genericparser/resources/c94490a0-f7ef-48be-b3f8-8d8662a37236/toscaModel",
-            "category": "Volte",
-            "subCategory": "VolteVNF",
-            "resourceType": "VF",
-            "lifecycleState": "CERTIFIED",
-            "distributionStatus": "DISTRIBUTION_APPROVED",
-            "lastUpdaterUserId": "jh0003"
-        }
+    def test_service_pkg_distribute_when_fail_download_artifacts(self, mock_get_asset, mock_download_artifacts):
+        mock_get_asset.return_value = self.asset_data
         mock_download_artifacts.side_effect = GenericparserException("Failed to download 1 from sdc.")
         csar_id = "1"
+        VnfPackageModel(vnfPackageId="cd557883-ac4b-462d-aa01-421b5fa606b1",
+                        vnfdId="cd557883-ac4b-462d-aa01-421b5fa606b1").save()
+        PnfPackageModel(pnfPackageId="m6000_s", pnfdId="m6000_s").save()
+
         try:
             ServicePackage().on_distribute(csar_id)
         except Exception as e:
             self.assertTrue(isinstance(e, GenericparserException))
             self.assertEqual("Failed to download 1 from sdc.", e.args[0])
 
-    @mock.patch.object(sdc, 'get_artifact')
+    @mock.patch.object(sdc, 'get_asset')
     @mock.patch.object(sdc, 'download_artifacts')
     @mock.patch.object(toscaparsers, 'parse_sd')
-    def test_service_pkg_distribute(self, mock_parse_sd, mock_download_artifacts, mock_get_artifact):
+    def test_service_pkg_distribute(self, mock_parse_sd, mock_download_artifacts, mock_get_asset):
         mock_parse_sd.return_value = json.JSONEncoder().encode(self.sd_data)
         mock_download_artifacts.return_value = "/test.csar"
-        mock_get_artifact.return_value = {
-            "uuid": "1",
-            "invariantUUID": "63eaec39-ffbe-411c-a838-448f2c73f7eb",
-            "name": "underlayvpn",
-            "version": "2.0",
-            "toscaModelURL": "/sdc/v1/genericparser/resources/c94490a0-f7ef-48be-b3f8-8d8662a37236/toscaModel",
-            "category": "Volte",
-            "subCategory": "VolteVNF",
-            "resourceType": "VF",
-            "lifecycleState": "CERTIFIED",
-            "distributionStatus": "DISTRIBUTION_APPROVED",
-            "lastUpdaterUserId": "jh0003"
-        }
-        VnfPackageModel(vnfPackageId="1", vnfdId="cd557883-ac4b-462d-aa01-421b5fa606b1").save()
-        PnfPackageModel(pnfPackageId="1", pnfdId="m6000_s").save()
+        mock_get_asset.return_value = self.asset_data
+        VnfPackageModel(vnfPackageId="cd557883-ac4b-462d-aa01-421b5fa606b1",
+                        vnfdId="cd557883-ac4b-462d-aa01-421b5fa606b1").save()
+        PnfPackageModel(pnfPackageId="m6000_s", pnfdId="m6000_s").save()
         ServicePackage().on_distribute(csar_id="1")
 
         service_package = ServicePackageModel.objects.filter(servicePackageId="1").first()

diff --git a/genericparser/pub/msapi/sdc.py b/genericparser/pub/msapi/sdc.py
index e95c1ca..81715de 100644 (file)
--- a/genericparser/pub/msapi/sdc.py
+++ b/genericparser/pub/msapi/sdc.py
@@ -16,10 +16,10 @@ import json
 import logging
 import os
 
+from genericparser.pub.config.config import SDC_BASE_URL, SDC_USER, SDC_PASSWD
 from genericparser.pub.exceptions import GenericparserException
-from genericparser.pub.utils import restcall
 from genericparser.pub.utils import fileutil
-from genericparser.pub.config.config import SDC_BASE_URL, SDC_USER, SDC_PASSWD
+from genericparser.pub.utils import restcall
 
 logger = logging.getLogger(__name__)
 
@@ -77,12 +77,26 @@ def get_artifact(asset_type, csar_id):
         if artifact["uuid"] == csar_id:
             if asset_type == ASSETTYPE_SERVICES and \
                     artifact.get("distributionStatus", None) != DISTRIBUTED:
-                raise GenericparserException("The artifact (%s,%s) is not distributed from sdc." % (asset_type, csar_id))
+                raise GenericparserException(
+                    "The artifact (%s,%s) is not distributed from sdc." % (asset_type, csar_id))
             else:
                 return artifact
     raise GenericparserException("Failed to query artifact(%s,%s) from sdc." % (asset_type, csar_id))
 
 
+def get_asset(asset_type, uuid):
+    resource = "/sdc/v1/catalog/{assetType}/{uuid}/metadata".format(assetType=asset_type, uuid=uuid)
+    ret = call_sdc(resource, "GET")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise GenericparserException("Failed to get asset(%s, %s) from sdc." % (asset_type, uuid))
+    asset = json.JSONDecoder().decode(ret[1])
+    if asset.get("distributionStatus", None) != DISTRIBUTED:
+        raise GenericparserException("The asset (%s,%s) is not distributed from sdc." % (asset_type, uuid))
+    else:
+        return asset
+
+
 def delete_artifact(asset_type, asset_id, artifact_id):
     resource = "/sdc/v1/catalog/{assetType}/{uuid}/artifacts/{artifactUUID}"
     resource = resource.format(assetType=asset_type, uuid=asset_id, artifactUUID=artifact_id)