netconf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmUzYzM2NDEyMGJjMzE0NDljYmYzNjIxOGE0ZTE5YWNiMDg0ZDNmMQ==
+    MTQ4MDNlZWZjODQ4ODM5ZTY4YWI3Y2RlMzVkYmE3MWQyNGI4MjI0Mg==
   data.tar.gz: !binary |-
-    MjRiMTk0ZWJkMWUyZjRkNTFlNDJhZDBhMjU1M2I5NDI5MTgwODZiMg==
+    NWE2M2Y1YWM0MGZmNWQ0Zjg0MTY3NTRmNjBlYWEwMmNkYmU1ZDEwMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Njg1NzU5NDZhY2ZiYWZkMGRmYTdjOTRjZWE1OWFjNmRhMzI0NjY4MzRjMzBl
-    NGQ0YWVmNWI0NjA0ZDU2ODY1OWI1NjQ0ZWJiNjhjM2MyMDg2ZjJmMjE5NWIy
-    ZDEzZGI0NzI1ZmM2NTZkNzhhNjlhNDI0NzhmY2NmNmI1NDk4ZGU=
+    MTg0YjRmY2VlNzkzMWU5ODliYzQ1NjI4NGVkNjZkZTcxYzY1MWQ3OWI3N2Q2
+    MDlhNTQ2NDA0YmVmMDA3ZWNmM2UwMDUzZGVhYmYyMGY2ZmIzN2UzN2E4NTVj
+    NzcwZDQ3NDEyYTgzNWFkMzVjOGE3MGJhZGU5MTA3MzNjNDhkY2Q=
   data.tar.gz: !binary |-
-    MGNhYjE4NzdmOGFlMGJjNTI4YTZkNjYyMWNlOWZmZTBjNTZiNzM1ZTkyNjIw
-    YjYxMTVmMmExYzBkNTJkODg3MzFiMTU3ZmZhYWM5YmRhZWNjYzc1OWY1ODY5
-    MWNmZjdlNTAzNDBmNWVlMTAxM2RkMTliYjQ4OWU2NDQ4Y2IwNmE=
+    YWM1YjFlZjNjZWY3ODUwNjNhYTRjZWIwZjUzMWJmMGJiYzk0NjYxZTM0MWRm
+    NzdmZmYyZjg1ZGY4YTQ5ZjVlMmQ1MGIyZTFjZGM1MGRmNDM2OWU4Y2FmZDYx
+    MjM1M2JiNGFjOTEwMmM5NzZmMjkyZDI4MjdjNzNmMjZhYTNlZjA=

data/lib/net/netconf/jnpr/ssh.rb

@@ -0,0 +1,27 @@
+require 'net/netconf'
+require 'net/netconf/jnpr'
+
+module Netconf
+  module Junos  
+    module TransSSH
+    
+      ##
+      ## this is used to handle the case where NETCONF (port 830) is disabled.  We can still access
+      ## the NETCONF subsystem from the CLI using a hidden command 'netconf'
+      ##
+      
+      def trans_on_connect_refused( start_args )        
+        start_args[:port] = 22      
+        @trans[:conn] = Net::SSH.start( @args[:target], @args[:username], start_args )
+        do_once = true
+        @trans[:conn].exec( NETCONF_CLI ) do |chan, success|        
+          @trans[:chan] = chan
+          do_once = false
+        end
+        @trans[:conn].loop { do_once }   
+        @trans[:chan]
+      end
+      
+    end
+  end  
+end    

data/lib/net/netconf/ssh.rb

@@ -8,8 +8,16 @@ module Netconf
     
     def initialize( args_h, &block )      
       @args = args_h.clone
-      @trans = Hash.new   
+      @args[:os_type] = args_h[:os_type] || Netconf::DEFAULT_OS_TYPE
+      
+      # extend this instance with the capabilities of the specific os_type
+      begin
+        extend Netconf::const_get( @args[:os_type] )::TransSSH        
+      rescue NameError
+        # no extensions available ...
+      end     
       
+      @trans = Hash.new   
       super( &block )
     end
     
@@ -20,9 +28,17 @@ module Netconf
       start_args[:passphrase] = @args[:passphrase] || nil
       start_args[:port] = @args[:port] || NETCONF_PORT
       start_args.merge!(@args[:ssh_args]) if @args[:ssh_args]
-      
-      @trans[:conn] = Net::SSH.start( @args[:target], @args[:username], start_args )     
-      @trans[:chan] = @trans[:conn].open_channel{ |ch| ch.subsystem( NETCONF_SUBSYSTEM ) }      
+            
+      begin
+        @trans[:conn] = Net::SSH.start( @args[:target], @args[:username], start_args )     
+        @trans[:chan] = @trans[:conn].open_channel{ |ch| ch.subsystem( NETCONF_SUBSYSTEM ) }
+      rescue Errno::ECONNREFUSED => e
+        if self.respond_to? 'trans_on_connect_refused'
+          return trans_on_connect_refused( start_args )
+        end
+        return nil
+      end
+      @trans[:chan]
     end
     
     def trans_close     

data/lib/net/netconf/version.rb

@@ -1,3 +1,3 @@
 module Netconf  
-  VERSION = "0.3.0" 
+  VERSION = "0.3.1" 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netconf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jeremy Schulman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -45,50 +45,51 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
 description: Extensible Ruby-based NETCONF client
 email: jschulman@juniper.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/net/netconf/exception.rb
+- lib/net/netconf.rb
 - lib/net/netconf/ioproc.rb
+- lib/net/netconf/transport.rb
+- lib/net/netconf/exception.rb
 - lib/net/netconf/jnpr/ioproc.rb
-- lib/net/netconf/jnpr/junos_config.rb
+- lib/net/netconf/jnpr/telnet.rb
 - lib/net/netconf/jnpr/rpc.rb
 - lib/net/netconf/jnpr/serial.rb
-- lib/net/netconf/jnpr/telnet.rb
-- lib/net/netconf/jnpr.rb
+- lib/net/netconf/jnpr/junos_config.rb
+- lib/net/netconf/jnpr/ssh.rb
+- lib/net/netconf/version.rb
+- lib/net/netconf/telnet.rb
 - lib/net/netconf/rpc.rb
 - lib/net/netconf/rpc_std.rb
+- lib/net/netconf/jnpr.rb
 - lib/net/netconf/serial.rb
 - lib/net/netconf/ssh.rb
-- lib/net/netconf/telnet.rb
-- lib/net/netconf/transport.rb
-- lib/net/netconf/version.rb
-- lib/net/netconf.rb
-- examples/confd/get-running.rb
 - examples/jnpr/edit-config-jnpr-set.rb
-- examples/jnpr/edit-config-jnpr-text.rb
-- examples/jnpr/edit-config-jnpr.rb
-- examples/jnpr/edit-config-std.rb
-- examples/jnpr/edit-config-text-std.rb
-- examples/jnpr/get-config-jnpr.rb
-- examples/jnpr/get-config-matching.rb
-- examples/jnpr/get-config-std.rb
-- examples/jnpr/get-inventory-serial-explicit.rb
 - examples/jnpr/get-inventory-serial.rb
-- examples/jnpr/get-inventory-telnet.rb
+- examples/jnpr/get-config-matching.rb
 - examples/jnpr/get-inventory.rb
+- examples/jnpr/get-config-std.rb
 - examples/jnpr/scp.rb
+- examples/jnpr/get-config-jnpr.rb
+- examples/jnpr/edit-config-std.rb
+- examples/jnpr/edit-config-text-std.rb
+- examples/jnpr/edit-config-jnpr.rb
+- examples/jnpr/get-inventory-telnet.rb
+- examples/jnpr/get-inventory-serial-explicit.rb
+- examples/jnpr/edit-config-jnpr-text.rb
+- examples/confd/get-running.rb
 homepage: https://github.com/Juniper/net-netconf
 licenses: []
 metadata: {}
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: NETCONF client