Add Lock for create port

[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 1679a56..ba84442 100644 (file)
--- a/lcm/lcm/pub/vimapi/api.py
+++ b/lcm/lcm/pub/vimapi/api.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import time
 from multiprocessing import Lock
 
 from lcm.pub.msapi.aai import delete_aai_flavor
@@ -22,6 +23,7 @@ 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=''):
@@ -32,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 {}
 
 ######################################################################
 
@@ -97,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):