summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Kölker <jason@koelker.net>2011-05-26 11:54:45 -0500
committerJason Kölker <jason@koelker.net>2011-05-26 11:54:45 -0500
commitf726587dea5f06ac673cee0ecdefdc81118ab59a (patch)
tree025c01c41464c2fc0207b27c6f79c6631560eb60
parent87c702f9560165d78bd66a45eecc4ae49443229d (diff)
we don't need the mac or the host anymore
-rw-r--r--nova/tests/network/base.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/nova/tests/network/base.py b/nova/tests/network/base.py
index b06271c99..2f17b2b86 100644
--- a/nova/tests/network/base.py
+++ b/nova/tests/network/base.py
@@ -56,7 +56,6 @@ class NetworkTestCase(test.TestCase):
# create the necessary network data for the project
user_context = context.RequestContext(project=self.projects[i],
user=self.user)
- host = self.network.get_network_host(user_context.elevated())
instance_ref = self._create_instance(0)
self.instance_id = instance_ref['id']
instance_ref = self._create_instance(1)
@@ -72,15 +71,12 @@ class NetworkTestCase(test.TestCase):
self.manager.delete_user(self.user)
super(NetworkTestCase, self).tearDown()
- def _create_instance(self, project_num, mac=None):
- if not mac:
- mac = utils.generate_mac()
+ def _create_instance(self, project_num):
project = self.projects[project_num]
self.context._project = project
self.context.project_id = project.id
return db.instance_create(self.context,
- {'project_id': project.id,
- 'mac_address': mac})
+ {'project_id': project.id})
def _create_address(self, project_num, instance_id=None):
"""Create an address in given project num"""