From 37f26ad82f6fef8c6fc21903b8c8183424bfd3fe Mon Sep 17 00:00:00 2001 From: Jens Rosenboom Date: Sat, 14 May 2016 21:52:14 +0200 Subject: [PATCH] Fix network mtu in network_metadata The mtu field is hidden inside the "meta" section, so we have to get it from there. Change-Id: Ic44dcdb04cbaf8a007338258d74eec136a580289 Closes-Bug: 1576713 --- nova/tests/unit/network/test_network_info.py | 4 ++-- nova/virt/netutils.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/tests/unit/network/test_network_info.py b/nova/tests/unit/network/test_network_info.py index d6f60eff288e..ce7d37da7462 100644 --- a/nova/tests/unit/network/test_network_info.py +++ b/nova/tests/unit/network/test_network_info.py @@ -865,7 +865,7 @@ class TestNetworkMetadata(test.NoDBTestCase): self.netinfo[0]['network']['subnets'][0] = ipv4_subnet self.netinfo[0]['network']['subnets'][1] = ipv6_subnet - self.netinfo[0]['network']['mtu'] = 1500 + self.netinfo[0]['network']['meta']['mtu'] = 1500 def test_get_network_metadata_json(self): @@ -1141,7 +1141,7 @@ class TestNetworkMetadata(test.NoDBTestCase): '11111111-1111-1111-1111-111111111111') self.netinfo[1]['network']['subnets'][0] = ipv4_subnet - self.netinfo[1]['network']['mtu'] = 1500 + self.netinfo[1]['network']['meta']['mtu'] = 1500 network_json = netutils.get_network_metadata(self.netinfo) self.assertEqual(expected_json, network_json) diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py index 505dc98f2dd3..8dbff85a8e0a 100644 --- a/nova/virt/netutils.py +++ b/nova/virt/netutils.py @@ -257,7 +257,7 @@ def _get_eth_link(vif, ifc_num): 'id': link_id, 'vif_id': vif['id'], 'type': nic_type, - 'mtu': vif['network'].get('mtu'), + 'mtu': vif['network']['meta'].get('mtu'), 'ethernet_mac_address': vif.get('address'), } return link