X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fvimapi%2Fapi.py;h=721ab70180e68ef9ccead3fc41693d924d334187;hb=e724ea16cd75c295caf04e416578ebcef68f2d82;hp=15229ed61ad09a5e1f1912ec5fab977094aa4aa2;hpb=665ab553e8c09fa35c46a9fe3e5e773af5df7f43;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/pub/vimapi/api.py b/lcm/lcm/pub/vimapi/api.py
index 15229ed6..721ab701 100644
--- a/lcm/lcm/pub/vimapi/api.py
+++ b/lcm/lcm/pub/vimapi/api.py
@@ -17,12 +17,16 @@ import json
 from lcm.pub.utils.restcall import req_by_msb
 from .exceptions import VimException
 
-VIM_DRIVER_BASE_URL = "openoapi/vimdriver/v1"
+VIM_DRIVER_BASE_URL = "openoapi/multivim/v1"
 
-def call(vim_id, res, method, data=''):
+def call(vim_id, tenant_id, res, method, data=''):
     if data and not isinstance(a, (str, unicode)):
         data = json.JSONEncoder().encode(data)
-    url = "%/%s/%s" % (VIM_DRIVER_BASE_URL, vim_id, res)
+    url = "{base_url}/{vim_id}{tenant_id}/{res}".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])
@@ -30,98 +34,106 @@ def call(vim_id, res, method, data=''):
 
 ######################################################################
 
-def create_image(vim_id, data):
-    return call(vim_id, "images", "POST", data)
+def create_image(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "images", "POST", data)
 
-def delete_image(vim_id, image_id):
-    return call(vim_id, "images/%s" % image_id, "DELETE")
+def delete_image(vim_id, tenant_id, image_id):
+    return call(vim_id, tenant_id, "images/%s" % image_id, "DELETE")
     
-def get_image(vim_id, image_id):
-    return call(vim_id, "images/%s" % image_id, "GET")
+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):
-    return call(vim_id, "images", "GET")
+def list_image(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "images", "GET")
 
 ######################################################################
 
-def create_network(vim_id, data):
-    return call(vim_id, "networks", "POST", data)
+def create_network(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "networks", "POST", data)
 
-def delete_network(vim_id, network_id):
-    return call(vim_id, "networks/%s" % network_id, "DELETE")
+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, network_id):
-    return call(vim_id, "networks/%s" % network_id, "GET")
+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):
-    return call(vim_id, "networks", "GET")
+def list_network(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "networks", "GET")
 
 ######################################################################
 
-def create_subnet(vim_id, data):
-    return call(vim_id, "subnets", "POST", data)
+def create_subnet(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "subnets", "POST", data)
 
-def delete_subnet(vim_id, subnet_id):
-    return call(vim_id, "subnets/%s" % subnet_id, "DELETE")
+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, subnet_id):
-    return call(vim_id, "subnets/%s" % subnet_id, "GET")
+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):
-    return call(vim_id, "subnets", "GET")
+def list_subnet(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "subnets", "GET")
 
 ######################################################################
 
-def create_port(vim_id, data):
-    return call(vim_id, "ports", "POST", data)
+def create_port(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "ports", "POST", data)
 
-def delete_port(vim_id, port_id):
-    return call(vim_id, "ports/%s" % port_id, "DELETE")
+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, port_id):
-    return call(vim_id, "ports/%s" % port_id, "GET")
+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):
-    return call(vim_id, "ports", "GET")
+def list_port(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "ports", "GET")
 
 ######################################################################
 
-def create_flavor(vim_id, data):
-    return call(vim_id, "flavors", "POST", data)
+def create_flavor(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "flavors", "POST", data)
 
-def delete_flavor(vim_id, flavor_id):
-    return call(vim_id, "flavors/%s" % flavor_id, "DELETE")
+def delete_flavor(vim_id, tenant_id, flavor_id):
+    return call(vim_id, tenant_id, "flavors/%s" % flavor_id, "DELETE")
     
-def get_flavor(vim_id, flavor_id):
-    return call(vim_id, "flavors/%s" % flavor_id, "GET")
+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):
-    return call(vim_id, "flavors", "GET")
+def list_flavor(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "flavors", "GET")
 
 ######################################################################
 
-def create_vm(vim_id, data):
-    return call(vim_id, "vms", "POST", data)
+def create_vm(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "vms", "POST", data)
 
-def delete_vm(vim_id, vm_id):
-    return call(vim_id, "vms/%s" % vm_id, "DELETE")
+def delete_vm(vim_id, tenant_id, vm_id):
+    return call(vim_id, tenant_id, "vms/%s" % vm_id, "DELETE")
     
-def get_vm(vim_id, vm_id):
-    return call(vim_id, "vms/%s" % vm_id, "GET")
+def get_vm(vim_id, tenant_id, vm_id):
+    return call(vim_id, tenant_id, "vms/%s" % vm_id, "GET")
     
-def list_vm(vim_id):
-    return call(vim_id, "vms", "GET")
+def list_vm(vim_id, tenant_id):
+    return call(vim_id, tenant_id, "vms", "GET")
 
 ######################################################################
 
-def create_volume(vim_id, data):
-    return call(vim_id, "volumes", "POST", data)
+def create_volume(vim_id, tenant_id, data):
+    return call(vim_id, tenant_id, "volumes", "POST", data)
 
-def delete_volume(vim_id, volume_id):
-    return call(vim_id, "volumes/%s" % volume_id, "DELETE")
+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, volume_id):
-    return call(vim_id, "volumes/%s" % volume_id, "GET")
+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):
-    return call(vim_id, "volumes", "GET")
+def list_volume(vim_id, tenant_id):
+    return call(vim_id, tenant_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")