From a4bf498d77b5cd2db00aae226b10a60d9b1fba23 Mon Sep 17 00:00:00 2001
From: Nataliia Solomko <natalirs1985@gmail.com>
Date: Tue, 3 Dec 2024 15:45:21 +0200
Subject: ipoe_server: T6628: Add option to assign static IP address to end
 users

---
 data/templates/accel-ppp/chap-secrets.ipoe.j2     |  2 +-
 interface-definitions/service_ipoe-server.xml.in  | 12 ++++++++
 smoketest/scripts/cli/test_service_ipoe-server.py | 35 +++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/data/templates/accel-ppp/chap-secrets.ipoe.j2 b/data/templates/accel-ppp/chap-secrets.ipoe.j2
index 43083e22e..dd85160c0 100644
--- a/data/templates/accel-ppp/chap-secrets.ipoe.j2
+++ b/data/templates/accel-ppp/chap-secrets.ipoe.j2
@@ -6,7 +6,7 @@
 {%                 if mac_config.vlan is vyos_defined %}
 {%                     set iface = iface ~ '.' ~ mac_config.vlan %}
 {%                 endif %}
-{{ "%-11s" | format(iface) }} * {{ mac | lower }} * {{ mac_config.rate_limit.download ~ '/' ~ mac_config.rate_limit.upload if mac_config.rate_limit.download is vyos_defined and mac_config.rate_limit.upload is vyos_defined }}
+{{ "%-11s" | format(iface) }} * {{ mac | lower }} {{ mac_config.static_ip if mac_config.static_ip is vyos_defined else '*' }} {{ mac_config.rate_limit.download ~ '/' ~ mac_config.rate_limit.upload if mac_config.rate_limit.download is vyos_defined and mac_config.rate_limit.upload is vyos_defined }}
 {%             endfor %}
 {%         endif %}
 {%     endfor %}
diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index 39cfb7889..6cc4471af 100644
--- a/interface-definitions/service_ipoe-server.xml.in
+++ b/interface-definitions/service_ipoe-server.xml.in
@@ -70,6 +70,18 @@
                           <constraintErrorMessage>VLAN IDs need to be in range 1-4094</constraintErrorMessage>
                         </properties>
                       </leafNode>
+                      <leafNode name="static-ip">
+                        <properties>
+                          <help>Static client IP address</help>
+                          <valueHelp>
+                            <format>ipv4</format>
+                            <description>IPv4 address</description>
+                          </valueHelp>
+                          <constraint>
+                            <validator name="ipv4-address"/>
+                          </constraint>
+                        </properties>
+                      </leafNode>
                     </children>
                   </tagNode>
                 </children>
diff --git a/smoketest/scripts/cli/test_service_ipoe-server.py b/smoketest/scripts/cli/test_service_ipoe-server.py
index be03179bf..ab0898d17 100755
--- a/smoketest/scripts/cli/test_service_ipoe-server.py
+++ b/smoketest/scripts/cli/test_service_ipoe-server.py
@@ -260,6 +260,41 @@ delegate={delegate_2_prefix},{delegate_mask},name={pool_name}"""
         tmp = ','.join(vlans)
         self.assertIn(f'{interface},{tmp}', conf['ipoe']['vlan-mon'])
 
+    def test_ipoe_server_static_client_ip(self):
+        mac_address = '08:00:27:2f:d8:06'
+        ip_address = '192.0.2.100'
+
+        # Test configuration of local authentication for PPPoE server
+        self.basic_config()
+        # Rewrite authentication from basic_config
+        self.set(
+            [
+                'authentication',
+                'interface',
+                interface,
+                'mac',
+                mac_address,
+                'static-ip',
+                ip_address,
+            ]
+        )
+        self.set(['authentication', 'mode', 'local'])
+        # commit changes
+        self.cli_commit()
+
+        # Validate configuration values
+        conf = ConfigParser(allow_no_value=True, delimiters='=', strict=False)
+        conf.read(self._config_file)
+
+        # basic verification
+        self.verify(conf)
+
+        # check local users
+        tmp = cmd(f'sudo cat {self._chap_secrets}')
+        regex = f'{interface}\s+\*\s+{mac_address}\s+{ip_address}'
+        tmp = re.findall(regex, tmp)
+        self.assertTrue(tmp)
+
     @unittest.skip("PPP is not a part of IPoE")
     def test_accel_ppp_options(self):
         pass
-- 
cgit v1.2.3