vfclcm upgrade from python2 to python3

[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..857c3a9 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,20 +23,25 @@ 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 {}
 
 ######################################################################
 
@@ -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):
@@ -155,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")
+
 ######################################################################