API upgrading for OPENOAPI

Change-Id: I8d0fdc7671d9333ee24e77dda9e07c32a0767950
Issue-ID: MULTICLOUD-297
Signed-off-by: Bin Yang <bin.yang@windriver.com>

5 files changed, 68 insertions, 21 deletions

diff --git a/windriver/titanium_cloud/registration/views/registration.py b/windriver/titanium_cloud/registration/views/registration.py
index b54772e3..5bf3f1c5 100644
--- a/windriver/titanium_cloud/registration/views/registration.py
+++ b/windriver/titanium_cloud/registration/views/registration.py
@@ -365,7 +365,8 @@ class Registry(newton_registration.Registry):
         return instruction_capability
 
 
-class RegistryV1(Registry):
+class APIv1Registry(Registry):
+
     def __init__(self):
         self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
         self.aai_base_url = settings.AAI_BASE_URL
@@ -373,13 +374,12 @@ class RegistryV1(Registry):
 
     def post(self, request, cloud_owner="", cloud_region_id=""):
         self._logger.info("registration with : %s, %s" % (cloud_owner, cloud_region_id))
-        self._logger.debug("with data: %s" % request.data)
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
-        return super(RegistryV1, self).post(request, vimid)
+        return super(APIv1Registry, self).post(request, vimid)
 
     def delete(self, request, cloud_owner="", cloud_region_id=""):
         self._logger.debug("unregister cloud region: %s, %s" % (cloud_owner, cloud_region_id))
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
-        return super(RegistryV1, self).delete(request, vimid)
+        return super(APIv1Registry, self).delete(request, vimid)
diff --git a/windriver/titanium_cloud/requests/urlsV1.py b/windriver/titanium_cloud/requests/urlsV1.py
new file mode 100644
index 00000000..f1552443
--- /dev/null
+++ b/windriver/titanium_cloud/requests/urlsV1.py
@@ -0,0 +1,47 @@
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
+#
+# 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.
+
+from django.conf.urls import url
+from rest_framework.urlpatterns import format_suffix_patterns
+
+from newton_base.openoapi import network
+from newton_base.openoapi import subnet
+from newton_base.openoapi import image
+from newton_base.openoapi import volume
+from newton_base.openoapi import server
+from newton_base.openoapi import vport
+from newton_base.openoapi import limits
+from newton_base.openoapi import hosts
+from newton_base.openoapi import flavor
+
+urlpatterns = [
+    url(r'^networks(/(?P<networkid>[0-9a-zA-Z_-]+))?',
+        network.APIv1Networks.as_view()),
+    url(r'^subnets(/(?P<subnetid>[0-9a-zA-Z_-]+))?',
+        subnet.APIv1Subnets.as_view()),
+    url(r'^images(/(?P<imageid>[0-9a-zA-Z_-]+))?',
+        image.APIv1Images.as_view()),
+    url(r'^volumes(/(?P<volumeid>[0-9a-zA-Z_-]+))?',
+        volume.APIv1Volumes.as_view()),
+    url(r'^servers(/(?P<serverid>[0-9a-zA-Z_-]+))?',
+        server.APIv1Servers.as_view()),
+    url(r'^ports(/(?P<portid>[0-9a-zA-Z_-]+))?',
+        vport.APIv1Vports.as_view()),
+    url(r'^flavors(/(?P<flavorid>[0-9a-zA-Z_-]+))?',
+        flavor.APIv1Flavors.as_view()),
+    url(r'^limits$', limits.APIv1Limits.as_view()),
+    url(r'^hosts(/(?P<hostname>[0-9a-zA-Z_-]+))?', hosts.APIv1Hosts.as_view()),
+]
+
+urlpatterns = format_suffix_patterns(urlpatterns)
diff --git a/windriver/titanium_cloud/resource/views/capacity.py b/windriver/titanium_cloud/resource/views/capacity.py
index 26a673c0..74470ca2 100644
--- a/windriver/titanium_cloud/resource/views/capacity.py
+++ b/windriver/titanium_cloud/resource/views/capacity.py
@@ -142,7 +142,7 @@ class CapacityCheck(APIView):
 
 
 
-class CapacityCheckV1(APIView):
+class APIv1CapacityCheck(APIView):
 
     def __init__(self):
         self._logger = logger
@@ -152,4 +152,5 @@ class CapacityCheckV1(APIView):
         self._logger.debug("META> %s" % request.META)
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
-        return super(CapacityCheckV1, self).post(request, vimid)
+        return super(APIv1CapacityCheck, self).post(request, vimid)
+
diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py
index 5a4e64b0..d56be236 100644
--- a/windriver/titanium_cloud/urls.py
+++ b/windriver/titanium_cloud/urls.py
@@ -46,25 +46,25 @@ urlpatterns = [
 
 #API upgrading
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry/?$',
-        registration.RegistryV1.as_view()),
+        registration.APIv1Registry.as_view()),
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/?$',
-        registration.RegistryV1.as_view()),
+        registration.APIv1Registry.as_view()),
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/exten',
         include('titanium_cloud.extensions.urlsV1')),
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',
         include('titanium_cloud.proxy.urlsV1')),
-#    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/tenants/?$',
-#        tenants.Tenants.as_view()),
-#    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/'
-#        '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urls')),
+    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/tenants/?$',
+        tenants.APIv1Tenants.as_view()),
+    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/'
+        '(?P<tenantid>[0-9a-zA-Z_-]{20,})/', include('titanium_cloud.requests.urlsV1')),
     # CapacityCheck
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/capacity_check/?$',
-        capacity.CapacityCheckV1.as_view()),
+        capacity.APIv1CapacityCheck.as_view()),
     # events
 #    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/events_check/?$',
 #        events.EventsCheck.as_view()),
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/vesagent/?$',
-        vesagent_ctrl.VesAgentCtrlV1.as_view()),
+        vesagent_ctrl.APIv1VesAgentCtrl.as_view()),
 ]
 
 
diff --git a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
index 39c36581..a85ce150 100644
--- a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
+++ b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
@@ -406,7 +406,7 @@ class VesAgentCtrl(APIView):
         return None
 
 
-class VesAgentCtrlV1(VesAgentCtrl):
+class APIv1VesAgentCtrl(VesAgentCtrl):
 
     def __init__(self):
         self._logger = logger
@@ -421,10 +421,9 @@ class VesAgentCtrlV1(VesAgentCtrl):
         :return:
         '''
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
-        self._logger.debug("with META: %s" % request.META)
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
-        return super(VesAgentCtrlV1,self).get(request, vimid)
+        return super(APIv1VesAgentCtrl,self).get(request, vimid)
 
 
     def post(self, request, cloud_owner="", cloud_region_id=""):
@@ -436,9 +435,9 @@ class VesAgentCtrlV1(VesAgentCtrl):
         :return:
         '''
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
-        self._logger.debug("with META: %s, with data: %s" % (request.META, request.data))
+
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
-        return super(VesAgentCtrlV1,self).post(request, vimid)
+        return super(APIv1VesAgentCtrl,self).post(request, vimid)
 
 
     def delete(self, request, cloud_owner="", cloud_region_id=""):
@@ -450,7 +449,7 @@ class VesAgentCtrlV1(VesAgentCtrl):
         :return:
         '''
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
-        self._logger.debug("with META: %s" % request.META)
+
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
-        return super(VesAgentCtrlV1,self).delete(request, vimid)
+        return super(APIv1VesAgentCtrl,self).delete(request, vimid)