vagrant-cloudstack 1.3.0 → 1.4.0

data/lib/vagrant-cloudstack/errors.rb

@@ -1,27 +1,27 @@
-require "vagrant"
-
-module VagrantPlugins
-  module Cloudstack
-    module Errors
-      class VagrantCloudstackError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant_cloudstack.errors")
-      end
-
-      class FogError < VagrantCloudstackError
-        error_key(:fog_error)
-      end
-
-      class InstanceReadyTimeout < VagrantCloudstackError
-        error_key(:instance_ready_timeout)
-      end
-
-      class RsyncError < VagrantCloudstackError
-        error_key(:rsync_error)
-      end
-
-      class UserdataError < VagrantCloudstackError
-        error_key(:user_data_error)
-      end
-    end
-  end
-end
+require "vagrant"
+
+module VagrantPlugins
+  module Cloudstack
+    module Errors
+      class VagrantCloudstackError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant_cloudstack.errors")
+      end
+
+      class FogError < VagrantCloudstackError
+        error_key(:fog_error)
+      end
+
+      class InstanceReadyTimeout < VagrantCloudstackError
+        error_key(:instance_ready_timeout)
+      end
+
+      class RsyncError < VagrantCloudstackError
+        error_key(:rsync_error)
+      end
+
+      class UserdataError < VagrantCloudstackError
+        error_key(:user_data_error)
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/exceptions/exceptions.rb

@@ -1,10 +1,10 @@
-module VagrantPlugins
-  module Cloudstack
-    module Exceptions
-      class IpNotFoundException < Exception
-      end
-      class DuplicatePFRule < Exception
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module Cloudstack
+    module Exceptions
+      class IpNotFoundException < Exception
+      end
+      class DuplicatePFRule < Exception
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/model/cloudstack_resource.rb

@@ -1,33 +1,51 @@
-module VagrantPlugins
-  module Cloudstack
-    module Model
-      class CloudstackResource
-        attr_accessor :id, :name
-        attr_reader   :kind
-
-        def initialize(id, name, kind)
-          raise 'Resource must have a kind' if kind.nil? || kind.empty?
-          @id             = id
-          @name           = name
-          @kind           = kind
-        end
-
-        def is_undefined?
-          is_id_undefined? and is_name_undefined?
-        end
-
-        def is_id_undefined?
-          id.nil? || id.empty?
-        end
-
-        def is_name_undefined?
-          name.nil? || name.empty?
-        end
-
-        def to_s
-          "#{kind} - #{id || '<unknown id>'}:#{name || '<unknown name>'}"
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module Cloudstack
+    module Model
+      class CloudstackResource
+        attr_accessor :id, :name, :details
+        attr_reader   :kind
+
+        def initialize(id, name, kind)
+          raise 'Resource must have a kind' if kind.nil? || kind.empty?
+          @id             = id
+          @name           = name
+          @kind           = kind
+        end
+
+        def is_undefined?
+          is_id_undefined? and is_name_undefined?
+        end
+
+        def is_id_undefined?
+          id.nil? || id.empty?
+        end
+
+        def is_name_undefined?
+          name.nil? || name.empty?
+        end
+
+        def to_s
+          "#{kind} - #{id || '<unknown id>'}:#{name || '<unknown name>'}"
+        end
+
+        def self.create_list(ids, names, kind)
+          return create_id_list(ids, kind)     unless ids.empty?
+          return create_name_list(names, kind) unless names.empty?
+          []
+        end
+
+        def self.create_id_list(ids, kind)
+          ids.each_with_object([]) do |id, resources|
+            resources << CloudstackResource.new(id, nil, kind)
+          end
+        end
+
+        def self.create_name_list(names, kind)
+          names.each_with_object([]) do |name, resources|
+            resources << CloudstackResource.new(nil, name, kind)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/plugin.rb

@@ -1,82 +1,82 @@
-begin
-  require "vagrant"
-rescue LoadError
-  raise "The Vagrant Cloudstack plugin must be run within Vagrant."
-end
-
-# This is a sanity check to make sure no one is attempting to install
-# this into an early Vagrant version.
-if Vagrant::VERSION < "1.5.0"
-  raise "The Vagrant Cloudstack plugin is only compatible with Vagrant 1.5+"
-end
-
-module VagrantPlugins
-  module Cloudstack
-    class Plugin < Vagrant.plugin("2")
-      name "Cloudstack"
-      description <<-DESC
-      This plugin installs a provider that allows Vagrant to manage
-      machines in Cloudstack.
-      DESC
-
-      config(:cloudstack, :provider) do
-        require_relative "config"
-        Config
-      end
-
-      provider(:cloudstack, { parallel: true, box_optional:  true}) do # Setup logging and i18n
-        setup_logging
-        setup_i18n
-
-        # Return the provider
-        require_relative "provider"
-        Provider
-      end
-
-      provider_capability(:cloudstack, :winrm_info) do
-        require_relative 'capabilities/winrm'
-        VagrantPlugins::Cloudstack::Cap::WinRM
-      end
-
-      provider_capability(:cloudstack, :rdp_info) do
-        require_relative 'capabilities/rdp'
-        VagrantPlugins::Cloudstack::Cap::Rdp
-      end
-
-      # This initializes the internationalization strings.
-      def self.setup_i18n
-        I18n.load_path << File.expand_path("locales/en.yml", Cloudstack.source_root)
-        I18n.reload!
-      end
-
-      # This sets up our log level to be whatever VAGRANT_LOG is.
-      def self.setup_logging
-        require "log4r"
-
-        level = nil
-        begin
-          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
-        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)
-
-        # Set the logging level on all "vagrant" namespaced
-        # logs as long as we have a valid level.
-        if level
-          logger            = Log4r::Logger.new("vagrant_cloudstack")
-          logger.outputters = Log4r::Outputter.stderr
-          logger.level      = level
-          logger            = nil
-        end
-      end
-    end
-  end
-end
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The Vagrant Cloudstack plugin must be run within Vagrant."
+end
+
+# This is a sanity check to make sure no one is attempting to install
+# this into an early Vagrant version.
+if Vagrant::VERSION < "1.5.0"
+  raise "The Vagrant Cloudstack plugin is only compatible with Vagrant 1.5+"
+end
+
+module VagrantPlugins
+  module Cloudstack
+    class Plugin < Vagrant.plugin("2")
+      name "Cloudstack"
+      description <<-DESC
+      This plugin installs a provider that allows Vagrant to manage
+      machines in Cloudstack.
+      DESC
+
+      config(:cloudstack, :provider) do
+        require_relative "config"
+        Config
+      end
+
+      provider(:cloudstack, { parallel: true, box_optional:  true}) do # Setup logging and i18n
+        setup_logging
+        setup_i18n
+
+        # Return the provider
+        require_relative "provider"
+        Provider
+      end
+
+      provider_capability(:cloudstack, :winrm_info) do
+        require_relative 'capabilities/winrm'
+        VagrantPlugins::Cloudstack::Cap::WinRM
+      end
+
+      provider_capability(:cloudstack, :rdp_info) do
+        require_relative 'capabilities/rdp'
+        VagrantPlugins::Cloudstack::Cap::Rdp
+      end
+
+      # This initializes the internationalization strings.
+      def self.setup_i18n
+        I18n.load_path << File.expand_path("locales/en.yml", Cloudstack.source_root)
+        I18n.reload!
+      end
+
+      # This sets up our log level to be whatever VAGRANT_LOG is.
+      def self.setup_logging
+        require "log4r"
+
+        level = nil
+        begin
+          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
+        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)
+
+        # Set the logging level on all "vagrant" namespaced
+        # logs as long as we have a valid level.
+        if level
+          logger            = Log4r::Logger.new("vagrant_cloudstack")
+          logger.outputters = Log4r::Outputter.stderr
+          logger.level      = level
+          logger            = nil
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/provider.rb

@@ -1,58 +1,58 @@
-require "log4r"
-require "vagrant"
-
-module VagrantPlugins
-  module Cloudstack
-    class Provider < Vagrant.plugin("2", :provider)
-      def initialize(machine)
-        @machine = machine
-      end
-
-      def action(name)
-        # Attempt to get the action method from the Action class if it
-        # exists, otherwise return nil to show that we don't support the
-        # given action.
-        action_method = "action_#{name}"
-        return Action.send(action_method) if Action.respond_to?(action_method)
-        nil
-      end
-
-      def ssh_info
-        # Run a custom action called "read_ssh_info" which does what it
-        # says and puts the resulting SSH info into the `:machine_ssh_info`
-        # key in the environment.
-        env = @machine.action("read_ssh_info")
-        env[:machine_ssh_info]
-      end
-
-      def winrm_info
-        # Run a custom action called "read_winrm_info" which does what it
-        # says and puts the resulting WinRM info into the `:machine_winrm_info`
-        # key in the environment.
-        env = @machine.action("read_winrm_info")
-        env[:machine_winrm_info]
-      end
-
-      def state
-        # Run a custom action we define called "read_state" which does
-        # what it says. It puts the state in the `:machine_state_id`
-        # key in the environment.
-        env = @machine.action("read_state")
-
-        state_id = env[:machine_state_id]
-
-        # Get the short and long description
-        short    = I18n.t("vagrant_cloudstack.states.short_#{state_id}")
-        long     = I18n.t("vagrant_cloudstack.states.long_#{state_id}")
-
-        # Return the MachineState object
-        Vagrant::MachineState.new(state_id, short, long)
-      end
-
-      def to_s
-        id = @machine.id.nil? ? "new" : @machine.id
-        "Cloudstack (#{id})"
-      end
-    end
-  end
-end
+require "log4r"
+require "vagrant"
+
+module VagrantPlugins
+  module Cloudstack
+    class Provider < Vagrant.plugin("2", :provider)
+      def initialize(machine)
+        @machine = machine
+      end
+
+      def action(name)
+        # Attempt to get the action method from the Action class if it
+        # exists, otherwise return nil to show that we don't support the
+        # given action.
+        action_method = "action_#{name}"
+        return Action.send(action_method) if Action.respond_to?(action_method)
+        nil
+      end
+
+      def ssh_info
+        # Run a custom action called "read_ssh_info" which does what it
+        # says and puts the resulting SSH info into the `:machine_ssh_info`
+        # key in the environment.
+        env = @machine.action("read_ssh_info")
+        env[:machine_ssh_info]
+      end
+
+      def winrm_info
+        # Run a custom action called "read_winrm_info" which does what it
+        # says and puts the resulting WinRM info into the `:machine_winrm_info`
+        # key in the environment.
+        env = @machine.action("read_winrm_info")
+        env[:machine_winrm_info]
+      end
+
+      def state
+        # Run a custom action we define called "read_state" which does
+        # what it says. It puts the state in the `:machine_state_id`
+        # key in the environment.
+        env = @machine.action("read_state")
+
+        state_id = env[:machine_state_id]
+
+        # Get the short and long description
+        short    = I18n.t("vagrant_cloudstack.states.short_#{state_id}")
+        long     = I18n.t("vagrant_cloudstack.states.long_#{state_id}")
+
+        # Return the MachineState object
+        Vagrant::MachineState.new(state_id, short, long)
+      end
+
+      def to_s
+        id = @machine.id.nil? ? "new" : @machine.id
+        "Cloudstack (#{id})"
+      end
+    end
+  end
+end

data/lib/vagrant-cloudstack/service/cloudstack_resource_service.rb

@@ -1,58 +1,64 @@
-module VagrantPlugins
-  module Cloudstack
-    module Service
-      class CloudstackResourceService
-        def initialize(cloudstack_compute, ui)
-          @cloudstack_compute = cloudstack_compute
-          @ui                 = ui
-        end
-
-        def sync_resource(resource, api_parameters = {})
-          if resource.id.nil? and resource.name
-            resource.id = name_to_id(resource.name, resource.kind, api_parameters)
-          elsif resource.id
-            resource.name = id_to_name(resource.id, resource.kind, api_parameters)
-          end
-          @ui.detail("Syncronized resource: #{resource}")
-        end
-
-        private
-
-        def translate_from_to(resource_type, options)
-          if resource_type == 'public_ip_address'
-            pluralised_type = 'public_ip_addresses'
-          else
-            pluralised_type = "#{resource_type}s"
-          end
-
-          full_response = @cloudstack_compute.send("list_#{pluralised_type}".to_sym, options)
-          full_response["list#{pluralised_type.tr('_', '')}response"][resource_type.tr('_', '')]
-        end
-
-        def resourcefield_to_id(resource_type, resource_field, resource_field_value, options={})
-          @ui.info("Fetching UUID for #{resource_type} with #{resource_field} '#{resource_field_value}'")
-          full_response = translate_from_to(resource_type, options)
-          result        = full_response.find {|type| type[resource_field] == resource_field_value }
-          result['id']
-        end
-
-        def id_to_resourcefield(resource_id, resource_type, resource_field, options={})
-          @ui.info("Fetching #{resource_field} for #{resource_type} with UUID '#{resource_id}'")
-          options = options.merge({'id' => resource_id})
-          full_response = translate_from_to(resource_type, options)
-          full_response[0][resource_field]
-        end
-
-        def name_to_id(resource_name, resource_type, options={})
-          resource_field = resource_type == 'public_ip_address' ? 'ipaddress' : 'name'
-          resourcefield_to_id(resource_type, resource_field, resource_name, options)
-        end
-
-        def id_to_name(resource_id, resource_type, options={})
-          resource_field = resource_type == 'public_ip_address' ? 'ipaddress' : 'name'
-          id_to_resourcefield(resource_id, resource_type, resource_field, options)
-        end
-      end
-    end
-  end
-end
+module VagrantPlugins
+  module Cloudstack
+    module Service
+      class CloudstackResourceService
+        def initialize(cloudstack_compute, ui)
+          @cloudstack_compute = cloudstack_compute
+          @ui                 = ui
+        end
+
+        def sync_resource(resource, api_parameters = {})
+          @resource_details = nil
+          if resource.id.nil? and resource.name
+            resource.id = name_to_id(resource.name, resource.kind, api_parameters)
+          elsif resource.id
+            resource.name = id_to_name(resource.id, resource.kind, api_parameters)
+          end
+
+          unless resource.is_undefined?
+            resource.details = @resource_details
+            @ui.detail("Syncronized resource: #{resource}")
+          end
+        end
+
+        private
+
+        def translate_from_to(resource_type, options)
+          if resource_type == 'public_ip_address'
+            pluralised_type = 'public_ip_addresses'
+          else
+            pluralised_type = "#{resource_type}s"
+          end
+
+          full_response = @cloudstack_compute.send("list_#{pluralised_type}".to_sym, options)
+          full_response["list#{pluralised_type.tr('_', '')}response"][resource_type.tr('_', '')]
+        end
+
+        def resourcefield_to_id(resource_type, resource_field, resource_field_value, options={})
+          @ui.info("Fetching UUID for #{resource_type} with #{resource_field} '#{resource_field_value}'")
+          full_response = translate_from_to(resource_type, options)
+          @resource_details = full_response.find {|type| type[resource_field] == resource_field_value }
+          @resource_details['id']
+        end
+
+        def id_to_resourcefield(resource_id, resource_type, resource_field, options={})
+          @ui.info("Fetching #{resource_field} for #{resource_type} with UUID '#{resource_id}'")
+          options = options.merge({'id' => resource_id})
+          full_response = translate_from_to(resource_type, options)
+          @resource_details = full_response[0]
+          @resource_details[resource_field]
+        end
+
+        def name_to_id(resource_name, resource_type, options={})
+          resource_field = resource_type == 'public_ip_address' ? 'ipaddress' : 'name'
+          resourcefield_to_id(resource_type, resource_field, resource_name, options)
+        end
+
+        def id_to_name(resource_id, resource_type, options={})
+          resource_field = resource_type == 'public_ip_address' ? 'ipaddress' : 'name'
+          id_to_resourcefield(resource_id, resource_type, resource_field, options)
+        end
+      end
+    end
+  end
+end