Move aai.py to msapi in gvnfm vnflcm

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

diff --git a/lcm/.gitignore b/lcm/.gitignore
index b7dfabf..6a415b1 100644 (file)
--- a/lcm/.gitignore
+++ b/lcm/.gitignore
@@ -1,4 +1,4 @@
-../.idea
+.idea
 logs/runtime_lcm.log
 *.pyc
 bash.exe.stackdump

diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
index eede66f..b3dee2f 100644 (file)
--- a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
@@ -14,9 +14,9 @@
 
 import logging
 
-from lcm.pub.aaiapi.aai import delete_vnf
 from lcm.pub.database.models import NfInstModel, NfvoRegInfoModel
 from lcm.pub.exceptions import NFLCMException
+from lcm.pub.msapi.aai import delete_vnf
 
 logger = logging.getLogger(__name__)
 

diff --git a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
index d801a26..b1b87c4 100644 (file)
--- a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
@@ -16,9 +16,9 @@ import json
 import logging
 import uuid
 
-from lcm.pub.aaiapi.aai import create_vnf
 from lcm.pub.database.models import NfInstModel
 from lcm.pub.exceptions import NFLCMException
+from lcm.pub.msapi.aai import create_vnf
 from lcm.pub.msapi.catalog import query_rawdata_from_catalog
 from lcm.pub.msapi.gvnfmdriver import get_packageinfo_by_vnfdid
 from lcm.pub.utils import toscautil

diff --git a/lcm/lcm/pub/aaiapi/__init__.py b/lcm/lcm/pub/aaiapi/__init__.py
deleted file mode 100644 (file)
index c7b6818..0000000
--- a/lcm/lcm/pub/aaiapi/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017 ZTE Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.

diff --git a/lcm/lcm/pub/aaiapi/aai.py b/lcm/lcm/pub/msapi/aai.py
similarity index 97%
rename from lcm/lcm/pub/aaiapi/aai.py
rename to lcm/lcm/pub/msapi/aai.py
index 698b7c5..67b25c2 100644 (file)
--- a/lcm/lcm/pub/aaiapi/aai.py
+++ b/lcm/lcm/pub/msapi/aai.py
@@ -1,180 +1,180 @@
-# Copyright 2017 ZTE Corporation.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-import json\r
-import logging\r
-\r
-from lcm.pub.config.config import AAI_BASE_URL, AAI_USER, AAI_PASSWORD\r
-from lcm.pub.exceptions import NFLCMException\r
-from lcm.pub.utils.restcall import call_req_aai, rest_no_auth\r
-\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
-\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
-    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
-\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")\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
-    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
-    return json.JSONDecoder().decode(ret[1])\r
-\r
-\r
-def create_vnf(vnf_id, data):\r
-    resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\r
-    ret = call_aai(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
-\r
-def delete_vnf(vnf_id):\r
-    resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id\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
-    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
-    return json.JSONDecoder().decode(ret[1])\r
-\r
-\r
-def create_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, "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
-\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")\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
-    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
-    return json.JSONDecoder().decode(ret[1])\r
-\r
-\r
-def put_vserver_relationship(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/relationship-list/relationship" % \\r
-               (cloud_owner, cloud_region_id, tenant_id, vserver_id)\r
-    ret = call_aai(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
-\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")\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
-    return json.JSONDecoder().decode(ret[1])\r
-\r
-\r
-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
-    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
-\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")\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
-    return json.JSONDecoder().decode(ret[1])\r
-\r
-\r
-def put_ns_relationship(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/relationship-list/relationship" % \\r
-               (global_customer_id, service_type, service_instance_id)\r
-    ret = call_aai(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
-\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")\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
-    return json.JSONDecoder().decode(ret[1])\r
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+import logging
+
+from lcm.pub.config.config import AAI_BASE_URL, AAI_USER, AAI_PASSWORD
+from lcm.pub.exceptions import NFLCMException
+from lcm.pub.utils.restcall import call_req_aai, rest_no_auth
+
+logger = logging.getLogger(__name__)
+
+def call_aai(resource, method, data=''):
+    return call_req_aai(AAI_BASE_URL, AAI_USER, AAI_PASSWORD, rest_no_auth, resource, method, data)
+
+
+def create_ns(global_customer_id, service_type, service_instance_id, data):
+    resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \
+               "%s/service-instances/service-instance/%s" % \
+               (global_customer_id, service_type, service_instance_id)
+    ret = call_aai(resource, "PUT", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Ns instance creation exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def delete_ns(global_customer_id, service_type, service_instance_id):
+    resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \
+               "%s/service-instances/service-instance/%s" % \
+               (global_customer_id, service_type, service_instance_id)
+    ret = call_aai(resource, "DELETE")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Ns instance delete exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def query_ns(global_customer_id, service_type, service_instance_id, data):
+    resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \
+               "%s/service-instances/service-instance/%s" % \
+               (global_customer_id, service_type, service_instance_id)
+    ret = call_aai(resource, "GET", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Ns instance query exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def create_vnf(vnf_id, data):
+    resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id
+    ret = call_aai(resource, "PUT", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Vnf instance creation exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def delete_vnf(vnf_id):
+    resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id
+    ret = call_aai(resource, "DELETE")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Vnf instance delete exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def query_vnf(vnf_id, data):
+    resource = "/network/generic-vnfs/generic-vnf/%s" % vnf_id
+    ret = call_aai(resource, "GET", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Vnf instance query exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def create_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):
+    resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \
+               "%s/tenants/tenant/%s/vservers/vserver/%s" % \
+               (cloud_owner, cloud_region_id, tenant_id, vserver_id)
+    ret = call_aai(resource, "PUT", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Vserver creation exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def delete_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id):
+    resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \
+               "%s/tenants/tenant/%s/vservers/vserver/%s" % \
+               (cloud_owner, cloud_region_id, tenant_id, vserver_id)
+    ret = call_aai(resource, "DELETE")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Vserver delete exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def query_vserver(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):
+    resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \
+               "%s/tenants/tenant/%s/vservers/vserver/%s" % \
+               (cloud_owner, cloud_region_id, tenant_id, vserver_id)
+    ret = call_aai(resource, "GET", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Vserver query exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def put_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver_id, data):
+    resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \
+               "%s/tenants/tenant/%s/vservers/vserver/%s/relationship-list/relationship" % \
+               (cloud_owner, cloud_region_id, tenant_id, vserver_id)
+    ret = call_aai(resource, "PUT", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Put or update vserver relationship exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def delete_vserver_relationship(cloud_owner, cloud_region_id, tenant_id, vserver_id):
+    resource = "/cloud-infrastructure/cloud-regions/cloud-region/%s/" \
+               "%s/tenants/tenant/%s/vservers/vserver/%s/relationship-list/relationship" % \
+               (cloud_owner, cloud_region_id, tenant_id, vserver_id)
+    ret = call_aai(resource, "DELETE")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Delete vserver relationship exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def put_vnf_relationship(vnf_id, data):
+    resource = "/network/generic-vnfs/generic-vnf/%s/relationship-list/relationship" % vnf_id
+    ret = call_aai(resource, "PUT", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Put or update vnf instance relationship exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def delete_vnf_relationship(vnf_id):
+    resource = "/network/generic-vnfs/generic-vnf/%s/relationship-list/relationship" % vnf_id
+    ret = call_aai(resource, "DELETE")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Delete vnf instance relationship exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def put_ns_relationship(global_customer_id, service_type, service_instance_id, data):
+    resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \
+               "%s/service-instances/service-instance/%s/relationship-list/relationship" % \
+               (global_customer_id, service_type, service_instance_id)
+    ret = call_aai(resource, "PUT", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Put or update ns instance relationship exception in AAI")
+    return json.JSONDecoder().decode(ret[1])
+
+
+def delete_ns_relationship(global_customer_id, service_type, service_instance_id):
+    resource = "/business/customers/customer/%s/service-subscriptions/service-subscription/" \
+               "%s/service-instances/service-instance/%s/relationship-list/relationship" % \
+               (global_customer_id, service_type, service_instance_id)
+    ret = call_aai(resource, "DELETE")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Delete ns instance relationship exception in AAI")
+    return json.JSONDecoder().decode(ret[1])