From: Jithin Jose Date: Wed, 22 Mar 2017 06:19:57 +0000 (-0400) Subject: Removed unused scaling rpc handler code X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F46%2F1346%2F1;p=osm%2FSO.git Removed unused scaling rpc handler code Signed-off-by: Jithin Jose --- diff --git a/models/plugins/yang/nsr.yang b/models/plugins/yang/nsr.yang index 97c32dee..365387fc 100644 --- a/models/plugins/yang/nsr.yang +++ b/models/plugins/yang/nsr.yang @@ -1404,67 +1404,4 @@ module nsr } } - rpc exec-scale-in { - description "Executes scale out request"; - - input { - - leaf nsr-id-ref { - description "Reference to NSR ID ref"; - type leafref { - path "/nsr:ns-instance-config/nsr:nsr/nsr:id"; - } - } - - leaf scaling-group-name-ref { - description "name of the scaling group"; - type string; - } - - leaf instance-id { - description "id of the scaling group"; - type uint64; - } - - - } - output { - leaf instance-id { - description "id of the scaling group"; - type uint64; - } - } - } - - rpc exec-scale-out { - description "Executes scale out request"; - - input { - - leaf nsr-id-ref { - description "Reference to NSR ID ref"; - type leafref { - path "/nsr:ns-instance-config/nsr:nsr/nsr:id"; - } - } - - leaf scaling-group-name-ref { - description "name of the scaling group"; - type string; - } - - leaf instance-id { - description "id of the scaling group"; - type uint64; - } - - } - output { - leaf instance-id { - description "id of the scaling group"; - type uint64; - } - } - } - } diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py index da9807a6..b78a279b 100755 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py @@ -3641,7 +3641,6 @@ class NsManager(object): VnfrDtsHandler(dts, log, loop, self), NsdRefCountDtsHandler(dts, log, loop, self), NsrDtsHandler(dts, log, loop, self), - ScalingRpcHandler(log, dts, loop, self.scale_rpc_callback), NsrRpcDtsHandler(dts,log,loop,self), self._vnfd_dts_handler, self.cfgmgr_obj, @@ -3750,74 +3749,6 @@ class NsManager(object): self._loop.create_task(nsr.delete_scale_group_instance(scale_group_name, instance_id)) - def scale_rpc_callback(self, xact, msg, action): - """Callback handler for RPC calls - Args: - xact : Transaction Handler - msg : RPC input - action : Scaling Action - """ - ScalingGroupInstance = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup_Instance - ScalingGroup = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup - - xpath = ('C,/nsr:ns-instance-config/nsr:nsr[nsr:id="{}"]').format( - msg.nsr_id_ref) - instance = ScalingGroupInstance.from_dict({"id": msg.instance_id}) - - @asyncio.coroutine - def get_nsr_scaling_group(): - results = yield from self._dts.query_read(xpath, rwdts.XactFlag.MERGE) - - for result in results: - res = yield from result - nsr_config = res.result - - for scaling_group in nsr_config.scaling_group: - if scaling_group.scaling_group_name_ref == msg.scaling_group_name_ref: - break - else: - scaling_group = nsr_config.scaling_group.add() - scaling_group.scaling_group_name_ref = msg.scaling_group_name_ref - - return (nsr_config, scaling_group) - - @asyncio.coroutine - def update_config(nsr_config): - xml = self._ncclient.convert_to_xml(RwNsrYang, nsr_config) - xml = '{}'.format(xml) - yield from self._ncclient.connect() - yield from self._ncclient.manager.edit_config(target="running", config=xml, default_operation="replace") - - @asyncio.coroutine - def scale_out(): - nsr_config, scaling_group = yield from get_nsr_scaling_group() - scaling_group.instance.append(instance) - yield from update_config(nsr_config) - - @asyncio.coroutine - def scale_in(): - nsr_config, scaling_group = yield from get_nsr_scaling_group() - scaling_group.instance.remove(instance) - yield from update_config(nsr_config) - - if action == ScalingRpcHandler.ACTION.SCALE_OUT: - self._loop.create_task(scale_out()) - else: - self._loop.create_task(scale_in()) - - # Opdata based calls, disabled for now! - # if action == ScalingRpcHandler.ACTION.SCALE_OUT: - # self.scale_nsr_out( - # msg.nsr_id_ref, - # msg.scaling_group_name_ref, - # msg.instance_id, - # xact) - # else: - # self.scale_nsr_in( - # msg.nsr_id_ref, - # msg.scaling_group_name_ref, - # msg.instance_id) - def nsr_update_cfg(self, nsr_id, msg): nsr = self._nsrs[nsr_id] nsr.nsr_cfg_msg= msg @@ -4191,91 +4122,6 @@ class NsmRecordsPublisherProxy(object): path = VirtualLinkRecord.vlr_xpath(vlr) return (yield from self._vlr_pub_hdlr.delete(xact, path)) - -class ScalingRpcHandler(mano_dts.DtsHandler): - """ The Network service Monitor DTS handler """ - SCALE_IN_INPUT_XPATH = "I,/nsr:exec-scale-in" - SCALE_IN_OUTPUT_XPATH = "O,/nsr:exec-scale-in" - - SCALE_OUT_INPUT_XPATH = "I,/nsr:exec-scale-out" - SCALE_OUT_OUTPUT_XPATH = "O,/nsr:exec-scale-out" - - ACTION = Enum('ACTION', 'SCALE_IN SCALE_OUT') - - def __init__(self, log, dts, loop, callback=None): - super().__init__(log, dts, loop) - self.callback = callback - self.last_instance_id = defaultdict(int) - - @asyncio.coroutine - def register(self): - - @asyncio.coroutine - def on_scale_in_prepare(xact_info, action, ks_path, msg): - assert action == rwdts.QueryAction.RPC - - try: - if self.callback: - self.callback(xact_info.xact, msg, self.ACTION.SCALE_IN) - - rpc_op = NsrYang.YangOutput_Nsr_ExecScaleIn.from_dict({ - "instance_id": msg.instance_id}) - - xact_info.respond_xpath( - rwdts.XactRspCode.ACK, - self.__class__.SCALE_IN_OUTPUT_XPATH, - rpc_op) - - except Exception as e: - self.log.exception(e) - xact_info.respond_xpath( - rwdts.XactRspCode.NACK, - self.__class__.SCALE_IN_OUTPUT_XPATH) - - @asyncio.coroutine - def on_scale_out_prepare(xact_info, action, ks_path, msg): - assert action == rwdts.QueryAction.RPC - - try: - scaling_group = msg.scaling_group_name_ref - if not msg.instance_id: - last_instance_id = self.last_instance_id[scale_group] - msg.instance_id = last_instance_id + 1 - self.last_instance_id[scale_group] += 1 - - if self.callback: - self.callback(xact_info.xact, msg, self.ACTION.SCALE_OUT) - - rpc_op = NsrYang.YangOutput_Nsr_ExecScaleOut.from_dict({ - "instance_id": msg.instance_id}) - - xact_info.respond_xpath( - rwdts.XactRspCode.ACK, - self.__class__.SCALE_OUT_OUTPUT_XPATH, - rpc_op) - - except Exception as e: - self.log.exception(e) - xact_info.respond_xpath( - rwdts.XactRspCode.NACK, - self.__class__.SCALE_OUT_OUTPUT_XPATH) - - scale_in_hdl = rift.tasklets.DTS.RegistrationHandler( - on_prepare=on_scale_in_prepare) - scale_out_hdl = rift.tasklets.DTS.RegistrationHandler( - on_prepare=on_scale_out_prepare) - - with self.dts.group_create() as group: - group.register( - xpath=self.__class__.SCALE_IN_INPUT_XPATH, - handler=scale_in_hdl, - flags=rwdts.Flag.PUBLISHER) - group.register( - xpath=self.__class__.SCALE_OUT_INPUT_XPATH, - handler=scale_out_hdl, - flags=rwdts.Flag.PUBLISHER) - - class NsmTasklet(rift.tasklets.Tasklet): """ The network service manager tasklet