diff options
| author | vladimir.p <vladimir@zadarastorage.com> | 2011-07-22 17:12:14 -0700 |
|---|---|---|
| committer | vladimir.p <vladimir@zadarastorage.com> | 2011-07-22 17:12:14 -0700 |
| commit | a4f1ac011cdb086bf77ba3d2e14b9a34001cc8a7 (patch) | |
| tree | 18d0a058d6fb5fe6df08320a463dfa08c4abc821 /nova/tests | |
| parent | 2b9181632786bdbb92911b4a6e7180cb06c8f9d8 (diff) | |
| parent | c3a0c914b17d3ad677208808162065b1688ec9ac (diff) | |
Merged with 1306 + fix for dns change
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/__init__.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_versions.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_network.py | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index 7df6c06eb..720d5b0e6 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -67,7 +67,8 @@ def setup(): bridge=FLAGS.flat_network_bridge, bridge_interface=bridge_interface, vpn_start=FLAGS.vpn_start, - vlan_start=FLAGS.vlan_start) + vlan_start=FLAGS.vlan_start, + dns1=FLAGS.flat_network_dns) for net in db.network_get_all(ctxt): network.set_network_host(ctxt, net) diff --git a/nova/tests/api/openstack/test_versions.py b/nova/tests/api/openstack/test_versions.py index 0eae18a62..da964ee1f 100644 --- a/nova/tests/api/openstack/test_versions.py +++ b/nova/tests/api/openstack/test_versions.py @@ -174,7 +174,7 @@ class VersionsTest(test.TestCase): { "rel": "self", "href": "http://test/2.7.1", - } + }, ], }, ] @@ -204,7 +204,7 @@ class VersionsTest(test.TestCase): { "rel": "self", "href": "http://test/2.9.8", - } + }, ], }, ] diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py index d30c5e9e5..fbe7d769e 100644 --- a/nova/tests/test_network.py +++ b/nova/tests/test_network.py @@ -55,7 +55,8 @@ networks = [{'id': 0, 'bridge_interface': 'fake_fa0', 'gateway': '192.168.0.1', 'broadcast': '192.168.0.255', - 'dns': '192.168.0.1', + 'dns1': '192.168.0.1', + 'dns2': '192.168.0.2', 'vlan': None, 'host': None, 'project_id': 'fake_project', @@ -73,7 +74,8 @@ networks = [{'id': 0, 'bridge_interface': 'fake_fa1', 'gateway': '192.168.1.1', 'broadcast': '192.168.1.255', - 'dns': '192.168.0.1', + 'dns1': '192.168.0.1', + 'dns2': '192.168.0.2', 'vlan': None, 'host': None, 'project_id': 'fake_project', |