projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move 'launchpad' directory to 'RIFT_VAR_ROOT' from 'RIFT_ARTIFACTS'
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwvnfm
/
rift
/
tasklets
/
rwvnfmtasklet
/
rwvnfmtasklet.py
diff --git
a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
index
2cbe240
..
d378c92
100755
(executable)
--- 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 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()
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]
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:
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:
if os.path.exists(vnfd_dir):
shutil.rmtree(vnfd_dir, ignore_errors=True)
except Exception as e: