Add retry when delete vim res failed

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / vimapi / api.py

diff --git a/lcm/lcm/pub/vimapi/api.py b/lcm/lcm/pub/vimapi/api.py
index 0090d66..b46bbf4 100644 (file)
--- a/lcm/lcm/pub/vimapi/api.py
+++ b/lcm/lcm/pub/vimapi/api.py
@@ -13,12 +13,16 @@
 # 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()
 
 
 def call(vim_id, tenant_id, res, method, data=''):
@@ -29,10 +33,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 +64,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 +83,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):
@@ -145,6 +155,11 @@ def get_vm(vim_id, tenant_id, vm_id):
 def list_vm(vim_id, tenant_id):
     return call(vim_id, tenant_id, "servers", "GET")
 
+
+# Used to start/stop/restart a vm
+def action_vm(vim_id, tenant_id, vm_id, data):
+    return call(vim_id, tenant_id, "servers/%s/action" % vm_id, "POST", data)
+
 ######################################################################