opennebula-provider 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae90815076cc487d10199bed0a3ff1d8dbd81a1
-  data.tar.gz: 575a144fdd4436e0f18246a33ea8de5bd8a7d61b
+  metadata.gz: 092426db2ef0d08775ed8a7cdd03981b43807e69
+  data.tar.gz: 3d59ec44e5a34b8760aafdde8959a937d83db42b
 SHA512:
-  metadata.gz: e8b14749cdfa2ee3f57b6f047d74dab81b9402ae57a8b0999fddb884efac5fb7945deeedbe1398286b61ea91165ff6583a1021bb3741cc56c2651a65b9727b09
-  data.tar.gz: 767e5d43bd71c92f0bd6b2211469271ac27d1b7200e4c8bb7dd4cb6f5c5fc76342565f1ec382d137da76d8cdb00270d5c7c33056e8d7098f6c8555321ae85672
+  metadata.gz: 3ee472688c017ef639fa7bbc8e068bc35de95890d1609138e7f42bd6f833f33876b898b8a7ea2dddc9a9acf9e2b9725c897b3fee27356ee1fcb6b8eca01e2f38
+  data.tar.gz: 87eff7f92549fa85da7f426ac3179e18f24bc5c763754d327cc3428c9aadbed1ba988c594b17ecd56ad0ac661e2d6145efae145adfcd2def457dcfa371006005

data/lib/opennebula-provider/action.rb

@@ -2,8 +2,11 @@ require_relative 'action/check_state'
 require_relative 'action/connect_opennebula'
 require_relative 'action/create'
 require_relative 'action/destroy'
+require_relative 'action/messages'
 require_relative 'action/read_ssh_info'
 require_relative 'action/sync_folders'
+require_relative 'action/start'
+require_relative 'action/stop'
 
 module VagrantPlugins
   module OpenNebulaProvider
@@ -17,8 +20,11 @@ module VagrantPlugins
             b1.use ConnectOpenNebula
             b1.use Call, CheckState do |env2, b2|
               case env2[:machine_state]
-              when :active
+              when :active, :error, :suspended, :inactive
                 b2.use Destroy
+                b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
+              when :not_created
+                b2.use MessageAlreadyDestroyed
               end
             end
           end
@@ -32,14 +38,50 @@ module VagrantPlugins
           b.use Call, CheckState do |env, b1|
             case env[:machine_state]
             when :active
-              p 'active' # TODO, use logger
-            when :not_created
+              b1.use MessageAlreadyCreated
+            when :suspended
+              b1.use Start
+            when :not_created, :inactive
               b1.use Create
             end
           end
         end
       end
 
+      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
+            when :suspended
+              b1.use MessageAlreadyHalted
+            when :not_created, :inactive
+              b1.use MessageNotCreated
+            end
+          end
+        end
+      end
+
+      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
+              b1.use MessageNotCreated
+              next
+            end
+
+            b1.use halt
+            b1.use up
+          end
+        end
+      end
+
       def self.check_state
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate

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

@@ -10,8 +10,16 @@ module VagrantPlugins
         def call(env)
           @logger.info I18n.t('opennebula_provider.info.creating')
           result = env[:rocci].compute
-          env[:rocci].wait_for_event(env, result)
           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
           @app.call(env)
         end
       end

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

@@ -4,7 +4,7 @@ module VagrantPlugins
       class Destroy
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new('vagrant::provider::opennebula::create')
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::destroy')
         end
 
         def call(env)

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

@@ -0,0 +1,48 @@
+module VagrantPlugins
+  module OpenNebulaProvider
+    module Action
+      class MessageAlreadyCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.already_created')
+          @app.call(env)
+        end
+      end
+
+      class MessageAlreadyDestroyed
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.already_destroyed')
+          @app.call(env)
+        end
+      end
+
+      class MessageAlreadyHalted
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.already_halted')
+          @app.call(env)
+        end
+      end
+      class MessageNotCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.not_created')
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module VagrantPlugins
+  module OpenNebulaProvider
+    module Action
+      class Start
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::start')
+        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
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module OpenNebulaProvider
+    module Action
+      class Stop
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::stop')
+        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')
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -75,15 +75,21 @@ module VagrantPlugins
           raise Errors::ComputeError, error: e
         end
 
+        def stop(id)
+          @logger.info 'stop!'
+          @rocci.trigger id, action_instance(id, 'stop')
+        end
+
+        def start(id)
+          @logger.info 'start!'
+          @rocci.trigger id, action_instance(id, 'start')
+        end
+
         def delete(id)
           @logger.info 'delete!'
           @rocci.delete id
         end
 
-        def describe_resource(resource)
-          @rocci.describe resource
-        end
-
         def machine_state(id)
           if id
             begin
@@ -110,18 +116,29 @@ module VagrantPlugins
           networkinterface[:address]
         end
 
-        def wait_for_event(env, id)
-          retryable(tries: 120, sleep: 10) do
-            # stop waiting if interrupted
+        def wait_for_state(env, state)
+          retryable(tries: 10, sleep: 6) do
             next if env[:interrupted]
-
-            # check event status
-            result = machine_state(id)
+            result = machine_state(env[:machine].id)
 
             yield result if block_given?
-            fail 'not ready' if result != 'active'
+            fail Errors::ComputeError, error: 'Not ready' if result != state
           end
         end
+
+        private
+
+        def action_instance(id, action)
+          desc = describe_resource(id)
+          action_ = desc.first.actions.map do |ai|
+            ai.term == action ? ai : nil
+          end.compact.first
+          Occi::Core::ActionInstance.new action_, nil
+        end
+
+        def describe_resource(resource)
+          @rocci.describe resource
+        end
       end
     end
   end

data/lib/opennebula-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenNebulaProvider
-    VERSION = '0.1.9'
+    VERSION = '0.2.0'
   end
 end

data/locales/en.yml

@@ -7,10 +7,18 @@ en:
         Creating a new instance...
       not_created: |-
         Instance is not created
+      already_created: |-
+        Instance already created
+      already_destroyed: |-
+        Instance already destroyed
+      already_halted: |-
+        Instance already halted
       destroying: |-
-        Machine %{machine} is destroying...
+        Instance %{machine} is destroying...
       state: |-
-        Machine state is %{state}
+        Instance state is %{state}
+      waiting_for_sshd: |-
+        Instance is active, waiting for sshd daemon startup...
       rsyncing: |-
         Rsyncing folder: %{hostpath} => %{guestpath}...
       rsync_not_found_warning: |-
@@ -33,11 +41,26 @@ en:
       long_active: |-
         Instance is active
 
+      short_waiting: |-
+        waiting
+      long_waiting: |-
+        Instance is waiting to create or boot
+
       short_running: |-
         running
       long_running: |-
         The OpenNebula instance is running
 
+      short_error: |-
+        error
+      long_error: |-
+        The OpenNebula instance cannot be started
+
+      short_suspended: |-
+        suspended
+      long_suspended: |-
+        The OpenNebula instance is suspended or halted
+
     config:
       endpoint: |-
         rOCCI-server endpoint is not set

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-provider
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Cherdancev Evgeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OpenNebula provider for Vagrant
@@ -73,30 +73,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE.txt
+- locales/en.yml
 - README.md
-- Rakefile
-- boxes/dummy/README.md
+- Gemfile
 - boxes/dummy/dummy.box
 - boxes/dummy/metadata.json
-- lib/opennebula-provider.rb
-- lib/opennebula-provider/action.rb
+- boxes/dummy/README.md
+- lib/opennebula-provider/version.rb
+- lib/opennebula-provider/errors.rb
+- lib/opennebula-provider/plugin.rb
+- lib/opennebula-provider/helpers/rocci.rb
+- lib/opennebula-provider/action/stop.rb
+- lib/opennebula-provider/action/destroy.rb
 - lib/opennebula-provider/action/check_state.rb
+- lib/opennebula-provider/action/read_ssh_info.rb
 - lib/opennebula-provider/action/connect_opennebula.rb
+- lib/opennebula-provider/action/messages.rb
 - lib/opennebula-provider/action/create.rb
-- lib/opennebula-provider/action/destroy.rb
-- lib/opennebula-provider/action/read_ssh_info.rb
+- lib/opennebula-provider/action/start.rb
 - lib/opennebula-provider/action/sync_folders.rb
+- lib/opennebula-provider/action.rb
 - lib/opennebula-provider/config.rb
-- lib/opennebula-provider/errors.rb
-- lib/opennebula-provider/helpers/rocci.rb
-- lib/opennebula-provider/plugin.rb
 - lib/opennebula-provider/provider.rb
-- lib/opennebula-provider/version.rb
-- locales/en.yml
+- lib/opennebula-provider.rb
 - opennebula-provider.gemspec
+- Rakefile
+- .gitignore
 homepage: ''
 licenses:
 - MIT
@@ -107,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: OpenNebula provider for Vagrant