← Back to branch summary

~u-matt-h/nova/aws-api-validation

« back to all changes in this revision

Viewing changes to smoketests/test_netadmin.py

  • Committer: Matthew Hooker
  • Date: 2011-08-17 23:57:07 UTC
  • mfrom: (1416.1.34 nova)
  • Revision ID: matt@cloudscaling.com-20110817235707-djkwr0r5r8ia2u1x
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
smoketests/test_netadmin.py
107
107
 
108
108
class SecurityGroupTests(base.UserSmokeTestCase):
109
109
 
110
 
    def __public_instance_is_accessible(self):
111
 
        id_url = "latest/meta-data/instance-id"
 
110
    def __get_metadata_item(self, category):
 
111
        id_url = "latest/meta-data/%s" % category
112
112
        options = "-f -s --max-time 1"
113
113
        command = "curl %s %s/%s" % (options, self.data['public_ip'], id_url)
114
114
        status, output = commands.getstatusoutput(command)
115
 
        instance_id = output.strip()
 
115
        value = output.strip()
116
116
        if status > 0:
117
117
            return False
 
118
        return value
 
119
 
 
120
    def __public_instance_is_accessible(self):
 
121
        instance_id = self.__get_metadata_item('instance-id')
118
122
        if not instance_id:
119
123
            return False
120
124
        if instance_id != self.data['instance'].id:
166
170
        finally:
167
171
            result = self.conn.disassociate_address(self.data['public_ip'])
168
172
 
169
 
    def test_005_can_revoke_security_group_ingress(self):
 
173
    def test_005_validate_metadata(self):
 
174
 
 
175
        instance = self.data['instance']
 
176
        self.assertTrue(instance.instance_type,
 
177
                            self.__get_metadata_item("instance-type"))
 
178
        #FIXME(dprince): validate more metadata here
 
179
 
 
180
    def test_006_can_revoke_security_group_ingress(self):
170
181
        self.assertTrue(self.conn.revoke_security_group(TEST_GROUP,
171
182
                                                        ip_protocol='tcp',
172
183
                                                        from_port=80,