diff options
| author |   hongyuzhao <zhao.hongyu@zte.com.cn> | 2020-02-18 18:10:21 +0800 |
|---|---|---|
| committer | hongyuzhao <zhao.hongyu@zte.com.cn> | 2020-02-19 12:31:30 +0800 |
| commit | ec917b25163dc63a6177cbe9ad68b345649cd8e9 (patch) | |
| tree | ea2ff59da482990cc213755fdf6637d4c3db2b6c /catalog/packages/biz | |
| parent | b7d87af11036d724710a50116fd3edabe25afd5b (diff) | |
_links is not implemented in the response of the Query VNF API
Change-Id: Ia5a7de02c05ef75f5dfb0729a25d4d86ffd1ead8
Issue-ID: MODELING-312
Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>
Diffstat (limited to 'catalog/packages/biz')
| -rw-r--r-- | catalog/packages/biz/vnf_package.py | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py index 6dec204..1073879 100644 --- a/catalog/packages/biz/vnf_package.py +++ b/catalog/packages/biz/vnf_package.py @@ -25,7 +25,7 @@ import zipfile from catalog.packages import const from catalog.packages.biz.common import parse_file_range, read, save from catalog.packages.biz.notificationsutil import PkgNotifications -from catalog.pub.config.config import CATALOG_ROOT_PATH +from catalog.pub.config.config import CATALOG_ROOT_PATH, MSB_SERVICE_IP, MSB_SERVICE_PORT from catalog.pub.database.models import VnfPackageModel, NSPackageModel from catalog.pub.exceptions import CatalogException, ResourceNotFoundException from catalog.pub.utils import fileutil, toscaparser @@ -279,6 +279,21 @@ def fill_artifacts_data(vnf_pkg_id): } for artifact in artifacts] +def fill_links(pkg_id, is_onboarded=False): + self_href = "http://%s:%s/api/vnfpkgm/v1/vnf_packages/%s" % ( + MSB_SERVICE_IP, + MSB_SERVICE_PORT, + pkg_id) + links = { + "self": {"href": self_href}, + "vnfd": {"href": "%s/%s" % (self_href, "vnfd")}, + "packageContent": {"href": "%s/%s" % (self_href, "package_content")} + } + if not is_onboarded: + links.pop("vnfd") + return links + + def fill_response_data(nf_pkg): pkg_info = {} pkg_info["id"] = nf_pkg.vnfPackageId @@ -295,7 +310,7 @@ def fill_response_data(nf_pkg): pkg_info["usageState"] = nf_pkg.usageState if nf_pkg.userDefinedData: pkg_info["userDefinedData"] = json.JSONDecoder().decode(nf_pkg.userDefinedData) - pkg_info["_links"] = None # TODO + pkg_info["_links"] = fill_links(nf_pkg.vnfPackageId, True) return pkg_info |