← Back to branch summary

~rackspace-titan/nova/openstack-api-markers

« back to all changes in this revision

Viewing changes to nova/tests/test_virt.py

  • Committer: Naveed Massjouni
  • Date: 2011-03-24 22:32:00 UTC
  • mfrom: (784.1.94 nova)
  • Revision ID: naveedm9@gmail.com-20110324223200-sfjw7bcxivdhfdp2
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_virt.py
796
796
 
797
797
        instance_ref = db.instance_create(self.context,
798
798
                                          {'user_id': 'fake',
799
 
                                          'project_id': 'fake'})
 
799
                                          'project_id': 'fake',
 
800
                                          'mac_address': '00:A0:C9:14:C8:29'})
800
801
        inst_id = instance_ref['id']
801
802
 
802
803
        ip = '10.11.12.13'
813
814
                                            'instance_id': instance_ref['id']})
814
815
 
815
816
        def _ensure_all_called():
816
 
            instance_filter = 'nova-instance-%s' % instance_ref['name']
 
817
            instance_filter = 'nova-instance-%s-%s' % (instance_ref['name'],
 
818
                                                       '00A0C914C829')
817
819
            secgroup_filter = 'nova-secgroup-%s' % self.security_group['id']
818
820
            for required in [secgroup_filter, 'allow-dhcp-server',
819
821
                             'no-arp-spoofing', 'no-ip-spoofing',