icontrol 0.3.5 → 0.3.7

data/lib/icontrol/base.rb

@@ -49,6 +49,9 @@ module IControl
   # @private Base
   class Base # :nodoc:
 
+    def id
+      @attributes[:id]
+    end
     
     include IControl::Base::Attributable
         

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

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

data/lib/icontrol/base/sequence.rb

@@ -5,9 +5,10 @@ class BasicSequence
       @conversion_method = conversion_method
     end
     def from_soap(xml)
-      object = [*xml[:item]].map { |i| i.send(@conversion_method) }
-      return nil if object.empty?
-      return object.length == 1 ? object.first : object
+      return_value = [*xml[:item]].map { |i| i.send(@conversion_method) }
+      return return_value.first if return_value.length == 1
+      return nil if return_value.length == 0
+      return return_value
     end
   end
 end
@@ -71,7 +72,7 @@ module IControl
         else
           if aux.length == 1
             # If is just 1 element we return the element
-            return aux[0]
+            return aux.first
           else
             #otherwise is empty so we return a nil 
             nil
@@ -82,11 +83,9 @@ module IControl
     
     class SequenceSequence
       def self.from_soap(xml)
-        return nil unless xml[:item]
+        return [] unless xml[:item]
         xml[:item][:type] = "A:Array"
-        object = [Mappings.map_object(xml[:item])].flatten
-        return nil if object.compact.length == 0
-        return object
+        return [*Mappings.map_object(xml[:item])].compact
       end
     end
   end

data/spec/icontrol/base/sequence_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.join(File.dirname(__FILE__),"..","..",'/spec_helper'))
+
+describe IControl::Base::Sequence do
+ 
+
+ 
+  describe "#from_soap" do
+
+    EMPTY_SEQUENCE =<<END
+<E:Envelope
+xmlns:E="http://schemas.xmlsoap.org/soap/envelope/"
+xmlns:A="http://schemas.xmlsoap.org/soap/encoding/"
+xmlns:s="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:y="http://www.w3.org/2001/XMLSchema"
+xmlns:iControl="urn:iControl"
+E:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+<E:Body>
+<m:get_httpclass_profileResponse
+xmlns:m="urn:iControl:LocalLB/VirtualServer">
+<return
+s:type="A:Array"
+A:arrayType="iControl:LocalLB.VirtualServer.VirtualServerHttpClass[][1]">
+<item
+A:arrayType="iControl:LocalLB.VirtualServer.VirtualServerHttpClass[0]"></item>
+</return>
+</m:get_httpclass_profileResponse>
+</E:Body>
+</E:Envelope>
+END
+    it "should allow to be loaded from soap" do
+      IControl::Base.map_response(EMPTY_SEQUENCE).should == []
+    end
+  end
+
+end

data/spec/icontrol/local_lb/virtual_server_spec.rb

@@ -34,7 +34,7 @@ describe IControl::LocalLB::VirtualServer do
     end
     
     it "Adds/associates authentication profiles to the specified virtual servers." do
-      @virtual_server.authentication_profile.should be_nil
+      @virtual_server.authentication_profile.should == []
       @virtual_server.add_authentication_profile(:profiles => [{:profile_name => "ldap",:priority => 1}] )
       @virtual_server.authentication_profile.first.profile_name.should == "ldap"
     end
@@ -62,7 +62,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Adds/associates clone pools to the specified virtual servers." do
-      @virtual_server.clone_pool.should be_nil
+      @virtual_server.clone_pool.should == []
       @virtual_server.add_clone_pool(:clone_pools => [{:pool_name => @test_pool_name,:type => IControl::LocalLB::ClonePoolType::CLONE_POOL_TYPE_CLIENTSIDE}] )
       @virtual_server.clone_pool.first.pool_name.should == @test_pool_name
     end
@@ -87,7 +87,7 @@ describe IControl::LocalLB::VirtualServer do
 
     it "Adds/associates HTTP class profiles to the specified virtual servers." do
       @virtual_server.add_profile(:profiles => [{:profile_name => "http",:profile_context => IControl::LocalLB::ProfileContextType::PROFILE_CONTEXT_TYPE_ALL}])
-      @virtual_server.httpclass_profile.should be_nil
+      @virtual_server.httpclass_profile.should == []
       @virtual_server.add_httpclass_profile(:profiles => [{:profile_name => @profile_http_class_name,:priority => 1}])
       @virtual_server.httpclass_profile.first.profile_name.should == @profile_http_class_name
     end
@@ -102,7 +102,7 @@ describe IControl::LocalLB::VirtualServer do
 
   describe "#add_persistence_profile" do
     it "Adds/associates persistence profiles to the specified virtual servers." do
-      @virtual_server.persistence_profile.should be_nil
+      @virtual_server.persistence_profile.should == []
       @virtual_server.add_persistence_profile(:profiles => [{:profile_name => "dest_addr",:default_profile => false}] )
       @virtual_server.persistence_profile.should_not be_nil
       @virtual_server.persistence_profile.first.profile_name.should == "dest_addr"
@@ -140,7 +140,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Adds/associates rules to the specified virtual servers." do
-      @virtual_server.rule.should be_nil
+      @virtual_server.rule.should == []
       @virtual_server.add_rule(:rules => [{:rule_name => @rule_name ,:priority => 1}])
       @virtual_server.rule.should_not be_nil
     end
@@ -248,7 +248,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Gets the lists of authentication profiles the specified virtual servers are associated with." do
-      @virtual_server.authentication_profile.should be_nil # It's tested in the the setter method
+      @virtual_server.authentication_profile.should == [] # It's tested in the the setter method
     end
   end
 
@@ -258,7 +258,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Gets the lists of clone pools the specified virtual servers are associated with." do
-      @virtual_server.clone_pool.should be_nil # It's tested in the the setter method
+      @virtual_server.clone_pool.should == [] # It's tested in the the setter method
     end
   end
 
@@ -433,7 +433,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Gets the lists of HTTP class profiles the specified virtual servers are associated with. If a specified virtual server is not associated with any HTTP class profile, then the list of HTTP class profiles for that virtual server will be empty." do
-      @virtual_server.httpclass_profile.should be_nil
+      @virtual_server.httpclass_profile.should == []
     end
 
     it "works this way" do
@@ -467,7 +467,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Returns the module scores for the specified virtual servers." do
-      @virtual_server.module_score.should be_nil
+      @virtual_server.module_score.should == []
     end
 
     it "works this way" do
@@ -505,7 +505,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Gets the lists of persistence profiles the specified virtual servers are associated with." do
-      @virtual_server.persistence_profile.should be_nil
+      @virtual_server.persistence_profile.should == []
     end
 
     it "works this way" do
@@ -521,7 +521,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Gets the persistence records based on the specified persistent modes for the specified virtual servers." do
-      @virtual_server.persistence_record(:persistence_mode => IControl::LocalLB::PersistenceMode::PERSISTENCE_MODE_NONE).should be_nil
+      @virtual_server.persistence_record(:persistence_mode => IControl::LocalLB::PersistenceMode::PERSISTENCE_MODE_NONE).should == []
     end
 
     it "works this way" do
@@ -586,7 +586,7 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Gets the lists of rules the specified virtual servers are associated with. If a specified virtual server is not associated with any rule, then the list of rules for that virtual server will be empty." do
-      @virtual_server.rule.should be_nil
+      @virtual_server.rule.should == []
     end
   end
 
@@ -1132,11 +1132,11 @@ describe IControl::LocalLB::VirtualServer do
     end
     
     it "Removes authentication profiles to the specified virtual servers." do
-      @virtual_server.authentication_profile.should be_nil
+      @virtual_server.authentication_profile.should == []
       @virtual_server.add_authentication_profile(:profiles => [{:profile_name => "ldap",:priority => 1}] )
       @virtual_server.authentication_profile.first.profile_name.should == "ldap"
       @virtual_server.remove_authentication_profile(:profiles => [{:profile_name => "ldap",:priority => 1}] )
-      @virtual_server.authentication_profile.should be_nil
+      @virtual_server.authentication_profile.should == []
     end
 
     it "works this way" do
@@ -1163,12 +1163,12 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it " Removes clone pools to the specified virtual servers." do
-      @virtual_server.clone_pool.should be_nil
+      @virtual_server.clone_pool.should == []
       @virtual_server.add_clone_pool(:clone_pools => [{:pool_name => @test_pool_name,:type => IControl::LocalLB::ClonePoolType::CLONE_POOL_TYPE_CLIENTSIDE}])
       @virtual_server.clone_pool.first.pool_name.should == @test_pool_name
       @virtual_server.remove_clone_pool(:clone_pools => [{:pool_name => @test_pool_name,
                                                            :type => IControl::LocalLB::ClonePoolType::CLONE_POOL_TYPE_CLIENTSIDE}])
-      @virtual_server.clone_pool.should be_nil      
+      @virtual_server.clone_pool.should == []
     end
 
     it "works this way" do
@@ -1193,11 +1193,11 @@ describe IControl::LocalLB::VirtualServer do
 
     it "Removes HTTP class profiles to the specified virtual servers." do
       @virtual_server.add_profile(:profiles => [{:profile_name => "http",:profile_context => IControl::LocalLB::ProfileContextType::PROFILE_CONTEXT_TYPE_ALL}])
-      @virtual_server.httpclass_profile.should be_nil
+      @virtual_server.httpclass_profile.should == []
       @virtual_server.add_httpclass_profile(:profiles => [{:profile_name => @profile_http_class_name,:priority => 1}])
       @virtual_server.httpclass_profile.first.profile_name.should == @profile_http_class_name
       @virtual_server.remove_httpclass_profile(:profiles => [{:profile_name => @profile_http_class_name,:priority => 1}])
-      @virtual_server.httpclass_profile.should be_nil
+      @virtual_server.httpclass_profile.should == []
     end
 
     it "works this way" do
@@ -1209,12 +1209,12 @@ describe IControl::LocalLB::VirtualServer do
 
   describe "#remove_persistence_profile" do
     it "Removes persistence profiles to the specified virtual servers." do
-      @virtual_server.persistence_profile.should be_nil
+      @virtual_server.persistence_profile.should == []
       @virtual_server.add_persistence_profile(:profiles => [{:profile_name => "dest_addr",:default_profile => false}] )
       @virtual_server.persistence_profile.should_not be_nil
       @virtual_server.persistence_profile.first.profile_name.should == "dest_addr"
       @virtual_server.remove_persistence_profile(:profiles => [{:profile_name => "dest_addr",:default_profile => false}] )
-      @virtual_server.persistence_profile.should be_nil
+      @virtual_server.persistence_profile.should == []
     end
 
     it "works this way" do
@@ -1251,11 +1251,11 @@ describe IControl::LocalLB::VirtualServer do
     end
 
     it "Removes/associates rules to the specified virtual servers." do
-      @virtual_server.rule.should be_nil
+      @virtual_server.rule.should == []
       @virtual_server.add_rule(:rules => [{:rule_name => @rule_name ,:priority => 1}])
       @virtual_server.rule.should_not be_nil
       @virtual_server.remove_rule(:rules => [{:rule_name => @rule_name ,:priority => 1}])
-      @virtual_server.rule.should be_nil
+      @virtual_server.rule.should == []
     end
 
     it "works this way" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Jose Fernandez (magec)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -360,6 +360,7 @@ files:
 - .yardopts
 - LICENSE
 - README.rdoc
+- spec/icontrol/base/sequence_spec.rb
 - spec/icontrol/base/struct_spec.rb
 - spec/icontrol/common_spec.rb
 - spec/icontrol/local_lb/pool_member_spec.rb
@@ -381,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -545576529
+      hash: -374151087
       segments: 
       - 0
       version: "0"
@@ -401,6 +402,7 @@ signing_key:
 specification_version: 3
 summary: A ruby client to the BigIP F5
 test_files: 
+- spec/icontrol/base/sequence_spec.rb
 - spec/icontrol/base/struct_spec.rb
 - spec/icontrol/common_spec.rb
 - spec/icontrol/local_lb/pool_member_spec.rb