diff options
| author | Devananda van der Veen <devananda.vdv@gmail.com> | 2012-12-27 17:19:21 -0800 |
|---|---|---|
| committer | Devananda van der Veen <devananda.vdv@gmail.com> | 2013-01-02 10:02:16 -0800 |
| commit | 0673aef9ff336b29a744cea02103ff992b50cbc6 (patch) | |
| tree | 922ab445d39519cb6cbcbeb44e6c8e925012ee48 /nova/tests | |
| parent | 4690b501b58bc499029bc4586ff4b7c0917d2395 (diff) | |
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
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/baremetal/test_driver.py | 2 | ||||
| -rw-r--r-- | nova/tests/utils.py | 7 |
2 files changed, 6 insertions, 3 deletions
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)] |