X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fapi.py;h=857c3a94b150bb4a9a8e11028fab45c38c8c0a64;hb=46ad7c172411214c5432ed93fda4271288077447;hp=2ceb82d0f3b4e3160a6e2d022b8c30c96e524674;hpb=0b8b410f563039cfc8879631bcb2587974de7875;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/pub/vimapi/api.py b/lcm/lcm/pub/vimapi/api.py
index 2ceb82d0..857c3a94 100644
--- a/lcm/lcm/pub/vimapi/api.py
+++ b/lcm/lcm/pub/vimapi/api.py
@@ -13,26 +13,35 @@
 # 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=''):
-    if data and not isinstance(data, (str, unicode)):
+    if data and not isinstance(data, str):
         data = json.JSONEncoder().encode(data)
     url_fmt = "{base_url}/{vim_id}{tenant_id}/{res}"
     url = url_fmt.format(base_url=VIM_DRIVER_BASE_URL,
                          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):
@@ -150,6 +162,25 @@ def list_vm(vim_id, tenant_id):
 def action_vm(vim_id, tenant_id, vm_id, data):
     return call(vim_id, tenant_id, "servers/%s/action" % vm_id, "POST", data)
 
+
+# List port interfaces, show port interface details of the given server.
+# Create a port interface and uses it to attach a port to the given server,
+# detach a port interface from the given server
+def list_vm_port(vim_id, tenant_id, vm_id):
+    return call(vim_id, tenant_id, "servers/%s/os-interface" % vm_id, "GET")
+
+
+def create_vm_port(vim_id, tenant_id, vm_id, data):
+    return call(vim_id, tenant_id, "servers/%s/os-interface" % vm_id, "POST", data)
+
+
+def get_vm_port(vim_id, tenant_id, vm_id, port_id):
+    return call(vim_id, tenant_id, "servers/%s/os-interface/%s" % (vm_id, port_id), "GET")
+
+
+def delete_vm_port(vim_id, tenant_id, vm_id, port_id):
+    return call(vim_id, tenant_id, "servers/%s/os-interface/%s" % (vm_id, port_id), "DELETE")
+
 ######################################################################