Merge branch 'vrf-dhcp' of https://github.com/davi2367/vyos-1x into vrf-dhcp

Author: David Vølker

interface-definitions/vrf.xml.in

@@ -108,6 +108,9 @@
             </children>
           </node>
           <node name="service">
+            <properties>
+              <help>Enable services in the vrf itself</help>
+            </properties>
             <children>
               <node name="dhcp-server" owner="${vyos_conf_scripts_dir}/service_dhcp-server.py $VAR(../../@)">
                 <properties>

op-mode-definitions/dhcp.xml.in

@@ -14,6 +14,13 @@
             <command>${vyos_op_scripts_dir}/dhcp.py clear_dhcp_server_lease --family inet --address $4</command>
           </tagNode>
           <tagNode name="vrf">
+            <properties>
+              <help>Clear DHCP server lease for vrf</help>
+              <completionHelp>
+                <path>vrf name</path>
+                <list>all</list>
+              </completionHelp>
+            </properties>
             <children>
               <tagNode name="lease">
                 <properties>
@@ -37,6 +44,13 @@
             <command>${vyos_op_scripts_dir}/dhcp.py clear_dhcp_server_lease --family inet6 --address $4</command>
           </tagNode>
           <tagNode name="vrf">
+            <properties>
+              <help>Clear DHCPv6 server lease for vrf</help>
+              <completionHelp>
+                <path>vrf name</path>
+                <list>all</list>
+              </completionHelp>
+            </properties>
             <children>
               <tagNode name="lease">
                 <properties>
@@ -174,6 +188,13 @@
                 </children>
               </node>
               <tagNode name="vrf">
+                <properties>
+                  <help>Show DHCP (Dynamic Host Configuration Protocol) information for vrf</help>
+                  <completionHelp>
+                    <path>vrf name</path>
+                    <list>all</list>
+                  </completionHelp>
+                </properties>
                 <children>
                   <node name="leases">
                     <properties>
@@ -357,6 +378,13 @@
                 </children>
               </node>
               <tagNode name="vrf">
+                <properties>
+                  <help>Show DHCPv6 (IPv6 Dynamic Host Configuration Protocol) information for vrf</help>
+                  <completionHelp>
+                    <path>vrf name</path>
+                    <list>all</list>
+                  </completionHelp>
+                </properties>
                 <children>
                   <node name="leases">
                     <properties>
@@ -458,6 +486,13 @@
             <command>sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dhcp</command>
             <children>
               <tagNode name="vrf">
+                <properties>
+                  <help>Restart DHCP server on vrf</help>
+                  <completionHelp>
+                    <path>vrf name</path>
+                    <list>all</list>
+                  </completionHelp>
+                </properties>
                 <command>sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dhcp --vrf $5</command>
               </tagNode>
             </children>
@@ -482,6 +517,13 @@
             <command>sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dhcpv6</command>
             <children>
               <tagNode name="vrf">
+                <properties>
+                  <help>Restart DHCPv6 server on vrf</help>
+                  <completionHelp>
+                    <path>vrf name</path>
+                    <list>all</list>
+                  </completionHelp>
+                </properties>
                 <command>sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dhcpv6 --vrf $5</command>
               </tagNode>
             </children>

src/op_mode/dhcp.py

@@ -166,9 +166,13 @@ def _get_formatted_server_leases(raw_data, family='inet'):
     return output
 
 
-def _get_pool_size(pool, family='inet'):
+def _get_pool_size(pool, family='inet', vrf=''):
     v = 'v6' if family == 'inet6' else ''
-    base = f'service dhcp{v}-server shared-network-name {pool}'
+    # if vrf is set get the correct base for config
+    if vrf:
+        base = f'vrf name {vrf} service dhcp{v}-server shared-network-name {pool}'
+    else:
+        base = f'service dhcp{v}-server shared-network-name {pool}'
     size = 0
     subnets = config.list_nodes(f'{base} subnet')
     for subnet in subnets:
@@ -185,7 +189,7 @@ def _get_pool_size(pool, family='inet'):
     return size
 
 
-def _get_raw_server_pool_statistics(config, family='inet', pool=None):
+def _get_raw_server_pool_statistics(config, family='inet', vrf='', pool=None):
     inet_suffix = '6' if family == 'inet6' else '4'
     pools = [pool] if pool else kea_get_dhcp_pools(config, inet_suffix)
 
@@ -269,11 +273,20 @@ def _verify_server(func):
     def _wrapper(*args, **kwargs):
         config = ConfigTreeQuery()
         family = kwargs.get('family')
+        vrf = kwargs.get('vrf')
         v = 'v6' if family == 'inet6' else ''
-        unconf_message = f'DHCP{v} server is not configured'
+
         # Check if config does not exist
-        if not config.exists(f'service dhcp{v}-server'):
-            raise vyos.opmode.UnconfiguredSubsystem(unconf_message)
+        if vrf:
+            unconf_message = f'DHCP{v} server is not configured for VRF {vrf}'
+            if not config.exists(f'vrf name {vrf} service dhcp{v}-server'):
+                raise vyos.opmode.UnconfiguredSubsystem(unconf_message)
+        else:
+            unconf_message = f'DHCP{v} server is not configured'
+            if not config.exists(f'service dhcp{v}-server'):
+                raise vyos.opmode.UnconfiguredSubsystem(unconf_message)
+
+        # return
         return func(*args, **kwargs)
 
     return _wrapper
@@ -326,7 +339,9 @@ def show_server_pool_statistics(
     if pool and active_pools and pool not in active_pools:
         raise vyos.opmode.IncorrectValue(f'DHCP{v} pool "{pool}" does not exist!')
 
-    pool_data = _get_raw_server_pool_statistics(active_config, family=family, pool=pool)
+    pool_data = _get_raw_server_pool_statistics(
+        active_config, family=family, vrf=vrf, pool=pool
+    )
     if raw:
         return pool_data
     else: