sloe 0.5.1 → 0.5.3

data/README.md

@@ -61,6 +61,7 @@ All options supported by Netconf, Net::SCP and SNMP are supported in this gem to
 Sloe supports vendor specific Netconf extensions. To add that vendor specific support call `new()` on one of the supported classes. Sloe supports the following:
 
 *Sloe::Device - no vendor specific Netconf extensions added
+
 *Sloe::Junos - Junos vendor specific Netconf extensions added
 
 Just simply call `Sloe::Junos.new()` to get the Junos extensions added
@@ -74,10 +75,7 @@ As well as supporting Junos specific Netconf RPCs Sloe::Junos also supports the
     device.cli("show version")
     device.cli("show ospf interfaces")
 
-By default this call will respond with an XML result tree fragment, a Nokogiri::XML object. To get what you would see on the CLI modify the `cli()` call with the `:format => 'text'` attribute and chain the Nokogiri `text()` method. Here is an example that will return just the output from "show version"
-
-    device.cli("show version", :format => 'text').text
-
+By default this call will respond with a string. This should make this call compatable with existing automation scripts that are based on CLI commands. To get an XML result tree fragment use the rpc.command() API.
 
 ## SUPPORT
 

data/lib/sloe/device.rb

@@ -6,7 +6,8 @@ module Sloe
 
     def initialize(args, &block)
 
-      # Stop netconf gem from defaulting to :Junos and thus not loading :Junos extensions
+      # Stop netconf gem from defaulting to :Junos and thus 
+      # not loading :Junos extensions
       args[:os_type] = :Netconf
       super( args, &block )
     end

data/lib/sloe/junos.rb

@@ -8,8 +8,9 @@ module Sloe
         super( args, &block )
     end
 
-    def cli(cmd_str, attrs = nil)
-      self.rpc.command(cmd_str, attrs)
+    def cli(cmd_str, attrs = { :format => 'text' })
+      attrs[:format] ||= 'text'
+      self.rpc.command(cmd_str, attrs).text
     end
   end
 end

data/lib/sloe/version.rb

@@ -1,3 +1,3 @@
 module Sloe
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/spec/blocks_spec.rb

@@ -7,8 +7,8 @@ describe Sloe do
     before(:all) do
       @login = {
         :target => 'capella',
-        :username => 'dgethings',
-        :password => 'mcisamilf'
+        :username => 'netconf',
+        :password => 'netconf'
       }
       @hostname = ''
     end
@@ -34,8 +34,8 @@ describe Sloe do
     before(:all) do
       @login = {
         :target => 'capella',
-        :username => 'dgethings',
-        :password => 'mcisamilf'
+        :username => 'netconf',
+        :password => 'netconf'
       }
     end
 

data/spec/methods_spec.rb

@@ -7,8 +7,8 @@ describe Sloe do
     @jnx_mibs = Dir.glob("./mibs/JUNIPER-*.yaml").map { |f| File.basename(f, '.yaml') }
     @args = {
       :target => 'capella',
-      :username => 'dgethings',
-      :password => 'mcisamilf',
+      :username => 'netconf',
+      :password => 'netconf',
       :mib_dir => './mibs',
       :mib_modules => ["SNMPv2-SMI", "SNMPv2-MIB", "IF-MIB", "IP-MIB", "TCP-MIB", "UDP-MIB"].concat(@jnx_mibs)
     }
@@ -44,7 +44,7 @@ describe Sloe do
   end
 
   context "NETCONF API" do
-    it "rpc.get_interface_information() functioons without error" do
+    it "rpc.get_interface_information() functions without error" do
       lambda { @dut.rpc.get_interface_information() }.should_not raise_error
     end
     it "rpc.get_ospf_neighbor_information() functions without error" do
@@ -66,11 +66,16 @@ describe Sloe do
   end
 
   context "CLI API" do
-    it "cli.('show version') functions without error" do
+    it "cli('show version') functions without error" do
       lambda { @dut.cli("show version") }.should_not raise_error
     end
-    it "cli.('show version') contains OS information" do
-      @dut.cli("show version").text.should =~ /JUNOS Base OS/
+    it "cli('show version') contains OS information" do
+      @dut.cli("show version").should be_a(String)      
+      @dut.cli("show version").should =~ /JUNOS Base OS/
+    end
+    it "cli('show version', :foo => 'bar') still contains OS information" do
+      @dut.cli("show version", :foo => 'bar').should be_a(String)
+      @dut.cli("show version", :foo => 'bar').should =~ /JUNOS Base OS/
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sloe
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp