From aa7b5972d48ad05824bfffdf1c5df5a6c2b1e37b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 7 Jan 2021 22:59:55 +0100
Subject: vyos.configverify: provide generic helper to check for interface
 existence

---
 src/conf_mode/interfaces-ethernet.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/conf_mode/interfaces-ethernet.py')

diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index bc102826f..0a904c592 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -23,13 +23,13 @@ from vyos.config import Config
 from vyos.configdict import get_interface_dict
 from vyos.configverify import verify_address
 from vyos.configverify import verify_dhcpv6
+from vyos.configverify import verify_eapol
 from vyos.configverify import verify_interface_exists
+from vyos.configverify import verify_mirror
 from vyos.configverify import verify_mtu
 from vyos.configverify import verify_mtu_ipv6
 from vyos.configverify import verify_vlan_config
 from vyos.configverify import verify_vrf
-from vyos.configverify import verify_eapol
-from vyos.configverify import verify_mirror
 from vyos.ifconfig import EthernetIf
 from vyos.template import render
 from vyos.util import call
@@ -59,7 +59,8 @@ def verify(ethernet):
     if 'deleted' in ethernet:
         return None
 
-    verify_interface_exists(ethernet)
+    ifname = ethernet['ifname']
+    verify_interface_exists(ifname)
 
     if ethernet.get('speed', None) == 'auto':
         if ethernet.get('duplex', None) != 'auto':
@@ -77,7 +78,6 @@ def verify(ethernet):
     verify_eapol(ethernet)
     verify_mirror(ethernet)
 
-    ifname = ethernet['ifname']
     # verify offloading capabilities
     if 'offload' in ethernet and 'rps' in ethernet['offload']:
         if not os.path.exists(f'/sys/class/net/{ifname}/queues/rx-0/rps_cpus'):
-- 
cgit v1.2.3


From 7a95aa238ba4d6743be645ffa3baef0e69251926 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 7 Jan 2021 23:41:33 +0100
Subject: smoketest: ethernet: verify() speed/duplex must both be auto or
 discrete

---
 smoketest/scripts/cli/test_interfaces_ethernet.py | 12 ++++++++++++
 src/conf_mode/interfaces-ethernet.py              | 11 ++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'src/conf_mode/interfaces-ethernet.py')

diff --git a/smoketest/scripts/cli/test_interfaces_ethernet.py b/smoketest/scripts/cli/test_interfaces_ethernet.py
index 0f3579c30..6b21853c3 100755
--- a/smoketest/scripts/cli/test_interfaces_ethernet.py
+++ b/smoketest/scripts/cli/test_interfaces_ethernet.py
@@ -136,6 +136,18 @@ class EthernetInterfaceTest(BasicInterfaceTest.BaseTest):
         # manually, else tearDown() will have problem in commit()
         self.session.delete(unknonw_interface)
 
+    def test_speed_duplex_verify(self):
+        for interface in self._interfaces:
+            self.session.set(self._base_path + [interface, 'speed', '1000'])
+
+            # check validate() - if either speed or duplex is not auto, the
+            # other one must be manually configured, too
+            with self.assertRaises(ConfigSessionError):
+                self.session.commit()
+            self.session.set(self._base_path + [interface, 'duplex', 'full'])
+
+        self.session.commit()
+
     def test_eapol_support(self):
         for interface in self._interfaces:
             # Enable EAPoL
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 0a904c592..e7f0cd6a5 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -62,13 +62,10 @@ def verify(ethernet):
     ifname = ethernet['ifname']
     verify_interface_exists(ifname)
 
-    if ethernet.get('speed', None) == 'auto':
-        if ethernet.get('duplex', None) != 'auto':
-            raise ConfigError('If speed is hardcoded, duplex must be hardcoded, too')
-
-    if ethernet.get('duplex', None) == 'auto':
-        if ethernet.get('speed', None) != 'auto':
-            raise ConfigError('If duplex is hardcoded, speed must be hardcoded, too')
+    # No need to check speed and duplex keys as both have default values.
+    if ((ethernet['speed'] == 'auto' and ethernet['duplex'] != 'auto') or
+        (ethernet['speed'] != 'auto' and ethernet['duplex'] == 'auto')):
+            raise ConfigError('Speed/Duplex missmatch. Must be both auto or manually configured')
 
     verify_mtu(ethernet)
     verify_mtu_ipv6(ethernet)
-- 
cgit v1.2.3