X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Frwnsm%2Frift%2Ftasklets%2Frwnsmtasklet%2Fopenmano_nsm.py;h=0fcd905ee04fc86a4abd0ffcc59292570c67f98b;hb=f49375710db1acf3cd74c8651d098b7a08e8d0b2;hp=7133ea436b923ced91cea6648de0ba32ad266512;hpb=08effcd8c95f689ac84ffc40878980cf9e9f8497;p=osm%2FSO.git diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py index 7133ea43..0fcd905e 100644 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py @@ -102,7 +102,7 @@ class VnfrConsoleOperdataDtsHandler(object): ) if action == rwdts.QueryAction.READ: - schema = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur.schema() + schema = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur.schema() path_entry = schema.keyspec_to_entry(ks_path) try: @@ -118,7 +118,7 @@ class VnfrConsoleOperdataDtsHandler(object): self._nsr._nsr_uuid, self._vdur_id ) - vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur() + vdur_console = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur() vdur_console.id = self._vdur_id if console_url: vdur_console.console_url = console_url @@ -128,7 +128,7 @@ class VnfrConsoleOperdataDtsHandler(object): except openmano_client.InstanceStatusError as e: self._log.error("Could not get NS instance console URL: %s", str(e)) - vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur() + vdur_console = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur() vdur_console.id = self._vdur_id vdur_console.console_url = 'none' @@ -885,7 +885,7 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): def vnfr_uptime_update(self, vnfr): try: - vnfr_ = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.from_dict({'id': vnfr.id}) + vnfr_ = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.from_dict({'id': vnfr.id}) while True: vnfr_.uptime = int(time.time()) - vnfr._create_time yield from self._publisher.publish_vnfr(None, vnfr_) @@ -902,6 +902,7 @@ class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase): 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)