From c5651795c9b7fc6782fa666a27351c2aae52c08f Mon Sep 17 00:00:00 2001 From: tierno Date: Mon, 27 Mar 2017 10:50:43 +0200 Subject: [PATCH] fix issue at stopping service when it has not been started Change-Id: Ie56b940d5a5b4e7d38fa85e9921ea39a66ec0469 Signed-off-by: tierno --- nfvo.py | 6 +++++- openmanod.py | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nfvo.py b/nfvo.py index 7230a50b..0b7e6d0d 100644 --- a/nfvo.py +++ b/nfvo.py @@ -52,7 +52,7 @@ global default_volume_size default_volume_size = '5' #size in GB global ovim ovim = None - +global_config = None vimconn_imported = {} # dictionary with VIM type as key, loaded module as value vim_threads = {"running":{}, "deleting": {}, "names": []} # threads running for attached-VIMs @@ -184,12 +184,16 @@ def start_service(mydb): raise NfvoException(str(e) + " at nfvo.get_vim", e.http_code) def stop_service(): + global ovim, global_config if ovim: ovim.stop_service() for thread_id,thread in vim_threads["running"].items(): thread.insert_task(new_task("exit", None, store=False)) vim_threads["deleting"][thread_id] = thread vim_threads["running"] = {} + if global_config and global_config.get("console_thread"): + for thread in global_config["console_thread"]: + thread.terminate = True def get_flavorlist(mydb, vnf_id, nfvo_tenant=None): diff --git a/openmanod.py b/openmanod.py index 4ac475db..ee9b8621 100755 --- a/openmanod.py +++ b/openmanod.py @@ -316,6 +316,4 @@ if __name__=="__main__": nfvo.stop_service() if httpthread: httpthread.join(1) - for thread in global_config["console_thread"]: - thread.terminate = True -- 2.17.1