Merge pull request #24 from pdion891/timeout

adding missing api calls, and add timeout option for http call
chipchilders · Nov 17, 2014 · 6c73935 · 6c73935
2 parents 5b486c8 + 528a649
commit 6c73935
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/lib/cloudstack_ruby_client/api/network_api.rb b/lib/cloudstack_ruby_client/api/network_api.rb
@@ -44,9 +44,15 @@ module NetworkDevice
     end
 
     module NetworkACL
-      cmd_processor :create_network_acl,
-                    :delete_network_acl,
-                    :list_network_acls,
+      cmd_processor :create_network_a_c_l,
+                    :update_network_a_c_l_item,
+                    :delete_network_a_c_l,
+                    :list_network_a_c_ls,
+                    :create_network_a_c_l_list,
+                    :delete_network_a_c_l_list,
+                    :replace_network_a_c_l_list,
+                    :list_network_a_c_l_lists,
+                    :update_network_a_c_l_list,
                     :list_nicira_nvp_device_networks
     end
 

diff --git a/lib/cloudstack_ruby_client/base_client.rb b/lib/cloudstack_ruby_client/base_client.rb
@@ -1,10 +1,11 @@
 class CloudstackRubyClient::BaseClient
 
-  def initialize(api_url, api_key, secret_key, use_ssl=nil)
-    @api_url    = api_url
-    @api_key    = api_key
-    @secret_key = secret_key
-    @use_ssl    = use_ssl
+  def initialize(api_url, api_key, secret_key, use_ssl=nil, open_timeout=20)
+    @api_url      = api_url
+    @api_key      = api_key
+    @secret_key   = secret_key
+    @use_ssl      = use_ssl
+    @open_timeout = open_timeout
   end
 
   def request(params)
@@ -21,6 +22,7 @@ def request(params)
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = @use_ssl
+    http.open_timeout = @open_timeout  # fail the connection faster if can't open socket
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     request = Net::HTTP::Get.new(uri.request_uri)
 

diff --git a/lib/cloudstack_ruby_client/client.rb b/lib/cloudstack_ruby_client/client.rb
@@ -26,6 +26,11 @@ def self.API_LIST
     @@API_LIST
   end
 
+  ## CloudStack management server version
+  def version
+    self.list_capabilities["capability"]["cloudstackversion"]
+  end
+
   ## login api command
   def login(params = {})
     auth_request(params, "login")

diff --git a/lib/cloudstack_ruby_client/version.rb b/lib/cloudstack_ruby_client/version.rb
@@ -1,3 +1,3 @@
 module CloudstackRubyClient
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end