netscaler-cli 0.3.1 → 0.3.2

data/etc/Version

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/netscaler/baseexecutor.rb

@@ -17,6 +17,8 @@ module Netscaler
         raise Netscaler::TransactionError.new("The parameters were empty.")
       end
 
+      params.delete(:empty)
+
       log.debug("Calling: #{name}")
 
       result = client.send("#{name}!") do |soap|

data/lib/netscaler/clitemplate.rb

@@ -96,14 +96,25 @@ module Netscaler
       opts.separator ""
     end
 
+    def requires_argument?
+      true
+    end
+
+    def validate_noargs
+    end
+
     def validate_args(args)
-      if args.length == 0
-        raise Netscaler::ConfigurationError.new("No hosts specified to act on.")
-      elsif args.length != 1
-        raise Netscaler::ConfigurationError.new("Only one #{cli_type} can be acted on at a time.")
-      end
+      if requires_argument?
+        if args.length == 0
+          raise Netscaler::ConfigurationError.new("No hosts specified to act on.")
+        elsif args.length != 1
+          raise Netscaler::ConfigurationError.new("Only one #{cli_type} can be acted on at a time.")
+        end
 
-      @host = args[0]
+        @host = args[0]
+      else
+        validate_noargs
+      end
 
       if options[:action].empty?
         options[:action] << :status

data/lib/netscaler/server/cli.rb

@@ -1,4 +1,5 @@
 require 'netscaler/clitemplate'
+require 'netscaler/errors'
 require 'netscaler/server/executor'
 
 module Netscaler::Server
@@ -12,7 +13,7 @@ module Netscaler::Server
     end
 
     def interface_header(opts)
-      opts.banner = "Usage: #{File.basename($0)} [OPTIONS] SERVER"
+      opts.banner = "Usage: #{File.basename($0)} [OPTIONS] [SERVER]"
       opts.separator <<DESC
 Description:
     This is a tool for enabling and disabling a server in a Netscaler
@@ -22,10 +23,23 @@ Description:
     By default, this script will tell you what its current status of the
     server is.
 
+    If you want to list all of the services, use the --list flag with no
+    server argument.
+
 Options:
 DESC
     end
 
+    def requires_argument?
+      false
+    end
+
+    def validate_noargs
+      if !options[:action].include?(:list)
+        raise Netscaler::ConfigurationError.new("No hosts specified to act on.")
+      end
+    end
+
     def interface_actions(opts)
       opts.separator "   Actions: "
       opts.on('-e', '--enable',
@@ -36,6 +50,10 @@ DESC
               "Disables the given server.") do |d|
         options[:action] << :disable
       end
+      opts.on('-l', '--list',
+              "Lists all of the servers in the environment") do |l|
+        options[:action] << :list
+      end
       opts.separator ""
     end
   end # CLI

data/lib/netscaler/server/executor.rb

@@ -15,9 +15,32 @@ module Netscaler::Server
       send_request('disableserver', @params)
     end
 
+    def list(options)
+      send_request('getserver', {:empty => :ok}) do |response|
+        puts "[" if options[:json]
+        
+        servers = response[:return][:list][:item]
+        servers.each_with_index do |server, i|
+          resp = Response.new(server)
+          if options[:json]
+            if i == servers.length - 1
+              puts "    #{resp.to_json}"
+            else
+              puts "    #{resp.to_json},"
+            end
+          else
+            puts resp.to_s
+            puts
+          end
+        end
+
+        puts "]"if options[:json]
+      end      
+    end
+
     def status(options)
       send_request('getserver', @params) do |response|
-        resp = Response.new(response)
+        resp = Response.new(response[:return][:list][:item])
         if options[:json]
           puts resp.to_json
         else
@@ -28,11 +51,10 @@ module Netscaler::Server
   end
 
   class Response
-    attr_reader :raw_response, :info
+    attr_reader :info
 
     def initialize(raw_response)
-      @raw_response = raw_response
-      @info = raw_response[:return][:list][:item]
+      @info = raw_response
     end
 
     def name
@@ -48,28 +70,46 @@ module Netscaler::Server
     end
 
     def services
-      info[:servicename][:item]
+      if info[:servicename]
+        info[:servicename][:item]
+      else
+        []
+      end
     end
 
     def to_s
-      base = "Name:\t#{name}\nIP Address:\t#{ip_address}\nState:\t#{state}\nServices:\n"
-      services.each do |service|
-        base << "\t#{service}\n"
+      base = "Name:\t#{name}\nIP:\t#{ip_address}\nState:\t#{state}"
+
+      if !services.empty?
+        base << "\nServices:\n"
+        services.each do |service|
+          base << "\t#{service}\n"
+        end
+        base
       end
+
       base
     end
 
     def to_json
-      base = "{ 'name': '#{name}', 'ip_address': '#{ip_address}', 'state': '#{state}', 'services': ["
+      base = "{ 'name': '#{name}', 'ip_address': '#{ip_address}', 'state': '#{state}'"
+
+      if services.empty?
+        base << " }"
+      else
+        base << ", 'services': ["
 
-      services.each_with_index do |service, i|
-        base << "'#{service}'"
-        if i != services.length - 1
-          base << ", "
+        services.each_with_index do |service, i|
+          base << "'#{service}'"
+          if i != services.length - 1
+            base << ", "
+          end
         end
+
+        base << "] }"
       end
 
-      base << "] }"
+      base
     end
   end
 end

data/lib/netscaler/vserver/cli.rb

@@ -12,7 +12,7 @@ module Netscaler::VServer
     end
 
     def interface_header(opts)
-      opts.banner = "Usage: #{File.basename($0)} [OPTIONS] VSERVER"
+      opts.banner = "Usage: #{File.basename($0)} [OPTIONS] [VSERVER]"
       opts.separator <<DESC
 Description:
     This is a tool for enabling and disabling a virtual server in a Netscaler
@@ -22,6 +22,9 @@ Description:
     By default, this script will tell you what its current status of the
     virtual server is.
 
+    If you want to list all of the virtual servers, use the --list flag with no
+    server argument.
+
 Options:
 DESC
     end
@@ -53,9 +56,23 @@ DESC
         options[:action] << :unbind
         options[:policy_name] = u
       end
+      opts.on('-l', '--list',
+              "List all of the virtual servers in the environment.") do |l|
+        options[:action] << :list
+      end
       opts.separator ""
     end
 
+    def requires_argument?
+      false
+    end
+
+    def validate_noargs
+      if !options[:action].include?(:list)
+        raise Netscaler::ConfigurationError.new("No hosts specified to act on.")
+      end
+    end
+
     def validate_args(args)
       super(args)
 

data/lib/netscaler/vserver/executor.rb

@@ -18,10 +18,33 @@ module Netscaler::VServer
       send_request('disablelbvserver', @params)
     end
 
+    def list(options)
+      send_request('getlbvserver', {:empty => :ok}) do |response|
+        puts "[" if options[:json]
+        
+        vservers = response[:return][:list][:item]
+        vservers.each_with_index do |vserver, i|
+          resp = Response.new(vserver)
+          if options[:json]
+            if i == vservers.length - 1
+              puts "    #{resp.to_json}"
+            else
+              puts "    #{resp.to_json},"
+            end
+          else
+            puts resp.to_s
+            puts
+          end
+        end
+
+        puts "]"if options[:json]
+      end      
+    end
+
     def status(options)
       send_request('getlbvserver', @params) do |response|
         begin
-          resp = Response.new(response)
+          resp = Response.new(response[:return][:list][:item])
           if options[:json]
             puts resp.to_json
           else
@@ -58,11 +81,10 @@ module Netscaler::VServer
   end
 
   class Response
-    attr_reader :raw_response, :info
+    attr_reader :info
 
     def initialize(raw_response)
-      @raw_response = raw_response
-      @info = raw_response[:return][:list][:item]
+      @info = raw_response
     end
 
     def name
@@ -91,7 +113,7 @@ module Netscaler::VServer
 
     def servers
       @parsed_servers ||= []
-      if !@parsed_servers.empty?
+      if !@parsed_servers.empty? || info[:servicename].nil?
         return @parsed_servers
       end
 
@@ -121,27 +143,40 @@ module Netscaler::VServer
     end
 
     def to_s
-      base = "Name:\t#{name}\nIP:\t#{ip_address}\nState:\t#{state}\nPort:\t#{port}\nType:\t#{type}\nServers:\n"
-      servers.each do |server|
-        base << server.to_s
-        base << "\n\n"
+      base = "Name:\t#{name}\nIP:\t#{ip_address}\nState:\t#{state}\nPort:\t#{port}\nType:\t#{type}"
+
+      if !servers.empty?
+        base << "\nServers:\n"
+        servers.each do |server|
+          base << server.to_s
+          base << "\n\n"
+        end
       end
+
       base
     end
 
     def to_json
-      base = "{ 'name': '#{name}', 'ip_address': '#{ip_address}', 'state': '#{state}', 'port': '#{port}', 'type': #{type}, 'servers': [\n    "
-
-      servers.each_with_index do |server, i|
-        base << server.to_json
-        if i != servers.length - 1
-          base << ",\n    "
-        else
-          base << "\n"
+      base = "{ 'name': '#{name}', 'ip_address': '#{ip_address}', 'state': '#{state}', 'port': #{port}, 'type': '#{type}'"
+
+      if servers.empty?
+        base << " }"
+      else
+        base << ", 'servers': [\n    "
+
+        servers.each_with_index do |server, i|
+          base << server.to_json
+          if i != servers.length - 1
+            base << ",\n    "
+          else
+            base << "\n"
+          end
         end
+
+        base << "] }"
       end
 
-      base << "] }"
+      base
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: netscaler-cli
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Gabe McArthur