Updated the EC2 metadata controller so that it returns the correct value

for instance-type metadata.

1 files changed, 15 insertions, 4 deletions

diff --git a/smoketests/test_netadmin.py b/smoketests/test_netadmin.py
index 8c8fa35b8f..ef73e6f4cf 100644
--- a/smoketests/test_netadmin.py
+++ b/smoketests/test_netadmin.py
@@ -107,14 +107,18 @@ class AddressTests(base.UserSmokeTestCase):
 
 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 @@ class SecurityGroupTests(base.UserSmokeTestCase):
         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,