openstack
/
openstacksdk
Code Issues Proposed changes

Merge "Apply urllib.parse.quote in unittests to get_mock_url"

This commit is contained in:
Zuul 2021-01-18 20:26:37 +00:00 committed by Gerrit Code Review
parent 4893c5c922 4c870cf2b9
commit 4629245277
5 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack/tests/unit/base.py
View File

@ -187,10 +187,13 @@ class TestCase(base.TestCase):
to_join.append(base_url_append)
if resource:
to_join.append(resource)
to_join.extend(append or [])
if append:
to_join.extend([urllib.parse.quote(i) for i in append])
if qs_elements is not None:
qs = '?%s' % '&'.join(qs_elements)
return '%(uri)s%(qs)s' % {'uri': '/'.join(to_join), 'qs': qs}
return '%(uri)s%(qs)s' % {
'uri': '/'.join(to_join),
'qs': qs}
def mock_for_keystone_projects(self, project=None, v3=True,
list_get=False, id_get=False,

4
openstack/tests/unit/cloud/test_baremetal_node.py
View File

@ -71,13 +71,13 @@ class TestBaremetalNode(base.IronicTestCase):
def test_get_machine_by_mac(self):
mac_address = '00:01:02:03:04:05'
url_address = 'detail?address=%s' % mac_address
node_uuid = self.fake_baremetal_node['uuid']
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
resource='ports',
append=[url_address]),
append=['detail'],
qs_elements=['address=%s' % mac_address]),
json={'ports': [{'address': mac_address,
'node_uuid': node_uuid}]}),
dict(method='GET',

26
openstack/tests/unit/cloud/test_baremetal_ports.py
View File

@ -64,10 +64,13 @@ class TestBaremetalPort(base.IronicTestCase):
self.assert_calls()
def test_list_nics_for_machine(self):
query = 'detail?node_uuid=%s' % self.fake_baremetal_node['uuid']
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(resource='ports', append=[query]),
uri=self.get_mock_url(
resource='ports',
append=['detail'],
qs_elements=['node_uuid=%s' %
self.fake_baremetal_node['uuid']]),
json={'ports': [self.fake_baremetal_port,
self.fake_baremetal_port2]}),
])
@ -79,10 +82,13 @@ class TestBaremetalPort(base.IronicTestCase):
self.assert_calls()
def test_list_nics_for_machine_failure(self):
query = 'detail?node_uuid=%s' % self.fake_baremetal_node['uuid']
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(resource='ports', append=[query]),
uri=self.get_mock_url(
resource='ports',
append=['detail'],
qs_elements=['node_uuid=%s' %
self.fake_baremetal_node['uuid']]),
status_code=400)
])
@ -93,10 +99,12 @@ class TestBaremetalPort(base.IronicTestCase):
def test_get_nic_by_mac(self):
mac = self.fake_baremetal_port['address']
query = 'detail?address=%s' % mac
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(resource='ports', append=[query]),
uri=self.get_mock_url(
resource='ports',
append=['detail'],
qs_elements=['address=%s' % mac]),
json={'ports': [self.fake_baremetal_port]}),
])
@ -107,10 +115,12 @@ class TestBaremetalPort(base.IronicTestCase):
def test_get_nic_by_mac_failure(self):
mac = self.fake_baremetal_port['address']
query = 'detail?address=%s' % mac
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(resource='ports', append=[query]),
uri=self.get_mock_url(
resource='ports',
append=['detail'],
qs_elements=['address=%s' % mac]),
json={'ports': []}),
])

3
openstack/tests/unit/cloud/test_recordset.py
View File

@ -208,7 +208,8 @@ class TestRecordset(base.TestCase):
'next': self.get_mock_url(
'dns', 'public',
append=['v2', 'zones', fake_zone['id'],
'recordsets?limit=1&marker=asd']),
'recordsets'],
qs_elements=['limit=1', 'marker=asd']),
'self': self.get_mock_url(
'dns', 'public',
append=['v2', 'zones', fake_zone['id'],

8
openstack/tests/unit/cloud/test_zone.py
View File

@ -195,12 +195,12 @@ class TestZone(base.TestCase):
'links': {
'next': self.get_mock_url(
'dns', 'public',
append=['v2', 'zones',
'?limit=1&marker=asd']),
append=['v2', 'zones/'],
qs_elements=['limit=1', 'marker=asd']),
'self': self.get_mock_url(
'dns', 'public',
append=['v2', 'zones',
'?limit=1'])},
append=['v2', 'zones/'],
qs_elements=['limit=1'])},
'metadata':{'total_count': 2}}),
dict(method='GET',
uri=self.get_mock_url(