diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-09-22 10:55:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-22 10:55:41 +0000 |
| commit | 3258608c3b4d84800092f030b9cf8bd7c38a8099 (patch) | |
| tree | 28c6b025426b32a56977c0c08dd53c9aa8ef7fc4 | |
| parent | b16dfab8279a035ed0ce9961943c11a7e1633ea6 (diff) | |
| parent | b428f80a98ad7d83269589ab9dca0cc190764106 (diff) | |
Merge "Update return value of ns pkg list"
| -rw-r--r-- | catalog/packages/ns_package.py | 9 | ||||
| -rw-r--r-- | catalog/packages/tests/test_ns.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py index 396d0866..2b88a755 100644 --- a/catalog/packages/ns_package.py +++ b/catalog/packages/ns_package.py @@ -112,8 +112,9 @@ class NsPackage(object): artifact = sdc.get_artifact(sdc.ASSETTYPE_SERVICES, csar_id) local_path = os.path.join(CATALOG_ROOT_PATH, csar_id) + csar_name = "%s.csar" % artifact.get("name", csar_id) local_file_name = sdc.download_artifacts(artifact["toscaModelURL"], - local_path, "%s.csar" % artifact.get("name", csar_id)) + local_path, csar_name) nsd_json = toscaparser.parse_nsd(local_file_name) nsd = json.JSONDecoder().decode(nsd_json) @@ -135,7 +136,7 @@ class NsPackage(object): nsdDesginer=nsd["metadata"].get("vendor", "undefined"), nsdDescription=nsd["metadata"].get("description", ""), nsdVersion=nsd["metadata"].get("version", "undefined"), - nsPackageUri=local_file_name, + nsPackageUri="%s/%s" % (csar_id, csar_name), sdcCsarId=csar_id, localFilePath=local_file_name, nsdModel=nsd_json @@ -149,10 +150,10 @@ class NsPackage(object): return [0, "Delete CSAR(%s) successfully." % csar_id] def get_csars(self): - csars = [] + csars = {"csars": []} nss = NSPackageModel.objects.filter() for ns in nss: - csars.append({ + csars["csars"].append({ "csarId": ns.nsPackageId, "nsdId": ns.nsdId, "nsdProvider": ns.nsdDesginer, diff --git a/catalog/packages/tests/test_ns.py b/catalog/packages/tests/test_ns.py index de5aa8ed..3f855afa 100644 --- a/catalog/packages/tests/test_ns.py +++ b/catalog/packages/tests/test_ns.py @@ -464,7 +464,7 @@ class TestNsPackage(TestCase): resp = self.client.get("/api/catalog/v1/nspackages") self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual([{"csarId":"13", "nsdId": "2"}], resp.data) + self.assertEqual({"csars": [{"csarId":"13", "nsdId": "2"}]}, resp.data) def test_ns_pkg_get_one(self): NSPackageModel(nsPackageId="14", nsdId="2", nsdDesginer="3", nsdVersion="4").save() |