refactor ip_repo

fmoehler · fmoehler · commit a9ad2ffc6377 · 2025-06-26T16:15:05.000+02:00
diff --git a/src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_repo.rb b/src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_repo.rb
@@ -15,10 +15,10 @@ def delete(ip)
       ip_address = Bosh::Director::Models::IpAddress.first(address_str: ip_or_cidr.to_cidr_s)
 
       if ip_address
-        @logger.debug("Releasing ip '#{ip_or_cidr}'")
+        @logger.debug("Releasing ip '#{ip_or_cidr.to_cidr_s}'")
         ip_address.destroy
       else
-        @logger.debug("Skipping releasing ip '#{ip_or_cidr}': not reserved")
+        @logger.debug("Skipping releasing ip '#{ip_or_cidr.to_cidr_s}': not reserved")
       end
     end
 
@@ -71,7 +71,7 @@ def allocate_vip_ip(reservation, subnet)
       end
 
       @logger.debug("Allocated vip IP '#{ip_address}' for #{reservation.network.name}")
-      ip_address.to_i
+      ip_address
     end
 
     private
@@ -84,7 +84,7 @@ def try_to_allocate_dynamic_ip(reservation, subnet)
       addresses_in_use = Set.new(all_ip_addresses)
 
       first_range_address = Bosh::Director::IpAddrOrCidr.new(subnet.range.to_range.first.to_i - 1)
-      
+
       addresses_we_cant_allocate = addresses_in_use
 
       addresses_we_cant_allocate.merge(subnet.restricted_ips.map { |int_ip| Bosh::Director::IpAddrOrCidr.new(int_ip)}) unless subnet.restricted_ips.empty?
