bosh-director 1.2686.0 → 1.2690.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b925415b6577c01836374e361adea28b9f0fc9bc
-  data.tar.gz: abc3658c8758bdca6a34148463822067e3c4a1f2
+  metadata.gz: 1ac6ba90e9a35e9139bfb91e75536ec872cb6dd5
+  data.tar.gz: 03d0cd5cff23966e803dd3b8492881a9278d075d
 SHA512:
-  metadata.gz: 963428802eb65461667ddd8f4df593a8b35596c4633743df73a7afe47f11da3560c5fd5c98428fc774954e4089da9b36981c084e6159ac1f4cbb7d57a089f410
-  data.tar.gz: 9946b4c884e4eba0cfc12909815c51626f2d02c3ba910b6bb753d5046b573d33e7701c0fc4e1d34e4e3e3f23ce12e7fdee4a15d654a82b1a871557ecc859708b
+  metadata.gz: 2cab0cd501525452b4d283e4b0207a0a352bc8bd4ff045af3dfdf730fe930eec2e6b6335a2ecba513993d81e5912c5b57dd9cdf41088f5fba4b6988e1cbd256c
+  data.tar.gz: d86c2b84b29388df2c428b89aee574e05686f40840a85237c8e8a1b0dc77289be383f3c94d830ef09369c9dff496449657f88ff7f56feeda7aef59e1ce75b51f

data/lib/bosh/director/deployment_plan/instance.rb

@@ -469,10 +469,12 @@ module Bosh::Director
       # @param [Hash<String, NetworkReservation>] reservations
       # @return [void]
       def take_network_reservations(reservations)
-        @logger.debug("Copying job instance `#{self}' network reservations")
         reservations.each do |name, provided_reservation|
           reservation = @network_reservations[name]
-          reservation.take(provided_reservation) if reservation
+          if reservation
+            @logger.debug("Copying job instance `#{self}' network reservation #{provided_reservation}")
+            reservation.take(provided_reservation)
+          end
         end
       end
 
@@ -480,10 +482,15 @@ module Bosh::Director
         resource_pool = @job.resource_pool
         vm = resource_pool.add_allocated_vm
 
-        @logger.debug("Found VM `#{vm_model.cid}' running job instance `#{self}' in resource pool `#{resource_pool.name}'")
+        reservation = @network_reservations[vm.resource_pool.network.name]
+
+        @logger.debug("Found VM '#{vm_model.cid}' running job instance '#{self}'" +
+          " in resource pool `#{resource_pool.name}'" +
+          " with reservation '#{reservation}'")
         vm.model = vm_model
         vm.bound_instance = self
         vm.current_state = state
+        vm.use_reservation(reservation)
 
         @vm = vm
       end

data/lib/bosh/director/deployment_plan/resource_pool.rb

@@ -69,6 +69,10 @@ module Bosh::Director
         @reserved_errand_capacity = 0
       end
 
+      def vms
+        @allocated_vms + @idle_vms
+      end
+
       # Returns resource pools spec as Hash (usually for agent to serialize)
       # @return [Hash] Resource pool spec
       def spec
@@ -94,12 +98,24 @@ module Bosh::Director
         end
       end
 
+      # Attempts to allocate a dynamic IP addresses for all VMs
+      # (unless they already have one).
+      def reserve_dynamic_networks
+        vms.each do |vm|
+          unless vm.has_network_reservation?
+            instance = vm.bound_instance
+            origin = instance ? "Job instance `#{instance}' in resource pool `#{@name}'" : nil
+            vm.network_reservation = reserve_dynamic_network(origin)
+          end
+        end
+      end
+
       # Tries to obtain one dynamic reservation in its own network
       # @raise [NetworkReservationError]
       # @return [NetworkReservation] Obtained reservation
-      def reserve_dynamic_network
+      def reserve_dynamic_network(origin="Resource pool `#{@name}'")
         reservation = NetworkReservation.new_dynamic
-        @network.reserve!(reservation, "Resource pool `#{@name}'")
+        @network.reserve!(reservation, origin)
         reservation
       end
 

data/lib/bosh/director/network_reservation.rb

@@ -89,7 +89,6 @@ module Bosh::Director
     # @return void
     def handle_error(origin)
       if static?
-        formatted_ip = ip_to_netaddr(@ip).ip
         case @error
           when NetworkReservation::USED
             raise NetworkReservationAlreadyInUse,
@@ -117,5 +116,15 @@ module Bosh::Director
         end
       end
     end
+
+    def to_s
+      "{type=#{@type}, ip=#{formatted_ip.inspect}}"
+    end
+
+    private
+
+    def formatted_ip
+      @ip.nil? ? nil : ip_to_netaddr(@ip).ip
+    end
   end
-end
+end

data/lib/bosh/director/resource_pool_updater.rb

@@ -17,7 +17,7 @@ module Bosh::Director
       counter = 0
       vms_to_process = []
 
-      each_vm do |vm|
+      @resource_pool.vms.each do |vm|
         next if vm.model
         if !block_given? || yield(vm)
           counter += 1
@@ -132,49 +132,13 @@ module Bosh::Director
     # in case any of resource pools is not big enough to accommodate
     # those VMs.
     def reserve_networks
-      network = @resource_pool.network
-
-      each_vm_with_index do |vm, index|
-        unless vm.network_reservation
-          reservation = NetworkReservation.new(
-              :type => NetworkReservation::DYNAMIC)
-          network.reserve(reservation)
-
-          unless reservation.reserved?
-            case reservation.error
-              when NetworkReservation::CAPACITY
-                raise NetworkReservationNotEnoughCapacity,
-                      "'#{@resource_pool.name}/#{index}' asked for a dynamic IP " +
-                      "but there were no more available"
-              else
-                raise NetworkReservationError,
-                      "'#{@resource_pool.name}/#{index}' failed to reserve " +
-                      "dynamic IP: #{reservation.error}"
-            end
-          end
-
-          vm.network_reservation = reservation
-        end
-      end
+      @resource_pool.reserve_dynamic_networks
     end
 
     def generate_agent_id
       SecureRandom.uuid
     end
 
-    def each_vm
-      @resource_pool.allocated_vms.each { |vm| yield vm }
-      @resource_pool.idle_vms.each { |vm| yield vm }
-    end
-
-    def each_vm_with_index
-      index = 0
-      each_vm do |vm|
-        yield(vm, index)
-        index += 1
-      end
-    end
-
     def extra_vm_count
       @resource_pool.extra_vm_count
     end
@@ -189,7 +153,7 @@ module Bosh::Director
 
     def missing_vm_count
       counter = 0
-      each_vm do |vm|
+      @resource_pool.vms.each do |vm|
         next if vm.model
         counter += 1
       end
@@ -198,7 +162,7 @@ module Bosh::Director
 
     def bound_missing_vm_count
       counter = 0
-      each_vm do |vm|
+      @resource_pool.vms.each do |vm|
         next if vm.model
         next if vm.bound_instance.nil?
         counter += 1

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2686.0'
+    VERSION = '1.2690.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2686.0
+  version: 1.2690.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2686.0
+        version: 1.2690.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  b748e0
+  03d2f5
 email: support@cloudfoundry.com
 executables:
 - bosh-director