bosh-director 1.3012.0 → 1.3016.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b371e8ca5c84ecea103b391df527d1ec8ec9e9ca
-  data.tar.gz: c02bda21dd172939f62495717175a6040590204e
+  metadata.gz: 13cd05082e949cce8da88e0ce3b104ab3b5db3cb
+  data.tar.gz: ad109214ab949c9b1da47ed09609436dcc902eaa
 SHA512:
-  metadata.gz: afb5b93f7fb726d8d76bdcf59a1e7c3c937250dd4a4f6fd82b87b9ed01c418e2e74f10d5141b185e7b9bfca822f5cbb02795ca6934c041b7ca171e306babe4a9
-  data.tar.gz: a3b6a77f739223d4d8d8f8372cfec09210c7923bb72923ae0c5d9d84b5041b05ab66abb4aa156be3f4e6ca21a1140086ea67112c346954bc5f9912f32031d26d
+  metadata.gz: 087eaba75dfd98fa0a496dc5b1d7acd10b4e55743ab056ac0e054013b74628cc749747bee4e6de73ece1d870bc507dfc3b2aa3f97e7331d7b548106c9a6c6732
+  data.tar.gz: def64e21c02dcc889608d462ce197a0ec746ea05657cc5379685dc82fe6a4bf14cfd21d9d65297b301db7f54f2838d9a297e32a76a3252be9a7e97a883dfde3b

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

@@ -66,11 +66,8 @@ module Bosh::Director
       def parse_jobs
         jobs = safe_property(@deployment_manifest, 'jobs', :class => Array, :default => [])
         jobs.each do |job_spec|
-          state_overrides = @job_states[job_spec['name']]
-          if state_overrides
-            job_spec.recursive_merge!(state_overrides)
-          end
-
+          state_overrides = @job_states.fetch(job_spec['name'], {})
+          job_spec = job_spec.recursive_merge(state_overrides)
           @deployment.add_job(Job.parse(@deployment, job_spec, @event_log, @logger))
         end
       end

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

@@ -177,13 +177,9 @@ module Bosh::Director
 
       def parse_properties
         # Manifest can contain global and per-job properties section
-        job_properties = safe_property(@job_spec, "properties", :class => Hash, :optional => true)
+        job_properties = safe_property(@job_spec, "properties", :class => Hash, :optional => true, :default => {})
 
-        @job.all_properties = Bosh::Common::DeepCopy.copy(@deployment.properties)
-
-        if job_properties
-          @job.all_properties.recursive_merge!(job_properties)
-        end
+        @job.all_properties = @deployment.properties.recursive_merge(job_properties)
 
         mappings = safe_property(@job_spec, "property_mappings", :class => Hash, :default => {})
 

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

@@ -148,6 +148,10 @@ module Bosh::Director
         @jobs_name_index[name]
       end
 
+      def reset_jobs
+        @jobs = []
+      end
+
       def jobs_starting_on_deploy
         @jobs.select(&:starts_on_deploy?)
       end

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

@@ -1,6 +1,16 @@
 module Bosh
   module Director
     module DeploymentPlan
+      class TransientDeployment
+        def initialize(name, manifest, release_versions)
+          @name = name
+          @manifest = manifest
+          @release_versions = release_versions
+          @vms = []
+        end
+        attr_accessor :name, :manifest, :release_versions, :vms
+      end
+
       class PlannerFactory
         def self.create(event_log, logger)
           deployment_manifest_migrator = Bosh::Director::DeploymentPlan::ManifestMigrator.new

data/lib/bosh/director/ext.rb

@@ -17,15 +17,14 @@ class Array
 end
 
 class Hash
-  def recursive_merge!(other)
-    self.merge!(other) do |_, old_value, new_value|
+  def recursive_merge(other)
+    self.merge(other) do |_, old_value, new_value|
       if old_value.class == Hash && new_value.class == Hash
-        old_value.recursive_merge!(new_value)
+        old_value.recursive_merge(new_value)
       else
         new_value
       end
     end
-    self
   end
 
   def to_openstruct

data/lib/bosh/director/jobs/export_release.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'common/version/release_version'
+require 'pp'
 
 module Bosh::Director
   module Jobs
@@ -8,6 +9,10 @@ module Bosh::Director
 
       @queue = :normal
 
+      @stemcell
+      @targeted_deployment
+      @release_version
+
       def self.job_type
         :export_release
       end
@@ -20,24 +25,92 @@ module Bosh::Director
         @stemcell_version = stemcell_version
       end
 
-
       # @return [void]
       def perform
         logger.info("Exporting release: #{@release_name}/#{@release_version} for #{@stemcell_os}/#{@stemcell_version}")
+        validate_and_prepare
+        lock_timeout = 15 * 60 # 15 minutes
 
-        deployment_manager = Bosh::Director::Api::DeploymentManager.new()
-        deployment_manager.find_by_name(@deployment_name)
+        with_deployment_lock(@deployment_name, :timeout => lock_timeout) do
+          with_release_lock(@release_name, :timeout => lock_timeout) do
+            with_stemcell_lock(@stemcell.name, @stemcell.version, :timeout => lock_timeout) do
+
+              planner = create_planner
+              package_compile_step = DeploymentPlan::Steps::PackageCompileStep.new(
+                  planner,
+                  Config.cloud, # CPI
+                  Config.logger,
+                  Config.event_log,
+                  self
+              )
+              package_compile_step.perform
+            end
+          end
+        end
+      end
+
+      def validate_and_prepare
+        stemcell_manager = Bosh::Director::Api::StemcellManager.new
+        @stemcell = stemcell_manager.find_by_os_and_version(@stemcell_os, @stemcell_version)
+
+        logger.info "Will compile with stemcell: #{@stemcell.desc}"
+
+        deployment_manager = Bosh::Director::Api::DeploymentManager.new
+        @targeted_deployment = deployment_manager.find_by_name(@deployment_name)
 
         release_manager = Bosh::Director::Api::ReleaseManager.new
         release = release_manager.find_by_name(@release_name)
-        release_manager.find_version(release, @release_version)
+        @release_version = release_manager.find_version(release, @release_version)
+      end
 
-        stemcell_manager = Bosh::Director::Api::StemcellManager.new
-        stemcell = stemcell_manager.find_by_os_and_version(@stemcell_os, @stemcell_version)
+      def create_planner
+        modified_deployment_manifest = Psych.load(@targeted_deployment.manifest)
+        cloud_config_model = @targeted_deployment.cloud_config
+        network_name = cloud_config_model.manifest['networks'][0]['name']
+
+        fake_resource_pool_manifest = {
+            "name" => "just_for_compiling",
+            "network" => network_name,
+            "stemcell" => { "name" => @stemcell.name, "version" => @stemcell.version }
+        }
+
+        planner_factory = DeploymentPlan::PlannerFactory.create(Config.event_log, Config.logger)
+        planner = planner_factory.planner_without_vm_binding(
+            modified_deployment_manifest,
+            cloud_config_model,
+            {}
+        )
+
+        resource_pool = DeploymentPlan::ResourcePool.new(planner, fake_resource_pool_manifest, Config.logger)
+        planner.add_resource_pool(resource_pool)
+        planner.reset_jobs
 
-        logger.info "Will compile with stemcell: #{stemcell.desc}"
+        fake_job = create_fake_job(planner, fake_resource_pool_manifest, network_name)
+        planner.add_job(fake_job)
 
+        planner
       end
+
+      def create_fake_job(planner, fake_resource_pool_manifest, network_name)
+        fake_job_spec_for_compiling = {
+            "name" => "dummy-job-for-compilation",
+            "release" => @release_name,
+            "instances" => 1,
+            "resource_pool" => fake_resource_pool_manifest['name'],
+            "templates" => @release_version.templates.map do |template|
+              { "name" => template.name, "release" => @release_name }
+            end,
+            "networks" => [ "name" => network_name ],
+        }
+
+        fake_job = DeploymentPlan::Job.parse(planner, fake_job_spec_for_compiling, Config.event_log, Config.logger)
+        @release_version.packages.each { |package| fake_job.packages[package.name] = package }
+        fake_job.resource_pool.stemcell.bind_model
+        fake_job.release.bind_model
+        fake_job.templates.each { |template| template.bind_models }
+        fake_job
+      end
+
     end
   end
 end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3012.0'
+    VERSION = '1.3016.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3012.0
+  version: 1.3016.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-14 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.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3012.0
+        version: 1.3016.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.7.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.7.10
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  8d43aa
+  10557b
 email: support@cloudfoundry.com
 executables:
 - bosh-director