bosh-director 1.1777.0 → 1.1782.0

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

@@ -291,6 +291,10 @@ module Bosh::Director
       @deployment_plan.releases.each do |release|
         release.bind_templates
       end
+
+      @deployment_plan.jobs.each do |job|
+        job.validate_package_names_do_not_collide!
+      end
     end
 
     # Binds properties for all templates in the deployment

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

@@ -203,6 +203,22 @@ module Bosh::Director
         @properties = filter_properties(@all_properties)
       end
 
+      def validate_package_names_do_not_collide!
+        releases_by_package_names = templates.reduce([]) { |memo, t|
+          memo + t.model.package_names.product([t.release])
+        }.reduce({}) { |memo, package_name_and_release_version|
+          package_name = package_name_and_release_version.first
+          release_version = package_name_and_release_version.last
+          memo[package_name] ||= Set.new
+          memo[package_name] << release_version
+          memo
+        }
+
+        if releases_by_package_names.values.detect { |x| x.size > 1 }
+          raise JobPackageCollision, 'Unable to deploy: package name collision in job definitions.'
+        end
+      end
+
       private
 
       # @param [Hash] collection All properties collection

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

@@ -50,25 +50,18 @@ module Bosh::Director
         if release_name.nil?
           if @deployment.releases.size == 1
             @job.release = @deployment.releases.first
-          else
-            raise JobMissingRelease,
-                  "Cannot tell what release job `#{@job.name}' supposed to use, please reference an existing release"
           end
         else
           @job.release = @deployment.release(release_name)
-        end
 
-        if @job.release.nil?
-          raise JobUnknownRelease,
-                "Job `#{@job.name}' references an unknown release `#{release_name}'"
+          if @job.release.nil?
+            raise JobUnknownRelease,
+                  "Job `#{@job.name}' references an unknown release `#{release_name}'"
+          end
         end
       end
 
       def parse_template
-        if @job.release.nil?
-          raise DirectorError, "Cannot parse template before parsing release"
-        end
-
         template_names = safe_property(@job_spec, "template", optional: true)
         if template_names
           if template_names.is_a?(String)
@@ -93,13 +86,20 @@ module Bosh::Director
             template_name = safe_property(template, 'name', class: String)
             release_name = safe_property(template, 'release', class: String, optional: true)
 
-            release = release_name ? @deployment.release(release_name) : @job.release
-            if release
-              @job.templates << release.use_template_named(template_name)
+            release = nil
+            if release_name
+              release = @deployment.release(release_name)
+              unless release
+                raise JobUnknownRelease,
+                      "Template `#{template_name}' (job `#{@job.name}') references an unknown release `#{release_name}'"
+              end
             else
-              raise JobUnknownRelease,
-                    "Template `#{template_name}' (job `#{@job.name}') references an unknown release `#{release_name}'"
+              release = @job.release
+              unless release
+                raise JobMissingRelease, "Cannot tell what release template `#{template_name}' (job `#{@job.name}') is supposed to use, please explicitly specify one"
+              end
             end
+            @job.templates << release.use_template_named(template_name)
           end
         end
       end
@@ -109,11 +109,6 @@ module Bosh::Director
           raise JobInvalidTemplates,
                 "Job `#{@job.name}' templates must not have repeating names."
         end
-
-        if @job.templates.uniq(&:release).size > 1
-          raise JobInvalidTemplates,
-                "Job `#{@job.name}' templates must come from the same release."
-        end
       end
 
       def parse_disk

data/lib/bosh/director/errors.rb

@@ -105,6 +105,7 @@ module Bosh::Director
   JobInvalidPropertySpec = err(80008)
   JobInvalidPropertyMapping = err(80009)
   JobIncompatibleSpecs = err(80010)
+  JobPackageCollision = err(80011)
 
   ResourceError = err(100001)
   ResourceNotFound = err(100002, NOT_FOUND)

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.1777.0'
+    VERSION = '1.1782.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1777.0
+  version: 1.1782.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-16 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.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.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.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !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.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !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.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !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.1777.0
+        version: 1.1782.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1777.0
+        version: 1.1782.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  0308a9'
+  5aedfc'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -713,7 +713,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2902799239834298514
+      hash: 4571235917096416855
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23