ganeti_client 0.0.2 → 0.0.3

data/README

@@ -2,28 +2,16 @@
 
     1. Manually test the following methods + fix when bugs found
         1.1.    redistribute_config
-        1.2.    instance_create
         1.3.    instance_delete
-        1.4.    instance_reboot
-        1.5.    instance_shutdown
-        1.6.    instance_startup
         1.7.    instance_reinstall
         1.8.    instance_replace_disks
         1.9.    instance_activate_disks
-        1.10.   instance_create_tags
-        1.11.   instance_delete_tags
         1.13.   job_delete
-        1.14.   node_evaluate
         1.15.   node_migrate
         1.16.   node_change_role
         1.17.   node_get_storage
         1.18.   node_modify_storage
         1.19.   node_repair_storage
-        1.20.   node_get_tags
-        1.21.   node_create_tags
-        1.22.   node_delete_tags
-        1.22.   tags_create
-        1.23.   tags_delete
     2. Add some error handling
     3. Make some code improvements
     4. Add better comments
@@ -47,7 +35,7 @@
 
     # now you should be able to access the api resources by using the client instance. 
     # example:
-    info = client.get_info
+    info = client.info_get
     => #<GanetiInfo:0x10151bb78>
 
     # most methods return an object. When you use .to_json on an object, you get the json object returned

data/lib/ganeti_client.rb

@@ -32,7 +32,7 @@ require 'ganeti_client/client'
 require 'ganeti_client/ganeti_object'
 
 
-module GanetiClient
+module Ganeti
 
 
 end

data/lib/ganeti_client/client.rb

@@ -27,7 +27,7 @@
 # Copyright:: Copyright (c) 2010 Michaël Rigart
 # License::   Distributes under AGPL Licence
 
-module GanetiClient
+module Ganeti
  
     # This class contains all active resources available in Ganeti RAPI
     class Client
@@ -85,6 +85,7 @@ module GanetiClient
         #   Array of all available instances. The array items contain a GanetiInstance object
         def instances_get(bulk = 0)
             url = get_url("instances", {"bulk" => bulk})
+            body = JSON.generate({"bulk" => bulk})
             response_body = JSON.parse(send_request("GET", url))
 
             create_class("GanetiInstance")
@@ -103,12 +104,12 @@ module GanetiClient
         # excluded to not cause issues with rapi.
         #  
         # Example:
-        #       info = {
-        #               'hypervisor'    => 'kvm'    ,               'disk_template' => 'plain',
-        #               'pnode'         => 'node.netronix.be',      'name'          => 'vm1.netronix.be',   'os'    => 'debootstrap+lucid', 
-        #               'vcpus'         => '4',                     'memory'        => '4096',              'disks' => ['25600'],
-        #               'kernel-path'   => '/boot/vmlinuz-2.6-kvmU'
-        #              }
+        #      info = {
+        #              'hypervisor'    => 'kvm'    ,               'disk_template' => 'plain',
+        #              'pnode'         => 'node.netronix.be',      'name'          => 'vm1.netronix.be',   'os'    => 'debootstrap+lucid', 
+        #              'vcpus'         => '4',                     'memory'        => '4096',              'disks' => [25600],
+        #              'kernel-path'   => '/boot/vmlinuz-2.6-kvmU'
+        #             }
         #
         # Parameters:
         #   info: hash of data needed for the instance creation
@@ -120,7 +121,7 @@ module GanetiClient
             params = {
                         'hypervisor'    => info['hypervisor'],  'disk_template' => info['disk_template'],
                         'pnode'         => info['pnode'],       'name'          => info['iname'],           'os'    => info['os'], 
-                        'vcpus'         => info['vcpus'],       'memory'        => info['memory'],          'disks' => [info['size']]
+                        'vcpus'         => info['vcpus'],       'memory'        => info['memory'],          'disks' => info['disks']
                     }
 
             # Add secondary node
@@ -202,7 +203,7 @@ module GanetiClient
         #   dry_run: 0|1 (optional)
         #
         # Return:
-        #   ?
+        #   job id
         def instance_reboot(name, type = "soft", ignore_secondaries = 0, dry_run = 0)
             url = get_url("instances/#{name}/reboot", {"type" => type, "ignore_secondaries" => ignore_secondaries, "dry_run" => 0})
             response_body = send_request("POST", url)
@@ -218,12 +219,12 @@ module GanetiClient
         #   dry_run: 0|1 (optional)
         #
         # Return:
-        #   ?
+        #   job id
         def instance_shutdown(name, dry_run = 0)
             url = get_url("instances/#{name}/shutdown", {"dry-run" => dry_run})
             response_body = send_request("PUT", url)
 
-            return response_body 
+            return response_body
         end      
 
         # Startup an instance
@@ -235,11 +236,10 @@ module GanetiClient
         #   dry_run: 0|1 (optional)
         #
         # Return:
-        #   ?
+        #   job id
         def instance_startup(name, force = 0, dry_run=0)
             url = get_url("instances/#{name}/startup", {"force" => force, "dry-run" => dry_run})
-            body = "" # force parameter
-            response_body = send_request("PUT", url, body)
+            response_body = send_request("PUT", url)
 
             return response_body
         end
@@ -333,9 +333,9 @@ module GanetiClient
         #   dry_run: 0|1 (optional)
         #
         # Return:
-        #   ?
+        #   job id
         def instance_create_tags(name, tags, dry_run = 0)
-            url = get_url("instances/#{name}/tags", {"tags" => tags, "dry-run" => dry_run})
+            url = get_url("instances/#{name}/tags", {'dry-run' => dry_run, 'tag' => tags})
             response_body = send_request("PUT", url)
 
             return response_body
@@ -349,9 +349,9 @@ module GanetiClient
         #   dry_run: 0|1 (optional)
         #
         # Return:
-        #   ?
+        #   job id
         def instance_delete_tags(name, tags, dry_run = 0)
-            url = get_url("instances/#{name}/tags", {"tags" => tags, "dry-run" => dry_run})
+            url = get_url("instances/#{name}/tags",  {'dry-run' => dry_run, 'tag' => tags})
             response_body = send_request("DELETE", url)
 
             return response_body
@@ -439,7 +439,7 @@ module GanetiClient
         #   ?
         def job_delete(job_id)
             url = get_url("jobs/#{job_id}")
-            response = send_request("DELETE", url)
+            response_body = send_request("DELETE", url)
 
             return response_body
         end
@@ -477,7 +477,10 @@ module GanetiClient
         # Example:
         #   evacuate?iallocator=[iallocator]
         #   evacuate?remote_node=[nodeX.example.com]
-        def node_evauate(name, iallocator = "", remote_node = "")
+        #
+        # Return:
+        #   job id
+        def node_evaluate(name, iallocator = "", remote_node = "")
            url = get_url("nodes/#{name}/evacuate", {"iallocator" => iallocator, "remote_node" => remote_node}) 
            response_body = send_request("POST", url)
 
@@ -570,9 +573,15 @@ module GanetiClient
         #
         # Example:
         #   ["tag1","tag2", "tag3"]
+        #
+        # Parameters:
+        #   name: name of node
+        # 
+        # Return:
+        #   array of tags
         def node_get_tags(name)
             url = get_url("nodes/#{name}/tags")
-            response_body = send_request("GET", url)
+            response_body = JSON.parse(send_request("GET", url))
 
             return response_body
         end
@@ -582,8 +591,15 @@ module GanetiClient
         # It supports the dry-run argument
         #
         # The result will be a job id
+        #
+        # Parameters:
+        #   name: node name
+        #   tags: Array of tags
+        #
+        # Return:
+        #   job id
         def node_create_tags(name, tags, dry_run = 0)
-            url = get_url("nodes/#{name}/tags", {"tags" => tags, "dry-run" => dry_run})
+            url = get_url("nodes/#{name}/tags", {"tag" => tags, "dry-run" => dry_run})
             response_body = send_request("PUT", url)
 
             return response_body
@@ -594,8 +610,15 @@ module GanetiClient
         #   /tags?tag=[tag]&tag=[tag]
         #
         # It supports the dry-run argument
+        #
+        # Parameters:
+        #   name: node name
+        #   tags: Array of tags
+        #
+        # Return:
+        #   job id
         def node_delete_tags(name, tags, dry_run = 0)
-            url = get_url("nodes/#{name}/tags", {"tags" => targs, "dry-run" => dry_run})
+            url = get_url("nodes/#{name}/tags", {"tag" => tags, "dry-run" => dry_run})
             response_body = send_request("DELETE", url)
 
             return response_body
@@ -620,6 +643,9 @@ module GanetiClient
         #
         # Example:
         #   ["tag1", "tag2", "tag3"]
+        #
+        # Return:
+        #   Array of tags
         def tags_get
             url = get_url("tags")
             response_body = JSON.parse(send_request("GET", url))
@@ -631,8 +657,14 @@ module GanetiClient
         # The request as a list of strings should be PUT to this URI. The result will be a job id
         #
         # It supports the dry-run argument
+        # 
+        # Parameters
+        #   tags: Array of tags
+        #
+        # Return:
+        #   job id
         def tags_create(tags, dry_run = 0)
-            url = get_url("tags", {"tags" => tags, "dry-run" => dry_run})
+            url = get_url("tags", {"tag" => tags, "dry-run" => dry_run})
             response_body = send_request("PUT", url)
 
             return response_body
@@ -643,8 +675,14 @@ module GanetiClient
         #   /tags?tag=[tag]&tag=[tag]
         #
         # It supports the dry-run argument
+        #
+        # Parameters:
+        #   tags: Array of tags
+        #
+        # Return:
+        #   job id
         def tags_delete(tags, dry_run = 0)
-            url = get_url("tags", {"tags" => tags, "dry-run" => dry_run})
+            url = get_url("tags", {"tag" => tags, "dry-run" => dry_run})
             response_body = send_request("DELETE", url)
 
             return response_body
@@ -710,7 +748,7 @@ module GanetiClient
 
         def create_class(class_name)
             unless(class_exists?(class_name))
-                klass = Class.new GanetiClient::GanetiObject
+                klass = Class.new Ganeti::GanetiObject
                 Object.const_set(class_name, klass)
             end
         end

data/lib/ganeti_client/ganeti_object.rb

@@ -1,4 +1,4 @@
-module GanetiClient
+module Ganeti
     class GanetiObject
     
         attr_accessor :json_object

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ganeti_client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Micha\xC3\xABl Rigart"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 +02:00
+date: 2010-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: []