X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=nfvo.py;h=3708edd049263a47225b9762ce828f4b3df2ddf7;hb=7e0e9c65bbe47c3c4dc784c7b33eac90bc2fde91;hp=1a301509436442872d8b7c68e641c1a08d138739;hpb=3fbff9b6666ea4981e953c98d236b54fb86c583b;p=osm%2FRO.git diff --git a/nfvo.py b/nfvo.py index 1a301509..3708edd0 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):