bosh-director 1.2957.0 → 1.2962.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d589c307d896df5f326722069aa936fd0c29a1
-  data.tar.gz: 61c89bad235002495be9fe893b80c3e9fee52b21
+  metadata.gz: 4d4f4eade478f6b9d65bf799b7e13648e301cfc3
+  data.tar.gz: fa9bae11220e770e7394620c62b3d947adb17040
 SHA512:
-  metadata.gz: ffc81e49d9766168a5a4bfc12c6a7debaa96cdd8e06d67c9f3ab5438d02cfed245e8e20534a2ccc45a5fd4d3f40055a548aad25e9f208d135956157c45fb1aca
-  data.tar.gz: ea6925e99a98eb92155d4439e1add573424577ca5b906f5dcfd0db98ca74343b4532c9fdd7604cb178051eb952cec9b5cbeff7a89f79a6483584bb67fae49c7a
+  metadata.gz: 371c318920e3d18d0f6692ee3c394846c76ad9eecf9c357968cd87fababb8d77ae8b1b61583505320fa7cac9f47a7392131cd715ef40e8cd0143d234a32e2b95
+  data.tar.gz: 7409d247a48a67c21fa360b5ed0139ead30f536b8bcfb25a7d133c51af1fc1fb93c1dd38736033ace5cbf97619263c80eb45c8b32a2baf850ea98c55fd636fe3

data/lib/bosh/director.rb

@@ -64,7 +64,6 @@ require 'bosh/director/vm_metadata_updater'
 require 'bosh/director/vm_data'
 require 'bosh/director/vm_reuser'
 require 'bosh/director/deployment_plan'
-require 'bosh/director/deployment_plan/assembler'
 require 'bosh/director/errand'
 require 'bosh/director/duration'
 require 'bosh/director/hash_string_vals'

data/lib/bosh/director/api/cloud_config_manager.rb

@@ -6,6 +6,7 @@ module Bosh
           cloud_config = Bosh::Director::Models::CloudConfig.new(
             properties: cloud_config_yaml
           )
+          validate_manifest(cloud_config)
           cloud_config.save
         end
 
@@ -16,6 +17,14 @@ module Bosh
         def latest
           list(1).first
         end
+
+        private
+
+        def validate_manifest(cloud_config)
+          deployment = Bosh::Director::DeploymentPlan::CloudPlanner.new(cloud_config)
+          parser = Bosh::Director::DeploymentPlan::CloudManifestParser.new(deployment, Config.logger)
+          parser.parse(cloud_config.manifest)
+        end
       end
     end
   end

data/lib/bosh/director/api/controllers/deployments_controller.rb

@@ -291,10 +291,7 @@ module Bosh::Director
       end
 
       get '/:deployment_name/errands' do
-        deployment = @deployment_manager.find_by_name(params[:deployment_name])
-
-        manifest = Psych.load(deployment.manifest)
-        deployment_plan = DeploymentPlan::Planner.parse(manifest, deployment.cloud_config, {}, Config.event_log, Config.logger)
+        deployment_plan = load_deployment_plan_without_binding
 
         errands = deployment_plan.jobs.select(&:can_run_as_errand?)
 
@@ -306,6 +303,17 @@ module Bosh::Director
       end
 
       private
+
+      def load_deployment_plan_without_binding
+        deployment_model = @deployment_manager.find_by_name(params[:deployment_name])
+        manifest_hash = Psych.load(deployment_model.manifest)
+        cloud_config_model = deployment_model.cloud_config
+
+        planner_factory = Bosh::Director::DeploymentPlan::PlannerFactory.create(Config.event_log, Config.logger)
+        planner_factory.planner_without_vm_binding(manifest_hash, cloud_config_model, {})
+      end
+
+
       def convert_job_instance_hash(hash)
         hash.reduce([]) do |jobs, kv|
           job, indicies = kv

data/lib/bosh/director/deployment_plan.rb

@@ -24,7 +24,9 @@ require 'bosh/director/deployment_plan/vip_network'
 require 'bosh/director/deployment_plan/planner'
 require 'bosh/director/deployment_plan/dns_binder'
 require 'bosh/director/deployment_plan/notifier'
-require 'bosh/director/deployment_plan/steps/prepare_step'
 require 'bosh/director/deployment_plan/steps/update_step'
 require 'bosh/director/deployment_plan/steps/package_compile_step'
-
+require 'bosh/director/deployment_plan/assembler'
+require 'bosh/director/deployment_plan/planner_factory'
+require 'bosh/director/deployment_plan/manifest_migrator'
+require 'bosh/director/deployment_plan/deployment_repo'

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

@@ -5,19 +5,13 @@ module Bosh::Director
     include LockHelper
     include IpUtil
 
-    def initialize(deployment_plan)
+    def initialize(deployment_plan, stemcell_manager, cloud, blobstore, logger, event_log)
       @deployment_plan = deployment_plan
-      @cloud = Config.cloud
-      @logger = Config.logger
-      @event_log = Config.event_log
-      @stemcell_manager = Api::StemcellManager.new
-      @blobstore = App.instance.blobstores.blobstore
-    end
-
-    # Binds deployment DB record to a plan
-    # @return [void]
-    def bind_deployment
-      @deployment_plan.bind_model
+      @cloud = cloud
+      @logger = logger
+      @event_log = event_log
+      @stemcell_manager = stemcell_manager
+      @blobstore = blobstore
     end
 
     # Binds release DB record(s) to a plan
@@ -318,59 +312,9 @@ module Bosh::Director
       end
     end
 
-    # Calculates configuration checksums for all jobs in this deployment plan
-    # @return [void]
-    def bind_configuration
-      @deployment_plan.jobs_starting_on_deploy.each do |job|
-        JobRenderer.new(job, @blobstore).render_job_instances
-      end
-    end
-
     def bind_dns
       binder = DeploymentPlan::DnsBinder.new(@deployment_plan)
       binder.bind_deployment
     end
-
-    def bind_instance_vms
-      jobs = @deployment_plan.jobs_starting_on_deploy
-      instances = jobs.map(&:instances).flatten
-
-      binder = DeploymentPlan::InstanceVmBinder.new(@event_log)
-      binder.bind_instance_vms(instances)
-    end
-
-    def delete_unneeded_vms
-      unneeded_vms = @deployment_plan.unneeded_vms
-      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, logger: @logger).wrap do |pool|
-        unneeded_vms.each do |vm_model|
-          pool.process do
-            @event_log.track(vm_model.cid) do
-              @logger.info("Delete unneeded VM #{vm_model.cid}")
-              @cloud.delete_vm(vm_model.cid)
-              vm_model.destroy
-            end
-          end
-        end
-      end
-    end
-
-    def delete_unneeded_instances
-      unneeded_instances = @deployment_plan.unneeded_instances
-      if unneeded_instances.empty?
-        @logger.info('No unneeded instances to delete')
-        return
-      end
-
-      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
 end

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

@@ -0,0 +1,77 @@
+require 'common/deep_copy'
+
+module Bosh::Director
+  module DeploymentPlan
+    class CloudManifestParser
+      include ValidationHelper
+
+      def initialize(deployment, logger)
+        @deployment = deployment
+        @logger = logger
+      end
+
+      def parse(cloud_manifest)
+        @cloud_manifest = cloud_manifest
+
+        parse_networks
+        parse_compilation
+        parse_resource_pools
+        parse_disk_pools
+
+        @deployment
+      end
+
+      private
+
+      def parse_networks
+        networks = safe_property(@cloud_manifest, 'networks', :class => Array)
+        networks.each do |network_spec|
+          type = safe_property(network_spec, 'type', :class => String,
+            :default => 'manual')
+
+          case type
+            when 'manual'
+              network = ManualNetwork.new(@deployment, network_spec)
+            when 'dynamic'
+              network = DynamicNetwork.new(@deployment, network_spec)
+            when 'vip'
+              network = VipNetwork.new(@deployment, network_spec)
+            else
+              raise DeploymentInvalidNetworkType,
+                "Invalid network type `#{type}'"
+          end
+
+          @deployment.add_network(network)
+        end
+
+        if @deployment.networks.empty?
+          raise DeploymentNoNetworks, 'No networks specified'
+        end
+      end
+
+      def parse_compilation
+        compilation_spec = safe_property(@cloud_manifest, 'compilation', :class => Hash)
+        @deployment.compilation = CompilationConfig.new(@deployment, compilation_spec)
+      end
+
+      def parse_resource_pools
+        resource_pools = safe_property(@cloud_manifest, 'resource_pools', :class => Array)
+        resource_pools.each do |rp_spec|
+          @deployment.add_resource_pool(ResourcePool.new(@deployment, rp_spec, @logger))
+        end
+
+        if @deployment.resource_pools.empty?
+          raise DeploymentNoResourcePools, 'No resource_pools specified'
+        end
+      end
+
+      def parse_disk_pools
+        disk_pools = safe_property(@cloud_manifest, 'disk_pools', :class => Array, :optional => true)
+        return if disk_pools.nil?
+        disk_pools.each do |dp_spec|
+          @deployment.add_disk_pool(DiskPool.parse(dp_spec))
+        end
+      end
+    end
+  end
+end

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

@@ -30,24 +30,24 @@ module Bosh::Director
       # @param [Hash] compilation_config parsed compilation config YAML section
       def initialize(deployment, compilation_config)
         @deployment = deployment
-        @workers = safe_property(compilation_config, "workers",
-                                 :class => Integer, :min => 1)
-        network_name = safe_property(compilation_config, "network",
-                                     :class => String)
+        @workers = safe_property(compilation_config, "workers", class: Integer, min: 1)
+
+        network_name = safe_property(compilation_config, "network", class: String)
+
         @reuse_compilation_vms = safe_property(compilation_config,
-                                               "reuse_compilation_vms",
-                                               :class => :boolean,
-                                               :optional => true)
+          "reuse_compilation_vms",
+          class: :boolean,
+          optional: true)
+
         @network = deployment.network(network_name)
         if @network.nil?
           raise CompilationConfigUnknownNetwork,
-                "Compilation config references an unknown " +
-                "network `#{network_name}'"
+            "Compilation config references an unknown " +
+              "network `#{network_name}'"
         end
         @cloud_properties = safe_property(
-            compilation_config, "cloud_properties", :class => Hash)
-        @env = safe_property(compilation_config, "env", :class => Hash,
-                             :optional => true, :default => {})
+          compilation_config, "cloud_properties", class: Hash, default: {})
+        @env = safe_property(compilation_config, "env", class: Hash, optional: true, default: {})
       end
     end
   end

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

@@ -0,0 +1,28 @@
+module Bosh
+  module Director
+    module DeploymentPlan
+      class DeploymentRepo
+
+        def initialize(canonicalizer)
+          @canonicalizer = canonicalizer
+        end
+
+        def find_or_create_by_name(name)
+          deployment = Models::Deployment.find(name: name)
+          return deployment if deployment
+
+          canonical_name = @canonicalizer.canonical(name)
+          Models::Deployment.db.transaction do
+            Models::Deployment.each do |other|
+              if @canonicalizer.canonical(other.name) == canonical_name
+                raise DeploymentCanonicalNameTaken,
+                  "Invalid deployment name `#{name}', canonical name already taken (`#{canonical_name}')"
+              end
+            end
+            Models::Deployment.create(name: name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,32 +6,21 @@ module Bosh::Director
       include DnsHelper
       include ValidationHelper
 
-      def initialize(event_log, logger)
+      def initialize(deployment, event_log, logger)
         @event_log = event_log
         @logger = logger
+        @deployment = deployment
       end
 
       # @param [Hash] manifest Raw deployment manifest
       # @return [DeploymentPlan::Planner] Deployment as build from deployment_spec
-      def parse(manifest, cloud_config, options = {})
-        @deployment_manifest = manifest
-        if cloud_config.nil?
-          @cloud_manifest = cloud_manifest_from_deployment_manifest @deployment_manifest 
-        else
-          @cloud_manifest = cloud_config.manifest
-        end
-
+      def parse(deployment_manifest, options = {})
+        @deployment_manifest = deployment_manifest
         @job_states = safe_property(options, 'job_states', :class => Hash, :default => {})
 
-        @deployment = Planner.new(parse_name, manifest, cloud_config, options)
-
         parse_properties
         parse_releases
-        parse_networks
-        parse_compilation
         parse_update
-        parse_resource_pools
-        parse_disk_pools
         parse_jobs
 
         @deployment
@@ -39,15 +28,6 @@ module Bosh::Director
 
       private
 
-      CLOUD_MANIFEST_KEYS = ['resource_pools','compilation','disk_pools','networks']
-      def cloud_manifest_from_deployment_manifest(deployment_manifest)
-        cloud_manifest = {}
-        CLOUD_MANIFEST_KEYS.each do |key|
-          cloud_manifest[key] = deployment_manifest[key] if deployment_manifest.has_key? key
-        end
-        cloud_manifest
-      end
-
       def parse_name
         safe_property(@deployment_manifest, 'name', :class => String)
       end
@@ -74,64 +54,15 @@ module Bosh::Director
         end
 
         release_specs.each do |release_spec|
-          @deployment.add_release(ReleaseVersion.new(@deployment, release_spec))
-        end
-      end
-
-      def parse_networks
-        networks = safe_property(@cloud_manifest, 'networks', :class => Array)
-        networks.each do |network_spec|
-          type = safe_property(network_spec, 'type', :class => String,
-            :default => 'manual')
-
-          case type
-            when 'manual'
-              network = ManualNetwork.new(@deployment, network_spec)
-            when 'dynamic'
-              network = DynamicNetwork.new(@deployment, network_spec)
-            when 'vip'
-              network = VipNetwork.new(@deployment, network_spec)
-            else
-              raise DeploymentInvalidNetworkType,
-                "Invalid network type `#{type}'"
-          end
-
-          @deployment.add_network(network)
-        end
-
-        if @deployment.networks.empty?
-          raise DeploymentNoNetworks, 'No networks specified'
+          @deployment.add_release(ReleaseVersion.new(@deployment.model, release_spec))
         end
       end
 
-      def parse_compilation
-        compilation_spec = safe_property(@cloud_manifest, 'compilation', :class => Hash)
-        @deployment.compilation = CompilationConfig.new(@deployment, compilation_spec)
-      end
-
       def parse_update
         update_spec = safe_property(@deployment_manifest, 'update', :class => Hash)
         @deployment.update = UpdateConfig.new(update_spec)
       end
 
-      def parse_resource_pools
-        resource_pools = safe_property(@cloud_manifest, 'resource_pools', :class => Array)
-        resource_pools.each do |rp_spec|
-          @deployment.add_resource_pool(ResourcePool.new(@deployment, rp_spec, @logger))
-        end
-
-        # Uncomment when integration test fixed
-        # raise "No resource pools specified." if @resource_pools.empty?
-      end
-
-      def parse_disk_pools
-        disk_pools = safe_property(@cloud_manifest, 'disk_pools', :class => Array, :optional => true)
-        return if disk_pools.nil?
-        disk_pools.each do |dp_spec|
-          @deployment.add_disk_pool(DiskPool.parse(dp_spec))
-        end
-      end
-
       def parse_jobs
         jobs = safe_property(@deployment_manifest, 'jobs', :class => Array, :default => [])
         jobs.each do |job_spec|

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

@@ -23,7 +23,7 @@ module Bosh::Director
       def initialize(deployment, network_spec)
         super
         @cloud_properties =
-          safe_property(network_spec, "cloud_properties", :class => Hash)
+          safe_property(network_spec, "cloud_properties", class: Hash, default: {})
 
         @dns = dns_servers(network_spec["name"], network_spec)
       end
@@ -88,4 +88,4 @@ module Bosh::Director
       end
     end
   end
-end
+end