zeus-api 0.1.0 → 0.1.1

data/Gemfile

@@ -2,11 +2,12 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+gem "soap4r", ">=1.5.8"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "rspec", "~> 2.1.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -1,14 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     git (1.2.5)
+    httpclient (2.1.5.2)
     jeweler (1.5.1)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     rake (0.8.7)
     rcov (0.9.9)
-    shoulda (2.11.3)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    soap4r (1.5.8)
+      httpclient (>= 2.1.1)
 
 PLATFORMS
   ruby
@@ -17,4 +28,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.1)
   rcov
-  shoulda
+  rspec (~> 2.1.0)
+  soap4r (>= 1.5.8)

data/Rakefile

@@ -16,31 +16,28 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/peterson/zeus-api"
   gem.license = "MIT"
   gem.summary = %Q{Ruby control API for Zeus Load Balancer and Zeus Traffic Manager}
-  gem.description = %Q{This gem implements a wrapper to the SOAP control API provided by Zeus Load Balance (ZLB) and Zeus Traffic Manager (ZTM).}
+  gem.description = %Q{This gem implements a wrapper to the SOAP control API provided by Zeus Load Balancer (ZLB) and Zeus Traffic Manager (ZTM).}
   gem.email = "peterson@orbitec.com.au"
   gem.authors = ["David Peterson"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   gem.add_runtime_dependency 'soap4r', '>= 1.5.8'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/api/catalogrule/CatalogRuleService.rb

@@ -145,6 +145,7 @@ class CatalogRuleService
   #
   # Examples
   #   note(name, note)  - Sets the note for a rule called "name"
+  #   note(name) - Returns the note for the rule "name"
   def note(name, note=nil)
     if note.nil?
       details(name).rule_notes
@@ -161,6 +162,7 @@ class CatalogRuleService
   #
   # Examples
   #   text(name, text)  - Sets the text for a rule called "name"
+  #   text(name) - Returns the text for the rule "name"
   def text(name, text=nil)
     if text.nil?
       details(name).rule_text

data/lib/api/pool/PoolService.rb

@@ -210,7 +210,7 @@ class PoolService
   #   node (String)     - Node ("host:port")
   #
   # Examples
-  #   remove_draining_node("pool", "host:80")
+  #   undrain_node("pool", "host:80")
   #
   def undrain_node(name, node)
     @driver.removeDrainingNodes([name], [[node]])
@@ -223,7 +223,7 @@ class PoolService
   #   nodes (Array)     - Nodes (["host1:port", "host2:port"])
   #
   # Examples
-  #   remove_draining_nodes("pool",["host1:80", "host2:80"])
+  #   undrain_nodes("pool",["host1:80", "host2:80"])
   #  
   def undrain_nodes(name, nodes)
     @driver.removeDrainingNodes([name], [nodes])

data/lib/api/virtualserver/VirtualServerService.rb

@@ -71,6 +71,44 @@ class VirtualServerService
     @driver.addVirtualServer([name], [vs_basic_info])
   end
 
+  # Copies a virtual server
+  #
+  # Args
+  #   name (String)       - Name of current virtual server
+  #   new_name (String)   - Name of new virtual server
+  #
+  # Examples
+  #   copy(name, new_name)  - Copies VS called "name" to a new VS called "new_name"
+  #  
+  def copy(name, new_name)
+    @driver.copyVirtualServer([name], [new_name])
+  end
+
+  # Renames a virtual server
+  #
+  # Args
+  #   name (String)       - Current name of virtual server
+  #   new_name (String)   - New name of virtual server
+  #
+  # Examples
+  #   rename(name, new_name)  - Renames VS "name" to "new_name"
+  #  
+  def rename(name, new_name)
+    @driver.renameVirtualServer([name], [new_name])
+  end
+  
+  # Deletes a virtual server
+  #
+  # Args
+  #   name (String)       - Name of virtual server
+  #
+  # Examples
+  #   delete("test")        - Deletes virtual server called "test"
+  #  
+  def delete(name)
+    @driver.deleteVirtualServer([name])
+  end
+
   # Enables a virtual server
   #
   # Args
@@ -89,11 +127,27 @@ class VirtualServerService
   #   name (String)          - Virtual server's name to disable
   #
   # Examples
-  #   disable("web")         - Disables a virtual server called "web"
+  #   disable("name")         - Disables a virtual server called "name"
   #
   def disable(vs_name=nil)
     @driver.setEnabled([vs_name], [false])
   end
+
+  # Checks whether the virtual server is enabled
+  #
+  # Args
+  #   vs_name (String) - Virtual server's name
+  #
+  # Returns
+  #   valid (boolean)  - True if valid
+  #
+  # Examples
+  #   enabled?("test")  - Checks whether VS "test" is enabled
+  #  
+  def enabled?(vs_name)
+    res = @driver.getEnabled([vs_name])
+    return res.first
+  end
   
   # Adds a request rule (and enables it)
   #

data/sample/simple.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'zeus-api'
 
-endpoint = "https://10.0.0.250:9090/soap"
+endpoint = "https://zeus:9090/soap"
 username = "api"
 password = "api"
 
@@ -9,31 +9,42 @@ vs = VirtualServerService.new(endpoint, username, password)
 p = PoolService.new(endpoint, username, password)
 r = CatalogRuleService.new(endpoint, username, password)
 
-
-# create a new pool
+# basic config
+vs_name = "test"
 pool_name = "test-pool"
 pool_nodes = ["10.0.0.101:80", "10.0.0.102:80"]
+rule_name = "test-rule"
+
+
+# delete if existing
+if vs.list.include?(vs_name)
+  vs.delete("test")
+  puts "Found existing virtual server '#{vs_name}', deleting ..."
+end
 
 if p.list.include?(pool_name)
   p.delete(pool_name)
+  puts "Found existing pool '#{pool_name}', deleting ..."
 end
 
+if r.list.include?(rule_name)
+  r.delete(rule_name)
+  puts "Found existing rule '#{rule_name}', deleting ..."
+end
+
+# create pool
+pool_nodes = ["10.0.0.101:80", "10.0.0.102:80"]
 p.create(pool_name, pool_nodes)
 puts "Pool '#{pool_name}' was successfully created."
 
 
 # create a new virtual server
-vs_name = "test"
 vs_info = {
   :protocol => "http",
   :port => "8000",
   :default_pool => pool_name
 }
 
-if vs.list.include?(vs_name)
-  # vs.delete("test") # FIXME implement
-end
-
 vs.create(vs_name, vs_info)
 puts "Virtual server '#{vs_name}' was successfully created."
 
@@ -42,7 +53,6 @@ puts "Virtual server '#{vs_name}' was enabled."
 
 
 # create a new rule and add to virtual server
-rule_name = "test-rule"
 rule_text = "if( string.contains( http.getheader( \"Host\" ), \"test.com\" ) ){\n\n\tpool.use( \"test-pool\" );\n\n}\n"
 rule_note = "Simple Host header dispatch rule using trafficscript"
 

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'zeus-api'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+
+end

data/spec/virtualserver_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "virtualserver" do
+  
+  vs_name = "rspec-test"
+  vs_copy = "rspec-test-copy"
+  
+  before do
+    endpoint = "https://zeus:9090/soap"
+    user = "api"
+    pass = "api"
+
+    @vs = VirtualServerService.new(endpoint, user, pass)
+  end
+  
+  it "should have a driver" do
+    @vs.driver.nil?.should == false
+  end
+
+  it "should create a virtual server" do  
+    vs_info = {
+      :protocol => "http",
+      :port => "9999",
+    }
+  
+    @vs.create(vs_name, vs_info)    
+    @vs.list.include?(vs_name).should == true    
+  end
+
+  it "should list the virtual server" do
+    @vs.list.include?(vs_name).should == true
+  end
+
+  it "should copy the virtual server" do
+    @vs.copy(vs_name, vs_copy).nil?.should == true
+  end
+
+  it "should delete the original virtual server" do
+    @vs.delete(vs_name)
+    @vs.list.include?(vs_name).should == false    
+  end
+
+  it "should rename the copied virtual server" do
+    @vs.copy(vs_copy, vs_name).nil?.should == true
+  end
+
+  it "should delete the copied virtual server" do
+    @vs.delete(vs_name)
+    @vs.list.include?(vs_name).should == false    
+  end
+
+end

data/zeus-api.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zeus-api}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Peterson"]
-  s.date = %q{2010-11-24}
-  s.description = %q{This gem implements a wrapper to the SOAP control API provided by Zeus Load Balance (ZLB) and Zeus Traffic Manager (ZTM).}
+  s.date = %q{2010-11-25}
+  s.description = %q{This gem implements a wrapper to the SOAP control API provided by Zeus Load Balancer (ZLB) and Zeus Traffic Manager (ZTM).}
   s.email = %q{peterson@orbitec.com.au}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -41,8 +41,8 @@ Gem::Specification.new do |s|
     "lib/api/virtualserver/VirtualServerService.rb",
     "lib/zeus-api.rb",
     "sample/simple.rb",
-    "test/helper.rb",
-    "test/test_zeus-api.rb",
+    "spec/spec_helper.rb",
+    "spec/virtualserver_spec.rb",
     "zeus-api.gemspec"
   ]
   s.homepage = %q{http://github.com/peterson/zeus-api}
@@ -51,8 +51,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby control API for Zeus Load Balancer and Zeus Traffic Manager}
   s.test_files = [
-    "test/helper.rb",
-    "test/test_zeus-api.rb"
+    "spec/spec_helper.rb",
+    "spec/virtualserver_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -60,24 +60,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_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<soap4r>, [">= 1.5.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<soap4r>, [">= 1.5.8"])
+      s.add_development_dependency(%q<rspec>, ["> 1.2.3"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<soap4r>, [">= 1.5.8"])
+      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<soap4r>, [">= 1.5.8"])
+      s.add_dependency(%q<rspec>, ["> 1.2.3"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<soap4r>, [">= 1.5.8"])
+    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<soap4r>, [">= 1.5.8"])
+    s.add_dependency(%q<rspec>, ["> 1.2.3"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zeus-api
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - David Peterson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +11:00
+date: 2010-11-25 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,16 +24,34 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        version: "0"
-  type: :development
-  name: shoulda
+        - 1
+        - 5
+        - 8
+        version: 1.5.8
+  type: :runtime
+  name: soap4r
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  name: rspec
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,9 +65,9 @@ dependencies:
   type: :development
   name: bundler
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,9 +81,9 @@ dependencies:
   type: :development
   name: jeweler
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,9 +95,9 @@ dependencies:
   type: :development
   name: rcov
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,8 +111,24 @@ dependencies:
   type: :runtime
   name: soap4r
   prerelease: false
-  version_requirements: *id005
-description: This gem implements a wrapper to the SOAP control API provided by Zeus Load Balance (ZLB) and Zeus Traffic Manager (ZTM).
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :development
+  name: rspec
+  prerelease: false
+  version_requirements: *id007
+description: This gem implements a wrapper to the SOAP control API provided by Zeus Load Balancer (ZLB) and Zeus Traffic Manager (ZTM).
 email: peterson@orbitec.com.au
 executables: []
 
@@ -128,8 +162,8 @@ files:
 - lib/api/virtualserver/VirtualServerService.rb
 - lib/zeus-api.rb
 - sample/simple.rb
-- test/helper.rb
-- test/test_zeus-api.rb
+- spec/spec_helper.rb
+- spec/virtualserver_spec.rb
 - zeus-api.gemspec
 has_rdoc: true
 homepage: http://github.com/peterson/zeus-api
@@ -166,5 +200,5 @@ signing_key:
 specification_version: 3
 summary: Ruby control API for Zeus Load Balancer and Zeus Traffic Manager
 test_files: 
-- test/helper.rb
-- test/test_zeus-api.rb
+- spec/spec_helper.rb
+- spec/virtualserver_spec.rb

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'zeus-api'
-
-class Test::Unit::TestCase
-end

data/test/test_zeus-api.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestZeusApi < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end