Merge "Bug 173 - Creation of additional networks in running NS does not publish VLRs"
diff --git a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
index 7779479..add6a29 100644
--- a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
+++ b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
@@ -326,15 +326,20 @@
if parameter.value:
val = self.xlate(parameter.value, vnfr['tags'])
# TBD do validation of the parameters
- data_type = 'string'
+ data_type = 'STRING'
found = False
for ca_param in config.parameter:
if ca_param.name == parameter.name:
data_type = ca_param.data_type
found = True
break
- if data_type == 'integer':
- val = int(parameter.value)
+ try:
+ if data_type == 'INTEGER':
+ tmp = int(val)
+ val = tmp
+ except Exception as e:
+ pass
+
if not found:
self._log.warn("jujuCA: Did not find parameter {} for {}".
format(parameter, config.name))
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index e009ba3..d53d701 100644
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
@@ -630,6 +630,13 @@
yield from self._publisher.publish_vnfr(None, vnfr_msg)
return
+ if (time.time() - start_time) > OpenmanoNsr.TIMEOUT_SECS:
+ self._log.error("NSR timed out before reaching running state")
+ self._state = OpenmanoNSRecordState.FAILED
+ vnfr_msg.operational_status = "failed"
+ yield from self._publisher.publish_vnfr(None, vnfr_msg)
+ return
+
if all_vms_active(vnf_status):
vnf_ip_address = get_vnf_ip_address(vnf_status)
vnf_mac_address = get_vnf_mac_address(vnf_status)
@@ -671,12 +678,6 @@
yield from self._publisher.publish_vnfr(None, vnfr_msg)
active_vnfs.append(vnfr)
- if (time.time() - start_time) > OpenmanoNsr.TIMEOUT_SECS:
- self._log.error("NSR timed out before reaching running state")
- self._state = OpenmanoNSRecordState.FAILED
- vnfr_msg.operational_status = "failed"
- yield from self._publisher.publish_vnfr(None, vnfr_msg)
- return
except Exception as e:
vnfr_msg.operational_status = "failed"
@@ -901,6 +902,7 @@
openmano_nsr = self._openmano_nsrs[nsr.id]
if openmano_nsr._state == OpenmanoNSRecordState.RUNNING:
yield from openmano_nsr.create_vlr(vlr)
+ yield from self._publisher.publish_vlr(None, vlr.vlr_msg)
else:
yield from openmano_nsr.add_vlr(vlr)