vagrant-arubacloud 0.0.7 → 0.0.9

data/lib/vagrant-arubacloud/config.rb

@@ -1,167 +1,166 @@
-require 'vagrant'
-require 'fog'
-
-module VagrantPlugins
-  module ArubaCloud
-
-    DC_TABLES = {
-      :dc1 => "https://api.dc1.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
-      :dc2 => "https://api.dc2.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
-      :dc3 => "https://api.dc3.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
-      :dc4 => "https://api.dc4.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
-      :dc5 => "https://api.dc5.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
-      :dc6 => "https://api.dc6.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
-      :dc8 => "https://api.dc8.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json"
-    }
-
-    DC_DEFAULT = "dc2"
-
-    class Config < Vagrant.plugin('2', :config)
-
-      # ArubaCloud Username
-      # @return [String]
-      attr_accessor :arubacloud_username
-
-      # ArubaCloud Password
-      # @return [String]
-      attr_accessor :arubacloud_password
-
-      # reserved for internal use
-      attr_accessor  :reserved_status
-      attr_accessor  :reserved_list_owned
-
-      # Ws EndPoint Url
-      # Expected to be the url of the web service to use
-      # @return [String]
-      attr_accessor :url
-
-      # Ws EndPoint id : can be dc2,dc2,dc3,...dc8 (dc7 is not defined at this release)
-      # @return [String]
-      attr_accessor :endpoint
-
-      # The name of the server. This defaults to the name of the machine
-      # defined by Vagrant (via 'config.vm.define'), but can be override here.
-      # @return [String]
-      attr_accessor :server_name
-
-      # The ID of the template to use, use vagrant arubacloud templates to obtain
-      # the complete list.
-      # @return [Integer]
-      attr_accessor :template_id
-
-      # The smart vm type expressed as String:
-      # 'small'
-      # 'medium'
-      # 'large'
-      # 'extra large'
-      # @return [String]
-      attr_accessor :package_id
-
-      # Service Type expressed in ID [Integer]:
-      # 1 = Pro Hyper-V
-      # 2 = Pro VMWare
-      # 3 = Pro Hyper-V Low Cost
-      # 4 = Smart
-      # @return [Integer]
-      attr_accessor :service_type
-
-      # Number of Virtual CPU to be assigned to the VM
-      # Pro VMWare:  1 < n < 8
-      # Pro Hyper-V: 1 < n < 4
-      # @return [Integer]
-      attr_accessor :cpu_number
-
-      # Amount of GB of RAM to be assigned to the VM
-      # n <= 16
-      # @return [Integer]
-      attr_accessor :ram_qty
-
-      # Array containing hard disk Configuration
-      # Example configuration (size is expressed in GB):
-      # Hds = [{:type => 0, :size => 100}, {:type => 1, :size => 200}]
-      # Hd type 0 is required because specify the first hard disk, max size per hd: 500 GB
-      # Hd type > 0 < 4 are 3 additional hard disks (optional)
-      # @return [Array]
-      attr_accessor :hds
-
-      def initialize
-        @arubacloud_username = UNSET_VALUE
-        @arubacloud_password = UNSET_VALUE
-        @url = UNSET_VALUE
-        @reserved_status = UNSET_VALUE
-        @reserved_list_owned = UNSET_VALUE
-        @endpoint = UNSET_VALUE
-        @server_name = UNSET_VALUE
-        @template_id = UNSET_VALUE
-        @package_id = UNSET_VALUE
-        @service_type = UNSET_VALUE
-        @cpu_number = UNSET_VALUE
-        @ram_qty = UNSET_VALUE
-        @hds = UNSET_VALUE
-      end
-
-      def finalize!
-        @arubacloud_username = nil if @arubacloud_username == UNSET_VALUE
-        @arubacloud_password = nil if @arubacloud_password == UNSET_VALUE
-        @url = nil if @url == UNSET_VALUE
-        @reserved_status = nil if @reserved_status = UNSET_VALUE
-        @reserved_list_owned = nil if @reserved_list_owned = UNSET_VALUE
-        @endpoint = nil if @endpoint == UNSET_VALUE
-        @server_name = nil if @server_name == UNSET_VALUE
-        @template_id = nil if @template_id == UNSET_VALUE
-        @package_id = nil if @package_id == UNSET_VALUE
-        @service_type = nil if @service_type == UNSET_VALUE
-        @cpu_number = nil if @cpu_number == UNSET_VALUE
-        @ram_qty = nil if @ram_qty == UNSET_VALUE
-        @hds = nil if @hds == UNSET_VALUE
-      end
-
-      def validate(machine)
-        errors = _detected_errors
-
-        # Global configurations needed by all service types
-        errors << I18n.t('vagrant_arubacloud.config.arubacloud_username_required') unless @arubacloud_username
-        errors << I18n.t('vagrant_arubacloud.config.arubacloud_password_required') unless @arubacloud_password
-        errors << I18n.t('vagrant_arubacloud.config.template_id_required') unless @template_id
-        errors << I18n.t('vagrant_arubacloud.config.service_type_required') unless @service_type
-
-        errors << I18n.t('vagrant_arubacloud.config.ssh_password_required') unless machine.config.ssh.password
-
-        #check if coded url or endpoint
-        #if url not in table or dc wrong return error
-        if (@url)
-          if (DC_TABLES.key(@url))
-            @endpoint = DC_TABLES.key(@url)
-          else
-            errors << I18n.t('vagrant_arubacloud.config.url_is_wrong')
-          end
-        else
-          if (@endpoint)
-            if DC_TABLES.key?(@endpoint.to_sym)
-              @url = DC_TABLES[@endpoint.to_sym]
-            else
-              errors << I18n.t('vagrant_arubacloud.config.endpoint_is_wrong')
-            end
-          else
-            @endpoint = DC_DEFAULT.to_sym
-            @url = DC_TABLES[DC_DEFAULT.to_sym]
-          end
-        end
-
-        if @service_type.eql? 4
-          errors << I18n.t('vagrant_arubacloud.config.package_id_required') unless @package_id
-        else
-          errors << I18n.t('vagrant_arubacloud.config.cpu_number_required') unless @cpu_number
-          errors << I18n.t('vagrant_arubacloud.config.ram_qty_required') unless @ram_qty
-          if @hds
-            errors << I18n.t('vagrant_arubacloud.config.hds_conf_must_be_array') unless @hds.kind_of?(Array)
-          elsif
-            errors << I18n.t('vagrant_arubacloud.config.hds_conf_required')
-          end
-        end
-        {'ArubaCloud Provider' => errors}
-      end
-    end # Config
-
-  end # ArubaCloud
-end # VagrantPlugins
+require 'vagrant'
+
+module VagrantPlugins
+  module ArubaCloud
+
+    DC_TABLES = {
+      :dc1 => "https://api.dc1.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
+      :dc2 => "https://api.dc2.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
+      :dc3 => "https://api.dc3.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
+      :dc4 => "https://api.dc4.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
+      :dc5 => "https://api.dc5.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
+      :dc6 => "https://api.dc6.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json",
+      :dc8 => "https://api.dc8.computing.cloud.it/WsEndUser/v2.9/WsEndUser.svc/json"
+    }
+
+    DC_DEFAULT = "dc2"
+
+    class Config < Vagrant.plugin('2', :config)
+
+      # ArubaCloud Username
+      # @return [String]
+      attr_accessor :arubacloud_username
+
+      # ArubaCloud Password
+      # @return [String]
+      attr_accessor :arubacloud_password
+
+      # reserved for internal use
+      attr_accessor  :reserved_status
+      attr_accessor  :reserved_list_owned
+
+      # Ws EndPoint Url
+      # Expected to be the url of the web service to use
+      # @return [String]
+      attr_accessor :url
+
+      # Ws EndPoint id : can be dc2,dc2,dc3,...dc8 (dc7 is not defined at this release)
+      # @return [String]
+      attr_accessor :endpoint
+
+      # The name of the server. This defaults to the name of the machine
+      # defined by Vagrant (via 'config.vm.define'), but can be override here.
+      # @return [String]
+      attr_accessor :server_name
+
+      # The ID of the template to use, use vagrant arubacloud templates to obtain
+      # the complete list.
+      # @return [Integer]
+      attr_accessor :template_id
+
+      # The smart vm type expressed as String:
+      # 'small'
+      # 'medium'
+      # 'large'
+      # 'extra large'
+      # @return [String]
+      attr_accessor :package_id
+
+      # Service Type expressed in ID [Integer]:
+      # 1 = Pro Hyper-V
+      # 2 = Pro VMWare
+      # 3 = Pro Hyper-V Low Cost
+      # 4 = Smart
+      # @return [Integer]
+      attr_accessor :service_type
+
+      # Number of Virtual CPU to be assigned to the VM
+      # Pro VMWare:  1 < n < 8
+      # Pro Hyper-V: 1 < n < 4
+      # @return [Integer]
+      attr_accessor :cpu_number
+
+      # Amount of GB of RAM to be assigned to the VM
+      # n <= 16
+      # @return [Integer]
+      attr_accessor :ram_qty
+
+      # Array containing hard disk Configuration
+      # Example configuration (size is expressed in GB):
+      # Hds = [{:type => 0, :size => 100}, {:type => 1, :size => 200}]
+      # Hd type 0 is required because specify the first hard disk, max size per hd: 500 GB
+      # Hd type > 0 < 4 are 3 additional hard disks (optional)
+      # @return [Array]
+      attr_accessor :hds
+
+      def initialize
+        @arubacloud_username = UNSET_VALUE
+        @arubacloud_password = UNSET_VALUE
+        @url = UNSET_VALUE
+        @reserved_status = UNSET_VALUE
+        @reserved_list_owned = UNSET_VALUE
+        @endpoint = UNSET_VALUE
+        @server_name = UNSET_VALUE
+        @template_id = UNSET_VALUE
+        @package_id = UNSET_VALUE
+        @service_type = UNSET_VALUE
+        @cpu_number = UNSET_VALUE
+        @ram_qty = UNSET_VALUE
+        @hds = UNSET_VALUE
+      end
+
+      def finalize!
+        @arubacloud_username = nil if @arubacloud_username == UNSET_VALUE
+        @arubacloud_password = nil if @arubacloud_password == UNSET_VALUE
+        @url = nil if @url == UNSET_VALUE
+        @reserved_status = nil if @reserved_status = UNSET_VALUE
+        @reserved_list_owned = nil if @reserved_list_owned = UNSET_VALUE
+        @endpoint = nil if @endpoint == UNSET_VALUE
+        @server_name = nil if @server_name == UNSET_VALUE
+        @template_id = nil if @template_id == UNSET_VALUE
+        @package_id = nil if @package_id == UNSET_VALUE
+        @service_type = nil if @service_type == UNSET_VALUE
+        @cpu_number = nil if @cpu_number == UNSET_VALUE
+        @ram_qty = nil if @ram_qty == UNSET_VALUE
+        @hds = nil if @hds == UNSET_VALUE
+      end
+
+      def validate(machine)
+        errors = _detected_errors
+
+        # Global configurations needed by all service types
+        errors << I18n.t('vagrant_arubacloud.config.arubacloud_username_required') unless @arubacloud_username
+        errors << I18n.t('vagrant_arubacloud.config.arubacloud_password_required') unless @arubacloud_password
+        errors << I18n.t('vagrant_arubacloud.config.template_id_required') unless @template_id
+        errors << I18n.t('vagrant_arubacloud.config.service_type_required') unless @service_type
+
+        errors << I18n.t('vagrant_arubacloud.config.ssh_password_required') unless machine.config.ssh.password
+
+        #check if coded url or endpoint
+        #if url not in table or dc wrong return error
+        if (@url)
+          if (DC_TABLES.key(@url))
+            @endpoint = DC_TABLES.key(@url)
+          else
+            errors << I18n.t('vagrant_arubacloud.config.url_is_wrong')
+          end
+        else
+          if (@endpoint)
+            if DC_TABLES.key?(@endpoint.to_sym)
+              @url = DC_TABLES[@endpoint.to_sym]
+            else
+              errors << I18n.t('vagrant_arubacloud.config.endpoint_is_wrong')
+            end
+          else
+            @endpoint = DC_DEFAULT.to_sym
+            @url = DC_TABLES[DC_DEFAULT.to_sym]
+          end
+        end
+
+        if @service_type.eql? 4
+          errors << I18n.t('vagrant_arubacloud.config.package_id_required') unless @package_id
+        else
+          errors << I18n.t('vagrant_arubacloud.config.cpu_number_required') unless @cpu_number
+          errors << I18n.t('vagrant_arubacloud.config.ram_qty_required') unless @ram_qty
+          if @hds
+            errors << I18n.t('vagrant_arubacloud.config.hds_conf_must_be_array') unless @hds.kind_of?(Array)
+          elsif
+            errors << I18n.t('vagrant_arubacloud.config.hds_conf_required')
+          end
+        end
+        {'ArubaCloud Provider' => errors}
+      end
+    end # Config
+
+  end # ArubaCloud
+end # VagrantPlugins

data/lib/vagrant-arubacloud/plugin.rb

@@ -1,56 +1,56 @@
-begin
-  require 'vagrant'
-rescue LoadError
-  raise 'The ArubaCloud IaaS provider must be run within Vagrant.'
-end
-
-if Vagrant::VERSION < '1.2.0'
-  raise 'ArubaCloud IaaS provider is only compatible with Vagrant 1.2+'
-end
-
-module VagrantPlugins
-  module ArubaCloud
-    class Plugin < Vagrant.plugin('2')
-      # noinspection RubyArgCount
-      name 'ArubaCloud'
-      description <<-DESC
-      This plugin enable Vagrant to manage machines in ArubaCloud IaaS service.
-      DESC
-
-      config(:arubacloud, :provider) do
-        require_relative 'config'
-        Config
-      end
-
-      provider(:arubacloud, { :box_optional => true, :parallel => true }) do
-        ArubaCloud.init_i18n
-        ArubaCloud.init_logging
-
-        require_relative 'provider'
-        Provider
-      end
-
-      command('arubacloud') do
-        ArubaCloud.init_i18n
-        ArubaCloud.init_logging
-
-        require_relative 'command/root'
-        Command::Root
-      end
-
-      command('snapshot') do
-        ArubaCloud.init_i18n
-        ArubaCloud.init_logging
-
-        require_relative 'command/snapshot'
-        Command::Snapshot
-      end
-
-      # Disable require tty for centOS
-      guest_capability 'redhat', 'disable_requiretty' do
-        require_relative 'cap/disable_requiretty'
-        Cap::DisableRequireTty
-      end
-    end # Plugin
-  end # ArubaCloud
-end # VagrantPlugins
+begin
+  require 'vagrant'
+rescue LoadError
+  raise 'The ArubaCloud IaaS provider must be run within Vagrant.'
+end
+
+if Vagrant::VERSION < '1.2.0'
+  raise 'ArubaCloud IaaS provider is only compatible with Vagrant 1.2+'
+end
+
+module VagrantPlugins
+  module ArubaCloud
+    class Plugin < Vagrant.plugin('2')
+      # noinspection RubyArgCount
+      name 'ArubaCloud'
+      description <<-DESC
+      This plugin enable Vagrant to manage machines in ArubaCloud IaaS service.
+      DESC
+
+      config(:arubacloud, :provider) do
+        require_relative 'config'
+        Config
+      end
+
+      provider(:arubacloud, { :box_optional => true, :parallel => true }) do
+        ArubaCloud.init_i18n
+        ArubaCloud.init_logging
+
+        require_relative 'provider'
+        Provider
+      end
+
+      command('arubacloud') do
+        ArubaCloud.init_i18n
+        ArubaCloud.init_logging
+
+        require_relative 'command/root'
+        Command::Root
+      end
+
+      command('snapshot') do
+        ArubaCloud.init_i18n
+        ArubaCloud.init_logging
+
+        require_relative 'command/snapshot'
+        Command::Snapshot
+      end
+
+      # Disable require tty for centOS
+      guest_capability 'redhat', 'disable_requiretty' do
+        require_relative 'cap/disable_requiretty'
+        Cap::DisableRequireTty
+      end
+    end # Plugin
+  end # ArubaCloud
+end # VagrantPlugins

data/lib/vagrant-arubacloud/provider.rb

@@ -1,51 +1,51 @@
-require 'vagrant'
-
-require 'vagrant-arubacloud/action'
-
-
-module VagrantPlugins
-  module ArubaCloud
-    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 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_arubacloud.states.short_#{state_id}")
-        long = I18n.t("vagrant_arubacloud.states.long_#{state_id}")
-
-        # Return the MachineState object
-        Vagrant::MachineState.new(state_id, short, long)
-      end
-
-      def to_s
-        'ArubaCloud IaaS'
-      end
-    end # Provider
-  end # ArubaCloud
-end # VagrantPlugins
+require 'vagrant'
+
+require 'vagrant-arubacloud/action'
+
+
+module VagrantPlugins
+  module ArubaCloud
+    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 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_arubacloud.states.short_#{state_id}")
+        long = I18n.t("vagrant_arubacloud.states.long_#{state_id}")
+
+        # Return the MachineState object
+        Vagrant::MachineState.new(state_id, short, long)
+      end
+
+      def to_s
+        'ArubaCloud IaaS'
+      end
+    end # Provider
+  end # ArubaCloud
+end # VagrantPlugins