Fix: Compare networks using ipranges. (Redmine issue: #7603)

lib/mentat/module/netmngr.py

@@ -650,14 +650,15 @@ class MentatNetmngrScript(mentat.script.fetcher.FetcherScript):
         :return: index of network
         :rtype: int
         """
-        if isinstance(network, NetworkModel):
-            for index, net in enumerate(netlist):
-                if network.network == net['network'] and (('netname' in net and network.netname == net['netname']) or network.source == net['source']):
-                    return index
-        else:
-            for index, net in enumerate(netlist):
-                if net.network == network['network'] and (('netname' in network and net.netname == network['netname']) or net.source == network['source']):
-                    return index
+        network = network if isinstance(network, NetworkModel) else networkmodel_from_typeddict(network)
+        for index, net in enumerate(netlist):
+            net = net if isinstance(net, NetworkModel) else networkmodel_from_typeddict(net)
+            # Convert to ipranges object so ranges and CIDRs can be compared.
+            # e.g. 195.113.220.80-195.113.220.95 should be equal to 195.113.220.80/28
+            iprange_net = mentat.datatype.internal.t_net(net.network)
+            iprange_network = mentat.datatype.internal.t_net(network.network)
+            if iprange_net == iprange_network and (net.netname == network.netname or net.source == network.source):
+                return index
         return -1
 
     @staticmethod