cloudstack_ruby_client 0.2.3 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzRhODczOTFkNDY2NDFlMTM1MThjMjc5ZjIwODc0YmRlMGYxZGNiNQ==
+    OGM0YWRiMDk2YWMyNmU5MTZmNDgyMjE1ZWU4Yzg3ZWY1Njk5MjA4Mg==
   data.tar.gz: !binary |-
-    NGQwNjE5NmM1NDI4MmE5NTBmOGUyYjYwZTZhMGYyNDI1ODI1YmM5Mg==
+    OWY4ODEzYjlkNTFjNmFlYWIyM2UwMDQyN2ViY2JkMGY4ZmQwYjZlZQ==
 SHA512:
   metadata.gz: !binary |-
-    MjIxNDg5NWEzNDgzNTZhZDFiYTlhOGE2Yjg2ZTY0YWU0NTJkOTBhMGIxMDEz
-    NzljODIwNzk0YTljZGQzYTM5NWZkYTVlZGJlOWI1OTk0N2U4ZWZmMzExMjkw
-    MzU5MzI5NWQyODAzOTM2ODFkZjg5ODRmNjk3MjJiYTFjM2NiMzk=
+    OWY5OWNmZWEwYmQ2MTFkNzI3MGZjYWU0MzBmMzIxNjM1ZDI5NWZiN2YwYWE2
+    YmM5NDk1ZDBlYzIwMGRiODBmMmE4NDM1MmFiMTE0YTU2OGEwMjY0ZmViMTBh
+    NmFhMzhhMmZiODFlZmJmZWM1MWQ0NDY3YjMxYWVlM2ZhY2Q5ODY=
   data.tar.gz: !binary |-
-    NzhjMGNjMzY4NWRiODFlODhmYzAzODcyYmUzYWQ1ODg5ZGE3Yzg0MDRiZWJh
-    ODMxYTFjMGZmNzk1MGM0NDY0NmIxOTBlNTY4YTY1Mzc1OWFkZDQwODMyMmNl
-    YTgwZTc0ZjU5Mzg0N2MyMmRlYzhmZjllZDA0N2FiMWIxMzFhNDk=
+    NmFhNDQ2MmE1NDQxZmNiZTkyNTNiMjI3OTVlODY2YWU2NWQ5YzM5YWM3MzE3
+    YTY2OTdhM2E1ZDA3NWVlMmNmOTNkMWNhZmI0MDJlOGI0ZTg2YzkxMzhhNjUz
+    NGMxMjU2YWE2MjRjMTA1ZWI4MTk2YTFiOGY1ODA0YmIyYjZmOTU=

data/lib/cloudstack_ruby_client/api/affinity_api.rb

@@ -0,0 +1,11 @@
+module CloudstackRubyClient
+  module Api
+    module AffinityGroup
+      cmd_processor :list_affinity_groups,
+                    :list_affinity_group_types,
+                    :create_affinity_group,
+                    :delete_affinity_group,
+                    :update_vm_affinity_group
+    end
+  end
+end

data/lib/cloudstack_ruby_client/base_client.rb

@@ -20,8 +20,8 @@ class CloudstackRubyClient::BaseClient
     url = "#{@api_url}?#{data}&signature=#{signature}"
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.host, uri.port)
-    # http.use_ssl = @use_ssl
-    # http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    http.use_ssl = @use_ssl
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     request = Net::HTTP::Get.new(uri.request_uri)
 
     http.request(request)

data/lib/cloudstack_ruby_client/client.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 class CloudstackRubyClient::RequestError < RuntimeError
   attr_reader :response, :json
 
@@ -34,6 +36,33 @@ class CloudstackRubyClient::Client < CloudstackRubyClient::BaseClient
   def logout(params = {})
     auth_request(params, "logout")
   end
+
+  def wait_for_async_job(job, timeout=nil)
+    wait_time = 1
+    slept_time = 0
+    if job.has_key? 'jobid' then
+      job_id = job['jobid']
+    else
+      job_id = job
+    end
+
+    return Timeout::timeout(timeout) do
+      while true do
+         job_stat = self.query_async_job_result(:jobid => job_id)
+         if job_stat[:jobprocstatus] == 0 then  #pending
+           sleep wait_time
+           slept_time += wait_time
+           if slept_time >= 30 then
+             wait_time = 5
+           elsif slept_time >= 10 then
+             wait_time = 2
+           end
+         else
+           return job_stat
+         end
+      end
+    end
+  end
   
   protected
   
@@ -66,4 +95,5 @@ class CloudstackRubyClient::Client < CloudstackRubyClient::BaseClient
     
     json[resp_title]
   end
+
 end

data/lib/cloudstack_ruby_client/client_helper.rb

@@ -1,7 +1,36 @@
 class Module
 
   MALFORMED_CMDS = {
-    /getvmpassword/i            => 'getVMPassword'
+    "getvmpassword"              => 'getVMPassword',
+    "updatevmaffinitygroup"      => "updateVMAffinityGroup",
+    "listneworkacls"             => "listNetworkACLs",
+    "createneworkacl"            => "createNetworkACL",
+    "deleteneworkacl"            => "deleteNetworkACL",
+    "updateeneworkaclitem"       => "updateNetworkACLItem",
+    "createnetworkacllist"       => "createNetworkACLList",
+    "deleteNetworkacllist"       => "deleteNetworkACLList",
+    "replacenetworkacllist"      => "replaceNetworkACLList",
+    "listnetworkacllists"        => "listNetworkACLLists",
+    "setsshkeyforvirtualmachine" => "setSSHKeyForVirtualMachine",
+    "registersshkeypair"         => "registerSSHKeyPair",
+    "createsshkeypair"           => "createSSHKeyPair",
+    "deletesshkeypair"           => "deleteSSHKeyPair",
+    "listsshkeypairs"            => "listSSHKeyPairs",
+    "createlbstickinesspolicy"   => "createLBStickinessPolicy",
+    "deletelbstickinesspolicy"   => "deleteLBStickinessPolicy",
+    "deletelbstickinesspolicy"   => "deleteLBStickinessPolicy",
+    "listlbstickinesspolicies"   => "listLBStickinessPolicies",
+    "listlbhealthcheckpolicies"  => "listLBHealthCheckPolicies",
+    "createlbhealthcheckpolicy"  => "createLBHealthCheckPolicy",
+    "deletelbhealthcheckpolicy"  => "deleteLBHealthCheckPolicy",
+    "createvpc"                  => "createVPC",
+    "listvpcsdeletevpc"          => "listVPCsdeleteVPC",
+    "updatevpc"                  => "updateVPC",
+    "restartvpc"                 => "restartVPC",
+    "createvpcoffering"          => "createVPCOffering",
+    "updatevpcoffering"          => "updateVPCOffering",
+    "deletevpcoffering"          => "deleteVPCOffering",
+    "listvpcofferings"           => "listVPCOfferings"
   }
 
   #
@@ -27,7 +56,8 @@ class Module
     /copyiso/i                      => 'copytemplateresponse',
     /deleteiso/i                    => 'deleteisosresponse',
     /listisopermissions/i           => 'listtemplatepermissionsresponse',
-    /addiptonic/i                   => 'addiptovmnicresponse'
+    /addiptonic/i                   => 'addiptovmnicresponse',
+    /updatevmaffinitygroup/i        => 'updatevirtualmachineresponse'
   }
 
   def cmd_processor(*args)
@@ -36,61 +66,44 @@ class Module
       meta_method = %Q{
         def #{arg}(args={});
 
-          command = "#{
+          command = MALFORMED_CMDS.has_key?('#{arga.join('')}') ? MALFORMED_CMDS['#{arga.join('')}'] : "#{
             arga.each_with_index.map {|x, i|
               i==0 ? x : x.capitalize
             }.join('')
-          }"
+          }";
 
-          resp_title = "#{arga.join('')}response"
+          resp_title = "#{arga.join('')}response";
       } +
 
       #
-      # The following code block is dealing with malformed api commands
+      # The following code block is dealing with malformed response
       #
 
       %Q{
-          MALFORMED_RESPONSES.each do |k, v|
-            if k =~ command
-              resp_title = v
-            end
-          end
-
-          MALFORMED_CMDS.each do |k, v|
-            if k =~ command
-              command = v
-            end
-          end
 
-          if /(list|create|delete)networkacl.*/i =~ command
-            command.gsub!(/acl/i, 'ACL')
-          end
-
-          if /.*(ssh).*/i =~ command
-            command.gsub!(/ssh/i, 'SSH')
-          end
+          MALFORMED_RESPONSES.each do |k, v|;
+            if k =~ command;
+              resp_title = v;
+            end;
+          end;
 
-          if /(list|create|delete)lbstickinesspolic.*/i =~ command
-            command.gsub!(/lb/i, 'LB')
-          end
-
-          if /.*vpc.*/i =~ command
-            command.gsub!(/vpc/i, 'VPC')
-          end
       } +
+
       %Q{
-          params = {'command' => command}
-          params.merge!(args) unless args.empty?
+          params = {'command' => command};
+          params.merge!(args) unless args.empty?;
 
-          response = request(params)
-          json = JSON.parse(response.body)
+          response = request(params);
+          json = JSON.parse(response.body);
 
           if !response.is_a?(Net::HTTPOK)
-            if ["431","530"].include?(response.code) and ["9999","4350"].include?(json[resp_title]['cserrorcode'])
-               raise ArgumentError, json[resp_title]['errortext']
-            end
+            if ["431","530"].include?(response.code) and
+               ["9999","4350"].include?(json[resp_title]['cserrorcode'].to_s);
+
+              raise ArgumentError, json[resp_title]['errortext'];
+            end;
 
-            raise RuntimeError, json['errorresponse']['errortext'] if response.code == "432"
+            raise RuntimeError, json['errorresponse']['errortext'] if response.code.to_s == "432"
 
             raise CloudstackRubyClient::RequestError.new(response, json)
           end

data/lib/cloudstack_ruby_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackRubyClient
-  VERSION = "0.2.3"
+  VERSION = "1.0.0"
 end

data/test/config.yml

@@ -1,7 +1,6 @@
 cloudstack:
-  host:       '10.1.192.92'
-  # host:       'localhost'
+  host:       '10.1.192.54'
   port:       '8080'
   admin_port: '8096'
-  api_key:    'd460dbswlC6ApcirESZJOh-JDCFxCtwtmoRd_FHC9QYwHNkeHi1BjdDrvnfQQ0vwDOC9t4yPF46o5Kfpn5eFVg'
-  secret_key: 'sZchCmafeZU4ZKM2HkX5DzcoWFWAYp3eGIpYFdgsCoYtZiTIuXIgv48Ja5vD1sdkf_gFFbh534hepPayEfcfNQ'
+  api_key:    'j88bUHw6zqG9Ch1RygIsqrwb4vs3PTBM3g-H7mxuY-Lk51cMHxM2c8PyaQELYbvnLqJg1uDeWABKPiPLAgG03g'
+  secret_key: 'TdMoVDOHsWofNjpmh4BacktKbRPn8CnjtG6cQLJ6B2ACD1-NXL6fK__yg2d2IAHwm___ogwc7nY2fbr-55fVDQ'

data/test/unit/affinitygroup_test.rb

@@ -0,0 +1,46 @@
+require 'test/unit'
+require 'yaml'
+require_relative '../../lib/cloudstack_ruby_client'
+
+class AffinityGroupTest < Test::Unit::TestCase
+  def setup
+    config      = YAML.load_file("test/config.yml")
+    _host       = config['cloudstack']['host']
+    _port       = config['cloudstack']['port']
+    _admin_port = config['cloudstack']['admin_port']
+    _api_key    = config['cloudstack']['api_key']
+    _secret_key = config['cloudstack']['secret_key']
+    @client     = CloudstackRubyClient::Client.new\
+                                          "http://#{_host}:#{_port}/client/api",
+                                          "#{_api_key}",
+                                          "#{_secret_key}"
+  end
+
+  def teardown
+    # Do nothing here!
+  end
+
+  def test_list_affinity_groups
+    @client.list_affinity_groups
+  end
+
+  def test_list_affinity_group_types
+    @client.list_affinity_group_types
+  end
+
+  def test_create_affinity_group
+    assert_raise(ArgumentError) do
+      @client.create_affinity_group
+    end
+  end
+
+  def test_update_vm_affinity_group
+    assert_raise(ArgumentError) do
+      @client.update_vm_affinity_group
+    end
+  end
+
+  def test_delete_affinity_group
+    @client.delete_affinity_group
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_ruby_client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Chip Childers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby client for CloudStack's API, including a simple CLI.
 email:
@@ -29,6 +29,7 @@ files:
 - lib/cloudstack_ruby_client.rb
 - lib/cloudstack_ruby_client/api/accounts_api.rb
 - lib/cloudstack_ruby_client/api/address_api.rb
+- lib/cloudstack_ruby_client/api/affinity_api.rb
 - lib/cloudstack_ruby_client/api/alert_api.rb
 - lib/cloudstack_ruby_client/api/apidiscovery_api.rb
 - lib/cloudstack_ruby_client/api/asyncjob_api.rb
@@ -67,6 +68,7 @@ files:
 - test/config.yml
 - test/integration/client_test.rb
 - test/unit/accounts_test.rb
+- test/unit/affinitygroup_test.rb
 - test/unit/asyncjob_test.rb
 - test/unit/autoscale_test.rb
 - test/unit/configuration_test.rb
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby client for CloudStack's API.
@@ -109,6 +111,7 @@ test_files:
 - test/config.yml
 - test/integration/client_test.rb
 - test/unit/accounts_test.rb
+- test/unit/affinitygroup_test.rb
 - test/unit/asyncjob_test.rb
 - test/unit/autoscale_test.rb
 - test/unit/configuration_test.rb