B OpenNebula#1710: network fsck takes reserved networks

src/onedb/fsck/network.rb

@@ -238,7 +238,7 @@ def calculate_leases(address_range, oid, addrs, p_vnet, p_ar)
         address_range.at_xpath('SIZE').text.to_i.times do |index|
             lease = get_lease(oid, addrs[:mac], addrs[:ip], addrs[:ipv6], index)
 
-            counters[:vnet][p_vnet][:ar_leases][p_ar][mac] = lease
+            counters[:vnet][p_vnet][:ar_leases][p_ar][lease[:mac_index]] = lease
         end
     end
 

src/onedb/fsck/quotas.rb

@@ -71,6 +71,7 @@ def calculate_quotas(doc, filter, resource)
 
         queries << "SELECT body FROM vm_pool WHERE #{filter} AND state<>6"
         queries << "SELECT body FROM vrouter_pool WHERE #{filter}"
+        queries << "SELECT body FROM network_pool WHERE #{filter}"
 
         calculate_vnet_quotas(doc, queries, resource)
 
@@ -466,6 +467,22 @@ def calculate_vnet_quotas(doc, queries, resource)
             end
         end
 
+        # Calculate quotas for reserved networks
+        @db.fetch(queries[2]) do |vnet_row|
+            vnet_doc  = nokogiri_doc(vnet_row[:body])
+
+            vnet_doc.xpath('VNET/AR_POOL').each do |ar|
+                parent_id = ar.xpath('AR/PARENT_NETWORK_AR_ID')
+                parent_id = parent_id.text unless parent_id.nil?
+                size      = ar.xpath('AR/SIZE').text.to_i
+
+                if !parent_id.nil?
+                    vnet_usage[parent_id] = 0 if vnet_usage[parent_id].nil?
+                    vnet_usage[parent_id] += size
+                end
+            end
+        end
+
         net_quota = nil
         doc.root.xpath('NETWORK_QUOTA').each {|e| net_quota = e }