openstack
/
nova
Code Issues Proposed changes

Use UUID as vif and network_id in vif tests 

Later patches depend on these more realistic test data. Also a faulty
test case, test_compute.ComputeAPITestCase.test_attach_interface_failed
has been caught and fixed.

Part of blueprint sriov-interface-attach-detach

Change-Id: I4bdd25458998ca1a9fb411dfd015684a6d3fcfa3
This commit is contained in:
Balazs Gibizer 2020-08-28 16:09:10 +02:00
parent 7e8a9786dc
commit 5bea8a09c5
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/unit/compute/test_compute.py
View File

@ -10298,7 +10298,7 @@ class ComputeAPITestCase(BaseTestCase):
network_id,
port_id,
req_ip, None)
self.assertEqual(vif['id'], network_id)
self.assertEqual(vif['id'], port_id)
mock_allocate.assert_called_once_with(
self.context, instance, port_id, network_id, req_ip,
bind_host_id='fake-mini', tag=None)
@ -10330,7 +10330,7 @@ class ComputeAPITestCase(BaseTestCase):
network_id,
port_id,
req_ip, tag='foo')
self.assertEqual(vif['id'], network_id)
self.assertEqual(vif['id'], port_id)
mock_allocate.assert_called_once_with(
self.context, instance, port_id, network_id, req_ip,
bind_host_id='fake-mini', tag='foo')
@ -10386,7 +10386,7 @@ class ComputeAPITestCase(BaseTestCase):
self.compute.attach_interface, self.context,
instance, network_id, port_id, req_ip, None)
mock_allocate.assert_called_once_with(self.context, instance,
network_id, port_id, req_ip,
port_id, network_id, req_ip,
bind_host_id='fake-host',
tag=None)
mock_deallocate.assert_called_once_with(self.context, instance,

8
nova/tests/unit/fake_network_cache_model.py
View File

@ -13,6 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_utils.fixture import uuidsentinel as uuids
from nova.network import model
@ -81,7 +83,7 @@ def new_subnet(subnet_dict=None, version=4):
def new_network(network_dict=None, version=4):
if version == 6:
new_net = dict(
id=1,
id=uuids.network_id,
bridge='br0',
label='public',
subnets=[new_subnet(version=6),
@ -89,7 +91,7 @@ def new_network(network_dict=None, version=4):
version=6)])
elif version == 4:
new_net = dict(
id=1,
id=uuids.network_id,
bridge='br0',
label='public',
subnets=[new_subnet(), new_subnet(dict(cidr='255.255.255.255'))])
@ -100,7 +102,7 @@ def new_network(network_dict=None, version=4):
def new_vif(vif_dict=None, version=4):
vif = dict(
id=1,
id=uuids.vif_id,
address='aa:aa:aa:aa:aa:aa',
type='bridge',
network=new_network(version=version))

44
nova/tests/unit/network/test_network_info.py
View File

@ -278,7 +278,7 @@ class SubnetTests(test.NoDBTestCase):
class NetworkTests(test.NoDBTestCase):
def test_create_network(self):
network = fake_network_cache_model.new_network()
self.assertEqual(1, network['id'])
self.assertEqual(uuids.network_id, network['id'])
self.assertEqual('br0', network['bridge'])
self.assertEqual('public', network['label'])
self.assertEqual(
@ -336,7 +336,7 @@ class NetworkTests(test.NoDBTestCase):
fake_network_cache_model.new_subnet(dict(cidr='255.255.255.255'))
network = model.Network.hydrate(fake_network_cache_model.new_network())
self.assertEqual(1, network['id'])
self.assertEqual(uuids.network_id, network['id'])
self.assertEqual('br0', network['bridge'])
self.assertEqual('public', network['label'])
self.assertEqual(
@ -348,7 +348,7 @@ class NetworkTests(test.NoDBTestCase):
class VIFTests(test.NoDBTestCase):
def test_create_vif(self):
vif = fake_network_cache_model.new_vif()
self.assertEqual(1, vif['id'])
self.assertEqual(uuids.vif_id, vif['id'])
self.assertEqual('aa:aa:aa:aa:aa:aa', vif['address'])
self.assertEqual(fake_network_cache_model.new_network(),
vif['network'])
@ -405,12 +405,12 @@ class VIFTests(test.NoDBTestCase):
def test_create_vif_with_type(self):
vif_dict = dict(
id=1,
id=uuids.vif_id,
address='aa:aa:aa:aa:aa:aa',
network=fake_network_cache_model.new_network(),
type='bridge')
vif = fake_network_cache_model.new_vif(vif_dict)
self.assertEqual(1, vif['id'])
self.assertEqual(uuids.vif_id, vif['id'])
self.assertEqual('aa:aa:aa:aa:aa:aa', vif['address'])
self.assertEqual('bridge', vif['type'])
self.assertEqual(fake_network_cache_model.new_network(),
@ -440,7 +440,7 @@ class VIFTests(test.NoDBTestCase):
vif = fake_network_cache_model.new_vif()
labeled_ips = vif.labeled_ips()
ip_dict = {
'network_id': 1,
'network_id': uuids.network_id,
'ips': [fake_network_cache_model.new_ip(
{'address': '10.10.0.2', 'type': 'fixed'}),
fake_network_cache_model.new_ip(
@ -451,19 +451,19 @@ class VIFTests(test.NoDBTestCase):
def test_hydrate(self):
fake_network_cache_model.new_network()
vif = model.VIF.hydrate(fake_network_cache_model.new_vif())
self.assertEqual(1, vif['id'])
self.assertEqual(uuids.vif_id, vif['id'])
self.assertEqual('aa:aa:aa:aa:aa:aa', vif['address'])
self.assertEqual(fake_network_cache_model.new_network(),
vif['network'])
def test_hydrate_vif_with_type(self):
vif_dict = dict(
id=1,
id=uuids.vif_id,
address='aa:aa:aa:aa:aa:aa',
network=fake_network_cache_model.new_network(),
type='bridge')
vif = model.VIF.hydrate(fake_network_cache_model.new_vif(vif_dict))
self.assertEqual(1, vif['id'])
self.assertEqual(uuids.vif_id, vif['id'])
self.assertEqual('aa:aa:aa:aa:aa:aa', vif['address'])
self.assertEqual('bridge', vif['type'])
self.assertEqual(fake_network_cache_model.new_network(),
@ -938,7 +938,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
'id': 'interface0',
'type': 'phy',
'ethernet_mac_address': 'aa:aa:aa:aa:aa:aa',
'vif_id': 1,
'vif_id': uuids.vif_id,
'mtu': 1500
},
net_metadata['links'][0])
@ -965,7 +965,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
],
'services': [{'address': '1.2.3.4', 'type': 'dns'},
{'address': '2.3.4.5', 'type': 'dns'}],
'network_id': 1
'network_id': uuids.network_id
},
net_metadata['networks'][0])
@ -990,7 +990,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
],
'services': [{'address': '1:2:3:4::', 'type': 'dns'},
{'address': '2:3:4:5::', 'type': 'dns'}],
'network_id': 1
'network_id': uuids.network_id
},
net_metadata['networks'][1])
@ -1010,7 +1010,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
'id': 'network0',
'link': 'interface0',
'type': 'ipv4_dhcp',
'network_id': 1
'network_id': uuids.network_id
},
net_metadata['networks'][0])
@ -1020,7 +1020,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
'id': 'network1',
'link': 'interface0',
'type': 'ipv6_dhcp',
'network_id': 1
'network_id': uuids.network_id
},
net_metadata['networks'][1])
@ -1055,7 +1055,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
{'address': '2:3:4:5::', 'type': 'dns'}
],
'type': 'ipv6_%s' % mode,
'network_id': 1
'network_id': uuids.network_id
},
net_metadata['networks'][1])
@ -1074,7 +1074,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
'ip_address': '10.10.0.2',
'link': 1,
'netmask': '255.255.255.0',
'network_id': 1,
'network_id': uuids.network_id,
'routes': [
{
'gateway': '10.10.0.1',
@ -1097,7 +1097,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
def test__get_eth_link(self):
expected_link = {
'id': 'interface0',
'vif_id': 1,
'vif_id': uuids.vif_id,
'type': 'vif',
'ethernet_mac_address': 'aa:aa:aa:aa:aa:aa',
'mtu': 1500
@ -1109,7 +1109,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
def test__get_eth_link_physical(self):
expected_link = {
'id': 'interface1',
'vif_id': 1,
'vif_id': uuids.vif_id,
'type': 'phy',
'ethernet_mac_address': 'aa:aa:aa:aa:aa:aa',
'mtu': 1500
@ -1161,14 +1161,14 @@ class TestNetworkMetadata(test.NoDBTestCase):
"ethernet_mac_address": "aa:aa:aa:aa:aa:aa",
"id": "interface0",
"type": "phy",
"vif_id": 1,
"vif_id": uuids.vif_id,
"mtu": 1500
},
{
"ethernet_mac_address": "aa:aa:aa:aa:aa:ab",
"id": "interface1",
"type": "phy",
"vif_id": 1,
"vif_id": uuids.vif_id,
"mtu": 1500
},
],
@ -1277,7 +1277,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
],
"networks": [
{
"network_id": 1,
"network_id": uuids.network_id,
"type": "ipv6",
"netmask": "ffff:ffff:ffff::",
"link": "interface0",
@ -1305,7 +1305,7 @@ class TestNetworkMetadata(test.NoDBTestCase):
"mtu": 1500,
"type": "phy",
"id": "interface0",
"vif_id": 1
"vif_id": uuids.vif_id
}
]
}