* changes in get_dpdk_queues_count method were reverted
* restriction for negative number was added

Change-Id: Ia51801dfb39705521411102a5fe3989bcf51be86
Related-Bug: #1654950
This commit is contained in:
Anastasiya 2017-01-12 15:35:07 +04:00
parent 5a2b81c2fc
commit 68778a404b
2 changed files with 5 additions and 9 deletions

View File

@ -91,11 +91,12 @@ class NIC(DPDKMixin, NailgunObject):
@classmethod
def get_dpdk_queues_count(cls, instance):
from nailgun.objects import NodeAttributes
cpu_pinning = NodeAttributes.distribute_node_cpus(
instance.node)['components']
pmd_core_count = len(cpu_pinning.get('ovs_pmd_core_mask', []))
dpdk_cpu_pinning = utils.get_in(instance.node.attributes,
'cpu_pinning', 'dpdk', 'value') or 0
max_queues = utils.get_in(instance.meta, 'max_queues') or 0
# Number CPU for ovs_pmd_core_mask equals number DPDK CPU pinning - 1
# 1 CPU is needed for ovs_core_mask
pmd_core_count = dpdk_cpu_pinning - 1 if dpdk_cpu_pinning > 0 else 0
return min(max_queues, pmd_core_count)
@classmethod

View File

@ -248,11 +248,6 @@ class TestNICObject(BaseTestCase):
def _prepare_dpdk_settings(self, dpdk_cpu_pinning, max_queues):
node = self.env.nodes[0]
dpdk_nic = node.nic_interfaces[0]
numa_topology = {'numa_nodes': [
{'id': 0, 'cpus': [1, 2, 3, 4]}
]}
node.meta['numa_topology'] = numa_topology
node.attributes['cpu_pinning'] = {
'dpdk': {
'value': dpdk_cpu_pinning