diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-03-26 05:54:48 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-03-26 05:54:48 +0000 |
commit | 655765a5eac161be8209e62950ecde7b4da84d1a (patch) | |
tree | 75c760a8cf96bbe726f0875ee21b4263710f524a /tests/v1_1 | |
parent | f03575a8c742cb789c89620fc171edd5e75d426d (diff) | |
parent | 0f7404d7a8f5b6948ae050f6bd434483be42522d (diff) | |
download | python-novaclient-655765a5eac161be8209e62950ecde7b4da84d1a.tar.gz |
Merge "Add support for retrieving instance-actions info"2.12.0
Diffstat (limited to 'tests/v1_1')
-rw-r--r-- | tests/v1_1/contrib/test_instance_actions.py | 41 | ||||
-rw-r--r-- | tests/v1_1/fakes.py | 20 | ||||
-rw-r--r-- | tests/v1_1/test_shell.py | 9 |
3 files changed, 70 insertions, 0 deletions
diff --git a/tests/v1_1/contrib/test_instance_actions.py b/tests/v1_1/contrib/test_instance_actions.py new file mode 100644 index 00000000..8f8e1cd5 --- /dev/null +++ b/tests/v1_1/contrib/test_instance_actions.py @@ -0,0 +1,41 @@ +# Copyright 2013 Rackspace Hosting +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, 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. +from novaclient import extension +from novaclient.v1_1.contrib import instance_action + +from tests import utils +from tests.v1_1.contrib import fakes + + +extensions = [ + extension.Extension(instance_action.__name__.split(".")[-1], + instance_action), +] +cs = fakes.FakeClient(extensions=extensions) + + +class InstanceActionExtensionTests(utils.TestCase): + def test_list_instance_actions(self): + server_uuid = '1234' + cs.instance_action.list(server_uuid) + cs.assert_called('GET', '/servers/%s/os-instance-actions' % + server_uuid) + + def test_get_instance_action(self): + server_uuid = '1234' + request_id = 'req-abcde12345' + cs.instance_action.get(server_uuid, request_id) + cs.assert_called('GET', '/servers/%s/os-instance-actions/%s' % + (server_uuid, request_id)) diff --git a/tests/v1_1/fakes.py b/tests/v1_1/fakes.py index 7f082d5f..27e1cfbf 100644 --- a/tests/v1_1/fakes.py +++ b/tests/v1_1/fakes.py @@ -1693,3 +1693,23 @@ class FakeHTTPClient(base_client.HTTPClient): def delete_servers_1234_os_volume_attachments_Work(self, **kw): return (200, {}, {}) + + def get_servers_1234_os_instance_actions(self, **kw): + return (200, {}, {"instanceActions": + [{"instance_uuid": "1234", + "user_id": "b968c25e04ab405f9fe4e6ca54cce9a5", + "start_time": "2013-03-25T13:45:09.000000", + "request_id": "req-abcde12345", + "action": "create", + "message": None, + "project_id": "04019601fe3648c0abd4f4abfb9e6106"}]}) + + def get_servers_1234_os_instance_actions_req_abcde12345(self, **kw): + return (200, {}, {"instanceAction": + {"instance_uuid": "1234", + "user_id": "b968c25e04ab405f9fe4e6ca54cce9a5", + "start_time": "2013-03-25T13:45:09.000000", + "request_id": "req-abcde12345", + "action": "create", + "message": None, + "project_id": "04019601fe3648c0abd4f4abfb9e6106"}}) diff --git a/tests/v1_1/test_shell.py b/tests/v1_1/test_shell.py index 4d67523f..2febe7e0 100644 --- a/tests/v1_1/test_shell.py +++ b/tests/v1_1/test_shell.py @@ -1276,3 +1276,12 @@ class ShellTest(utils.TestCase): self.run_command('volume-detach sample-server Work') self.assert_called('DELETE', '/servers/1234/os-volume_attachments/Work') + + def test_instance_action_list(self): + self.run_command('instance-action-list sample-server') + self.assert_called('GET', '/servers/1234/os-instance-actions') + + def test_instance_action_get(self): + self.run_command('instance-action sample-server req-abcde12345') + self.assert_called('GET', + '/servers/1234/os-instance-actions/req-abcde12345') |