opennebula-provider 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133a2592923c168d7cf6f232ad5f6a0ab4e75944
-  data.tar.gz: f360bff7b59fe13b08a4ff931e2a27250eb48762
+  metadata.gz: 18120f65713e4caff7bf5042be0f6c94ae768e64
+  data.tar.gz: c44850849cf4844d1ebb451b3edd3e8ce2f461cf
 SHA512:
-  metadata.gz: aaf3d1935c0abe91bb3cf3c3641aa926ecae4a7c8bb1a6f808bff0a22c05f3d7fa8f60222b44baf973f4f73f9b36e514c93b06b1678b8fea3698f3c8f7c8a1b6
-  data.tar.gz: d48cb67b91f95bd199669b954122ba2c7f2d3520d003439b4478cda08f00f03a178299e35bbc2d608e6977ca32d3390535e6175326010d3f8b5a037c8cb7585f
+  metadata.gz: 6f5fdc6707290d15eb51a451e924bc552ce9900fb098b36b1f66db7d392aca80204c5bb69448264ce345f081e98bcdc5be7a4c67dd4d141436fe41790a594284
+  data.tar.gz: 50b196264ceec8d7eedb8c861f9dd90da705fd28f566cadc97ed94125ea11b691d2a717ee0f264f7c414991d58a5f385a6b4aab01d9d9658a4f0057040bd114a

data/lib/opennebula-provider/action/check_state.rb

@@ -1,25 +1,22 @@
-require 'opennebula-provider/helpers/rocci'
-
 module VagrantPlugins
   module OpenNebulaProvider
     module Action
       class CheckState
-        include Helpers::Rocci
-
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new('vagrant::provider::opennebula::check_state')
         end
 
         def call(env)
-          env[:machine_state] = check_state(env[:rocci], env[:machine])
+          env[:machine_state] = check_state(env[:machine])
           @logger.info I18n.t('opennebula_provider.info.state', state: env[:machine_state])
           @app.call(env)
         end
 
-        def check_state(rocci, machine)
-          return :not_created if machine.id.nil?
-          state = rocci.machine_state(machine.id)
+        def check_state(machine)
+          return :not_created unless machine.id
+          driver = machine.provider.driver
+          state = driver.state(machine.id)
           state.to_sym
         end
       end

data/lib/opennebula-provider/action/create.rb

@@ -9,17 +9,8 @@ module VagrantPlugins
 
         def call(env)
           @logger.info I18n.t('opennebula_provider.info.creating')
-          result = env[:rocci].compute
-          env[:machine].id = result
-          env[:rocci].wait_for_state(env, 'active')
-          env[:ui].info I18n.t('opennebula_provider.info.waiting_for_sshd')
-          if !env[:interrupted]
-            while true
-              break if env[:interrupted]
-              break if env[:machine].communicate.ready?
-              sleep 2
-            end
-          end
+          driver = env[:machine].provider.driver
+          env[:machine].id = driver.create
           @app.call(env)
         end
       end

data/lib/opennebula-provider/action/destroy.rb

@@ -9,7 +9,8 @@ module VagrantPlugins
 
         def call(env)
           @logger.info I18n.t('opennebula_provider.info.destroying', machine: env[:machine].id)
-          env[:rocci].delete(env[:machine].id)
+          driver = env[:machine].provider.driver
+          driver.delete(env[:machine].id)
           env[:machine].id = nil
           @app.call(env)
         end

data/lib/opennebula-provider/action/messages.rb

@@ -33,6 +33,7 @@ module VagrantPlugins
           @app.call(env)
         end
       end
+
       class MessageNotCreated
         def initialize(app, env)
           @app = app
@@ -54,6 +55,17 @@ module VagrantPlugins
           @app.call(env)
         end
       end
+
+      class MessageHalted
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.halted')
+          @app.call(env)
+        end
+      end
     end
   end
 end

data/lib/opennebula-provider/action/read_ssh_info.rb

@@ -8,14 +8,15 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(env[:rocci], env[:machine])
+          env[:machine_ssh_info] = read_ssh_info(env[:machine])
           @app.call(env)
         end
 
-        def read_ssh_info(rocci, machine)
+        def read_ssh_info(machine)
           return nil if machine.id.nil?
+          driver = machine.provider.driver
 
-          host = rocci.ssh_info(machine.id)
+          host = driver.ssh_info(machine.id)
           { host: host, port: 22 }
         end
       end

data/lib/opennebula-provider/action/start.rb

@@ -8,16 +8,9 @@ module VagrantPlugins
         end
 
         def call(env)
-          @logger.info I18n.t('opennebula_provider.info.start', machine: env[:machine].id)
-          env[:rocci].start(env[:machine].id)
-          env[:ui].info I18n.t('opennebula_provider.info.waiting_for_sshd')
-          if !env[:interrupted]
-            while true
-              break if env[:interrupted]
-              break if env[:machine].communicate.ready?
-              sleep 2
-            end
-          end
+          env[:ui].info I18n.t('opennebula_provider.info.start', machine: env[:machine].id)
+          driver = env[:machine].provider.driver
+          driver.start(env[:machine].id)
           @app.call(env)
         end
       end

data/lib/opennebula-provider/action/stop.rb

@@ -8,9 +8,9 @@ module VagrantPlugins
         end
 
         def call(env)
-          @logger.info I18n.t('opennebula_provider.info.stop', machine: env[:machine].id)
-          env[:rocci].stop(env[:machine].id)
-          env[:rocci].wait_for_state(env, 'suspended')
+          env[:ui].info I18n.t('opennebula_provider.info.halt', machine: env[:machine].id)
+          driver = env[:machine].provider.driver
+          driver.stop(env[:machine].id)
           @app.call(env)
         end
       end

data/lib/opennebula-provider/action/{connect_opennebula.rb → wait_for_ssh.rb}

@@ -1,21 +1,17 @@
-require 'opennebula-provider/helpers/rocci'
-
 module VagrantPlugins
   module OpenNebulaProvider
     module Action
-      class ConnectOpenNebula
-        include Helpers::Rocci
-
+      class WaitForSSH
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new('vagrant::provider::opennebula::connect_opennebula')
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::wait_for_ssh')
         end
 
         def call(env)
-          @logger.info('Connecting to OpenNebula')
-          rocci = rocci(env[:machine].provider_config)
-          env[:rocci] = rocci
-
+          env[:ui].info I18n.t('opennebula_provider.info.waiting_for_sshd')
+          unless env[:interrupted]
+            env[:machine].communicate.ready?
+          end
           @app.call(env)
         end
       end

data/lib/opennebula-provider/action/wait_for_state.rb

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module OpenNebulaProvider
+    module Action
+      class WaitForState
+        def initialize(app, env, state)
+          @app = app
+          @state = state
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::wait_for_state')
+        end
+
+        def call(env)
+          driver = env[:machine].provider.driver
+          driver.wait_for_state(env, @state)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/opennebula-provider/action.rb

@@ -1,5 +1,4 @@
 require_relative 'action/check_state'
-require_relative 'action/connect_opennebula'
 require_relative 'action/create'
 require_relative 'action/destroy'
 require_relative 'action/messages'
@@ -7,6 +6,8 @@ require_relative 'action/read_ssh_info'
 require_relative 'action/sync_folders'
 require_relative 'action/start'
 require_relative 'action/stop'
+require_relative 'action/wait_for_state'
+require_relative 'action/wait_for_ssh'
 
 module VagrantPlugins
   module OpenNebulaProvider
@@ -16,7 +17,6 @@ module VagrantPlugins
       def self.destroy
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectOpenNebula
           b.use Call, CheckState do |env, b1|
             case env[:machine_state]
             when :active, :error, :suspended, :inactive
@@ -39,7 +39,6 @@ module VagrantPlugins
       def self.up
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectOpenNebula
           b.use Call, CheckState do |env, b1|
             case env[:machine_state]
             when :active
@@ -49,6 +48,7 @@ module VagrantPlugins
             when :not_created, :inactive
               b1.use Create
             end
+            b1.use WaitForState, 'active'
           end
         end
       end
@@ -56,11 +56,11 @@ module VagrantPlugins
       def self.halt
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectOpenNebula
           b.use Call, CheckState do |env1, b1|
             case env1[:machine_state]
             when :active
               b1.use Stop
+              b1.use WaitForState, 'suspended'
             when :suspended
               b1.use MessageAlreadyHalted
             when :not_created, :inactive
@@ -73,7 +73,6 @@ module VagrantPlugins
       def self.reload
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectOpenNebula
           b.use Call, CheckState do |env1, b1|
             case env1[:machine_state]
             when :not_created
@@ -90,7 +89,6 @@ module VagrantPlugins
       def self.check_state
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectOpenNebula
           b.use CheckState
         end
       end
@@ -98,15 +96,23 @@ module VagrantPlugins
       def self.provision
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Provision
-          b.use SyncFolders
+          b.use Call, CheckState do |env1, b1|
+            case env1[:machine_state]
+            when :not_created, :inactive
+              b1.use MessageNotCreated
+            when :suspended
+              b1.use MessageHalted
+            else
+              b1.use Provision
+              b1.use SyncFolders
+            end
+          end
         end
       end
 
       def self.read_ssh_info
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectOpenNebula
           b.use ReadSSHInfo
         end
       end
@@ -114,7 +120,16 @@ module VagrantPlugins
       def self.ssh
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use SSHExec
+          b.use Call, CheckState do |env1, b1|
+            case env1[:machine_state]
+            when :not_created, :inactive
+              b1.use MessageNotCreated
+            when :suspended
+              b1.use MessageHalted
+            else
+              b1.use SSHExec
+            end
+          end
         end
       end
     end

data/lib/opennebula-provider/driver.rb

@@ -0,0 +1,56 @@
+require 'opennebula-provider/helpers/rocci'
+
+module VagrantPlugins
+  module OpenNebulaProvider
+    class Driver
+      include Vagrant::Util::Retryable
+
+      def initialize
+        @rocci_driver ||= VagrantPlugins::OpenNebulaProvider::Helpers::RocciApi.new
+      end
+
+      def config=(provider_config)
+        @rocci_driver.fill_config(provider_config)
+        @rocci_driver.connect
+      end
+
+      def state(cid)
+        @rocci_driver.machine_state(cid)
+      end
+
+      def create
+        @rocci_driver.compute
+      end
+
+      def delete(cid)
+        @rocci_driver.delete(cid)
+      end
+
+      def start(cid)
+        @rocci_driver.start(cid)
+      end
+
+      def stop(cid)
+        @rocci_driver.stop(cid)
+      end
+
+      def ssh_info(cid)
+        @rocci_driver.ssh_info(cid)
+      end
+
+      def wait_for_state(env, state)
+        retryable(tries: 60, sleep: 2) do
+          next if env[:interrupted]
+          result = @rocci_driver.machine_state(env[:machine].id)
+
+          yield result if block_given?
+          if result != state
+            fail Errors::ComputeError,
+              error: "Can not wait when instance will be in '#{state}' status, " \
+                     "last status is '#{result}'"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opennebula-provider/helpers/rocci.rb

@@ -3,32 +3,33 @@ require 'occi-api'
 module VagrantPlugins
   module OpenNebulaProvider
     module Helpers
-      module Rocci
-        def rocci(provider_config)
-          @rocci ||= RocciApi.new(@machine, provider_config)
-        end
-      end
-
       class RocciApi
-        include Vagrant::Util::Retryable
+        def initialize
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::helpers::rocciapi')
+        end
 
-        def initialize(machine, provider_config)
+        def fill_config(provider_config)
           @logger = Log4r::Logger.new('vagrant::provider::opennebula::helpers::rocciapi')
           @config = provider_config
-          options = {
-            endpoint: @config.endpoint,
+          @options = {
+            endpoint: provider_config.endpoint,
             auth: {
-              type: @config.auth,
-              username: @config.username,
-              password: @config.password
+              type: provider_config.auth,
+              username: provider_config.username,
+              password: provider_config.password
             }
 #              :log => {
 #              :out   => STDERR,
 #              :level => Occi::Api::Log::DEBUG
 #            }
           }
+        end
+
+        def connect
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::helpers::rocciapi')
+          @logger.info 'Connect to RocciServer'
           begin
-            @rocci = Occi::Api::Client::ClientHttp.new(options)
+            @rocci = Occi::Api::Client::ClientHttp.new(@options)
           rescue Errno::ECONNREFUSED => e
             raise Errors::ConnectError, error: e
           rescue Occi::Api::Client::Errors::AuthnError => e
@@ -116,16 +117,6 @@ module VagrantPlugins
           networkinterface[:address]
         end
 
-        def wait_for_state(env, state)
-          retryable(tries: 100, sleep: 6) do
-            next if env[:interrupted]
-            result = machine_state(env[:machine].id)
-
-            yield result if block_given?
-            fail Errors::ComputeError, error: 'Not ready' if result != state
-          end
-        end
-
         private
 
         def action_instance(id, action)

data/lib/opennebula-provider/plugin.rb

@@ -1,4 +1,5 @@
 require_relative 'version'
+require_relative 'driver'
 
 require 'vagrant'
 
@@ -7,15 +8,15 @@ module VagrantPlugins
     class Plugin < Vagrant.plugin('2')
       name 'opennebula-provider'
 
-      provider(:opennebula) do
-        require_relative 'provider'
-        Provider
-      end
-
       config(:opennebula, :provider) do
         require_relative 'config'
         Config
       end
+
+      provider(:opennebula) do
+        require_relative 'provider'
+        Provider
+      end
     end
   end
 end

data/lib/opennebula-provider/provider.rb

@@ -13,16 +13,25 @@ module VagrantPlugins
         nil
       end
 
+      def driver
+        return @driver if @driver
+        @driver = Driver.new
+        @driver.config = @machine.provider_config
+
+        @driver
+      end
+
       def ssh_info
         env = @machine.action('read_ssh_info')
         env[:machine_ssh_info]
       end
 
       def state
-        env = @machine.action('check_state')
-        state = env[:machine_state]
+        state = driver.state(@machine.id)
+
         short = I18n.t("opennebula_provider.states.short_#{state}")
         long = I18n.t("opennebula_provider.states.long_#{state}")
+
         Vagrant::MachineState.new(state, short, long)
       end
     end

data/lib/opennebula-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenNebulaProvider
-    VERSION = '0.2.4'
+    VERSION = '0.3.0'
   end
 end

data/locales/en.yml

@@ -19,6 +19,12 @@ en:
         Instance will not be destroyed, declined
       state: |-
         Instance state is %{state}
+      halt: |-
+        Instance is shutdown...
+      halted: |-
+        Instance is halted
+      start: |-
+        Starting the instance...
       waiting_for_sshd: |-
         Instance is active, waiting for sshd daemon startup...
       rsyncing: |-

data/opennebula-provider.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.version       = VagrantPlugins::OpenNebulaProvider::VERSION
   spec.authors       = ['Cherdancev Evgeni']
   spec.email         = ['cyber@sibnet.ru']
-  spec.description   = %q{OpenNebula provider for Vagrant}
+  spec.description   = %q(OpenNebula provider for Vagrant)
   spec.summary       = spec.description
   spec.homepage      = ''
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-provider
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Cherdancev Evgeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -84,7 +84,6 @@ files:
 - lib/opennebula-provider.rb
 - lib/opennebula-provider/action.rb
 - lib/opennebula-provider/action/check_state.rb
-- lib/opennebula-provider/action/connect_opennebula.rb
 - lib/opennebula-provider/action/create.rb
 - lib/opennebula-provider/action/destroy.rb
 - lib/opennebula-provider/action/messages.rb
@@ -92,7 +91,10 @@ files:
 - lib/opennebula-provider/action/start.rb
 - lib/opennebula-provider/action/stop.rb
 - lib/opennebula-provider/action/sync_folders.rb
+- lib/opennebula-provider/action/wait_for_ssh.rb
+- lib/opennebula-provider/action/wait_for_state.rb
 - lib/opennebula-provider/config.rb
+- lib/opennebula-provider/driver.rb
 - lib/opennebula-provider/errors.rb
 - lib/opennebula-provider/helpers/rocci.rb
 - lib/opennebula-provider/plugin.rb