netscaler-cli 0.2.1 → 0.2.2

data/lib/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/netscaler/clitemplate.rb

@@ -15,26 +15,16 @@ module Netscaler
     end
 
     def execute!
-      parse!(@args.dup)
-      Netscaler::Logging.configure(options[:debug])
-      
-      Netscaler::Transaction.new(netscaler_configuration) do |client|
-        action = options[:action].keys[0]
-        args = options[:action][action]
-        executor = create_executor(client)
-
-        if args.nil?
-          executor.send(action)
-        else
-          executor.send(action, args)
-        end
-      end
-    end
-
-    def parse!(args)
       begin
-        parse_options(args)
-        validate_args(args)
+        parse!(@args.dup)
+        Netscaler::Logging.configure(options[:debug])
+        
+        Netscaler::Transaction.new(netscaler_configuration) do |client|
+          action = options[:action][0]
+          executor = create_executor(client)
+          
+          executor.send(action, options)
+        end
       rescue SystemExit => e
         raise
       rescue Netscaler::ConfigurationError => e
@@ -47,10 +37,15 @@ module Netscaler
       end
     end
 
+    def parse!(args)
+      parse_options(args)
+      validate_args(args)
+    end
+
     def parse_options(args)
       @options ||= {}
       if @options.empty?
-        @options[:action] = Hash.new
+        @options[:action] = Array.new
       end
       @parsed_options ||= OptionParser.new do |opts|
         interface_header(opts)
@@ -62,14 +57,16 @@ module Netscaler
 
     def interface_configuration(opts)
       opts.separator "   Configuration: "
-      opts.on('-n', '--netscaler NETSCALER_ADDRESS',
-              "The IP or hostname of the Netscaler load balancer.",
+      opts.on('-n', '--netscaler NETSCALER',
+              "The IP or hostname of the Netscaler",
+              "load balancer.",
               "This argument is required.") do |n|
         options[:netscaler] = n
       end
       opts.on('-c', '--config CONFIG',
-              "The path to the netscaler-cli configuration file.",
-              "By default, it is ~/.netscaler-cli.yml") do |c|
+              "The path to the netscaler-cli configuration",
+              "file.  By default, it is the ",
+              "~/.netscaler-cli.yml") do |c|
         options[:config] = c
       end
       opts.separator ""
@@ -105,8 +102,8 @@ module Netscaler
       @host = args[0]
 
       if options[:action].empty?
-        options[:action][:status] = nil
-      elsif options[:action].keys.length != 1
+        options[:action] << :status
+      elsif options[:action].length != 1
         raise Netscaler::ConfigurationError.new("Multiple actions specified -- only one action is supported at a time.")
       end
 

data/lib/netscaler/server/cli.rb

@@ -30,11 +30,11 @@ DESC
       opts.separator "   Actions: "
       opts.on('-e', '--enable',
               "Enables the given server.") do |e|
-        options[:action][:enable] = nil
+        options[:action] << :enable
       end
       opts.on('-d', '--disable',
               "Disables the given server.") do |d|
-        options[:action][:disable] = nil
+        options[:action] << :disable
       end
       opts.separator ""
     end

data/lib/netscaler/server/executor.rb

@@ -7,15 +7,15 @@ module Netscaler::Server
       @params = { :name => host }
     end
 
-    def enable
+    def enable(options)
       send_request('enableserver', @params)
     end
 
-    def disable
+    def disable(options)
       send_request('disableserver', @params)
     end
 
-    def status
+    def status(options)
       send_request('getserver', @params) do |response|
         info = response[:return][:list][:item]
         puts "Name:       #{info[:name]}"

data/lib/netscaler/service/cli.rb

@@ -27,19 +27,21 @@ DESC
       opts.separator "   Actions: "
       opts.on('-e', '--enable',
               "Enables the given service.") do |e|
-        options[:action][:enable] = nil
+        options[:action] << :enable
       end
       opts.on('-d', '--disable',
               "Disables the given service.") do |d|
-        options[:action][:disable] = nil
+        options[:action] << :disable
       end
       opts.on('-b', '--bind VSERVER',
               "Binds a service to a virtual server.") do |b|
-        options[:action][:bind] = b
+        options[:action] << :bind
+        options[:vserver] = b
       end
       opts.on('-u', '--unbind VSERVER',
               "Unbinds a serivce to a virtual server.") do |u|
-        options[:action][:unbind] = u
+        options[:action] << :unbind
+        options[:vserver] = u
       end
       opts.separator ""
     end

data/lib/netscaler/service/executor.rb

@@ -7,11 +7,11 @@ module Netscaler::Service
       @params = { :name => host }
     end
 
-    def enable
+    def enable(options)
       send_request('enableservice', @params)
     end
 
-    def disable
+    def disable(options)
       params = { 
         :name => host, 
         :delay => 0 
@@ -19,7 +19,7 @@ module Netscaler::Service
       send_request('disableservice', params)
     end
 
-    def status
+    def status(options)
       send_request('getservice', @params) do |response|
         info = response[:return][:list][:item]
         puts "Name:       #{info[:name]}"
@@ -29,9 +29,9 @@ module Netscaler::Service
       end
     end
 
-    def bind(vserver)
+    def bind(options)
       params = {
-        :name => vserver,
+        :name => options[:vserver],
         :servicename => host
       }
       send_request('bindlbvserver_service', params) do |response|
@@ -40,9 +40,9 @@ module Netscaler::Service
       end
     end
 
-    def unbind(vserver)
+    def unbind(options)
       params = {
-        :name => vserver,
+        :name => options[:vserver],
         :servicename => host
       }
       send_request('unbindlbvserver_service', params) do |response|

data/lib/netscaler/transaction.rb

@@ -42,6 +42,8 @@ module Netscaler
 
         log.debug("Yielding client control to the calling context")
         yield client
+      rescue SystemExit => e
+        raise
       rescue Exception => e
         log.fatal(e)
         log.fatal("Unable to execute transaction.")

data/lib/netscaler/vserver/cli.rb

@@ -30,21 +30,46 @@ DESC
       opts.separator "   Actions: "
       opts.on('-e', '--enable',
               "Enables the given virtual server.") do |e|
-        options[:action][:enable] = nil
+        options[:action] << :enable
       end
       opts.on('-d', '--disable',
               "Disables the given virtual server.") do |d|
-        options[:action][:disable] = nil
+        options[:action] << :disable
       end
       opts.on('-b', '--bind POLICY_NAME',
-              "Binds a policy of a given name to a virtual server.") do |b|
-        options[:action][:bind] = b
+              "Binds a policy of a given name to a",
+              "virtual server.") do |b|
+        options[:action] << :bind
+        options[:policy_name] = b
+      end
+      opts.on('-p', '--priority NUMBER', Integer,
+              "The priority to bind the policy with.",
+              "Used only with the --bind flag.") do |p|
+        options[:priority] = p
       end
       opts.on('-u', '--unbind POLICY_NAME',
-              "Unbinds a policy of a given name to a virtual server.") do |u|
-        options[:action][:unbind] = u
+              "Unbinds a policy of a given name to a",
+              "virtual server.") do |u|
+        options[:action] << :unbind
+        options[:policy_name] = u
       end
       opts.separator ""
     end
+
+    def validate_args(args)
+      super(args)
+
+      if options[:action][0] == :bind
+        if options[:priority].nil?
+          options[:priority] = 1
+        elsif options[:priority] <= 0
+          raise Netscaler::ConfigurationError.new("The --priority must be greater than 0")
+        end
+      else
+        if options[:priority]
+          raise Netscaler::ConfigurationError.new("The --priority flag can only specified with the --bind option")
+        end
+      end
+    end
   end # CLI
 end

data/lib/netscaler/vserver/executor.rb

@@ -1,55 +1,57 @@
+require 'netscaler/logging'
 require 'netscaler/baseexecutor'
 
 module Netscaler::VServer
   class Executor < Netscaler::BaseExecutor
+    include Netscaler::Logging
+
     def initialize(host, client)
       super(host, client)
       @params = { :name => host }
     end
 
-    def enable
+    def enable(options)
       send_request('enablelbvserver', @params)
     end
 
-    def disable
+    def disable(options)
       send_request('disablelbvserver', @params)
     end
 
-    def status
+    def status(options)
       send_request('getlbvserver', @params) do |response|
-        info = response[:return][:list][:item]
-        puts "Name:       #{info[:name]}"
-        puts "IP Address: #{info[:svcipaddress][:item]}"
-        puts "Port:       #{info[:svcport][:item]}"
-        puts "State:      #{info[:svcstate][:item]}"
+        begin
+          info = response[:return][:list][:item]
+          puts "Name:       #{info[:name]}"
+          puts "IP Address: #{info[:svcipaddress][:item]}"
+          puts "Port:       #{info[:svcport][:item]}"
+          puts "State:      #{info[:svcstate][:item]}"
+        rescue Exception => e
+          log.fatal "Unable to lookup any information for host: #{host}"
+          exit(1)
+        end
       end
     end
 
-    def bind(policy_name)
+    def bind(options)
       params = { 
         :name => host,
-        :policyname => policy_name,
-        :priority => 1,
+        :policyname => options[:policy_name],
+        :priority => options[:priority],
         :gotopriorityexpression => 'END' 
       }
 
-      send_request('bindlbvserver_policy', params) do |response|
-        #require 'pp'
-        #pp response
-      end
+      send_request('bindlbvserver_policy', params)
     end
 
-    def unbind(policy_name)
+    def unbind(options)
       params = {
         :name => host,
-        :policyname => policy_name, 
+        :policyname => options[:policy_name], 
         :type => 'REQUEST'
       }
 
-      send_request('unbindlbvserver_policy', params) do |response|
-        #require 'pp'
-        #pp response
-      end
+      send_request('unbindlbvserver_policy', params)
     end
   end
 end

data/spec/helpers.rb

@@ -3,3 +3,7 @@
 def attempting(&block)
   lambda &block
 end
+
+def attempting_to(&block)
+  lambda &block
+end

data/spec/server/cli_spec.rb

@@ -0,0 +1,33 @@
+require 'helpers'
+require 'netscaler/server/cli'
+
+module Netscaler::Server
+
+  module CLIHelper
+    def parse(*args)
+      cli = CLI.new(args)
+      cli.parse_options(args)
+      cli.options
+    end
+
+    def validate(*args)
+      cli = CLI.new(args)
+      cli.parse_options(args)
+      cli.validate_args(args)
+    end
+  end
+
+  describe "The CLI interface" do
+    include CLIHelper
+
+    describe "while parsing" do
+      it "should set the --enable flag correctly." do
+        parse('--enable')[:action][0].should eql(:enable)
+      end
+
+      it "should set the --disable flag correctly." do
+        parse('--disable')[:action][0].should eql(:disable)
+      end
+    end
+  end
+end

data/spec/service/cli_spec.rb

@@ -0,0 +1,45 @@
+require 'helpers'
+require 'netscaler/service/cli'
+
+module Netscaler::Service
+
+  module CLIHelper
+    def parse(*args)
+      cli = CLI.new(args)
+      cli.parse_options(args)
+      cli.options
+    end
+
+    def validate(*args)
+      cli = CLI.new(args)
+      cli.parse_options(args)
+      cli.validate_args(args)
+    end
+  end
+
+  describe "The CLI interface" do
+    include CLIHelper
+
+    describe "while parsing" do
+      it "should set the --enable flag correctly." do
+        parse('--enable')[:action][0].should eql(:enable)
+      end
+
+      it "should set the --disable flag correctly." do
+        parse('--disable')[:action][0].should eql(:disable)
+      end
+
+      it "should set the --bind flag correctly." do
+        opts = parse('--bind', 'some-vserver')
+        opts[:action][0].should eql(:bind)
+        opts[:vserver].should eql('some-vserver')
+      end
+
+      it "should set the --unbind flag correctly." do
+        opts = parse('--unbind', 'some-vserver')
+        opts[:action][0].should eql(:unbind)
+        opts[:vserver].should eql('some-vserver')
+      end
+    end
+  end
+end

data/spec/vserver/cli_spec.rb

@@ -9,37 +9,67 @@ module Netscaler::VServer
       cli.parse_options(args)
       cli.options
     end
+
+    def validate(*args)
+      cli = CLI.new(args)
+      cli.parse_options(args)
+      cli.validate_args(args)
+    end
   end
 
   describe "The CLI interface" do
     include CLIHelper
 
-    it "should set the --netscaler flag correctly." do
-      parse('--netscaler', 'localhost')[:netscaler].should eql('localhost')
-    end
+    describe "while parsing" do
+      it "should set the --netscaler flag correctly." do
+        parse('--netscaler', 'localhost')[:netscaler].should eql('localhost')
+      end
 
-    it "should set the --debug flag correctly." do
-      parse('--debug')[:debug].should be(true)
-    end
+      it "should set the --debug flag correctly." do
+        parse('--debug')[:debug].should be(true)
+      end
 
-    it "should set the --enable flag correctly." do
-      parse('--enable')[:action].has_key?(:enable).should be(true)
-    end
+      it "should set the --enable flag correctly." do
+        parse('--enable')[:action][0].should eql(:enable)
+      end
 
-    it "should set the --disable flag correctly." do
-      parse('--disable')[:action].has_key?(:disable).should be(true)
-    end
+      it "should set the --disable flag correctly." do
+        parse('--disable')[:action][0].should eql(:disable)
+      end
 
-    it "should set the --bind flag correctly." do
-      parse('--bind', 'some-policy')[:action][:bind].should eql('some-policy')
-    end
+      it "should set the --bind flag correctly." do
+        opts = parse('--bind', 'some-policy')
+        opts[:action][0].should eql(:bind)
+        opts[:policy_name].should eql('some-policy')
+      end
+
+      it "should set the --unbind flag correctly." do
+        opts = parse('--unbind', 'some-policy')
+        opts[:action][0].should eql(:unbind)
+        opts[:policy_name].should eql('some-policy')
+      end
 
-    it "should set the --unbind flag correctly." do
-      parse('--unbind', 'some-policy')[:action][:unbind].should eql('some-policy')
+      it "should fail when the --priority flag is not an integer" do 
+        attempting_to { parse('--priority', 'blah') }.should raise_error(OptionParser::InvalidArgument)
+      end
+
+      it "should set the --priority flag correctly." do
+        parse('--priority', '6')[:priority].should eql(6)
+      end
+
+      it "should set the --config flag correctly." do
+        parse('--config', 'CONFIG')[:config].should eql('CONFIG')
+      end
     end
 
-    it "should set the --config flag correctly." do
-      parse('--config', 'CONFIG')[:config].should eql('CONFIG')
+    describe "while validating" do
+      it "should fail when the priority flag is set with unbind" do
+        attempting_to { validate('-n', 'net', '--unbind', 'policy', '--priority', '5', 'host') }.should raise_error(Netscaler::ConfigurationError, /priority/)
+      end
+
+      it "should set the priority when the bind flag is set." do
+        validate('-n', 'net', '--bind', 'policy', '--priority', '5', 'host') 
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: netscaler-cli
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,8 @@ files:
 - spec/configs/missing-username.yml
 - spec/configs/simple-config.yml
 - spec/helpers.rb
+- spec/server/cli_spec.rb
+- spec/service/cli_spec.rb
 - spec/vserver/cli_spec.rb
 has_rdoc: true
 homepage: http://github.com/gabemc/netscaler-cli
@@ -156,4 +158,6 @@ summary: Simple command line utilities for interacting remotely with a Netscaler
 test_files: 
 - spec/vserver/cli_spec.rb
 - spec/helpers.rb
+- spec/server/cli_spec.rb
+- spec/service/cli_spec.rb
 - spec/config_spec.rb