bosh-director 1.5.0.pre.1365 → 1.5.0.pre.1374

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

@@ -322,7 +322,7 @@ module Bosh::Director
     # @return [void]
     def bind_configuration
       @deployment_plan.jobs.each do |job|
-        ConfigurationHasher.new(job).hash
+        JobRenderer.new(job).render_job_instances
       end
     end
 

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

@@ -59,12 +59,12 @@ module Bosh::Director
 
         # Expanding virtual states
         case @state
-          when "recreate"
+          when 'recreate'
             @recreate = true
-            @state = "started"
-          when "restart"
+            @state = 'started'
+          when 'restart'
             @restart = true
-            @state = "started"
+            @state = 'started'
         end
       end
 
@@ -76,7 +76,7 @@ module Bosh::Director
       # @return [void]
       def use_model(model)
         if @model
-          raise DirectorError, "Instance model is already bound"
+          raise DirectorError, 'Instance model is already bound'
         end
         @model = model
       end
@@ -183,7 +183,7 @@ module Bosh::Director
       # @return [Integer] persistent disk size
       def disk_size
         if @model.nil?
-          current_state["persistent_disk"].to_i
+          current_state['persistent_disk'].to_i
         elsif @model.persistent_disk
           @model.persistent_disk.size
         else
@@ -197,7 +197,7 @@ module Bosh::Director
         dns_record_info = {}
         network_settings.each do |network_name, network|
           name = dns_record_name(network_name)
-          dns_record_info[name] = network["ip"]
+          dns_record_info[name] = network['ip']
         end
         dns_record_info
       end
@@ -205,20 +205,20 @@ module Bosh::Director
       ##
       # @return [String] dns record name
       def dns_record_name(network_name)
-        [index, job.canonical_name, canonical(network_name), job.deployment.canonical_name, dns_domain_name].join(".")  
+        [index, job.canonical_name, canonical(network_name), job.deployment.canonical_name, dns_domain_name].join('.')
       end
 
       ##
       # @return [Boolean] returns true if the persistent disk is attached to the
       #   VM
       def disk_currently_attached?
-        current_state["persistent_disk"].to_i > 0
+        current_state['persistent_disk'].to_i > 0
       end
 
       ##
       # @return [Boolean] returns true if the network configuration changed
       def networks_changed?
-        network_settings != @current_state["networks"]
+        network_settings != @current_state['networks']
       end
 
       ##
@@ -229,7 +229,7 @@ module Bosh::Director
           return true
         end
 
-        if @job.resource_pool.spec != @current_state["resource_pool"]
+        if @job.resource_pool.spec != @current_state['resource_pool']
           return true
         end
 
@@ -252,7 +252,7 @@ module Bosh::Director
       # @return [Boolean] returns true if the expected configuration hash
       #   differs from the one provided by the VM
       def configuration_changed?
-        configuration_hash != @current_state["configuration_hash"]
+        configuration_hash != @current_state['configuration_hash']
       end
 
       ##
@@ -260,11 +260,11 @@ module Bosh::Director
       #   from the one provided by the VM
       def job_changed?
         job_spec = @job.spec
-        if job_spec != @current_state["job"]
+        if job_spec != @current_state['job']
           # The agent job spec could be in legacy form.  job_spec cannot be,
           # though, because we got it from the spec function in job.rb which
           # automatically makes it non-legacy.
-          return job_spec != Job.convert_from_legacy_spec(@current_state["job"])
+          return job_spec != Job.convert_from_legacy_spec(@current_state['job'])
         end
         return false
       end
@@ -273,7 +273,7 @@ module Bosh::Director
       # @return [Boolean] returns true if the expected packaged of the running
       #   instance differ from the ones provided by the VM
       def packages_changed?
-        @job.package_spec != @current_state["packages"]
+        @job.package_spec != @current_state['packages']
       end
 
       ##
@@ -289,7 +289,7 @@ module Bosh::Director
       def dns_changed?
         if Config.dns_enabled?
           dns_record_info.any? do |name, ip|
-            Models::Dns::Record.find(:name => name, :type => "A",
+            Models::Dns::Record.find(:name => name, :type => 'A',
                                      :content => ip).nil?
           end
         else
@@ -306,9 +306,9 @@ module Bosh::Director
       # @return [Boolean] returns true if the expected job state differs from
       #   the one provided by the VM
       def state_changed?
-        @state == "detached" ||
-          @state == "started" && @current_state["job_state"] != "running" ||
-          @state == "stopped" && @current_state["job_state"] == "running"
+        @state == 'detached' ||
+          @state == 'started' && @current_state['job_state'] != 'running' ||
+          @state == 'stopped' && @current_state['job_state'] == 'running'
       end
 
       ##
@@ -323,7 +323,7 @@ module Bosh::Director
       #   differences
       def changes
         changes = Set.new
-        unless @state == "detached" && @current_state.nil?
+        unless @state == 'detached' && @current_state.nil?
           changes << :restart if @restart
           changes << :resource_pool if resource_pool_changed?
           changes << :network if networks_changed?
@@ -344,21 +344,21 @@ module Bosh::Director
       # @return [Hash<String, Object>] instance spec
       def spec
         spec = {
-          "deployment" => @job.deployment.name,
-          "release" => job.release.spec,
-          "job" => job.spec,
-          "index" => index,
-          "networks" => network_settings,
-          "resource_pool" => job.resource_pool.spec,
-          "packages" => job.package_spec,
-          "persistent_disk" => job.persistent_disk,
-          "configuration_hash" => configuration_hash,
-          "properties" => job.properties,
-          "dns_domain_name" => dns_domain_name
+          'deployment' => @job.deployment.name,
+          'release' => job.release.spec,
+          'job' => job.spec,
+          'index' => index,
+          'networks' => network_settings,
+          'resource_pool' => job.resource_pool.spec,
+          'packages' => job.package_spec,
+          'persistent_disk' => job.persistent_disk,
+          'configuration_hash' => configuration_hash,
+          'properties' => job.properties,
+          'dns_domain_name' => dns_domain_name
         }
 
         if template_hashes
-          spec["template_hashes"] = template_hashes
+          spec['template_hashes'] = template_hashes
         end
 
         spec
@@ -368,17 +368,17 @@ module Bosh::Director
       # @return [Models::Instance]
       def find_or_create_model
         if @job.deployment.model.nil?
-          raise DirectorError, "Deployment model is not bound"
+          raise DirectorError, 'Deployment model is not bound'
         end
 
         conditions = {
-          :deployment_id => @job.deployment.model.id,
-          :job => @job.name,
-          :index => @index
+          deployment_id: @job.deployment.model.id,
+          job: @job.name,
+          index: @index
         }
 
         Models::Instance.find_or_create(conditions) do |model|
-          model.state = "started"
+          model.state = 'started'
         end
       end
 

data/lib/bosh/director/job_instance_renderer.rb

@@ -10,7 +10,7 @@ module Bosh::Director
       job.templates.map do |template|
         job_template_renderer = job_template_renderers[template.name]
         job_template_renderer.render(job.name, instance)
-      end.sort { |x, y| x.name <=> y.name }
+      end
     end
 
     private

data/lib/bosh/director/job_renderer.rb

@@ -0,0 +1,28 @@
+require 'bosh/director/job_template_loader'
+require 'bosh/director/job_instance_renderer'
+require 'bosh/director/rendered_job_instance_hasher'
+require 'bosh/director/rendered_templates_uploader'
+
+module Bosh::Director
+  class JobRenderer
+    # @param [DeploymentPlan::Job]
+    def initialize(job)
+      @job = job
+      job_template_loader = JobTemplateLoader.new
+      @instance_renderer = JobInstanceRenderer.new(@job, job_template_loader)
+    end
+
+    def render_job_instances
+      @job.instances.each do |instance|
+        rendered_templates = @instance_renderer.render(instance)
+
+        uploader = RenderedTemplatesUploader.new
+        uploader.upload(rendered_templates)
+
+        hasher = RenderedJobInstanceHasher.new(rendered_templates)
+        instance.configuration_hash = hasher.configuration_hash
+        instance.template_hashes = hasher.template_hashes
+      end
+    end
+  end
+end

data/lib/bosh/director/job_template_loader.rb

@@ -1,6 +1,8 @@
 require 'bosh/director/job_template_renderer'
 
 module Bosh::Director
+  SrcFileTemplate = Struct.new(:src_name, :dest_name, :erb_file)
+
   class JobTemplateLoader
     def process(job_template)
       template_dir = extract_template(job_template)
@@ -9,14 +11,12 @@ module Bosh::Director
       monit_template = erb(File.join(template_dir, 'monit'))
       monit_template.filename = File.join(job_template.name, 'monit')
 
-      templates = {}
+      templates = []
 
-      if manifest['templates']
-        manifest['templates'].each_key do |template_name|
-          template = erb(File.join(template_dir, 'templates', template_name))
-          template.filename = File.join(job_template.name, template_name)
-          templates[template_name] = template
-        end
+      manifest.fetch('templates', {}).each_pair do |src_name, dest_name|
+        erb_file = erb(File.join(template_dir, 'templates', src_name))
+        erb_file.filename = File.join(job_template.name, src_name)
+        templates << SrcFileTemplate.new(src_name, dest_name, erb_file)
       end
 
       JobTemplateRenderer.new(job_template.name, monit_template, templates)

data/lib/bosh/director/job_template_renderer.rb

@@ -1,4 +1,7 @@
+require 'bosh/director/rendered_job_template'
+
 module Bosh::Director
+  RenderedFileTemplate = Struct.new(:src_name, :dest_name, :contents)
   class JobTemplateRenderer
 
     attr_reader :monit_template, :templates
@@ -14,11 +17,13 @@ module Bosh::Director
       template_context = Bosh::Common::TemplateEvaluationContext.new(instance.spec)
 
       monit = render_erb(job_name, monit_template, template_context, instance.index)
-      rendered_templates = {}
-      templates.keys.sort.each do |src_name|
-        rendered_templates[src_name] = render_erb(job_name, templates[src_name], template_context, instance.index)
+
+      rendered_templates = templates.map do |template_file|
+        file_contents = render_erb(job_name, template_file.erb_file, template_context, instance.index)
+        RenderedFileTemplate.new(template_file.src_name, template_file.dest_name, file_contents)
       end
-      return RenderedJobTemplate.new(name, monit, rendered_templates)
+
+      RenderedJobTemplate.new(name, monit, rendered_templates)
     end
 
     private
@@ -32,7 +37,7 @@ module Bosh::Director
     rescue Exception => e
       @logger.debug(e.inspect)
       job_desc = "#{job_name}/#{index}"
-      line_index = e.backtrace.index{ |l| l.include?(template.filename) }
+      line_index = e.backtrace.index { |l| l.include?(template.filename) }
       line = line_index ? e.backtrace[line_index] : '(unknown):(unknown)'
       template_name, line = line.split(':')
 
@@ -40,9 +45,8 @@ module Bosh::Director
         "for `#{job_desc}' (line #{line}: #{e})"
 
       @logger.debug("#{message}\n#{e.backtrace.join("\n")}")
+
       raise JobTemplateBindingFailed, "#{message}"
     end
   end
-
-  RenderedJobTemplate = Struct.new(:name, :monit, :templates)
-end
+end

data/lib/bosh/director/rendered_job_instance_hasher.rb

@@ -0,0 +1,31 @@
+module Bosh::Director
+  class RenderedJobInstanceHasher
+    def initialize(job_templates)
+      @job_templates = job_templates
+    end
+
+    def configuration_hash
+      instance_digest = Digest::SHA1.new
+      job_templates.sort { |x, y| x.name <=> y.name }.each do |rendered_job_template|
+        bound_templates = ''
+        bound_templates << rendered_job_template.monit
+
+        rendered_job_template.templates.sort { |x, y| x.src_name <=> y.src_name }.each do |template_file|
+          bound_templates << template_file.contents
+          instance_digest << bound_templates
+        end
+      end
+
+      instance_digest.hexdigest
+    end
+
+    def template_hashes
+      job_templates.reduce({}) do |h, rendered_job_template|
+        h.merge(rendered_job_template.name => rendered_job_template.template_hash)
+      end
+    end
+
+    private
+    attr_reader :job_templates
+  end
+end

data/lib/bosh/director/rendered_job_template.rb

@@ -0,0 +1,21 @@
+module Bosh::Director
+  class RenderedJobTemplate
+    attr_reader :name, :monit, :templates
+
+    def initialize(name, monit, templates)
+      @name = name
+      @monit = monit
+      @templates = templates
+    end
+
+    def template_hash
+      template_digest = Digest::SHA1.new
+      template_digest << monit
+      templates.sort { |x, y| x.src_name <=> y.src_name }.each do |template_file|
+        template_digest << template_file.contents
+      end
+
+      template_digest.hexdigest
+    end
+  end
+end

data/lib/bosh/director/rendered_templates_uploader.rb

@@ -0,0 +1,6 @@
+module Bosh::Director
+  class RenderedTemplatesUploader
+    def upload(rendered_templates)
+    end
+  end
+end

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1365'
+    VERSION = '1.5.0.pre.1374'
   end
 end

data/lib/bosh/director.rb

@@ -58,7 +58,7 @@ require 'bosh/director/blob_util'
 require 'bosh/director/agent_client'
 require 'cloud'
 require 'bosh/director/compile_task'
-require 'bosh/director/configuration_hasher'
+require 'bosh/director/job_renderer'
 require 'bosh/director/cycle_helper'
 require 'bosh/director/encryption_helper'
 require 'bosh/director/vm_creator'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1365
+  version: 1.5.0.pre.1374
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 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.5.0.pre.1365
+        version: 1.5.0.pre.1374
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
 - !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.5.0.pre.1365
+        version: 1.5.0.pre.1374
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
 - !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.5.0.pre.1365
+        version: 1.5.0.pre.1374
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
 - !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.5.0.pre.1365
+        version: 1.5.0.pre.1374
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1365
+        version: 1.5.0.pre.1374
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -396,7 +396,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.9
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -412,7 +412,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-fire
+  name: machinist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -428,24 +444,24 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: machinist
+  name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: ! 'BOSH Director
 
-  a77e8c'
+  d50b1a'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -535,7 +551,6 @@ files:
 - lib/bosh/director/compiled_package_manifest.rb
 - lib/bosh/director/compiled_packages_exporter.rb
 - lib/bosh/director/config.rb
-- lib/bosh/director/configuration_hasher.rb
 - lib/bosh/director/cycle_helper.rb
 - lib/bosh/director/db_backup.rb
 - lib/bosh/director/db_backup/adapter.rb
@@ -578,6 +593,7 @@ files:
 - lib/bosh/director/ip_util.rb
 - lib/bosh/director/job_instance_renderer.rb
 - lib/bosh/director/job_queue.rb
+- lib/bosh/director/job_renderer.rb
 - lib/bosh/director/job_runner.rb
 - lib/bosh/director/job_template_loader.rb
 - lib/bosh/director/job_template_renderer.rb
@@ -642,6 +658,9 @@ files:
 - lib/bosh/director/problem_handlers/unresponsive_agent.rb
 - lib/bosh/director/problem_resolver.rb
 - lib/bosh/director/problem_scanner.rb
+- lib/bosh/director/rendered_job_instance_hasher.rb
+- lib/bosh/director/rendered_job_template.rb
+- lib/bosh/director/rendered_templates_uploader.rb
 - lib/bosh/director/resource_pool_updater.rb
 - lib/bosh/director/scheduler.rb
 - lib/bosh/director/sequel.rb

data/lib/bosh/director/configuration_hasher.rb

@@ -1,44 +0,0 @@
-require 'bosh/director/job_template_loader'
-require 'bosh/director/job_instance_renderer'
-
-module Bosh::Director
-  class ConfigurationHasher
-    # @param [DeploymentPlan::Job]
-    def initialize(job)
-      @job = job
-    end
-
-    def hash
-      job_template_loader = JobTemplateLoader.new
-      job_instance_renderer = JobInstanceRenderer.new(@job, job_template_loader)
-
-      @job.instances.each do |instance|
-        rendered_job_templates = job_instance_renderer.render(instance)
-        instance_digest, template_digests = render_digest(rendered_job_templates)
-        instance.configuration_hash = instance_digest.hexdigest
-        instance.template_hashes = template_digests
-      end
-    end
-
-    private
-
-    def render_digest(rendered_job_templates)
-      instance_digest = Digest::SHA1.new
-      template_digests = {}
-      rendered_job_templates.each do |rendered_job_template|
-        bound_templates = ''
-        bound_templates << rendered_job_template.monit
-
-        rendered_job_template.templates.keys.sort.each do |src_name|
-          bound_templates << rendered_job_template.templates[src_name]
-          instance_digest << bound_templates
-
-          template_digest = Digest::SHA1.new
-          template_digest << bound_templates
-          template_digests[rendered_job_template.name] = template_digest.hexdigest
-        end
-      end
-      return instance_digest, template_digests
-    end
-  end
-end