Merge branch 'dhcp-relay' of github.com:c-po/vyos-1x into current

* 'dhcp-relay' of github.com:c-po/vyos-1x:
  dhcp-relay: T3095: migrate service to get_config_dict()
  smoketest: dhcp-relay: T3095: initial tests

1 files changed, 101 insertions, 0 deletions

diff --git a/smoketest/scripts/cli/test_service_dhcp-relay.py b/smoketest/scripts/cli/test_service_dhcp-relay.py
new file mode 100755
index 000000000..d56f6aa16
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_dhcp-relay.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from vyos.configsession import ConfigSession
+from vyos.configsession import ConfigSessionError
+from vyos.ifconfig import Section
+from vyos.util import cmd
+from vyos.util import process_named_running
+from vyos.util import read_file
+
+PROCESS_NAME = 'dhcrelay'
+RELAY_CONF = '/run/dhcp-relay/dhcrelay.conf'
+base_path = ['service', 'dhcp-relay']
+
+def get_config_value(key):
+    tmp = read_file(SSHD_CONF)
+    tmp = re.findall(f'\n?{key}\s+(.*)', tmp)
+    return tmp
+
+class TestServiceDHCPRelay(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        self.session.delete(base_path)
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_relay_default(self):
+        max_size = '800'
+        hop_count = '20'
+        agents_packets = 'append'
+        servers = ['192.0.2.1', '192.0.2.2']
+
+        self.session.set(base_path + ['interface', 'lo'])
+        # check validate() - DHCP relay does not support the loopback interface
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+        self.session.delete(base_path + ['interface', 'lo'])
+
+        # activate DHCP relay on all ethernet interfaces
+        for tmp in Section.interfaces("ethernet"):
+            self.session.set(base_path + ['interface', tmp])
+
+        # check validate() - No DHCP relay server(s) configured
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+        for server in servers:
+            self.session.set(base_path + ['server', server])
+
+        self.session.set(base_path + ['relay-options', 'max-size', max_size])
+        self.session.set(base_path + ['relay-options', 'hop-count', hop_count])
+        self.session.set(base_path + ['relay-options', 'relay-agents-packets', agents_packets])
+
+        # commit changes
+        self.session.commit()
+
+        # Check configured port
+        config = read_file(RELAY_CONF)
+
+        # Test configured relay interfaces
+        for tmp in Section.interfaces("ethernet"):
+            self.assertIn(f'-i {tmp}', config)
+
+        # Test relay servers
+        for server in servers:
+            self.assertIn(f' {server}', config)
+
+        # Test max-size
+        self.assertIn(f'-A {max_size}', config)
+        # Hop count
+        self.assertIn(f'-c {hop_count}', config)
+        # relay-agents-packets
+        self.assertIn(f'-a -m {agents_packets}', config)
+
+        # Check for running process
+        self.assertTrue(process_named_running(PROCESS_NAME))
+
+if __name__ == '__main__':
+    unittest.main()
+