Upstreaming patches: filter_by_networks

[darix]

Index: salt-2019.2.2-suse/salt/utils/network.py
===================================================================
--- salt-2019.2.2-suse.orig/salt/utils/network.py
+++ salt-2019.2.2-suse/salt/utils/network.py
@@ -2032,3 +2032,42 @@ def is_fqdn(hostname):
 
     compliant = re.compile(r"(?!-)[A-Z\d\-\_]{1,63}(?<!-)$", re.IGNORECASE)
     return "." in hostname and len(hostname) < 0xff and all(compliant.match(x) for x in hostname.rstrip(".").split("."))
+
+
+def _filter_by_networks(values, networks):
+    filtered_addresses = []
+
+    for value in values:
+        address = ipaddress.ip_address(value)
+        for network in networks:
+            if network.__contains__(address):
+                filtered_addresses.append(value)
+
+    return filtered_addresses
+
+
+@jinja_filter('filter_by_networks')
+def filter_by_networks(values, filters=None):
+    '''
+    Returns a the list of IPs filtered by the optional network list.
+    If no filter is specified all all items are returned.
+    {% set networks = ['192.168.0.0/24', 'fe80::/64'] %}
+    {{ grains['ip_interfaces'] | filter_by_networks(networks) }}
+    {{ grains['ipv6'] | filter_by_networks(networks) }}
+    {{ grains['ipv4'] | filter_by_networks(networks) }}
+    '''
+    if filters:
+        networks = [ipaddress.ip_network(network) for network in filters]
+        new_values = None
+        if isinstance(values, dict):
+            new_values = {}
+            for interface, addresses in values.items():
+                new_values[interface] = _filter_by_networks(addresses,
+                                                            networks)
+        elif isinstance(values, list):
+            new_values = _filter_by_networks(values, networks)
+        else:
+            raise ValueError('Do not know how to filter a {}'.format(type(values)))
+        return new_values
+    else:
+        return values

[brejoc]

I think this issue can be closed. Please re-open if you think we still need it.