bosh-director 1.2579.0 → 1.2583.0

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

@@ -20,13 +20,26 @@ module Bosh::Director
       # @param [Models::Release] release Release model
       # @param [String] version Release version
       # @return [Models::ReleaseVersion] Release version model
-      # @raise [ReleaseVersionNotFound]
+      # @raise [ReleaseVersionInvalid, ReleaseVersionNotFound]
       def find_version(release, version)
         dataset = release.versions_dataset
+
         release_version = dataset.filter(:version => version).first
         if release_version.nil?
-          raise ReleaseVersionNotFound,
-                "Release version `#{release.name}/#{version}' doesn't exist"
+          begin
+            # specified version not found, try formatted version
+            formatted_version = Bosh::Common::VersionNumber.parse(version).to_s
+            unless version == formatted_version
+              # only check db if the formatted version is different
+              release_version = dataset.filter(:version => formatted_version).first
+            end
+            if release_version.nil?
+              raise ReleaseVersionNotFound,
+                    "Release version `#{release.name}/#{version}' doesn't exist"
+            end
+          rescue SemiSemantic::ParseError
+            raise ReleaseVersionInvalid, "Release version invalid: #{version}"
+          end
         end
 
         release_version

data/lib/bosh/director/errors.rb

@@ -70,6 +70,7 @@ module Bosh::Director
   ReleaseInUse = err(30007)
   ReleaseVersionInUse = err(30008)
   ReleaseDeleteFailed = err(30009)
+  ReleaseVersionInvalid = err(30010)
 
   ValidationInvalidType = err(40000)
   ValidationMissingField = err(40001)

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

@@ -158,13 +158,13 @@ module Bosh::Director
         with_release_lock(@name, :timeout => 10) do
           logger.info("Looking up release: #{@name}")
           release = @release_manager.find_by_name(@name)
-          desc = "#{@name}/#{@version}"
-          logger.info("Found: #{release.name}")
+          logger.info("Found release: #{release.name}")
 
           if @version
-            logger.info("Looking up release version `#{desc}'")
+            logger.info("Looking up release version `#{release.name}/#{@version}'")
             release_version = @release_manager.find_version(release, @version)
-            logger.info("Found release version `#{desc}'")
+            # found version may be different than the requested version, due to version formatting
+            logger.info("Found release version: `#{release.name}/#{release_version.version}'")
             logger.info("Checking for any deployments still using " +
                          "this particular release version")
 
@@ -173,7 +173,7 @@ module Bosh::Director
             unless deployments.empty?
               names = deployments.map{ |d| d.name }.join(", ")
               raise ReleaseVersionInUse,
-                    "ReleaseVersion `#{desc}' is still in use by: #{names}"
+                    "ReleaseVersion `#{release.name}/#{release_version.version}' is still in use by: #{names}"
             end
 
             delete_release_version(release_version)
@@ -186,7 +186,7 @@ module Bosh::Director
             unless deployments.empty?
               names = deployments.map { |d| d.name }.join(", ")
               raise ReleaseInUse,
-                    "Release `#{@name}' is still in use by: #{names}"
+                    "Release `#{release.name}' is still in use by: #{names}"
             end
 
             delete_release(release)

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

@@ -24,8 +24,11 @@ module Bosh::Director
           release_version_version = manifest.fetch('release_version')
 
           release = Bosh::Director::Models::Release[name: release_name]
+          if release.nil?
+            raise ReleaseNotFound, "Release version `#{release}/#{release_version_version}' doesn't exist"
+          end
 
-          release_version = Bosh::Director::Models::ReleaseVersion[version: release_version_version, release: release]
+          release_version = Bosh::Director::Api::ReleaseManager.new.find_version(release, release_version_version)
           inserter = Bosh::Director::CompiledPackage::CompiledPackageInserter.new(@blobstore_client)
 
           packages.each { |p| p.check_blob_sha }

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

@@ -34,9 +34,9 @@ module Bosh::Director
 
         @packages_unchanged = false
         @jobs_unchanged = false
-        
+
         @remote_release = options['remote'] || false
-        @remote_release_location = options['location'] if @remote_release 
+        @remote_release_location = options['location'] if @remote_release
       end
 
       # Extracts release tarball, verifies release manifest and saves release
@@ -69,7 +69,7 @@ module Bosh::Director
         end
       end
 
-      def download_remote_release         
+      def download_remote_release
         release_file = File.join(@tmp_release_dir, Api::ReleaseManager::RELEASE_TGZ)
         download_remote_file('release', @remote_release_location, release_file)
       end
@@ -104,7 +104,16 @@ module Bosh::Director
         normalize_manifest
 
         @name = @manifest["name"]
-        @version = @manifest["version"]
+
+        begin
+          @version = Bosh::Common::VersionNumber.parse(@manifest["version"])
+          unless @version == @manifest["version"]
+            logger.info("Formatted version '#{@manifest["version"]}' => '#{@version}'")
+          end
+        rescue SemiSemantic::ParseError
+          raise ReleaseVersionInvalid, "Release version invalid: #{@manifest["version"]}"
+        end
+
         @commit_hash = @manifest.fetch("commit_hash", nil)
         @uncommitted_changes = @manifest.fetch("uncommitted_changes", nil)
       end
@@ -113,13 +122,14 @@ module Bosh::Director
       # @return [void]
       def process_release
         @release_model = Models::Release.find_or_create(:name => @name)
+
         if @rebase
           @version = next_release_version
         end
 
         version_attrs = {
           :release => @release_model,
-          :version => @version
+          :version => @version.to_s
         }
         version_attrs[:uncommitted_changes] = @uncommitted_changes if @uncommitted_changes
         version_attrs[:commit_hash] = @commit_hash if @commit_hash
@@ -223,27 +233,6 @@ module Bosh::Director
             next
           end
 
-          # Rebase is an interesting use case: we don't really care about
-          # preserving the original package/job versions, so if we have a
-          # checksum/fingerprint match, we can just substitute the original
-          # package/job version with an existing one.
-          if @rebase
-            substitutes = packages.select do |package|
-              package.release_id == @release_model.id &&
-              package.name == package_meta["name"] &&
-              package.dependency_set == Set.new(package_meta["dependencies"])
-            end
-
-            substitute = pick_best(substitutes, package_meta["version"])
-
-            if substitute
-              package_meta["version"] = substitute.version
-              package_meta["sha1"] = substitute.sha1
-              existing_packages << [substitute, package_meta]
-              next
-            end
-          end
-
           # We can reuse an existing package as long as it
           # belongs to the same release and has the same name and version.
           existing_package = packages.find do |package|
@@ -333,17 +322,6 @@ module Bosh::Director
           :version => version
         }
 
-        if @rebase
-          new_version = next_package_version(name, version)
-          if new_version != version
-            transition = "#{version} -> #{new_version}"
-            logger.info("Package `#{name}' rebased: #{transition}")
-            package_attrs[:version] = new_version
-            version = new_version
-            @package_rebase_mapping[name] = transition
-          end
-        end
-
         package = Models::Package.new(package_attrs)
         package.dependency_set = package_meta["dependencies"]
 
@@ -400,25 +378,6 @@ module Bosh::Director
           # Checking whether we might have the same bits somewhere
           jobs = Models::Template.where(filter).all
 
-          if @rebase
-            substitutes = jobs.select do |job|
-              job.release_id == @release_model.id &&
-              job.name == job_meta["name"]
-            end
-
-            substitute = pick_best(substitutes, job_meta["version"])
-
-            if substitute
-              job_meta["version"] = substitute.version
-              job_meta["sha1"] = substitute.sha1
-              existing_jobs << [substitute, job_meta]
-            else
-              new_jobs << job_meta
-            end
-
-            next
-          end
-
           template = jobs.find do |job|
             job.release_id == @release_model.id &&
             job.name == job_meta["name"] &&
@@ -464,17 +423,6 @@ module Bosh::Director
           :version => version
         }
 
-        if @rebase
-          new_version = next_template_version(name, version)
-          if new_version != version
-            transition = "#{version} -> #{new_version}"
-            logger.info("Job `#{name}' rebased: #{transition}")
-            template_attrs[:version] = new_version
-            version = new_version
-            @job_rebase_mapping[name] = transition
-          end
-        end
-
         logger.info("Creating job template `#{name}/#{version}' " +
                     "from provided bits")
         template = Models::Template.new(template_attrs)
@@ -600,42 +548,10 @@ module Bosh::Director
         attrs = {
           :release_id => @release_model.id
         }
-        next_version(Models::ReleaseVersion.filter(attrs).all, @version)
-      end
-
-      # Returns the next package version (to be used for rebased package)
-      # @param [String] name Package name
-      # @param [String] version Package version
-      # @return [String]
-      def next_package_version(name, version)
-        attrs = {
-          :release_id => @release_model.id,
-          :name => name
-        }
-
-        next_version(Models::Package.filter(attrs).all, version)
-      end
-
-      # Returns the next job template version (to be used for rebased template)
-      # @param [String] name Template name
-      # @param [Fixnum] version Template version
-      # @return [String]
-      def next_template_version(name, version)
-        attrs = {
-          :release_id => @release_model.id,
-          :name => name
-        }
-
-        next_version(Models::Template.filter(attrs).all, version)
-      end
-
-      # Takes collection of versioned items and returns the version
-      # that new item should be promoted to if auto-versioning is used
-      # @param [Array<#version>] Collection of items
-      # @param [String] version Current version of item
-      # @return [String] Next version to be used
-      def next_version(collection, version)
-        Bosh::Director::NextRebaseVersion.new(collection).calculate(version)
+        models = Models::ReleaseVersion.filter(attrs).all
+        strings = models.map(&:version)
+        versions = Bosh::Common::VersionNumber.parse_list(strings)
+        Bosh::Director::NextRebaseVersion.new(versions).calculate(@version)
       end
 
       # Removes release version model, along with all packages and templates.
@@ -647,26 +563,6 @@ module Bosh::Director
         @release_version_model.remove_all_templates
         @release_version_model.destroy
       end
-
-      # Picks the best matching package/job from collection based on a simple
-      # heuristics: items with same version are preferred, then items
-      # with non-dev versions, then items with most compiled packages,
-      # then everything else.
-      # @param [Array<#name,#version>] collection
-      # @param [String] original_version
-      def pick_best(collection, original_version)
-        collection.sort_by { |item|
-          if item.version == original_version
-            1
-          elsif Bosh::Common::VersionNumber.new(item.version).final?
-            2
-          elsif item.is_a?(Bosh::Director::Models::Package)
-            3000 - [item.compiled_packages.size, 900].min
-          else
-            3000
-          end
-        }.first
-      end
     end
   end
-end
+end

data/lib/bosh/director/models.rb

@@ -22,7 +22,7 @@ require 'bosh/director/models/rendered_templates_archive'
 
 module Bosh::Director
   module Models
-    VALID_ID = /^[-a-z0-9_.]+$/i
+    VALID_ID = /^[-0-9A-Za-z_+.]+$/i
 
     autoload :Dns, 'bosh/director/models/dns'
   end

data/lib/bosh/director/next_rebase_version.rb

@@ -1,20 +1,34 @@
+require 'semi_semantic/version'
+
 module Bosh::Director
   class NextRebaseVersion
+
+    # See Bosh::Common::VersionNumber.parse_list to parse a list of strings
     def initialize(existing_versions)
+      existing_versions.each { |v| raise TypeError, "Invalid Version Type: #{v.class}" unless v.is_a?(SemiSemantic::Version) }
       @existing_versions = existing_versions
     end
 
-    def calculate(current_version)
-      current_version = Bosh::Common::VersionNumber.new(current_version)
-      versions = @existing_versions.map { |item| Bosh::Common::VersionNumber.new(item.version) }
+    def calculate(version)
+      raise TypeError, "Invalid Version Type: #{version.class}" unless version.is_a?(SemiSemantic::Version)
 
-      return current_version.to_s if current_version.final?
+      # Only rebase post-release versions
+      return version if version.post_release.nil?
 
-      latest = versions.select { |version|
-        version.major == current_version.major
+      # Find the latest existing version with the same release and pre-release segments as the provided version
+      latest = @existing_versions.select { |v|
+        v.release == version.release && v.pre_release == version.pre_release
       }.max
 
-      latest ? latest.next_minor.dev.to_s : "#{current_version.major}.1-dev"
+      if latest
+        if latest.post_release.nil?
+          SemiSemantic::Version.new(latest.release, latest.pre_release, Bosh::Common::VersionNumber::DEFAULT_DEV_RELEASE_SEGMENT)
+        else
+          SemiSemantic::Version.new(latest.release, latest.pre_release, latest.post_release.increment)
+        end
+      else
+        SemiSemantic::Version.new(version.release, version.pre_release, Bosh::Common::VersionNumber::DEFAULT_DEV_RELEASE_SEGMENT)
+      end
     end
   end
-end
+end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2579.0'
+    VERSION = '1.2583.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -127,10 +127,6 @@ module Bosh
         FileUtils.rm(snapshot_file(snapshot_id))
       end
 
-      def validate_deployment(old_manifest, new_manifest)
-        raise NotImplemented, 'Dummy CPI does not implement validate_deployment'
-      end
-
       # Additional Dummy test helpers
 
       def vm_cids

data/lib/cloud/provider.rb

@@ -0,0 +1,31 @@
+module Bosh::Clouds
+  class Provider
+    def self.create(cloud_config, director_uuid)
+      if cloud_config.fetch('external_cpi', {}).fetch('enabled', false)
+        ExternalCpiProvider.create(cloud_config['external_cpi'], director_uuid)
+      else
+        PluginCloudProvider.create(cloud_config['plugin'], cloud_config['properties'])
+      end
+    end
+  end
+
+  private
+
+  class PluginCloudProvider
+    def self.create(plugin, options)
+      begin
+        require "cloud/#{plugin}"
+      rescue LoadError => error
+        raise CloudError, "Could not load Cloud Provider Plugin: #{plugin}, with error #{error.inspect}"
+      end
+
+      Bosh::Clouds.const_get(plugin.capitalize).new(options)
+    end
+  end
+
+  class ExternalCpiProvider
+    def self.create(external_cpi_config, director_uuid)
+      ExternalCpi.new(external_cpi_config['cpi_path'], director_uuid)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2579.0
+  version: 1.2583.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-30 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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.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.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2579.0
+        version: 1.2583.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -288,17 +288,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -459,9 +459,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: semi_semantic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: ! 'BOSH Director
 
-  4fef83'
+  b96a92'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -693,6 +709,7 @@ files:
 - lib/bosh/director/vm_metadata_updater.rb
 - lib/bosh/director/vm_reuser.rb
 - lib/cloud/dummy.rb
+- lib/cloud/provider.rb
 - CHANGELOG
 - bin/bosh-director
 - bin/bosh-director-console
@@ -721,10 +738,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3881888844669519304
+      hash: 3045382623018678181
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: BOSH Director