summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-08 19:00:00 +0000
committerGerrit Code Review <review@openstack.org>2012-02-08 19:00:00 +0000
commite7ac6629fea1e1561c772ed0946174350abd4734 (patch)
tree35fb6641a993520c9eb3eae6260a8d5ee7d61b11
parent85f4255cdd853adb46545e3215c224c4b9906826 (diff)
parent2a872a606b2ed8e32de335c8a8a0d8b178ddba0c (diff)
Merge "Add an alias to the ServerStartStop extension"
-rw-r--r--nova/api/openstack/compute/contrib/server_start_stop.py1
-rw-r--r--nova/tests/api/openstack/compute/test_extensions.py7
2 files changed, 8 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/server_start_stop.py b/nova/api/openstack/compute/contrib/server_start_stop.py
index e5317f051..5f26c7dac 100644
--- a/nova/api/openstack/compute/contrib/server_start_stop.py
+++ b/nova/api/openstack/compute/contrib/server_start_stop.py
@@ -67,6 +67,7 @@ class Server_start_stop(extensions.ExtensionDescriptor):
"""Start/Stop instance compute API support"""
name = "ServerStartStop"
+ alias = "os-server-start-stop"
namespace = "http://docs.openstack.org/compute/ext/servers/api/v1.1"
updated = "2012-01-23:00:00+00:00"
diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index adeb847a4..7341cd483 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -217,6 +217,13 @@ class ExtensionControllerTest(ExtensionTestCase):
},
)
+ for ext in data['extensions']:
+ url = '/fake/extensions/%s' % ext['alias']
+ request = webob.Request.blank(url)
+ response = request.get_response(app)
+ output = json.loads(response.body)
+ self.assertEqual(output['extension']['alias'], ext['alias'])
+
def test_get_extension_json(self):
app = compute.APIRouter()
request = webob.Request.blank("/fake/extensions/FOXNSOX")