opennebula-provider 0.3.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18120f65713e4caff7bf5042be0f6c94ae768e64
-  data.tar.gz: c44850849cf4844d1ebb451b3edd3e8ce2f461cf
+  metadata.gz: d54ad5437c3357301e0f52b252dc1eee03103c3d
+  data.tar.gz: f5c1b7451fb8ff82fa58745272f68fc715f94776
 SHA512:
-  metadata.gz: 6f5fdc6707290d15eb51a451e924bc552ce9900fb098b36b1f66db7d392aca80204c5bb69448264ce345f081e98bcdc5be7a4c67dd4d141436fe41790a594284
-  data.tar.gz: 50b196264ceec8d7eedb8c861f9dd90da705fd28f566cadc97ed94125ea11b691d2a717ee0f264f7c414991d58a5f385a6b4aab01d9d9658a4f0057040bd114a
+  metadata.gz: 87d820a1495222852e53775ce75d96828447f3669b749ffdc0d7aadd0388b167af527cdbc215eb0027abdbce1083edabdc20a58de2eabd7b247e751194066c83
+  data.tar.gz: fed987dd54af464b87d82c073955aaacea94f2387cdf8dc1b8eac64b1e261364d37d94ae4473e2146351e89d503c784311ba29f4121c9a24aaf18e00dcd151c7

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'occi-api'
-
 group :development do
+  gem 'fog'
+  gem 'opennebula'
   gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
   gem 'vagrant-spec', :git => 'https://github.com/mitchellh/vagrant-spec.git'
 end

data/README.md

@@ -1,11 +1,9 @@
 # OpenNebula::Provider
 
-[![Gem Version](https://badge.fury.io/rb/opennebula-provider.svg)](https://rubygems.org/gems/opennebula-provider) 
+[![Gem Version](https://badge.fury.io/rb/opennebula-provider.svg)](https://rubygems.org/gems/opennebula-provider)
 
 This is a Vagrant 1.5+ plugin that add an OpenNebula provider to Vagrant.
 
-**NOTE:** This plugin requires occi-api gem and works with [rOCCI-server](https://github.com/gwdg/rOCCI-server/).
-
 ## Features
 
 * Boot OpenNebula instances
@@ -33,31 +31,33 @@ Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
 
   config.vm.provider :opennebula do |one, override|
-    one.endpoint = 'http://rOCCI-server:PORT'
+    one.endpoint = 'http://opennebula.server:2633/RPC2'
     one.username = 'YOUR NAME'
     one.password = 'YOUR PASSWORD'
-    one.os_tpl = 'OS template'
+    one.template_id = 123
+    one.title = 'my vm'
   end
 end
 ```
 
 ## Configuration
 
-* `endpoint` - rOCCI server url
+* `endpoint` - OpenNebula RPC endpoint (like 'http://127.0.0.1:2633/RPC2')
 * `username` - OpenNebula username
 * `password` - OpenNebula password
-* `auth` - OpenNebula authorization method, default: basic
-* `os_tpl` - OpenNebula os template
-* `resource_tpl` - OpenNebula resource template, default: small
+* `template_id` - OpenNebula template id
 * `title` - OpenNebula instance name
+* `memory` - An instance memory in MB
+* `cpu` - An instance cpus
+* `vcpu` - An instance virtual cpus
 
-You can use ONE_USER, ONE_PASSWORD, ONE_ENDPOINT environment variables
+You can use ONE_USER, ONE_PASSWORD, ONE_XMLRPC (or ONE_ENDPOINT) environment variables
 instead of defining it in Vagrantfile.
 However, Vagrantfile's provider config has more priority.
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/opennebula-provider/fork )
+1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/opennebula-provider/action.rb

@@ -3,9 +3,11 @@ require_relative 'action/create'
 require_relative 'action/destroy'
 require_relative 'action/messages'
 require_relative 'action/read_ssh_info'
+require_relative 'action/resume'
 require_relative 'action/sync_folders'
 require_relative 'action/start'
 require_relative 'action/stop'
+require_relative 'action/suspend'
 require_relative 'action/wait_for_state'
 require_relative 'action/wait_for_ssh'
 
@@ -19,7 +21,7 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use Call, CheckState do |env, b1|
             case env[:machine_state]
-            when :active, :error, :suspended, :inactive
+            when :active, :error, :suspended, :inactive, :stopped
               b1.use Call, DestroyConfirm do |env1, b2|
                 if env1[:result]
                   b2.use Destroy
@@ -44,11 +46,22 @@ module VagrantPlugins
             when :active
               b1.use MessageAlreadyCreated
             when :suspended
+              # TODO: uncomment this with patching fog
+              # b1.use Resume
+            when :stopped
               b1.use Start
             when :not_created, :inactive
               b1.use Create
+            when :error    # in state FAILED
+              b1.use MessageInErrorState
+              next
+            end
+            b1.use Call, WaitForState, :active do |env1, b2|
+              if env1[:machine_state] == :error
+                b2.use MessageInErrorState
+                next
+              end
             end
-            b1.use WaitForState, 'active'
           end
         end
       end
@@ -60,8 +73,10 @@ module VagrantPlugins
             case env1[:machine_state]
             when :active
               b1.use Stop
-              b1.use WaitForState, 'suspended'
+              b1.use WaitForState, :stopped
             when :suspended
+              b1.use MessageSuspended
+            when :stopped
               b1.use MessageAlreadyHalted
             when :not_created, :inactive
               b1.use MessageNotCreated
@@ -70,6 +85,42 @@ module VagrantPlugins
         end
       end
 
+      def self.suspend
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, CheckState do |env1, b1|
+            case env1[:machine_state]
+            when :active
+              # TODO: uncomment this with patching fog
+              # b1.use Suspend
+              # b1.use WaitForState, :suspended
+            when :suspended
+              b1.use MessageAlreadySuspended
+            when :not_created, :inactive
+              b1.use MessageNotCreated
+            end
+          end
+        end
+      end
+
+      def self.resume
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, CheckState do |env1, b1|
+            case env1[:machine_state]
+            when :suspended
+              # TODO: uncomment this with patching fog
+              # b1.use Resume
+              # b1.use WaitForState, :active
+            when :stopped
+              b1.use MessageHalted
+            when :not_created, :inactive
+              b1.use MessageNotCreated
+            end
+          end
+        end
+      end
+
       def self.reload
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
@@ -101,6 +152,8 @@ module VagrantPlugins
             when :not_created, :inactive
               b1.use MessageNotCreated
             when :suspended
+              b1.use MessageSuspended
+            when :stopped
               b1.use MessageHalted
             else
               b1.use Provision
@@ -112,7 +165,6 @@ module VagrantPlugins
 
       def self.read_ssh_info
         Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
           b.use ReadSSHInfo
         end
       end
@@ -125,7 +177,9 @@ module VagrantPlugins
             when :not_created, :inactive
               b1.use MessageNotCreated
             when :suspended
-              b1.use MessageHalted
+              b1.use MessageSuspended
+            when :stopped
+              b1.use MessageStopped
             else
               b1.use SSHExec
             end

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

@@ -16,8 +16,7 @@ module VagrantPlugins
         def check_state(machine)
           return :not_created unless machine.id
           driver = machine.provider.driver
-          state = driver.state(machine.id)
-          state.to_sym
+          driver.state(machine.id)
         end
       end
     end

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

@@ -34,6 +34,17 @@ module VagrantPlugins
         end
       end
 
+      class MessageAlreadySuspended
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.already_suspended')
+          @app.call(env)
+        end
+      end
+
       class MessageNotCreated
         def initialize(app, env)
           @app = app
@@ -56,6 +67,17 @@ module VagrantPlugins
         end
       end
 
+      class MessageSuspended
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.suspended')
+          @app.call(env)
+        end
+      end
+
       class MessageHalted
         def initialize(app, env)
           @app = app
@@ -66,6 +88,17 @@ module VagrantPlugins
           @app.call(env)
         end
       end
+
+      class MessageInErrorState
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.error')
+          @app.call(env)
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module OpenNebulaProvider
+    module Action
+      class Resume
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::resume')
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.resume', machine: env[:machine].id)
+          driver = env[:machine].provider.driver
+          driver.resume(env[:machine].id)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module OpenNebulaProvider
+    module Action
+      class Suspend
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::suspend')
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.suspend', machine: env[:machine].id)
+          driver = env[:machine].provider.driver
+          driver.suspend(env[:machine].id)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,10 @@ module VagrantPlugins
 
         def call(env)
           driver = env[:machine].provider.driver
-          driver.wait_for_state(env, @state)
+          driver.wait_for_state(env, @state) do |last_state|
+#            env[:machine_state] = last_state.to_sym
+            break if last_state == :error
+          end
           @app.call(env)
         end
       end

data/lib/opennebula-provider/config.rb

@@ -5,18 +5,29 @@ module VagrantPlugins
       attr_accessor :auth
       attr_accessor :username
       attr_accessor :password
+      attr_accessor :template
+      attr_accessor :template_id
+      attr_accessor :template_name
       attr_accessor :os_tpl
       attr_accessor :resource_tpl
       attr_accessor :title
+      attr_accessor :memory
+      attr_accessor :cpu
+      attr_accessor :vcpu
 
       def initialize
-        @endpoint = ENV['ONE_ENDPOINT'] || UNSET_VALUE
+        @endpoint = ENV['ONE_XMLRPC'] || ENV['ONE_ENDPOINT'] || UNSET_VALUE
         @auth = UNSET_VALUE
         @username = ENV['ONE_USER'] || UNSET_VALUE
         @password = ENV['ONE_PASSWORD'] || UNSET_VALUE
+        @template_id = UNSET_VALUE
+        @template_name = UNSET_VALUE
         @os_tpl = UNSET_VALUE
         @resource_tpl = UNSET_VALUE
         @title = UNSET_VALUE
+        @memory = UNSET_VALUE
+        @cpu = UNSET_VALUE
+        @vcpu = UNSET_VALUE
       end
 
       def finalize!
@@ -24,9 +35,23 @@ module VagrantPlugins
         @auth = 'basic' if @auth == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @password = nil if @password == UNSET_VALUE
-        @os_tpl = nil if @os_tpl == UNSET_VALUE
+        @template_id = nil if @template_id == UNSET_VALUE
+        @template_name = nil if @template_name == UNSET_VALUE
+        if @template_id
+          @template = @template_id
+        elsif @template_name
+          @template = @template_name
+        elsif @template == UNSET_VALUE
+          @template = nil
+        end
         @resource_tpl = 'small' if @resource_tpl == UNSET_VALUE
         @title = nil if @title == UNSET_VALUE
+        @memory = nil if @memory == UNSET_VALUE
+        @vcpu = nil if @vcpu == UNSET_VALUE
+        @cpu = nil if @cpu == UNSET_VALUE
+        if @cpu && ! @vcpu
+          @vcpu = @cpu
+        end
       end
 
       def validate(machine)
@@ -34,7 +59,8 @@ module VagrantPlugins
         errors << I18n.t('opennebula_provider.config.endpoint') unless @endpoint
         errors << I18n.t('opennebula_provider.config.username') unless @username
         errors << I18n.t('opennebula_provider.config.password') unless @password
-        errors << I18n.t('opennebula_provider.config.os_tpl') unless @os_tpl
+        errors << I18n.t('opennebula_provider.config.template') unless @template
+        errors << I18n.t('opennebula_provider.config.title') unless @title
 
         { 'OpenNebula provider' => errors }
       end

data/lib/opennebula-provider/driver.rb

@@ -1,4 +1,4 @@
-require 'opennebula-provider/helpers/rocci'
+require 'opennebula-provider/helpers/fog'
 
 module VagrantPlugins
   module OpenNebulaProvider
@@ -6,48 +6,64 @@ module VagrantPlugins
       include Vagrant::Util::Retryable
 
       def initialize
-        @rocci_driver ||= VagrantPlugins::OpenNebulaProvider::Helpers::RocciApi.new
+        @fog_driver ||= VagrantPlugins::OpenNebulaProvider::Helpers::FogApi.new
       end
 
-      def config=(provider_config)
-        @rocci_driver.fill_config(provider_config)
-        @rocci_driver.connect
+      def config=(config)
+        @fog_driver.config = config
+      end
+
+      def provider_config=(provider_config)
+        @fog_driver.provider_config = provider_config
+      end
+
+      def connect
+        @fog_driver.connect
       end
 
       def state(cid)
-        @rocci_driver.machine_state(cid)
+        @fog_driver.machine_state(cid)
       end
 
       def create
-        @rocci_driver.compute
+        @fog_driver.compute
       end
 
       def delete(cid)
-        @rocci_driver.delete(cid)
+        @fog_driver.delete(cid)
       end
 
       def start(cid)
-        @rocci_driver.start(cid)
+        @fog_driver.start(cid)
       end
 
       def stop(cid)
-        @rocci_driver.stop(cid)
+        @fog_driver.stop(cid)
+      end
+
+      def suspend(cid)
+        @fog_driver.suspend(cid)
+      end
+
+      def resume(cid)
+        @fog_driver.resume(cid)
       end
 
       def ssh_info(cid)
-        @rocci_driver.ssh_info(cid)
+        @fog_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)
+          env[:machine_state] = @fog_driver.machine_state(env[:machine].id)
+
+          yield env[:machine_state] if block_given?
 
-          yield result if block_given?
-          if result != state
+          if env[:machine_state] != state
             fail Errors::ComputeError,
               error: "Can not wait when instance will be in '#{state}' status, " \
-                     "last status is '#{result}'"
+                     "last status is '#{env[:machine_state]}'"
           end
         end
       end

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

@@ -0,0 +1,149 @@
+require 'fog'
+
+module VagrantPlugins
+  module OpenNebulaProvider
+    module Helpers
+      class FogApi
+        attr_accessor :config
+
+        def initialize
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::helpers::fog')
+        end
+
+        def provider_config=(provider_config)
+          @provider_config = provider_config
+          @options = {
+            provider: 'OpenNebula',
+            opennebula_endpoint: provider_config.endpoint,
+            opennebula_username: provider_config.username,
+            opennebula_password: provider_config.password
+          }
+        end
+
+        def connect
+          @logger = Log4r::Logger.new('vagrant::provider::opennebula::helpers::fog')
+          @logger.info 'Connect to OpenNebula RPC'
+          @fog_client = Fog::Compute.new(@options)
+          rc = @fog_client.client.get_version
+          if rc.is_a?(OpenNebula::Error)
+            case rc.errno
+            when 256
+                raise Errors::AuthError, error: rc.message
+            when 4369
+                raise Errors::ConnectError, error: rc.message
+            end
+          end
+        end
+
+        def compute
+          @logger.info 'compute!'
+          newvm = @fog_client.servers.new
+          if @provider_config.template_id
+            newvm.flavor = @fog_client.flavors.get @provider_config.template_id
+          elsif @provider_config.template_name
+            newvm.flavor = @fog_client.flavors.get_by_filter({name: @provider_config.template_name})
+          end
+          if newvm.flavor.nil?
+            fail Errors::ComputeError, error: I18n.t('opennebula_provider.compute.template_missing', template: @provider_config.template)
+          end
+
+          newvm.name = @provider_config.title if @provider_config.title
+          if @config.vm.hostname != nil
+            newvm.flavor.context = (newvm.flavor.context).merge({ 'SET_HOSTNAME' => @config.vm.hostname })
+          end
+          newvm.flavor.memory = @provider_config.memory unless @provider_config.memory.nil?
+          newvm.flavor.cpu = @provider_config.cpu unless @provider_config.cpu.nil?
+          newvm.flavor.vcpu = @provider_config.vcpu unless @provider_config.vcpu.nil?
+          vm = newvm.save
+          vm.id
+        rescue RuntimeError => e
+          raise Errors::ComputeError, error: e
+        end
+
+        def stop(id)
+          @logger.info 'stop!'
+          @fog_client.servers.get(id).stop
+        end
+
+        def start(id)
+          @logger.info 'start!'
+          @fog_client.servers.get(id).start
+        end
+
+        def delete(id)
+          @logger.info 'delete!'
+          @fog_client.servers.get(id).destroy
+        end
+
+        def suspend(id)
+          @logger.info 'suspend!'
+          @fog_client.servers.get(id).suspend
+        end
+
+        def resume(id)
+          @logger.info 'resume!'
+          @fog_client.servers.get(id).resume
+        end
+
+        def machine_state(id)
+          if id
+            begin
+              desc = @fog_client.servers.get(id)  #state LCM_INIT & RUNNING  status 7 && UNDEPLOYED
+            rescue ArgumentError => e
+              raise Errors::ResourceError, error: e
+            end
+            return :not_created if desc.nil?
+
+            return get_pretty_status(desc.state, desc.status)
+          else
+            return :not_created
+          end
+        end
+
+        def ssh_info(id)
+          desc = @fog_client.servers.get(id)
+          desc.ip
+        end
+
+        private
+        def get_pretty_status(state, status)
+          pretty = "#{state}_#{status}"
+          case state
+          when 'LCM_INIT'
+            case status
+            when 1
+              pretty = 'pending'
+            when 4
+              pretty = 'stopped'
+            when 5
+              pretty = 'suspended'
+            when 7
+              pretty = 'error'
+            end
+          when 'PROLOG'
+            case status
+            when 3
+              pretty = 'prolog'
+            end
+          when 'BOOT'
+            case status
+            when 3
+              pretty = 'boot'
+            end
+          when 'RUNNING'
+            case status
+            when 3
+              pretty = 'active'
+            end
+          when 'BOOT_STOPPED_FAILURE'
+            case status
+            when 3
+              pretty = 'error'
+            end
+          end
+          pretty.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/opennebula-provider/provider.rb

@@ -16,7 +16,9 @@ module VagrantPlugins
       def driver
         return @driver if @driver
         @driver = Driver.new
-        @driver.config = @machine.provider_config
+        @driver.config = @machine.config
+        @driver.provider_config = @machine.provider_config
+        @driver.connect
 
         @driver
       end

data/lib/opennebula-provider/version.rb

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

data/locales/en.yml

@@ -8,11 +8,13 @@ en:
       not_created: |-
         Instance is not created
       already_created: |-
-        Instance already created
+        Instance is already created
       already_destroyed: |-
-        Instance already destroyed
+        Instance is already destroyed
       already_halted: |-
-        Instance already halted
+        Instance is already halted
+      already_suspended: |-
+        Instance is already suspended
       destroying: |-
         Instance %{machine} is destroying...
       will_not_destroy: |-
@@ -25,6 +27,12 @@ en:
         Instance is halted
       start: |-
         Starting the instance...
+      suspend: |-
+        Instance is suspending...
+      suspended: |-
+        Instance is suspended
+      resume: |-
+        Resuming instance...
       waiting_for_sshd: |-
         Instance is active, waiting for sshd daemon startup...
       rsyncing: |-
@@ -32,6 +40,8 @@ en:
       rsync_not_found_warning: |-
         Warning! Folder sync disabled because the rsync binary is missing in the %{side}.
         Make sure rsync is installed and the binary can be found in the PATH.
+      error: |-
+        The instance is in error state
 
     states:
       short_not_created: |-
@@ -62,12 +72,22 @@ en:
       short_error: |-
         error
       long_error: |-
-        The OpenNebula instance cannot be started
+        The OpenNebula instance is can not start
+
+      short_stopped: |-
+        stopped
+      long_stopped: |-
+        The OpenNebula instance is in stopped state (halted)
 
       short_suspended: |-
         suspended
       long_suspended: |-
-        The OpenNebula instance is suspended or halted
+        The OpenNebula instance is suspended
+
+      short_LCM_INIT_7: |-
+        FAILED
+      long_LCM_INIT_7: |-
+        The OpenNebula instance is in FAILED state
 
     config:
       endpoint: |-
@@ -76,12 +96,14 @@ en:
         Username is not set
       password: |-
         Password is not set
-      os_tpl: |-
-        An os template must defined via "os_tpl"
+      template: |-
+        An template must defined via "template_id" or "template_name"
+      title: |-
+        VM title is not set
 
     compute:
-      os_missing: |-
-        Os template "%{template}" is not defined in OpenNebula
+      template_missing: |-
+        Template "%{template}" is not defined in OpenNebula
       resource_size_missing: |-
         Resource size "%{template}" is not defined in rOCCI-server
 

data/opennebula-provider.gemspec

@@ -44,7 +44,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency     'occi-api', '~> 4.2'
+  spec.add_runtime_dependency     'opennebula', '~> 4.14'
+  spec.add_runtime_dependency     'fog', '~> 1.38', '>= 1.38.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 0'

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-provider
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Cherdancev Evgeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: occi-api
+  name: opennebula
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.14'
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.38.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.38.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,15 +108,17 @@ files:
 - lib/opennebula-provider/action/destroy.rb
 - lib/opennebula-provider/action/messages.rb
 - lib/opennebula-provider/action/read_ssh_info.rb
+- lib/opennebula-provider/action/resume.rb
 - lib/opennebula-provider/action/start.rb
 - lib/opennebula-provider/action/stop.rb
+- lib/opennebula-provider/action/suspend.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/helpers/fog.rb
 - lib/opennebula-provider/plugin.rb
 - lib/opennebula-provider/provider.rb
 - lib/opennebula-provider/version.rb
@@ -122,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: OpenNebula provider for Vagrant

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

@@ -1,136 +0,0 @@
-require 'occi-api'
-
-module VagrantPlugins
-  module OpenNebulaProvider
-    module Helpers
-      class RocciApi
-        def initialize
-          @logger = Log4r::Logger.new('vagrant::provider::opennebula::helpers::rocciapi')
-        end
-
-        def fill_config(provider_config)
-          @logger = Log4r::Logger.new('vagrant::provider::opennebula::helpers::rocciapi')
-          @config = provider_config
-          @options = {
-            endpoint: provider_config.endpoint,
-            auth: {
-              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)
-          rescue Errno::ECONNREFUSED => e
-            raise Errors::ConnectError, error: e
-          rescue Occi::Api::Client::Errors::AuthnError => e
-            raise Errors::AuthError, error: e
-          end
-        end
-
-        def compute
-          @logger.info 'compute!'
-          cmpt = @rocci.get_resource 'compute'
-
-          os = @rocci.get_mixin @config.os_tpl, 'os_tpl'
-          unless os
-            mixins = @rocci.get_mixins 'os_tpl'
-            mixins.each do |mixin|
-              if mixin.title == @config.os_tpl
-                os = @rocci.get_mixin mixin.term, 'os_tpl'
-              end
-            end
-            fail Errors::ComputeError, error: I18n.t('opennebula_provider.compute.os_missing', template: @config.os_tpl) unless os
-          end
-
-          size = @rocci.get_mixin @config.resource_tpl, 'resource_tpl'
-          unless size
-            fail Errors::ComputeError, error: I18n.t('opennebula_provider.compute.resource_size_missing', template: @config.resource_tpl)
-          end
-
-          cmpt.mixins << os << size
-          cmpt.title = @config.title if @config.title
-          cmpt_loc = @rocci.create cmpt
-          @logger.info "Location of new compute resource: #{cmpt_loc}"
-          cmpt_loc
-        rescue RuntimeError => e
-          case e.message
-          when /(?<ms>\[VirtualMachineAllocate\])/
-            message_scope = $LAST_MATCH_INFO[:ms]
-            case e.message
-            when /quota/
-              raise Errors::QuotaError, error: e.message.split(message_scope)[1].to_s
-            else
-              raise Errors::AllocateError, error: e
-            end
-          end
-          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 machine_state(id)
-          if id
-            begin
-              desc = @rocci.describe id
-            rescue ArgumentError => e
-              raise Errors::ResourceError, error: e
-            end
-            return :not_created if desc.empty?
-            return desc.first.attributes.occi.compute.state
-          else
-            return :not_created
-          end
-        end
-
-        def ssh_info(id)
-          desc = describe_resource(id)
-          networkinterface = desc.first.links.map do |link|
-            if link.attributes.occi.key?(:networkinterface)
-              link.attributes.occi.networkinterface
-            else
-              nil
-            end
-          end.reject! { |n| n.nil? }.first
-          networkinterface[:address]
-        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
-end