summaryrefslogtreecommitdiffstats
path: root/newton
diff options
context:
space:
mode:
Diffstat (limited to 'newton')
-rw-r--r--newton/newton/requests/tests/test_flavor.py4
-rw-r--r--newton/newton/requests/urls.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/newton/newton/requests/tests/test_flavor.py b/newton/newton/requests/tests/test_flavor.py
index 4a9df9c5..ef7ec86a 100644
--- a/newton/newton/requests/tests/test_flavor.py
+++ b/newton/newton/requests/tests/test_flavor.py
@@ -174,7 +174,7 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
"content": self.MOCK_GET_RESOURCES_RESPONSE},
"post": {
"content": self.MOCK_POST_RESOURCE_RESPONSE,
- "status_code": status.HTTP_202_ACCEPTED,
+ "status_code": status.HTTP_200_OK,
}
}
),
@@ -190,7 +190,7 @@ class TestFlavorsNewton(unittest.TestCase, AbstractTestResource):
HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID)
context = response.json()
- self.assertEquals(status.HTTP_202_ACCEPTED,
+ self.assertEquals(status.HTTP_200_OK,
response.status_code)
self.assertIsNotNone(context['id'])
self.assertEqual(1, context['returnCode'])
diff --git a/newton/newton/requests/urls.py b/newton/newton/requests/urls.py
index ff1a7fb2..c6c9f5ed 100644
--- a/newton/newton/requests/urls.py
+++ b/newton/newton/requests/urls.py
@@ -34,6 +34,8 @@ 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_-]+))/action/?$',
+ server.ServerAction.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/?$',