Merge pull request #4364 from natali-rs1985/T7171

T7171: Add dstport option to GENEVE tunnels

Author: dmbaturin

interface-definitions/interfaces_geneve.xml.in

@@ -23,6 +23,10 @@
           #include <include/interface/ipv6-options.xml.i>
           #include <include/interface/mac.xml.i>
           #include <include/interface/mtu-1200-16000.xml.i>
+          #include <include/port-number.xml.i>
+          <leafNode name="port">
+            <defaultValue>6081</defaultValue>
+          </leafNode>
           <node name="parameters">
             <properties>
               <help>GENEVE tunnel parameters</help>

python/vyos/ifconfig/geneve.py

@@ -48,7 +48,7 @@ def _create(self):
             'parameters.ipv6.flowlabel'  : 'flowlabel',
         }
 
-        cmd = 'ip link add name {ifname} type geneve id {vni} remote {remote}'
+        cmd = 'ip link add name {ifname} type geneve id {vni} remote {remote} dstport {port}'
         for vyos_key, iproute2_key in mapping.items():
             # dict_search will return an empty dict "{}" for valueless nodes like
             # "parameters.nolearning" - thus we need to test the nodes existence

src/conf_mode/interfaces_geneve.py

@@ -47,7 +47,7 @@ def get_config(config=None):
     # GENEVE interfaces are picky and require recreation if certain parameters
     # change. But a GENEVE interface should - of course - not be re-created if
     # it's description or IP address is adjusted. Feels somehow logic doesn't it?
-    for cli_option in ['remote', 'vni', 'parameters']:
+    for cli_option in ['remote', 'vni', 'parameters', 'port']:
         if is_node_changed(conf, base + [ifname, cli_option]):
             geneve.update({'rebuild_required': {}})