Skip to content

Commit 08c15d9

Browse files
committed
Fix Mellanox CI, test-requirements.txt and unit tests failures
Due to some upstream changes [1], Mellanox CI is failing. Moreover, the test requierments must be synced with the neutron [1] [openstack/neutron@b5e10bf Change-Id: Ie54d2b5d535d815019e6546b0ee8478633f684f0
1 parent 98591db commit 08c15d9

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

networking_mlnx/eswitchd/eswitch_daemon.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import sys
1818

19+
from neutron.common import config as common_config
1920
from oslo_config import cfg
2021
from oslo_log import log as logging
2122
from oslo_serialization import jsonutils
@@ -104,6 +105,7 @@ def daemon_loop(self):
104105

105106

106107
def main():
108+
common_config.register_common_config_options()
107109
config.init(sys.argv[1:])
108110
try:
109111
daemon = MlxEswitchDaemon()

networking_mlnx/plugins/ml2/drivers/mlnx/agent/mlnx_eswitch_neutron_agent.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ def run(self):
455455

456456

457457
def main():
458+
common_config.register_common_config_options()
458459
config.config.register_root_helper(cfg.CONF)
459460
common_config.init(sys.argv[1:])
460461
common_config.setup_logging()

networking_mlnx/tests/unit/ml2/drivers/mlnx/test_mech_mlnx.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,20 @@ class MlnxMechanismBaseTestCase(base.AgentMechanismBaseTestCase):
4444

4545
AGENTS = [{'alive': True,
4646
'configurations': GOOD_CONFIGS,
47-
'host': 'host'}]
47+
'host': 'host',
48+
'agent_type': AGENT_TYPE}]
4849
AGENTS_DEAD = [{'alive': False,
4950
'configurations': GOOD_CONFIGS,
50-
'host': 'dead_host'}]
51+
'host': 'dead_host',
52+
'agent_type': AGENT_TYPE}]
5153
AGENTS_BAD = [{'alive': False,
5254
'configurations': GOOD_CONFIGS,
53-
'host': 'bad_host_1'},
55+
'host': 'bad_host_1',
56+
'agent_type': AGENT_TYPE},
5457
{'alive': True,
5558
'configurations': BAD_CONFIGS,
56-
'host': 'bad_host_2'}]
59+
'host': 'bad_host_2',
60+
'agent_type': AGENT_TYPE}]
5761

5862
def setUp(self):
5963
super(MlnxMechanismBaseTestCase, self).setUp()

test-requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ testscenarios>=0.4 # Apache-2.0/BSD
1010
WebTest>=2.0.27 # MIT
1111
oslotest>=3.2.0 # Apache-2.0
1212
stestr>=1.0.0 # Apache-2.0
13-
reno>=3.1.0 # Apache-2.0
1413
ddt>=1.0.1 # MIT
15-
astroid==2.4.0 # LGPLv2.1
16-
isort==4.3.21 # MIT
1714
# Needed to run DB commands in virtualenvs
1815
PyMySQL>=0.7.6 # MIT License
1916
mock>=1.2

0 commit comments

Comments
 (0)