bosh-director 1.2583.0 → 1.2596.0

data/lib/bosh/director/models/vm.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director::Models
   class Vm < Sequel::Model(Bosh::Director::Config.db)
     many_to_one :deployment

data/lib/bosh/director/version.rb

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

data/lib/cloud/dummy.rb

@@ -1,12 +1,15 @@
 require 'digest/sha1'
 require 'fileutils'
 require 'securerandom'
+require 'logger'
 
 module Bosh
   module Clouds
     class Dummy
       class NotImplemented < StandardError; end
 
+      attr_reader :commands
+
       def initialize(options)
         @options = options
 
@@ -22,8 +25,9 @@ module Bosh
 
         @running_vms_dir = File.join(@base_dir, 'running_vms')
 
-        log_device = options['log_device'] || STDOUT
-        @logger = Logger.new(log_device)
+        @logger = Logger.new(options['log_device'] || STDOUT)
+
+        @commands = CommandTransport.new(@base_dir, @logger)
 
         FileUtils.mkdir_p(@base_dir)
       rescue Errno::EACCES
@@ -42,13 +46,19 @@ module Bosh
 
       # rubocop:disable ParameterLists
       def create_vm(agent_id, stemcell, resource_pool, networks, disk_locality = nil, env = nil)
-        @logger.info('Dummy: create_vm')
       # rubocop:enable ParameterLists
+        @logger.info('Dummy: create_vm')
+
+        cmd = commands.next_create_vm_cmd
+
+        write_agent_default_network(agent_id, cmd.ip_address) if cmd.ip_address
+
         write_agent_settings(agent_id, {
           agent_id: agent_id,
           blobstore: @options['agent']['blobstore'],
           ntp: [],
           disks: { persistent: {} },
+          networks: networks,
           vm: { name: "vm-#{agent_id}" },
           mbus: @options['nats'],
         })
@@ -71,7 +81,7 @@ module Bosh
         FileUtils.rm_rf(File.join(@base_dir, 'running_vms', vm_name))
       end
 
-      def reboot_vm(vm)
+      def reboot_vm(vm_id)
         raise NotImplemented, 'Dummy CPI does not implement reboot_vm'
       end
 
@@ -79,7 +89,9 @@ module Bosh
         File.exists?(vm_file(vm_id))
       end
 
-      def configure_networks(vm, networks)
+      def configure_networks(vm_id, networks)
+        cmd = commands.next_configure_networks_cmd(vm_id)
+        raise NotSupported, 'Dummy CPI was configured to return NotSupported' if cmd.not_supported
         raise NotImplemented, 'Dummy CPI does not implement configure_networks'
       end
 
@@ -130,7 +142,8 @@ module Bosh
       # Additional Dummy test helpers
 
       def vm_cids
-        Dir.glob(File.join(@running_vms_dir, '*')).map { |vm| File.basename(vm) }
+        # Shuffle so that no one relies on the order of VMs
+        Dir.glob(File.join(@running_vms_dir, '*')).map { |vm| File.basename(vm) }.shuffle
       end
 
       def kill_agents
@@ -190,6 +203,13 @@ module Bosh
         File.write(agent_settings_file(agent_id), JSON.generate(settings))
       end
 
+      def write_agent_default_network(agent_id, ip_address)
+        # Agent looks for following file to resolve default network on dummy infrastructure
+        path = File.join(agent_base_dir(agent_id), 'bosh', 'dummy-default-network-settings.json')
+        FileUtils.mkdir_p(File.dirname(path))
+        File.write(path, JSON.generate('ip' => ip_address))
+      end
+
       def agent_cmd(agent_id, root_dir)
         go_agent_exe = File.expand_path('../../../../go_agent/out/bosh-agent', __FILE__)
         {
@@ -221,6 +241,49 @@ module Bosh
       def snapshot_file(snapshot_id)
         File.join(@base_dir, 'snapshots', snapshot_id)
       end
+
+      # Example file system layout for arranging commands information.
+      # Currently uses file system as transport but could be switch to use NATS.
+      #   base_dir/cpi/create_vm/next -> {"something": true}
+      #   base_dir/cpi/configure_networks/<vm_id> -> (presence)
+      class CommandTransport
+        def initialize(base_dir, logger)
+          @cpi_commands = File.join(base_dir, 'cpi_commands')
+          @logger = logger
+        end
+
+        def make_configure_networks_not_supported(vm_id)
+          @logger.info("Making configure_networks for #{vm_id} raise NotSupported")
+          path = File.join(@cpi_commands, 'configure_networks', vm_id)
+          FileUtils.mkdir_p(File.dirname(path))
+          File.write(path, 'marker')
+        end
+
+        def next_configure_networks_cmd(vm_id)
+          @logger.info("Reading configure_networks configuration for #{vm_id}")
+          vm_path = File.join(@cpi_commands, 'configure_networks', vm_id)
+          vm_supported = File.exists?(vm_path)
+          FileUtils.rm_rf(vm_path)
+          ConfigureNetworksCommand.new(vm_supported)
+        end
+
+        def make_create_vm_always_use_dynamic_ip(ip_address)
+          @logger.info("Making create_vm method to set ip address #{ip_address}")
+          always_path = File.join(@cpi_commands, 'create_vm', 'always')
+          FileUtils.mkdir_p(File.dirname(always_path))
+          File.write(always_path, ip_address)
+        end
+
+        def next_create_vm_cmd
+          @logger.info('Reading create_vm configuration')
+          always_path = File.join(@cpi_commands, 'create_vm', 'always')
+          ip_address = File.read(always_path) if File.exists?(always_path)
+          CreareVmCommand.new(ip_address)
+        end
+      end
+
+      class ConfigureNetworksCommand < Struct.new(:not_supported); end
+      class CreareVmCommand < Struct.new(:ip_address); end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2583.0
+  version: 1.2596.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-07 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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.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.2583.0
+        version: 1.2596.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2583.0
+        version: 1.2596.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -477,7 +477,7 @@ dependencies:
         version: 1.1.0
 description: ! 'BOSH Director
 
-  b96a92'
+  3c1470'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -626,11 +626,13 @@ files:
 - lib/bosh/director/instance_updater/network_updater.rb
 - lib/bosh/director/instance_updater/preparer.rb
 - lib/bosh/director/instance_updater/stopper.rb
+- lib/bosh/director/instance_updater/vm_updater.rb
 - lib/bosh/director/ip_util.rb
 - lib/bosh/director/job_queue.rb
 - lib/bosh/director/job_renderer.rb
 - lib/bosh/director/job_runner.rb
 - lib/bosh/director/job_updater.rb
+- lib/bosh/director/job_updater_factory.rb
 - lib/bosh/director/jobs/backup.rb
 - lib/bosh/director/jobs/base_job.rb
 - lib/bosh/director/jobs/cloud_check/apply_resolutions.rb
@@ -683,7 +685,6 @@ files:
 - lib/bosh/director/models/vm.rb
 - lib/bosh/director/nats_rpc.rb
 - lib/bosh/director/network_reservation.rb
-- lib/bosh/director/next_rebase_version.rb
 - lib/bosh/director/package_compiler.rb
 - lib/bosh/director/problem_handlers/base.rb
 - lib/bosh/director/problem_handlers/inactive_disk.rb
@@ -738,7 +739,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3045382623018678181
+      hash: -3703569249647131017
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2

data/lib/bosh/director/next_rebase_version.rb

@@ -1,34 +0,0 @@
-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(version)
-      raise TypeError, "Invalid Version Type: #{version.class}" unless version.is_a?(SemiSemantic::Version)
-
-      # Only rebase post-release versions
-      return version if version.post_release.nil?
-
-      # 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
-
-      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