Merge pull request #1121 from sever-sever/T4109

keepalived: T4109: Add high-availability virtual-server

2 files changed, 151 insertions, 5 deletions

diff --git a/smoketest/scripts/cli/test_ha_virtual_server.py b/smoketest/scripts/cli/test_ha_virtual_server.py
new file mode 100755
index 000000000..e3a91283e
--- /dev/null
+++ b/smoketest/scripts/cli/test_ha_virtual_server.py
@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021-2022 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 unittest
+
+from base_vyostest_shim import VyOSUnitTestSHIM
+
+from vyos.configsession import ConfigSessionError
+from vyos.ifconfig.vrrp import VRRP
+from vyos.util import cmd
+from vyos.util import process_named_running
+from vyos.util import read_file
+from vyos.template import inc_ip
+
+PROCESS_NAME = 'keepalived'
+KEEPALIVED_CONF = VRRP.location['config']
+base_path = ['high-availability']
+vrrp_interface = 'eth1'
+
+class TestHAVirtualServer(VyOSUnitTestSHIM.TestCase):
+    def tearDown(self):
+        # Check for running process
+        self.assertTrue(process_named_running(PROCESS_NAME))
+
+        self.cli_delete(['interfaces', 'ethernet', vrrp_interface, 'address'])
+        self.cli_delete(base_path)
+        self.cli_commit()
+
+        # Process must be terminated after deleting the config
+        self.assertFalse(process_named_running(PROCESS_NAME))
+
+    def test_01_ha_virtual_server(self):
+        algo = 'least-connection'
+        delay = '10'
+        method = 'nat'
+        persistence_timeout = '600'
+        vip = '203.0.113.111'
+        vport = '2222'
+        rservers = ['192.0.2.21', '192.0.2.22', '192.0.2.23']
+        rport = '22'
+        proto = 'tcp'
+        connection_timeout = '30'
+
+        vserver_base = base_path + ['virtual-server']
+
+        self.cli_set(vserver_base + [vip, 'algorithm', algo])
+        self.cli_set(vserver_base + [vip, 'delay-loop', delay])
+        self.cli_set(vserver_base + [vip, 'forward-method', method])
+        self.cli_set(vserver_base + [vip, 'persistence-timeout', persistence_timeout])
+        self.cli_set(vserver_base + [vip, 'port', vport])
+        self.cli_set(vserver_base + [vip, 'protocol', proto])
+        for rs in rservers:
+            self.cli_set(vserver_base + [vip, 'real-server', rs, 'connection-timeout', connection_timeout])
+            self.cli_set(vserver_base + [vip, 'real-server', rs, 'port', rport])
+
+        # commit changes
+        self.cli_commit()
+
+        config = read_file(KEEPALIVED_CONF)
+
+        self.assertIn(f'delay_loop {delay}', config)
+        self.assertIn(f'lb_algo lc', config)
+        self.assertIn(f'lb_kind {method.upper()}', config)
+        self.assertIn(f'persistence_timeout {persistence_timeout}', config)
+        self.assertIn(f'protocol {proto.upper()}', config)
+        for rs in rservers:
+            self.assertIn(f'real_server {rs} {rport}', config)
+            self.assertIn(f'{proto.upper()}_CHECK', config)
+            self.assertIn(f'connect_timeout {connection_timeout}', config)
+
+    def test_02_ha_virtual_server_and_vrrp(self):
+        algo = 'least-connection'
+        delay = '15'
+        method = 'nat'
+        persistence_timeout = '300'
+        vip = '203.0.113.222'
+        vport = '22322'
+        rservers = ['192.0.2.11', '192.0.2.12']
+        rport = '222'
+        proto = 'tcp'
+        connection_timeout = '23'
+        group = 'VyOS'
+        vrid = '99'
+
+        vrrp_base = base_path + ['vrrp', 'group']
+        vserver_base = base_path + ['virtual-server']
+
+        self.cli_set(['interfaces', 'ethernet', vrrp_interface, 'address', '203.0.113.10/24'])
+
+        # VRRP config
+        self.cli_set(vrrp_base + [group, 'description', group])
+        self.cli_set(vrrp_base + [group, 'interface', vrrp_interface])
+        self.cli_set(vrrp_base + [group, 'address', vip + '/24'])
+        self.cli_set(vrrp_base + [group, 'vrid', vrid])
+
+        # Virtual-server config
+        self.cli_set(vserver_base + [vip, 'algorithm', algo])
+        self.cli_set(vserver_base + [vip, 'delay-loop', delay])
+        self.cli_set(vserver_base + [vip, 'forward-method', method])
+        self.cli_set(vserver_base + [vip, 'persistence-timeout', persistence_timeout])
+        self.cli_set(vserver_base + [vip, 'port', vport])
+        self.cli_set(vserver_base + [vip, 'protocol', proto])
+        for rs in rservers:
+            self.cli_set(vserver_base + [vip, 'real-server', rs, 'connection-timeout', connection_timeout])
+            self.cli_set(vserver_base + [vip, 'real-server', rs, 'port', rport])
+
+        # commit changes
+        self.cli_commit()
+
+        config = read_file(KEEPALIVED_CONF)
+
+        # Keepalived vrrp
+        self.assertIn(f'# {group}', config)
+        self.assertIn(f'interface {vrrp_interface}', config)
+        self.assertIn(f'virtual_router_id {vrid}', config)
+        self.assertIn(f'priority 100', config) # default value
+        self.assertIn(f'advert_int 1', config) # default value
+        self.assertIn(f'preempt_delay 0', config) # default value
+
+        # Keepalived virtual-server
+        self.assertIn(f'delay_loop {delay}', config)
+        self.assertIn(f'lb_algo lc', config)
+        self.assertIn(f'lb_kind {method.upper()}', config)
+        self.assertIn(f'persistence_timeout {persistence_timeout}', config)
+        self.assertIn(f'protocol {proto.upper()}', config)
+        for rs in rservers:
+            self.assertIn(f'real_server {rs} {rport}', config)
+            self.assertIn(f'{proto.upper()}_CHECK', config)
+            self.assertIn(f'connect_timeout {connection_timeout}', config)
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_ha_vrrp.py b/smoketest/scripts/cli/test_ha_vrrp.py
index 23a9f7796..a37ce7e64 100755
--- a/smoketest/scripts/cli/test_ha_vrrp.py
+++ b/smoketest/scripts/cli/test_ha_vrrp.py
@@ -27,7 +27,7 @@ from vyos.template import inc_ip
 
 PROCESS_NAME = 'keepalived'
 KEEPALIVED_CONF = VRRP.location['config']
-base_path = ['high-availability', 'vrrp']
+base_path = ['high-availability']
 
 vrrp_interface = 'eth1'
 groups = ['VLAN77', 'VLAN78', 'VLAN201']
@@ -56,7 +56,7 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
         for group in groups:
             vlan_id = group.lstrip('VLAN')
             vip = f'100.64.{vlan_id}.1/24'
-            group_base = base_path + ['group', group]
+            group_base = base_path + ['vrrp', 'group', group]
 
             self.cli_set(['interfaces', 'ethernet', vrrp_interface, 'vif', vlan_id, 'address', inc_ip(vip, 1) + '/' + vip.split('/')[-1]])
 
@@ -91,7 +91,7 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
         for group in groups:
             vlan_id = group.lstrip('VLAN')
             vip = f'100.64.{vlan_id}.1/24'
-            group_base = base_path + ['group', group]
+            group_base = base_path + ['vrrp', 'group', group]
 
             self.cli_set(['interfaces', 'ethernet', vrrp_interface, 'vif', vlan_id, 'address', inc_ip(vip, 1) + '/' + vip.split('/')[-1]])
 
@@ -138,7 +138,7 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
         for group in groups:
             vlan_id = group.lstrip('VLAN')
             vip = f'100.64.{vlan_id}.1/24'
-            group_base = base_path + ['group', group]
+            group_base = base_path + ['vrrp', 'group', group]
 
             self.cli_set(['interfaces', 'ethernet', vrrp_interface, 'vif', vlan_id, 'address', inc_ip(vip, 1) + '/' + vip.split('/')[-1]])
 
@@ -146,7 +146,7 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase):
             self.cli_set(group_base + ['address', vip])
             self.cli_set(group_base + ['vrid', vlan_id])
 
-            self.cli_set(base_path + ['sync-group', sync_group, 'member', group])
+            self.cli_set(base_path + ['vrrp', 'sync-group', sync_group, 'member', group])
 
         # commit changes
         self.cli_commit()