Merge ~fnordahl/ubuntu/+source/python-os-vif:bug/1892132-ussuri into ~ubuntu-openstack-dev/ubuntu/+source/python-os-vif:stable/ussuri

[Frode Nordahl]

diff --git a/debian/changelog b/debian/changelog
index e2673a2..b62c1c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-os-vif (2.0.0-0ubuntu1.2) UNRELEASED; urgency=medium
+
+  * Add support for switchdev NICs that link representor ports to parent PCI
+    device. (LP: #1892132)
+    - d/p/Refactor-code-of-linux_net-to-more-cleaner-and-increase-performace.patch
+    - d/p/Fix-os-vif-fails-to-get-the-correct-UpLink-Representor.patch
+
+ -- Frode Nordahl <[e-mail]>  Fri, 16 Jul 2021 09:43:06 +0000
+
 python-os-vif (2.0.0-0ubuntu1.1) UNRELEASED; urgency=medium
 
   [ Corey Bryant ]
diff --git a/debian/patches/Fix-os-vif-fails-to-get-the-correct-UpLink-Representor.patch b/debian/patches/Fix-os-vif-fails-to-get-the-correct-UpLink-Representor.patch
new file mode 100644
index 0000000..bb82b13
--- /dev/null
+++ b/debian/patches/Fix-os-vif-fails-to-get-the-correct-UpLink-Representor.patch
@@ -0,0 +1,168 @@
+From ssh://review.opendev.org:29418/openstack/os-vif
+ * branch            refs/changes/67/765967/5 -> FETCH_HEAD
+From 1226d46cc8bde9531821c68465a05292528142f0 Mon Sep 17 00:00:00 2001
+From: Mamduh Alassi <[e-mail]>
+Date: Wed, 12 Aug 2020 16:24:47 +0300
+Subject: [PATCH] Fix - os-vif fails to get the correct UpLink Representor
+
+Till kernel 5.7 PF and VF representors are exposed as virtual device.
+They are not linked to its parent PCI device like how uplink
+representor is linked.
+
+Starting from kernel 5.8 due to new change [1] the PF and VF representors are
+linked to their parent PCI device, and so "get_ifname_by_pci_address" fails
+to get the correct UpLink Representor.
+
+This patch modifys the behviour of "get_ifname_by_pci_address" to
+check the physical port name of the netdev in
+vf_pci_addr_path/physfn/net to match the formart for the uplink "p\d+".
+
+[1] https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=123f0f53dd64b67e34142485fe866a8a581f12f1
+
+Closes-Bug: #1892132
+Change-Id: I49f6ae3f0e6bfbf555c8284bfd70371ce90da0c7
+(cherry picked from commit a28aafa796378b8a36ccb51d2c0010a44f622d14)
+---
+ .../notes/bug-1892132-812e6d5ce0588ebb.yaml   | 10 +++++
+ vif_plug_ovs/linux_net.py                     | 28 +++++++++---
+ vif_plug_ovs/tests/unit/test_linux_net.py     | 44 +++++++++++++++++--
+ 3 files changed, 74 insertions(+), 8 deletions(-)
+ create mode 100644 releasenotes/notes/bug-1892132-812e6d5ce0588ebb.yaml
+
+diff --git a/releasenotes/notes/bug-1892132-812e6d5ce0588ebb.yaml b/releasenotes/notes/bug-1892132-812e6d5ce0588ebb.yaml
+new file mode 100644
+index 0000000..f7604dd
+--- /dev/null
++++ b/releasenotes/notes/bug-1892132-812e6d5ce0588ebb.yaml
+@@ -0,0 +1,10 @@
++---
++fixes:
++  - |
++    Linux kernel 5.8 changed the sysfs interface that is used to
++    discover the interfaces used for OVS offloads for certain NIC
++    models. This results in network plugging failure, as described
++    in `bug #1892132`_. This release fixes the plugging issue by
++    properly handling the new sysfs structure.
++
++    .. _bug #1892132: https://bugs.launchpad.net/os-vif/+bug/1892132
+diff --git a/vif_plug_ovs/linux_net.py b/vif_plug_ovs/linux_net.py
+index 3e77585..f7b120c 100644
+--- a/vif_plug_ovs/linux_net.py
++++ b/vif_plug_ovs/linux_net.py
+@@ -45,6 +45,8 @@ VF_RE = re.compile(r"vf(\d+)", re.IGNORECASE)
+ PF_RE = re.compile(r"pf(\d+)", re.IGNORECASE)
+ # bus_info (bdf) contains <bus>:<dev>.<func>
+ PF_FUNC_RE = re.compile(r"\.(\d+)", 0)
++# phys_port_name contains p##
++UPLINK_PORT_RE = re.compile(r"p(\d+)", re.IGNORECASE)
+ 
+ _SRIOV_TOTALVFS = "sriov_totalvfs"
+ NIC_NAME_LEN = 14
+@@ -327,12 +329,28 @@ def get_ifname_by_pci_address(pci_addr, pf_interface=False, switchdev=False):
+     itself based on the argument of pf_interface.
+     """
+     dev_path = _get_sysfs_netdev_path(pci_addr, pf_interface)
+-    # make the if statement later more readable
+-    ignore_switchdev = not switchdev
+     try:
+-        for netdev in os.listdir(dev_path):
+-            if ignore_switchdev or _is_switchdev(netdev):
+-                return netdev
++        devices = os.listdir(dev_path)
++
++        # Return the first netdev in case of switchdev=False
++        if not switchdev:
++            return devices[0]
++        elif pf_interface:
++            fallback_netdev = None
++            for netdev in devices:
++                # Return the uplink representor in case of switchdev=True
++                if _is_switchdev(netdev):
++                    fallback_netdev = netdev if fallback_netdev is None \
++                        else fallback_netdev
++                    phys_port_name = _get_phys_port_name(netdev)
++                    if phys_port_name is not None and \
++                            UPLINK_PORT_RE.search(phys_port_name):
++                        return netdev
++
++            # Fallback to first switchdev netdev in case of switchdev=True
++            if fallback_netdev is not None:
++                return fallback_netdev
++
+     except Exception:
+         raise exception.PciDeviceNotFoundById(id=pci_addr)
+     raise exception.PciDeviceNotFoundById(id=pci_addr)
+diff --git a/vif_plug_ovs/tests/unit/test_linux_net.py b/vif_plug_ovs/tests/unit/test_linux_net.py
+index a5404ea..e19ce94 100644
+--- a/vif_plug_ovs/tests/unit/test_linux_net.py
++++ b/vif_plug_ovs/tests/unit/test_linux_net.py
+@@ -260,26 +260,64 @@ class LinuxNetTest(testtools.TestCase):
+ 
+     @mock.patch.object(os, 'listdir')
+     @mock.patch.object(linux_net, '_get_phys_switch_id')
++    @mock.patch.object(linux_net, "_get_phys_port_name")
+     def test_physical_function_interface_name(
+-            self, mock__get_phys_switch_id, mock_listdir):
++            self, mock__get_phys_port_name, mock__get_phys_switch_id,
++            mock_listdir):
+         mock_listdir.return_value = ['foo', 'bar']
+         mock__get_phys_switch_id.side_effect = (
+             ['', 'valid_switch'])
++        mock__get_phys_port_name.side_effect = (["p1"])
+         ifname = linux_net.get_ifname_by_pci_address(
+             '0000:00:00.1', pf_interface=True, switchdev=False)
+         self.assertEqual(ifname, 'foo')
+ 
+     @mock.patch.object(os, 'listdir')
+-    @mock.patch.object(linux_net, '_get_phys_switch_id')
++    @mock.patch.object(linux_net, "_get_phys_switch_id")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
+     def test_physical_function_interface_name_with_switchdev(
+-            self, mock__get_phys_switch_id, mock_listdir):
++            self, mock__get_phys_port_name, mock__get_phys_switch_id,
++            mock_listdir):
+         mock_listdir.return_value = ['foo', 'bar']
+         mock__get_phys_switch_id.side_effect = (
+             ['', 'valid_switch'])
++        mock__get_phys_port_name.side_effect = (["p1s0"])
+         ifname = linux_net.get_ifname_by_pci_address(
+             '0000:00:00.1', pf_interface=True, switchdev=True)
+         self.assertEqual(ifname, 'bar')
+ 
++    @mock.patch.object(os, 'listdir')
++    @mock.patch.object(linux_net, "_get_phys_switch_id")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
++    def test_physical_function_interface_name_with_representors(
++            self, mock__get_phys_port_name, mock__get_phys_switch_id,
++            mock_listdir):
++        # Get the PF that matches the phys_port_name regex
++        mock_listdir.return_value = ['enp2s0f0_0', 'enp2s0f0_1', 'enp2s0f0']
++        mock__get_phys_switch_id.side_effect = (
++            ['valid_switch', 'valid_switch', 'valid_switch'])
++        mock__get_phys_port_name.side_effect = (["pf0vf0", "pf0vf1", "p0"])
++        ifname = linux_net.get_ifname_by_pci_address(
++            '0000:00:00.1', pf_interface=True, switchdev=True)
++        self.assertEqual(ifname, 'enp2s0f0')
++
++    @mock.patch.object(os, 'listdir')
++    @mock.patch.object(linux_net, "_get_phys_switch_id")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
++    def test_physical_function_interface_name_with_fallback_To_first_netdev(
++            self, mock__get_phys_port_name, mock__get_phys_switch_id,
++            mock_listdir):
++        # Try with switchdev mode to get PF but fail because there is no match
++        # for the phys_port_name then fallback to first interface found
++        mock_listdir.return_value = ['enp2s0f0_0', 'enp2s0f0_1', 'enp2s0f0']
++        mock__get_phys_switch_id.side_effect = (['valid_switch',
++                                                 'valid_switch',
++                                                 'valid_switch'])
++        mock__get_phys_port_name.side_effect = (["pf0vf0", "pf0vf1", "pf0vf2"])
++        ifname = linux_net.get_ifname_by_pci_address(
++            '0000:00:00.1', pf_interface=True, switchdev=True)
++        self.assertEqual(ifname, 'enp2s0f0_0')
++
+     @mock.patch.object(os, 'listdir')
+     def test_get_ifname_by_pci_address_exception(self, mock_listdir):
+         mock_listdir.side_effect = OSError('No such file or directory')
+-- 
+2.31.1
diff --git a/debian/patches/Refactor-code-of-linux_net-to-more-cleaner-and-increase-performace.patch b/debian/patches/Refactor-code-of-linux_net-to-more-cleaner-and-increase-performace.patch
new file mode 100644
index 0000000..e895a24
--- /dev/null
+++ b/debian/patches/Refactor-code-of-linux_net-to-more-cleaner-and-increase-performace.patch
@@ -0,0 +1,491 @@
+From ssh://review.opendev.org:29418/openstack/os-vif
+ * branch            refs/changes/19/765419/6 -> FETCH_HEAD
+From 3e1d898b752c327165aeca1fec0919d858a87ec4 Mon Sep 17 00:00:00 2001
+From: Mamduh <[e-mail]>
+Date: Tue, 18 Aug 2020 12:40:10 +0300
+Subject: [PATCH] Refactor code of linux_net to more cleaner and increase
+ performace
+
+The patch adds new functions '_get_phys_port_name' for reading physical
+port name of the SR-IOV port and '_get_phys_switch_id' for reading
+physical port switch ID of the SR-IOV port, in addition to refactoring
+'get_representor_port' to use the new functions and decrease calls for
+"_get_pf_func" and netdevs associated with the PF will now be processed
+in the loop, however it will not be matching 'phys_port_name' which
+ensures the correct behaviour.
+
+In addition to updating the unit test for linux_net and remove not
+needed mocks
+
+Conflicts:
+      vif_plug_ovs/linux_net.py
+      vif_plug_ovs/tests/unit/test_linux_net.py
+
+Related-Bug: #1892132
+Change-Id: I3fdbea4f48cb79ebfd03a4da21e2232ccafb7a76
+(cherry picked from commit 167bb030f1143f37ce189673d831bd572f64d4ad)
+---
+ vif_plug_ovs/linux_net.py                 |  77 ++++---
+ vif_plug_ovs/tests/unit/test_linux_net.py | 250 ++++++++--------------
+ 2 files changed, 139 insertions(+), 188 deletions(-)
+
+diff --git a/vif_plug_ovs/linux_net.py b/vif_plug_ovs/linux_net.py
+index 20baab3..3e77585 100644
+--- a/vif_plug_ovs/linux_net.py
++++ b/vif_plug_ovs/linux_net.py
+@@ -239,46 +239,35 @@ def get_representor_port(pf_ifname, vf_num):
+     VF number in the phys_port_name. That interface is the representor for
+     the requested VF.
+     """
+-    pf_path = "/sys/class/net/%s" % pf_ifname
+-    pf_sw_id_file = os.path.join(pf_path, "phys_switch_id")
+ 
+     pf_sw_id = None
+     try:
+-        with open(pf_sw_id_file, 'r') as fd:
+-            pf_sw_id = fd.readline().rstrip()
++        pf_sw_id = _get_phys_switch_id(pf_ifname)
+     except (OSError, IOError):
+         raise exception.RepresentorNotFound(ifname=pf_ifname, vf_num=vf_num)
+ 
+-    pf_subsystem_file = os.path.join(pf_path, "subsystem")
++    pf_subsystem_file = "/sys/class/net/%s/subsystem" % pf_ifname
+     try:
+         devices = os.listdir(pf_subsystem_file)
+     except (OSError, IOError):
+         raise exception.RepresentorNotFound(ifname=pf_ifname, vf_num=vf_num)
+ 
+-    for device in devices:
+-        address_str, pf = get_function_by_ifname(device)
+-        if pf:
+-            continue
++    ifname_pf_func = _get_pf_func(pf_ifname)
++    if ifname_pf_func is None:
++        raise exception.RepresentorNotFound(ifname=pf_ifname, vf_num=vf_num)
+ 
+-        device_path = "/sys/class/net/%s" % device
+-        device_sw_id_file = os.path.join(device_path, "phys_switch_id")
++    for device in devices:
+         try:
+-            with open(device_sw_id_file, 'r') as fd:
+-                device_sw_id = fd.readline().rstrip()
++            device_sw_id = _get_phys_switch_id(device)
++            if not device_sw_id or device_sw_id != pf_sw_id:
++                continue
+         except (OSError, IOError):
+             continue
+ 
+-        if device_sw_id != pf_sw_id:
+-            continue
+-        device_port_name_file = (
+-            os.path.join(device_path, 'phys_port_name'))
+-
+-        if not os.path.isfile(device_port_name_file):
+-            continue
+-
+         try:
+-            with open(device_port_name_file, 'r') as fd:
+-                phys_port_name = fd.readline().rstrip()
++            phys_port_name = _get_phys_port_name(device)
++            if phys_port_name is None:
++                continue
+         except (OSError, IOError):
+             continue
+ 
+@@ -287,12 +276,8 @@ def get_representor_port(pf_ifname, vf_num):
+         # the PCI func number of pf_ifname.
+         rep_parent_pf_func = _parse_pf_number(phys_port_name)
+         if rep_parent_pf_func is not None:
+-                ifname_pf_func = _get_pf_func(pf_ifname)
+-                if ifname_pf_func is None:
+-                    continue
+-                if int(rep_parent_pf_func) != int(ifname_pf_func):
+-                    continue
+-
++            if int(rep_parent_pf_func) != int(ifname_pf_func):
++                continue
+         representor_num = _parse_vf_number(phys_port_name)
+         # Note: representor_num can be 0, referring to VF0
+         if representor_num is None:
+@@ -321,9 +306,7 @@ def _get_sysfs_netdev_path(pci_addr, pf_interface):
+ def _is_switchdev(netdev):
+     """Returns True if a netdev has a readable phys_switch_id"""
+     try:
+-        sw_id_file = "/sys/class/net/%s/phys_switch_id" % netdev
+-        with open(sw_id_file, 'r') as fd:
+-            phys_switch_id = fd.readline().rstrip()
++        phys_switch_id = _get_phys_switch_id(netdev)
+         if phys_switch_id != "" and phys_switch_id is not None:
+             return True
+     except (OSError, IOError):
+@@ -389,3 +372,33 @@ def get_pf_pci_from_vf(vf_pci):
+     """
+     physfn_path = os.readlink("/sys/bus/pci/devices/%s/physfn" % vf_pci)
+     return os.path.basename(physfn_path)
++
++
++def _get_phys_port_name(ifname):
++    """Get the interface name and return its phys_port_name
++
++    :param ifname: The interface name
++    :return: The phys_port_name of the given ifname
++    """
++    phys_port_name_path = "/sys/class/net/%s/phys_port_name" % ifname
++
++    if not os.path.isfile(phys_port_name_path):
++        return None
++
++    with open(phys_port_name_path, 'r') as fd:
++        return fd.readline().strip()
++
++
++def _get_phys_switch_id(ifname):
++    """Get the interface name and return its phys_switch_id
++
++    :param ifname: The interface name
++    :return: The phys_switch_id of the given ifname
++    """
++    phys_port_name_path = "/sys/class/net/%s/phys_switch_id" % ifname
++
++    if not os.path.isfile(phys_port_name_path):
++        return None
++
++    with open(phys_port_name_path, 'r') as fd:
++        return fd.readline().strip()
+diff --git a/vif_plug_ovs/tests/unit/test_linux_net.py b/vif_plug_ovs/tests/unit/test_linux_net.py
+index 4eaa1f7..a5404ea 100644
+--- a/vif_plug_ovs/tests/unit/test_linux_net.py
++++ b/vif_plug_ovs/tests/unit/test_linux_net.py
+@@ -132,47 +132,22 @@ class LinuxNetTest(testtools.TestCase):
+         linux_net.add_bridge_port("br0", "vnet1")
+         mock_set.assert_called_once_with("vnet1", master="br0")
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+-    def test_is_switchdev_ioerror(self, mock_isfile, mock_open):
+-        mock_isfile.side_effect = [True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
+-            [IOError()])
++    @mock.patch.object(linux_net, '_get_phys_switch_id')
++    def test_is_switchdev_ioerror(self, mock__get_phys_switch_id):
++        mock__get_phys_switch_id.side_effect = ([IOError()])
+         test_switchdev = linux_net._is_switchdev('pf_ifname')
+         self.assertEqual(test_switchdev, False)
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+-    def test_is_switchdev_empty(self, mock_isfile, mock_open):
+-        mock_isfile.side_effect = [True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
+-            [''])
+-        open_calls = (
+-            [mock.call('/sys/class/net/pf_ifname/phys_switch_id', 'r'),
+-             mock.call().readline(),
+-             mock.call().__exit__(None, None, None)])
++    @mock.patch.object(linux_net, '_get_phys_switch_id')
++    def test_is_switchdev_empty(self, mock__get_phys_switch_id):
++        mock__get_phys_switch_id.return_value = ''
+         test_switchdev = linux_net._is_switchdev('pf_ifname')
+-        mock_open.assert_has_calls(open_calls)
+         self.assertEqual(test_switchdev, False)
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+-    def test_is_switchdev_positive(self, mock_isfile, mock_open):
+-        mock_isfile.side_effect = [True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
+-            ['pf_sw_id'])
+-        open_calls = (
+-            [mock.call('/sys/class/net/pf_ifname/phys_switch_id', 'r'),
+-             mock.call().readline(),
+-             mock.call().__exit__(None, None, None)])
++    @mock.patch.object(linux_net, '_get_phys_switch_id')
++    def test_is_switchdev_positive(self, mock__get_phys_switch_id):
++        mock__get_phys_switch_id.return_value = 'pf_sw_id'
+         test_switchdev = linux_net._is_switchdev('pf_ifname')
+-        mock_open.assert_has_calls(open_calls)
+         self.assertEqual(test_switchdev, True)
+ 
+     def test_parse_vf_number(self):
+@@ -191,184 +166,115 @@ class LinuxNetTest(testtools.TestCase):
+         self.assertEqual(linux_net._parse_pf_number("pf31"), "31")
+         self.assertIsNone(linux_net._parse_pf_number("g4rbl3d"))
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+     @mock.patch.object(os, 'listdir')
+-    @mock.patch.object(linux_net, "get_function_by_ifname")
+-    def test_get_representor_port(self, mock_get_function_by_ifname,
+-                                  mock_listdir, mock_isfile, mock_open):
++    @mock.patch.object(linux_net, "_get_pf_func")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
++    @mock.patch.object(linux_net, '_get_phys_switch_id')
++    def test_get_representor_port(self, mock__get_phys_switch_id,
++                                  mock__get_phys_port_name,
++                                  mock__get_pf_func,
++                                  mock_listdir):
+         mock_listdir.return_value = [
+             'pf_ifname', 'rep_vf_1', 'rep_vf_2'
+         ]
+-        mock_isfile.side_effect = [True, True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
+-              ['pf_sw_id', 'pf_sw_id', '1', 'pf_sw_id', 'pf0vf2'])
+-        # PCI IDs mocked:
+-        # PF0:    0000:0a:00.0
+-        # PF0VF1: 0000:0a:02.1    PF0VF2: 0000:0a:02.2
+-        mock_get_function_by_ifname.side_effect = (
+-            [("0000:0a:00.0", True),
+-             ("0000:0a:02.1", False),
+-             ("0000:0a:02.2", False), ("0000:0a:00.0", True)])
+-        open_calls = (
+-            [mock.call('/sys/class/net/pf_ifname/phys_switch_id', 'r'),
+-             mock.call().readline(),
+-             mock.call().__exit__(None, None, None),
+-             mock.call('/sys/class/net/rep_vf_1/phys_switch_id', 'r'),
+-             mock.call().readline(),
+-             mock.call().__exit__(None, None, None),
+-             mock.call('/sys/class/net/rep_vf_1/phys_port_name', 'r'),
+-             mock.call().readline(),
+-             mock.call().__exit__(None, None, None),
+-             mock.call('/sys/class/net/rep_vf_2/phys_switch_id', 'r'),
+-             mock.call().readline(),
+-             mock.call().__exit__(None, None, None),
+-             mock.call('/sys/class/net/rep_vf_2/phys_port_name', 'r'),
+-             mock.call().readline(),
+-             mock.call().__exit__(None, None, None)])
++        mock__get_phys_switch_id.return_value = 'pf_sw_id'
++        mock__get_pf_func.return_value = "0"
++        mock__get_phys_port_name.side_effect = (['1', "pf0vf1", "pf0vf2"])
+         ifname = linux_net.get_representor_port('pf_ifname', '2')
+-        mock_open.assert_has_calls(open_calls)
+         self.assertEqual('rep_vf_2', ifname)
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+     @mock.patch.object(os, 'listdir')
+-    @mock.patch.object(linux_net, "get_function_by_ifname")
++    @mock.patch.object(linux_net, "_get_pf_func")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
++    @mock.patch.object(linux_net, "_get_phys_switch_id")
+     def test_get_representor_port_2_pfs(
+-            self, mock_get_function_by_ifname, mock_listdir, mock_isfile,
+-            mock_open):
++            self, mock__get_phys_switch_id, mock__get_phys_port_name,
++            mock__get_pf_func, mock_listdir):
+         mock_listdir.return_value = [
+             'pf_ifname1', 'pf_ifname2', 'rep_pf1_vf_1', 'rep_pf1_vf_2',
+             'rep_pf2_vf_1', 'rep_pf2_vf_2',
+         ]
+-        mock_isfile.side_effect = [True, True, True, True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
+-            ['pf_sw_id',
+-             'pf_sw_id', 'VF1@PF1', 'pf_sw_id', 'vf2@pf1',
+-             'pf_sw_id', 'pf2vf1', 'pf_sw_id', 'pf2vf2'])
+-        # PCI IDs mocked:
+-        # PF1:    0000:0a:00.1    PF2:    0000:0a:00.2
+-        # PF1VF1: 0000:0a:02.1    PF1VF2: 0000:0a:02.2
+-        # PF2VF1: 0000:0a:04.1    PF2VF2: 0000:0a:04.2
+-        mock_get_function_by_ifname.side_effect = (
+-            [("0000:0a:00.1", True), ("0000:0a:00.2", True),
+-             ("0000:0a:02.1", False), ("0000:0a:00.2", True),
+-             ("0000:0a:02.2", False), ("0000:0a:00.2", True),
+-             ("0000:0a:04.1", False), ("0000:0a:00.2", True),
+-             ("0000:0a:04.2", False), ("0000:0a:00.2", True)])
++        mock__get_phys_switch_id.return_value = 'pf_sw_id'
++        mock__get_pf_func.return_value = "2"
++        mock__get_phys_port_name.side_effect = (
++            ["p1", "p2", "VF1@PF1", "pf2vf1", "vf2@pf1", "pf2vf2"])
+         ifname = linux_net.get_representor_port('pf_ifname2', '2')
+         self.assertEqual('rep_pf2_vf_2', ifname)
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+     @mock.patch.object(os, 'listdir')
+-    @mock.patch.object(linux_net, "get_function_by_ifname")
++    @mock.patch.object(linux_net, "_get_pf_func")
++    @mock.patch.object(linux_net, "_get_phys_switch_id")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
+     def test_get_representor_port_not_found(
+-            self, mock_get_function_by_ifname, mock_listdir, mock_isfile,
+-            mock_open):
++            self, mock__get_phys_port_name, mock__get_phys_switch_id,
++            mock__get_pf_func, mock_listdir):
+         mock_listdir.return_value = [
+             'pf_ifname', 'rep_vf_1', 'rep_vf_2'
+         ]
+-        mock_isfile.side_effect = [True, True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
+-            ['pf_sw_id', 'pf_sw_id', '1', 'pf_sw_id', '2'])
+-        # PCI IDs mocked:
+-        # PF0:    0000:0a:00.0
+-        # PF0VF1: 0000:0a:02.1    PF0VF2: 0000:0a:02.2
+-        mock_get_function_by_ifname.side_effect = (
+-            [("0000:0a:00.0", True),
+-             ("0000:0a:02.1", False),
+-             ("0000:0a:02.2", False)])
++        mock__get_phys_switch_id.return_value = 'pf_sw_id'
++        mock__get_pf_func.return_value = "0"
++        mock__get_phys_port_name.side_effect = (
++            ["p0", "1", "2"])
+         self.assertRaises(
+             exception.RepresentorNotFound,
+             linux_net.get_representor_port,
+             'pf_ifname', '3'),
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+     @mock.patch.object(os, 'listdir')
+-    @mock.patch.object(linux_net, "get_function_by_ifname")
++    @mock.patch.object(linux_net, "_get_pf_func")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
++    @mock.patch.object(linux_net, "_get_phys_switch_id")
+     def test_get_representor_port_exception_io_error(
+-            self, mock_get_function_by_ifname, mock_listdir, mock_isfile,
+-            mock_open):
++            self, mock__get_phys_switch_id, mock__get_phys_port_name,
++            mock__get_pf_func, mock_listdir):
+         mock_listdir.return_value = [
+             'pf_ifname', 'rep_vf_1', 'rep_vf_2'
+         ]
+-        mock_isfile.side_effect = [True, True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
++        mock__get_phys_switch_id.side_effect = (
+             ['pf_sw_id', 'pf_sw_id', IOError(), 'pf_sw_id', '2'])
+-        # PCI IDs mocked:
+-        # PF0:    0000:0a:00.0
+-        # PF0VF1: 0000:0a:02.1    PF0VF2: 0000:0a:02.2
+-        mock_get_function_by_ifname.side_effect = (
+-            [("0000:0a:00.0", True),
+-             ("0000:0a:02.1", False),
+-             ("0000:0a:02.2", False), ("0000:0a:00.0", True)])
++        mock__get_pf_func.return_value = "0"
++        mock__get_phys_port_name.side_effect = (
++            ["p0", "pf0vf0", "pf0vf1"])
+         self.assertRaises(
+             exception.RepresentorNotFound,
+             linux_net.get_representor_port,
+             'pf_ifname', '3')
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+     @mock.patch.object(os, 'listdir')
+-    @mock.patch.object(linux_net, "get_function_by_ifname")
++    @mock.patch.object(linux_net, "_get_pf_func")
++    @mock.patch.object(linux_net, "_get_phys_port_name")
++    @mock.patch.object(linux_net, "_get_phys_switch_id")
+     def test_get_representor_port_exception_value_error(
+-            self, mock_get_function_by_ifname, mock_listdir, mock_isfile,
+-            mock_open):
++            self, mock__get_phys_switch_id, mock__get_phys_port_name,
++            mock__get_pf_func, mock_listdir):
+         mock_listdir.return_value = [
+             'pf_ifname', 'rep_vf_1', 'rep_vf_2'
+         ]
+-        mock_isfile.side_effect = [True, True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
+-            ['pf_sw_id', 'pf_sw_id', '1', 'pf_sw_id', 'a'])
+-        # PCI IDs mocked:
+-        # PF0:    0000:0a:00.0
+-        # PF0VF1: 0000:0a:02.1    PF0VF2: 0000:0a:02.2
+-        mock_get_function_by_ifname.side_effect = (
+-            [("0000:0a:00.0", True),
+-             ("0000:0a:02.1", False),
+-             ("0000:0a:02.2", False)])
++        mock__get_phys_switch_id.return_value = 'pf_sw_id'
++        mock__get_phys_port_name.side_effect = (['p0', '1', 'a'])
++        mock__get_pf_func.return_value = "0"
+         self.assertRaises(
+             exception.RepresentorNotFound,
+             linux_net.get_representor_port,
+             'pf_ifname', '3')
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+     @mock.patch.object(os, 'listdir')
+-    def test_physical_function_inferface_name(
+-            self, mock_listdir, mock_isfile, mock_open):
++    @mock.patch.object(linux_net, '_get_phys_switch_id')
++    def test_physical_function_interface_name(
++            self, mock__get_phys_switch_id, mock_listdir):
+         mock_listdir.return_value = ['foo', 'bar']
+-        mock_isfile.side_effect = [True, True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
++        mock__get_phys_switch_id.side_effect = (
+             ['', 'valid_switch'])
+         ifname = linux_net.get_ifname_by_pci_address(
+             '0000:00:00.1', pf_interface=True, switchdev=False)
+         self.assertEqual(ifname, 'foo')
+ 
+-    @mock.patch('six.moves.builtins.open')
+-    @mock.patch.object(os.path, 'isfile')
+     @mock.patch.object(os, 'listdir')
+-    def test_physical_function_inferface_name_with_switchdev(
+-            self, mock_listdir, mock_isfile, mock_open):
++    @mock.patch.object(linux_net, '_get_phys_switch_id')
++    def test_physical_function_interface_name_with_switchdev(
++            self, mock__get_phys_switch_id, mock_listdir):
+         mock_listdir.return_value = ['foo', 'bar']
+-        mock_isfile.side_effect = [True, True]
+-        mock_open.return_value.__enter__ = lambda s: s
+-        readline_mock = mock_open.return_value.readline
+-        readline_mock.side_effect = (
++        mock__get_phys_switch_id.side_effect = (
+             ['', 'valid_switch'])
+         ifname = linux_net.get_ifname_by_pci_address(
+             '0000:00:00.1', pf_interface=True, switchdev=True)
+@@ -419,3 +325,35 @@ class LinuxNetTest(testtools.TestCase):
+             linux_net.get_vf_num_by_pci_address,
+             '0000:00:00.1'
+         )
++
++    @mock.patch('builtins.open')
++    @mock.patch.object(os.path, 'isfile')
++    def test__get_phys_port_name(self, mock_isfile, mock_open):
++        mock_open.return_value.__enter__ = lambda s: s
++        readline_mock = mock_open.return_value.readline
++        readline_mock.return_value = 'pf0vf0'
++        mock_isfile.return_value = True
++        phys_port_name = linux_net._get_phys_port_name("vf_ifname")
++        self.assertEqual(phys_port_name, 'pf0vf0')
++
++    @mock.patch.object(os.path, 'isfile')
++    def test__get_phys_port_name_not_found(self, mock_isfile):
++        mock_isfile.return_value = False
++        phys_port_name = linux_net._get_phys_port_name("vf_ifname")
++        self.assertIsNone(phys_port_name)
++
++    @mock.patch('builtins.open')
++    @mock.patch.object(os.path, 'isfile')
++    def test__get_phys_switch_id(self, mock_isfile, mock_open):
++        mock_open.return_value.__enter__ = lambda s: s
++        readline_mock = mock_open.return_value.readline
++        readline_mock.return_value = '66e40000039b0398'
++        mock_isfile.return_value = True
++        phys_port_name = linux_net._get_phys_switch_id("ifname")
++        self.assertEqual(phys_port_name, '66e40000039b0398')
++
++    @mock.patch.object(os.path, 'isfile')
++    def test__get_phys_switch_id_not_found(self, mock_isfile):
++        mock_isfile.return_value = False
++        phys_port_name = linux_net._get_phys_switch_id("ifname")
++        self.assertIsNone(phys_port_name)
+-- 
+2.31.1
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2467eb6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Refactor-code-of-linux_net-to-more-cleaner-and-increase-performace.patch
+Fix-os-vif-fails-to-get-the-correct-UpLink-Representor.patch