f535e6945b
Currently, users must use different interface to get request_ids.
1. Commonly, ListWithMeta, DictWithMeta or TupleWithMeta, etc is
returned to user. And request_ids is returned as an attribute of
*WithMeta.
For a server delete action:
result = serverManager.delete(server)
# result = TupelWithMeta
request_ids = result.request_ids
2. Some places reutrn a tuple which contains request_ids in one of
its elements.
For a server stop action:
result = serverManager.stop(server)
# result = (Response, TupleWithMeta)
request_ids = result[1].request_ids
Such kind of difference makes user confused.
This change provides a backwards compatibility solution for users
who don't care about request_ids as TupleWithMeta is subclass of
tuple.
Change-Id: I164bb95abce6dc96cf455033f02822ccb0d87b8f
Closes-Bug: 1542179
103 lines
3.9 KiB
Python
103 lines
3.9 KiB
Python
#
|
|
# 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.tests.unit.fixture_data import client
|
|
from novaclient.tests.unit.fixture_data import hosts as data
|
|
from novaclient.tests.unit import utils
|
|
from novaclient.tests.unit.v2 import fakes
|
|
from novaclient.v2 import hosts
|
|
|
|
|
|
class HostsTest(utils.FixturedTestCase):
|
|
|
|
client_fixture_class = client.V1
|
|
data_fixture_class = data.V1
|
|
|
|
def test_describe_resource(self):
|
|
hs = self.cs.hosts.get('host')
|
|
self.assert_request_id(hs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('GET', '/os-hosts/host')
|
|
for h in hs:
|
|
self.assertIsInstance(h, hosts.Host)
|
|
|
|
def test_list_host(self):
|
|
hs = self.cs.hosts.list()
|
|
self.assert_request_id(hs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('GET', '/os-hosts')
|
|
for h in hs:
|
|
self.assertIsInstance(h, hosts.Host)
|
|
self.assertEqual(h.zone, 'nova1')
|
|
|
|
def test_list_host_with_zone(self):
|
|
hs = self.cs.hosts.list('nova')
|
|
self.assert_request_id(hs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('GET', '/os-hosts?zone=nova')
|
|
for h in hs:
|
|
self.assertIsInstance(h, hosts.Host)
|
|
self.assertEqual(h.zone, 'nova')
|
|
|
|
def test_update_enable(self):
|
|
host = self.cs.hosts.get('sample_host')[0]
|
|
values = {"status": "enabled"}
|
|
result = host.update(values)
|
|
self.assert_request_id(result, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('PUT', '/os-hosts/sample_host', values)
|
|
self.assertIsInstance(result, hosts.Host)
|
|
|
|
def test_update_maintenance(self):
|
|
host = self.cs.hosts.get('sample_host')[0]
|
|
values = {"maintenance_mode": "enable"}
|
|
result = host.update(values)
|
|
self.assert_request_id(result, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('PUT', '/os-hosts/sample_host', values)
|
|
self.assertIsInstance(result, hosts.Host)
|
|
|
|
def test_update_both(self):
|
|
host = self.cs.hosts.get('sample_host')[0]
|
|
values = {"status": "enabled",
|
|
"maintenance_mode": "enable"}
|
|
result = host.update(values)
|
|
self.assert_request_id(result, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('PUT', '/os-hosts/sample_host', values)
|
|
self.assertIsInstance(result, hosts.Host)
|
|
|
|
def test_host_startup(self):
|
|
host = self.cs.hosts.get('sample_host')[0]
|
|
result = host.startup()
|
|
self.assert_request_id(result, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called(
|
|
'GET', '/os-hosts/sample_host/startup')
|
|
|
|
def test_host_reboot(self):
|
|
host = self.cs.hosts.get('sample_host')[0]
|
|
result = host.reboot()
|
|
self.assert_request_id(result, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called(
|
|
'GET', '/os-hosts/sample_host/reboot')
|
|
|
|
def test_host_shutdown(self):
|
|
host = self.cs.hosts.get('sample_host')[0]
|
|
result = host.shutdown()
|
|
self.assert_request_id(result, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called(
|
|
'GET', '/os-hosts/sample_host/shutdown')
|
|
|
|
def test_hosts_repr(self):
|
|
hs = self.cs.hosts.get('host')
|
|
self.assertEqual('<Host: dummy>', repr(hs[0]))
|
|
|
|
def test_hosts_list_repr(self):
|
|
hs = self.cs.hosts.list()
|
|
for h in hs:
|
|
self.assertEqual('<Host: %s>' % h.host_name, repr(h))
|