bosh-director 1.3173.0 → 1.3177.0

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

@@ -29,7 +29,7 @@ module Bosh::Director
       end
 
       def dns_manager
-        @dns_manager ||= DnsManager.create
+        @dns_manager ||= DnsManagerProvider.create
       end
 
       # @return [Boolean] Has task been cancelled?

data/lib/bosh/director/jobs/cloud_check/scan_and_fix.rb

@@ -36,10 +36,10 @@ module Bosh::Director
               resolver = ProblemResolver.new(@deployment)
               resolver.apply_resolutions(resolutions(jobs))
 
-              "scan and fix complete"
+              'scan and fix complete'
             end
           rescue Lock::TimeoutError
-            raise "Unable to get deployment lock, maybe a deployment is in progress. Try again later."
+            raise 'Unable to get deployment lock, maybe a deployment is in progress. Try again later.'
           end
         end
 
@@ -48,7 +48,7 @@ module Bosh::Director
           jobs.each do |job, index|
             instance = @instance_manager.find_by_name(@deployment.name, job, index)
             next if instance.resurrection_paused
-            problems = Models::DeploymentProblem.filter(deployment: @deployment, resource_id: instance.vm.id, state: 'open')
+            problems = Models::DeploymentProblem.filter(deployment: @deployment, resource_id: instance.id, state: 'open')
             problems.each do |problem|
               if problem.type == 'unresponsive_agent' || problem.type == 'missing_vm'
                 all_resolutions[problem.id.to_s] = :recreate_vm

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

@@ -14,7 +14,7 @@ module Bosh::Director
       end
 
       def perform
-        logger.info("taking snapshot of: #{@instance.job}/#{@instance.index} (#{@instance.vm.cid})")
+        logger.info("taking snapshot of: #{@instance.job}/#{@instance.index} (#{@instance.vm_cid})")
         snapshot_cids = Bosh::Director::Api::SnapshotManager.take_snapshot(@instance, @options)
         "snapshot(s) #{snapshot_cids.join(', ')} created"
       end

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

@@ -25,7 +25,7 @@ module Bosh::Director
 
           ip_provider = DeploymentPlan::IpProviderFactory.new(true, logger)
 
-          dns_manager = DnsManager.create
+          dns_manager = DnsManagerProvider.create
           disk_manager = DiskManager.new(@cloud, logger)
           instance_deleter = InstanceDeleter.new(ip_provider, dns_manager, disk_manager, force: @force)
           deployment_deleter = DeploymentDeleter.new(event_log, logger, dns_manager, Config.max_threads)

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

@@ -22,7 +22,7 @@ module Bosh::Director
         deployment.job_instances.each do |instance|
           snapshots = instance.persistent_disks.map { |disk| disk.snapshots }.flatten
           if snapshots.any?
-            logger.info("deleting snapshots of: #{instance.job}/#{instance.index} (#{instance.vm.cid})")
+            logger.info("deleting snapshots of: #{instance.job}/#{instance.index} (#{instance.vm_cid})")
             Bosh::Director::Api::SnapshotManager.delete_snapshots(snapshots)
           end
         end

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

@@ -31,11 +31,11 @@ module Bosh::Director
       end
 
       def snapshot(instance)
-        logger.info("taking snapshot of: #{instance.job}/#{instance.index} (#{instance.vm.cid})")
+        logger.info("taking snapshot of: #{instance.job}/#{instance.index} (#{instance.vm_cid})")
         Bosh::Director::Api::SnapshotManager.take_snapshot(instance, @options)
       rescue Bosh::Clouds::CloudError => e
         @errors += 1
-        logger.error("failed to take snapshot of: #{instance.job}/#{instance.index} (#{instance.vm.cid}) - #{e.inspect}")
+        logger.error("failed to take snapshot of: #{instance.job}/#{instance.index} (#{instance.vm_cid}) - #{e.inspect}")
         send_alert(instance, e.inspect)
       end
 

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

@@ -15,11 +15,11 @@ module Bosh::Director
       end
 
       def perform
-        vms = Models::Vm.filter(:deployment_id => @deployment_id)
+        instances = Models::Instance.filter(:deployment_id => @deployment_id).exclude(vm_cid: nil)
         ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
-          vms.each do |vm|
+          instances.each do |instance|
             pool.process do
-              vm_state = process_vm(vm)
+              vm_state = process_instance(instance)
               result_file.write(vm_state.to_json + "\n")
             end
           end
@@ -29,7 +29,7 @@ module Bosh::Director
         nil
       end
 
-      def process_vm(vm)
+      def process_instance(instance)
         ips = []
         dns_records = []
         job_state = nil
@@ -37,7 +37,7 @@ module Bosh::Director
         processes = []
 
         begin
-          agent = AgentClient.with_vm_credentials_and_agent_id(vm.credentials, vm.agent_id, :timeout => TIMEOUT)
+          agent = AgentClient.with_vm_credentials_and_agent_id(instance.credentials, instance.agent_id, :timeout => TIMEOUT)
           agent_state = agent.get_state(@format)
           agent_state['networks'].each_value do |network|
             ips << network['ip']
@@ -53,30 +53,29 @@ module Bosh::Director
         end
 
         if dns_manager.dns_enabled?
-          dns_records = dns_manager.find_dns_record_names_by_instance(vm.instance)
+          dns_records = dns_manager.find_dns_record_names_by_instance(instance)
           dns_records.sort_by! { |name| -(name.split('.').first.length) }
         end
 
-        vm_apply_spec = vm.instance ? vm.instance.spec : {}
-        vm_type_name = vm_apply_spec && vm_apply_spec['vm_type'] ? vm_apply_spec['vm_type']['name'] : nil
+        vm_type_name = instance.spec && instance.spec['vm_type'] ? instance.spec['vm_type']['name'] : nil
 
         {
-          :vm_cid => vm.cid,
-          :disk_cid => vm.instance ? vm.instance.persistent_disk_cid : nil,
+          :vm_cid => instance.vm_cid,
+          :disk_cid => instance.persistent_disk_cid,
           :ips => ips,
           :dns => dns_records,
-          :agent_id => vm.agent_id,
-          :job_name => vm.instance ? vm.instance.job : nil,
-          :index => vm.instance ? vm.instance.index : nil,
+          :agent_id => instance.agent_id,
+          :job_name => instance.job,
+          :index => instance.index,
           :job_state => job_state,
           :resource_pool => vm_type_name,
           :vm_type => vm_type_name,
           :vitals => job_vitals,
           :processes => processes,
-          :resurrection_paused => vm.instance ? vm.instance.resurrection_paused : nil,
-          :az => vm.instance ? vm.instance.availability_zone : nil,
-          :id => vm.instance ? vm.instance.uuid : nil,
-          :bootstrap => vm.instance ? vm.instance.bootstrap : false
+          :resurrection_paused => instance.resurrection_paused,
+          :az => instance.availability_zone,
+          :id => instance.uuid,
+          :bootstrap => instance.bootstrap
         }
       end
 

data/lib/bosh/director/models.rb

@@ -20,7 +20,6 @@ require 'bosh/director/models/snapshot'
 require 'bosh/director/models/task'
 require 'bosh/director/models/template'
 require 'bosh/director/models/user'
-require 'bosh/director/models/vm'
 require 'bosh/director/models/persistent_disk'
 require 'bosh/director/models/rendered_templates_archive'
 

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

@@ -1,11 +1,8 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director::Models
   class Deployment < Sequel::Model(Bosh::Director::Config.db)
     many_to_many :stemcells
     many_to_many :release_versions
     one_to_many  :job_instances, :class => "Bosh::Director::Models::Instance"
-    one_to_many  :vms
     one_to_many  :instances
     one_to_many  :properties, :class => "Bosh::Director::Models::DeploymentProperty"
     one_to_many  :problems, :class => "Bosh::Director::Models::DeploymentProblem"

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

@@ -3,7 +3,6 @@ require 'securerandom'
 module Bosh::Director::Models
   class Instance < Sequel::Model(Bosh::Director::Config.db)
     many_to_one :deployment
-    many_to_one :vm
     one_to_many :persistent_disks
     one_to_many :rendered_templates_archives
     one_to_many :ip_addresses
@@ -12,7 +11,6 @@ module Bosh::Director::Models
     def validate
       validates_presence [:deployment_id, :job, :index, :state]
       validates_unique [:deployment_id, :job, :index]
-      validates_unique [:vm_id] if vm_id
       validates_integer :index
       validates_includes %w(started stopped detached), :state
     end
@@ -64,7 +62,7 @@ module Bosh::Director::Models
     end
 
     def to_s
-      "#{self.job}/#{self.uuid} (#{self.index})"
+      "#{self.job}/#{self.index} (#{self.uuid})"
     end
 
     def spec
@@ -96,13 +94,22 @@ module Bosh::Director::Models
       self.spec_json = Yajl::Encoder.encode(spec)
     end
 
-    def env
-      if vm
-        @env = vm.env
-      else
-        @env = {}
-      end
-      @env
+    def vm_env
+      return {} if spec.nil?
+      spec['env'] || {}
+    end
+
+    def vm_env=(vm_env_hash)
+      self.spec = (spec || {}).merge(env: vm_env_hash)
+    end
+
+    def credentials
+      return nil if credentials_json.nil?
+      Yajl::Parser.parse(credentials_json)
+    end
+
+    def credentials=(spec)
+      self.credentials_json = Yajl::Encoder.encode(spec)
     end
   end
 

data/lib/bosh/director/network_reservation.rb

@@ -2,10 +2,10 @@ module Bosh::Director
   class NetworkReservation
     include IpUtil
 
-    attr_reader :ip, :instance, :network, :type
+    attr_reader :ip, :instance_model, :network, :type
 
-    def initialize(instance, network)
-      @instance = instance
+    def initialize(instance_model, network)
+      @instance_model = instance_model
       @network = network
       @ip = nil
       @reserved = false
@@ -41,8 +41,8 @@ module Bosh::Director
   class ExistingNetworkReservation < NetworkReservation
     attr_reader :network_type
 
-    def initialize(instance, network, ip, network_type)
-      super(instance, network)
+    def initialize(instance_model, network, ip, network_type)
+      super(instance_model, network)
       @ip = ip_to_i(ip) if ip
       @network_type = network_type
     end
@@ -52,26 +52,25 @@ module Bosh::Director
     end
 
     def desc
-      "existing reservation#{@ip.nil? ? '' : " with IP '#{formatted_ip}' for instance #{@instance}"}"
+      "existing reservation#{@ip.nil? ? '' : " with IP '#{formatted_ip}' for instance #{@instance_model}"}"
     end
 
     def to_s
-      "{ip=#{formatted_ip}, network=#{@network.name}, instance=#{@instance}, reserved=#{reserved?}, type=#{type}}"
+      "{ip=#{formatted_ip}, network=#{@network.name}, instance=#{@instance_model}, reserved=#{reserved?}, type=#{type}}"
     end
   end
 
   class DesiredNetworkReservation < NetworkReservation
-    def self.new_dynamic(instance, network)
-      new(instance, network, nil, :dynamic)
+    def self.new_dynamic(instance_model, network)
+      new(instance_model, network, nil, :dynamic)
     end
 
-    def self.new_static(instance, network, ip)
-      new(instance, network, ip, :static)
+    def self.new_static(instance_model, network, ip)
+      new(instance_model, network, ip, :static)
     end
 
-    def initialize(instance, network, ip, type)
-      @instance = instance
-      @network = network
+    def initialize(instance_model, network, ip, type)
+      super(instance_model, network)
       @ip = ip_to_i(ip) if ip
       @type = type
     end
@@ -90,11 +89,11 @@ module Bosh::Director
     end
 
     def desc
-      "#{type} reservation with IP '#{formatted_ip}' for instance #{@instance}"
+      "#{type} reservation with IP '#{formatted_ip}' for instance #{@instance_model}"
     end
 
     def to_s
-      "{type=#{type}, ip=#{formatted_ip}, network=#{@network.name}, instance=#{@instance}}"
+      "{type=#{type}, ip=#{formatted_ip}, network=#{@network.name}, instance=#{@instance_model}}"
     end
   end
 end

data/lib/bosh/director/problem_handlers/inactive_disk.rb

@@ -25,8 +25,6 @@ module Bosh::Director
         if @instance.nil?
           handler_error("Cannot find instance for disk `#{@disk.disk_cid}'")
         end
-
-        @vm = @instance.vm
       end
 
       def description
@@ -72,9 +70,9 @@ module Bosh::Director
           handler_error("Disk is currently in use")
         end
 
-        if @vm
+        if @instance.vm_cid
           begin
-            cloud.detach_disk(@vm.cid, @disk.disk_cid)
+            cloud.detach_disk(@instance.vm_cid, @disk.disk_cid)
           rescue => e
             # We are going to delete this disk anyway
             # and we know it's not in use, so we can ignore
@@ -87,8 +85,8 @@ module Bosh::Director
       end
 
       def disk_mounted?
-        return false if @vm.nil?
-        agent_timeout_guard(@vm) do |agent|
+        return false unless @instance.vm_cid
+        agent_timeout_guard(@instance.vm_cid, @instance.credentials, @instance.agent_id) do |agent|
           agent.list_disk.include?(@disk.disk_cid)
         end
       end

data/lib/bosh/director/problem_handlers/missing_disk.rb

@@ -19,8 +19,6 @@ module Bosh::Director
         if @instance.nil?
           handler_error("Cannot find instance for disk `#{@disk.disk_cid}'")
         end
-
-        @vm = @instance.vm
       end
 
       def description
@@ -44,8 +42,8 @@ module Bosh::Director
         @disk.update(active: false)
 
         # If VM is present we try to unmount and detach disk from VM
-        if @vm && @vm.cid && cloud.has_vm?(@vm.cid)
-          agent_client = agent_client(@vm)
+        if @instance.vm_cid && cloud.has_vm?(@instance.vm_cid)
+          agent_client = agent_client(@instance.credentials, @instance.agent_id)
           disk_list = []
 
           begin
@@ -67,7 +65,7 @@ module Bosh::Director
 
           begin
             @logger.debug('Sending cpi request: detach_disk')
-            cloud.detach_disk(@vm.cid, @disk.disk_cid) if @vm.cid
+            cloud.detach_disk(@instance.vm_cid, @disk.disk_cid) if @instance.vm_cid
           rescue Bosh::Clouds::DiskNotAttached, Bosh::Clouds::DiskNotFound
           end
         end

data/lib/bosh/director/problem_handlers/missing_vm.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module ProblemHandlers
     class MissingVM < Base
@@ -7,28 +5,28 @@ module Bosh::Director
       register_as :missing_vm
       auto_resolution :recreate_vm
 
-      def initialize(vm_id, data)
+      def initialize(instance_id, data)
         super
-        @vm = Models::Vm[vm_id]
+        @instance = Models::Instance.find(id: instance_id)
       end
 
       resolution :ignore do
-        plan { "Skip for now" }
+        plan { 'Skip for now' }
         action { }
       end
 
       resolution :recreate_vm do
-        plan { "Recreate VM for '#{@vm.instance.job}/#{@vm.instance.index}'" }
-        action { recreate_vm(@vm) }
+        plan { "Recreate VM for '#{@instance}'" }
+        action { recreate_vm(@instance) }
       end
 
       resolution :delete_vm_reference do
-        plan { "Delete VM reference" }
-        action { delete_vm_reference(@vm, skip_cid_check: true) }
+        plan { 'Delete VM reference' }
+        action { delete_vm_reference(@instance) }
       end
 
       def description
-        "VM with cloud ID `#{@vm.cid}' missing."
+        "VM with cloud ID `#{@instance.vm_cid}' missing."
       end
     end
   end

data/lib/bosh/director/problem_handlers/mount_info_mismatch.rb

@@ -16,11 +16,10 @@ module Bosh::Director
         end
 
         @disk_cid = @disk.disk_cid
-        @vm_cid = @disk.instance.vm.cid if @disk.instance && @disk.instance.vm
+        @vm_cid = @disk.instance.vm_cid if @disk.instance
         handler_error("Can't find corresponding vm-cid for disk `#{@disk_cid}'") if @vm_cid.nil?
 
         @instance = @disk.instance
-        @vm = @instance.vm
 
         @disk_owners = @data['owner_vms']
       end
@@ -55,7 +54,13 @@ module Bosh::Director
       
       def reattach_disk(reboot = false)
         cloud.attach_disk(@vm_cid, @disk_cid)
-        reboot ? reboot_vm(@vm) : agent_timeout_guard(@vm) { |agent| agent.mount_disk(@disk_cid) }
+        if reboot
+          reboot_vm(@instance)
+        else
+          agent_timeout_guard(@instance.vm_cid, @instance.credentials, @instance.agent_id) do |agent|
+            agent.mount_disk(@disk_cid)
+          end
+        end
       end
     end
   end

data/lib/bosh/director/problem_handlers/unresponsive_agent.rb

@@ -5,21 +5,21 @@ module Bosh::Director
       register_as :unresponsive_agent
       auto_resolution :ignore
 
-      def initialize(vm_id, data)
+      def initialize(instance_id, data)
         super
-        @vm = Models::Vm[vm_id]
+        @instance = Models::Instance.find(id: instance_id)
 
-        if @vm.nil?
-          handler_error("VM `#{vm_id}' is no longer in the database")
+        unless @instance.vm_cid
+          handler_error("VM `#{@instance.vm_cid}' is no longer in the database")
         end
 
-        if @vm.agent_id.nil?
-          handler_error("VM `#{vm_id}' doesn't have an agent id")
+        unless @instance.agent_id
+          handler_error("VM `#{@instance.agent_id}' doesn't have an agent id")
         end
       end
 
       def description
-        "#{instance_name(@vm)} (#{@vm.cid}) is not responding"
+        "#{@instance} (#{@instance.vm_cid}) is not responding"
       end
 
       resolution :ignore do
@@ -29,48 +29,33 @@ module Bosh::Director
 
       resolution :reboot_vm do
         plan { 'Reboot VM' }
-        action { validate; ensure_cid; reboot_vm(@vm) }
+        action { validate; reboot_vm(@instance) }
       end
 
       resolution :recreate_vm do
-        plan { "Recreate VM for '#{@vm.instance.job}/#{@vm.instance.index}'" }
-        action { validate; ensure_cid; recreate_vm(@vm) }
+        plan { "Recreate VM for '#{@instance}'" }
+        action { validate; recreate_vm(@instance) }
       end
 
       resolution :delete_vm_reference do
         plan { 'Delete VM reference (forceful; may need to manually delete VM from the Cloud to avoid IP conflicts)' }
-        action { validate; delete_vm_reference(@vm, skip_cid_check: true) }
+        action { validate; delete_vm_reference(@instance) }
       end
 
+      private
+
       def agent_alive?
-        agent_client(@vm).ping
+        agent_client(@instance.credentials, @instance.agent_id).ping
         true
       rescue Bosh::Director::RpcTimeout
         false
       end
 
-      def ensure_cid
-        if @vm.cid.nil?
-          handler_error("VM `#{@vm.id}' doesn't have a cloud id, " +
-              'only resolution is to delete the VM reference.')
-        end
-      end
-
-      def ensure_no_cid
-        if @vm.cid
-          handler_error("VM `#{@vm.id}' has a cloud id, " +
-              'please use a different resolution.')
-        end
-      end
-
       def validate
         if agent_alive?
           handler_error('Agent is responding now, skipping resolution')
         end
       end
-
-      def delete_vm
-      end
     end
   end
 end