Update report resoure code and other files

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / aaiapi / aai.py

diff --git a/lcm/lcm/pub/aaiapi/aai.py b/lcm/lcm/pub/aaiapi/aai.py
index 632e4f3..698b7c5 100644 (file)
--- a/lcm/lcm/pub/aaiapi/aai.py
+++ b/lcm/lcm/pub/aaiapi/aai.py
@@ -24,34 +24,34 @@ logger = logging.getLogger(__name__)
 def call_aai(resource, method, data=''):\r
     return call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, method, data)\r
 \r
+\r
 def create_ns(global_customer_id, service_type, service_instance_id, data):\r
     resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \\r
                "%s/service-instances/service-instance/%s" % \\r
                (global_customer_id, service_type, service_instance_id)\r
     ret = call_aai(resource, "PUT", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Ns instance creation exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
-def delete_ns(global_customer_id, service_type, service_instance_id, data):\r
+\r
+def delete_ns(global_customer_id, service_type, service_instance_id):\r
     resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \\r
                "%s/service-instances/service-instance/%s" % \\r
                (global_customer_id, service_type, service_instance_id)\r
-    ret = call_aai(resource, "DELETE", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\r
+    ret = call_aai(resource, "DELETE")\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Ns instance delete exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
+\r
 def query_ns(global_customer_id, service_type, service_instance_id, data):\r
     resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \\r
                "%s/service-instances/service-instance/%s" % \\r
                (global_customer_id, service_type, service_instance_id)\r
     ret = call_aai(resource, "GET", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "GET", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Ns instance query exception in AAI")\r
@@ -61,25 +61,24 @@ def query_ns(global_customer_id, service_type, service_instance_id, data):
 def create_vnf(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\r
     ret = call_aai(resource, "PUT", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Vnf instance creation exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
-def delete_vnf(vnf_id, data=[]):\r
+\r
+def delete_vnf(vnf_id):\r
     resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\r
-    ret = call_aai(resource, "DELETE", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\r
+    ret = call_aai(resource, "DELETE")\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Vnf instance delete exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
+\r
 def query_vnf(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\r
     ret = call_aai(resource, "GET", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "GET", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Vnf instance query exception in AAI")\r
@@ -91,29 +90,28 @@ def create_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):
                "%s/tenants/tenant/%s/vservers/vserver/%s" % \\r
                (cloud_owner, cloud_region_id, tenant_id, vserver_id)\r
     ret = call_aai(resource, "PUT", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Vserver creation exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
-def delete_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):\r
+\r
+def delete_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id):\r
     resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \\r
                "%s/tenants/tenant/%s/vservers/vserver/%s" % \\r
                (cloud_owner, cloud_region_id, tenant_id, vserver_id)\r
-    ret = call_aai(resource, "DELETE", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\r
+    ret = call_aai(resource, "DELETE")\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Vserver delete exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
+\r
 def query_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):\r
     resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \\r
                "%s/tenants/tenant/%s/vservers/vserver/%s" % \\r
                (cloud_owner, cloud_region_id, tenant_id, vserver_id)\r
     ret = call_aai(resource, "GET", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "GET", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Vserver query exception in AAI")\r
@@ -125,18 +123,17 @@ def put_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver_id
                "%s/tenants/tenant/%s/vservers/vserver/%s/relationship-list/relationship" % \\r
                (cloud_owner, cloud_region_id, tenant_id, vserver_id)\r
     ret = call_aai(resource, "PUT", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Put or update vserver relationship exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
-def delete_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):\r
+\r
+def delete_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver_id):\r
     resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \\r
                "%s/tenants/tenant/%s/vservers/vserver/%s/relationship-list/relationship" % \\r
                (cloud_owner, cloud_region_id, tenant_id, vserver_id)\r
-    ret = call_aai(resource, "DELETE", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\r
+    ret = call_aai(resource, "DELETE")\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Delete vserver relationship exception in AAI")\r
@@ -146,16 +143,15 @@ def delete_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver
 def put_vnf_relationship(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s/relationship-list/relationship" % vnf_id\r
     ret = call_aai(resource, "PUT", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Put or update vnf instance relationship exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
-def delete_vnf_relationship(vnf_id, data):\r
+\r
+def delete_vnf_relationship(vnf_id):\r
     resource = "/network/generic-vnfs/generic-vnf/%s/relationship-list/relationship" % vnf_id\r
-    ret = call_aai(resource, "DELETE", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\r
+    ret = call_aai(resource, "DELETE")\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Delete vnf instance relationship exception in AAI")\r
@@ -167,18 +163,17 @@ def put_ns_relationship(global_customer_id, service_type, service_instance_id, d
                "%s/service-instances/service-instance/%s/relationship-list/relationship" % \\r
                (global_customer_id, service_type, service_instance_id)\r
     ret = call_aai(resource, "PUT", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Put or update ns instance relationship exception in AAI")\r
     return json.JSONDecoder().decode(ret[1])\r
 \r
-def delete_ns_relationship(global_customer_id, service_type, service_instance_id, data):\r
+\r
+def delete_ns_relationship(global_customer_id, service_type, service_instance_id):\r
     resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \\r
                "%s/service-instances/service-instance/%s/relationship-list/relationship" % \\r
                (global_customer_id, service_type, service_instance_id)\r
-    ret = call_aai(resource, "DELETE", data)\r
-    # ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\r
+    ret = call_aai(resource, "DELETE")\r
     if ret[0] != 0:\r
         logger.error("Status code is %s, detail is %s.", ret[2], ret[1])\r
         raise NFLCMException("Delete ns instance relationship exception in AAI")\r