From b755a690a44cc5ebb066701f710f161ee6ce3070 Mon Sep 17 00:00:00 2001 From: "raviteja.karumuri" Date: Mon, 14 Feb 2022 19:43:35 +0000 Subject: [PMSH] Exit Handler Update Issue-ID: DCAEGEN2-3084 Signed-off-by: Raviteja, Karumuri Change-Id: Iecda19e7dbac2c612ec72a1ec34f72fdd7ba143b --- .../pmsh_service/mod/exit_handler.py | 27 ++++++++++------------ .../pmsh_service/pmsh_service_main.py | 22 +++++------------- 2 files changed, 18 insertions(+), 31 deletions(-) (limited to 'components/pm-subscription-handler/pmsh_service') diff --git a/components/pm-subscription-handler/pmsh_service/mod/exit_handler.py b/components/pm-subscription-handler/pmsh_service/mod/exit_handler.py index 1ea83e59..16223790 100755 --- a/components/pm-subscription-handler/pmsh_service/mod/exit_handler.py +++ b/components/pm-subscription-handler/pmsh_service/mod/exit_handler.py @@ -1,5 +1,5 @@ # ============LICENSE_START=================================================== -# Copyright (C) 2020-2021 Nordix Foundation. +# Copyright (C) 2020-2022 Nordix Foundation. # ============================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ # ============LICENSE_END===================================================== from mod import logger, db +from mod.api.services import subscription_service, measurement_group_service from mod.subscription import AdministrativeState @@ -25,29 +26,25 @@ class ExitHandler: Args: periodic_tasks (List[PeriodicTask]): PeriodicTasks that needs to be cancelled. - app_conf (AppConfig): The PMSH Application Configuration. - subscription_handler (SubscriptionHandler): The subscription handler instance. """ shutdown_signal_received = False - def __init__(self, *, periodic_tasks, app_conf, subscription_handler): + def __init__(self, *, periodic_tasks): self.periodic_tasks = periodic_tasks - self.app_conf = app_conf - self.subscription_handler = subscription_handler def __call__(self, sig_num, frame): logger.info('Graceful shutdown of PMSH initiated.') logger.debug(f'ExitHandler was called with signal number: {sig_num}.') - self.subscription_handler.stop_aai_event_thread() - current_sub = self.app_conf.subscription - if current_sub.administrativeState == AdministrativeState.UNLOCKED.value: - try: - nfs = self.app_conf.subscription.get_network_functions() - current_sub.delete_subscription_from_nfs(nfs, self.subscription_handler.mr_pub, - self.app_conf) - except Exception as e: - logger.error(f'Failed to shut down PMSH application: {e}', exc_info=True) + try: + subscriptions_all = subscription_service.query_all_subscriptions() + for subscription in subscriptions_all: + for mg in subscription.measurement_groups: + if mg.administrative_state == AdministrativeState.UNLOCKED.value: + measurement_group_service.\ + update_admin_status(mg, AdministrativeState.LOCKED.value) + except Exception as e: + logger.error(f'Failed to shut down PMSH application: {e}', exc_info=True) for thread in self.periodic_tasks: logger.info(f'Cancelling thread {thread.name}') thread.cancel() diff --git a/components/pm-subscription-handler/pmsh_service/pmsh_service_main.py b/components/pm-subscription-handler/pmsh_service/pmsh_service_main.py index 1af01cf1..1d8b0b34 100755 --- a/components/pm-subscription-handler/pmsh_service/pmsh_service_main.py +++ b/components/pm-subscription-handler/pmsh_service/pmsh_service_main.py @@ -1,5 +1,5 @@ # ============LICENSE_START=================================================== -# Copyright (C) 2019-2021 Nordix Foundation. +# Copyright (C) 2019-2022 Nordix Foundation. # ============================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,10 +20,9 @@ from signal import signal, SIGTERM from mod.aai_event_handler import AAIEventHandler from mod import db, create_app, launch_api_server, logger from mod.exit_handler import ExitHandler -from mod.pmsh_config import AppConfig as NewAppConfig -from mod.pmsh_utils import AppConfig, PeriodicTask +from mod.pmsh_config import AppConfig +from mod.pmsh_utils import PeriodicTask from mod.policy_response_handler import PolicyResponseHandler -from mod.subscription_handler import SubscriptionHandler def main(): @@ -32,10 +31,7 @@ def main(): app = create_app() app.app_context().push() db.create_all(app=app) - app_conf = AppConfig() - pmsh_app_conf = NewAppConfig() - policy_mr_pub = app_conf.get_mr_pub('policy_pm_publisher') - aai_event_mr_sub = app_conf.get_mr_sub('aai_subscriber') + pmsh_app_conf = AppConfig() except Exception as e: logger.error(f'Failed to get config and create application: {e}', exc_info=True) sys.exit(e) @@ -46,20 +42,14 @@ def main(): logger.info('Start polling PMSH_CL_INPUT topic on DMaaP MR.') policy_response_handler_thread.start() - subscription_handler = SubscriptionHandler(policy_mr_pub, aai_event_mr_sub, app, app_conf) - subscription_handler_thread = PeriodicTask(20, subscription_handler.execute) - subscription_handler_thread.name = 'sub_handler_thread' - subscription_handler_thread.start() - aai_event_handler = AAIEventHandler(app) aai_event_handler_thread = PeriodicTask(20, aai_event_handler.execute) aai_event_handler_thread.name = 'aai_event_thread' aai_event_handler_thread.start() - periodic_tasks = [subscription_handler_thread, policy_response_handler_thread, + periodic_tasks = [policy_response_handler_thread, aai_event_handler_thread] - signal(SIGTERM, ExitHandler(periodic_tasks=periodic_tasks, - app_conf=app_conf, subscription_handler=subscription_handler)) + signal(SIGTERM, ExitHandler(periodic_tasks=periodic_tasks)) launch_api_server(pmsh_app_conf) except Exception as e: -- cgit 1.2.3-korg