sloe 0.3.2 → 0.4.0

data/README.md

@@ -56,6 +56,15 @@ An alternate way to use this module is:
 
 All options supported by Netconf, Net::SCP and SNMP are supported in this gem too. The :target option is aliased to the SNMP :host option so there is no need to duplicate that option key.
 
+## Vendor specific Netconf extensions
+
+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
+
 ## SUPPORT
 
 This software is not officially supported by Juniper Networks, but by a team dedicated to helping customers, partners, and the development community.  To report bug-fixes, issues, susggestions, please contact David Gethings <dgethings@juniper.net>

data/lib/sloe.rb

@@ -1,26 +1,7 @@
 require 'sloe/version'
-require 'net/netconf'
-require 'net/scp'
-require 'snmp'
-
+require 'sloe/device'
+require 'sloe/junos'
 
 module Sloe
-	class Device < Netconf::SSH
-
-		attr_reader :snmp
 
-	  def initialize(args, &block)
-	  	@snmp_args = {:host => args[:target], :mib_dir => args[:mib_dir], :mib_modules => args[:mib_modules]}
-      @snmp = SNMP::Manager.new(@snmp_args)
-			
-	  	if block_given?
-	  		super( args, &block )
-	  		return
-	  	else
-		  	super(args)
-		    self.open
-		    self
-	  	end
-	  end
-	end
 end

data/lib/sloe/common.rb

@@ -0,0 +1,23 @@
+require 'net/scp'
+require 'snmp'
+
+module Sloe
+  class Common < Netconf::SSH
+
+    attr_reader :snmp
+
+    def initialize(args, &block)
+      @snmp_args = {:host => args[:target], :mib_dir => args[:mib_dir], :mib_modules => args[:mib_modules]}
+      @snmp = SNMP::Manager.new(@snmp_args)
+      
+      if block_given?
+        super( args, &block )
+        return
+      else
+        super(args)
+        self.open
+        self
+      end
+    end
+  end
+end

data/lib/sloe/device.rb

@@ -0,0 +1,14 @@
+require 'net/netconf'
+require 'sloe/common'
+
+module Sloe
+  class Device < Sloe::Common
+
+    def initialize(args, &block)
+
+      # Stop netconf gem from defaulting to :Junos and thus not loading :Junos extensions
+      args[:os_type] = :Netconf
+      super( args, &block )
+    end
+  end
+end

data/lib/sloe/junos.rb

@@ -0,0 +1,23 @@
+require 'net/netconf/jnpr'
+require 'sloe/common'
+
+module Sloe
+  class Junos < Sloe::Common
+
+    # attr_reader :snmp
+
+    def initialize(args, &block)
+      # @snmp_args = {:host => args[:target], :mib_dir => args[:mib_dir], :mib_modules => args[:mib_modules]}
+      # @snmp = SNMP::Manager.new(@snmp_args)
+      
+      # if block_given?
+        super( args, &block )
+        # return
+      # else
+        # super(args)
+        # self.open
+        # self
+      # end
+    end
+  end
+end

data/lib/sloe/version.rb

@@ -1,3 +1,3 @@
 module Sloe
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/blocks_spec.rb

@@ -1,5 +1,6 @@
 require 'sloe'
-require 'ruby-debug'
+require 'sloe/junos'
+# require 'ruby-debug'
 
 describe Sloe do
   context "invoked with block" do
@@ -26,5 +27,28 @@ describe Sloe do
       }
       @hostname.should include @login[:target]
     end
+
+  end
+
+  context "Junos extensions" do
+    before(:all) do
+      @login = {
+        :target => 'capella',
+        :username => 'dgethings',
+        :password => 'mcisamilf'
+      }
+    end
+
+    it "Sloe::Junos responds to Junos specific RPCs" do
+      Sloe::Junos.new ( @login ) { |dut|
+        dut.rpc.respond_to?(:lock_configuration).should be true
+      }
+    end
+    it "Sloe::Device does not respond to Junos specific RPCs" do
+      Sloe::Device.new ( @login ) { |dut|
+        dut.rpc.respond_to?(:lock_configuration).should be false
+      }
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sloe
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-01 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
@@ -124,6 +124,9 @@ files:
 - Rakefile
 - lib/import-mibs.rb
 - lib/sloe.rb
+- lib/sloe/common.rb
+- lib/sloe/device.rb
+- lib/sloe/junos.rb
 - lib/sloe/version.rb
 - mibs/ACCOUNTING-CONTROL-MIB.yaml
 - mibs/ADSL-LINE-EXT-MIB.yaml