Merge pull request #5 from stackhpc/bugfix/2023.1

jovial · web-flow · commit 6065fdbeb0e5 · 2024-10-03T12:12:08.000+01:00
[2023.1] Various bug fixes
diff --git a/networking_mlnx/eswitchd/eswitch_daemon.py b/networking_mlnx/eswitchd/eswitch_daemon.py
@@ -64,14 +64,13 @@ def _parse_physical_mapping(self):
     def _init_connections(self):
         context = zmq.Context()
         self.socket_os = context.socket(zmq.REP)
+        self.socket.setsockopt(zmq.LINGER, 0)
         os_transport = constants.SOCKET_OS_TRANSPORT
         os_port = constants.SOCKET_OS_PORT
         os_addr = constants.SOCKET_OS_ADDR
         self.conn_os_url = set_conn_url(os_transport, os_addr, os_port)
 
         self.socket_os.bind(self.conn_os_url)
-        self.poller = zmq.Poller()
-        self.poller.register(self.socket_os, zmq.POLLIN)
 
     def _handle_msg(self):
         data = None
@@ -81,15 +80,20 @@ def _handle_msg(self):
         if msg:
             data = jsonutils.loads(msg)
 
-        msg = None
+        result = {
+            "status": "FAIL",
+            "action": data.get("action", "UNKNOWN"),
+            "reason": "UNKNOWN"
+        }
         if data:
             try:
                 result = self.dispatcher.handle_msg(data)
-                msg = jsonutils.dumps(result)
             except Exception as e:
                 LOG.exception("Exception during message handling - %s", e)
-                msg = jsonutils.dumps(str(e))
-            sender.send_string(msg)
+                result["reason"] = str(e)
+
+        msg = jsonutils.dumps(result)
+        sender.send_string(msg)
 
     def daemon_loop(self):
         LOG.info("Daemon Started!")
diff --git a/networking_mlnx/eswitchd/utils/pci_utils.py b/networking_mlnx/eswitchd/utils/pci_utils.py
@@ -71,8 +71,8 @@ def get_vfs_info(self, pf):
 
     def get_dev_attr(self, attr_path):
         try:
-            fd = open(attr_path)
-            return fd.readline().strip()
+            with open(attr_path) as fd:
+                return fd.readline().strip()
         except IOError:
             return
 
diff --git a/networking_mlnx/internal/netdev_ops/impl_pyroute2.py b/networking_mlnx/internal/netdev_ops/impl_pyroute2.py
@@ -33,16 +33,16 @@ def set_vf_admin_state(self, pf_ifname, vf_idx, state):
         :param state: desired admin state as defined in
                       networking_mlnx.internal.netdev_ops.constants
         """
-        try:
-            ip = pyroute2.IPRoute()
-            link_idx = ip.link_lookup(ifname=pf_ifname)[0]
-            ip.link(
-                'set', index=link_idx, vf={'vf': int(vf_idx),
-                                           'link_state': state})
-        except IndexError:
-            raise exceptions.NetworkInterfaceNotFound(pf_ifname)
-        except pyroute2.NetlinkError as e:
-            raise exceptions.NetlinkRuntimeError(e)
+        with pyroute2.IPRoute() as ip:
+            try:
+                link_idx = ip.link_lookup(ifname=pf_ifname)[0]
+                ip.link(
+                    'set', index=link_idx, vf={'vf': int(vf_idx),
+                                            'link_state': state})
+            except IndexError:
+                raise exceptions.NetworkInterfaceNotFound(pf_ifname)
+            except pyroute2.NetlinkError as e:
+                raise exceptions.NetlinkRuntimeError(e)
 
     def set_link_state(self, ifname, state):
         """Set net device link state
@@ -51,14 +51,14 @@ def set_link_state(self, ifname, state):
         :param state: desired link state as defined in
                       networking_mlnx.internal.netdev_ops.constants
         """
-        try:
-            ip = pyroute2.IPRoute()
-            link_idx = ip.link_lookup(ifname=ifname)[0]
-            ip.link('set', index=link_idx, state=state)
-        except IndexError:
-            raise exceptions.NetworkInterfaceNotFound(ifname)
-        except pyroute2.NetlinkError as e:
-            raise exceptions.NetlinkRuntimeError(e)
+        with pyroute2.IPRoute() as ip:
+            try:
+                link_idx = ip.link_lookup(ifname=ifname)[0]
+                ip.link('set', index=link_idx, state=state)
+            except IndexError:
+                raise exceptions.NetworkInterfaceNotFound(ifname)
+            except pyroute2.NetlinkError as e:
+                raise exceptions.NetlinkRuntimeError(e)
 
     def set_vf_guid(self, pf_ifname, vf_idx, guid):
         """Set vf administrative port and node GUID
@@ -68,17 +68,17 @@ def set_vf_guid(self, pf_ifname, vf_idx, guid):
         :param guid: 64bit guid str in xx:xx:xx:xx:xx:xx:xx:xx format
                      where x is a hexadecimal digit.
         """
-        try:
-            ip = pyroute2.IPRoute()
-            link_idx = ip.link_lookup(ifname=pf_ifname)[0]
-            ip.link('set', index=link_idx, vf={'vf': int(vf_idx),
-                                               'ib_port_guid': guid})
-            ip.link('set', index=link_idx,
-                    vf={'vf': int(vf_idx), 'ib_node_guid': guid})
-        except IndexError:
-            raise exceptions.NetworkInterfaceNotFound(pf_ifname)
-        except pyroute2.NetlinkError as e:
-            raise exceptions.NetlinkRuntimeError(e)
+        with pyroute2.IPRoute() as ip:
+            try:
+                link_idx = ip.link_lookup(ifname=pf_ifname)[0]
+                ip.link('set', index=link_idx, vf={'vf': int(vf_idx),
+                                                'ib_port_guid': guid})
+                ip.link('set', index=link_idx,
+                        vf={'vf': int(vf_idx), 'ib_node_guid': guid})
+            except IndexError:
+                raise exceptions.NetworkInterfaceNotFound(pf_ifname)
+            except pyroute2.NetlinkError as e:
+                raise exceptions.NetlinkRuntimeError(e)
 
     def get_vf_guid(self, pf_ifname, vf_idx):
         """Get vf administrative GUID
@@ -91,14 +91,14 @@ def get_vf_guid(self, pf_ifname, vf_idx):
         NOTE: while there are two GUIDs assigned per VF (port and node GUID)
         we assume they are the same and return just one value.
         """
-        try:
-            ip = pyroute2.IPRoute()
-            link_idx = ip.link_lookup(ifname=pf_ifname)[0]
-            attrs = ip.link('get', index=link_idx, ext_mask=1)[0]
-        except IndexError:
-            raise exceptions.NetworkInterfaceNotFound(pf_ifname)
-        except pyroute2.NetlinkError as e:
-            raise exceptions.NetlinkRuntimeError(e)
+        with pyroute2.IPRoute() as ip:
+            try:
+                link_idx = ip.link_lookup(ifname=pf_ifname)[0]
+                attrs = ip.link('get', index=link_idx, ext_mask=1)[0]
+            except IndexError:
+                raise exceptions.NetworkInterfaceNotFound(pf_ifname)
+            except pyroute2.NetlinkError as e:
+                raise exceptions.NetlinkRuntimeError(e)
 
         vf_attr = (attrs.get_attr('IFLA_VFINFO_LIST').
                    get_attrs("IFLA_VF_INFO"))[int(vf_idx)]
diff --git a/networking_mlnx/plugins/ml2/drivers/mlnx/mech_mlnx.py b/networking_mlnx/plugins/ml2/drivers/mlnx/mech_mlnx.py
@@ -86,7 +86,8 @@ def _gen_client_id_with_prefix(self, port, prefix):
     def _gen_client_id_opt(self, port):
         client_id = self._gen_client_id(port)
         return [{"opt_name": edo_ext.DHCP_OPT_CLIENT_ID,
-                 "opt_value": client_id}]
+                 "opt_value": client_id,
+                 "ip_version": 4}]
 
     def _gen_none_client_id_opt(self, port):
         updated_extra_dhcp_opts = []
diff --git a/networking_mlnx/tests/unit/linux/interface_drivers/test_interface.py b/networking_mlnx/tests/unit/linux/interface_drivers/test_interface.py
@@ -183,7 +183,7 @@ def test__init_network_cache_with_cache_maintenance(self,
             conf, self._get_networks_cb, self.fields)
         looping_mock.assert_called_once_with(
             net_cache_mock.remove_stale_networks)
-        loop_obj.start.called_once_with()
+        loop_obj.start.assert_called()
         # Make sure consecutive calls dont re-spawn cleanup thread
         looping_mock.reset_mock()
         loop_obj.start.reset_mock()
diff --git a/tox.ini b/tox.ini
@@ -5,22 +5,25 @@ skipsdist = True
 ignore_basepython_conflict = True
 
 [testenv]
-basepython = python3
+basepython = python3.8
 setenv = VIRTUAL_ENV={envdir}
          OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
          OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
          OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
+         # "AttributeError: install_layout".
+         SETUPTOOLS_USE_DISTUTILS=stdlib
          PYTHONWARNINGS=default::DeprecationWarning,ignore::DeprecationWarning:distutils,ignore::DeprecationWarning:site
-passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY TOX_ENV_SRC_MODULES
+passenv = TRACE_FAILONLY,GENERATE_HASHES,http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY,TOX_ENV_SRC_MODULES
 usedevelop = True
 install_command =
   pip install {opts} {packages}
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://raw.githubusercontent.com/stackhpc/requirements/refs/heads/bugfix/2023.1/networking-mlnx/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
+  {toxinidir}
   hacking>=3.0.1,<3.1.0 # Apache-2.0
-whitelist_externals = sh
+allowlist_externals = sh,env,{toxinidir}/tools/pip_install_src_modules.sh
 commands =
   {toxinidir}/tools/pip_install_src_modules.sh "{toxinidir}"
   stestr run {posargs}
@@ -48,7 +51,7 @@ commands=
   #{[testenv:genconfig]commands}
   {[testenv:bashate]commands}
   {[testenv:bandit]commands}
-whitelist_externals =
+allowlist_externals =
   sh
   bash
 
