0414bab3d3
Add return-request-id-to-caller function to resources and resource managers in the following files. The methods in the resource class and resource manager return a wrapper class that has 'request_ids' property. The caller can get request ids of the callee via the property. * novaclient/v2/keypairs.py * novaclient/v2/limits.py * novaclient/v2/networks.py * novaclient/v2/quota_classes.py * novaclient/v2/quotas.py * novaclient/v2/security_group_default_rules.py * novaclient/v2/security_group_rules.py * novaclient/v2/security_groups.py * novaclient/v2/server_groups.py * novaclient/v2/services.py * novaclient/v2/usage.py * novaclient/v2/versions.py Co-authored-by: Ankit Agrawal <ankit11.agrawal@nttdata.com> Change-Id: I9203f70a0eef5686b590fbff35563f2cf8b6f586 Implements: blueprint return-request-id-to-caller
85 lines
3.6 KiB
Python
85 lines
3.6 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 security_groups as data
|
|
from novaclient.tests.unit import utils
|
|
from novaclient.tests.unit.v2 import fakes
|
|
from novaclient.v2 import security_groups
|
|
|
|
|
|
class SecurityGroupsTest(utils.FixturedTestCase):
|
|
|
|
client_fixture_class = client.V1
|
|
data_fixture_class = data.Fixture
|
|
|
|
def _do_test_list_security_groups(self, search_opts, path):
|
|
sgs = self.cs.security_groups.list(search_opts=search_opts)
|
|
self.assert_request_id(sgs, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('GET', path)
|
|
for sg in sgs:
|
|
self.assertIsInstance(sg, security_groups.SecurityGroup)
|
|
|
|
def test_list_security_groups_all_tenants_on(self):
|
|
self._do_test_list_security_groups(
|
|
None, '/os-security-groups')
|
|
|
|
def test_list_security_groups_all_tenants_on_with_search_opts(self):
|
|
self._do_test_list_security_groups(
|
|
{'all_tenants': 1}, '/os-security-groups?all_tenants=1')
|
|
|
|
def test_list_security_groups_all_tenants_off(self):
|
|
self._do_test_list_security_groups(
|
|
{'all_tenants': 0}, '/os-security-groups')
|
|
|
|
def test_get_security_groups(self):
|
|
sg = self.cs.security_groups.get(1)
|
|
self.assert_request_id(sg, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('GET', '/os-security-groups/1')
|
|
self.assertIsInstance(sg, security_groups.SecurityGroup)
|
|
self.assertEqual('1', str(sg))
|
|
|
|
def test_delete_security_group(self):
|
|
sg = self.cs.security_groups.list()[0]
|
|
ret = sg.delete()
|
|
self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('DELETE', '/os-security-groups/1')
|
|
ret = self.cs.security_groups.delete(1)
|
|
self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('DELETE', '/os-security-groups/1')
|
|
ret = self.cs.security_groups.delete(sg)
|
|
self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('DELETE', '/os-security-groups/1')
|
|
|
|
def test_create_security_group(self):
|
|
sg = self.cs.security_groups.create("foo", "foo barr")
|
|
self.assert_request_id(sg, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('POST', '/os-security-groups')
|
|
self.assertIsInstance(sg, security_groups.SecurityGroup)
|
|
|
|
def test_update_security_group(self):
|
|
sg = self.cs.security_groups.list()[0]
|
|
secgroup = self.cs.security_groups.update(sg, "update", "update")
|
|
self.assert_request_id(secgroup, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('PUT', '/os-security-groups/1')
|
|
self.assertIsInstance(secgroup, security_groups.SecurityGroup)
|
|
|
|
def test_refresh_security_group(self):
|
|
sg = self.cs.security_groups.get(1)
|
|
sg2 = self.cs.security_groups.get(1)
|
|
self.assertEqual(sg.name, sg2.name)
|
|
sg2.name = "should be test"
|
|
self.assertNotEqual(sg.name, sg2.name)
|
|
sg2.get()
|
|
self.assertEqual(sg.name, sg2.name)
|