introduce new prefix column in ip addresses table

Author: fmoehler

src/bosh-director/lib/bosh/director/deployment_plan/instance_network_reservations.rb

@@ -17,7 +17,8 @@ def self.create_from_db(instance_model, deployment, logger)
                                     deployment,
                                     ip_address.network_name,
                                     ip_address.address,
-                                    'not-dynamic')
+                                    'not-dynamic',
+                                    ip_address.prefix)
         end
 
         unless instance_model.spec.nil?
@@ -54,9 +55,9 @@ def delete(reservation)
         @reservations.delete(reservation)
       end
 
-      def add_existing(instance_model, deployment, network_name, ip, existing_network_type)
+      def add_existing(instance_model, deployment, network_name, ip, existing_network_type, prefix)
         network = find_network(deployment, ip, network_name, instance_model)
-        reservation = ExistingNetworkReservation.new(instance_model, network, ip, existing_network_type)
+        reservation = ExistingNetworkReservation.new(instance_model, network, ip, existing_network_type, prefix)
         deployment.ip_provider.reserve_existing_ips(reservation)
         @reservations << reservation
       end

src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_provider.rb

@@ -65,15 +65,8 @@ def reserve_manual(reservation)
           @logger.debug("Allocating dynamic ip for manual network '#{reservation.network.name}'")
 
           filter_subnet_by_instance_az(reservation).each do |subnet|
-            ip = if reservation.is_prefix_reservation
-              @ip_repo.allocate_dynamic_prefix(reservation, subnet)
-            else
-              @ip_repo.allocate_dynamic_ip(reservation, subnet)
-            end
-
-            @logger.debug("Reserving dynamic IP/prefix '#{ip}' for manual network '#{reservation.network.name}'")
-
-            if ip
+            if (ip = @ip_repo.allocate_dynamic_ip(reservation, subnet))
+              @logger.debug("Reserving dynamic IP '#{ip}' for manual network '#{reservation.network.name}'")
               reservation.resolve_ip(ip)
               reservation.resolve_type(:dynamic)
               break
@@ -82,7 +75,7 @@ def reserve_manual(reservation)
 
           if reservation.ip.nil?
             raise NetworkReservationNotEnoughCapacity,
-              "Failed to reserve IP/Prefix for '#{reservation.instance_model}' for manual network '#{reservation.network.name}': no more available"
+              "Failed to reserve IP for '#{reservation.instance_model}' for manual network '#{reservation.network.name}': no more available"
           end
         else
           @logger.debug("Reserving #{reservation.desc} for manual network '#{reservation.network.name}'")

src/bosh-director/lib/bosh/director/deployment_plan/ip_provider/ip_repo.rb

@@ -54,23 +54,6 @@ def allocate_dynamic_ip(reservation, subnet)
       ip_address.to_i
     end
 
-    def allocate_dynamic_prefix(reservation, subnet)
-      begin
-        cidr = try_to_allocate_dynamic_prefix(reservation, subnet)
-      rescue NoMoreIPsAvailableAndStopRetrying
-        @logger.debug('Failed to allocate dynamic prefix: no more available')
-        return nil
-      rescue IpFoundInDatabaseAndCanBeRetried
-        @logger.debug('Retrying to allocate dynamic prefix: probably a race condition with another deployment')
-        # IP can be taken by other deployment that runs in parallel
-        # retry until succeeds or out of range
-        retry
-      end
-
-      @logger.debug("Allocated dynamic cidr '#{cidr}' for #{reservation.network.name}")
-      cidr.to_i
-    end
-
     def allocate_vip_ip(reservation, subnet)
       begin
         ip_address = try_to_allocate_vip_ip(reservation, subnet)
@@ -112,33 +95,6 @@ def try_to_allocate_dynamic_ip(reservation, subnet)
       ip_address
     end
 
-    def try_to_allocate_dynamic_prefix(reservation, subnet)
-      @logger.debug("Allocating dynamic prefix for #{reservation.network.name}")
-      addresses_in_use = Set.new(all_ip_addresses)
-
-      first_range_address = subnet.range.to_range.first.to_i - 1
-      addresses_we_cant_allocate = addresses_in_use
-      addresses_we_cant_allocate << first_range_address
-
-      addresses_we_cant_allocate.merge(subnet.restricted_ips.to_a) unless subnet.restricted_ips.empty?
-      addresses_we_cant_allocate.merge(subnet.static_ips.to_a) unless subnet.static_ips.empty?
-
-      addr = Bosh::Director::IpAddrOrCidr.new(find_first_available_address(addresses_we_cant_allocate, first_range_address)).to_s
-      cidr_string = get_first_available_prefix(addr, subnet.prefix)
-
-      @logger.debug("FIRST AVAILABLE PREFIX '#{cidr_string}' for #{reservation.network.name}")
-
-      cidr = Bosh::Director::IpAddrOrCidr.new(cidr_string)
-
-      unless subnet.range == cidr || subnet.range.include?(cidr)
-        raise NoMoreIPsAvailableAndStopRetrying
-      end
-
-      save_ip(cidr, reservation, false)
-
-      cidr
-    end
-
     def find_first_available_address(addresses_we_cant_allocate, first_address)
       last_address_we_cant_use = addresses_we_cant_allocate
                                  .to_a
@@ -204,15 +160,18 @@ def validate_instance_and_update_reservation_type(instance_model, ip, ip_address
     end
 
     def save_ip(ip, reservation, is_static)
+      @logger.debug("Adding IP Address: #{ip} from reservation: #{reservation}")
       ip_address = Bosh::Director::Models::IpAddress.new(
         address_str: ip.to_i.to_s,
         network_name: reservation.network.name,
         task_id: Bosh::Director::Config.current_job.task_id,
         static: is_static,
+        prefix: reservation.prefix
       )
       reservation.instance_model.add_ip_address(ip_address)
     rescue Sequel::ValidationFailed, Sequel::DatabaseError => e
       error_message = e.message.downcase
+      @logger.debug("ERROR!!! #{error_message}")
       if error_message.include?('unique') || error_message.include?('duplicate')
         raise IpFoundInDatabaseAndCanBeRetried, e.inspect
       else

src/bosh-director/lib/bosh/director/deployment_plan/network_planner/planner.rb

@@ -6,31 +6,21 @@ def initialize(logger)
       end
 
       def network_plan_with_dynamic_reservation(instance_plan, job_network)
-        plans = []
-        reservation = Bosh::Director::DesiredNetworkReservation.new_dynamic(instance_plan.instance.model, job_network.deployment_network)
-        @logger.debug("Creating new dynamic reservation #{reservation} for instance '#{instance_plan.instance}'")
-        plans << Plan.new(reservation: reservation)
-        job_network.deployment_network.subnets.each do |subnet|
-          unless subnet.prefix.nil?
-            prefix_reservation = Bosh::Director::DesiredNetworkReservation.new_dynamic(instance_plan.instance.model, job_network.deployment_network, true)
-            plans << Plan.new(reservation: prefix_reservation)
-          end
+        prefix = job_network.deployment_network.subnets.each do |subnet|
+          subnet.prefix
         end
-        plans
+        reservation = Bosh::Director::DesiredNetworkReservation.new_dynamic(instance_plan.instance.model, job_network.deployment_network, prefix)
+        @logger.debug("Creating new dynamic reservation #{reservation} for instance '#{instance_plan.instance}'")
+        Plan.new(reservation: reservation)
       end
 
       def network_plan_with_static_reservation(instance_plan, job_network, static_ip)
-        plans = []
-        reservation = Bosh::Director::DesiredNetworkReservation.new_static(instance_plan.instance.model, job_network.deployment_network, static_ip)
-        @logger.debug("Creating new static reservation #{reservation} for instance '#{instance_plan.instance}'")
-        plans << Plan.new(reservation: reservation)
-        job_network.deployment_network.subnets.each do |subnet|
-          unless subnet.prefix.nil?
-            prefix_reservation = Bosh::Director::DesiredNetworkReservation.new_dynamic(instance_plan.instance.model, job_network.deployment_network, true)
-            plans << Plan.new(reservation: prefix_reservation)
-          end
+        prefix =  job_network.deployment_network.subnets.each do |subnet|
+            subnet.prefix
         end
-        plans
+        reservation = Bosh::Director::DesiredNetworkReservation.new_static(instance_plan.instance.model, job_network.deployment_network, static_ip, prefix)
+        @logger.debug("Creating new static reservation #{reservation} for instance '#{instance_plan.instance}'")
+        Plan.new(reservation: reservation)
       end
     end
   end

src/bosh-director/lib/bosh/director/deployment_plan/placement_planner/availability_zone_picker.rb

@@ -123,7 +123,7 @@ def desired_new_instance_plans(new_desired_instances)
 
           def populate_network_plans(instance_plan)
             @networks.each do |network|
-              @network_planner.network_plan_with_dynamic_reservation(instance_plan, network).each {|plan| instance_plan.network_plans << plan }
+              instance_plan.network_plans << @network_planner.network_plan_with_dynamic_reservation(instance_plan, network)
             end
           end
 

src/bosh-director/lib/bosh/director/models/ip_address.rb

@@ -11,7 +11,7 @@ def validate
       validates_presence :orphaned_vm_id, allow_nil: true
       validates_presence :task_id
       validates_presence :address_str
-      validates_unique :address_str
+      validates_unique([:address_str, :prefix])
       raise 'Invalid type for address_str column' unless address_str.is_a?(String)
     end
 
@@ -48,6 +48,18 @@ def address
       address_str.to_i
     end
 
+    def ip_prefix
+      if prefix.nil?
+        if Bosh::Director::IpAddrOrCidr.new(address).ipv6?
+          128
+        else
+          32
+        end
+      else
+        prefix
+      end
+    end
+
     def to_s
       info
     end

src/bosh-director/lib/bosh/director/network_reservation.rb

@@ -1,6 +1,6 @@
 module Bosh::Director
   class NetworkReservation
-    attr_reader :ip, :instance_model, :network, :type, :is_prefix_reservation
+    attr_reader :ip, :instance_model, :network, :type, :prefix
 
     def initialize(instance_model, network)
       @instance_model = instance_model
@@ -26,10 +26,10 @@ def formatted_ip
   class ExistingNetworkReservation < NetworkReservation
     attr_reader :network_type, :obsolete
 
-    def initialize(instance_model, network, ip, network_type)
+    def initialize(instance_model, network, ip, network_type, prefix)
       super(instance_model, network)
       @ip = IpAddrOrCidr.new(ip).to_i if ip
-      @is_prefix_reservation = IpAddrOrCidr.new(ip).prefix != 32
+      @prefix = prefix
       @network_type = network_type
       @obsolete = network.instance_of? Bosh::Director::DeploymentPlan::Network
     end
@@ -48,19 +48,19 @@ def to_s
   end
 
   class DesiredNetworkReservation < NetworkReservation
-    def self.new_dynamic(instance_model, network, prefix_reservation = false)
-      new(instance_model, network, nil, :dynamic, prefix_reservation)
+    def self.new_dynamic(instance_model, network, prefix)
+      new(instance_model, network, nil, :dynamic, prefix)
     end
 
-    def self.new_static(instance_model, network, ip)
-      new(instance_model, network, ip, :static)
+    def self.new_static(instance_model, network, ip, prefix)
+      new(instance_model, network, ip, :static, prefix)
     end
 
-    def initialize(instance_model, network, ip, type, prefix_reservation)
+    def initialize(instance_model, network, ip, type, prefix)
       super(instance_model, network)
       @ip = IpAddrOrCidr.new(ip).to_i if ip
       @type = type
-      @is_prefix_reservation = prefix_reservation
+      @prefix = prefix
     end
 
     def resolve_ip(ip)