File tree Expand file tree Collapse file tree 4 files changed +11
-7
lines changed
plugins/ml2/drivers/mlnx/agent
tests/unit/ml2/drivers/mlnx Expand file tree Collapse file tree 4 files changed +11
-7
lines changed Original file line number Diff line number Diff line change 16
16
17
17
import sys
18
18
19
+ from neutron .common import config as common_config
19
20
from oslo_config import cfg
20
21
from oslo_log import log as logging
21
22
from oslo_serialization import jsonutils
@@ -104,6 +105,7 @@ def daemon_loop(self):
104
105
105
106
106
107
def main ():
108
+ common_config .register_common_config_options ()
107
109
config .init (sys .argv [1 :])
108
110
try :
109
111
daemon = MlxEswitchDaemon ()
Original file line number Diff line number Diff line change @@ -455,6 +455,7 @@ def run(self):
455
455
456
456
457
457
def main ():
458
+ common_config .register_common_config_options ()
458
459
config .config .register_root_helper (cfg .CONF )
459
460
common_config .init (sys .argv [1 :])
460
461
common_config .setup_logging ()
Original file line number Diff line number Diff line change @@ -44,16 +44,20 @@ class MlnxMechanismBaseTestCase(base.AgentMechanismBaseTestCase):
44
44
45
45
AGENTS = [{'alive' : True ,
46
46
'configurations' : GOOD_CONFIGS ,
47
- 'host' : 'host' }]
47
+ 'host' : 'host' ,
48
+ 'agent_type' : AGENT_TYPE }]
48
49
AGENTS_DEAD = [{'alive' : False ,
49
50
'configurations' : GOOD_CONFIGS ,
50
- 'host' : 'dead_host' }]
51
+ 'host' : 'dead_host' ,
52
+ 'agent_type' : AGENT_TYPE }]
51
53
AGENTS_BAD = [{'alive' : False ,
52
54
'configurations' : GOOD_CONFIGS ,
53
- 'host' : 'bad_host_1' },
55
+ 'host' : 'bad_host_1' ,
56
+ 'agent_type' : AGENT_TYPE },
54
57
{'alive' : True ,
55
58
'configurations' : BAD_CONFIGS ,
56
- 'host' : 'bad_host_2' }]
59
+ 'host' : 'bad_host_2' ,
60
+ 'agent_type' : AGENT_TYPE }]
57
61
58
62
def setUp (self ):
59
63
super (MlnxMechanismBaseTestCase , self ).setUp ()
Original file line number Diff line number Diff line change @@ -10,10 +10,7 @@ testscenarios>=0.4 # Apache-2.0/BSD
10
10
WebTest>=2.0.27 # MIT
11
11
oslotest>=3.2.0 # Apache-2.0
12
12
stestr>=1.0.0 # Apache-2.0
13
- reno>=3.1.0 # Apache-2.0
14
13
ddt>=1.0.1 # MIT
15
- astroid==2.4.0 # LGPLv2.1
16
- isort==4.3.21 # MIT
17
14
# Needed to run DB commands in virtualenvs
18
15
PyMySQL>=0.7.6 # MIT License
19
16
mock>=1.2
You can’t perform that action at this time.
0 commit comments