Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type rpc...

[osm/SO.git] / rwlaunchpad / plugins / rwpkgmgr / rift / tasklets / rwpkgmgr / downloader / url.py

diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
index 88155fa..6c49323 100644 (file)
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
@@ -71,7 +71,8 @@ class PackageFileDownloader(downloader.UrlDownloader):
         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):