X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rwlaunchpad%2Fplugins%2Frwvnfm%2Frift%2Ftasklets%2Frwvnfmtasklet%2Frwvnfmtasklet.py;h=d378c92ff2ea98d0a60d33c8dde2d2b3083db6d9;hb=da28246cbc7b0118355b94df11e8d0dca1590932;hp=2cbe240429ad9e4a9afb72c9afd47a8b2fd81892;hpb=e36fcf1de3aa198c2c931c591db3859c09941347;p=osm%2FSO.git

diff --git a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
index 2cbe2404..d378c92f 100755
--- a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
+++ b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
@@ -1417,9 +1417,6 @@ class VirtualNetworkFunctionRecord(object):
 
         if self._vnfr.vnf_configuration is not None:
             vnfr_msg.vnf_configuration.from_dict(self._vnfr.vnf_configuration.as_dict())
-            if (ip_address is not None and
-                    vnfr_msg.vnf_configuration.config_access.mgmt_ip_address is None):
-                vnfr_msg.vnf_configuration.config_access.mgmt_ip_address = ip_address
 
         for group in self._vnfr_msg.placement_groups_info:
             group_info = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_PlacementGroupsInfo()
@@ -2716,10 +2713,10 @@ class VnfManager(object):
 
             del self._vnfds_to_vnfr[vnfd_id]
 
-        # Remove any files uploaded with VNFD and stored under $RIFT_ARTIFACTS/libs/<id>
+        # Remove any files uploaded with VNFD and stored under $RIFT_VAR_ROOT/libs/<id>
         try:
-            rift_artifacts_dir = os.environ['RIFT_ARTIFACTS']
-            vnfd_dir = os.path.join(rift_artifacts_dir, 'launchpad/libs', vnfd_id)
+            rift_var_root_dir = os.environ['RIFT_VAR_ROOT']
+            vnfd_dir = os.path.join(rift_var_root_dir, 'launchpad/libs', vnfd_id)
             if os.path.exists(vnfd_dir):
                 shutil.rmtree(vnfd_dir, ignore_errors=True)
         except Exception as e: