X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns_thread.py;h=2b9d8cf8b6df9d54fc27cd9b61cbf672f39828be;hb=29712418a90f80aee5042bb605f1c4c394a92c6a;hp=bca21e0cbdd814217ce2276ea46c6cc8c33e8785;hpb=df48655ed39c3b5202289bcc84cd1618ce5464af;p=osm%2FRO.git diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py index bca21e0c..2b9d8cf8 100644 --- a/NG-RO/osm_ng_ro/ns_thread.py +++ b/NG-RO/osm_ng_ro/ns_thread.py @@ -285,9 +285,11 @@ class VimInteractionNet(VimInteractionBase): ro_task["target_id"], vim_id, ro_vim_item_update.get("vim_status"), - ro_vim_item_update.get("vim_message") - if ro_vim_item_update.get("vim_status") != "ACTIVE" - else "", + ( + ro_vim_item_update.get("vim_message") + if ro_vim_item_update.get("vim_status") != "ACTIVE" + else "" + ), ) ) @@ -969,9 +971,11 @@ class VimInteractionVdu(VimInteractionBase): ro_task["target_id"], vim_id, ro_vim_item_update.get("vim_status"), - ro_vim_item_update.get("vim_message") - if ro_vim_item_update.get("vim_status") != "ACTIVE" - else "", + ( + ro_vim_item_update.get("vim_message") + if ro_vim_item_update.get("vim_status") != "ACTIVE" + else "" + ), ) ) @@ -1635,9 +1639,9 @@ class VimInteractionSdnNet(VimInteractionBase): new_port = { "service_endpoint_id": pmap.get("service_endpoint_id") or service_endpoint_id, - "service_endpoint_encapsulation_type": "dot1q" - if port["type"] == "SR-IOV" - else None, + "service_endpoint_encapsulation_type": ( + "dot1q" if port["type"] == "SR-IOV" else None + ), "service_endpoint_encapsulation_info": { "vlan": port.get("vlan"), "mac": port.get("mac-address"), @@ -2183,9 +2187,7 @@ class NsWorker(threading.Thread): target_database = ( "vim_accounts" if target == "vim" - else "wim_accounts" - if target == "wim" - else "sdns" + else "wim_accounts" if target == "wim" else "sdns" ) error_text = "" @@ -2291,9 +2293,7 @@ class NsWorker(threading.Thread): target_database = ( "vim_accounts" if target == "vim" - else "wim_accounts" - if target == "wim" - else "sdns" + else "wim_accounts" if target == "wim" else "sdns" ) plugin_name = "" vim = None @@ -2474,9 +2474,9 @@ class NsWorker(threading.Thread): and task["action"] == "CREATE" ): # set to finished - db_update["tasks.{}.status".format(index)] = task[ - "status" - ] = "FINISHED" + db_update["tasks.{}.status".format(index)] = task["status"] = ( + "FINISHED" + ) elif task["action"] == "CREATE" and task["status"] not in ( "FINISHED", "SUPERSEDED", @@ -2789,9 +2789,9 @@ class NsWorker(threading.Thread): task_depends[dependency_task_id] = dependency_ro_task[ "vim_info" ]["vim_id"] - task_depends[ - "TASK-{}".format(dependency_task_id) - ] = dependency_ro_task["vim_info"]["vim_id"] + task_depends["TASK-{}".format(dependency_task_id)] = ( + dependency_ro_task["vim_info"]["vim_id"] + ) if dependency_not_completed: self.logger.warning(