Merge lp:~rackspace-titan/nova/fix_ec2_metadata_instance_type into lp:~hudson-openstack/nova/trunk

[Dan Prince]

Updated the EC2 metadata controller so that it returns the correct value for instance-type metadata.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[William Wolf (throughnothing)]

lgtm

review: Approve

[Jesse Andrews (anotherjesse)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~rackspace-titan/nova/fix_ec2_metadata_instance_type into lp:nova failed. Below is the output from the failed tests.

FloatingIpTest
    test_floating_ip_allocate OK 0.17
    test_floating_ip_associate OK 0.09
    test_floating_ip_disassociate OK 0.09
    test_floating_ip_release OK 0.09
    test_floating_ip_show OK 0.09
    test_floating_ips_list OK 0.22
    test_translate_floating_ip_view OK 0.04
    test_translate_floating_ip_view_dict OK 0.02
KeypairsTest
    test_keypair_create OK 0.24
    test_keypair_delete OK 0.09
    test_keypair_import OK 0.13
    test_keypair_list OK 0.08
FixedIpTest
    test_add_fixed_ip OK 0.08
    test_add_fixed_ip_no_network OK 0.08
    test_remove_fixed_ip OK 0.07
    test_remove_fixed_ip_no_address OK 0.27
TestSecurityGroupRules
    test_create_add_existing_rules_json OK 0.34
    test_create_by_cidr_json OK 0.34
    test_create_by_group_id_json OK 0.52
    test_create_rule_with_same_group_parent_id_json OK 0.32
    test_create_with_empty_group_id_json OK 0.48
    test_create_with_invalid_cidr_json OK 0.32
    test_create_with_invalid_from_port_json OK 0.48
    test_create_with_invalid_group_id_json OK 0.34
    test_create_with_invalid_parent_group_id_json OK 0.32
    test_create_with_invalid_protocol_json OK 0.48
    test_create_with_invalid_to_port_json OK 0.33
    test_create_with_no_body_json OK 0.45
    test_create_with_no_cidr_group_json OK 0.34
    test_create_with_no_protocol_json OK 0.47
    test_create_with_no_security_group_rule_in_body_json OK 0.29
    test_create_with_no_to_port_json OK 0.50
    test_create_with_non_existing_parent_group_id_json OK 0.33
    test_create_with_non_numerical_from_port_json OK 0.33
    test_create_with_non_numerical_to_port_json OK 0.49
    test_delete OK 0.46
    test_delete_invalid_rule_id OK 0.48
    test_delete_non_existing_rule_id OK 0.35
TestSecurityGroupRulesXMLDeserializer
    test_create_no_protocol_request OK 0.00
    test_create_request OK 0.00
TestSecurityGroupXMLDeserializer
    ...

[Dan Prince (dan-prince)]

Fixed the test_metadata tests. Should be good to go again.

[Brian Lamar (blamar)]

review: Approve

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-07-07 12:56:15 +0000
+++ nova/api/ec2/cloud.py	2011-08-16 14:50:32 +0000
@@ -305,7 +305,7 @@
                 'hostname': hostname,
                 'instance-action': 'none',
                 'instance-id': ec2_id,
-                'instance-type': instance_ref['instance_type'],
+                'instance-type': instance_ref['instance_type']['name'],
                 'local-hostname': hostname,
                 'local-ipv4': address,
                 'placement': {'availability-zone': availability_zone},
 
=== modified file 'nova/tests/test_metadata.py'
--- nova/tests/test_metadata.py	2011-07-07 12:56:15 +0000
+++ nova/tests/test_metadata.py	2011-08-16 14:50:32 +0000
@@ -39,7 +39,7 @@
                          'key_name': None,
                          'host': 'test',
                          'launch_index': 1,
-                         'instance_type': 'm1.tiny',
+                         'instance_type': {'name': 'm1.tiny'},
                          'reservation_id': 'r-xxxxxxxx',
                          'user_data': '',
                          'image_ref': 7,
 
=== modified file 'smoketests/test_netadmin.py'
--- smoketests/test_netadmin.py	2011-08-07 02:59:09 +0000
+++ smoketests/test_netadmin.py	2011-08-16 14:50:32 +0000
@@ -107,14 +107,18 @@
 
 class SecurityGroupTests(base.UserSmokeTestCase):
 
-    def __public_instance_is_accessible(self):
-        id_url = "latest/meta-data/instance-id"
+    def __get_metadata_item(self, category):
+        id_url = "latest/meta-data/%s" % category
         options = "-f -s --max-time 1"
         command = "curl %s %s/%s" % (options, self.data['public_ip'], id_url)
         status, output = commands.getstatusoutput(command)
-        instance_id = output.strip()
+        value = output.strip()
         if status > 0:
             return False
+        return value
+
+    def __public_instance_is_accessible(self):
+        instance_id = self.__get_metadata_item('instance-id')
         if not instance_id:
             return False
         if instance_id != self.data['instance'].id:
@@ -166,7 +170,14 @@
         finally:
             result = self.conn.disassociate_address(self.data['public_ip'])
 
-    def test_005_can_revoke_security_group_ingress(self):
+    def test_005_validate_metadata(self):
+
+        instance = self.data['instance']
+        self.assertTrue(instance.instance_type,
+                            self.__get_metadata_item("instance-type"))
+        #FIXME(dprince): validate more metadata here
+
+    def test_006_can_revoke_security_group_ingress(self):
         self.assertTrue(self.conn.revoke_security_group(TEST_GROUP,
                                                         ip_protocol='tcp',
                                                         from_port=80,