summaryrefslogtreecommitdiffstats
path: root/windriver
diff options
context:
space:
mode:
Diffstat (limited to 'windriver')
-rw-r--r--windriver/titanium_cloud/extensions/__init__.py1
-rw-r--r--windriver/titanium_cloud/extensions/tests/__init__.py1
-rw-r--r--windriver/titanium_cloud/extensions/views/__init__.py1
-rw-r--r--windriver/titanium_cloud/extensions/views/extensions.py18
-rw-r--r--windriver/titanium_cloud/samples/__init__.py1
-rw-r--r--windriver/titanium_cloud/samples/tests_sample.py (renamed from windriver/titanium_cloud/samples/tests.py)1
-rw-r--r--windriver/titanium_cloud/swagger/__init__.py1
-rw-r--r--windriver/titanium_cloud/swagger/tests_swagger.py (renamed from windriver/titanium_cloud/swagger/tests.py)1
-rw-r--r--windriver/titanium_cloud/swagger/urls.py2
-rw-r--r--windriver/titanium_cloud/swagger/views.py29
10 files changed, 24 insertions, 32 deletions
diff --git a/windriver/titanium_cloud/extensions/__init__.py b/windriver/titanium_cloud/extensions/__init__.py
index afa702d3..ae1ce9db 100644
--- a/windriver/titanium_cloud/extensions/__init__.py
+++ b/windriver/titanium_cloud/extensions/__init__.py
@@ -11,4 +11,3 @@
# 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/windriver/titanium_cloud/extensions/tests/__init__.py b/windriver/titanium_cloud/extensions/tests/__init__.py
index afa702d3..ae1ce9db 100644
--- a/windriver/titanium_cloud/extensions/tests/__init__.py
+++ b/windriver/titanium_cloud/extensions/tests/__init__.py
@@ -11,4 +11,3 @@
# 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/windriver/titanium_cloud/extensions/views/__init__.py b/windriver/titanium_cloud/extensions/views/__init__.py
index afa702d3..ae1ce9db 100644
--- a/windriver/titanium_cloud/extensions/views/__init__.py
+++ b/windriver/titanium_cloud/extensions/views/__init__.py
@@ -11,4 +11,3 @@
# 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/windriver/titanium_cloud/extensions/views/extensions.py b/windriver/titanium_cloud/extensions/views/extensions.py
index 9360cbba..7dd78272 100644
--- a/windriver/titanium_cloud/extensions/views/extensions.py
+++ b/windriver/titanium_cloud/extensions/views/extensions.py
@@ -18,7 +18,7 @@ import traceback
from keystoneauth1.exceptions import HttpError
from rest_framework import status
from rest_framework.response import Response
-from rest_framework.views import APIView
+# from rest_framework.views import APIView
from django.conf import settings
from common.exceptions import VimDriverNewtonException
@@ -29,6 +29,7 @@ logger = logging.getLogger(__name__)
# DEBUG=True
+
class Extensions(newton_extensions.Extensions):
def __init__(self):
@@ -36,7 +37,6 @@ class Extensions(newton_extensions.Extensions):
# self._logger = logger
self.proxy_prefix = settings.MULTICLOUD_PREFIX
-
def get(self, request, vimid=""):
logger.debug("Extensions--get::data> %s" % request.data)
logger.debug("Extensions--get::vimid> %s"
@@ -55,9 +55,9 @@ class Extensions(newton_extensions.Extensions):
]
content = {
- "cloud-owner":cloud_owner,
- "cloud-region-id":cloud_region_id,
- "vimid":vimid,
+ "cloud-owner": cloud_owner,
+ "cloud-region-id": cloud_region_id,
+ "vimid": vimid,
"extensions": registered_extensions
}
return Response(data=content, status=status.HTTP_200_OK)
@@ -73,7 +73,6 @@ class Extensions(newton_extensions.Extensions):
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
class APIv1Extensions(Extensions):
def __init__(self):
@@ -81,9 +80,10 @@ class APIv1Extensions(Extensions):
# self._logger = logger
self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
-
def get(self, request, cloud_owner="", cloud_region_id=""):
- self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
+ self._logger.info(
+ "cloud_owner,cloud_region_id: %s,%s" %
+ (cloud_owner, cloud_region_id))
vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
- return super(APIv1Extensions,self).get(request, vimid)
+ return super(APIv1Extensions, self).get(request, vimid)
diff --git a/windriver/titanium_cloud/samples/__init__.py b/windriver/titanium_cloud/samples/__init__.py
index afa702d3..ae1ce9db 100644
--- a/windriver/titanium_cloud/samples/__init__.py
+++ b/windriver/titanium_cloud/samples/__init__.py
@@ -11,4 +11,3 @@
# 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/windriver/titanium_cloud/samples/tests.py b/windriver/titanium_cloud/samples/tests_sample.py
index b294a52b..02c59247 100644
--- a/windriver/titanium_cloud/samples/tests.py
+++ b/windriver/titanium_cloud/samples/tests_sample.py
@@ -13,7 +13,6 @@
# limitations under the License.
import unittest
-import json
from django.test import Client
from rest_framework import status
diff --git a/windriver/titanium_cloud/swagger/__init__.py b/windriver/titanium_cloud/swagger/__init__.py
index afa702d3..ae1ce9db 100644
--- a/windriver/titanium_cloud/swagger/__init__.py
+++ b/windriver/titanium_cloud/swagger/__init__.py
@@ -11,4 +11,3 @@
# 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/windriver/titanium_cloud/swagger/tests.py b/windriver/titanium_cloud/swagger/tests_swagger.py
index fde26217..eba67c06 100644
--- a/windriver/titanium_cloud/swagger/tests.py
+++ b/windriver/titanium_cloud/swagger/tests_swagger.py
@@ -13,7 +13,6 @@
# limitations under the License.
import unittest
-import json
from django.test import Client
from rest_framework import status
diff --git a/windriver/titanium_cloud/swagger/urls.py b/windriver/titanium_cloud/swagger/urls.py
index 38573d58..a690d9cf 100644
--- a/windriver/titanium_cloud/swagger/urls.py
+++ b/windriver/titanium_cloud/swagger/urls.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from rest_framework.urlpatterns import format_suffix_patterns
from titanium_cloud.swagger.views import SwaggerJsonViewDepreciated
diff --git a/windriver/titanium_cloud/swagger/views.py b/windriver/titanium_cloud/swagger/views.py
index 6829714b..bbf897e1 100644
--- a/windriver/titanium_cloud/swagger/views.py
+++ b/windriver/titanium_cloud/swagger/views.py
@@ -12,16 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import json
+# import json
import logging
-import os
-import traceback
+# import os
+# import traceback
-from rest_framework import status
+# from rest_framework import status
from rest_framework.response import Response
-from rest_framework.views import APIView
+# from rest_framework.views import APIView
-from common.exceptions import VimDriverNewtonException
+# from common.exceptions import VimDriverNewtonException
from newton_base.swagger import views as newton_json_view
logger = logging.getLogger(__name__)
@@ -36,15 +36,14 @@ class SwaggerJsonViewDepreciated(newton_json_view.SwaggerJsonView):
:return:
'''
- resp = super(SwaggerJsonViewDepreciated,self).get(request)
+ resp = super(SwaggerJsonViewDepreciated, self).get(request)
json_data = resp.data if resp else None
if json_data:
json_data["basePath"] = "/api/multicloud-titanium_cloud/v0/"
json_data["info"]["title"] = "Depreciated Service NBI of MultiCloud plugin for Titanium Cloud"
return Response(data=json_data, status=200)
else:
- return Response(data={'error':'internal error'}, status=500)
-
+ return Response(data={'error': 'internal error'}, status=500)
class APIv1SwaggerJsonViewDepreciated(newton_json_view.SwaggerJsonView):
@@ -56,14 +55,14 @@ class APIv1SwaggerJsonViewDepreciated(newton_json_view.SwaggerJsonView):
:return:
'''
- resp = super(APIv1SwaggerJsonViewDepreciated,self).get(request)
+ resp = super(APIv1SwaggerJsonViewDepreciated, self).get(request)
json_data = resp.data if resp else None
if json_data:
json_data["basePath"] = "/api/multicloud-titanium_cloud/v1/"
json_data["info"]["title"] = "Depreciated Service NBI v1 of MultiCloud plugin for Titanium Cloud"
return Response(data=json_data, status=200)
else:
- return Response(data={'error':'internal error'}, status=500)
+ return Response(data={'error': 'internal error'}, status=500)
class SwaggerJsonView(newton_json_view.SwaggerJsonView):
@@ -75,14 +74,14 @@ class SwaggerJsonView(newton_json_view.SwaggerJsonView):
:return:
'''
- resp = super(SwaggerJsonView,self).get(request)
+ resp = super(SwaggerJsonView, self).get(request)
json_data = resp.data if resp else None
if json_data:
json_data["basePath"] = "/api/multicloud-titaniumcloud/v0/"
json_data["info"]["title"] = "Service NBI v0 of MultiCloud plugin for Titanium Cloud"
return Response(data=json_data, status=200)
else:
- return Response(data={'error':'internal error'}, status=500)
+ return Response(data={'error': 'internal error'}, status=500)
class APIv1SwaggerJsonView(newton_json_view.SwaggerJsonView):
@@ -94,11 +93,11 @@ class APIv1SwaggerJsonView(newton_json_view.SwaggerJsonView):
:return:
'''
- resp = super(APIv1SwaggerJsonView,self).get(request)
+ resp = super(APIv1SwaggerJsonView, self).get(request)
json_data = resp.data if resp else None
if json_data:
json_data["basePath"] = "/api/multicloud-titaniumcloud/v1/"
json_data["info"]["title"] = "Service NBI v1 of MultiCloud plugin for Titanium Cloud"
return Response(data=json_data, status=200)
else:
- return Response(data={'error':'internal error'}, status=500)
+ return Response(data={'error': 'internal error'}, status=500)