← Back to branch summary

~cisco-openstack/nova/network-refactoring-l2

« back to all changes in this revision

Viewing changes to nova/tests/test_compute.py

  • Committer: Ryu Ishimoto
  • Date: 2011-07-20 17:26:58 UTC
  • Revision ID: ryu@midokura.jp-20110720172658-72072tersw0b0ybi
Made the compute unit tests to pass

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_compute.py
569
569
        self._setup_other_managers()
570
570
        dbmock = self.mox.CreateMock(db)
571
571
        volmock = self.mox.CreateMock(self.volume_manager)
572
 
        netmock = self.mox.CreateMock(self.network_manager)
573
572
        drivermock = self.mox.CreateMock(self.compute_driver)
574
573
 
575
574
        dbmock.instance_get(c, i_ref['id']).AndReturn(i_ref)
577
576
        for i in range(len(i_ref['volumes'])):
578
577
            vid = i_ref['volumes'][i]['id']
579
578
            volmock.setup_compute_volume(c, vid).InAnyOrder('g1')
580
 
        netmock.setup_compute_network(c, i_ref['id'])
 
579
        drivermock.plug_vifs(i_ref, [])
581
580
        drivermock.ensure_filtering_rules_for_instance(i_ref)
582
581
 
583
582
        self.compute.db = dbmock
584
583
        self.compute.volume_manager = volmock
585
 
        self.compute.network_manager = netmock
586
584
        self.compute.driver = drivermock
587
585
 
588
586
        self.mox.ReplayAll()
597
595
 
598
596
        self._setup_other_managers()
599
597
        dbmock = self.mox.CreateMock(db)
600
 
        netmock = self.mox.CreateMock(self.network_manager)
601
598
        drivermock = self.mox.CreateMock(self.compute_driver)
602
599
 
603
600
        dbmock.instance_get(c, i_ref['id']).AndReturn(i_ref)
604
601
        dbmock.instance_get_fixed_addresses(c, i_ref['id']).AndReturn('dummy')
605
602
        self.mox.StubOutWithMock(compute_manager.LOG, 'info')
606
603
        compute_manager.LOG.info(_("%s has no volume."), i_ref['hostname'])
607
 
        netmock.setup_compute_network(c, i_ref['id'])
 
604
        drivermock.plug_vifs(i_ref, [])
608
605
        drivermock.ensure_filtering_rules_for_instance(i_ref)
609
606
 
610
607
        self.compute.db = dbmock
611
 
        self.compute.network_manager = netmock
612
608
        self.compute.driver = drivermock
613
609
 
614
610
        self.mox.ReplayAll()
629
625
        dbmock = self.mox.CreateMock(db)
630
626
        netmock = self.mox.CreateMock(self.network_manager)
631
627
        volmock = self.mox.CreateMock(self.volume_manager)
 
628
        drivermock = self.mox.CreateMock(self.compute_driver)
632
629
 
633
630
        dbmock.instance_get(c, i_ref['id']).AndReturn(i_ref)
634
631
        dbmock.instance_get_fixed_addresses(c, i_ref['id']).AndReturn('dummy')
635
632
        for i in range(len(i_ref['volumes'])):
636
633
            volmock.setup_compute_volume(c, i_ref['volumes'][i]['id'])
637
634
        for i in range(FLAGS.live_migration_retry_count):
638
 
            netmock.setup_compute_network(c, i_ref['id']).\
 
635
            drivermock.plug_vifs(i_ref, []).\
639
636
                AndRaise(exception.ProcessExecutionError())
640
637
 
641
638
        self.compute.db = dbmock
642
639
        self.compute.network_manager = netmock
643
640
        self.compute.volume_manager = volmock
 
641
        self.compute.driver = drivermock
644
642
 
645
643
        self.mox.ReplayAll()
646
644
        self.assertRaises(exception.ProcessExecutionError,