tunnel: T3366: rename remote-ip to remote

Streamline the CLI configuration where we try to use remote on other interfaces
like vxlan, geneve.

3 files changed, 19 insertions, 19 deletions

diff --git a/python/vyos/configverify.py b/python/vyos/configverify.py
index c901ccbc5..db3e7cc57 100644
--- a/python/vyos/configverify.py
+++ b/python/vyos/configverify.py
@@ -103,8 +103,8 @@ def verify_tunnel(config):
     if 'source_address' not in config and 'dhcp_interface' not in config:
         raise ConfigError('source-address is mandatory for tunnel')
 
-    if 'remote_ip' not in config and config['encapsulation'] != 'gre':
-        raise ConfigError('remote-ip is mandatory for tunnel')
+    if 'remote' not in config and config['encapsulation'] != 'gre':
+        raise ConfigError('remote ip address is mandatory for tunnel')
 
     if {'source_address', 'dhcp_interface'} <= set(config):
         raise ConfigError('Can not use both source-address and dhcp-interface')
@@ -114,15 +114,15 @@ def verify_tunnel(config):
         if 'source_address' in config and not is_ipv6(config['source_address']):
             raise ConfigError(f'{error_ipv6} source-address')
 
-        if 'remote_ip' in config and not is_ipv6(config['remote_ip']):
-            raise ConfigError(f'{error_ipv6} remote-ip')
+        if 'remote' in config and not is_ipv6(config['remote']):
+            raise ConfigError(f'{error_ipv6} remote')
     else:
         error_ipv4 = 'Encapsulation mode requires IPv4'
         if 'source_address' in config and not is_ipv4(config['source_address']):
             raise ConfigError(f'{error_ipv4} source-address')
 
-        if 'remote_ip' in config and not is_ipv4(config['remote_ip']):
-            raise ConfigError(f'{error_ipv4} remote-ip')
+        if 'remote' in config and not is_ipv4(config['remote']):
+            raise ConfigError(f'{error_ipv4} remote address')
 
     if config['encapsulation'] in ['sit', 'gretap']:
         if 'source_interface' in config:
diff --git a/python/vyos/ifconfig/erspan.py b/python/vyos/ifconfig/erspan.py
index e0f72109d..9e24cf6cd 100755
--- a/python/vyos/ifconfig/erspan.py
+++ b/python/vyos/ifconfig/erspan.py
@@ -76,11 +76,11 @@ class ERSpanIf(_ERSpan):
 
     def _create(self):
         ifname = self.config['ifname']
-        local_ip = self.config['local_ip']
-        remote_ip = self.config['remote_ip']
+        source_address = self.config['source_address']
+        remote = self.config['remote']
         key = self.config['parameters']['ip']['key']
         version = self.config['parameters']['version']
-        command = f'ip link add dev {ifname} type erspan local {local_ip} remote {remote_ip} seq key {key} erspan_ver {version}'
+        command = f'ip link add dev {ifname} type erspan local {source_address} remote {remote} seq key {key} erspan_ver {version}'
 
         if int(version) == 1:
             idx=dict_search('parameters.erspan.idx',self.config)
@@ -105,11 +105,11 @@ class ERSpanIf(_ERSpan):
 
     def change_options(self):
         ifname = self.config['ifname']
-        local_ip = self.config['local_ip']
-        remote_ip = self.config['remote_ip']
+        source_address = self.config['source_address']
+        remote = self.config['remote']
         key = self.config['parameters']['ip']['key']
         version = self.config['parameters']['version']
-        command = f'ip link set dev {ifname} type erspan local {local_ip} remote {remote_ip} seq key {key} erspan_ver {version}'
+        command = f'ip link set dev {ifname} type erspan local {source_address} remote {remote} seq key {key} erspan_ver {version}'
 
         if int(version) == 1:
             idx=dict_search('parameters.erspan.idx',self.config)
@@ -139,11 +139,11 @@ class ER6SpanIf(_ERSpan):
 
     def _create(self):
         ifname = self.config['ifname']
-        local_ip = self.config['local_ip']
-        remote_ip = self.config['remote_ip']
+        source_address = self.config['source_address']
+        remote = self.config['remote']
         key = self.config['parameters']['ip']['key']
         version = self.config['parameters']['version']
-        command = f'ip link add dev {ifname} type ip6erspan local {local_ip} remote {remote_ip} seq key {key} erspan_ver {version}'
+        command = f'ip link add dev {ifname} type ip6erspan local {source_address} remote {remote} seq key {key} erspan_ver {version}'
 
         if int(version) == 1:
             idx=dict_search('parameters.erspan.idx',self.config)
@@ -168,11 +168,11 @@ class ER6SpanIf(_ERSpan):
 
     def change_options(self):
         ifname = self.config['ifname']
-        local_ip = self.config['local_ip']
-        remote_ip = self.config['remote_ip']
+        source_address = self.config['source_address']
+        remote = self.config['remote']
         key = self.config['parameters']['ip']['key']
         version = self.config['parameters']['version']
-        command = f'ip link set dev {ifname} type ip6erspan local {local_ip} remote {remote_ip} seq key {key} erspan_ver {version}'
+        command = f'ip link set dev {ifname} type ip6erspan local {source_address} remote {remote} seq key {key} erspan_ver {version}'
 
         if int(version) == 1:
             idx=dict_search('parameters.erspan.idx',self.config)
diff --git a/python/vyos/ifconfig/tunnel.py b/python/vyos/ifconfig/tunnel.py
index 2820e2563..bb940b0cf 100644
--- a/python/vyos/ifconfig/tunnel.py
+++ b/python/vyos/ifconfig/tunnel.py
@@ -53,7 +53,7 @@ class TunnelIf(Interface):
     mapping = {
         'source_address'                  : 'local',
         'source_interface'                : 'dev',
-        'remote_ip'                       : 'remote',
+        'remote'                          : 'remote',
         'parameters.ip.key'               : 'key',
         'parameters.ip.tos'               : 'tos',
         'parameters.ip.ttl'               : 'ttl',