~sandy-walsh/nova/zones

« back to all changes in this revision

Viewing changes to nova/tests/test_api.py

  • Committer: Sandy Walsh
  • Date: 2011-02-17 21:39:03 UTC
  • mfrom: (635.1.60 nova)
  • Revision ID: sandy.walsh@rackspace.com-20110217213903-swehe88wea8inxow
changed from 003-004 migration

Show diffs side-by-side

added added

removed removed

Lines of Context:
248
248
        self.mox.ReplayAll()
249
249
 
250
250
        rv = self.ec2.get_all_security_groups()
251
 
        # I don't bother checkng that we actually find it here,
252
 
        # because the create/delete unit test further up should
253
 
        # be good enough for that.
254
 
        for group in rv:
255
 
            if group.name == security_group_name:
256
 
                self.assertEquals(len(group.rules), 1)
257
 
                self.assertEquals(int(group.rules[0].from_port), 80)
258
 
                self.assertEquals(int(group.rules[0].to_port), 81)
259
 
                self.assertEquals(len(group.rules[0].grants), 1)
260
 
                self.assertEquals(str(group.rules[0].grants[0]), '0.0.0.0/0')
 
251
 
 
252
        group = [grp for grp in rv if grp.name == security_group_name][0]
 
253
 
 
254
        self.assertEquals(len(group.rules), 1)
 
255
        self.assertEquals(int(group.rules[0].from_port), 80)
 
256
        self.assertEquals(int(group.rules[0].to_port), 81)
 
257
        self.assertEquals(len(group.rules[0].grants), 1)
 
258
        self.assertEquals(str(group.rules[0].grants[0]), '0.0.0.0/0')
261
259
 
262
260
        self.expect_http()
263
261
        self.mox.ReplayAll()
314
312
        self.mox.ReplayAll()
315
313
 
316
314
        rv = self.ec2.get_all_security_groups()
317
 
        # I don't bother checkng that we actually find it here,
318
 
        # because the create/delete unit test further up should
319
 
        # be good enough for that.
320
 
        for group in rv:
321
 
            if group.name == security_group_name:
322
 
                self.assertEquals(len(group.rules), 1)
323
 
                self.assertEquals(int(group.rules[0].from_port), 80)
324
 
                self.assertEquals(int(group.rules[0].to_port), 81)
325
 
                self.assertEquals(len(group.rules[0].grants), 1)
326
 
                self.assertEquals(str(group.rules[0].grants[0]), '::/0')
 
315
 
 
316
        group = [grp for grp in rv if grp.name == security_group_name][0]
 
317
        self.assertEquals(len(group.rules), 1)
 
318
        self.assertEquals(int(group.rules[0].from_port), 80)
 
319
        self.assertEquals(int(group.rules[0].to_port), 81)
 
320
        self.assertEquals(len(group.rules[0].grants), 1)
 
321
        self.assertEquals(str(group.rules[0].grants[0]), '::/0')
327
322
 
328
323
        self.expect_http()
329
324
        self.mox.ReplayAll()