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

diff --git a/lcm/lcm/pub/vimapi/api.py b/lcm/lcm/pub/vimapi/api.py
index 00a8735e..857c3a94 100644
--- a/lcm/lcm/pub/vimapi/api.py
+++ b/lcm/lcm/pub/vimapi/api.py
@@ -12,112 +12,198 @@
 # See the License for the specific language governing permissions and
 # 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 = "openoapi/vimdriver/v1"
+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):
+        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)
+    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 {}
+
+######################################################################
+
+
+def create_image(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "images", "POST", data)
+
+
+def delete_image(vim_id, tenant_id, image_id):
+    return call(vim_id, tenant_id, "images/%s" % image_id, "DELETE")
+
 
-def call(vim_id, res, method, data=''):
-    url = "%/%s/%s" % (VIM_DRIVER_BASE_URL, vim_id, 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 {}
+def get_image(vim_id, tenant_id, image_id):
+    return call(vim_id, tenant_id, "images/%s" % image_id, "GET")
+
+
+def list_image(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "images", "GET")
 
 ######################################################################
 
-def create_image(vim_id, data):
-    return call(vim_id, "images", "POST", data)
 
-def delete_image(vim_id, image_id):
-    return call(vim_id, "images/%s" % image_id, "DELETE")
-    
-def get_image(vim_id, image_id):
-    return call(vim_id, "images/%s" % image_id, "GET")
-    
-def list_image(vim_id):
-    return call(vim_id, "images", "GET")
+def create_network(vim_id, tenant_id, data):
+    with MUTEX_NET:
+        return call(vim_id, tenant_id, "networks", "POST", data)
+
+
+def delete_network(vim_id, tenant_id, network_id):
+    return call(vim_id, tenant_id, "networks/%s" % network_id, "DELETE")
+
+
+def get_network(vim_id, tenant_id, network_id):
+    return call(vim_id, tenant_id, "networks/%s" % network_id, "GET")
+
+
+def list_network(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "networks", "GET")
 
 ######################################################################
 
-def create_network(vim_id, data):
-    return call(vim_id, "networks", "POST", data)
 
-def delete_network(vim_id, network_id):
-    return call(vim_id, "networks/%s" % network_id, "DELETE")
-    
-def get_network(vim_id, network_id):
-    return call(vim_id, "networks/%s" % network_id, "GET")
-    
-def list_network(vim_id):
-    return call(vim_id, "networks", "GET")
+def create_subnet(vim_id, tenant_id, data):
+    with MUTEX_SUBNET:
+        return call(vim_id, tenant_id, "subnets", "POST", data)
+
+
+def delete_subnet(vim_id, tenant_id, subnet_id):
+    return call(vim_id, tenant_id, "subnets/%s" % subnet_id, "DELETE")
+
+
+def get_subnet(vim_id, tenant_id, subnet_id):
+    return call(vim_id, tenant_id, "subnets/%s" % subnet_id, "GET")
+
+
+def list_subnet(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "subnets", "GET")
 
 ######################################################################
 
-def create_subnet(vim_id, data):
-    return call(vim_id, "subnets", "POST", data)
 
-def delete_subnet(vim_id, subnet_id):
-    return call(vim_id, "subnets/%s" % subnet_id, "DELETE")
-    
-def get_subnet(vim_id, subnet_id):
-    return call(vim_id, "subnets/%s" % subnet_id, "GET")
-    
-def list_subnet(vim_id):
-    return call(vim_id, "subnets", "GET")
+def create_port(vim_id, tenant_id, data):
+    with MUTEX_PORT:
+        return call(vim_id, tenant_id, "ports", "POST", data)
+
+
+def delete_port(vim_id, tenant_id, port_id):
+    return call(vim_id, tenant_id, "ports/%s" % port_id, "DELETE")
+
+
+def get_port(vim_id, tenant_id, port_id):
+    return call(vim_id, tenant_id, "ports/%s" % port_id, "GET")
+
+
+def list_port(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "ports", "GET")
 
 ######################################################################
 
-def create_port(vim_id, data):
-    return call(vim_id, "ports", "POST", data)
 
-def delete_port(vim_id, port_id):
-    return call(vim_id, "ports/%s" % port_id, "DELETE")
-    
-def get_port(vim_id, port_id):
-    return call(vim_id, "ports/%s" % port_id, "GET")
-    
-def list_port(vim_id):
-    return call(vim_id, "ports", "GET")
+def create_flavor(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "flavors", "POST", data)
+
+
+def delete_flavor(vim_id, tenant_id, flavor_id):
+    # first delete aai register info
+    ret = delete_aai_flavor(vim_id, tenant_id, flavor_id)
+    if ret:
+        return call(vim_id, tenant_id, "flavors/%s" % flavor_id, "DELETE")
+
+
+def get_flavor(vim_id, tenant_id, flavor_id):
+    return call(vim_id, tenant_id, "flavors/%s" % flavor_id, "GET")
+
+
+def list_flavor(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "flavors", "GET")
 
 ######################################################################
 
-def create_flavor(vim_id, data):
-    return call(vim_id, "flavors", "POST", data)
 
-def delete_flavor(vim_id, flavor_id):
-    return call(vim_id, "flavors/%s" % flavor_id, "DELETE")
-    
-def get_flavor(vim_id, flavor_id):
-    return call(vim_id, "flavors/%s" % flavor_id, "GET")
-    
-def list_flavor(vim_id):
-    return call(vim_id, "flavors", "GET")
+def create_vm(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "servers", "POST", data)
+
+
+def delete_vm(vim_id, tenant_id, vm_id):
+    return call(vim_id, tenant_id, "servers/%s" % vm_id, "DELETE")
+
+
+def get_vm(vim_id, tenant_id, vm_id):
+    return call(vim_id, tenant_id, "servers/%s" % vm_id, "GET")
+
+
+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)
+
+
+# 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")
 
 ######################################################################
 
-def create_vm(vim_id, data):
-    return call(vim_id, "vms", "POST", data)
 
-def delete_vm(vim_id, vm_id):
-    return call(vim_id, "vms/%s" % vm_id, "DELETE")
-    
-def get_vm(vim_id, vm_id):
-    return call(vim_id, "vms/%s" % vm_id, "GET")
-    
-def list_vm(vim_id):
-    return call(vim_id, "vms", "GET")
+def create_volume(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "volumes", "POST", data)
+
+
+def delete_volume(vim_id, tenant_id, volume_id):
+    return call(vim_id, tenant_id, "volumes/%s" % volume_id, "DELETE")
+
+
+def get_volume(vim_id, tenant_id, volume_id):
+    return call(vim_id, tenant_id, "volumes/%s" % volume_id, "GET")
+
+
+def list_volume(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "volumes", "GET")
 
 ######################################################################
 
-def create_volume(vim_id, data):
-    return call(vim_id, "volumes", "POST", data)
-
-def delete_volume(vim_id, volume_id):
-    return call(vim_id, "volumes/%s" % volume_id, "DELETE")
-    
-def get_volume(vim_id, volume_id):
-    return call(vim_id, "volumes/%s" % volume_id, "GET")
-    
-def list_volume(vim_id):
-    return call(vim_id, "volumes", "GET")
+
+def list_tenant(vim_id, tenant_name=""):
+    res = "tenants"
+    if tenant_name:
+        res = "%s?name=%s" % (res, tenant_name)
+    return call(vim_id, "", res, "GET")