From: sinhan Date: Wed, 26 Apr 2017 18:42:43 +0000 (+0000) Subject: Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type rpc... X-Git-Tag: v2.0.1~23^2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c581c67eb7adccd40b66c8153b77fbebfe3e79e3;p=osm%2FSO.git Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type rpc param. Signed-off-by: sinhan --- c581c67eb7adccd40b66c8153b77fbebfe3e79e3 diff --cc rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py index d4956208,88155fa9..6c493238 --- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py +++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py @@@ -67,6 -71,7 +71,8 @@@ class PackageFileDownloader(downloader. self.package_id = package_id self.package_type = package_type self.package_path = package_path - self.package_file_type = vnfd_file_type.lower() if vnfd_file_type else nsd_file_type.lower() ++ self.package_file_type = vnfd_file_type.lower() \ ++ if package_type == 'VNFD' else nsd_file_type.lower() self.proxy = proxy def convert_to_yang(self): diff --cc rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py index a71f1085,dc0b27ad..56dd4049 --- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py +++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py @@@ -192,6 -192,8 +192,8 @@@ class PackageDeleteOperationsRpcHandler rpc_op = RPC_PACKAGE_DELETE_ENDPOINT.from_dict({"status": str(True)}) try: + package_file_type = msg.vnfd_file_type.lower() \ - if msg.vnfd_file_type else msg.nsd_file_type.lower() ++ if msg.package_type == 'VNFD' else msg.nsd_file_type.lower() self.proxy.package_file_delete( msg.package_type, msg.package_id,