netscaler 0.3.2 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJlMDU2YzgzMDQ4OTdmMGFjN2RlNzdiNGVlZDk0MWIxOTg2ZTY1NA==
+    MDAxODcxZGY0ZWZmNmRmYzdhYWRmZjkxMTRjMjEwOTcwYjA3NzcyMg==
   data.tar.gz: !binary |-
-    NzEyOTdiMDgxODc2MzhmMTVjYmY2ODQyZDg5NDkzOTZiY2Y0ODEwOA==
+    YzUxNDE2M2E1MGYyOTdlYWQ2ZTg3YTVkNmI4OTgwY2RkOTNiYmY4Mg==
 SHA512:
   metadata.gz: !binary |-
-    N2I0ODQyMjA5MzQyNDhjMDBmY2QwODdkMmI5YjQwMTQwYjJiY2E3ODUxYjA4
-    ZTk4YzYwYzFmNjIzN2MxOWNiNDk5M2E1ZTk3OGNjYTRmNzA4MjE4N2MwYmM4
-    Y2U2YzQ1OTY3ZDU0YzVmNzA3MGEyNDQwMjI5ZTdhNGU3ODY4Zjc=
+    NDFlMDViZGVkZGVhMTk5YjBjODQ2NzY0Y2ZiN2UyMjUwNTVlMzFlZjBhZTYz
+    YTM0NzMzNzlmOTdiMzg5ZWI5YjgxYzc1MjVjNWM4MThhZTExYzUxYTc1Y2Nl
+    NWVmY2QwY2EyZjAxNmJkZmEzMDMzY2JkMzcxMGM3ZDU3YmQ3NDA=
   data.tar.gz: !binary |-
-    YzgzNTU0OTFkNTc2OGZmN2QzOGZkMDFmMmExYTAxZmI3NmU4OWY1YTY2OGIx
-    OWQ1YTM1NTNjMzIxNzMzMjY0MDg1MTgzOGNmZDFjYTBkMjViMGZlMGE5NDIw
-    NGRmZmIzYWEyZmRkY2Y3NTg2YTUzMjlmNDUyZjA1MWUxMTNiODM=
+    OTY3MGI4MTg2ZWU4ZmFmNDBlYWIyY2JkOTkwZWI5MmMwZmFkMDE3ZjVhMWVh
+    Y2NlZjlmMzNkNWQ5Mzk4MGUwOGNkN2FhMmYxMDJlZjI0YTJiYmM0ZmQzNzFm
+    ODIwNTRjZjExMjQ1NzFhMTU1MDdkYmZlMTFjNjhmZGZjNDc0ZWI=

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/netscaler/adapter.rb

@@ -7,6 +7,15 @@ module Netscaler
       @session = value
     end
 
+    class FailedRequest < StandardError
+      attr_reader :payload
+
+      def initialize(message, payload, rest_client_exception=nil)
+        super(message)
+        @payload = payload
+        @rest_client_exception = rest_client_exception
+      end
+    end
 
     :protected
 
@@ -28,24 +37,25 @@ module Netscaler
       end
       options[:accept] = :json
       options[:params] = args[:params] if args.has_key?(:params)
+
       return options
     end
 
     def check_error(payload)
       if payload['errorcode'] != 0
-        raise Exception, "ErrorCode #{payload['errorcode']} -> #{payload['message']}"
+        e = FailedRequest.new("ErrorCode #{payload['errorcode']} -> #{payload['message']}", payload)
+        raise e
       end
     end
 
     def process_result(result, response)
-      #status_code = result.code.to_i
-
       if result.header['content-type'] =~ /application\/json/
         payload = JSON.parse(response)
         check_error(payload)
         return payload
       else
-        raise Exception, 'Shit is broke'
+        e = FailedRequest.new("Unexpected Content Type Header #{result.header['content-type']}", response)
+        raise e
       end
     end
 

data/lib/netscaler/connection.rb

@@ -51,6 +51,10 @@ module Netscaler
       return @servicegroups
     end
 
+    def servicegroup
+      return @servicegroups
+    end
+
     def load_balancing
       return @load_balancing
     end
@@ -67,6 +71,10 @@ module Netscaler
       return @servers
     end
 
+    def server
+      return @servers
+    end
+
     def session
       return @adapter.session
     end

data/lib/netscaler/http_adapter.rb

@@ -18,7 +18,12 @@ module Netscaler
       options[:content_type] = 'application/x-www-form-urlencoded'
 
       post_data = prepare_payload(data)
-      @site[url].post post_data, options
+      begin
+        @site[url].post post_data, options
+      rescue RestClient::Exception => e
+        fr = Netscaler::Adapter::FailedRequest.new "Bad request", e.response , e
+        raise fr
+      end
     end
 
     def post(part, data, args={})
@@ -27,8 +32,13 @@ module Netscaler
       options[:content_type] = 'application/x-www-form-urlencoded'
 
       post_data = prepare_payload(data)
-      @site[url].post post_data, options do |response, request, result|
-        return process_result(result, response)
+      begin
+        @site[url].post post_data, options do |response, request, result|
+          return process_result(result, response)
+        end
+      rescue RestClient::Exception => e
+        fr = Netscaler::Adapter::FailedRequest.new "Bad request", e.response , e
+        raise fr
       end
     end
 
@@ -36,8 +46,13 @@ module Netscaler
       url = get_uri(part)
       options = prepare_options(args)
 
-      @site[url].get options do |response, request, result|
-        return process_result(result, response)
+      begin
+        @site[url].get options do |response, request, result|
+          return process_result(result, response)
+        end
+      rescue RestClient::Exception => e
+        fr = Netscaler::Adapter::FailedRequest.new "Bad request", e.response , e
+        raise fr
       end
     end
 
@@ -45,10 +60,15 @@ module Netscaler
       url = get_uri(part)
       options = prepare_options(args)
 
-      @site[url].delete options do |response, request, result|
-        return process_result(result, response)
+      begin
+        @site[url].delete options do |response, request, result|
+          return process_result(result, response)
+        end
+      rescue RestClient::Exception => e
+        fr = Netscaler::Adapter::FailedRequest.new "Bad request", e.response , e
+        raise fr
       end
     end
 
   end
-end
+end

data/lib/netscaler/lb/vserver.rb

@@ -20,28 +20,24 @@ module Netscaler
 
       def show_binding(payload)
         raise ArgumentError, 'payload cannot be null' if payload.nil?
-        payload = Netscaler.hash_hack(payload)
         validate_payload(payload, [:name])
         return @netscaler.adapter.get("config/lbvserver_binding/#{payload[:name]}")
       end
 
       def remove(payload) # :args: :name
         raise ArgumentError, 'payload cannot be null' if payload.nil?
-        payload = Netscaler.hash_hack(payload)
         validate_payload(payload, [:name])
         return @netscaler.adapter.delete("config/lbvserver/#{payload[:name]}")
       end
 
       def add(payload)
         raise ArgumentError, 'payload cannot be null' if payload.nil?
-        payload = Netscaler.hash_hack(payload)
         validate_payload(payload, [:name, :serviceType, :ipv46, :port])
         return @netscaler.adapter.post_no_body('config/lbvserver/', {'lbvserver' => payload})
       end
 
       def stat(payload)
         raise ArgumentError, 'payload cannot be null' if payload.nil?
-        payload = Netscaler.hash_hack(payload)
         validate_payload(payload, [:name])
         return @netscaler.adapter.get("stat/lbvserver/#{payload[:name]}")
       end

data/lib/netscaler/mock_adapter.rb

@@ -26,7 +26,7 @@ module Netscaler
       options = prepare_options(args)
       options[:content_type] = :json#'application/json'
       post_data = prepare_payload(data)
-      puts "POST /#{url}\n#{post_data}"
+      #puts "POST /#{url}\n#{post_data}"
 
       return process_result(@result, @response)
 

data/lib/netscaler/netscaler_service.rb

@@ -1,6 +1,7 @@
 module Netscaler
   class NetscalerService
     def validate_payload(payload, required_args)
+      payload = Netscaler.hash_hack(payload)
       raise ArgumentError, 'payload must be a hash.' unless payload.is_a?(Hash)
       missing_args=[]
       required_args.each do |arg|

data/lib/netscaler/server.rb

@@ -10,7 +10,6 @@ module Netscaler
     # method #add requires arg :name but :ipaddress and :domain are optional but requires one of them.
     def add(server) # :args: :name => 'foo', :ipaddress => '192.168.1.10', :domain => 'bar.com'
       raise ArgumentError, 'server cannot be null' if server.nil?
-      server = Netscaler.hash_hack(server)
       if server[:domain] != nil then
         validate_payload(server, [:name, :domain])
       else
@@ -22,17 +21,44 @@ module Netscaler
 
     def remove(payload) # :args: :server
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:server])
       return @netscaler.adapter.delete("config/server/#{payload[:server]}")
     end
 
+    def enable(payload) # :args: :server, :service_group
+      toggle('enable', payload)
+    end
+
+    def disable(payload) # :args: :server, :service_group
+      toggle('disable', payload)
+    end
+
+    def show_bindings(payload)  # :args:  :server => 'foo'
+      raise ArgumentError, 'payload cannot be null' if payload.nil?
+      validate_payload(payload, [:server])
+      return @netscaler.adapter.get("config/server_binding/#{payload[:server]}")
+    end
+
     ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #add instead=.
-    def add_server(server)
-      warn '[DEPRECATION] "add_server" is deprecated.  Please use "#add" instead.'
-      self.add server
+    # :server is optional, if omitted it will return all servers
+    # configured on the Netscaler.
+    def show(payload = {}) # :args:  :server => 'foo'
+      if payload[:server] != nil then
+        validate_payload(payload, [:server])
+        return @netscaler.adapter.get("config/server/#{payload[:server]}")
+      elsif payload == {} then
+        return @netscaler.adapter.get('config/server/')
+      else
+        raise ArgumentError, 'payload supplied must have been missing :server'
+      end
+    end
+
+  private
+    def toggle(toggle_action, payload)
+      raise ArgumentError, 'payload cannot be null' if payload.nil?
+      #validate_payload(payload, [:server, :service_group])
+      validate_payload(payload, [:server])
+      return @netscaler.adapter.post('config/', {"params" => {"action" => toggle_action}, "server" => {"name" => payload[:server]}})
     end
   end
 end

data/lib/netscaler/service.rb

@@ -14,25 +14,15 @@ module Netscaler
     # or if it is already configured on the netscaler.
     def add(payload)  # :args: :name, :serverName, :serviceType, :port
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:name, :serverName, :serviceType, :port])
       return @netscaler.adapter.post_no_body('config/service/', {'service' => payload})
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #add instead=.
-    def add_service(payload)
-      warn '[DEPRECATION] "add_service" is deprecated.  Please use "#add" instead.'
-      self.add(payload)
-    end
-
     ##
     # :serverName is optional, if omitted it will return all services
     # configured on the Netscaler.
     def show(payload={}) # :args:  :serverName => 'foo'
       if payload[:serviceName] != nil then
-        payload = Netscaler.hash_hack(payload)
         validate_payload(payload, [:serviceName])
         return @netscaler.adapter.get("config/service/#{payload[:serviceName]}")
       elsif payload == {} then
@@ -42,73 +32,17 @@ module Netscaler
       end
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #show instead=.
-    def get_service(payload)
-      warn '[DEPRECATION] "get_service" is deprecated.  Please use "#show" instead.'
-      self.show(payload)
-    end
-
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #show instead=.
-    def get_services(args={})
-      warn '[DEPRECATION] "get_services" is deprecated.  Please use "#show" instead.'
-      return @netscaler.adapter.get('config/service/', args)
-    end
-
     def enable(payload) # :args:  :name => 'foo'
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:name])
       return @netscaler.adapter.post_no_body('config/service/', {'params' => {'action' => 'enable'}, 'service' => payload})
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #enable instead=.
-    def enable_service(payload)
-      warn '[DEPRECATION] "enable_service" is deprecated.  Please use "#enable" instead.'
-      self.enable(payload)
-    end
-
     def disable(payload) # :args:  :name => 'foo'
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:name])
       return @netscaler.adapter.post_no_body('config/service/', {'params' => {'action' => 'disable'}, 'service' => payload})
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #disable instead=.
-    def disable_service(payload)
-      warn '[DEPRECATION] "disable_service" is deprecated.  Please use "#disable" instead.'
-      self.disable(payload)
-    end
-
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use Netscaler::Lb::Monitor.bind instead=.
-    def lbmonitor_service_binding(payload)
-      warn '[DEPRECATION] "lbmonitor_service_binding" is deprecated.  Please use "Netscaler::Lb::Monitor.bind" instead.'
-      raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
-      validate_payload(payload, [:serviceName, :monitorName])
-      return @netscaler.adapter.post_no_body("config/lbmonitor_service_binding/#{payload[:monitorName]}?action=bind", {'params' => {'action' => 'bind'}, 'lbmonitor_service_binding' => payload})
-    end
-
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use Netscaler::Lb::Monitor.unbind instead=.
-    def lbmonitor_service_unbinding(payload)
-      warn '[DEPRECATION] "lbmonitor_service_binding" is deprecated.  Please use "Netscaler::Lb::Monitor.bind" instead.'
-      raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
-      validate_payload(payload, [:serviceName, :monitorName])
-      return @netscaler.adapter.post_no_body("config/lbmonitor_service_binding/#{payload[:monitorName]}?action=unbind", {'params' => {'action' => 'unbind'}, 'lbmonitor_service_binding' => payload})
-    end
-
   end
 end

data/lib/netscaler/servicegroup.rb

@@ -8,120 +8,74 @@ module Netscaler
 
     def add(payload)  # :args: :serviceGroupName => 'foo', :serviceType => 'HTTP'
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:serviceGroupName, :serviceType])
       return @netscaler.adapter.post_no_body("config/servicegroup/", "servicegroup" => payload)
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #add instead=.
-    def add_servicegroup(payload)
-      warn '[DEPRECATION] "add_servicegroup" is deprecated.  Please use "#add" instead.'
-      self.add(payload)
-    end
-
     def remove(payload) # :arg: serviceGroupName
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:serviceGroupName])
       return @netscaler.adapter.delete("config/servicegroup/#{payload[:serviceGroupName]}")
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #remove instead=.
-    def remove_servicegroup(payload)
-      warn '[DEPRECATION] "remove_servicegroup" is deprecated.  Please use "#remove" instead.'
-      self.remove(payload)
-    end
-
     ##
     # argument is optional, if left empty it will return all servicegroups
-    def show(payload) # :arg: servicegroupname
-      return @netscaler.adapter.get("config/servicegroup/", args) if payload.nil?
+    def show(payload={}) # :arg: servicegroupname
+      return @netscaler.adapter.get("config/servicegroup/") if payload = {}
       return @netscaler.adapter.get("config/servicegroup/#{payload}")
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #show instead=.
-    def get_servicegroup(payload)
-      warn '[DEPRECATION] "get_servicegroup" is deprecated.  Please use "#show" instead.'
-      self.show(payload)
+    def enable(payload) # :arg: service_group
+      toggle('enable', payload)
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #show instead=.
-    def get_servicegroups(payload)
-      warn '[DEPRECATION] "get_servicegroup" is deprecated.  Please use "#show" instead.'
-      self.show(payload)
-    end
-
-    def show_bindings(payload)  # :args: servicegroupname
-      return @netscaler.adapter.get("config/servicegroup_servicegroupmember_binding/#{payload}")
+    def disable(payload) # :arg: service_group
+      toggle('disable', payload)
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #show_bindings instead=.
-    def get_servicegroup_servicegroupmember_bindings(payload)
-      warn '[DEPRECATION] "get_servicegroup_servicegroupmember_bindings" is deprecated.  Please use "#show_bindings" instead.'
-      self.show_bindings(payload)
+    def enable_server(payload) # :arg: service_group, serverName, port
+      raise ArgumentError, 'payload cannot be null' if payload.nil?
+      validate_payload(payload, [:serviceGroupName, :serverName, :port])
+      return @netscaler.adapter.post('config/', {"params" =>
+                                                     {"action" => "enable"},
+                                                 "servicegroup" =>
+                                                     {"servicegroupname" => payload[:serviceGroupName],
+                                                      "serverName" => payload[:serverName],
+                                                      "port" => payload[:port] }})
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use Netscaler::Lb::Monitor.bind instead=.
-    def lbmonitor_servicegroup_binding(payload)
-      warn '[DEPRECATION] "lbmonitor_servicegroup_binding" is deprecated.  Please use "Netscaler::Lb::Monitor.bind" instead.'
+    def disable_server(payload) # :arg: service_group, servername, port
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
-      validate_payload(payload, [:serviceGroupName, :monitorName])
-      return @netscaler.adapter.post_no_body("config/lbmonitor_servicegroup_binding/#{payload[:monitorName]}?action=bind",  {'params' => {'action' => 'bind'}, 'lbmonitor_servicegroup_binding' => payload})
+      validate_payload(payload, [:serviceGroupName, :serverName, :port])
+      return @netscaler.adapter.post('config/', {"params" =>
+                                                     {"action" => "disable"},
+                                                 "servicegroup" =>
+                                                     {"servicegroupname" => payload[:serviceGroupName],
+                                                      "serverName" => payload[:serverName],
+                                                      "port" => payload[:port] }})
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use Netscaler::Lb::Monitor.unbind instead=.
-    def lbmonitor_servicegroup_unbinding(payload)
-      warn '[DEPRECATION] "lbmonitor_servicegroup_unbinding" is deprecated.  Please use "Netscaler::Lb::Monitor.unbind" instead.'
-      raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
-      validate_payload(payload, [:serviceGroupName, :monitorName])
-      return @netscaler.adapter.post_no_body("config/lbmonitor_servicegroup_binding/#{payload[:monitorName]}?action=unbind", {'params' => {'action' => 'unbind'}, 'lbmonitor_servicegroup_binding' => payload})
+    def show_bindings(payload)  # :args: servicegroupname
+      return @netscaler.adapter.get("config/servicegroup_servicegroupmember_binding/#{payload}")
     end
 
     def bind(payload) # :args:  :serviceGroupName => 'foo', :port => '80', :serverName => 'bar'
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:serviceGroupName, :port, :serverName])
       return @netscaler.adapter.post_no_body("config/servicegroup_servicegroupmember_binding/#{payload['serviceGroupName']}?action=bind", {'params' => {'action' => 'bind'}, 'servicegroup_servicegroupmember_binding' => payload})
     end
 
-
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #bind instead=.
-    def bind_servicegroup_servicegroupmember(payload)
-      warn '[DEPRECATION] "bind_servicegroup_servicegroupmember" is deprecated.  Please use #bind instead.'
-      self.bind(payload)
-    end
-
     def unbind(payload) # :args:  :serviceGroupName => 'foo', :port => '80', :serverName => 'bar'
       raise ArgumentError, 'payload cannot be null' if payload.nil?
-      payload = Netscaler.hash_hack(payload)
       validate_payload(payload, [:serviceGroupName, :port, :serverName])
       return @netscaler.adapter.post_no_body("config/servicegroup_servicegroupmember_binding/#{payload['serviceGroupName']}?action=unbind", {'params' => {'action' => 'unbind'}, 'servicegroup_servicegroupmember_binding' => payload})
     end
 
-    ##
-    # :category: Deprecated Methods
-    # DEPRECATED: Please use #unbind instead=.
-    def unbind_servicegroup_servicegroupmember(payload)
-      warn '[DEPRECATION] "unbind_servicegroup_servicegroupmember" is deprecated.  Please use #unbind instead.'
-      self.unbind(payload)
+  private
+    def toggle(toggle_action, payload)
+      raise ArgumentError, 'payload cannot be null' if payload.nil?
+      validate_payload(payload, [:serviceGroupName])
+      return @netscaler.adapter.post('config/', {"params" => {"action" => toggle_action}, "servicegroup" => {"servicegroupname" => payload[:service_group]}})
     end
 
   end

data/netscaler.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: netscaler 0.3.2 ruby lib
+# stub: netscaler 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "netscaler"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jeremy Custenborder", "David Andrew", "Jarrett Irons"]
-  s.date = "2014-11-09"
+  s.date = "2014-12-20"
   s.description = "Netscaler api working against the Citrix Nitro api.  Currently supports Nitro 9.3.  Hope to add support for 10.X.  Currently has support for som basics such as adding servers/services/servicegroups."
   s.email = ["jeremy@scarcemedia.com", "david.andrew@webtrends.com", "jarrett.irons@gmail.com"]
   s.extra_rdoc_files = [
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/GravityLabs/netscaler"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Netscaler api working against the Citrix Nitro api."
 
   if s.respond_to? :specification_version then

data/spec/server_spec.rb

@@ -8,20 +8,12 @@ describe Netscaler::Server do
 
   context 'when adding a new server' do
     it 'a name is required' do
-      expect {
-        connection.servers.add_server({'ipaddress'=>'123.123.123.123'})
-      }.should raise_error(ArgumentError, /name/)
-
       expect {
         connection.servers.add({'ipaddress'=>'123.123.123.123'})
       }.should raise_error(ArgumentError, /name/)
     end
 
     it 'an ipaddress is required' do
-      expect {
-        connection.servers.add_server({'name'=>'hostname'})
-      }.should raise_error(ArgumentError, /ipaddress/)
-
       expect {
         connection.servers.add({'name'=>'hostname'})
       }.should raise_error(ArgumentError, /ipaddress/)
@@ -46,4 +38,51 @@ describe Netscaler::Server do
     end
   end
 
+  %w(enable disable).each do |toggle_action|
+    context "when running server.#{toggle_action}" do
+
+      it ':server is required' do
+        expect {
+          connection.servers.send(toggle_action, nil)
+        }.should raise_error(ArgumentError, /null/)
+      end
+
+      it 'returns a hash if all necesssary args are supplied' do
+        result = connection.servers.send(toggle_action, :server => 'foo')
+        result.should be_kind_of(Hash)
+      end
+
+    end
+  end
+
+  context 'when showing bindings for a server' do
+    it ':server is required' do
+      expect {
+        connection.servers.show_bindings({})
+      }.should raise_error(ArgumentError, /server/)
+    end
+
+    it 'returns a Hash object if all necessary args are supplied' do
+      result = connection.servers.show_bindings :server => 'foo'
+      result.should be_kind_of(Hash)
+    end
+  end
+
+  context 'when showing a server or servers' do
+    it ':server is required if arguments are specified' do
+      expect {
+        connection.servers.show_bindings({something: 'notcool'})
+      }.should raise_error(ArgumentError, /server/)
+    end
+
+    it 'returns a Hash object if server arg supplied' do
+      result = connection.servers.show_bindings :server => 'foo'
+      result.should be_kind_of(Hash)
+    end
+
+    it 'returns a Hash object if no args supplied since it then returns all servers' do
+      result = connection.servers.show_bindings :server => 'foo'
+      result.should be_kind_of(Hash)
+    end
+  end
 end

data/spec/servicegroup_spec.rb

@@ -5,74 +5,60 @@ require 'netscaler/mock_adapter'
 describe Netscaler::ServiceGroup do
 
   connection = Netscaler::Connection.new 'hostname' => 'foo', 'password' => 'bar', 'username' => 'bar'
+  connection.adapter = Netscaler::MockAdapter.new :body => '{ "errorcode": 0, "message": "Done" }'
 
   context 'when adding a new servicegroup' do
 
     it 'a name is required' do
-      #netscaler.adapter = Netscaler::MockAdapter.new :status_code=>400, :body => '{ "errorcode": 1095, "message": "Required argument missing [name]", "severity": "ERROR" }',
-
       expect {
-        connection.servicegroups.add_servicegroup({ 'serviceType' => 'tcp' })
+        connection.servicegroups.add({ 'serviceType' => 'tcp' })
       }.should raise_error(ArgumentError, /serviceGroupName/)
     end
 
     it 'a service type is required' do
       expect {
-        connection.servicegroups.add_servicegroup({ 'serviceGroupName' => 'test-serviceGroup' })
+        connection.servicegroups.add({ 'serviceGroupName' => 'test-serviceGroup' })
       }.should raise_error(ArgumentError, /serviceType/)
     end
 
   end
 
-  context 'when binding a new lbmonitor to servicegroup' do
+  context 'when removing a servicegroup' do
 
-    it 'a Service group name is required' do
+    it 'has to require a serviceGroupName' do
       expect {
-        connection.servicegroups.lbmonitor_servicegroup_binding({ 'monitorName' => 'TCP' })
+        connection.servicegroups.remove()
+      }.should raise_error(ArgumentError, /wrong number of arguments/)
+      expect {
+        connection.servicegroups.remove(:foo => 'bar')
       }.should raise_error(ArgumentError, /serviceGroupName/)
     end
 
-    it 'a lbmonitor name is required' do
-      expect {
-        connection.servicegroups.lbmonitor_servicegroup_binding({ 'serviceGroupName' => 'test-serviceGroup' })
-      }.should raise_error(ArgumentError, /monitorName/)
+    it 'returns a Hash object if all necessary args are supplied' do
+      result = connection.servicegroups.show_bindings :serviceGroupName => 'foo'
+      result.should be_kind_of(Hash)
     end
 
   end
 
-  context 'when unbinding a lbmonitor from servicegroup' do
 
-    it 'a Service group name is required' do
-      expect {
-        connection.servicegroups.lbmonitor_servicegroup_binding({ 'monitorName' => 'TCP' })
-      }.should raise_error(ArgumentError, /serviceGroupName/)
-    end
-
-    it 'a lbmonitor name is required' do
-      expect {
-        connection.servicegroups.lbmonitor_servicegroup_binding({ 'serviceGroupName' => 'test-serviceGroup' })
-      }.should raise_error(ArgumentError, /monitorName/)
-    end
-
-  end
-  
   context 'when binding a new server to servicegroup' do
 
     it 'a Service group name is required' do
       expect {
-        connection.servicegroups.bind_servicegroup_servicegroupmember({ 'port'=> '8080', 'ip' => '199.199.199.199' })
+        connection.servicegroups.bind({ 'port'=> '8080', 'ip' => '199.199.199.199' })
       }.should raise_error(ArgumentError, /serviceGroupName/)
     end
 
     it 'a server entity is required' do
       expect {
-        connection.servicegroups.bind_servicegroup_servicegroupmember({ 'serviceGroupName' => 'test-serviceGroup', 'port' => '8080' })
+        connection.servicegroups.bind({ 'serviceGroupName' => 'test-serviceGroup', 'port' => '8080' })
       }.should raise_error(ArgumentError, /serverName/)
     end
 
     it 'a port is required' do
       expect {
-        connection.servicegroups.bind_servicegroup_servicegroupmember({ 'serviceGroupName' => 'test-serviceGroup', 'ip' => '199.199.199.199' })
+        connection.servicegroups.bind({ 'serviceGroupName' => 'test-serviceGroup', 'ip' => '199.199.199.199' })
       }.should raise_error(ArgumentError, /port/)
     end
 
@@ -82,22 +68,68 @@ describe Netscaler::ServiceGroup do
 
     it 'a Service group name is required' do
       expect {
-        connection.servicegroups.unbind_servicegroup_servicegroupmember({ 'port' => '8080', 'ip' => '199.199.199.199' })
+        connection.servicegroups.unbind({ 'port' => '8080', 'ip' => '199.199.199.199' })
       }.should raise_error(ArgumentError, /serviceGroupName/)
     end
 
     it 'a server entity is required' do
       expect {
-        connection.servicegroups.unbind_servicegroup_servicegroupmember({ 'serviceGroupName' => 'test-serviceGroup', 'port' => '8080' })
+        connection.servicegroups.unbind({ 'serviceGroupName' => 'test-serviceGroup', 'port' => '8080' })
       }.should raise_error(ArgumentError, /serverName/)
     end
 
     it 'a port is required' do
       expect {
-        connection.servicegroups.unbind_servicegroup_servicegroupmember({ 'serviceGroupName' => 'test-serviceGroup', 'ip' => '199.199.199.199' })
+        connection.servicegroups.unbind({ 'serviceGroupName' => 'test-serviceGroup', 'ip' => '199.199.199.199' })
       }.should raise_error(ArgumentError, /port/)
     end
 
   end
-  
+
+  %w(enable disable).each do |toggle_action|
+    context "when running servicegroup.#{toggle_action}" do
+
+      it ':serviceGroupName is required' do
+        expect {
+          connection.servicegroups.send(toggle_action, {})
+        }.should raise_error(ArgumentError, /serviceGroupName/)
+      end
+
+      it 'returns a hash if all necesssary args are supplied' do
+        result = connection.servicegroups.send(toggle_action, :serviceGroupName => 'foo')
+        result.should be_kind_of(Hash)
+      end
+
+    end
+
+    context "when #{toggle_action} a server in servicegroup" do
+
+      it ':serviceGroupName is required' do
+        expect {
+          connection.servicegroups.send("#{toggle_action}_server", {:serverName => 'foo', :port => '80'})
+        }.should raise_error(ArgumentError, /serviceGroupName/)
+      end
+
+      it ':serviceGroupName is required' do
+        expect {
+          connection.servicegroups.send("#{toggle_action}_server", {:serviceGroupName => 'foo', :port => '80'})
+        }.should raise_error(ArgumentError, /serverName/)
+      end
+
+      it ':serviceGroupName is required' do
+        expect {
+          connection.servicegroups.send("#{toggle_action}_server", {:serviceGroupName => 'bar', :serverName => 'foo'})
+        }.should raise_error(ArgumentError, /port/)
+      end
+
+      it 'should return a Hash if all args are returned' do
+        result = connection.servicegroups.send("#{toggle_action}_server", {:serviceGroupName => 'bar', :serverName => 'foo', :port => '80'})
+        result.should be_kind_of(Hash)
+      end
+
+    end
+
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netscaler
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeremy Custenborder
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Netscaler api working against the Citrix Nitro api.