icontrol 0.3.4 → 0.3.5

data/lib/icontrol/base.rb

@@ -16,6 +16,7 @@ require 'base/icontrol_overlay'
 require 'base/xml'
 
 Savon.log = false
+HTTPI.log = false
 HTTPI::Adapter.use = :net_http
 
 # The idea is to create an object proxy to the web service client with the same structure
@@ -258,11 +259,21 @@ module IControl
     # Checks whether the correct params are passed.
     # It checks just if the needed params are passed (specified in params), if more params are passed, they go straight to the SOAP call
     def check_params(options,params)
-      return NotEnoughParams unless (params - options.keys).empty?
+      # In this case we are being called passing a hash (or something like that), in this case 
+      # we use the normal check when callong
+      if options.respond_to?(:keys)
+        return options
+      else
+        # now we are using the one parameter form, so there is no need to use a hash (we build it)
+        if params.size == 1          
+          return {params.first =>  options}
+        else
+          raise NotEnoughParams
+        end
+      end
     end
 
     def method_missing(method_name,*args,&block)
-
       # When calling an instance method we first check whether there is an argument with
       # that name and return it. If that is not the case we fallback in the class default method but adding the instance as
       # argument (the id), cause thats the way the api works, passing the id

data/lib/icontrol/base/attributable.rb

@@ -16,7 +16,7 @@ module IControl
           return @attributes[:type] || super
         end
 
-        def initialize(attributes)
+        def initialize(attributes = {})
           @attributes = attributes || {}
         end
 

data/lib/icontrol/base/icontrol_overlay.rb

@@ -3,4 +3,5 @@
 # in the generated code, to  be ablo to regenerate it when neccesary. So as
 # ruby allows open classes we use them to add functionality This file will load those files at boot time
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'icontrol/local_lb/pool'
+require 'icontrol_overlay/local_lb/pool'
+require 'icontrol_overlay/common'

data/lib/icontrol/base/icontrol_overlay/common.rb

@@ -0,0 +1,20 @@
+module IControl
+  module Common 
+    class ULong64 < IControl::Base::Struct
+      def to_f
+        retVal = 0.0
+        if @high >=0
+          retVal = @high << 32 & 0xffff0000
+        else
+          retVal = ((@high & 0x7fffffff) << 32) + (0x80000000 << 32)
+        end
+        if @low >=0
+          retVal += @low
+        else
+          retVal += ((@low & 0x7fffffff) + 0x7fffffff)
+        end
+        return retVal;
+      end    
+    end
+  end
+end

data/lib/icontrol/global_lb/application.rb

@@ -49,8 +49,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::GlobalLB::Application::ApplicationContextObject] :application_objects The list of application context objects.
     def disable_application_context_object(opts)
-      check_params(opts,[:application_objects])
-      super
+      opts = check_params(opts,[:application_objects])
+      super(opts)
     end
 
     ##
@@ -62,8 +62,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::GlobalLB::Application::ApplicationContextObject] :application_objects The list of application context objects.
     def enable_application_context_object(opts)
-      check_params(opts,[:application_objects])
-      super
+      opts = check_params(opts,[:application_objects])
+      super(opts)
     end
 
     ##
@@ -76,8 +76,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::GlobalLB::Application::ApplicationContextObject] :application_objects The list of application context objects.
     def application_context_status(opts)
-      check_params(opts,[:application_objects])
-      super
+      opts = check_params(opts,[:application_objects])
+      super(opts)
     end
 
     ##
@@ -152,8 +152,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::GlobalLB::AvailabilityDependency] :values The availability dependency for the specified applications.
     def set_availability_dependency(opts)
-      check_params(opts,[:values])
-      super
+      opts = check_params(opts,[:values])
+      super(opts)
     end
 
     ##
@@ -165,8 +165,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :states The states to set for the applications.
     def set_persistence_state(opts)
-      check_params(opts,[:states])
-      super
+      opts = check_params(opts,[:states])
+      super(opts)
     end
 
     ##
@@ -178,8 +178,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [long] :values The persistence TTLs of the specified applications.
     def set_persistence_ttl(opts)
-      check_params(opts,[:values])
-      super
+      opts = check_params(opts,[:values])
+      super(opts)
     end
 
     ##

data/lib/icontrol/global_lb/data_center.rb

@@ -172,8 +172,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [String] :contacts The contact information.
     def set_contact_information(opts)
-      check_params(opts,[:contacts])
-      super
+      opts = check_params(opts,[:contacts])
+      super(opts)
     end
 
     ##
@@ -185,8 +185,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :states The enabled states to set.
     def set_enabled_state(opts)
-      check_params(opts,[:states])
-      super
+      opts = check_params(opts,[:states])
+      super(opts)
     end
 
     ##
@@ -198,8 +198,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [String] :locations The location information.
     def set_location_information(opts)
-      check_params(opts,[:locations])
-      super
+      opts = check_params(opts,[:locations])
+      super(opts)
     end
 
     ##

data/lib/icontrol/global_lb/dnssec_key.rb

@@ -37,8 +37,8 @@ module IControl::GlobalLB
     # @option opts [IControl::GlobalLB::DNSSECKey::KeyAlgorithm] :algorithms Digital signature algorithm (See KeyAlgorithm ) for each specified key
     # @option opts [IControl::Common::EnabledState] :fips Specifies whether the FIPS device should be used for storing and retrieving the keys
     def create(opts)
-      check_params(opts,[:sizes,:types,:algorithms,:fips])
-      super
+      opts = check_params(opts,[:sizes,:types,:algorithms,:fips])
+      super(opts)
     end
 
     ##
@@ -130,8 +130,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::ULong64[]] :generations Identifiers for the key generations to query for each specified DNSSEC key
     def generation_expiration_time(opts)
-      check_params(opts,[:generations])
-      super
+      opts = check_params(opts,[:generations])
+      super(opts)
     end
 
     ##
@@ -144,8 +144,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::ULong64[]] :generations Identifiers for the key generations to query for each specified DNSSEC key
     def generation_public_text(opts)
-      check_params(opts,[:generations])
-      super
+      opts = check_params(opts,[:generations])
+      super(opts)
     end
 
     ##
@@ -158,8 +158,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::ULong64[]] :generations Identifiers for the key generations to query for each specified DNSSEC key
     def generation_rollover_time(opts)
-      check_params(opts,[:generations])
-      super
+      opts = check_params(opts,[:generations])
+      super(opts)
     end
 
     ##
@@ -257,8 +257,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :states Enabled state for each specified DNSSEC key (default: enabled)
     def set_enabled_state(opts)
-      check_params(opts,[:states])
-      super
+      opts = check_params(opts,[:states])
+      super(opts)
     end
 
     ##
@@ -272,8 +272,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [long] :times Expiration period (seconds) for each specified DNSSEC key (default: zero - never expires)
     def set_expiration_period(opts)
-      check_params(opts,[:times])
-      super
+      opts = check_params(opts,[:times])
+      super(opts)
     end
 
     ##
@@ -288,8 +288,8 @@ module IControl::GlobalLB
     # @option opts [IControl::Common::ULong64[]] :generations Identifiers for the key generations to modify for each specified DNSSEC key
     # @option opts [IControl::Common::TimeStamp[]] :times Expiration date and time for each specified DNSSEC key generation (default: as specified in the key)
     def set_generation_expiration_time(opts)
-      check_params(opts,[:generations,:times])
-      super
+      opts = check_params(opts,[:generations,:times])
+      super(opts)
     end
 
     ##
@@ -304,8 +304,8 @@ module IControl::GlobalLB
     # @option opts [IControl::Common::ULong64[]] :generations Identifiers for the key generations to modify for each specified DNSSEC key
     # @option opts [IControl::Common::TimeStamp[]] :times Rollover date and time for each specified DNSSEC key generation (default: as specified in the key)
     def set_generation_rollover_time(opts)
-      check_params(opts,[:generations,:times])
-      super
+      opts = check_params(opts,[:generations,:times])
+      super(opts)
     end
 
     ##
@@ -319,8 +319,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [long] :times Rollover period (seconds) for each specified DNSSEC key (default: zero - one-shot key (never rolls over))
     def set_rollover_period(opts)
-      check_params(opts,[:times])
-      super
+      opts = check_params(opts,[:times])
+      super(opts)
     end
 
     ##
@@ -335,8 +335,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [long] :times Signature publication period (seconds) for each specified DNSSEC key (default: zero - standard BIND value)
     def set_signature_publication_period(opts)
-      check_params(opts,[:times])
-      super
+      opts = check_params(opts,[:times])
+      super(opts)
     end
 
     ##
@@ -350,8 +350,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [long] :times Signature validity period (seconds) for each specified DNSSEC key (default: zero - standard BIND value)
     def set_signature_validity_period(opts)
-      check_params(opts,[:times])
-      super
+      opts = check_params(opts,[:times])
+      super(opts)
     end
 
     ##
@@ -363,8 +363,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [long] :times DNSKEY record Time To Live (TTL) (seconds) for each specified DNSSEC key (default: 86400 (1 day))
     def set_time_to_live(opts)
-      check_params(opts,[:times])
-      super
+      opts = check_params(opts,[:times])
+      super(opts)
     end
 
 

data/lib/icontrol/global_lb/dnssec_zone.rb

@@ -21,8 +21,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [String[]] :keys Names of DNSSEC keys to add to each specified DNSSEC zone
     def add_key(opts)
-      check_params(opts,[:keys])
-      super
+      opts = check_params(opts,[:keys])
+      super(opts)
     end
 
     ##
@@ -34,8 +34,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [String[]] :keys DNSSEC key names for each specified DNSSEC zone
     def create(opts)
-      check_params(opts,[:keys])
-      super
+      opts = check_params(opts,[:keys])
+      super(opts)
     end
 
     ##
@@ -129,8 +129,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [String[]] :keys Names of DNSSEC keys to delete from each specified DNSSEC zone
     def remove_key(opts)
-      check_params(opts,[:keys])
-      super
+      opts = check_params(opts,[:keys])
+      super(opts)
     end
 
     ##
@@ -143,8 +143,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :states Enabled/disabled state for each specified DNSSEC zone (default: enabled)
     def set_enabled_state(opts)
-      check_params(opts,[:states])
-      super
+      opts = check_params(opts,[:states])
+      super(opts)
     end
 
 

data/lib/icontrol/global_lb/globals.rb

@@ -566,8 +566,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [boolean] :v6 A boolean indicating which CIDR mask to get, the mask used for protocol IPv4 or IPv6 .
     def static_persistence_cidr_mask(opts)
-      check_params(opts,[:v6])
-      super
+      opts = check_params(opts,[:v6])
+      super(opts)
     end
 
     ##
@@ -740,8 +740,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_aol_aware_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -754,8 +754,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_auto_configure_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -768,8 +768,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_auto_sync_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -781,8 +781,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_cache_ldns_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -795,8 +795,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_check_dynamic_dependency_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -808,8 +808,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_check_static_dependency_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -821,8 +821,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::GlobalLB::LBMethod] :lb_method The LB method to set.
     def set_default_alternate_lb_method(opts)
-      check_params(opts,[:lb_method])
-      super
+      opts = check_params(opts,[:lb_method])
+      super(opts)
     end
 
     ##
@@ -834,8 +834,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::GlobalLB::LBMethod] :lb_method The LB method to set.
     def set_default_fallback_lb_method(opts)
-      check_params(opts,[:lb_method])
-      super
+      opts = check_params(opts,[:lb_method])
+      super(opts)
     end
 
     ##
@@ -884,8 +884,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_drain_request_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -897,8 +897,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_dump_topology_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -910,8 +910,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_fb_respect_acl_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -924,8 +924,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_fb_respect_dependency_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -950,8 +950,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::GlobalLB::LDNSProbeProtocol] :protocols The probe protocols to set.
     def set_ldns_probe_protocols(opts)
-      check_params(opts,[:protocols])
-      super
+      opts = check_params(opts,[:protocols])
+      super(opts)
     end
 
     ##
@@ -967,8 +967,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_link_compensate_inbound_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -984,8 +984,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_link_compensate_outbound_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -1120,8 +1120,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_paths_never_die_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -1144,8 +1144,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_probe_disabled_object_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -1267,8 +1267,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_reset_ripeness_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -1310,8 +1310,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [boolean] :v6 A boolean indicating which CIDR mask to affect, the mask used for protocol IPv4 or IPv6 .
     def set_static_persistence_cidr_mask(opts)
-      check_params(opts,[:v6])
-      super
+      opts = check_params(opts,[:v6])
+      super(opts)
     end
 
     ##
@@ -1323,8 +1323,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [String] :sync_group_name The sync group name to set.
     def set_sync_group_name(opts)
-      check_params(opts,[:sync_group_name])
-      super
+      opts = check_params(opts,[:sync_group_name])
+      super(opts)
     end
 
     ##
@@ -1337,8 +1337,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_sync_named_configuration_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -1427,8 +1427,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_topology_longest_match_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end
 
     ##
@@ -1461,8 +1461,8 @@ module IControl::GlobalLB
     # @param [Hash] opts
     # @option opts [IControl::Common::EnabledState] :state The state to set.
     def set_use_recursion_bit_state(opts)
-      check_params(opts,[:state])
-      super
+      opts = check_params(opts,[:state])
+      super(opts)
     end