From 0673aef9ff336b29a744cea02103ff992b50cbc6 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Thu, 27 Dec 2012 17:19:21 -0800 Subject: Improve baremetal driver error handling Several improvements to baremetal driver are implemented in this patch. There is now significantly more error handling during spawn(). It also includes an addition to nova/tests/utils.py to provide additional sample information from get_test_network_info(). blueprint general-bare-metal-provisioning-framework Change-Id: I65d93051d7fcfd79f4d24d4ddb62fb1a55bee646 --- nova/tests/baremetal/test_driver.py | 2 +- nova/tests/utils.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/baremetal/test_driver.py index d060d3a5d..4c4e01719 100644 --- a/nova/tests/baremetal/test_driver.py +++ b/nova/tests/baremetal/test_driver.py @@ -159,7 +159,7 @@ class BareMetalDriverWithDBTestCase(bm_db_base.BMDBTestCase): db.bm_node_update(self.context, self.node['id'], {'id': 9876}) - self.assertRaises(exception.InstanceNotFound, + self.assertRaises(exception.NovaException, self.driver.spawn, **self.spawn_params) row = db.bm_node_get(self.context, 9876) diff --git a/nova/tests/utils.py b/nova/tests/utils.py index 9fabab593..45d0d295b 100644 --- a/nova/tests/utils.py +++ b/nova/tests/utils.py @@ -81,6 +81,7 @@ def get_test_network_info(count=1): fake_ip = '0.0.0.0/0' fake_ip_2 = '0.0.0.1/0' fake_ip_3 = '0.0.0.1/0' + fake_netmask = '255.255.255.255' fake_vlan = 100 fake_bridge_interface = 'eth0' network = {'bridge': fake, @@ -91,11 +92,13 @@ def get_test_network_info(count=1): 'injected': False} mapping = {'mac': fake, 'dhcp_server': fake, + 'dns': ['fake1', 'fake2'], 'gateway': fake, 'gateway_v6': fake, - 'ips': [{'ip': fake_ip}, {'ip': fake_ip}]} + 'ips': [{'ip': fake_ip, 'netmask': fake_netmask}, + {'ip': fake_ip, 'netmask': fake_netmask}]} if ipv6: - mapping['ip6s'] = [{'ip': fake_ip}, + mapping['ip6s'] = [{'ip': fake_ip, 'netmask': fake_netmask}, {'ip': fake_ip_2}, {'ip': fake_ip_3}] return [(network, mapping) for x in xrange(0, count)] -- cgit