RIFT-14562 Supprt of mngmt network overriding on VLDs

[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 e39a8ae..460b273 100755 (executable)
--- a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
+++ b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
@@ -855,7 +855,6 @@ class VirtualDeploymentUnitRecord(object):
             if (query_action == rwdts.QueryAction.UPDATE or
                     query_action == rwdts.QueryAction.CREATE):
                 self._vm_resp = msg
-
                 if msg.resource_state == "active":
                     # Move this VDU to ready state
                     yield from self.vdu_is_active()
@@ -867,7 +866,6 @@ class VirtualDeploymentUnitRecord(object):
                 raise NotImplementedError(
                     "%s action on VirtualDeployementUnitRecord not supported",
                     query_action)
-
             xact_info.respond_xpath(rwdts.XactRspCode.ACK)
 
         try:
@@ -885,7 +883,6 @@ class VirtualDeploymentUnitRecord(object):
 
             vm_resp = yield from self.create_resource(xact, vnfr, config)
             self._vm_resp = vm_resp
-
             self._state = VDURecordState.RESOURCE_ALLOC_PENDING
             self._log.debug("Requested VM from resource manager response %s",
                             vm_resp)
@@ -1260,7 +1257,6 @@ class VirtualNetworkFunctionRecord(object):
 
         mgmt_intf = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_MgmtInterface()
         ip_address, port = self.mgmt_intf_info()
-
         if ip_address is not None:
             mgmt_intf.ip_address = ip_address
         if port is not None:
@@ -2478,7 +2474,7 @@ class VnfManager(object):
         # network
         for vld in nsr_obj.nsd.vld:
             if vld.mgmt_network:
-                return vld.name
+                return vld.vim_network_name
 
         return None