From 093c8200a102891232e2da166830cd59ee133fc4 Mon Sep 17 00:00:00 2001 From: Trey Morris Date: Mon, 14 Mar 2011 13:32:22 -0500 Subject: committing to share --- nova/tests/test_compute.py | 1 - nova/tests/test_quota.py | 1 - nova/tests/test_scheduler.py | 1 - nova/tests/test_volume.py | 1 - 4 files changed, 4 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index b049ac943..ba1f6be46 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -65,7 +65,6 @@ class ComputeTestCase(test.TestCase): inst['user_id'] = self.user.id inst['project_id'] = self.project.id inst['instance_type'] = 'm1.tiny' - inst['mac_address'] = utils.generate_mac() inst['ami_launch_index'] = 0 return db.instance_create(self.context, inst)['id'] diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py index 1e42fddf3..b1e7910ca 100644 --- a/nova/tests/test_quota.py +++ b/nova/tests/test_quota.py @@ -63,7 +63,6 @@ class QuotaTestCase(test.TestCase): inst['project_id'] = self.project.id inst['instance_type'] = 'm1.large' inst['vcpus'] = cores - inst['mac_address'] = utils.generate_mac() return db.instance_create(self.context, inst)['id'] def _create_volume(self, size=10): diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py index b6888c4d2..b34b374fd 100644 --- a/nova/tests/test_scheduler.py +++ b/nova/tests/test_scheduler.py @@ -160,7 +160,6 @@ class SimpleDriverTestCase(test.TestCase): inst['user_id'] = self.user.id inst['project_id'] = self.project.id inst['instance_type'] = 'm1.tiny' - inst['mac_address'] = utils.generate_mac() inst['ami_launch_index'] = 0 inst['vcpus'] = 1 inst['availability_zone'] = kwargs.get('availability_zone', None) diff --git a/nova/tests/test_volume.py b/nova/tests/test_volume.py index b40ca004b..68412a184 100644 --- a/nova/tests/test_volume.py +++ b/nova/tests/test_volume.py @@ -105,7 +105,6 @@ class VolumeTestCase(test.TestCase): inst['user_id'] = 'fake' inst['project_id'] = 'fake' inst['instance_type'] = 'm1.tiny' - inst['mac_address'] = utils.generate_mac() inst['ami_launch_index'] = 0 instance_id = db.instance_create(self.context, inst)['id'] mountpoint = "/dev/sdf" -- cgit