bosh-director 1.3215.4.0 → 1.3232.0

data/lib/bosh/director/deployment_deleter.rb

@@ -19,27 +19,27 @@ module Bosh::Director
       event_log_stage = @event_log.begin_stage('Deleting instances', instance_plans.size)
       instance_deleter.delete_instance_plans(instance_plans, event_log_stage, max_threads: @max_threads)
 
-      @event_log.begin_stage('Removing deployment artifacts', 3)
+      event_log_stage = @event_log.begin_stage('Removing deployment artifacts', 3)
 
-      @event_log.track('Detaching stemcells') do
+      event_log_stage.advance_and_track('Detaching stemcells') do
         @logger.info('Detaching stemcells')
         deployment_model.remove_all_stemcells
       end
 
-      @event_log.track('Detaching releases') do
+      event_log_stage.advance_and_track('Detaching releases') do
         @logger.info('Detaching releases')
         deployment_model.remove_all_release_versions
       end
 
-      @event_log.begin_stage('Deleting properties', deployment_model.properties.count)
+      event_log_stage = @event_log.begin_stage('Deleting properties', deployment_model.properties.count)
       @logger.info('Deleting deployment properties')
       deployment_model.properties.each do |property|
-        @event_log.track(property.name) do
+        event_log_stage.advance_and_track(property.name) do
           property.destroy
         end
       end
 
-      @event_log.track('Destroying deployment') do
+      event_log_stage.advance_and_track('Destroying deployment') do
         @logger.info('Destroying deployment')
         deployment_model.destroy
       end

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

@@ -24,9 +24,9 @@ module Bosh::Director
 
       def verify_state(instance, state)
         unless state.kind_of?(Hash)
-          @logger.error("Invalid state for `#{instance.vm_cid}': #{state.pretty_inspect}")
+          @logger.error("Invalid state for '#{instance.vm_cid}': #{state.pretty_inspect}")
           raise AgentInvalidStateFormat,
-            "VM `#{instance.vm_cid}' returns invalid state: " +
+            "VM '#{instance.vm_cid}' returns invalid state: " +
               "expected Hash, got #{state.class}"
         end
       end

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

@@ -129,7 +129,7 @@ module Bosh::Director
 
           if stemcell.nil?
             raise DirectorError,
-              "Stemcell not bound for resource pool `#{resource_pool.name}'"
+              "Stemcell not bound for resource pool '#{resource_pool.name}'"
           end
 
           stemcell.bind_model(@deployment_plan.model)

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

@@ -88,7 +88,7 @@ module Bosh::Director
             instance_memo = InstanceMemo.new(@instance_provider, stemcell)
             @instance_reuser.add_in_use_instance(instance_memo, stemcell)
           else
-            @logger.info("Reusing compilation VM `#{instance_memo.instance.model.vm_cid}' for stemcell `#{stemcell.model.desc}'")
+            @logger.info("Reusing compilation VM '#{instance_memo.instance.model.vm_cid}' for stemcell '#{stemcell.model.desc}'")
           end
         end
         return instance_memo
@@ -139,9 +139,34 @@ module Bosh::Director
       end
 
       def create_instance(instance_plan)
+        instance_model = instance_plan.instance.model
+        parent_id = add_event(instance_model.deployment.name, instance_model.name)
         @deployment_plan.ip_provider.reserve(instance_plan.network_plans.first.reservation)
         @vm_creator.create_for_instance_plan(instance_plan, [])
         instance_plan.instance
+      rescue Exception => e
+        raise e
+      ensure
+        add_event(instance_model.deployment.name, instance_model.name, parent_id, e )
+      end
+
+      private
+
+      def add_event(deployment_name, instance_name = nil, parent_id = nil, error = nil)
+        user  = Config.current_job.username
+        event  = Config.current_job.event_manager.create_event(
+            {
+                parent_id:   parent_id,
+                user:        user,
+                action:      'create',
+                object_type: 'instance',
+                object_name: instance_name,
+                task:        Config.current_job.task_id,
+                deployment:  deployment_name,
+                instance:    instance_name,
+                error:       error
+            })
+        event.id
       end
     end
 

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

@@ -25,7 +25,7 @@ module Bosh::Director
           Bosh::Director::Models::Deployment.each do |other|
             if Canonicalizer.canonicalize(other.name) == canonical_name
                 raise DeploymentCanonicalNameTaken,
-                "Invalid deployment name `#{attributes[:name]}', canonical name already taken (`#{canonical_name}')"
+                "Invalid deployment name '#{attributes[:name]}', canonical name already taken ('#{canonical_name}')"
             end
           end
           Bosh::Director::Models::Deployment.create(attributes)

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

@@ -39,7 +39,7 @@ module Bosh::Director
           disk_size = safe_property(dp_spec, 'disk_size', class: Integer)
           if disk_size < 0
             raise DiskTypeInvalidDiskSize,
-              "Disk types `#{name}' references an invalid persistent disk size `#{disk_size}'"
+              "Disk types '#{name}' references an invalid persistent disk size '#{disk_size}'"
           end
 
           cloud_properties = safe_property(dp_spec, 'cloud_properties', class: Hash, default: {})

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

@@ -341,12 +341,12 @@ module Bosh::Director
 
       def check_model_bound
         if @model.nil?
-          raise DirectorError, "Instance `#{self}' model is not bound"
+          raise DirectorError, "Instance '#{self}' model is not bound"
         end
       end
 
       def check_model_not_bound
-        raise DirectorError, "Instance `#{self}' model is already bound" if @model
+        raise DirectorError, "Instance '#{self}' model is already bound" if @model
       end
 
       def log_changes(method_sym, old_state, new_state)

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

@@ -298,7 +298,7 @@ module Bosh
 
         def disk_size
           if @instance.model.nil?
-            raise DirectorError, "Instance `#{@instance}' model is not bound"
+            raise DirectorError, "Instance '#{@instance}' model is not bound"
           end
 
           if @instance.model.persistent_disk
@@ -310,7 +310,7 @@ module Bosh
 
         def disk_cloud_properties
           if @instance.model.nil?
-            raise DirectorError, "Instance `#{@instance}' model is not bound"
+            raise DirectorError, "Instance '#{@instance}' model is not bound"
           end
 
           if @instance.model.persistent_disk

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

@@ -30,6 +30,7 @@ module Bosh::Director
           'env' => job.env.spec,
           'packages' => job.package_spec,
           'properties' => job.properties,
+          'properties_need_filtering' => true,
           'dns_domain_name' => dns_manager.dns_domain_name,
           'links' => job.link_spec,
           'address' => instance_plan.network_settings.network_address,
@@ -112,6 +113,7 @@ module Bosh::Director
           'az',
           'networks',
           'properties',
+          'properties_need_filtering',
           'dns_domain_name',
           'links',
           'persistent_disk',

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

@@ -92,7 +92,7 @@ module Bosh::Director
         end
 
         @logger.debug('Reserving existing ips')
-        network, subnet = find_network_and_subnet_containing(reservation.ip)
+        network, subnet = find_network_and_subnet_containing(reservation.ip, reservation.network.name)
         if subnet
           @logger.debug("Marking existing IP #{format_ip(reservation.ip)} as reserved")
           reservation.resolve_network(network)
@@ -140,8 +140,12 @@ module Bosh::Director
         end
       end
 
-      def find_network_and_subnet_containing(cidr_ip)
-        @networks.values.select(&:manual?).each do |network|
+      def find_network_and_subnet_containing(cidr_ip, network_name)
+        networks = @networks.values.dup
+
+        networks.unshift(networks.find { |network| network.name == network_name }).compact!
+
+        networks.select(&:manual?).each do |network|
           subnet = network.subnets.find { |subnet| subnet.is_reservable?(cidr_ip) }
           return [network, subnet] if subnet
         end

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

@@ -184,8 +184,6 @@ module Bosh::Director
             "blobstore_id" => first_template.blobstore_id
           }
 
-          result['template_scoped_properties'] = first_template.template_scoped_properties[@name] unless first_template.template_scoped_properties[@name].nil?
-
           if first_template.logs
             result["logs"] = first_template.logs
           end
@@ -199,8 +197,6 @@ module Bosh::Director
               "blobstore_id" => template.blobstore_id
             }
 
-            template_entry['template_scoped_properties'] = template.template_scoped_properties[@name] unless template.template_scoped_properties[@name].nil?
-
             if template.logs
               template_entry["logs"] = template.logs
             end
@@ -347,8 +343,12 @@ module Bosh::Director
       # @param [Hash] collection All properties collection
       # @return [Hash] Properties required by templates included in this job
       def filter_properties(collection)
-        if @templates.none? { |template| template.properties }
-          return collection
+        if @templates.none? { |template| template.properties}
+          result = {}
+          @templates.each do |template|
+            result[template.name] = collection
+          end
+          return result
         end
 
         if @templates.all? { |template| template.properties }
@@ -356,9 +356,9 @@ module Bosh::Director
         end
 
         raise JobIncompatibleSpecs,
-          "Instance group '#{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."
+              "Instance group '#{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)
@@ -370,11 +370,13 @@ module Bosh::Director
           # make them available to other templates in the same deployment job. That can
           # be done by checking @template_scoped_properties variable of each
           # template
+          result[template.name] ||= {}
           if template.has_template_scoped_properties(@name)
             template.bind_template_scoped_properties(@name)
+            result[template.name] = template.template_scoped_properties[@name]
           else
             template.properties.each_pair do |name, definition|
-              copy_property(result, collection, name, definition["default"])
+              copy_property(result[template.name], collection, name, definition["default"])
             end
           end
         end

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

@@ -165,23 +165,23 @@ module Bosh::Director
 
             if current_template_model.consumes != nil
               current_template_model.consumes.each do |consumes|
-                template.add_link_info(@job.name,'consumes', consumes["name"], consumes)
+                template.add_link_from_release(@job.name,'consumes', consumes["name"], consumes)
               end
             end
             if current_template_model.provides != nil
               current_template_model.provides.each do |provides|
-                template.add_link_info(@job.name, 'provides', provides["name"], provides)
+                template.add_link_from_release(@job.name, 'provides', provides["name"], provides)
               end
             end
 
             provides_links = safe_property(template_spec, 'provides', class: Hash, optional: true)
             provides_links.to_a.each do |link_name, source|
-              template.add_link_info(@job.name, "provides", link_name, source)
+              template.add_link_from_manifest(@job.name, "provides", link_name, source)
             end
 
             consumes_links = safe_property(template_spec, 'consumes', class: Hash, optional: true)
             consumes_links.to_a.each do |link_name, source|
-              template.add_link_info(@job.name, 'consumes', link_name, source)
+              template.add_link_from_manifest(@job.name, 'consumes', link_name, source)
             end
 
             if template_spec.has_key?("properties")

data/lib/bosh/director/deployment_plan/links/link.rb

@@ -22,6 +22,7 @@ module Bosh::Director
             {
               'name' => @source.name,
               'index' => instance.index,
+              'bootstrap' => instance.bootstrap?,
               'id' => instance.uuid,
               'az' => availability_zone,
               'address' => instance_plan.network_address(@network_name),

data/lib/bosh/director/deployment_plan/links/link_path.rb

@@ -1,7 +1,7 @@
 module Bosh::Director
   module DeploymentPlan
     class LinkPath
-      attr_reader :deployment, :job, :template, :name, :path, :skip
+      attr_reader :deployment, :job, :template, :name, :path, :skip, :manual_spec
 
       def initialize(deployment_plan, job_name, template_name)
         @deployment_plan = deployment_plan
@@ -13,10 +13,11 @@ module Bosh::Director
         @name = nil
         @path = nil
         @skip = false
+        @manual_spec = nil
       end
 
       def parse(link_info)
-        # in case the link was explicitly set to the string `nil', do not add it
+        # in case the link was explicitly set to the string 'nil', do not add it
         # to the link paths, even if the link provider exist, since the user intent
         # was explicitly set to not consume any link
 
@@ -27,6 +28,11 @@ module Bosh::Director
 
         if link_info.has_key?("from")
           link_path = fulfill_explicit_link(link_info)
+        elsif link_info.has_key?("instances") || link_info.has_key?('properties')
+          @manual_spec = {}
+          @manual_spec['instances'] = link_info['instances']
+          @manual_spec['properties'] = link_info['properties']
+          return
         else
           link_path = fulfill_implicit_link(link_info)
         end
@@ -74,24 +80,17 @@ module Bosh::Director
         else
           # Only raise an exception if no linkpath was found, and the link is not optional
           if !link_info["optional"]
-             raise "Can't find link with type: '#{link_type}' in deployment '#{@deployment_plan.name}'#{" and network '#{link_network}''" unless link_network.to_s.empty?}"
+             raise "Can't find link with type '#{link_type}' for job '#{@consumes_job_name}' in deployment '#{@deployment_plan.name}'#{" and network '#{link_network}''" unless link_network.to_s.empty?}"
           end
         end
       end
 
       def fulfill_explicit_link(link_info)
-        from_where = link_info['from']
+        from_name = link_info['from']
         link_network = link_info['network']
-        parts = from_where.split('.') # the string might be formatted like 'deployment.link_name'
-        from_name = parts.shift
-
-        if parts.size >= 1  # given a deployment name
-          deployment_name = from_name
-          from_name = parts.shift
-          if parts.size >= 1
-            raise "From string #{from_where} is poorly formatted. It should look like 'link_name' or 'deployment_name.link_name'"
-          end
+        deployment_name = link_info['deployment']
 
+        if !deployment_name.nil?
           if deployment_name == @deployment_plan.name
             link_path = get_link_path_from_deployment_plan(from_name, link_network)
           else
@@ -100,6 +99,7 @@ module Bosh::Director
         else  # given no deployment name
           link_path = get_link_path_from_deployment_plan(from_name, link_network)   # search the jobs for the current deployment for a provides
         end
+
         link_path[:name] = from_name
         return link_path
       end
@@ -113,7 +113,7 @@ module Bosh::Director
                 template.link_infos[job.name]['provides'].to_a.each do |provides_name, source|
                   link_name = source.has_key?("as") ? source['as'] : source['name']
                   if link_name == name
-                    found_link_paths.push({:deployment => @deployment_plan.name, :job => job.name, :template => template.name, :name => name})
+                    found_link_paths.push({:deployment => @deployment_plan.name, :job => job.name, :template => template.name, :name => source['name'], :as => source['as']})
                   end
                 end
               end
@@ -121,14 +121,13 @@ module Bosh::Director
           end
         end
         if found_link_paths.size == 1
-          return found_link_paths[0]
+          return {:deployment => found_link_paths[0][:deployment], :job => found_link_paths[0][:job], :template => found_link_paths[0][:template], :name => found_link_paths[0][:as].nil? ? found_link_paths[0][:name] : found_link_paths[0][:as]}
         elsif found_link_paths.size > 1
           all_link_paths = ""
           found_link_paths.each do |link_path|
-            all_link_paths = all_link_paths + "\n   #{link_path[:deployment]}.#{link_path[:job]}.#{link_path[:template]}.#{link_path[:name]}"
+            all_link_paths = all_link_paths + "\n   #{link_path[:name]}#{" aliased as '#{link_path[:as]}'" unless link_path[:as].nil?} (job: #{link_path[:template]}, instance group: #{link_path[:job]})"
           end
-          link_str = "#{@deployment_plan.name}.#{@consumes_job_name}.#{@consumes_template_name}.#{name}"
-          raise "Cannot resolve ambiguous link '#{link_str}' in deployment #{@deployment_plan.name}:#{all_link_paths}"
+          raise "Cannot resolve ambiguous link '#{name}' (job: #{@consumes_template_name}, instance group: #{@consumes_job_name}). All of these match: #{all_link_paths}"
         else
           raise "Can't resolve link '#{name}' in instance group '#{@consumes_job_name}' on job '#{@consumes_template_name}' in deployment '#{@deployment_plan.name}'#{" and network '#{link_network}'" unless link_network.to_s.empty?}."
         end
@@ -177,4 +176,4 @@ module Bosh::Director
 
     end
   end
-end
+end

data/lib/bosh/director/deployment_plan/links/links_resolver.rb

@@ -29,6 +29,8 @@ module Bosh::Director
             if !consumed_link.optional
               raise JobMissingLink, "Link path was not provided for required link '#{link_name}' in instance group '#{job.name}'"
             end
+          elsif !link_path.manual_spec.nil?
+            job.add_resolved_link(link_name, link_path.manual_spec)
           else
             link_network = template.consumes_link_info(job.name, link_name)['network']
             link_lookup = LinkLookupFactory.create(consumed_link, link_path, @deployment_plan, link_network, job.name, template.name)

data/lib/bosh/director/deployment_plan/links/template_link.rb

@@ -23,7 +23,7 @@ module Bosh::Director
       def self.parse_provides_link(link_def)
         if link_def.is_a?(Hash) && link_def.has_key?('type') && link_def.has_key?('name')
           if link_def.has_key?('optional')
-            raise JobInvalidLinkSpec, "Link '#{link_def['name']}' of type '#{link_def['type']}' is a provides link, not allowed to have `optional' key"
+            raise JobInvalidLinkSpec, "Link '#{link_def['name']}' of type '#{link_def['type']}' is a provides link, not allowed to have 'optional' key"
           elsif link_def.has_key?('as')
             return new(link_def['as'], link_def['type'], false, link_def['shared'] || false)
           else

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

@@ -18,7 +18,7 @@ module Bosh::Director
           new_subnet = ManualNetworkSubnet.parse(name, subnet_spec, availability_zones, reserved_ranges)
           subnets.each do |subnet|
             if subnet.overlaps?(new_subnet)
-              raise NetworkOverlappingSubnets, "Network `#{name}' has overlapping subnets"
+              raise NetworkOverlappingSubnets, "Network '#{name}' has overlapping subnets"
             end
           end
           subnets << new_subnet

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

@@ -16,7 +16,7 @@ module Bosh::Director
 
         if range.size <= 1
           raise NetworkInvalidRange,
-            "Invalid network range `#{range_property}', " +
+            "Invalid network range '#{range_property}', " +
               "should include at least 2 IPs"
         end
 
@@ -61,8 +61,8 @@ module Bosh::Director
         each_ip(reserved_property) do |ip|
           unless range.contains?(ip)
             raise NetworkReservedIpOutOfRange,
-              "Reserved IP `#{format_ip(ip)}' is out of " +
-                "network `#{network_name}' range"
+              "Reserved IP '#{format_ip(ip)}' is out of " +
+                "network '#{network_name}' range"
           end
           restricted_ips.add(ip)
         end
@@ -71,11 +71,11 @@ module Bosh::Director
         each_ip(static_property) do |ip|
           if restricted_ips.include?(ip)
             raise NetworkStaticIpOutOfRange,
-              "Static IP `#{format_ip(ip)}' is in network `#{network_name}' reserved range"
+              "Static IP '#{format_ip(ip)}' is in network '#{network_name}' reserved range"
           end
           unless range.contains?(ip)
             raise NetworkStaticIpOutOfRange,
-              "Static IP `#{format_ip(ip)}' is out of network `#{network_name}' range"
+              "Static IP '#{format_ip(ip)}' is out of network '#{network_name}' range"
           end
           static_ips.add(ip)
         end
@@ -138,7 +138,7 @@ module Bosh::Director
 
       def self.invalid_gateway(network_name, reason)
         raise NetworkInvalidGateway,
-              "Invalid gateway for network `#{network_name}': #{reason}"
+              "Invalid gateway for network '#{network_name}': #{reason}"
       end
 
       def self.check_validity_of_subnet_availability_zone(availability_zone_name, availability_zones, network_name)