← Back to branch summary

~raxnetworking/nova/bare_bones_melange

« back to all changes in this revision

Viewing changes to nova/tests/api/ec2/test_cloud.py

  • Committer: Rajaram Mallya
  • Date: 2011-09-14 11:46:48 UTC
  • mfrom: (1265.2.302 nova)
  • Revision ID: rajarammallya@gmail.com-20110914114648-a12n6zr1uctd3wxu
Merged from nova trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/ec2/test_cloud.py
1540
1540
                    'ephemeral0': '/dev/sdb',
1541
1541
                    'swap': '/dev/sdc',
1542
1542
                    'ephemeral1': '/dev/sdd',
1543
 
                    'ephemeral2': '/dev/sd3'}
 
1543
                    'ephemeral2': '/dev/sd3',
 
1544
                    'ebs0': '/dev/sdh',
 
1545
                    'ebs1': '/dev/sdi'}
1544
1546
 
1545
1547
        self.assertEqual(self.cloud._format_instance_mapping(ctxt,
1546
1548
                                                             instance_ref0),