rubineti 1.3.0 → 1.4.0

data/lib/rubineti/{compute/jobs.rb → job.rb}

@@ -1,10 +1,14 @@
 module Rubineti
-  module Jobs
+  class Job
+    def initialize connection
+      @connection = connection
+    end
+
     ##
     # Returns an Array of all jobs.
 
-    def jobs_list
-      request.get "/#{Ganeti::Version}/jobs"
+    def all
+      @connection.get "/#{Ganeti::Version}/jobs"
     end
 
     ##
@@ -12,8 +16,8 @@ module Rubineti
     #
     # +job_id+: A String of the 'job id'.
 
-    def job_list job_id
-      request.get "/#{Ganeti::Version}/jobs/#{job_id}"
+    def list job_id
+      @connection.get "/#{Ganeti::Version}/jobs/#{job_id}"
     end
 
     ##
@@ -21,8 +25,8 @@ module Rubineti
     #
     # +job_id+: A String of the 'job id'.
 
-    def job_delete job_id
-      warn "WARNING: Jobs#job_delete not implemented."
+    def delete job_id
+      warn "WARNING: Job#job_delete not implemented."
       # delete "/#{Ganeti::Version}/jobs/#{job_id}/delete"
     end
 
@@ -34,8 +38,8 @@ module Rubineti
     # Body parameters:
     #   - http://docs.ganeti.org/ganeti/#{Ganeti::Version}.1/html/rapi.html#jobs-job-id-wait
 
-    def job_wait job_id, params = {}
-      warn "WARNING: Jobs#job_wait not implemented."
+    def wait job_id, params = {}
+      warn "WARNING: Job#job_wait not implemented."
       # get "/#{Ganeti::Version}/jobs/#{job_id}/wait", params
     end
   end

data/lib/rubineti/{compute/node.rb → node.rb}

@@ -1,5 +1,8 @@
 module Rubineti
-  module Node
+  class Node
+    def initialize connection
+      @connection = connection
+    end
 
     ##
     # Evacuates all secondary instances off a node.
@@ -13,16 +16,16 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def node_evacuate node_name, params = {}
-      warn "WARNING: Node#node_evacuate not implemented."
-      # post "/2/nodes/#{node_name}/evacuate", params
+    def evacuate name, params = {}
+      warn "WARNING: Node#evacuate not implemented."
+      # post "/2/nodes/#{name}/evacuate", params
     end
 
     ##
     # Returns information about a node.
 
-    def node_list node_name
-      request.get "/2/nodes/#{node_name}"
+    def list name
+      @connection.get "/2/nodes/#{name}"
     end
 
     ##
@@ -34,9 +37,9 @@ module Rubineti
     #   - mode (string): Sets migration mode, live for live migration
     #     and non-live for non-live migration. Supported by Ganeti 2.2 and above.
 
-    def node_migrate node_name, params = {}
-      warn "WARNING: Node#node_migrate not implemented."
-      # post "/2/nodes/#{node_name}/migrate", params
+    def migrate name, params = {}
+      warn "WARNING: Node#migrate not implemented."
+      # post "/2/nodes/#{name}/migrate", params
     end
 
     ##
@@ -45,17 +48,17 @@ module Rubineti
     #
     # It supports the bool force argument.
 
-    def node_role_create node_name
-      warn "WARNING: Node#node_role_create not implemented."
+    def role_create name
+      warn "WARNING: Node#role_create not implemented."
       # TODO: API Docs do not describe it's usage well.
-      # put "/2/nodes/#{node_name}/role"
+      # put "/2/nodes/#{name}/role"
     end
 
     ##
     # Returns the current node role.
 
-    def node_role_list node_name
-      request.get "/2/nodes/#{node_name}/role"
+    def role_list name
+      @connection.get "/2/nodes/#{name}/role"
     end
 
     ##
@@ -64,8 +67,8 @@ module Rubineti
     # If the optional bulk parameter (?bulk=1) is provided,
     # the output contains detailed information about instances as a list.
 
-    def nodes_list params = {}
-      request.get "/2/nodes", params
+    def all params = {}
+      @connection.get "/2/nodes", params
     end
 
     ##
@@ -74,9 +77,9 @@ module Rubineti
     #
     # Requires the parameters storage_type (one of file, lvm-pv or lvm-vg) and output_fields.
 
-    def node_storage_list node_name, params = {}
-      warn "WARNING: Node#node_storage_list not implemented."
-      # get "/2/nodes/#{node_name}/storage", params
+    def storage_list name, params = {}
+      warn "WARNING: Node#storage_list not implemented."
+      # get "/2/nodes/#{name}/storage", params
     end
 
     ##
@@ -86,9 +89,9 @@ module Rubineti
     # Requires the parameters storage_type (one of file, lvm-pv or lvm-vg) and name (name of the storage unit).
     # Parameters can be passed additionally. Currently only allocatable (bool) is supported.
 
-    def node_storage_modify node_name, params = {}
-      warn "WARNING: Node#node_storage_modify not implemented."
-      # put "/2/nodes/#{node_name}/storage/modify", params
+    def storage_modify name, params = {}
+      warn "WARNING: Node#storage_modify not implemented."
+      # put "/2/nodes/#{name}/storage/modify", params
     end
 
     ##
@@ -98,9 +101,9 @@ module Rubineti
     # Requires the parameters storage_type (currently only lvm-vg can be repaired) and
     # name (name of the storage unit).
 
-    def node_storage_repair node_name, params = {}
-      warn "WARNING: Node#node_storage_repair not implemented."
-      # put "/2/nodes/#{node_name}/repair", params
+    def storage_repair name, params = {}
+      warn "WARNING: Node#storage_repair not implemented."
+      # put "/2/nodes/#{name}/repair", params
     end
 
     ##
@@ -111,9 +114,9 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def node_tags_create node_name, params = {}
-      warn "WARNING: Node#node_tags_create not implemented."
-      # put "/2/nodes/#{node_name}/tags", params
+    def tags_create name, params = {}
+      warn "WARNING: Node#tags_create not implemented."
+      # put "/2/nodes/#{name}/tags", params
     end
 
     ##
@@ -124,17 +127,17 @@ module Rubineti
     # the job will not be actually executed, only the pre-execution
     # checks will be done.
 
-    def node_tags_delete node_name, params = {}
-      warn "WARNING: Node#node_tags_delete not implemented."
-      # delete "/2/nodes/#{node_name}/tags", params
+    def tags_delete name, params = {}
+      warn "WARNING: Node#tags_delete not implemented."
+      # delete "/2/nodes/#{name}/tags", params
     end
 
     ##
     # Return a list of tags.
 
-    def node_tags_list node_name
-      warn "WARNING: Node#node_tags_list not implemented."
-      # get "/2/nodes/#{node_name}/tags"
+    def tags_list name
+      warn "WARNING: Node#tags_list not implemented."
+      # get "/2/nodes/#{name}/tags"
     end
   end
 end

data/rubineti.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubineti}
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2010-12-12}
+  s.date = %q{2011-01-30}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/ganeti.rb",
     "lib/rubineti.rb",
-    "lib/rubineti/compute.rb",
-    "lib/rubineti/compute/cluster.rb",
-    "lib/rubineti/compute/instances.rb",
-    "lib/rubineti/compute/jobs.rb",
-    "lib/rubineti/compute/node.rb",
+    "lib/rubineti/client.rb",
+    "lib/rubineti/cluster.rb",
+    "lib/rubineti/instance.rb",
+    "lib/rubineti/job.rb",
+    "lib/rubineti/node.rb",
     "rubineti.gemspec",
     "test/fixtures/cassettes/cluster_info.yml",
     "test/fixtures/cassettes/cluster_oses.yml",
@@ -49,22 +49,22 @@ Gem::Specification.new do |s|
     "test/fixtures/cassettes/node_list.yml",
     "test/fixtures/cassettes/node_role_list.yml",
     "test/fixtures/cassettes/nodes.yml",
-    "test/lib/rubineti/compute/test_cluster.rb",
-    "test/lib/rubineti/compute/test_instances.rb",
-    "test/lib/rubineti/compute/test_jobs.rb",
-    "test/lib/rubineti/compute/test_node.rb",
-    "test/support.rb"
+    "test/lib/rubineti/cluster_test.rb",
+    "test/lib/rubineti/instance_test.rb",
+    "test/lib/rubineti/job_test.rb",
+    "test/lib/rubineti/node_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/retr0h/rubineti}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby bindings to Ganeti's v2 Remote API.}
   s.test_files = [
-    "test/lib/rubineti/compute/test_cluster.rb",
-    "test/lib/rubineti/compute/test_instances.rb",
-    "test/lib/rubineti/compute/test_jobs.rb",
-    "test/lib/rubineti/compute/test_node.rb",
-    "test/support.rb"
+    "test/lib/rubineti/cluster_test.rb",
+    "test/lib/rubineti/instance_test.rb",
+    "test/lib/rubineti/job_test.rb",
+    "test/lib/rubineti/node_test.rb",
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -72,30 +72,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hugs>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<hugs>, ["~> 2.3.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<vcr>, ["~> 1.3.3"])
-      s.add_development_dependency(%q<webmock>, ["~> 1.6.1"])
-      s.add_development_dependency(%q<minitest>, ["~> 2.0.0"])
-      s.add_development_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<vcr>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
+      s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<hugs>, ["~> 1.1.0"])
+      s.add_dependency(%q<hugs>, ["~> 2.3.0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<vcr>, ["~> 1.3.3"])
-      s.add_dependency(%q<webmock>, ["~> 1.6.1"])
-      s.add_dependency(%q<minitest>, ["~> 2.0.0"])
-      s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<vcr>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<hugs>, ["~> 1.1.0"])
+    s.add_dependency(%q<hugs>, ["~> 2.3.0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<vcr>, ["~> 1.3.3"])
-    s.add_dependency(%q<webmock>, ["~> 1.6.1"])
-    s.add_dependency(%q<minitest>, ["~> 2.0.0"])
-    s.add_dependency(%q<yajl-ruby>, ["~> 0.7.8"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<vcr>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
   end
 end
 

data/test/lib/rubineti/cluster_test.rb

@@ -0,0 +1,69 @@
+require "test_helper"
+
+describe Rubineti::Cluster do
+  describe "#features" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.cluster.features }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#info" do
+    it "returns a Hash" do
+      VCR.use_cassette "cluster_info" do
+        response = CONNECTION.cluster.info.body
+
+        response.must_be_kind_of Hash
+      end
+    end
+  end
+
+  describe "#redistribute_config" do
+    it "returns a job_id" do
+      VCR.use_cassette "cluster_redistribute_config" do
+        CONNECTION.cluster.redistribute_config.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#tags_create" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.cluster.tags_create }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#tags_delete" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.cluster.tags_create }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#tags_list" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.cluster.tags_list }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#version" do
+    it "returns a version string" do
+      VCR.use_cassette "cluster_version" do
+        CONNECTION.cluster.version.body.must_equal 2
+      end
+    end
+  end
+
+  describe "#os_list" do
+    it "returns an Array" do
+      VCR.use_cassette "cluster_oses" do
+        CONNECTION.cluster.os_list.body.size.must_equal 1
+     end
+    end
+  end
+end

data/test/lib/rubineti/instance_test.rb

@@ -0,0 +1,199 @@
+require "test_helper"
+
+describe Rubineti::Instance do
+  describe "#activate_disks" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.activate_disks(:invalid_instance_name) }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#create" do
+    it "returns a job_id" do
+      params = {
+        :__version__   => Ganeti::Version,
+        :name          => "compute1",
+        :pnode         => "node1",
+        :snode         => "node2",
+        :disk_template => "drbd8",
+        :disks         => [4096],
+        :beparams      => { :vcpus => 1, :memory => 512 },
+        :os            => "debootstrap+default"
+      }
+
+      VCR.use_cassette "instance_create" do
+        response = CONNECTION.instance.create :body => params, :query => "dry-run=1"
+
+        response.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#deactivate_disks" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.deactivate_disks :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#delete" do
+    it "returns a job_id" do
+      VCR.use_cassette "instance_delete" do
+        response = CONNECTION.instance.delete :invalid_instance_name, :query => "dry-run=1"
+
+        response.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#export" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.export :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#info" do
+    it "returns a job_id" do
+      name = cassette_for("instances").first["name"]
+
+      VCR.use_cassette "instance_info" do
+        response = CONNECTION.instance.info name
+
+        response.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#list" do
+    it "returns a Hash" do
+      name = cassette_for("instances").first["name"]
+
+      VCR.use_cassette "instance_list" do
+        response = CONNECTION.instance.list name
+
+        response.body.must_be_kind_of Hash
+      end
+    end
+  end
+
+  describe "#migrate" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.migrate :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#modify" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.modify :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#prepare_export" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.prepare_export :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#reboot" do
+    it "returns a job_id" do
+      VCR.use_cassette "instance_reboot" do
+        response = CONNECTION.instance.reboot :invalid_instance_name, :query => "dry-run=1"
+
+        response.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#reinstall" do
+    it "returns a job_id" do
+      name = cassette_for("instances").first["name"]
+      params        = {
+        :os => "debootstrap+default"
+      }
+
+      VCR.use_cassette "instance_reinstall" do
+        response = CONNECTION.instance.reinstall name, :body => params
+
+        response.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#rename" do
+    it "is not implemented" do
+      lambda { CONNECTION.instance.rename :invalid_instance_name }.must_output(nil, nil).must_equal true
+    end
+  end
+
+  describe "#replace_disks" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.replace_disks :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#shutdown" do
+    it "returns a job_id" do
+      VCR.use_cassette "instance_shutdown" do
+        response = CONNECTION.instance.shutdown :invalid_instance_name, :query => "dry-run=1"
+
+        response.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#all" do
+    it "returns an Array of Hashes" do
+      VCR.use_cassette "instances" do
+        response = CONNECTION.instance.all :query => "bulk=1"
+
+        response.body.size.must_equal 1
+      end
+    end
+  end
+
+  describe "#startup" do
+    it "returns a job_id" do
+      VCR.use_cassette "instance_startup" do
+        response = CONNECTION.instance.startup :invalid_instance_name, :query => "dry-run=1"
+
+        response.body.must_match Job_Matcher
+      end
+    end
+  end
+
+  describe "#tag_create" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.tag_create :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#tag_delete" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.tag_delete :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+
+  describe "#tag_list" do
+    it "is not implemented" do
+      out, err = capture_io { CONNECTION.instance.tag_list :invalid_instance_name }
+
+      err.must_match Not_Implemented_Matcher
+    end
+  end
+end