summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaibin Huang <haibin.huang@intel.com>2018-11-22 08:11:52 +0000
committerHaibin Huang <haibin.huang@intel.com>2018-11-22 08:13:14 +0000
commitb32eb9864c7fd9757dd0192af05af6e48699b42b (patch)
treebd0daaab51d96c2914a806c0bffc0de54870d053
parent48159a5d813f93103e6cc1459a31e61010dd3ee1 (diff)
Add server action for windriver APIv0
Change-Id: Ib6dca8c162644ba99ea04f5dd9c87ffde34bda8e Issue-ID: MULTICLOUD-414 Signed-off-by: Haibin Huang <haibin.huang@intel.com>
-rw-r--r--share/newton_base/openoapi/server.py2
-rw-r--r--windriver/titanium_cloud/requests/urls.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/share/newton_base/openoapi/server.py b/share/newton_base/openoapi/server.py
index be79c466..c4ef3f12 100644
--- a/share/newton_base/openoapi/server.py
+++ b/share/newton_base/openoapi/server.py
@@ -555,7 +555,7 @@ class ServerAction(APIView):
endpoint_filter=self.service,
headers={"Content-Type": "application/json",
"Accept": "application/json"})
- resp_body = resp.json()
+ resp_body = {}
return Response(data=resp_body, status=resp.status_code)
except VimDriverKiloException as e:
diff --git a/windriver/titanium_cloud/requests/urls.py b/windriver/titanium_cloud/requests/urls.py
index ff1a7fb2..73cc1543 100644
--- a/windriver/titanium_cloud/requests/urls.py
+++ b/windriver/titanium_cloud/requests/urls.py
@@ -34,10 +34,10 @@ urlpatterns = [
image.Images.as_view()),
url(r'^volumes(/(?P<volumeid>[0-9a-zA-Z_-]+))?',
volume.Volumes.as_view()),
- url(r'^servers(/(?P<serverid>[0-9a-zA-Z_-]+))?',
- server.Servers.as_view()),
url(r'^servers(/(?P<serverid>[0-9a-zA-Z_-]+))/action/?$',
server.ServerAction.as_view()),
+ url(r'^servers(/(?P<serverid>[0-9a-zA-Z_-]+))?',
+ server.Servers.as_view()),
url(r'^ports(/(?P<portid>[0-9a-zA-Z_-]+))?',
vport.Vports.as_view()),
url(r'^flavors(/(?P<flavorid>[0-9a-zA-Z_-]+))?',