diff options
Diffstat (limited to 'lcm')
| -rw-r--r-- | lcm/lcm/pub/vimapi/adaptor.py | 2 | ||||
| -rw-r--r-- | lcm/lcm/pub/vimapi/api.py | 26 |
2 files changed, 20 insertions, 8 deletions
diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index c84c4a7f..bc71aac7 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -401,7 +401,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): while retry_count < max_retry_count: vm_info = api.get_vm(vim_id, tenant_id, vm_id) if vm_info["status"].upper() == "ACTIVE": - logger.debug("Vm(%s) is active", vim_id) + logger.debug("Vm(%s) is active", vm_id) return if vm_info["status"].upper() == "ERROR": opt_vm_status = vm_info["status"] diff --git a/lcm/lcm/pub/vimapi/api.py b/lcm/lcm/pub/vimapi/api.py index 2ceb82d0..ba84442f 100644 --- a/lcm/lcm/pub/vimapi/api.py +++ b/lcm/lcm/pub/vimapi/api.py @@ -13,12 +13,17 @@ # limitations under the License. import json +import time +from multiprocessing import Lock from lcm.pub.msapi.aai import delete_aai_flavor from lcm.pub.utils.restcall import req_by_msb from .exceptions import VimException VIM_DRIVER_BASE_URL = "api/multicloud/v0" +MUTEX_NET = Lock() +MUTEX_SUBNET = Lock() +MUTEX_PORT = Lock() def call(vim_id, tenant_id, res, method, data=''): @@ -29,10 +34,14 @@ def call(vim_id, tenant_id, res, method, data=''): vim_id=vim_id, tenant_id="/" + tenant_id if tenant_id else "", res=res) - ret = req_by_msb(url, method, data) - if ret[0] > 0: - raise VimException(ret[1], ret[2]) - return json.JSONDecoder().decode(ret[1]) if ret[1] else {} + for i in range(10): + ret = req_by_msb(url, method, data) + if ret[0] > 0: + if ret[2] == '409' and "InUse" in ret[1] and method == "DELETE": + time.sleep(5) + continue + raise VimException(ret[1], ret[2]) + return json.JSONDecoder().decode(ret[1]) if ret[1] else {} ###################################################################### @@ -56,7 +65,8 @@ def list_image(vim_id, tenant_id): def create_network(vim_id, tenant_id, data): - return call(vim_id, tenant_id, "networks", "POST", data) + with MUTEX_NET: + return call(vim_id, tenant_id, "networks", "POST", data) def delete_network(vim_id, tenant_id, network_id): @@ -74,7 +84,8 @@ def list_network(vim_id, tenant_id): def create_subnet(vim_id, tenant_id, data): - return call(vim_id, tenant_id, "subnets", "POST", data) + with MUTEX_SUBNET: + return call(vim_id, tenant_id, "subnets", "POST", data) def delete_subnet(vim_id, tenant_id, subnet_id): @@ -92,7 +103,8 @@ def list_subnet(vim_id, tenant_id): def create_port(vim_id, tenant_id, data): - return call(vim_id, tenant_id, "ports", "POST", data) + with MUTEX_PORT: + return call(vim_id, tenant_id, "ports", "POST", data) def delete_port(vim_id, tenant_id, port_id): |