bosh-director 1.1750.0 → 1.1761.0

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

@@ -403,10 +403,12 @@ module Bosh::Director
 
     def delete_unneeded_vms
       unneeded_vms = @deployment_plan.unneeded_vms
-      return if unneeded_vms.empty?
+      if unneeded_vms.empty?
+        @logger.info("No unneeded vms to delete")
+        return
+      end
 
       @event_log.begin_stage("Deleting unneeded VMs", unneeded_vms.size)
-
       ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
         unneeded_vms.each do |vm|
           pool.process do
@@ -422,10 +424,14 @@ module Bosh::Director
 
     def delete_unneeded_instances
       unneeded_instances = @deployment_plan.unneeded_instances
-      return if unneeded_instances.empty?
+      if unneeded_instances.empty?
+        @logger.info("No unneeded instances to delete")
+        return
+      end
 
-      @event_log.begin_stage("Deleting unneeded instances", unneeded_instances.size)
-      InstanceDeleter.new(@deployment_plan).delete_instances(unneeded_instances)
+      event_log_stage = @event_log.begin_stage("Deleting unneeded instances", unneeded_instances.size)
+      instance_deleter = InstanceDeleter.new(@deployment_plan)
+      instance_deleter.delete_instances(unneeded_instances, event_log_stage)
       @logger.info("Deleted no longer needed instances")
     end
   end

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

@@ -1,14 +1,10 @@
-require 'common/deep_copy'
+require 'bosh/director/deployment_plan/job_spec_parser'
 
 module Bosh::Director
   module DeploymentPlan
     class Job
       include Bosh::Common::PropertyHelper
 
-      include IpUtil
-      include DnsHelper
-      include ValidationHelper
-
       # started, stopped and detached are real states
       # (persisting in DB and reflecting target instance state)
       # recreate and restart are two virtual states
@@ -51,6 +47,9 @@ module Bosh::Director
       # @return [DeploymentPlan::UpdateConfig] Job update settings
       attr_accessor :update
 
+      # @return [Array<DeploymentPlan::Instance>] All job instances
+      attr_accessor :instances
+
       # @return [Array<Models::Instance>] List of excess instance models that
       #   are not needed for current deployment
       attr_accessor :unneeded_instances
@@ -65,42 +64,32 @@ module Bosh::Director
       #   interrupted
       attr_accessor :halt_exception
 
+      attr_accessor :all_properties
+
       # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
       # @param [Hash] job_spec Raw job spec from the deployment manifest
       # @return [Bosh::Director::DeploymentPlan::Job]
       def self.parse(deployment, job_spec)
-        job = new(deployment, job_spec)
-        job.parse
-        job
+        job_parser = JobSpecParser.new(deployment)
+        job_parser.parse(job_spec)
       end
 
       # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
-      # @param [Hash] job_spec Raw job spec from the deployment manifest
-      def initialize(deployment, job_spec)
+      def initialize(deployment)
         @deployment = deployment
-        @job_spec = job_spec
 
         @release = nil
         @templates = []
         @all_properties = nil # All properties available to job
         @properties = nil # Actual job properties
 
+        @instances = []
+        @unneeded_instances = []
+        @instance_states = {}
+
         @error_mutex = Mutex.new
         @packages = {}
         @halt = false
-        @unneeded_instances = []
-      end
-
-      def parse
-        parse_name
-        parse_release
-        parse_template
-        parse_disk
-        parse_properties
-        parse_resource_pool
-        parse_update_config
-        parse_instances
-        parse_networks
       end
 
       def self.is_legacy_spec?(job_spec)
@@ -173,12 +162,6 @@ module Bosh::Director
         result.select { |name, _| run_time_dependencies.include? name }
       end
 
-      # Returns all instances of this job
-      # @return [Array<DeploymentPlan::Instance>] All job instances
-      def instances
-        @instances
-      end
-
       # Returns job instance by index
       # @param [Integer] index
       # @return [DeploymentPlan::Instance] index-th instance
@@ -212,215 +195,6 @@ module Bosh::Director
         end
       end
 
-      def parse_name
-        @name = safe_property(@job_spec, "name", :class => String)
-        @canonical_name = canonical(@name)
-      end
-
-      def parse_release
-        release_name = safe_property(@job_spec, "release", :class => String,
-                                     :optional => true)
-
-        if release_name.nil?
-          if @deployment.releases.size == 1
-            @release = @deployment.releases.first
-          else
-            raise JobMissingRelease,
-                  "Cannot tell what release job `#{@name}' supposed to use, please reference an existing release"
-          end
-        else
-          @release = @deployment.release(release_name)
-        end
-
-        if @release.nil?
-          raise JobUnknownRelease,
-                "Job `#{@name}' references an unknown release `#{release_name}'"
-        end
-      end
-
-      def parse_template
-        if @release.nil?
-          raise DirectorError, "Cannot parse template before parsing release"
-        end
-
-        template_names = safe_property(@job_spec, "template")
-
-        if template_names.is_a?(String)
-          template_names = Array(template_names)
-        end
-
-        unless template_names.is_a?(Array)
-          invalid_type("template", "String or Array", template_names)
-        end
-
-        template_names.each do |template_name|
-          @release.use_template_named(template_name)
-          @templates << @release.template(template_name)
-        end
-      end
-
-      def parse_disk
-        @persistent_disk = safe_property(@job_spec, "persistent_disk", :class => Integer, :default => 0)
-      end
-
-      def parse_properties
-        # Manifest can contain global and per-job properties section
-        job_properties = safe_property(@job_spec, "properties", :class => Hash, :optional => true)
-
-        @all_properties = Bosh::Common::DeepCopy.copy(deployment.properties)
-
-        if job_properties
-          @all_properties.recursive_merge!(job_properties)
-        end
-
-        mappings = safe_property(@job_spec, "property_mappings", :class => Hash, :default => {})
-
-        mappings.each_pair do |to, from|
-          resolved = lookup_property(@all_properties, from)
-
-          if resolved.nil?
-            raise JobInvalidPropertyMapping,
-                  "Cannot satisfy property mapping `#{to}: #{from}', as `#{from}' is not in deployment properties"
-          end
-
-          @all_properties[to] = resolved
-        end
-      end
-
-      def parse_resource_pool
-        resource_pool_name = safe_property(@job_spec, "resource_pool", class: String)
-        @resource_pool = deployment.resource_pool(resource_pool_name)
-        if @resource_pool.nil?
-          raise JobUnknownResourcePool,
-                "Job `#{@name}' references an unknown resource pool `#{resource_pool_name}'"
-        end
-      end
-
-      def parse_update_config
-        update_spec = safe_property(@job_spec, "update", class: Hash, optional: true)
-        @update = UpdateConfig.new(update_spec, @deployment.update)
-      end
-
-      def parse_instances
-        @instances = []
-        @instance_states = {}
-
-        @state = safe_property(@job_spec, "state", class: String, optional: true)
-        job_size = safe_property(@job_spec, "instances", class: Integer)
-        instance_states = safe_property(@job_spec, "instance_states", class: Hash, default: {})
-
-        instance_states.each_pair do |index, state|
-          begin
-            index = Integer(index)
-          rescue ArgumentError
-            raise JobInvalidInstanceIndex,
-              "Invalid job index `#{index}', integer expected"
-          end
-
-          unless (0...job_size).include?(index)
-            raise JobInvalidInstanceIndex,
-              "`#{@name}/#{index}' is outside of (0..#{job_size-1}) range"
-          end
-
-          unless VALID_JOB_STATES.include?(state)
-            raise JobInvalidInstanceState,
-              "Invalid state `#{state}' for `#{@name}/#{index}', valid states are: #{VALID_JOB_STATES.join(", ")}"
-          end
-
-          @instance_states[index] = state
-        end
-
-        if @state && !VALID_JOB_STATES.include?(@state)
-          raise JobInvalidJobState,
-            "Invalid state `#{@state}' for `#{@name}', valid states are: #{VALID_JOB_STATES.join(", ")}"
-        end
-
-        job_size.times do |index|
-          @instances[index] = Instance.new(self, index)
-          @resource_pool.reserve_capacity(1)
-        end
-      end
-
-      def parse_networks
-        @default_network = {}
-
-        network_specs = safe_property(@job_spec, "networks", :class => Array)
-        if network_specs.empty?
-          raise JobMissingNetwork,
-                "Job `#{@name}' must specify at least one network"
-        end
-
-        network_specs.each do |network_spec|
-          network_name = safe_property(network_spec, "name", :class => String)
-          network = @deployment.network(network_name)
-          if network.nil?
-            raise JobUnknownNetwork,
-                  "Job `#{@name}' references an unknown network `#{network_name}'"
-          end
-
-          static_ips = nil
-          if network_spec["static_ips"]
-            static_ips = []
-            each_ip(network_spec["static_ips"]) do |ip|
-              static_ips << ip
-            end
-            if static_ips.size != @instances.size
-              raise JobNetworkInstanceIpMismatch,
-                    "Job `#{@name}' has #{@instances.size} instances but was allocated #{static_ips.size} static IPs"
-            end
-          end
-
-          default_network = safe_property(network_spec, "default",
-                                          :class => Array, :optional => true)
-          if default_network
-            default_network.each do |property|
-              unless Network::VALID_DEFAULTS.include?(property)
-                raise JobNetworkInvalidDefault,
-                      "Job `#{@name}' specified an invalid default network property `#{property}', " +
-                      "valid properties are: " + Network::VALID_DEFAULTS.join(", ")
-              end
-
-              if @default_network[property]
-                raise JobNetworkMultipleDefaults,
-                      "Job `#{@name}' specified more than one network to contain default #{property}"
-              else
-                @default_network[property] = network_name
-              end
-            end
-          end
-
-          @instances.each_with_index do |instance, index|
-            reservation = NetworkReservation.new
-            if static_ips
-              reservation.ip = static_ips[index]
-              reservation.type = NetworkReservation::STATIC
-            else
-              reservation.type = NetworkReservation::DYNAMIC
-            end
-            instance.add_network_reservation(network_name, reservation)
-          end
-        end
-
-        if network_specs.size > 1
-          missing_default_properties = Network::VALID_DEFAULTS.dup
-          @default_network.each_key do |key|
-            missing_default_properties.delete(key)
-          end
-          unless missing_default_properties.empty?
-            raise JobNetworkMissingDefault,
-                  "Job `#{@name}' must specify which network is default for " +
-                  missing_default_properties.sort.join(", ") + ", since it has more than one network configured"
-          end
-        else
-          # Set the default network to the one and only available network
-          # (if not specified already)
-          network = safe_property(network_specs[0], "name", :class => String)
-          Network::VALID_DEFAULTS.each do |property|
-            @default_network[property] ||= network
-          end
-        end
-      end
-
       # Extracts only the properties needed by this job. This is decoupled from
       # parsing properties because templates need to be bound to their models
       # before 'bind_properties' is being called (as we persist job template
@@ -438,11 +212,18 @@ module Bosh::Director
           raise DirectorError, "Can't extract job properties before parsing job templates"
         end
 
-        return collection if @templates.none? { |template| template.properties }
-        return extract_template_properties(collection) if @templates.all? { |template| template.properties }
-        raise JobIncompatibleSpecs, "Job `#{name}' has specs with conflicting property definition styles between" +
-            " its job spec templates.  This may occur if colocating jobs, one of which has a spec file including" +
-            " `properties' and one which doesn't."
+        if @templates.none? { |template| template.properties }
+          return collection
+        end
+
+        if @templates.all? { |template| template.properties }
+          return extract_template_properties(collection)
+        end
+
+        raise JobIncompatibleSpecs,
+          "Job `#{name}' has specs with conflicting property definition styles between" +
+          " its job spec templates.  This may occur if colocating jobs, one of which has a spec file including" +
+          " `properties' and one which doesn't."
       end
 
       def extract_template_properties(collection)

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

@@ -0,0 +1,294 @@
+require 'common/deep_copy'
+
+module Bosh::Director
+  module DeploymentPlan
+    class JobSpecParser
+      include DnsHelper
+      include ValidationHelper
+      include Bosh::Common::PropertyHelper
+      include IpUtil
+
+      # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
+      def initialize(deployment)
+        @deployment = deployment
+      end
+
+      # @param [Hash] job_spec Raw job spec from the deployment manifest
+      # @return [DeploymentPlan::Job] Job as build from job_spec
+      def parse(job_spec)
+        @job_spec = job_spec
+        @job = Job.new(@deployment)
+
+        parse_name
+        parse_release
+        parse_template
+        parse_templates
+
+        validate_templates
+
+        check_template_uniqueness
+        parse_disk
+        parse_properties
+        parse_resource_pool
+        parse_update_config
+        parse_instances
+        parse_networks
+
+        @job
+      end
+
+      private
+
+      def parse_name
+        @job.name = safe_property(@job_spec, "name", :class => String)
+        @job.canonical_name = canonical(@job.name)
+      end
+
+      def parse_release
+        release_name = safe_property(@job_spec, "release", :class => String, :optional => true)
+
+        if release_name.nil?
+          if @deployment.releases.size == 1
+            @job.release = @deployment.releases.first
+          else
+            raise JobMissingRelease,
+                  "Cannot tell what release job `#{@job.name}' supposed to use, please reference an existing release"
+          end
+        else
+          @job.release = @deployment.release(release_name)
+        end
+
+        if @job.release.nil?
+          raise JobUnknownRelease,
+                "Job `#{@job.name}' references an unknown release `#{release_name}'"
+        end
+      end
+
+      def parse_template
+        if @job.release.nil?
+          raise DirectorError, "Cannot parse template before parsing release"
+        end
+
+        template_names = safe_property(@job_spec, "template", optional: true)
+        if template_names
+          if template_names.is_a?(String)
+            template_names = Array(template_names)
+          end
+
+          unless template_names.is_a?(Array)
+            invalid_type("template", "String or Array", template_names)
+          end
+
+          template_names.each do |template_name|
+            @job.templates << @job.release.use_template_named(template_name)
+          end
+        end
+      end
+
+      def parse_templates
+        templates = safe_property(@job_spec, 'templates', class: Array, optional: true)
+
+        if templates
+          templates.each do |template|
+            template_name = safe_property(template, 'name', class: String)
+            release_name = safe_property(template, 'release', class: String, optional: true)
+
+            release = release_name ? @deployment.release(release_name) : @job.release
+            if release
+              @job.templates << release.use_template_named(template_name)
+            else
+              raise JobUnknownRelease,
+                    "Template `#{template_name}' (job `#{@job.name}') references an unknown release `#{release_name}'"
+            end
+          end
+        end
+      end
+
+      def check_template_uniqueness
+        if @job.templates.uniq(&:name).size != @job.templates.size
+          raise JobInvalidTemplates,
+                "Job `#{@job.name}' templates must not have repeating names."
+        end
+
+        if @job.templates.uniq(&:release).size > 1
+          raise JobInvalidTemplates,
+                "Job `#{@job.name}' templates must come from the same release."
+        end
+      end
+
+      def parse_disk
+        @job.persistent_disk = safe_property(@job_spec, "persistent_disk", :class => Integer, :default => 0)
+      end
+
+      def parse_properties
+        # Manifest can contain global and per-job properties section
+        job_properties = safe_property(@job_spec, "properties", :class => Hash, :optional => true)
+
+        @job.all_properties = Bosh::Common::DeepCopy.copy(@deployment.properties)
+
+        if job_properties
+          @job.all_properties.recursive_merge!(job_properties)
+        end
+
+        mappings = safe_property(@job_spec, "property_mappings", :class => Hash, :default => {})
+
+        mappings.each_pair do |to, from|
+          resolved = lookup_property(@job.all_properties, from)
+
+          if resolved.nil?
+            raise JobInvalidPropertyMapping,
+                  "Cannot satisfy property mapping `#{to}: #{from}', as `#{from}' is not in deployment properties"
+          end
+
+          @job.all_properties[to] = resolved
+        end
+      end
+
+      def parse_resource_pool
+        resource_pool_name = safe_property(@job_spec, "resource_pool", class: String)
+        @job.resource_pool = @deployment.resource_pool(resource_pool_name)
+        if @job.resource_pool.nil?
+          raise JobUnknownResourcePool,
+                "Job `#{@job.name}' references an unknown resource pool `#{resource_pool_name}'"
+        end
+      end
+
+      def parse_update_config
+        update_spec = safe_property(@job_spec, "update", class: Hash, optional: true)
+        @job.update = UpdateConfig.new(update_spec, @deployment.update)
+      end
+
+      def parse_instances
+        @job.state = safe_property(@job_spec, "state", class: String, optional: true)
+        job_size = safe_property(@job_spec, "instances", class: Integer)
+        instance_states = safe_property(@job_spec, "instance_states", class: Hash, default: {})
+
+        instance_states.each_pair do |index, state|
+          begin
+            index = Integer(index)
+          rescue ArgumentError
+            raise JobInvalidInstanceIndex,
+              "Invalid job index `#{index}', integer expected"
+          end
+
+          unless (0...job_size).include?(index)
+            raise JobInvalidInstanceIndex,
+              "`#{@job.name}/#{index}' is outside of (0..#{job_size-1}) range"
+          end
+
+          unless Job::VALID_JOB_STATES.include?(state)
+            raise JobInvalidInstanceState,
+              "Invalid state `#{state}' for `#{@job.name}/#{index}', valid states are: #{Job::VALID_JOB_STATES.join(", ")}"
+          end
+
+          @job.instance_states[index] = state
+        end
+
+        if @job.state && !Job::VALID_JOB_STATES.include?(@job.state)
+          raise JobInvalidJobState,
+            "Invalid state `#{@job.state}' for `#{@job.name}', valid states are: #{Job::VALID_JOB_STATES.join(", ")}"
+        end
+
+        job_size.times do |index|
+          @job.instances[index] = Instance.new(@job, index)
+          @job.resource_pool.reserve_capacity(1)
+        end
+      end
+
+      def parse_networks
+        @job.default_network = {}
+
+        network_specs = safe_property(@job_spec, "networks", :class => Array)
+        if network_specs.empty?
+          raise JobMissingNetwork,
+                "Job `#{@job.name}' must specify at least one network"
+        end
+
+        network_specs.each do |network_spec|
+          network_name = safe_property(network_spec, "name", :class => String)
+          network = @deployment.network(network_name)
+          if network.nil?
+            raise JobUnknownNetwork,
+                  "Job `#{@job.name}' references an unknown network `#{network_name}'"
+          end
+
+          static_ips = nil
+          if network_spec["static_ips"]
+            static_ips = []
+            each_ip(network_spec["static_ips"]) do |ip|
+              static_ips << ip
+            end
+            if static_ips.size != @job.instances.size
+              raise JobNetworkInstanceIpMismatch,
+                    "Job `#{@job.name}' has #{@job.instances.size} instances but was allocated #{static_ips.size} static IPs"
+            end
+          end
+
+          default_network = safe_property(network_spec, "default", :class => Array, :optional => true)
+          if default_network
+            default_network.each do |property|
+              unless Network::VALID_DEFAULTS.include?(property)
+                raise JobNetworkInvalidDefault,
+                      "Job `#{@job.name}' specified an invalid default network property `#{property}', " +
+                      "valid properties are: " + Network::VALID_DEFAULTS.join(", ")
+              end
+
+              if @job.default_network[property]
+                raise JobNetworkMultipleDefaults,
+                      "Job `#{@job.name}' specified more than one network to contain default #{property}"
+              else
+                @job.default_network[property] = network_name
+              end
+            end
+          end
+
+          @job.instances.each_with_index do |instance, index|
+            reservation = NetworkReservation.new
+            if static_ips
+              reservation.ip = static_ips[index]
+              reservation.type = NetworkReservation::STATIC
+            else
+              reservation.type = NetworkReservation::DYNAMIC
+            end
+            instance.add_network_reservation(network_name, reservation)
+          end
+        end
+
+        if network_specs.size > 1
+          missing_default_properties = Network::VALID_DEFAULTS.dup
+          @job.default_network.each_key do |key|
+            missing_default_properties.delete(key)
+          end
+
+          unless missing_default_properties.empty?
+            raise JobNetworkMissingDefault,
+                  "Job `#{@job.name}' must specify which network is default for " +
+                  missing_default_properties.sort.join(", ") + ", since it has more than one network configured"
+          end
+        else
+          # Set the default network to the one and only available network
+          # (if not specified already)
+          network = safe_property(network_specs[0], "name", :class => String)
+          Network::VALID_DEFAULTS.each do |property|
+            @job.default_network[property] ||= network
+          end
+        end
+      end
+
+      def validate_templates
+        template_property = safe_property(@job_spec, 'template', optional: true)
+        templates_property = safe_property(@job_spec, 'templates', optional: true)
+
+        if template_property && templates_property
+          raise JobInvalidTemplates,
+                "Job `#{@job.name}' specifies both template and templates keys, only one is allowed"
+        end
+
+        if [template_property, templates_property].compact.empty?
+          raise ValidationMissingField,
+                "Job `#{@job.name}' does not specify template or templates keys, one is required"
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/dns_helper.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module DnsHelper
 
@@ -176,12 +174,21 @@ module Bosh::Director
       end
     end
 
-    # if the count is 2, it means we only have the NS & SOA record
-    # and the domain is "empty" and can be deleted
     def delete_empty_domain(domain)
+      # If the count is 2, it means we only have the NS & SOA record
+      # and the domain is "empty" and can be deleted
       if domain.records.size == 2
         @logger.info("Deleting empty reverse domain #{domain.name}")
-        domain.destroy # cascaded - all records are removed
+
+        # Since DNS domain can be deleted by multiple threads
+        # it's possible for database to return 0 rows modified result.
+        # In this specific case that's a valid return value
+        # but Sequel usually considers that an error.
+        # ('Attempt to delete object did not result in a single row modification')
+        domain.require_modification = false
+
+        # Cascaded - all records are removed
+        domain.destroy
       end
     end
 
@@ -199,6 +206,5 @@ module Bosh::Director
       octets = ip.split(/\./)
       "#{octets[0..n].reverse.join(".")}.in-addr.arpa"
     end
-
   end
-end
+end

data/lib/bosh/director/errors.rb

@@ -134,6 +134,7 @@ module Bosh::Director
   JobInvalidInstanceState = err(140005)
   JobInvalidJobState = err(140006)
   JobMissingNetwork = err(140007)
+  JobInvalidTemplates = err(140008)
 
   JobUnknownNetwork = err(150001)
   JobNetworkInstanceIpMismatch = err(150002)

data/lib/bosh/director/models/template.rb

@@ -1,10 +1,14 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director::Models
   class Template < Sequel::Model(Bosh::Director::Config.db)
     many_to_one :release
     many_to_many :release_versions
 
+    def validate
+      validates_presence [:release_id, :name, :version, :blobstore_id, :sha1]
+      validates_unique [:release_id, :name, :version]
+      validates_format VALID_ID, [:name, :version]
+    end
+
     def package_names
       result = self.package_names_json
       result ? Yajl::Parser.parse(result) : nil
@@ -34,11 +38,5 @@ module Bosh::Director::Models
       result = self.properties_json
       result ? Yajl::Parser.parse(result) : nil
     end
-
-    def validate
-      validates_presence [:release_id, :name, :version, :blobstore_id, :sha1]
-      validates_unique [:release_id, :name, :version]
-      validates_format VALID_ID, [:name, :version]
-    end
   end
 end

data/lib/bosh/director/validation_helper.rb

@@ -3,11 +3,14 @@ module Bosh::Director
     def safe_property(hash, property, options = {})
       result = nil
 
-      if hash && hash.has_key?(property)
+      if hash && !hash.kind_of?(Hash)
+        raise Bosh::Director::ValidationInvalidType,
+              "Object (#{hash.inspect}) did not match the required type `Hash'"
+
+      elsif hash && hash.has_key?(property)
         result = hash[property]
 
         if options[:class]
-
           if options[:class] == :boolean
             unless result.kind_of?(TrueClass) || result.kind_of?(FalseClass)
               invalid_type(property, options[:class], result)
@@ -20,17 +23,16 @@ module Bosh::Director
               invalid_type(property, options[:class], result)
             end
           end
-
         end
 
         if options[:min] && result < options[:min]
           raise ValidationViolatedMin,
-                "`#{property}' value (#{result}) should be greater than #{options[:min]}"
+                "`#{property}' value (#{result.inspect}) should be greater than #{options[:min].inspect}"
         end
 
         if options[:max] && result > options[:max]
           raise ValidationViolatedMax,
-                "`#{property}' value (#{result}) should be less than #{options[:max]}"
+                "`#{property}' value (#{result.inspect}) should be less than #{options[:max].inspect}"
         end
 
       elsif options[:default]
@@ -38,14 +40,15 @@ module Bosh::Director
 
       elsif !options[:optional]
         raise ValidationMissingField,
-              "Required property `#{property}' was not specified in #{self.class.name}"
+              "Required property `#{property}' was not specified in object (#{hash.inspect})"
       end
+
       result
     end
 
     def invalid_type(property, klass, value)
       raise ValidationInvalidType,
-        "Property `#{property}' (value #{value.inspect}) did not match the required type `#{klass}'"
+            "Property `#{property}' (value #{value.inspect}) did not match the required type `#{klass}'"
     end
   end
 end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.1750.0'
+    VERSION = '1.1761.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -3,10 +3,8 @@ require 'fileutils'
 require 'securerandom'
 
 module Bosh
-
   module Clouds
     class Dummy
-
       class NotImplemented < StandardError; end
 
       def initialize(options)
@@ -16,6 +14,7 @@ module Bosh
 
         @options = options
         @base_dir = options["dir"]
+
         FileUtils.mkdir_p(@base_dir)
       rescue Errno::EACCES
         raise ArgumentError, "cannot create dummy cloud base directory #{@base_dir}"
@@ -31,12 +30,8 @@ module Bosh
         FileUtils.rm(stemcell_file(stemcell_cid))
       end
 
-      def blobstore_uri
-        properties = @options['agent']['blobstore']['options']
-        uri = URI(properties['endpoint'])
-        uri.user = properties['user']
-        uri.password = properties['password']
-        uri.to_s
+      def blobstore
+        @options['agent']['blobstore']
       end
 
       def nats_uri
@@ -52,7 +47,8 @@ module Bosh
         # FIXME: if there is a need to start this dummy cloud agent with alerts turned on
         # then port should be overriden for each agent, otherwise all but first won't start
         # (won't be able to bind to port)
-        agent_cmd = %W[bosh_agent -a #{agent_id} -s #{blobstore_uri} -p simple -b #{agent_base_dir} -n #{nats_uri} -r #{root_dir} --no-alerts]
+        write_agent_settings(agent_base_dir, agent_id, nats_uri)
+        agent_cmd = %W[bosh_agent -b #{agent_base_dir} -r #{root_dir} --no-alerts -I dummy]
         agent_log = "#{@options['dir']}/agent.#{agent_id}.log"
         agent_pid = Process.spawn(*agent_cmd, chdir: agent_base_dir, out: agent_log, err: agent_log)
 
@@ -64,6 +60,23 @@ module Bosh
         agent_pid.to_s
       end
 
+      def write_agent_settings(agent_base_dir, agent_id, nats_uri)
+        FileUtils.mkdir_p(File.join(agent_base_dir, 'bosh'))
+        settings = {
+          agent_id: agent_id,
+          blobstore: @options['agent']['blobstore'],
+          ntp: [],
+          disks: {
+            persistent: {},
+          },
+          vm: {
+            name: "vm-#{agent_id}"
+          },
+          mbus: nats_uri,
+        }
+        File.write(File.join(agent_base_dir, 'bosh', 'settings.json'), JSON.generate(settings))
+      end
+
       def delete_vm(vm_name)
         agent_pid = vm_name.to_i
         Process.kill("INT", agent_pid)
@@ -74,7 +87,7 @@ module Bosh
       end
 
       def reboot_vm(vm)
-        raise NotImplemented, "reboot_vm"
+        raise NotImplemented, "Dummy CPI does not implement reboot_vm"
       end
 
       def has_vm?(vm_id)
@@ -82,7 +95,7 @@ module Bosh
       end
 
       def configure_networks(vm, networks)
-        raise NotImplemented, "configure_networks"
+        raise NotImplemented, "Dummy CPI does not implement configure_networks"
       end
 
       def attach_disk(vm_id, disk_id)
@@ -120,7 +133,7 @@ module Bosh
       end
 
       def validate_deployment(old_manifest, new_manifest)
-        raise NotImplemented, "validate_deployment"
+        raise NotImplemented, "Dummy CPI does not implement validate_deployment"
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1750.0
+  version: 1.1761.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1750.0
+        version: 1.1761.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  5212a9'
+  826c69'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -570,6 +570,7 @@ files:
 - lib/bosh/director/deployment_plan/idle_vm.rb
 - lib/bosh/director/deployment_plan/instance.rb
 - lib/bosh/director/deployment_plan/job.rb
+- lib/bosh/director/deployment_plan/job_spec_parser.rb
 - lib/bosh/director/deployment_plan/manual_network.rb
 - lib/bosh/director/deployment_plan/multi_job_updater.rb
 - lib/bosh/director/deployment_plan/network.rb
@@ -712,7 +713,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2997654396825944747
+      hash: 857401901605478284
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23