X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fvim_thread.py;h=7b197dac54858ac90fa2a6acb3a0641f8c3c0b41;hb=611fcfcd04af61cf083354da583a22bdeabcb9ea;hp=44c6ea10845142c2a9a529bff62580211599cc2d;hpb=c26cf291fc97d49224c85822e566b795c9692f14;p=osm%2FRO.git diff --git a/osm_ro/vim_thread.py b/osm_ro/vim_thread.py index 44c6ea10..7b197dac 100644 --- a/osm_ro/vim_thread.py +++ b/osm_ro/vim_thread.py @@ -87,6 +87,7 @@ import vimconn_opennebula import vimconn_openstack import vimconn_vmware import vimconn_fos +import vimconn_azure import yaml from db_base import db_base_Exception from lib_osm_openvim.ovim import ovimException @@ -101,7 +102,8 @@ vim_module = { "opennebula": vimconn_opennebula, "openstack": vimconn_openstack, "vmware": vimconn_vmware, - "fos": vimconn_fos + "fos": vimconn_fos, + "azure": vimconn_azure, } @@ -705,9 +707,12 @@ class vim_thread(threading.Thread): UPDATE={("number_failed" if task["status"] == "FAILED" else "number_done"): {"INCREMENT": 1}}, WHERE={"uuid": task["instance_action_id"]}) if database_update: + where_filter = {"related": task["related"]} + if task["item"] == "instance_nets" and task["datacenter_vim_id"]: + where_filter["datacenter_tenant_id"] = task["datacenter_vim_id"] self.db.update_rows(table=task["item"], UPDATE=database_update, - WHERE={"related": task["related"]}) + WHERE=where_filter) except db_base_Exception as e: self.logger.error("task={} Error updating database {}".format(task_id, e), exc_info=True)