From: Fu Jinhua Date: Fri, 22 Sep 2017 10:55:41 +0000 (+0000) Subject: Merge "Update return value of ns pkg list" X-Git-Tag: v1.0.0~26 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3258608c3b4d84800092f030b9cf8bd7c38a8099;p=vfc%2Fnfvo%2Fcatalog.git Merge "Update return value of ns pkg list" --- 3258608c3b4d84800092f030b9cf8bd7c38a8099 diff --cc catalog/packages/ns_package.py index 396d0866,318c0952..2b88a755 --- a/catalog/packages/ns_package.py +++ b/catalog/packages/ns_package.py @@@ -149,14 -150,12 +150,14 @@@ 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 + "nsdId": ns.nsdId, + "nsdProvider": ns.nsdDesginer, + "nsdVersion": ns.nsdVersion }) return [0, csars]