cloudstack_client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81f5d7509c2e4e783ea7f5cfff1c85f7a86fd155
-  data.tar.gz: b4d711d1eeda40f84b812cc9600a3a63e6168973
+  metadata.gz: 7468c8972d624355482e3946e890bd8b542e5b30
+  data.tar.gz: 3ef12511c1d261aab67bea420f14c1179dcb185c
 SHA512:
-  metadata.gz: 27566da29f73610f11bf053f4b0c362f3e0b4ed4bb43dbb707079094e6a53744b67d990ef8ccad6756ed07eacacbf7bfaa60a5843fca29889909f632338ee43c
-  data.tar.gz: 8e3c7fe4b0fe2c9697776d0cb157987633e9803a23f7296a5f76227c328af27d9bc9d618f1f9ce56a6f75dddf09a60dba53a41610c01e98c467e9b6298f36e77
+  metadata.gz: bc02b7356af99bae24863ff226baa5295272134a946177ce4fe218cfccf4ea08c609472cb6a9459cdce551fbf43c1f6ace4bbb224649f50ebb3ae944dd3ae2e8
+  data.tar.gz: 5b5f73dd889f9e00f0a7714a6e841d781d7bcf856ac18ce4056f15d81c7b0733ba3446cc400f98e04b02883adab8770e7549416811170b246bae8cf2ea680b01

data/lib/cloudstack_client/client.rb

@@ -26,7 +26,6 @@ module CloudstackClient
       @api_url = api_url
       @api_key = api_key
       @secret_key = secret_key
-      @use_ssl = api_url.start_with? "https"
       @verbose = opts[:quiet] ? false : true
       @debug = opts[:debug] ? true : false
     end
@@ -57,8 +56,11 @@ module CloudstackClient
 
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = @use_ssl
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      
+      if uri.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
 
       begin
         response = http.request(Net::HTTP::Get.new(uri.request_uri))
@@ -68,22 +70,26 @@ module CloudstackClient
         exit 1
       end
 
-      if response.is_a?(Net::HTTPOK)
+      
+      if response.is_a? Net::HTTPOK
         begin 
           json = JSON.parse(response.body)
           json[params['command'].downcase + 'response']
         rescue JSON::ParserError
-          puts "Error parsing response from server."
-          exit 1
+          puts "Error parsing response from server:"
+          puts response.body
+          exit 2
         end
-      elsif response.is_a?(Net::HTTPUnauthorized)
-        puts "Error #{response.code}: #{response.message}"
-        exit 2
       else
-        puts "Error #{response.code}: #{response.message}"
-        puts JSON.pretty_generate(JSON.parse(response.body))
-        puts "URL: #{url}"
-        exit 1
+        begin 
+          json = JSON.parse(response.body)
+          puts "Error executing command."
+          puts "#{json['errorresponse']['errorcode']}: #{json['errorresponse']['errortext']}"
+        rescue JSON::ParserError
+          puts "Error parsing response from server."
+          puts "#{response.code}: #{response.body}"
+        end
+        exit 3
       end
     end
 

data/lib/cloudstack_client/commands/affinity_group.rb

@@ -0,0 +1,39 @@
+module CloudstackClient
+
+	module AffinityGroup
+
+		##
+    # List Affinity Groups.
+
+    def list_affinity_groups(args = {})
+      params = {
+        'command' => 'listAffinityGroups',
+      }
+
+      if args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
+        end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
+      end
+
+      if args['listall']
+        params['listall'] = true
+        params['isrecursive'] = true
+      end
+
+      params['name'] = args['name'] if args['name']
+      params['type'] = args['type'] if args['type']
+      params['virtualmachineid'] = args['virtualmachine_id'] if args['virtualmachine_id']
+      params['keyword'] = args['keyword'] if args['keyword']
+
+      json = send_request(params)
+      json['affinitygroup'] || []
+    end
+
+	end
+
+end

data/lib/cloudstack_client/commands/server.rb

@@ -14,10 +14,13 @@ module CloudstackClient
       params['projectid'] = args[:project_id] if args[:project_id]
 
       if args[:account]
-        if account = list_accounts(name: args[:account]).first
-          params['domainid'] = account["domainid"]
-          params['account'] = args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
         end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
       end
 
       json = send_request(params)
@@ -115,10 +118,13 @@ module CloudstackClient
       end
 
       if args[:account]
-        if account = list_accounts(name: args[:account]).first
-          params['domainid'] = account["domainid"]
-          params['account'] = args[:account]
+        account = list_accounts({name: args[:account]}).first
+        unless account
+          puts "Error: Account #{args[:account]} not found."
+          exit 1
         end
+        params['domainid'] = account["domainid"]
+        params['account'] = args[:account]
       end
 
       json = send_request(params)

data/lib/cloudstack_client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack_client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -14,28 +14,28 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.4
 description: A ruby CloudStack API client
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -53,6 +53,7 @@ files:
 - lib/cloudstack_client.rb
 - lib/cloudstack_client/client.rb
 - lib/cloudstack_client/commands/account.rb
+- lib/cloudstack_client/commands/affinity_group.rb
 - lib/cloudstack_client/commands/capacity.rb
 - lib/cloudstack_client/commands/cluster.rb
 - lib/cloudstack_client/commands/disk_offering.rb
@@ -85,23 +86,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A ruby CloudStack API client