diff options
| -rw-r--r-- | nova/tests/test_cloud.py | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py index e4f445cf5..3727160cb 100644 --- a/nova/tests/test_cloud.py +++ b/nova/tests/test_cloud.py @@ -209,36 +209,37 @@ class CloudTestCase(test.TestCase): db.service_destroy(self.context, service2['id']) # NOTE(jkoelker): this test relies on fixed_ip being in instances - #def test_describe_instances(self): - # """Makes sure describe_instances works and filters results.""" - # inst1 = db.instance_create(self.context, {'reservation_id': 'a', - # 'image_id': 1, - # 'host': 'host1'}) - # inst2 = db.instance_create(self.context, {'reservation_id': 'a', - # 'image_id': 1, - # 'host': 'host2'}) - # comp1 = db.service_create(self.context, {'host': 'host1', - # 'availability_zone': 'zone1', - # 'topic': "compute"}) - # comp2 = db.service_create(self.context, {'host': 'host2', - # 'availability_zone': 'zone2', - # 'topic': "compute"}) - # result = self.cloud.describe_instances(self.context) - # result = result['reservationSet'][0] - # self.assertEqual(len(result['instancesSet']), 2) - # instance_id = ec2utils.id_to_ec2_id(inst2['id']) - # result = self.cloud.describe_instances(self.context, - # instance_id=[instance_id]) - # result = result['reservationSet'][0] - # self.assertEqual(len(result['instancesSet']), 1) - # self.assertEqual(result['instancesSet'][0]['instanceId'], - # instance_id) - # self.assertEqual(result['instancesSet'][0] - # ['placement']['availabilityZone'], 'zone2') - # db.instance_destroy(self.context, inst1['id']) - # db.instance_destroy(self.context, inst2['id']) - # db.service_destroy(self.context, comp1['id']) - # db.service_destroy(self.context, comp2['id']) + @test.skip_test("EC2 stuff needs fixed_ip in instance_ref") + def test_describe_instances(self): + """Makes sure describe_instances works and filters results.""" + inst1 = db.instance_create(self.context, {'reservation_id': 'a', + 'image_id': 1, + 'host': 'host1'}) + inst2 = db.instance_create(self.context, {'reservation_id': 'a', + 'image_id': 1, + 'host': 'host2'}) + comp1 = db.service_create(self.context, {'host': 'host1', + 'availability_zone': 'zone1', + 'topic': "compute"}) + comp2 = db.service_create(self.context, {'host': 'host2', + 'availability_zone': 'zone2', + 'topic': "compute"}) + result = self.cloud.describe_instances(self.context) + result = result['reservationSet'][0] + self.assertEqual(len(result['instancesSet']), 2) + instance_id = ec2utils.id_to_ec2_id(inst2['id']) + result = self.cloud.describe_instances(self.context, + instance_id=[instance_id]) + result = result['reservationSet'][0] + self.assertEqual(len(result['instancesSet']), 1) + self.assertEqual(result['instancesSet'][0]['instanceId'], + instance_id) + self.assertEqual(result['instancesSet'][0] + ['placement']['availabilityZone'], 'zone2') + db.instance_destroy(self.context, inst1['id']) + db.instance_destroy(self.context, inst2['id']) + db.service_destroy(self.context, comp1['id']) + db.service_destroy(self.context, comp2['id']) def test_describe_images(self): describe_images = self.cloud.describe_images @@ -432,13 +433,14 @@ class CloudTestCase(test.TestCase): db.instance_destroy(self.context, inst['id']) # NOTE(jkoelker): This test relies on mac_address in instance - #def test_update_of_instance_wont_update_private_fields(self): - # inst = db.instance_create(self.context, {}) - # self.cloud.update_instance(self.context, inst['id'], - # mac_address='DE:AD:BE:EF') - # inst = db.instance_get(self.context, inst['id']) - # self.assertEqual(None, inst['mac_address']) - # db.instance_destroy(self.context, inst['id']) + @test.skip_test("EC2 stuff needs mac_address in instance_ref") + def test_update_of_instance_wont_update_private_fields(self): + inst = db.instance_create(self.context, {}) + self.cloud.update_instance(self.context, inst['id'], + mac_address='DE:AD:BE:EF') + inst = db.instance_get(self.context, inst['id']) + self.assertEqual(None, inst['mac_address']) + db.instance_destroy(self.context, inst['id']) def test_update_of_volume_display_fields(self): vol = db.volume_create(self.context, {}) |