diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-08 08:20:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-08 08:20:02 +0000 |
| commit | 6f5ec5e79c6f62249d12fb401e347d61b3e4db48 (patch) | |
| tree | e2e06465067ede4fff6aeff6747582f5ade43cb5 | |
| parent | 33098fbec32fc58423fd18492e8590cfe2807d35 (diff) | |
| parent | 932af34740162406aced0b08c54b7213bbd5022f (diff) | |
| download | nova-6f5ec5e79c6f62249d12fb401e347d61b3e4db48.tar.gz nova-6f5ec5e79c6f62249d12fb401e347d61b3e4db48.tar.xz nova-6f5ec5e79c6f62249d12fb401e347d61b3e4db48.zip | |
Merge "Fix network manager ipv6 tests."
| -rw-r--r-- | nova/tests/network/test_manager.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index b12d12167..700b74141 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -23,6 +23,7 @@ from nova import context from nova import db from nova.db.sqlalchemy import models from nova import exception +from nova import ipv6 from nova.network import linux_net from nova.network import manager as network_manager from nova.openstack.common import importutils @@ -1118,6 +1119,8 @@ class CommonNetworkTestCase(test.TestCase): def setUp(self): super(CommonNetworkTestCase, self).setUp() self.context = context.RequestContext('fake', 'fake') + self.flags(ipv6_backend='rfc2462') + ipv6.reset_backend() def fake_create_fixed_ips(self, context, network_id, fixed_cidr=None): return None |