Browse Source

Adjust imports for re-organized neutron unit test tree

Change-Id: I09f73f57dbd8cd36a7381960f122a3a812e551c7
Closes-bug: #1440834
Shiv Haris 4 years ago
parent
commit
8b20d6f74c

+ 3
- 3
networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_l3_plugin.py View File

@@ -18,7 +18,7 @@
18 18
 import mock
19 19
 from neutron.db import api as db
20 20
 from neutron.i18n import _LI
21
-from neutron.tests.unit import test_l3_plugin
21
+from neutron.tests.unit.extensions import test_l3
22 22
 from oslo_config import cfg
23 23
 from oslo_context import context as oslo_context
24 24
 from oslo_log import log as logging
@@ -29,7 +29,7 @@ L3_SVC_PLUGIN = ('neutron.services.l3_router.'
29 29
                  'brocade.l3_router_plugin.BrocadeSVIPlugin')
30 30
 
31 31
 
32
-class BrocadeSVIPlugin_TestCases(test_l3_plugin.TestL3NatBasePlugin):
32
+class BrocadeSVIPlugin_TestCases(test_l3.TestL3NatBasePlugin):
33 33
 
34 34
     def setUp(self):
35 35
 
@@ -52,6 +52,6 @@ class BrocadeSVIPlugin_TestCases(test_l3_plugin.TestL3NatBasePlugin):
52 52
         self.context.session = db.get_session()
53 53
 
54 54
 
55
-class TestBrocadeSVINatBase(test_l3_plugin.L3NatExtensionTestCase,
55
+class TestBrocadeSVINatBase(test_l3.L3NatExtensionTestCase,
56 56
                             BrocadeSVIPlugin_TestCases):
57 57
     pass

+ 5
- 5
networking_brocade/vdx/tests/unit/ml2/drivers/brocade/test_brocade_mechanism_driver.py View File

@@ -17,7 +17,7 @@ import mock
17 17
 from networking_brocade.vdx.ml2driver import (
18 18
     mechanism_brocade as brocademechanism)
19 19
 from neutron.plugins.ml2 import config as ml2_config
20
-from neutron.tests.unit.ml2 import test_ml2_plugin
20
+from neutron.tests.unit.plugins.ml2 import test_plugin
21 21
 from oslo_log import log as logging
22 22
 from oslo_utils import importutils
23 23
 
@@ -27,7 +27,7 @@ MECHANISM_NAME = ('networking_brocade.'
27 27
                   'vdx.ml2driver.mechanism_brocade.BrocadeMechanism')
28 28
 
29 29
 
30
-class TestBrocadeMechDriverV2(test_ml2_plugin.Ml2PluginV2TestCase):
30
+class TestBrocadeMechDriverV2(test_plugin.Ml2PluginV2TestCase):
31 31
     """Test Brocade VCS/VDX mechanism driver.
32 32
 
33 33
     """
@@ -54,17 +54,17 @@ class TestBrocadeMechDriverV2(test_ml2_plugin.Ml2PluginV2TestCase):
54 54
             self.mechanism_driver = importutils.import_object(_mechanism_name)
55 55
 
56 56
 
57
-class TestBrocadeMechDriverNetworksV2(test_ml2_plugin.TestMl2NetworksV2,
57
+class TestBrocadeMechDriverNetworksV2(test_plugin.TestMl2NetworksV2,
58 58
                                       TestBrocadeMechDriverV2):
59 59
     pass
60 60
 
61 61
 
62
-class TestBrocadeMechDriverPortsV2(test_ml2_plugin.TestMl2PortsV2,
62
+class TestBrocadeMechDriverPortsV2(test_plugin.TestMl2PortsV2,
63 63
                                    TestBrocadeMechDriverV2):
64 64
     pass
65 65
 
66 66
 
67
-class TestBrocadeMechDriverSubnetsV2(test_ml2_plugin.TestMl2SubnetsV2,
67
+class TestBrocadeMechDriverSubnetsV2(test_plugin.TestMl2SubnetsV2,
68 68
                                      TestBrocadeMechDriverV2):
69 69
     pass
70 70
 

Loading…
Cancel
Save