Improve get_subnet_with_ips performance (#33)

Use an ad-hoc SQL query to speed up subnet retrieval.

Author: dclaisse

ipam/client/backends/phpipam.py

@@ -497,26 +497,29 @@ def get_subnet_with_ips(self, subnet):
         Returns a subnet with all its allocated ip addresses
         """
 
-        subnetid = self.find_subnet_id(subnet)
-
-        ipam_subnet = self.get_subnet_by_id(subnetid)
-
-        self.cur.execute('SELECT ip_addr,description,{},state '
-                         'FROM ipaddresses '
-                         'WHERE subnetId = {}'
-                         ''.format(self.hostname_db_field, subnetid))
-
+        ipam_subnet = {}
+
+        self.cur.execute('SELECT ip.ip_addr,ip.description,ip.{},ip.state,'
+                         's.description,s.vlanId '
+                         'FROM ipaddresses ip LEFT JOIN subnets s '
+                         'ON ip.subnetId = s.id '
+                         "WHERE s.subnet='{}' AND s.mask='{}'"
+                         ''.format(self.hostname_db_field,
+                                   int(subnet.network_address),
+                                   subnet.prefixlen))
         iplist = list()
         for row in self.cur:
+            if not ipam_subnet:
+                ipam_subnet['subnet'] = subnet
+                ipam_subnet['description'] = row[4]
+                ipam_subnet['vlan_id'] = row[5]
             item = {}
             item['ip'] = ip_address(int(row[0]))
             item['description'] = row[1]
             item['dnsname'] = row[2]
             item['state'] = row[3]
             iplist.append(item)
-
         ipam_subnet['ips'] = iplist
-
         return ipam_subnet
 
     def get_ipnetwork_by_desc(self, description):

ipam/client/tests/test_phpipam.py

@@ -841,9 +841,6 @@ def test_get_subnet_with_ips(testphpipam):
                                    'dnsname': 'test-ip-14',
                                    'description': 'test ip #14'}]}
 
-    with pytest.raises(ValueError, match='Unable to get subnet id'):
-        testphpipam.get_subnet_with_ips(ip_network('1.2.3.0/24'))
-
 
 def test_get_num_ips_by_desc(testphpipam):
     assert testphpipam.get_num_ips_by_desc('unknown ip') == 0