summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-04 15:41:08 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-04 18:20:44 +0100
commit2a33a6f71bbbaf7a6c26278b29f583e418b38354 (patch)
treea458ec5cd355ff17ea1b9e04416be3a62bcfbc95
parent146ba4b1b26f65e3e84f9ed99d954b1bf473e154 (diff)
downloadvyos-1x-2a33a6f71bbbaf7a6c26278b29f583e418b38354.tar.gz
vyos-1x-2a33a6f71bbbaf7a6c26278b29f583e418b38354.zip
ethernet: T3048: remove "smp-affinity" from CLI
Commit 5f5b2808c0a ("ethernet: T3048: drop static smp-affinity for dynamic performance tuning") but the CLI nodes have not been removed.
-rw-r--r--interface-definitions/interfaces-ethernet.xml.in25
-rw-r--r--smoketest/scripts/cli/base_interfaces_test.py5
2 files changed, 2 insertions, 28 deletions
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 223a94bff..0337c629b 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -167,31 +167,6 @@
</leafNode>
</children>
</node>
- <leafNode name="smp-affinity">
- <properties>
- <help>CPU interrupt affinity mask</help>
- <completionHelp>
- <list>auto 10 100 1000 2500 5000 10000</list>
- </completionHelp>
- <valueHelp>
- <format>auto</format>
- <description>Auto negotiation (default)</description>
- </valueHelp>
- <valueHelp>
- <format>hex</format>
- <description>Bitmask representing CPUs that this NIC will interrupt</description>
- </valueHelp>
- <valueHelp>
- <format>hex,hex</format>
- <description>Bitmasks representing CPUs for interrupt and receive processing</description>
- </valueHelp>
- <constraint>
- <regex>(auto)</regex>
- <regex>[0-9a-f]+(|,[0-9a-f]+)$</regex>
- </constraint>
- <constraintErrorMessage>IRQ affinity mask must be hex value or auto</constraintErrorMessage>
- </properties>
- </leafNode>
<leafNode name="speed">
<properties>
<help>Link speed</help>
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index 0a4e85c0f..615317368 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -61,13 +61,12 @@ class BasicInterfaceTest:
self.session.delete(self._base_path + [interface])
self.session.set(self._base_path + [interface, 'duplex', 'auto'])
self.session.set(self._base_path + [interface, 'speed', 'auto'])
- self.session.set(self._base_path + [interface, 'smp-affinity', 'auto'])
else:
self.session.delete(self._base_path)
self.session.commit()
del self.session
-
+
def test_mirror(self):
Success = 0
i = 0
@@ -93,7 +92,7 @@ class BasicInterfaceTest:
self.assertTrue(False)
else:
return None
-
+
def test_add_description(self):
"""