openstack/tempest
Code Issues Proposed changes

Remove unnecessary schema check of ip address

Browse Source 
This is to add more accurate ip version check in address
schema which will limit ip version value in [4, 6], and
to remove unnecessary schema check in testcases.

Change-Id: Ice426db172b8d697c8a5be0426fb3f7b25e548c2
This commit is contained in:
zhufl 2017-08-21 13:19:37 +08:00
parent e56964dfbe
commit 816358471f
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/add-ip-version-check-in-addresses-x491ac6d9abaxa12.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
Add more accurate ip version check in addresses schema which will
limit the ip version value in [4, 6].

3
tempest/api/compute/servers/test_server_addresses.py
View File

@ -51,9 +51,6 @@ class ServerAddressesTestJSON(base.BaseV2ComputeTest):
self.assertNotEmpty(addresses)
for network_addresses in addresses.values():
self.assertNotEmpty(network_addresses)
for address in network_addresses:
self.assertTrue(address['addr'])
self.assertTrue(address['version'])
@decorators.attr(type='smoke')
@decorators.idempotent_id('87bbc374-5538-4f64-b673-2b0e4443cc30')

6
tempest/api/compute/servers/test_virtual_interfaces.py
View File

@ -56,11 +56,11 @@ class VirtualInterfacesTestJSON(base.BaseV2ComputeTest):
self.client.list_virtual_interfaces(self.server['id'])
else:
output = self.client.list_virtual_interfaces(self.server['id'])
virt_ifaces = output
self.assertNotEmpty(virt_ifaces['virtual_interfaces'],
virt_ifaces = output['virtual_interfaces']
self.assertNotEmpty(virt_ifaces,
'Expected virtual interfaces, got 0 '
'interfaces.')
for virt_iface in virt_ifaces['virtual_interfaces']:
for virt_iface in virt_ifaces:
mac_address = virt_iface['mac_address']
self.assertTrue(netaddr.valid_mac(mac_address),
"Invalid mac address detected. mac address: %s"

2
tempest/lib/api_schema/response/compute/v2_1/parameter_types.py
View File

@ -65,7 +65,7 @@ addresses = {
'items': {
'type': 'object',
'properties': {
'version': {'type': 'integer'},
'version': {'enum': [4, 6]},
'addr': {
'type': 'string',
'oneOf': [