bosh_agent 1.5.0.pre.1215 → 1.5.0.pre.1226

data/lib/bosh_agent/apply_plan/plan.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Agent
   module ApplyPlan
     class Plan
@@ -91,6 +89,9 @@ module Bosh::Agent
         end
       end
 
+      def has_prepared_spec?(new_spec)
+        @spec['prepared_spec'] == new_spec
+      end
     end
   end
 end

data/lib/bosh_agent/message/apply.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Agent
   module Message
     class Apply < Base
@@ -110,7 +108,9 @@ module Bosh::Agent
       end
 
       def apply_job
-        if @new_plan.has_jobs?
+        if @old_plan.has_prepared_spec?(@new_spec)
+          logger.info("New jobs already installed")
+        elsif @new_plan.has_jobs?
           @new_plan.install_jobs
         else
           logger.info("No job")
@@ -118,7 +118,9 @@ module Bosh::Agent
       end
 
       def apply_packages
-        if @new_plan.has_packages?
+        if @old_plan.has_prepared_spec?(@new_spec)
+          logger.info("New packages already installed")
+        elsif @new_plan.has_packages?
           @new_plan.install_packages
         else
           logger.info("No packages")

data/lib/bosh_agent/message/prepare.rb

@@ -0,0 +1,86 @@
+module Bosh::Agent::Message
+  class Prepare < Base
+    def initialize(args)
+      @platform = Bosh::Agent::Config.platform
+
+      if args.size < 1
+        raise ArgumentError, "not enough arguments"
+      end
+
+      @new_spec = args.first
+      unless @new_spec.is_a?(Hash)
+        raise ArgumentError, "invalid spec, Hash expected, " +
+          "#{@new_spec.class} given"
+      end
+    end
+
+    def prepare
+      initialize_plans
+
+      %w(bosh jobs packages monit).each do |dir|
+        FileUtils.mkdir_p(File.join(base_dir, dir))
+      end
+
+      logger.info("Preparing: #{@new_spec.inspect}")
+
+      if @new_plan.configured?
+        begin
+          apply_job
+          apply_packages
+          log_bit_download_with_agent_state
+        rescue Exception => e
+          raise Bosh::Agent::MessageHandlerError,
+                "#{e.message}: #{e.backtrace}"
+        end
+      end
+    end
+
+    private
+
+    def initialize_plans
+      initialize_networks
+
+      @old_spec = Bosh::Agent::Config.state.to_hash
+
+      @old_plan = Bosh::Agent::ApplyPlan::Plan.new(@old_spec)
+      @new_plan = Bosh::Agent::ApplyPlan::Plan.new(@new_spec)
+    end
+
+    def initialize_networks
+      if @new_spec["networks"]
+        @new_spec["networks"].each do |network, properties|
+          infrastructure = Bosh::Agent::Config.infrastructure
+          network_settings =
+            infrastructure.get_network_settings(network, properties)
+          logger.debug("current network settings from VM: #{network_settings.inspect}")
+          logger.debug("new network settings to be applied: #{properties.inspect}")
+          if network_settings
+            @new_spec["networks"][network].merge!(network_settings)
+            logger.debug("merged network settings: #{@new_spec["networks"].inspect}")
+          end
+        end
+      end
+    end
+
+    def apply_job
+      if @new_plan.has_jobs?
+        @new_plan.install_jobs
+      else
+        logger.info("No job")
+      end
+    end
+
+    def apply_packages
+      if @new_plan.has_packages?
+        @new_plan.install_packages
+      else
+        logger.info("No packages")
+      end
+    end
+
+    def log_bit_download_with_agent_state
+      @old_spec['prepared_spec'] = @new_spec
+      Bosh::Agent::Config.state.write(@old_spec)
+    end
+  end
+end

data/lib/bosh_agent/version.rb

@@ -2,7 +2,7 @@
 
 module Bosh
   module Agent
-    VERSION = '1.5.0.pre.1215'
+    VERSION = '1.5.0.pre.1226'
     BOSH_PROTOCOL = "1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_agent
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1215
+  version: 1.5.0.pre.1226
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1215
+        version: 1.5.0.pre.1226
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1215
+        version: 1.5.0.pre.1226
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1215
+        version: 1.5.0.pre.1226
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1215
+        version: 1.5.0.pre.1226
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1215
+        version: 1.5.0.pre.1226
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1215
+        version: 1.5.0.pre.1226
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
 description: ! 'This agent listens for instructions from the bosh director on each
   server that bosh manages.
 
-  732bcf'
+  21ba44'
 email: support@cloudfoundry.com
 executables:
 - bosh_agent
@@ -266,6 +266,7 @@ files:
 - lib/bosh_agent/message/logs.rb
 - lib/bosh_agent/message/migrate_disk.rb
 - lib/bosh_agent/message/mount_disk.rb
+- lib/bosh_agent/message/prepare.rb
 - lib/bosh_agent/message/ssh.rb
 - lib/bosh_agent/message/state.rb
 - lib/bosh_agent/message/unmount_disk.rb