X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fservice%2Fhandlers.py;h=0665cf2a378fff1e46f5499151a732d018152bd1;hb=refs%2Fchanges%2F24%2F7524%2F1;hp=d68b295d1bc9044b13ba39c16774df9f7451de2a;hpb=44f01a560347914798d8f913696d0e495ee076f8;p=pti%2Fo2.git diff --git a/o2app/service/handlers.py b/o2app/service/handlers.py index d68b295..0665cf2 100644 --- a/o2app/service/handlers.py +++ b/o2app/service/handlers.py @@ -14,8 +14,8 @@ # pylint: disable=unused-argument from __future__ import annotations -from o2dms.service.nfdeployment_handler import install_nfdeployment -from o2dms.service.nfdeployment_handler import publish_nfdeployment_created + +from o2dms.service import nfdeployment_handler # from dataclasses import asdict from typing import List, Dict, Callable, Type # TYPE_CHECKING @@ -27,6 +27,8 @@ from o2ims.service.auditor import ocloud_handler, dms_handler, \ resourcepool_handler, pserver_handler, pserver_cpu_handler, \ pserver_mem_handler, pserver_port_handler, pserver_if_handler,\ pserver_eth_handler +from o2ims.service.event import notify_handler, ocloud_event, \ + resource_event, resource_pool_event # if TYPE_CHECKING: # from . import unit_of_work @@ -37,8 +39,22 @@ class InvalidResourceType(Exception): EVENT_HANDLERS = { - o2dms_events.NfDeploymentCreated: [publish_nfdeployment_created] -} + o2dms_events.NfDeploymentStateChanged: [ + nfdeployment_handler.publish_nfdeployment_state_change + ], + # o2dms_events.NfDeploymentCreated: [ + # nfdeployment_handler.publish_nfdeployment_created], + # o2dms_events.NfDeploymentInstalled: [ + # nfdeployment_handler.publish_nfdeployment_installed], + # o2dms_events.NfDeploymentUninstalling: [ + # nfdeployment_handler.publish_nfdeployment_uninstalling], + # o2dms_events.NfDeploymentUninstalled: [ + # nfdeployment_handler.publish_nfdeployment_uninstalled] + events.OcloudChanged: [ocloud_event.notify_ocloud_update], + events.ResourceChanged: [resource_event.notify_resource_change], + events.ResourcePoolChanged: [resource_pool_event.\ + notify_resourcepool_change], +} # type: Dict[Type[events.Event], Callable] COMMAND_HANDLERS = { @@ -51,5 +67,13 @@ COMMAND_HANDLERS = { commands.UpdatePserverIf: pserver_if_handler.update_pserver_if, commands.UpdatePserverIfPort: pserver_port_handler.update_pserver_port, commands.UpdatePserverEth: pserver_eth_handler.update_pserver_eth, - o2dms_cmmands.InstallNfDeployment: install_nfdeployment + o2dms_cmmands.HandleNfDeploymentStateChanged: + nfdeployment_handler.handle_nfdeployment_statechanged, + o2dms_cmmands.InstallNfDeployment: + nfdeployment_handler.install_nfdeployment, + o2dms_cmmands.UninstallNfDeployment: + nfdeployment_handler.uninstall_nfdeployment, + o2dms_cmmands.DeleteNfDeployment: + nfdeployment_handler.delete_nfdeployment, + commands.PubMessage2SMO: notify_handler.notify_change_to_smo, } # type: Dict[Type[commands.Command], Callable]