vagrant-openstack-provider 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6f67721a60001e4be971af684ea45cde415f0a3d
-  data.tar.gz: afcfda525e9e92210a028de2fd6a0507a8ba8ede
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjA4MjM1MzJiZGI0MWJlNWMzMTQxNDI5M2NmZmY3MTA3YzE0MWU0Mw==
+  data.tar.gz: !binary |-
+    M2U3ZDFiNzA0YWRhMWU4OTA1ZTJjYmUwZWQxMDNkMzQ4NGNhYTUyMQ==
 SHA512:
-  metadata.gz: cb94233253f0602739ece3d40f9224d10a9f210f00c343ba535fd3e79a7b6322f7215a5651b159d249b395568abeac591c15215d51166b6f1563291d6e828ae2
-  data.tar.gz: 97b7d686f7be2b2cc4623ba8250e06c6096d5c218db9b7e2e42d01399b79a21091230e267e1298f7e30e8b7cd100bb2eb33d7ff1601b5933260d4b7072015d49
+  metadata.gz: !binary |-
+    ODJkZGMzYzNiNzA0ZTdlMDAxNzA1ODIzYTQ0YTQ4Mjc2MDJmMmY1ZjY3ZDJh
+    NzM2YWM5MzgzODQ4ODZkMzU2NzVmZTcwMzc1N2VmOGQxYjRiZmE2NzBkZTMy
+    NWZlYTNjYzZiZWVhYWZjMjQwYTgyMDdjMjQwOTNkMmE3Y2NmOWM=
+  data.tar.gz: !binary |-
+    MThiZjUyYjU1NmY2M2JkYjAxOTcwYzczM2I1YTAzYTAyNjYwODQ1Njg0ZWYw
+    ZGY3M2I0YmE0ZmEwODBlZTdlOGEzYjkxNDAwNjY3MzIzMjY3ZTIxZWRkNmEz
+    OTJiYmVmNzY3ZWM2ZWQwZTMyM2MxYjEzYTI0YzliMGJkMGE1OTE=

data/.rubocop.yml

@@ -0,0 +1,28 @@
+AllCops:
+  Exclude:
+    - 'out/**/*'
+
+Style/FileName:
+  Enabled: false
+
+Style/Encoding:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/ClassLength:
+  Max: 300
+
+Style/CyclomaticComplexity:
+  Severity: warning
+  Max: 10
+
+Style/MethodLength:
+  Max: 50
+
+Style/LineLength:
+  Max: 150
+
+Style/ParameterLists:
+  Max: 6

data/Appraisals

@@ -1,13 +1,13 @@
 appraise "latest-stable" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.2'
+  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.3'
 end
 
 # Oldest (current release)
 appraise "oldest-current" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.4.0'
+  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.5.4'
 end
 
 # Latest patch (previous release)
 appraise "previous-release" do
-  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :branch => 'v1.3.5'
+  gem "vagrant", :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.4.3'
 end

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.0 (June 26, 2014)
+
+https://github.com/ggiamarchi/vagrant-openstack-provider/releases/tag/v0.2.0
+
 # 0.1.2 (April 25, 2014)
 
 IMPROVEMENTS:

data/Gemfile

@@ -4,8 +4,11 @@ gemspec
 
 gem "appraisal", "1.0.0"
 gem "restclient", "0.10.0"
+gem 'webmock', '~> 1.18.0', :group => [:test]
+gem "rubocop", '0.23.0', require: false
 gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 
+
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.
@@ -8,7 +9,7 @@ $stdout.sync = true
 $stderr.sync = true
 
 # Change to the directory of this file.
-Dir.chdir(File.expand_path("../", __FILE__))
+Dir.chdir(File.expand_path('../', __FILE__))
 
 # This installs the tasks that help with gem creation and
 # publishing.
@@ -17,5 +18,8 @@ Bundler::GemHelper.install_tasks
 # Install the `spec` task so that we can run tests.
 RSpec::Core::RakeTask.new
 
+# Install the `rubocop` task
+RuboCop::RakeTask.new
+
 # Default task is to run the unit tests
-task :default => "spec"
+task default: %w(rubocop spec)

data/Vagrantfile

@@ -12,26 +12,15 @@ Vagrant.configure("2") do |config|
 
     os.server_name = "vagrant-os-plugin-test"
     os.username = ENV['OS_USERNAME']
-    os.floating_ip = "185.39.216.118"
-    os.api_key = ENV['OS_PASSWORD']
-    #os.network = "private"
-    os.flavor = /Linux-XL.2plus-4vCpu-32G/
+    os.floating_ip = "185.39.216.244"
+    os.password = ENV['OS_PASSWORD']
+    os.flavor = /Linux-L-2vCpu-4G/
     os.image = /ubuntu-12.04_x86_64_LVM/
     os.openstack_auth_url = ENV['OS_AUTH_URL']
     os.openstack_compute_url = ENV['OS_COMPUTE_URL']
-    os.availability_zone = "nova"
+    os.openstack_network_url = ENV['OS_NETWORK_URL']
     os.tenant_name = ENV['OS_TENANT_NAME']
     os.keypair_name = "julien-vagrant"
     os.ssh_username = "stack"
-
-#    os.metadata  = {"key" => "value"}                      # optional
-#    os.user_data = "#cloud-config\nmanage_etc_hosts: True" # optional
-#    os.networks           = [ "internal", "external" ]     # optional, overrides os.network
-#    os.address_id         = "YOUR ADDRESS ID"              # optional (`network` above has higher precedence)
-#    os.scheduler_hints    = {
-#        :cell => 'australia'
-#    }                                          # optional
-#    os.security_groups    = ['ssh', 'http']    # optional
-
   end
 end

data/gemfiles/latest_stable.gemfile

@@ -4,6 +4,8 @@ source "https://rubygems.org"
 
 gem "appraisal", "1.0.0"
 gem "restclient", "0.10.0"
+gem "webmock", "~> 1.18.0", :group => [:test]
+gem "rubocop", "0.23.0", :require => false
 gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 
 group :development do

data/gemfiles/oldest_current.gemfile

@@ -4,6 +4,8 @@ source "https://rubygems.org"
 
 gem "appraisal", "1.0.0"
 gem "restclient", "0.10.0"
+gem "webmock", "~> 1.18.0", :group => [:test]
+gem "rubocop", "0.23.0", :require => false
 gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 
 group :development do

data/gemfiles/previous_release.gemfile

@@ -4,6 +4,8 @@ source "https://rubygems.org"
 
 gem "appraisal", "1.0.0"
 gem "restclient", "0.10.0"
+gem "webmock", "~> 1.18.0", :group => [:test]
+gem "rubocop", "0.23.0", :require => false
 gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 
 group :development do

data/lib/vagrant-openstack-provider.rb

@@ -1,16 +1,16 @@
-require "pathname"
+require 'pathname'
 
-require "vagrant-openstack-provider/plugin"
+require 'vagrant-openstack-provider/plugin'
 
 module VagrantPlugins
   module Openstack
-    lib_path = Pathname.new(File.expand_path("../vagrant-openstack-provider", __FILE__))
-    autoload :Errors, lib_path.join("errors")
+    lib_path = Pathname.new(File.expand_path('../vagrant-openstack-provider', __FILE__))
+    autoload :Errors, lib_path.join('errors')
 
     # This initializes the i18n load path so that the plugin-specific
     # translations work.
     def self.init_i18n
-      I18n.load_path << File.expand_path("locales/en.yml", source_root)
+      I18n.load_path << File.expand_path('locales/en.yml', source_root)
       I18n.reload!
     end
 
@@ -20,26 +20,31 @@ module VagrantPlugins
       # Initialize logging
       level = nil
       begin
-        level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
+        level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
       rescue NameError
         # This means that the logging constant wasn't found,
         # which is fine. We just keep `level` as `nil`. But
         # we tell the user.
-        level = nil
+        begin
+          level = Log4r.const_get(ENV['VAGRANT_OPENSTACK_LOG'].upcase)
+        rescue NameError
+          level = nil
+        end
       end
 
       # Some constants, such as "true" resolve to booleans, so the
       # above error checking doesn't catch it. This will check to make
       # sure that the log level is an integer, as Log4r requires.
-      level = nil if !level.is_a?(Integer)
+      level = nil unless level.is_a?(Integer)
 
-      # Set the logging level on all "vagrant" namespaced
+      # Set the logging level
       # logs as long as we have a valid level.
       if level
-        logger = Log4r::Logger.new("vagrant_openstack")
-        logger.outputters = Log4r::Outputter.stderr
+        logger = Log4r::Logger.new('vagrant_openstack')
+        out = Log4r::Outputter.stdout
+        out.formatter = Log4r::PatternFormatter.new(pattern: '%d | %5l | %m', date_pattern: '%Y-%m-%d %H:%M')
+        logger.outputters = out
         logger.level = level
-        logger = nil
       end
     end
 
@@ -47,7 +52,7 @@ module VagrantPlugins
     #
     # @return [Pathname]
     def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
   end
 end

data/lib/vagrant-openstack-provider/action.rb

@@ -1,6 +1,6 @@
-require "pathname"
+require 'pathname'
 
-require "vagrant/action/builder"
+require 'vagrant/action/builder'
 
 module VagrantPlugins
   module Openstack
@@ -12,14 +12,13 @@ module VagrantPlugins
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use DeleteServer
             end
-
-            b2.use ConnectOpenstack
-            b2.use DeleteServer
           end
         end
       end
@@ -28,14 +27,14 @@ module VagrantPlugins
       def self.action_provision
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use Provision
+              b2.use SyncFolders
             end
-
-            b2.use Provision
-            b2.use SyncFolders
           end
         end
       end
@@ -65,13 +64,13 @@ module VagrantPlugins
       def self.action_ssh
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SSHExec
             end
-
-            b2.use SSHExec
           end
         end
       end
@@ -79,13 +78,13 @@ module VagrantPlugins
       def self.action_ssh_run
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SSHRun
             end
-
-            b2.use SSHRun
           end
         end
       end
@@ -93,31 +92,98 @@ module VagrantPlugins
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if env[:result]
-              b2.use MessageAlreadyCreated
-              next
+          b.use ConnectOpenstack
+
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Provision
+              b2.use SyncFolders
+              b2.use CreateServer
+            else
+              b2.use Message, I18n.t('vagrant_openstack.already_created')
             end
+          end
+        end
+      end
+
+      def self.action_halt
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use StopServer
+            end
+          end
+        end
+      end
 
-            b2.use ConnectOpenstack
-            b2.use Provision
-            b2.use SyncFolders
-            b2.use CreateServer
+      # This is the action that is primarily responsible for suspending
+      # the virtual machine.
+      def self.action_suspend
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            elsif env[:machine_state_id] == :suspended
+              b2.use Message, I18n.t('vagrant_openstack.already_suspended')
+            else
+              b2.use Suspend
+            end
+          end
+        end
+      end
+
+      # This is the action that is primarily responsible for resuming
+      # suspended machines.
+      def self.action_resume
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use Resume
+            end
+          end
+        end
+      end
+
+      def self.action_reload
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, ReadState do |env, b2|
+            if env[:machine_state_id] == :not_created
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use StopServer
+              b2.use WaitForServerToStop
+              b2.use StartServer
+            end
           end
         end
       end
 
       # The autoload farm
-      action_root = Pathname.new(File.expand_path("../action", __FILE__))
-      autoload :ConnectOpenstack, action_root.join("connect_openstack")
-      autoload :CreateServer, action_root.join("create_server")
-      autoload :DeleteServer, action_root.join("delete_server")
-      autoload :IsCreated, action_root.join("is_created")
-      autoload :MessageAlreadyCreated, action_root.join("message_already_created")
-      autoload :MessageNotCreated, action_root.join("message_not_created")
-      autoload :ReadSSHInfo, action_root.join("read_ssh_info")
-      autoload :ReadState, action_root.join("read_state")
-      autoload :SyncFolders, action_root.join("sync_folders")
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :Message, action_root.join('message')
+      autoload :ConnectOpenstack, action_root.join('connect_openstack')
+      autoload :CreateServer, action_root.join('create_server')
+      autoload :DeleteServer, action_root.join('delete_server')
+      autoload :StopServer, action_root.join('stop_server')
+      autoload :StartServer, action_root.join('start_server')
+      autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+      autoload :ReadState, action_root.join('read_state')
+      autoload :SyncFolders, action_root.join('sync_folders')
+      autoload :Suspend, action_root.join('suspend')
+      autoload :Resume, action_root.join('resume')
+      autoload :WaitForServerToStop, action_root.join('wait_stop')
     end
   end
 end