summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-07-05 17:01:19 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-07-05 17:01:19 -0700
commit77b655cd16a265eb2b8fc369941d19890766e712 (patch)
tree3a590f2a243f433e2688411bfc5fade6524f1838
parent11dfe937bcfa542c985a977e9ff855f717e80e69 (diff)
update tests
-rw-r--r--nova/tests/__init__.py1
-rw-r--r--nova/tests/test_network.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index e4ed75d37..b885000e1 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -59,6 +59,7 @@ def setup():
network.create_networks(ctxt,
label='test',
cidr=FLAGS.fixed_range,
+ multi_host=FLAGS.multi_host,
num_networks=FLAGS.num_networks,
network_size=FLAGS.network_size,
cidr_v6=FLAGS.fixed_range_v6,
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 6d5166019..390cdc003 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -44,6 +44,7 @@ class FakeModel(dict):
networks = [{'id': 0,
'label': 'test0',
'injected': False,
+ 'multi_host': False,
'cidr': '192.168.0.0/24',
'cidr_v6': '2001:db8::/64',
'gateway_v6': '2001:db8::1',
@@ -61,6 +62,7 @@ networks = [{'id': 0,
{'id': 1,
'label': 'test1',
'injected': False,
+ 'multi_host': False,
'cidr': '192.168.1.0/24',
'cidr_v6': '2001:db9::/64',
'gateway_v6': '2001:db9::1',
@@ -163,6 +165,7 @@ class FlatNetworkTestCase(test.TestCase):
self.assertDictMatch(nw[0], check)
check = {'broadcast': '192.168.%s.255' % i,
+ 'dhcp_server': '192.168.%s.1' % i,
'dns': 'DONTCARE',
'gateway': '192.168.%s.1' % i,
'gateway6': '2001:db%s::1' % i8,