Merge pull request #841 from c-po/conntrack-sync

conntrack-sync: T3535: migrate to XML and Python

2 files changed, 43 insertions, 10 deletions

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index ff05cab0e..a08872509 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -743,28 +743,37 @@ class Interface(Control):
         """
         self.set_interface('proxy_arp_pvlan', enable)
 
-    def get_addr(self):
+    def get_addr_v4(self):
         """
-        Retrieve assigned IPv4 and IPv6 addresses from given interface.
+        Retrieve assigned IPv4 addresses from given interface.
         This is done using the netifaces and ipaddress python modules.
 
         Example:
         >>> from vyos.ifconfig import Interface
-        >>> Interface('eth0').get_addrs()
-        ['172.16.33.30/24', 'fe80::20c:29ff:fe11:a174/64']
+        >>> Interface('eth0').get_addr_v4()
+        ['172.16.33.30/24']
         """
-
         ipv4 = []
-        ipv6 = []
-
-        if AF_INET in ifaddresses(self.config['ifname']).keys():
+        if AF_INET in ifaddresses(self.config['ifname']):
             for v4_addr in ifaddresses(self.config['ifname'])[AF_INET]:
                 # we need to manually assemble a list of IPv4 address/prefix
                 prefix = '/' + \
                     str(IPv4Network('0.0.0.0/' + v4_addr['netmask']).prefixlen)
                 ipv4.append(v4_addr['addr'] + prefix)
+        return ipv4
 
-        if AF_INET6 in ifaddresses(self.config['ifname']).keys():
+    def get_addr_v6(self):
+        """
+        Retrieve assigned IPv6 addresses from given interface.
+        This is done using the netifaces and ipaddress python modules.
+
+        Example:
+        >>> from vyos.ifconfig import Interface
+        >>> Interface('eth0').get_addr_v6()
+        ['fe80::20c:29ff:fe11:a174/64']
+        """
+        ipv6 = []
+        if AF_INET6 in ifaddresses(self.config['ifname']):
             for v6_addr in ifaddresses(self.config['ifname'])[AF_INET6]:
                 # Note that currently expanded netmasks are not supported. That means
                 # 2001:db00::0/24 is a valid argument while 2001:db00::0/ffff:ff00:: not.
@@ -777,8 +786,18 @@ class Interface(Control):
                 # addresses
                 v6_addr['addr'] = v6_addr['addr'].split('%')[0]
                 ipv6.append(v6_addr['addr'] + prefix)
+        return ipv6
+
+    def get_addr(self):
+        """
+        Retrieve assigned IPv4 and IPv6 addresses from given interface.
 
-        return ipv4 + ipv6
+        Example:
+        >>> from vyos.ifconfig import Interface
+        >>> Interface('eth0').get_addr()
+        ['172.16.33.30/24', 'fe80::20c:29ff:fe11:a174/64']
+        """
+        return self.get_addr_v4() + self.get_addr_v6()
 
     def add_addr(self, addr):
         """
diff --git a/python/vyos/template.py b/python/vyos/template.py
index 3fbb33acb..e1986b1e4 100644
--- a/python/vyos/template.py
+++ b/python/vyos/template.py
@@ -121,6 +121,14 @@ def render(
 ##################################
 # Custom template filters follow #
 ##################################
+@register_filter('ip_from_cidr')
+def ip_from_cidr(prefix):
+    """ Take an IPv4/IPv6 CIDR host and strip cidr mask.
+    Example:
+    192.0.2.1/24 -> 192.0.2.1, 2001:db8::1/64 -> 2001:db8::1
+    """
+    from ipaddress import ip_interface
+    return str(ip_interface(prefix).ip)
 
 @register_filter('address_from_cidr')
 def address_from_cidr(prefix):
@@ -361,3 +369,9 @@ def natural_sort(iterable):
         return [convert(c) for c in re.split('([0-9]+)', str(key))]
 
     return sorted(iterable, key=alphanum_key)
+
+@register_filter('get_ipv4')
+def get_ipv4(interface):
+    """ Get interface IPv4 addresses"""
+    from vyos.ifconfig import Interface
+    return Interface(interface).get_addr_v4()