icontrol 0.3.7 → 0.3.8

data/lib/icontrol/base.rb

@@ -61,6 +61,10 @@ module IControl
       def set_id_name(name)
         @id_name = name
       end
+
+      def mutex
+        @mutex ||= Mutex.new
+      end
       
       def class_name
         name.split("::").last
@@ -222,11 +226,14 @@ module IControl
           begin
             # When calling a soap method we transparently add the ns (I'd rather say we obscurely)
             request = ""
-            response = self.client.request(:wsdl, method_name.to_s) do |soap|
-              soap.namespaces["xmlns:wsdl"] = "urn:iControl:#{parent_modules[1..-1].join(".")}/#{class_name}"              
-              soap.body = convert_to_soap(hash_to_call_args(args.first)) if args.first
-              block.call(soap) if block
-              request = soap.to_xml
+            response = nil
+            mutex.synchronize do              
+              response = self.client.request(:wsdl, method_name.to_s) do |soap|
+                soap.namespaces["xmlns:wsdl"] = "urn:iControl:#{parent_modules[1..-1].join(".")}/#{class_name}"              
+                soap.body = convert_to_soap(hash_to_call_args(args.first)) if args.first
+                block.call(soap) if block
+                request = soap.to_xml
+              end
             end
             return self.map_response(response.to_xml)
           rescue Savon::HTTP::Error, Savon::SOAP::Fault => error

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

@@ -1,17 +1,30 @@
+require 'bindata'
 module IControl
   module Common 
     class ULong64 < IControl::Base::Struct
+
+      def from_soap(xml)
+        puts "HEY"
+        puts xml.inspect
+      end
+      
       def to_f
-        retVal = 0.0
-        if high >=0
-          retVal = high << 32 & 0xffff0000
+        BinData::Uint64be.read(BinData::Int32be.new(high).to_binary_s + BinData::Int32be.new(low).to_binary_s)
+      end
+
+      def to_fd
+        retVal = 0.0        
+        u_high = high.to_s.unpack("L").first || 0
+        u_low  = low.to_s.unpack("L").first  || 0
+        if u_high >=0
+          retVal = u_high << 32 & 0xffff0000
         else
-          retVal = ((high & 0x7fffffff) << 32) + (0x80000000 << 32)
+          retVal = ((u_high & 0x7fffffff) << 32) + (0x80000000 << 32)
         end
-        if low >=0
-          retVal += low
+        if u_low >=0
+          retVal += u_low
         else
-          retVal += ((low & 0x7fffffff) + 0x7fffffff)
+          retVal += ((u_low & 0x7fffffff) + 0x7fffffff)
         end
         return retVal;
       end    

data/spec/icontrol/base_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.join(File.dirname(__FILE__),"..",'/spec_helper'))
+
+describe IControl::Base do
+  use_vcr_cassette "IControl::Base", :record => :all, :match_requests_on => [:uri, :method, :body] # Change :record => :new_episodes when done
+  describe "Concurrent invocation" do
+    it "should allow to be called concurrently" do
+      virtual_servers = []
+      pools = []
+      threads = []
+      lambda {
+        30.times do      
+          threads << Thread.new do
+            virtual_servers << IControl::LocalLB::VirtualServer.find(:all).first
+            pools           << IControl::LocalLB::Pool.find(:all).first
+          end
+        end
+        threads.each(&:join)
+      }.should_not raise_exception
+      
+      virtual_servers.each do |virtual_server|
+        virtual_server.id.should == virtual_servers.first.id
+      end
+      pools.each do |pool|
+        pool.id.should == pools.first.id
+      end
+      
+    end
+  end
+
+end

data/spec/icontrol/common_spec.rb

@@ -1,11 +1,16 @@
 require File.expand_path(File.join(File.dirname(__FILE__),"..",'/spec_helper'))
 
 describe IControl::Common::ULong64 do
-  
+  use_vcr_cassette "IControl::Common::ULong64", :record => :all, :match_requests_on => [:uri, :method, :body] # Change :record => :new_episodes when done
   describe "#to_f" do
     it "should exist" do
       IControl::Common::ULong64.new({}).methods.should include(:to_f)
     end
+
+    it "should correctly perform the conversion between two unsigned ints and a bignum" do
+      IControl::Common::ULong64.new(:high => 0, :low => 37565545).to_f.should == 37565545
+      IControl::Common::ULong64.new(:high => 2, :low => -1701380642).to_f.should == 11183521246
+    end
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Jose Fernandez (magec)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +01:00
+date: 2011-03-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,21 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: vcr
+  name: bindata
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: vcr
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,10 +74,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,10 +88,10 @@ dependencies:
         version: "1.6"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,10 +101,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mechanize
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,10 +114,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -116,10 +129,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -131,10 +144,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yard-examples-from-rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,10 +159,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -161,10 +174,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -176,10 +189,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -189,7 +202,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id013
 description: This gem allows you to Connect to a F5 appliance by means of its web services
 email: jfernandezperez@gmail.com
 executables: []
@@ -362,6 +375,7 @@ files:
 - README.rdoc
 - spec/icontrol/base/sequence_spec.rb
 - spec/icontrol/base/struct_spec.rb
+- spec/icontrol/base_spec.rb
 - spec/icontrol/common_spec.rb
 - spec/icontrol/local_lb/pool_member_spec.rb
 - spec/icontrol/local_lb/pool_spec.rb
@@ -382,7 +396,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -374151087
+      hash: -212281297
       segments: 
       - 0
       version: "0"
@@ -404,6 +418,7 @@ summary: A ruby client to the BigIP F5
 test_files: 
 - spec/icontrol/base/sequence_spec.rb
 - spec/icontrol/base/struct_spec.rb
+- spec/icontrol/base_spec.rb
 - spec/icontrol/common_spec.rb
 - spec/icontrol/local_lb/pool_member_spec.rb
 - spec/icontrol/local_lb/pool_spec.rb