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

Signed-off-by: sinhan <nandan.sinha@riftio.com>

diff --combined rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
index d495620,88155fa..6c49323
--- 1/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
--- 2/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
@@@ -38,6 -38,8 +38,8 @@@ class PackageFileDownloader(downloader.
              rpc_input.package_id,
              rpc_input.package_path,
              rpc_input.package_type,
+             rpc_input.vnfd_file_type, 
+             rpc_input.nsd_file_type,
              auth=auth,
              proxy=proxy,
              file_obj=file_obj,
@@@ -50,6 -52,8 +52,8 @@@
                   package_id,
                   package_path,
                   package_type,
+                  vnfd_file_type, 
+                  nsd_file_type,
                   proxy,
                   file_obj=None,
                   delete_on_fail=True,
@@@ -67,6 -71,7 +71,8 @@@
          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):
@@@ -106,7 -111,8 +112,8 @@@
                  self.meta.filepath,
                  self.package_type,
                  self.package_id,
-                 self.package_path)
+                 self.package_path, 
+                 self.package_file_type)
  
          except Exception as e:
              self.log.exception(e)

diff --combined rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
index a71f108,dc0b27a..56dd404
--- 1/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
--- 2/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
@@@ -192,10 -192,13 +192,13 @@@ class PackageDeleteOperationsRpcHandler
          rpc_op = RPC_PACKAGE_DELETE_ENDPOINT.from_dict({"status": str(True)})
  
          try:
 -                    if msg.vnfd_file_type else msg.nsd_file_type.lower()
+             package_file_type = msg.vnfd_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,
-                 msg.package_path)
+                 msg.package_path, 
+                 package_file_type)
          except Exception as e:
              self.log.exception(e)
              rpc_op.status = str(False)