Browse Source

Fixing import of the decomposed nos driver

Importing from networking-brocade

Fixes Bug: #1429977

Change-Id: I9854a9df23fc57d7ce294e402355b743a7f23e91
Shiv Haris 4 years ago
parent
commit
e38b37973f

+ 2
- 2
networking_brocade/test_discover/test_discover.py View File

@@ -26,8 +26,8 @@ def load_tests(loader, tests, pattern):
26 26
     base_path = os.path.split(os.path.dirname(os.path.abspath(__file__)))[0]
27 27
     base_path = os.path.split(base_path)[0]
28 28
     for test_dir in ['./networking_brocade/tests',
29
-                     './networking_brocade/vdx/tests/unit/ml2/drivers/brocade',
30
-                     './networking_brocade/vyatta/tests']:
29
+                     './networking_brocade/vdx/tests/unit/ml2/drivers/brocade'
30
+                     ]:
31 31
         if not pattern:
32 32
             suite.addTests(loader.discover(test_dir, top_level_dir=base_path))
33 33
         else:

+ 0
- 0
networking_brocade/vdx/services/__init__.py View File


+ 1
- 1
networking_brocade/vdx/services/l3_router/l3_router_plugin.py View File

@@ -18,13 +18,13 @@
18 18
 """Implentation of Brocade SVI service Plugin."""
19 19
 
20 20
 
21
+from networking_brocade.vdx.ml2driver.nos import nosdriver as driver
21 22
 from neutron.common import constants as l3_constants
22 23
 from neutron.i18n import _LE
23 24
 from neutron.i18n import _LI
24 25
 from neutron.openstack.common import log as logging
25 26
 from neutron.plugins.ml2 import db
26 27
 from neutron.plugins.ml2.drivers.brocade.db import models as brocade_db
27
-from neutron.plugins.ml2.drivers.brocade.nos import nosdriver as driver
28 28
 from neutron.services.l3_router import l3_router_plugin as router
29 29
 from oslo_config import cfg
30 30
 from oslo_utils import excutils

Loading…
Cancel
Save