← Back to branch summary

~niedbalski/ubuntu/vivid/neutron/fixes-1447803

« back to all changes in this revision

Viewing changes to neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_mech.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-10-03 18:45:23 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20141003184523-4mt6dy1q3j8n30c9
Tags: 1:2014.2~rc1-0ubuntu1
https://launchpad.net/bugs/1323729
* New upstream release candidate:
  - d/p/*: Refreshed.
  - d/control: Add python-requests-mock to BD's.
  - d/control: Align versioned requirements with upstream.
* Transition linuxbridge and openvswitch plugin users to modular
  layer 2 plugin (LP: #1323729):
  - d/control: Mark removed plugin packages as transitional, depend
    on neutron-plugin-ml2, mark oldlibs/extra.
  - d/neutron-plugin-{linuxbridge,openvswitch}.install: Drop.
  - d/control: Depend on neutron-plugin-ml2 for linuxbridge
    agent package.
  - d/neutron-plugin-linuxbridge-agent.upstart: Use ml2 plugin
    configuration files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/tests/unit/ml2/drivers/cisco/nexus/test_cisco_mech.py
268
268
                    yield req.get_response(self.api)
269
269
                    if expected_failure:
270
270
                        self._create_deviceowner_mock()
 
271
        self._delete('ports', port['port']['id'])
 
272
        self._delete('networks', network['network']['id'])
271
273
 
272
274
    def _assertExpectedHTTP(self, status, exc):
273
275
        """Confirm that an HTTP status corresponds to an expected exception.
303
305
                                   'create_port') as patched_plugin:
304
306
 
305
307
                def side_effect(*args, **kwargs):
306
 
                    return self._do_side_effect(patched_plugin, orig,
307
 
                                                *args, **kwargs)
 
308
                    return self._fail_second_call(patched_plugin, orig,
 
309
                                                  *args, **kwargs)
308
310
 
309
311
                patched_plugin.side_effect = side_effect
310
312
                with self.network() as net:
337
339
                                   'create_port') as patched_plugin:
338
340
 
339
341
                def side_effect(*args, **kwargs):
340
 
                    return self._do_side_effect(patched_plugin, orig,
341
 
                                                *args, **kwargs)
 
342
                    return self._fail_second_call(patched_plugin, orig,
 
343
                                                  *args, **kwargs)
342
344
 
343
345
                patched_plugin.side_effect = side_effect
344
346
                res = self._create_port_bulk(self.fmt, 2, net['network']['id'],
480
482
                    add_keyword_expected=False))
481
483
                self.mock_ncclient.reset_mock()
482
484
                yield
 
485
            self._delete('ports', port['port']['id'])
483
486
 
484
487
        # Create network and subnet
485
488
        with self.network(name=NETWORK_NAME) as network:
677
680
            with mock.patch.object(plugin_obj,
678
681
                                   'create_network') as patched_plugin:
679
682
                def side_effect(*args, **kwargs):
680
 
                    return self._do_side_effect(patched_plugin, orig,
681
 
                                                *args, **kwargs)
 
683
                    return self._fail_second_call(patched_plugin, orig,
 
684
                                                  *args, **kwargs)
682
685
                patched_plugin.side_effect = side_effect
683
686
                res = self._create_network_bulk(self.fmt, 2, 'test', True)
684
687
                LOG.debug("response is %s" % res)
697
700
                               'create_network') as patched_plugin:
698
701
 
699
702
            def side_effect(*args, **kwargs):
700
 
                return self._do_side_effect(patched_plugin, orig,
701
 
                                            *args, **kwargs)
 
703
                return self._fail_second_call(patched_plugin, orig,
 
704
                                              *args, **kwargs)
702
705
 
703
706
            patched_plugin.side_effect = side_effect
704
707
            res = self._create_network_bulk(self.fmt, 2, 'test', True)
729
732
                                   'create_subnet') as patched_plugin:
730
733
 
731
734
                def side_effect(*args, **kwargs):
732
 
                    self._do_side_effect(patched_plugin, orig,
733
 
                                         *args, **kwargs)
 
735
                    self._fail_second_call(patched_plugin, orig,
 
736
                                           *args, **kwargs)
734
737
 
735
738
                patched_plugin.side_effect = side_effect
736
739
                with self.network() as net:
751
754
        with mock.patch.object(plugin_obj,
752
755
                               'create_subnet') as patched_plugin:
753
756
            def side_effect(*args, **kwargs):
754
 
                return self._do_side_effect(patched_plugin, orig,
755
 
                                            *args, **kwargs)
 
757
                return self._fail_second_call(patched_plugin, orig,
 
758
                                              *args, **kwargs)
756
759
 
757
760
            patched_plugin.side_effect = side_effect
758
761
            with self.network() as net: