openstack
/
heat
Code Issues Proposed changes

Match on subnet update_networks_matching_iface_port 

* Add subnet to interface managed keys when updating nets matching
  interface port
* Add tests to verify that matching on "poor" nets with only
  subnet works.

Change-Id: I3c2a251088fafef78c69aa4a758137907f414a60
Related-Bug: #1696483
Related-Bug: #1702279
This commit is contained in:
Harald Jensas 2017-12-21 13:58:36 +01:00
parent 07b9b1a033
commit 8b71c583ad
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/resources/openstack/nova/server_network_mixin.py
View File

@ -315,15 +315,18 @@ class ServerNetworkMixin(object):
def update_networks_matching_iface_port(self, nets, interfaces):
iface_managed_keys = (self.NETWORK_PORT, self.NETWORK_ID,
self.NETWORK_FIXED_IP)
self.NETWORK_FIXED_IP, self.NETWORK_SUBNET)
def get_iface_props(iface):
ipaddr = None
subnet = None
if len(iface.fixed_ips) > 0:
ipaddr = iface.fixed_ips[0]['ip_address']
subnet = iface.fixed_ips[0]['subnet_id']
return {self.NETWORK_PORT: iface.port_id,
self.NETWORK_ID: iface.net_id,
self.NETWORK_FIXED_IP: ipaddr}
self.NETWORK_FIXED_IP: ipaddr,
self.NETWORK_SUBNET: subnet}
interfaces_net_props = [get_iface_props(iface) for iface in interfaces]
for net in nets:

41
heat/tests/openstack/nova/test_server.py
View File

@ -3371,7 +3371,7 @@ class ServersTest(common.HeatTestCase):
return_server = self.fc.servers.list()[3]
server = self._create_test_server(return_server, 'networks_update')
# old order 0 1 2 3 4
# old order 0 1 2 3 4 5 6
nets = [
self.create_old_net(port='aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'),
self.create_old_net(net='gggggggg-1111-1111-1111-gggggggggggg',
@ -3379,8 +3379,11 @@ class ServersTest(common.HeatTestCase):
self.create_old_net(net='gggggggg-1111-1111-1111-gggggggggggg'),
self.create_old_net(port='dddddddd-dddd-dddd-dddd-dddddddddddd'),
self.create_old_net(net='gggggggg-1111-1111-1111-gggggggggggg',
ip='5.6.7.8')]
# new order 2 3 0 1 4
ip='5.6.7.8'),
self.create_old_net(net='gggggggg-1111-1111-1111-gggggggggggg',
subnet='hhhhhhhh-1111-1111-1111-hhhhhhhhhhhh'),
self.create_old_net(subnet='iiiiiiii-1111-1111-1111-iiiiiiiiiiii')]
# new order 2 3 0 1 4 6 5
interfaces = [
create_fake_iface(port='cccccccc-cccc-cccc-cccc-cccccccccccc',
net=nets[2]['network'],
@ -3396,7 +3399,16 @@ class ServersTest(common.HeatTestCase):
ip=nets[1]['fixed_ip']),
create_fake_iface(port='eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee',
net=nets[4]['network'],
ip=nets[4]['fixed_ip'])]
ip=nets[4]['fixed_ip']),
create_fake_iface(port='gggggggg-gggg-gggg-gggg-gggggggggggg',
net='gggggggg-1111-1111-1111-gggggggggggg',
ip='10.0.0.14',
subnet=nets[6]['subnet']),
create_fake_iface(port='ffffffff-ffff-ffff-ffff-ffffffffffff',
net=nets[5]['network'],
ip='10.0.0.15',
subnet=nets[5]['subnet'])]
# all networks should get port id
expected = [
{'port': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
@ -3443,11 +3455,32 @@ class ServersTest(common.HeatTestCase):
'floating_ip': None,
'network': 'gggggggg-1111-1111-1111-gggggggggggg',
'allocate_network': None,
'tag': None},
{'port': 'ffffffff-ffff-ffff-ffff-ffffffffffff',
'uuid': None,
'fixed_ip': '10.0.0.15',
'subnet': 'hhhhhhhh-1111-1111-1111-hhhhhhhhhhhh',
'port_extra_properties': None,
'floating_ip': None,
'network': 'gggggggg-1111-1111-1111-gggggggggggg',
'allocate_network': None,
'tag': None},
{'port': 'gggggggg-gggg-gggg-gggg-gggggggggggg',
'uuid': None,
'fixed_ip': '10.0.0.14',
'subnet': 'iiiiiiii-1111-1111-1111-iiiiiiiiiiii',
'port_extra_properties': None,
'floating_ip': None,
'network': 'gggggggg-1111-1111-1111-gggggggggggg',
'allocate_network': None,
'tag': None}]
self.patchobject(neutron.NeutronClientPlugin,
'find_resourceid_by_name_or_id',
return_value='gggggggg-1111-1111-1111-gggggggggggg')
self.patchobject(neutron.NeutronClientPlugin,
'network_id_from_subnet_id',
return_value='gggggggg-1111-1111-1111-gggggggggggg')
server.update_networks_matching_iface_port(nets, interfaces)
self.assertEqual(expected, nets)