summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2018-11-27 13:10:59 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-27 13:10:59 +0000
commitf6ae5c7beb1b26a36a85e040b2474d991bbea994 (patch)
tree0d175fef6abd6441cd89327e5a1f18f6b061cca2
parentc74a6b2a253671bb0ade2838b473939f35bc8586 (diff)
parent0e7bdfd96bca38494ed86053812b9dabd53b2a80 (diff)
Merge "Add server action for windriver APIv1" into casablanca
-rw-r--r--share/newton_base/openoapi/server.py7
-rw-r--r--windriver/titanium_cloud/requests/urlsV1.py2
2 files changed, 9 insertions, 0 deletions
diff --git a/share/newton_base/openoapi/server.py b/share/newton_base/openoapi/server.py
index c4ef3f12..0c2382ae 100644
--- a/share/newton_base/openoapi/server.py
+++ b/share/newton_base/openoapi/server.py
@@ -567,3 +567,10 @@ class ServerAction(APIView):
logger.error(traceback.format_exc())
return Response(data={'error': str(e)},
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+class APIv1ServerAction(ServerAction):
+ def post(self, request, cloud_owner="", cloud_region_id="", tenantid="", serverid=""):
+ self._logger.info("%s, %s" % (cloud_owner, cloud_region_id))
+
+ vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+ return super(APIv1ServerAction, self).post(request, vimid, tenantid, serverid)
diff --git a/windriver/titanium_cloud/requests/urlsV1.py b/windriver/titanium_cloud/requests/urlsV1.py
index f1552443..6e884ab1 100644
--- a/windriver/titanium_cloud/requests/urlsV1.py
+++ b/windriver/titanium_cloud/requests/urlsV1.py
@@ -34,6 +34,8 @@ urlpatterns = [
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_-]+))/action/?$',
+ server.APIv1ServerAction.as_view()),
url(r'^servers(/(?P<serverid>[0-9a-zA-Z_-]+))?',
server.APIv1Servers.as_view()),
url(r'^ports(/(?P<portid>[0-9a-zA-Z_-]+))?',