diff options
| author |   fengyuanxing <feng.yuanxing@zte.com.cn> | 2017-08-30 17:47:09 +0800 |
|---|---|---|
| committer | fengyuanxing <feng.yuanxing@zte.com.cn> | 2017-08-31 10:05:43 +0800 |
| commit | dd8ce89b4ac028cf19c86c3afd132fabffe5b703 (patch) | |
| tree | 05ead6e5ee43f2c028539547d024819d1f0615ec | |
| parent | 3b1a3144956ffc99703afc14cf1ed72ae7edad0f (diff) | |
Add get_nsd mock data
Change-Id: Iee6a6abeda37b7e3250f09009dabcb9043ef7761
Issue-Id: VFC-152
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
| -rw-r--r-- | catalog/packages/ns_package.py | 16 | ||||
| -rw-r--r-- | catalog/packages/tests.py | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py index ce05a814..683b0548 100644 --- a/catalog/packages/ns_package.py +++ b/catalog/packages/ns_package.py @@ -99,12 +99,7 @@ class NsPackage(object): if NSDModel.objects.filter(id=csar_id): raise NSLCMException("NS CSAR(%s) already exists." % csar_id) - artifact = sdc.get_artifact(sdc.ASSETTYPE_SERVICES, csar_id) - local_path = os.path.join(CATALOG_ROOT_PATH, csar_id) - local_file_name = sdc.download_artifacts(artifact["toscaModelURL"], local_path) - - nsd_json = toscaparser.parse_nsd(local_file_name) - nsd = json.JSONDecoder().decode(nsd_json) + nsd,local_file_name,nsd_json = self.get_nsd(csar_id) nsd_id = nsd["metadata"]["id"] if NSDModel.objects.filter(nsd_id=nsd_id): @@ -128,6 +123,15 @@ class NsPackage(object): return [0, "CSAR(%s) distributed successfully." % csar_id] + def get_nsd(self, csar_id): + artifact = sdc.get_artifact(sdc.ASSETTYPE_SERVICES, csar_id) + local_path = os.path.join(CATALOG_ROOT_PATH, csar_id) + local_file_name = sdc.download_artifacts(artifact["toscaModelURL"], local_path) + + nsd_json = toscaparser.parse_nsd(local_file_name) + nsd = json.JSONDecoder().decode(nsd_json) + + return nsd,local_file_name,nsd_json def delete_csar(self, csar_id, force_delete): ''' diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py index 15c77bdb..b2deba66 100644 --- a/catalog/packages/tests.py +++ b/catalog/packages/tests.py @@ -443,8 +443,6 @@ class PackageTest(unittest.TestCase): @mock.patch.object(NsPackage,'get_nsd') def test_ns_distribute(self, mock_get_nsd): - - local_file_name = "/url/local/filename" nsd = json.JSONEncoder().encode(self.nsd_json) mock_get_nsd.return_value = self.nsd_json,local_file_name,nsd |