openstack
/
fuel-web
Code Issues Proposed changes

Merge "Add fallback test in __check_interfaces_correctness"

This commit is contained in:
Jenkins 2014-01-23 12:18:06 +00:00 committed by Gerrit Code Review
parent 17fab5e2d8 752aa4f87b
commit 0a70f7baba
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nailgun/nailgun/network/manager.py
View File

@ -718,6 +718,9 @@ class NetworkManager(object):
# Interface was founded
admin_interface = interface
break
elif interface['mac'].lower() == node.mac:
admin_interface = interface
break
if not admin_interface:
raise errors.InvalidInterfacesInfo(

10
nailgun/nailgun/test/integration/test_node_collection_handlers.py
View File

@ -294,6 +294,16 @@ class TestHandlers(BaseIntegrationTest):
self.assertNotEquals(node.timestamp, timestamp)
self.assertEquals('new', node.manufacturer)
def test_node_create_ip_not_in_admin_range(self):
node = self.env.create_node(api=False)
# Set IP outside of admin network range on eth1
node.meta['interfaces'][1]['ip'] = '10.21.0.3'
self.env.network_manager.update_interfaces_info(node)
# node.mac == eth0 mac so eth0 should now be admin interface
self.assertEquals(node.admin_interface.name, 'eth0')
def test_node_create_ext_mac(self):
node1 = self.env.create_node(
api=False