diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-14 18:59:20 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-14 18:59:20 -0500 |
| commit | 24fb4fdcfde29312f7a63fe682abcd8b95175716 (patch) | |
| tree | fb2f77951be9f9586560c78fdbbbd6eaad2cc093 | |
| parent | e0238c30ac5bb4d2090d47608c08e2c208429055 (diff) | |
network user only set if doesnt exist
| -rw-r--r-- | nova/tests/db/fakes.py | 1 | ||||
| -rw-r--r-- | nova/tests/network/base.py | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py index f737c505c..8883322fc 100644 --- a/nova/tests/db/fakes.py +++ b/nova/tests/db/fakes.py @@ -72,6 +72,7 @@ def stub_out_db_network_api(stubs): fixed_ip_fields = {'id': 0, 'network_id': 0, + 'network': FakeModel(network_fields), 'address': '192.168.0.100', 'instance': False, 'instance_id': 0, diff --git a/nova/tests/network/base.py b/nova/tests/network/base.py index 023fbf4f1..a4a1f9d39 100644 --- a/nova/tests/network/base.py +++ b/nova/tests/network/base.py @@ -36,9 +36,10 @@ class NetworkTestCase(test.TestCase): fake_network=True, network_manager=self.network_manager) self.manager = manager.AuthManager() - self.user = self.manager.create_user('netuser', - 'netuser', - 'netuser') + if not hasattr(self, 'user'): + self.user = self.manager.create_user('netuser', + 'netuser', + 'netuser') self.projects = [] self.network = utils.import_object(FLAGS.network_manager) db_fakes.stub_out_db_network_api(self.stubs) |