5206717f08
This commit fixes incorrect way for choosing VF in SR-IOV binding driver. Previously sriov-device-plugin has choosen device by it's own way while CNI choosed first available VF. This entities did not know anything about each other's choice. Now SR-IOV binding driver gets a list of used by kubelet devices with help of Pod Resources Client, then chooses device from this list which is not used by pod yet and passes an appropriate VF into container's network namespace. Also this commit contains tools for cluster upgrade. Change-Id: I5b24981f715966369b05b8ab157f8bfe02afc2d4 Closes-Bug: 1826865 Signed-off-by: Danil Golov <d.golov@samsung.com>
307 lines
12 KiB
Python
307 lines
12 KiB
Python
# Copyright 2017 Red Hat, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
import mock
|
|
import uuid
|
|
|
|
from os_vif import objects as osv_objects
|
|
from oslo_config import cfg
|
|
|
|
from kuryr_kubernetes.cni.binding import base
|
|
from kuryr_kubernetes.cni.binding import sriov
|
|
from kuryr_kubernetes import objects
|
|
from kuryr_kubernetes.tests import base as test_base
|
|
from kuryr_kubernetes.tests import fake
|
|
|
|
CONF = cfg.CONF
|
|
|
|
|
|
class TestDriverMixin(test_base.TestCase):
|
|
def setUp(self):
|
|
super(TestDriverMixin, self).setUp()
|
|
self.instance_info = osv_objects.instance_info.InstanceInfo(
|
|
uuid=uuid.uuid4(), name='foo')
|
|
self.ifname = 'c_interface'
|
|
self.netns = '/proc/netns/1234'
|
|
|
|
# Mock IPDB context managers
|
|
self.ipdbs = {}
|
|
self.m_bridge_iface = mock.Mock(__exit__=mock.Mock(return_value=None))
|
|
self.m_c_iface = mock.Mock()
|
|
self.m_h_iface = mock.Mock()
|
|
self.h_ipdb, self.h_ipdb_exit = self._mock_ipdb_context_manager(None)
|
|
self.c_ipdb, self.c_ipdb_exit = self._mock_ipdb_context_manager(
|
|
self.netns)
|
|
self.m_create = mock.Mock()
|
|
self.h_ipdb.create = mock.Mock(
|
|
return_value=mock.Mock(
|
|
__enter__=mock.Mock(return_value=self.m_create),
|
|
__exit__=mock.Mock(return_value=None)))
|
|
self.c_ipdb.create = mock.Mock(
|
|
return_value=mock.Mock(
|
|
__enter__=mock.Mock(return_value=self.m_create),
|
|
__exit__=mock.Mock(return_value=None)))
|
|
|
|
def _mock_ipdb_context_manager(self, netns):
|
|
mock_ipdb = mock.Mock(
|
|
interfaces={
|
|
'bridge': mock.Mock(
|
|
__enter__=mock.Mock(return_value=self.m_bridge_iface),
|
|
__exit__=mock.Mock(return_value=None),
|
|
),
|
|
'c_interface': mock.Mock(
|
|
__enter__=mock.Mock(return_value=self.m_c_iface),
|
|
__exit__=mock.Mock(return_value=None),
|
|
),
|
|
'h_interface': mock.Mock(
|
|
__enter__=mock.Mock(return_value=self.m_h_iface),
|
|
__exit__=mock.Mock(return_value=None),
|
|
),
|
|
}
|
|
)
|
|
mock_exit = mock.Mock(return_value=None)
|
|
mock_ipdb.__exit__ = mock_exit
|
|
mock_ipdb.__enter__ = mock.Mock(return_value=mock_ipdb)
|
|
self.ipdbs[netns] = mock_ipdb
|
|
|
|
return mock_ipdb, mock_exit
|
|
|
|
@mock.patch('kuryr_kubernetes.cni.binding.base.get_ipdb')
|
|
@mock.patch('os_vif.plug')
|
|
def _test_connect(self, m_vif_plug, m_get_ipdb, report=None):
|
|
def get_ipdb(netns=None):
|
|
return self.ipdbs[netns]
|
|
|
|
m_get_ipdb.side_effect = get_ipdb
|
|
|
|
base.connect(self.vif, self.instance_info, self.ifname, self.netns,
|
|
report)
|
|
m_vif_plug.assert_called_once_with(self.vif, self.instance_info)
|
|
self.m_c_iface.add_ip.assert_called_once_with('192.168.0.2/24')
|
|
if report:
|
|
report.assert_called_once()
|
|
|
|
@mock.patch('os_vif.unplug')
|
|
def _test_disconnect(self, m_vif_unplug, report=None):
|
|
base.disconnect(self.vif, self.instance_info, self.ifname, self.netns,
|
|
report)
|
|
m_vif_unplug.assert_called_once_with(self.vif, self.instance_info)
|
|
if report:
|
|
report.assert_called_once()
|
|
|
|
|
|
class TestOpenVSwitchDriver(TestDriverMixin, test_base.TestCase):
|
|
def setUp(self):
|
|
super(TestOpenVSwitchDriver, self).setUp()
|
|
self.vif = fake._fake_vif(osv_objects.vif.VIFOpenVSwitch)
|
|
|
|
@mock.patch('kuryr_kubernetes.cni.plugins.k8s_cni_registry.'
|
|
'K8sCNIRegistryPlugin.report_drivers_health')
|
|
@mock.patch('os.getpid', mock.Mock(return_value=123))
|
|
@mock.patch('kuryr_kubernetes.linux_net_utils.create_ovs_vif_port')
|
|
def test_connect(self, mock_create_ovs, m_report):
|
|
self._test_connect(report=m_report)
|
|
self.assertEqual(3, self.h_ipdb_exit.call_count)
|
|
self.assertEqual(2, self.c_ipdb_exit.call_count)
|
|
self.c_ipdb.create.assert_called_once_with(
|
|
ifname=self.ifname, peer='h_interface', kind='veth')
|
|
self.assertEqual(1, self.m_create.mtu)
|
|
self.assertEqual(str(self.vif.address),
|
|
self.m_create.address)
|
|
self.m_create.up.assert_called_once_with()
|
|
self.assertEqual(123, self.m_h_iface.net_ns_pid)
|
|
self.assertEqual(1, self.m_h_iface.mtu)
|
|
self.m_h_iface.up.assert_called_once_with()
|
|
|
|
mock_create_ovs.assert_called_once_with(
|
|
'bridge', 'h_interface', '89eccd45-43e9-43d8-b4cc-4c13db13f782',
|
|
'3e:94:b7:31:a0:83', 'kuryr')
|
|
|
|
@mock.patch('kuryr_kubernetes.cni.plugins.k8s_cni_registry.'
|
|
'K8sCNIRegistryPlugin.report_drivers_health')
|
|
@mock.patch('kuryr_kubernetes.linux_net_utils.delete_ovs_vif_port')
|
|
def test_disconnect(self, mock_delete_ovs, m_report):
|
|
self._test_disconnect(report=m_report)
|
|
mock_delete_ovs.assert_called_once_with('bridge', 'h_interface')
|
|
|
|
|
|
class TestBridgeDriver(TestDriverMixin, test_base.TestCase):
|
|
def setUp(self):
|
|
super(TestBridgeDriver, self).setUp()
|
|
self.vif = fake._fake_vif(osv_objects.vif.VIFBridge)
|
|
|
|
@mock.patch('os.getpid', mock.Mock(return_value=123))
|
|
def test_connect(self):
|
|
self._test_connect()
|
|
|
|
self.m_h_iface.remove.assert_called_once_with()
|
|
|
|
self.assertEqual(3, self.h_ipdb_exit.call_count)
|
|
self.assertEqual(2, self.c_ipdb_exit.call_count)
|
|
self.c_ipdb.create.assert_called_once_with(
|
|
ifname=self.ifname, peer='h_interface', kind='veth')
|
|
self.assertEqual(1, self.m_create.mtu)
|
|
self.assertEqual(str(self.vif.address),
|
|
self.m_create.address)
|
|
self.m_create.up.assert_called_once_with()
|
|
self.assertEqual(123, self.m_h_iface.net_ns_pid)
|
|
self.assertEqual(1, self.m_h_iface.mtu)
|
|
self.m_h_iface.up.assert_called_once_with()
|
|
|
|
self.m_bridge_iface.add_port.assert_called_once_with('h_interface')
|
|
|
|
def test_disconnect(self):
|
|
self._test_disconnect()
|
|
|
|
|
|
class TestNestedVlanDriver(TestDriverMixin, test_base.TestCase):
|
|
def setUp(self):
|
|
super(TestNestedVlanDriver, self).setUp()
|
|
self.vif = fake._fake_vif(objects.vif.VIFVlanNested)
|
|
self.vif.vlan_id = 7
|
|
CONF.set_override('link_iface', 'bridge', group='binding')
|
|
self.addCleanup(CONF.clear_override, 'link_iface', group='binding')
|
|
|
|
def test_connect(self):
|
|
self._test_connect()
|
|
|
|
self.assertEqual(1, self.h_ipdb_exit.call_count)
|
|
self.assertEqual(2, self.c_ipdb_exit.call_count)
|
|
|
|
self.assertEqual(self.ifname, self.m_h_iface.ifname)
|
|
self.assertEqual(1, self.m_h_iface.mtu)
|
|
self.assertEqual(str(self.vif.address), self.m_h_iface.address)
|
|
self.m_h_iface.up.assert_called_once_with()
|
|
|
|
def test_disconnect(self):
|
|
self._test_disconnect()
|
|
|
|
|
|
class TestNestedMacvlanDriver(TestDriverMixin, test_base.TestCase):
|
|
def setUp(self):
|
|
super(TestNestedMacvlanDriver, self).setUp()
|
|
self.vif = fake._fake_vif(objects.vif.VIFMacvlanNested)
|
|
CONF.set_override('link_iface', 'bridge', group='binding')
|
|
self.addCleanup(CONF.clear_override, 'link_iface', group='binding')
|
|
|
|
def test_connect(self):
|
|
self._test_connect()
|
|
|
|
self.assertEqual(1, self.h_ipdb_exit.call_count)
|
|
self.assertEqual(2, self.c_ipdb_exit.call_count)
|
|
|
|
self.assertEqual(self.ifname, self.m_h_iface.ifname)
|
|
self.assertEqual(1, self.m_h_iface.mtu)
|
|
self.assertEqual(str(self.vif.address), self.m_h_iface.address)
|
|
self.m_h_iface.up.assert_called_once_with()
|
|
|
|
def test_disconnect(self):
|
|
self._test_disconnect()
|
|
|
|
|
|
class TestSriovDriver(TestDriverMixin, test_base.TestCase):
|
|
def setUp(self):
|
|
super(TestSriovDriver, self).setUp()
|
|
self.vif = fake._fake_vif(objects.vif.VIFSriov)
|
|
self.vif.physnet = 'physnet2'
|
|
self.pci_info = mock.Mock()
|
|
self.vif.pod_link = 'pod_link'
|
|
self.vif.pod_name = 'pod_1'
|
|
self.pci = mock.Mock()
|
|
|
|
self.device_ids = ['pci_dev_1']
|
|
self.device = mock.Mock()
|
|
self.device.device_ids = self.device_ids
|
|
self.device.resource_name = 'intel.com/sriov'
|
|
|
|
self.cont_devs = [self.device]
|
|
self.container = mock.Mock()
|
|
self.container.devices = self.cont_devs
|
|
|
|
self.pod_containers = [self.container]
|
|
self.pod_resource = mock.Mock()
|
|
self.pod_resource.containers = self.pod_containers
|
|
self.pod_resource.name = 'pod_1'
|
|
|
|
self.resources = [self.pod_resource]
|
|
|
|
CONF.set_override('physnet_resource_mappings', 'physnet2:sriov',
|
|
group='sriov')
|
|
self.addCleanup(CONF.clear_override, 'physnet_resource_mappings',
|
|
group='sriov')
|
|
CONF.set_override('device_plugin_resource_prefix', 'intel.com',
|
|
group='sriov')
|
|
|
|
@mock.patch('kuryr_kubernetes.cni.binding.sriov.VIFSriovDriver.'
|
|
'_annotate_device')
|
|
@mock.patch('kuryr_kubernetes.cni.binding.sriov.VIFSriovDriver.'
|
|
'_choose_pci')
|
|
@mock.patch('kuryr_kubernetes.cni.binding.sriov.VIFSriovDriver.'
|
|
'_get_vf_info')
|
|
@mock.patch('kuryr_kubernetes.cni.binding.sriov.VIFSriovDriver.'
|
|
'_set_vf_mac')
|
|
@mock.patch('kuryr_kubernetes.cni.binding.sriov.VIFSriovDriver.'
|
|
'_save_pci_info')
|
|
def test_connect(self, m_save_pci_info, m_set_vf_mac, m_vf_info,
|
|
m_choose_pci, m_annot_dev):
|
|
m_vf_info.return_value = [self.ifname, 1, 'h_interface',
|
|
self.pci_info]
|
|
m_choose_pci.return_value = self.pci
|
|
self._test_connect()
|
|
|
|
self.assertEqual(self.ifname, self.m_c_iface.ifname)
|
|
self.assertEqual(1, self.m_c_iface.mtu)
|
|
self.m_c_iface.up.assert_called_once_with()
|
|
m_set_vf_mac.assert_called_once_with('h_interface', 1,
|
|
str(self.vif.address))
|
|
m_save_pci_info.assert_called_once_with(self.vif.id, self.pci_info)
|
|
m_annot_dev.assert_called_once_with(self.vif.pod_link, self.pci)
|
|
|
|
@mock.patch('kuryr_kubernetes.cni.binding.sriov.VIFSriovDriver.'
|
|
'_remove_pci_info')
|
|
def test_disconnect(self, m_remove_pci):
|
|
m_remove_pci.return_value = None
|
|
self._test_disconnect()
|
|
|
|
@mock.patch('kuryr_kubernetes.clients.get_pod_resources_client')
|
|
@mock.patch('kuryr_kubernetes.cni.binding.sriov.VIFSriovDriver.'
|
|
'_get_resource_by_physnet')
|
|
def test_choose_pci(self, m_get_res_ph, m_get_prc):
|
|
cls = sriov.VIFSriovDriver
|
|
m_driver = mock.Mock(spec=cls)
|
|
|
|
m_driver._make_resource.return_value = 'intel.com/sriov'
|
|
m_driver._get_pod_devices.return_value = ['pci_dev_2']
|
|
|
|
pod_resources_list = mock.Mock()
|
|
pod_resources_list.pod_resources = self.resources
|
|
pod_resources_client = mock.Mock()
|
|
pod_resources_client.list.return_value = pod_resources_list
|
|
m_get_prc.return_value = pod_resources_client
|
|
|
|
self.assertEqual('pci_dev_1', cls._choose_pci(m_driver, self.vif,
|
|
self.ifname, self.netns))
|
|
|
|
def test_get_resource_by_physnet(self):
|
|
cls = sriov.VIFSriovDriver
|
|
m_driver = mock.Mock(spec=cls)
|
|
self.assertEqual(
|
|
'sriov', cls._get_resource_by_physnet(m_driver, self.vif.physnet))
|
|
|
|
def test_make_resource(self):
|
|
cls = sriov.VIFSriovDriver
|
|
m_driver = mock.Mock(spec=cls)
|
|
self.assertEqual('intel.com/sriov', cls._make_resource(m_driver,
|
|
'sriov'))
|