bosh-director 1.2957.0 → 1.2962.0

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

@@ -0,0 +1,53 @@
+module Bosh
+  module Director
+    module DeploymentPlan
+      class ManifestMigrator
+        def migrate(manifest_hash, cloud_config)
+          migrate_releases(manifest_hash)
+
+          if cloud_config.nil?
+            cloud_manifest = cloud_manifest_from_deployment_manifest(manifest_hash)
+          else
+            verify_deployment_without_cloud_config(manifest_hash)
+            cloud_manifest = cloud_config.manifest
+          end
+
+          [manifest_hash, cloud_manifest]
+        end
+
+        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 migrate_releases(manifest_hash)
+          if manifest_hash.has_key?('release')
+            raise(
+              Bosh::Director::DeploymentAmbiguousReleaseSpec,
+              "Deployment manifest contains both 'release' and 'releases' sections, please use one of the two."
+            ) if manifest_hash.has_key?('releases')
+
+            legacy_release = manifest_hash.delete('release')
+            manifest_hash['releases'] = [legacy_release].compact
+          end
+        end
+
+        def verify_deployment_without_cloud_config(manifest_hash)
+          deployment_cloud_properties = manifest_hash.keys & CLOUD_MANIFEST_KEYS
+          if deployment_cloud_properties.any?
+            raise(
+              Bosh::Director::DeploymentInvalidProperty,
+              "Deployment manifest should not contain cloud config properties: #{deployment_cloud_properties}"
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -134,4 +134,4 @@ module Bosh::Director
       end
     end
   end
-end
+end

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

@@ -43,7 +43,7 @@ module Bosh::Director
         network_id = @range.network(:Objectify => true)
         broadcast = @range.broadcast(:Objectify => true)
 
-        gateway_property = safe_property(subnet_spec, "gateway", :class => String)
+        gateway_property = safe_property(subnet_spec, "gateway", class: String)
         if gateway_property
           @gateway = NetAddr::CIDR.create(gateway_property)
           unless @gateway.size == 1
@@ -62,8 +62,7 @@ module Bosh::Director
 
         @dns = dns_servers(@network.name, subnet_spec)
 
-        @cloud_properties = safe_property(subnet_spec, "cloud_properties",
-                                          :class => Hash)
+        @cloud_properties = safe_property(subnet_spec, "cloud_properties", class: Hash, default: {})
 
         @available_dynamic_ips = Set.new
         @available_static_ips = Set.new
@@ -163,4 +162,4 @@ module Bosh::Director
 
     end
   end
-end
+end

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

@@ -8,8 +8,8 @@ module Bosh::Director
         WARNING = 4
       end
 
-      def initialize(planner, nats_rpc, logger)
-        @planner = planner
+      def initialize(name, nats_rpc, logger)
+        @name = name
         @logger = logger
         @nats_rpc = nats_rpc
       end
@@ -19,7 +19,7 @@ module Bosh::Director
           'id' => SecureRandom.uuid,
           'severity' => Severity::WARNING,
           'title' => 'director - begin update deployment',
-          'summary' => "Begin update deployment for #{@planner.canonical_name} against Director #{Bosh::Director::Config.uuid}",
+          'summary' => "Begin update deployment for '#{@name}' against Director '#{Bosh::Director::Config.uuid}'",
           'created_at' => Time.now.to_i
         }
 
@@ -32,7 +32,7 @@ module Bosh::Director
           'id' => SecureRandom.uuid,
           'severity' => Severity::WARNING,
           'title' => 'director - finish update deployment',
-          'summary' => "Finish update deployment for #{@planner.canonical_name} against Director #{Bosh::Director::Config.uuid}",
+          'summary' => "Finish update deployment for '#{@name}' against Director '#{Bosh::Director::Config.uuid}'",
           'created_at' => Time.now.to_i
         }
 
@@ -45,7 +45,7 @@ module Bosh::Director
           'id' => SecureRandom.uuid,
           'severity' => Severity::ERROR,
           'title' => 'director - error during update deployment',
-          'summary' => "Error during update deployment for #{@planner.canonical_name} against Director #{Bosh::Director::Config.uuid}: #{exception.inspect}",
+          'summary' => "Error during update deployment for '#{@name}' against Director '#{Bosh::Director::Config.uuid}': #{exception.inspect}",
           'created_at' => Time.now.to_i
         }
 

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

@@ -1,5 +1,7 @@
 require 'bosh/director/deployment_plan/deployment_spec_parser'
+require 'bosh/director/deployment_plan/cloud_manifest_parser'
 require 'bosh/director/deployment_plan/disk_pool'
+require 'forwardable'
 
 module Bosh::Director
   # Encapsulates essential director data structures retrieved
@@ -9,6 +11,7 @@ module Bosh::Director
       include LockHelper
       include DnsHelper
       include ValidationHelper
+      extend Forwardable
 
       # @return [String] Deployment name
       attr_reader :name
@@ -21,10 +24,6 @@ module Bosh::Director
 
       attr_accessor :properties
 
-      # @return [Bosh::Director::DeploymentPlan::CompilationConfig]
-      #   Resource pool and other configuration for compilation workers
-      attr_accessor :compilation
-
       # @return [Bosh::Director::DeploymentPlan::UpdateConfig]
       #   Default job update configuration
       attr_accessor :update
@@ -46,33 +45,15 @@ module Bosh::Director
       # @return [Boolean] Indicates whether VMs should be recreated
       attr_reader :recreate
 
-      # @param [Hash] manifest Raw deployment manifest
-      # @param [Hash] options Additional options for deployment
-      #   (e.g. job_states, job_rename)
-      # @param [Bosh::Director::EventLog::Log]
-      #   event_log Event log for recording deprecations
-      # @param [Logger]
-      #   logger Log for director logging
-      # @return [Bosh::Director::DeploymentPlan::Planner]
-      def self.parse(manifest, cloud_config, options, event_log, logger)
-        parser = DeploymentSpecParser.new(event_log, logger)
-        parser.parse(manifest, cloud_config, options)
-      end
+      def initialize(attrs, manifest_text, cloud_config, deployment_model, options = {})
+        @name = attrs.fetch(:name)
+        @properties = attrs.fetch(:properties)
+        @releases = {}
 
-      def initialize(name, manifest_text, cloud_config, options = {})
-        raise ArgumentError, 'name must not be nil' unless name
-        @name = name
         @manifest_text = manifest_text
         @cloud_config = cloud_config
-
-        @model = nil
-        @properties = {}
-        @releases = {}
-        @networks = {}
-        @networks_canonical_name_index = Set.new
-
-        @resource_pools = {}
-        @disk_pools = {}
+        @cloud_planner = CloudPlanner.new(cloud_config)
+        @model = deployment_model
 
         @jobs = []
         @jobs_name_index = {}
@@ -88,110 +69,21 @@ module Bosh::Director
         @recreate = !!options['recreate']
       end
 
+      def_delegators :@cloud_planner, :add_network, :networks, :network,
+        :add_resource_pool, :resource_pools, :resource_pool,
+        :add_disk_pool, :disk_pools, :disk_pool,
+        :compilation, :compilation=
+
       def canonical_name
         canonical(@name)
       end
 
-      # Looks up deployment model in DB or creates one if needed
-      # @return [void]
-      def bind_model
-        attrs = {:name => @name}
-
-        Models::Deployment.db.transaction do
-          deployment = Models::Deployment.find(attrs)
-
-          # Canonical uniqueness is not enforced in the DB
-          if deployment.nil?
-            Models::Deployment.each do |other|
-              if canonical(other.name) == canonical_name
-                raise DeploymentCanonicalNameTaken,
-                      "Invalid deployment name `#{@name}', " +
-                        'canonical name already taken'
-              end
-            end
-            deployment = Models::Deployment.create(attrs)
-          end
-
-          @model = deployment
-        end
-      end
-
       # Returns a list of VMs in the deployment (according to DB)
       # @return [Array<Models::Vm>]
       def vms
-        if @model.nil?
-          raise DirectorError, "Can't get VMs list, deployment model is unbound"
-        end
         @model.vms
       end
 
-      # Adds a network by name
-      # @param [Bosh::Director::DeploymentPlan::Network] network
-      def add_network(network)
-        if @networks_canonical_name_index.include?(network.canonical_name)
-          raise DeploymentCanonicalNetworkNameTaken,
-            "Invalid network name `#{network.name}', " +
-              'canonical name already taken'
-        end
-
-        @networks[network.name] = network
-        @networks_canonical_name_index << network.canonical_name
-      end
-
-      # Returns all networks in a deployment plan
-      # @return [Array<Bosh::Director::DeploymentPlan::Network>]
-      def networks
-        @networks.values
-      end
-
-      # Returns a named network
-      # @param [String] name
-      # @return [Bosh::Director::DeploymentPlan::Network]
-      def network(name)
-        @networks[name]
-      end
-
-      # Adds a resource pool by name
-      # @param [Bosh::Director::DeploymentPlan::ResourcePool] resource_pool
-      def add_resource_pool(resource_pool)
-        if @resource_pools[resource_pool.name]
-          raise DeploymentDuplicateResourcePoolName,
-            "Duplicate resource pool name `#{resource_pool.name}'"
-        end
-        @resource_pools[resource_pool.name] = resource_pool
-      end
-
-      # Returns all resource pools in a deployment plan
-      # @return [Array<Bosh::Director::DeploymentPlan::ResourcePool>]
-      def resource_pools
-        @resource_pools.values
-      end
-
-      # Returns a named resource pool spec
-      # @param [String] name Resource pool name
-      # @return [Bosh::Director::DeploymentPlan::ResourcePool]
-      def resource_pool(name)
-        @resource_pools[name]
-      end
-
-      # Adds a disk pool by name
-      # @param [Bosh::Director::DeploymentPlan::DiskPool] disk_pool
-      def add_disk_pool(disk_pool)
-        if @disk_pools[disk_pool.name]
-          raise DeploymentDuplicateDiskPoolName,
-            "Duplicate disk pool name `#{disk_pool.name}'"
-        end
-        @disk_pools[disk_pool.name] = disk_pool
-      end
-
-      def disk_pools
-        @disk_pools.values
-      end
-
-      def disk_pool(name)
-        @disk_pools[name]
-      end
-
       # Adds a release by name
       # @param [Bosh::Director::DeploymentPlan::ReleaseVersion] release
       def add_release(release)
@@ -287,5 +179,87 @@ module Bosh::Director
         end
       end
     end
+
+    class CloudPlanner
+      # @return [Bosh::Director::DeploymentPlan::CompilationConfig]
+      #   Resource pool and other configuration for compilation workers
+      attr_accessor :compilation
+
+      def initialize(cloud_config)
+        @cloud_config = cloud_config
+        @networks_canonical_name_index = Set.new
+
+        @networks = {}
+        @resource_pools = {}
+        @disk_pools = {}
+      end
+
+      # Adds a resource pool by name
+      # @param [Bosh::Director::DeploymentPlan::ResourcePool] resource_pool
+      def add_resource_pool(resource_pool)
+        if @resource_pools[resource_pool.name]
+          raise DeploymentDuplicateResourcePoolName,
+            "Duplicate resource pool name `#{resource_pool.name}'"
+        end
+        @resource_pools[resource_pool.name] = resource_pool
+      end
+
+      # Returns all resource pools in a deployment plan
+      # @return [Array<Bosh::Director::DeploymentPlan::ResourcePool>]
+      def resource_pools
+        @resource_pools.values
+      end
+
+      # Returns a named resource pool spec
+      # @param [String] name Resource pool name
+      # @return [Bosh::Director::DeploymentPlan::ResourcePool]
+      def resource_pool(name)
+        @resource_pools[name]
+      end
+
+      # Adds a network by name
+      # @param [Bosh::Director::DeploymentPlan::Network] network
+      def add_network(network)
+        if @networks_canonical_name_index.include?(network.canonical_name)
+          raise DeploymentCanonicalNetworkNameTaken,
+            "Invalid network name `#{network.name}', " +
+              'canonical name already taken'
+        end
+
+        @networks[network.name] = network
+        @networks_canonical_name_index << network.canonical_name
+      end
+
+      # Returns all networks in a deployment plan
+      # @return [Array<Bosh::Director::DeploymentPlan::Network>]
+      def networks
+        @networks.values
+      end
+
+      # Returns a named network
+      # @param [String] name
+      # @return [Bosh::Director::DeploymentPlan::Network]
+      def network(name)
+        @networks[name]
+      end
+
+      # Adds a disk pool by name
+      # @param [Bosh::Director::DeploymentPlan::DiskPool] disk_pool
+      def add_disk_pool(disk_pool)
+        if @disk_pools[disk_pool.name]
+          raise DeploymentDuplicateDiskPoolName,
+            "Duplicate disk pool name `#{disk_pool.name}'"
+        end
+        @disk_pools[disk_pool.name] = disk_pool
+      end
+
+      def disk_pools
+        @disk_pools.values
+      end
+
+      def disk_pool(name)
+        @disk_pools[name]
+      end
+    end
   end
 end

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

@@ -0,0 +1,148 @@
+module Bosh
+  module Director
+    module DeploymentPlan
+      class PlannerFactory
+        def self.create(event_log, logger)
+          deployment_manifest_migrator = Bosh::Director::DeploymentPlan::ManifestMigrator.new
+          canonicalizer = Class.new { include Bosh::Director::DnsHelper }.new
+          deployment_repo = Bosh::Director::DeploymentPlan::DeploymentRepo.new(canonicalizer)
+
+          new(
+            canonicalizer,
+            deployment_manifest_migrator,
+            deployment_repo,
+            event_log,
+            logger
+          )
+        end
+
+        def initialize(canonicalizer, deployment_manifest_migrator, deployment_repo, event_log, logger)
+          @canonicalizer = canonicalizer
+          @deployment_manifest_migrator = deployment_manifest_migrator
+          @deployment_repo = deployment_repo
+          @event_log = event_log
+          @logger = logger
+        end
+
+        def planner(manifest_hash, cloud_config, plan_options)
+          planner = planner_without_vm_binding(manifest_hash, cloud_config, plan_options)
+          bind_vms(planner)
+        end
+
+        def planner_without_vm_binding(manifest_hash, cloud_config, options)
+          deployment_manifest, cloud_manifest = @deployment_manifest_migrator.migrate(manifest_hash, cloud_config)
+          name = deployment_manifest['name']
+
+          deployment_model = nil
+          @event_log.track('Binding deployment') do
+            @logger.info('Binding deployment')
+            deployment_model = @deployment_repo.find_or_create_by_name(name)
+          end
+
+          attrs = {
+            name: name,
+            properties: deployment_manifest.fetch('properties', {}),
+          }
+          assemble_without_vm_binding(attrs, deployment_manifest, cloud_manifest, deployment_model, cloud_config, options)
+        end
+
+        private
+
+        def deployment_name(manifest_hash)
+          name = manifest_hash['name']
+          @canonicalizer.canonical(name)
+        end
+
+        def assemble_without_vm_binding(attrs, deployment_manifest, cloud_manifest, deployment_model, cloud_config, options)
+          plan_options = {
+            'recreate' => !!options['recreate'],
+            'job_states' => options['job_states'] || {},
+            'job_rename' => options['job_rename'] || {}
+          }
+          @logger.info('Creating deployment plan')
+          @logger.info("Deployment plan options: #{plan_options.pretty_inspect}")
+
+          deployment = Planner.new(attrs, deployment_manifest, cloud_config, deployment_model, plan_options)
+          deployment = CloudManifestParser.new(deployment, @logger).parse(cloud_manifest)
+          DeploymentSpecParser.new(deployment, @event_log, @logger).parse(deployment_manifest, plan_options)
+        end
+
+        def bind_vms(planner)
+          stemcell_manager = Api::StemcellManager.new
+          cloud = Config.cloud
+          blobstore = nil # not used for this assembler purposes
+          director_job = nil
+          assembler = DeploymentPlan::Assembler.new(
+            planner,
+            stemcell_manager,
+            cloud,
+            blobstore,
+            @logger,
+            @event_log
+          )
+          @logger.info('Created deployment plan')
+
+          run_prepare_step(assembler)
+
+          DeploymentPlan::Steps::PackageCompileStep.new(
+            planner,
+            cloud,
+            @logger,
+            @event_log,
+            director_job
+          ).perform
+          @event_log.begin_stage('Preparing DNS', 1)
+          track_and_log('Binding DNS') do
+            assembler.bind_dns
+          end
+
+          planner
+        end
+
+        def run_prepare_step(assembler)
+          @event_log.begin_stage('Preparing deployment', 9)
+          @logger.info('Preparing deployment')
+
+          track_and_log('Binding releases') do
+            assembler.bind_releases
+          end
+
+          track_and_log('Binding existing deployment') do
+            assembler.bind_existing_deployment
+          end
+
+          track_and_log('Binding resource pools') do
+            assembler.bind_resource_pools
+          end
+
+          track_and_log('Binding stemcells') do
+            assembler.bind_stemcells
+          end
+
+          track_and_log('Binding templates') do
+            assembler.bind_templates
+          end
+
+          track_and_log('Binding properties') do
+            assembler.bind_properties
+          end
+
+          track_and_log('Binding unallocated VMs') do
+            assembler.bind_unallocated_vms
+          end
+
+          track_and_log('Binding instance networks') do
+            assembler.bind_instance_networks
+          end
+        end
+
+        def track_and_log(message)
+          @event_log.track(message) do
+            @logger.info(message)
+            yield
+          end
+        end
+      end
+    end
+  end
+end