bosh-director 1.2131.0 → 1.2168.0

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

@@ -0,0 +1,125 @@
+require 'common/deep_copy'
+
+module Bosh::Director
+  module DeploymentPlan
+    class DeploymentSpecParser
+      include DnsHelper
+      include ValidationHelper
+
+      def initialize(event_log)
+        @event_log = event_log
+      end
+
+      # @param [Hash] manifest Raw deployment manifest
+      # @return [DeploymentPlan::Planner] Deployment as build from deployment_spec
+      def parse(manifest, options = {})
+        @manifest = manifest
+
+        @job_states = safe_property(options, 'job_states',
+          :class => Hash, :default => {})
+
+        @deployment = Planner.new(parse_name, options)
+
+        parse_properties
+        parse_releases
+        parse_networks
+        parse_compilation
+        parse_update
+        parse_resource_pools
+        parse_jobs
+
+        @deployment
+      end
+
+      private
+
+      def parse_name
+        safe_property(@manifest, 'name', :class => String)
+      end
+
+      def parse_properties
+        @deployment.properties = safe_property(@manifest, 'properties',
+          :class => Hash, :default => {})
+      end
+
+      def parse_releases
+        release_specs = []
+
+        if @manifest.has_key?('release')
+          if @manifest.has_key?('releases')
+            raise DeploymentAmbiguousReleaseSpec,
+              "Deployment manifest contains both 'release' and 'releases' " +
+                'sections, please use one of the two.'
+          end
+          release_specs << @manifest['release']
+        else
+          safe_property(@manifest, 'releases', :class => Array).each do |release|
+            release_specs << release
+          end
+        end
+
+        release_specs.each do |release_spec|
+          @deployment.add_release(ReleaseVersion.new(@deployment, release_spec))
+        end
+      end
+
+      def parse_networks
+        networks = safe_property(@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(@manifest, 'compilation', :class => Hash)
+        @deployment.compilation = CompilationConfig.new(@deployment, compilation_spec)
+      end
+
+      def parse_update
+        update_spec = safe_property(@manifest, 'update', :class => Hash)
+        @deployment.update = UpdateConfig.new(update_spec)
+      end
+
+      def parse_resource_pools
+        resource_pools = safe_property(@manifest, 'resource_pools', :class => Array)
+        resource_pools.each do |rp_spec|
+          @deployment.add_resource_pool(ResourcePool.new(@deployment, rp_spec))
+        end
+
+        # Uncomment when integration test fixed
+        # raise "No resource pools specified." if @resource_pools.empty?
+      end
+
+      def parse_jobs
+        jobs = safe_property(@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
+
+          @deployment.add_job(Job.parse(@deployment, job_spec, @event_log))
+        end
+      end
+    end
+  end
+end

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

@@ -141,7 +141,7 @@ module Bosh::Director
       ##
       # Take any existing valid network reservations
       #
-      # @param [Hash<String, NetworkReservation] reservations
+      # @param [Hash<String, NetworkReservation>] reservations
       # @return [void]
       def take_network_reservations(reservations)
         reservations.each do |name, provided_reservation|

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

@@ -31,7 +31,7 @@ module Bosh::Director
       #   be run in
       attr_accessor :resource_pool
 
-      # @return [DeploymentPlan::Network Job default network
+      # @return [DeploymentPlan::Network] Job default network
       attr_accessor :default_network
 
       # @return [Array<DeploymentPlan::Template] Templates included into the job
@@ -66,12 +66,13 @@ module Bosh::Director
 
       attr_accessor :all_properties
 
-      # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
+      # @param [Bosh::Director::DeploymentPlan::Planner]
+      #   deployment Deployment plan
       # @param [Hash] job_spec Raw job spec from the deployment manifest
       # @return [Bosh::Director::DeploymentPlan::Job]
       def self.parse(deployment, job_spec, event_log)
-        job_parser = JobSpecParser.new(deployment, event_log)
-        job_parser.parse(job_spec)
+        parser = JobSpecParser.new(deployment, event_log)
+        parser.parse(job_spec)
       end
 
       # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan

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

@@ -67,7 +67,7 @@ module Bosh::Director
         if template_names
           if template_names.is_a?(Array)
             @event_log.warn_deprecated(
-              "Please use `templates' when specifying multiple templates for a job. "\
+              "Please use `templates' when specifying multiple templates for a job. " +
               "`template' for multiple templates will soon be unsupported."
             )
           end

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

@@ -1,3 +1,5 @@
+require 'bosh/director/deployment_plan/deployment_spec_parser'
+
 module Bosh::Director
   # Encapsulates essential director data structures retrieved
   # from the deployment manifest and the running environment.
@@ -8,66 +10,89 @@ module Bosh::Director
 
       # @return [String] Deployment name
       attr_reader :name
+
       # @return [String] Deployment canonical name (for DNS)
       attr_reader :canonical_name
+
       # @return [Models::Deployment] Deployment DB model
       attr_reader :model
 
       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
+
+      # @return [Array<Bosh::Director::DeploymentPlan::Job>]
+      #   All jobs in the deployment
+      attr_reader :jobs
+
       attr_accessor :unneeded_instances
       attr_accessor :unneeded_vms
       attr_accessor :dns_domain
 
-      attr_reader :jobs
       attr_reader :job_rename
+
+      # @return [Boolean] Indicates whether VMs should be recreated
       attr_reader :recreate
 
-      def initialize(manifest, options = {})
-        @manifest = manifest
-        @recreate = !!options['recreate']
-        @job_states = safe_property(options, 'job_states',
-                                    :class => Hash, :default => {})
+      # @param [Hash] manifest Raw deployment manifest
+      # @param [Bosh::Director::EventLog::Log]
+      #   event_log Event log for recording deprecations
+      # @param [Hash] options Additional options for deployment
+      #   (e.g. job_states, job_rename)
+      # @return [Bosh::Director::DeploymentPlan::Planner]
+      def self.parse(manifest, event_log, options)
+        parser = DeploymentSpecParser.new(event_log)
+        parser.parse(manifest, options)
+      end
+
+      def initialize(name, options = {})
+        raise ArgumentError, 'name must not be nil' unless name
+        @name = name
+        @model = nil
+
+        @properties = {}
+        @releases = {}
+        @networks = {}
+        @networks_canonical_name_index = Set.new
+
+        @resource_pools = {}
+
+        @jobs = []
+        @jobs_name_index = {}
+        @jobs_canonical_name_index = Set.new
 
-        @job_rename = safe_property(options, 'job_rename',
-                                    :class => Hash, :default => {})
         @unneeded_vms = []
         @unneeded_instances = []
         @dns_domain = nil
 
-        @name = nil
-        @canonical_name = nil
-        @model = nil
+        @job_rename = safe_property(options, 'job_rename',
+          :class => Hash, :default => {})
+
+        @recreate = !!options['recreate']
       end
 
-      def parse(event_log)
-        parse_name
-        parse_properties
-        parse_releases
-        parse_networks
-        parse_compilation
-        parse_update
-        parse_resource_pools
-        parse_jobs(event_log)
+      def canonical_name
+        canonical(@name)
       end
 
       # Looks up deployment model in DB or creates one if needed
       # @return [void]
       def bind_model
-        if @name.nil? || @canonical_name.nil?
-          raise DirectorError,
-                'Unable to bind model, name and/or canonical name unknown'
-        end
-
         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
+              if canonical(other.name) == canonical_name
                 raise DeploymentCanonicalNameTaken,
                       "Invalid deployment name `#{@name}', " +
                         'canonical name already taken'
@@ -75,6 +100,7 @@ module Bosh::Director
             end
             deployment = Models::Deployment.create(attrs)
           end
+
           @model = deployment
         end
       end
@@ -88,11 +114,17 @@ module Bosh::Director
         @model.vms
       end
 
-      # Returns a named job
-      # @param [String] name Job name
-      # @return [Bosh::Director::DeploymentPlan::Job] Job
-      def job(name)
-        @jobs_name_index[name]
+      # 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
@@ -108,6 +140,16 @@ module Bosh::Director
         @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
@@ -121,6 +163,16 @@ module Bosh::Director
         @resource_pools[name]
       end
 
+      # Adds a release by name
+      # @param [Bosh::Director::DeploymentPlan::ReleaseVersion] release
+      def add_release(release)
+        if @releases.has_key?(release.name)
+          raise DeploymentDuplicateReleaseName,
+            "Duplicate release name `#{release.name}'"
+        end
+        @releases[release.name] = release
+      end
+
       # Returns all releases in a deployment plan
       # @return [Array<Bosh::Director::DeploymentPlan::ReleaseVersion>]
       def releases
@@ -135,7 +187,6 @@ module Bosh::Director
 
       # Adds a VM to deletion queue
       # @param [Bosh::Director::Models::Vm] vm VM DB model
-      #
       def delete_vm(vm)
         @unneeded_vms << vm
       end
@@ -150,138 +201,34 @@ module Bosh::Director
         end
       end
 
-      def rename_in_progress?
-        @job_rename['old_name'] && @job_rename['new_name']
-      end
-
-      def parse_name
-        @name = safe_property(@manifest, 'name', :class => String)
-        @canonical_name = canonical(@name)
-      end
-
-      def parse_properties
-        @properties = safe_property(@manifest, 'properties',
-                                    :class => Hash, :default => {})
-      end
-
-      def parse_releases
-        release_specs = []
-
-        if @manifest.has_key?('release')
-          if @manifest.has_key?('releases')
-            raise DeploymentAmbiguousReleaseSpec,
-                  "Deployment manifest contains both 'release' and 'releases' " +
-                    'sections, please use one of the two.'
-          end
-          release_specs << @manifest['release']
-        else
-          safe_property(@manifest, 'releases', :class => Array).each do |release|
-            release_specs << release
-          end
-        end
-
-        @releases = {}
-        release_specs.each do |release_spec|
-          release = ReleaseVersion.new(self, release_spec)
-          if @releases.has_key?(release.name)
-            raise DeploymentDuplicateReleaseName,
-                  "Duplicate release name `#{release.name}'"
-          end
-          @releases[release.name] = release
-        end
-      end
-
-      def parse_resource_pools
-        @resource_pools = {}
-        resource_pools = safe_property(@manifest, 'resource_pools',
-                                       :class => Array)
-        resource_pools.each do |spec|
-          resource_pool = ResourcePool.new(self, spec)
-          if @resource_pools[resource_pool.name]
-            raise DeploymentDuplicateResourcePoolName,
-                  "Duplicate resource pool name `#{resource_pool.name}'"
-          end
-          @resource_pools[resource_pool.name] = resource_pool
+      # Adds a job by name
+      # @param [Bosh::Director::DeploymentPlan::Job] job
+      def add_job(job)
+        if rename_in_progress? && @job_rename['old_name'] == job.name
+          raise DeploymentRenamedJobNameStillUsed,
+            "Renamed job `#{job.name}' is still referenced in " +
+              'deployment manifest'
         end
 
-        # Uncomment when integration test fixed
-        # raise "No resource pools specified." if @resource_pools.empty?
-      end
-
-      def parse_jobs(event_log)
-        @jobs = []
-        @jobs_name_index = {}
-        @jobs_canonical_name_index = Set.new
-
-        jobs = safe_property(@manifest, 'jobs', :class => Array, :default => [])
-
-        jobs.each do |job|
-          state_overrides = @job_states[job['name']]
-
-          if state_overrides
-            job.recursive_merge!(state_overrides)
-          end
-
-          if rename_in_progress? && @job_rename['old_name'] == job['name']
-            raise DeploymentRenamedJobNameStillUsed,
-                  "Renamed job `#{job['name']}' is still referenced in " +
-                    'deployment manifest'
-          end
-
-          job = Job.parse(self, job, event_log)
-
-          if @jobs_canonical_name_index.include?(job.canonical_name)
-            raise DeploymentCanonicalJobNameTaken,
-                  "Invalid job name `#{job.name}', canonical name already taken"
-          end
-
-          @jobs << job
-          @jobs_name_index[job.name] = job
-          @jobs_canonical_name_index << job.canonical_name
-        end
-      end
-
-      def parse_networks
-        @networks = {}
-        @networks_canonical_name_index = Set.new
-        networks = safe_property(@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(self, network_spec)
-            when 'dynamic'
-              network = DynamicNetwork.new(self, network_spec)
-            when 'vip'
-              network = VipNetwork.new(self, network_spec)
-            else
-              raise DeploymentInvalidNetworkType,
-                    "Invalid network type `#{type}'"
-          end
-
-          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
+        if @jobs_canonical_name_index.include?(job.canonical_name)
+          raise DeploymentCanonicalJobNameTaken,
+            "Invalid job name `#{job.name}', canonical name already taken"
         end
 
-        if @networks.empty?
-          raise DeploymentNoNetworks, 'No networks specified'
-        end
+        @jobs << job
+        @jobs_name_index[job.name] = job
+        @jobs_canonical_name_index << job.canonical_name
       end
 
-      def parse_update
-        @update = UpdateConfig.new(
-          safe_property(@manifest, 'update', :class => Hash))
+      # Returns a named job
+      # @param [String] name Job name
+      # @return [Bosh::Director::DeploymentPlan::Job] Job
+      def job(name)
+        @jobs_name_index[name]
       end
 
-      def parse_compilation
-        @compilation = CompilationConfig.new(self, safe_property(
-          @manifest, 'compilation', :class => Hash))
+      def rename_in_progress?
+        @job_rename['old_name'] && @job_rename['new_name']
       end
     end
   end

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

@@ -27,8 +27,7 @@ module Bosh::Director
         }
 
         manifest_as_hash = Psych.load(@manifest)
-        @deployment_plan = DeploymentPlan::Planner.new(manifest_as_hash, plan_options)
-        @deployment_plan.parse(event_log)
+        @deployment_plan = DeploymentPlan::Planner.parse(manifest_as_hash, event_log, plan_options)
         logger.info('Created deployment plan')
 
         resource_pools = @deployment_plan.resource_pools

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2131.0'
+    VERSION = '1.2168.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2131.0
+  version: 1.2168.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-11 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.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2131.0
+        version: 1.2168.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -493,7 +493,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  bee75e'
+  542f8e'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -601,6 +601,7 @@ files:
 - lib/bosh/director/deployment_plan/assembler.rb
 - lib/bosh/director/deployment_plan/compilation_config.rb
 - lib/bosh/director/deployment_plan/compiled_package.rb
+- lib/bosh/director/deployment_plan/deployment_spec_parser.rb
 - lib/bosh/director/deployment_plan/dynamic_network.rb
 - lib/bosh/director/deployment_plan/idle_vm.rb
 - lib/bosh/director/deployment_plan/instance.rb
@@ -740,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 470950328678415738
+      hash: -4485791993473408680
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23