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
96 lines
3.8 KiB
Python
96 lines
3.8 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 import exceptions
|
|
from novaclient.tests.unit.fixture_data import client
|
|
from novaclient.tests.unit.fixture_data import security_group_rules as data
|
|
from novaclient.tests.unit import utils
|
|
from novaclient.tests.unit.v2 import fakes
|
|
from novaclient.v2 import security_group_rules
|
|
|
|
|
|
class SecurityGroupRulesTest(utils.FixturedTestCase):
|
|
|
|
client_fixture_class = client.V1
|
|
data_fixture_class = data.Fixture
|
|
|
|
def test_delete_security_group_rule(self):
|
|
ret = self.cs.security_group_rules.delete(1)
|
|
self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('DELETE', '/os-security-group-rules/1')
|
|
|
|
def test_create_security_group_rule(self):
|
|
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
|
|
"10.0.0.0/16")
|
|
self.assert_request_id(sg, fakes.FAKE_REQUEST_ID_LIST)
|
|
|
|
body = {
|
|
"security_group_rule": {
|
|
"ip_protocol": "tcp",
|
|
"from_port": 1,
|
|
"to_port": 65535,
|
|
"cidr": "10.0.0.0/16",
|
|
"group_id": None,
|
|
"parent_group_id": 1,
|
|
}
|
|
}
|
|
|
|
self.assert_called('POST', '/os-security-group-rules', body)
|
|
self.assertIsInstance(sg, security_group_rules.SecurityGroupRule)
|
|
|
|
def test_create_security_group_group_rule(self):
|
|
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
|
|
"10.0.0.0/16", 101)
|
|
self.assert_request_id(sg, fakes.FAKE_REQUEST_ID_LIST)
|
|
|
|
body = {
|
|
"security_group_rule": {
|
|
"ip_protocol": "tcp",
|
|
"from_port": 1,
|
|
"to_port": 65535,
|
|
"cidr": "10.0.0.0/16",
|
|
"group_id": 101,
|
|
"parent_group_id": 1,
|
|
}
|
|
}
|
|
|
|
self.assert_called('POST', '/os-security-group-rules', body)
|
|
self.assertIsInstance(sg, security_group_rules.SecurityGroupRule)
|
|
|
|
def test_invalid_parameters_create(self):
|
|
self.assertRaises(exceptions.CommandError,
|
|
self.cs.security_group_rules.create,
|
|
1, "invalid_ip_protocol", 1, 65535,
|
|
"10.0.0.0/16", 101)
|
|
self.assertRaises(exceptions.CommandError,
|
|
self.cs.security_group_rules.create,
|
|
1, "tcp", "invalid_from_port", 65535,
|
|
"10.0.0.0/16", 101)
|
|
self.assertRaises(exceptions.CommandError,
|
|
self.cs.security_group_rules.create,
|
|
1, "tcp", 1, "invalid_to_port",
|
|
"10.0.0.0/16", 101)
|
|
|
|
def test_security_group_rule_str(self):
|
|
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
|
|
"10.0.0.0/16")
|
|
self.assert_request_id(sg, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assertEqual('1', str(sg))
|
|
|
|
def test_security_group_rule_del(self):
|
|
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
|
|
"10.0.0.0/16")
|
|
ret = sg.delete()
|
|
self.assert_request_id(ret, fakes.FAKE_REQUEST_ID_LIST)
|
|
self.assert_called('DELETE', '/os-security-group-rules/1')
|