Refactor vnflcm call aai rest

Change-Id: Iacca08ae970eb518063373bd18b3be86eb8f00ea
Issue-ID: VFC-192
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>

diff --git a/lcm/lcm/pub/aaiapi/aai.py b/lcm/lcm/pub/aaiapi/aai.py
index 42418ca..e8b42fa 100644 (file)
--- a/lcm/lcm/pub/aaiapi/aai.py
+++ b/lcm/lcm/pub/aaiapi/aai.py
@@ -20,12 +20,15 @@ from lcm.pub.utils.restcall import call_req_aai, rest_no_auth
 \r
 logger = logging.getLogger(__name__)\r
 \r
+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
 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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\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
@@ -35,7 +38,8 @@ def delete_ns(global_customer_id, service_type, service_instance_id, data):
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\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
     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
@@ -45,7 +49,8 @@ def query_ns(global_customer_id, service_type, service_instance_id, data):
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "GET", data)\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
@@ -54,7 +59,8 @@ def query_ns(global_customer_id, service_type, service_instance_id, data):
 \r
 def create_vnf(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\r
-    ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\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
@@ -62,7 +68,8 @@ def create_vnf(vnf_id, data):
 \r
 def delete_vnf(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\r
-    ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\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
     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
@@ -70,7 +77,8 @@ def delete_vnf(vnf_id, data):
 \r
 def query_vnf(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\r
-    ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "GET", data)\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
@@ -81,7 +89,8 @@ def create_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\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
@@ -91,7 +100,8 @@ def delete_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\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
     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
@@ -101,7 +111,8 @@ def query_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "GET", data)\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
@@ -112,7 +123,8 @@ def put_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver_id
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\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
@@ -122,7 +134,8 @@ def delete_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\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
     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
@@ -131,7 +144,8 @@ def delete_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver
 \r
 def put_vnf_relationship(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s/relationship-list/relationship" % vnf_id\r
-    ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\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
@@ -139,7 +153,8 @@ def put_vnf_relationship(vnf_id, data):
 \r
 def delete_vnf_relationship(vnf_id, data):\r
     resource = "/network/generic-vnfs/generic-vnf/%s/relationship-list/relationship" % vnf_id\r
-    ret = call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\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
     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
@@ -150,7 +165,8 @@ def put_ns_relationship(global_customer_id, service_type, service_instance_id, d
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "PUT", data)\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
@@ -160,7 +176,8 @@ def delete_ns_relationship(global_customer_id, service_type, service_instance_id
     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_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, "DELETE", data)\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
     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

diff --git a/lcm/lcm/pub/utils/restcall.py b/lcm/lcm/pub/utils/restcall.py
index 1fbe59f..c13d07a 100644 (file)
--- a/lcm/lcm/pub/utils/restcall.py
+++ b/lcm/lcm/pub/utils/restcall.py
@@ -104,7 +104,7 @@ def call_req_aai(base_url, user, passwd, auth_type, resource, method, content=''
     try:
         full_url = combine_url(base_url, resource)
         headers = {'content-type': 'application/json', 'accept': 'application/json',
-                   'X-FromAppId': 'AAI', 'X-TransactionId': 'get_aai_subscr'}
+                   'X-FromAppId': 'VFC-GVNFM-VNFLCM', 'X-TransactionId': str(uuid.uuid1())}
         if user:
             headers['Authorization'] = 'Basic ' + ('%s:%s' % (user, passwd)).encode("base64")
         ca_certs = None