netconf 0.2.1 → 0.2.2

data/examples/confd/get-running.rb

@@ -0,0 +1,27 @@
+#
+# This code is used to retrieve the running configuration
+# from a Tail-F "confD" NETCONF server, and display the
+# configured user names
+#
+
+require 'net/netconf'
+
+puts "NETCONF v#{Netconf::VERSION}"
+
+login = { :target => 'jeap', :port => 2022,
+  :username => "admin", :password => "admin" }
+
+Netconf::SSH.new( login ){ |dev|  
+  
+  config = dev.rpc.get_config
+  
+  puts "Showing users on this device ..."
+    
+  config.xpath("//users/user").each{|user|
+    puts "Username: #{user.xpath('name').text}"
+  }
+  
+}
+
+
+

data/examples/jnpr/edit-config-jnpr.rb

@@ -1,6 +1,6 @@
 require 'net/netconf/jnpr'
 
-puts "NETCONF v.#{Netconf::VERSION}"
+puts "NETCONF v#{Netconf::VERSION}"
 
 login = { :target => 'vsrx', :username => "jeremy", :password => "jeremy1" }
   
@@ -14,9 +14,9 @@ Netconf::SSH.new( login ){ |dev|
   location = Nokogiri::XML::Builder.new{ |x| 
     x.system {
       x.location {
-        x.building "Main Campus, C"
-        x.floor 15
-        x.rack 37
+        x.building "Main Campus, D"
+        x.floor 22
+        x.rack 38
       }
     }
   }
@@ -52,7 +52,6 @@ Netconf::SSH.new( login ){ |dev|
     puts "Commit error"
   rescue Netconf::RpcError => e
     puts "General RPC error"
-    binding.pry
   else
     puts "Configuration Committed."
   end  

data/examples/jnpr/edit-config-std.rb

@@ -55,7 +55,6 @@ Netconf::SSH.new( login ){ |dev|
     puts "Commit error"
   rescue Netconf::RpcError => e
     puts "General RPC error"
-    binding.pry
   else
     puts "Configuration Committed."
   end  

data/examples/jnpr/edit-config-text-std.rb

@@ -59,7 +59,6 @@ EOCONF
     puts "Commit error"
   rescue Netconf::RpcError => e
     puts "General RPC error"
-    binding.pry
   else
     puts "Configuration Committed."
   end  

data/examples/jnpr/get-inventory-serial-explicit.rb

@@ -22,8 +22,6 @@ dev.open { |con|
 
 inv = dev.rpc.get_chassis_inventory
 
-binding.pry
-
 dev.close
 
 

data/examples/jnpr/get-inventory-serial.rb

@@ -4,10 +4,8 @@ puts "NETCONF v.#{Netconf::VERSION}"
 
 serial_port = '/dev/ttyS4'
 
-login = { 
-  :port => serial_port,
-  :username => "jeremy", :password => "jeremy1" 
-}
+login = { :port => serial_port,
+  :username => "jeremy", :password => "jeremy1" }
 
 puts "Connecting to SERIAL: #{serial_port} ... please wait."
 
@@ -21,8 +19,6 @@ Netconf::Serial.new( login ){ |dev|
   puts "Chassis: " + inv.xpath('chassis/description').text
   puts "Chassis Serial-Number: " + inv.xpath('chassis/serial-number').text
   
-  binding.pry
-
 }
 
 

data/examples/jnpr/get-inventory-telnet.rb

@@ -1,6 +1,6 @@
 require 'net/netconf/jnpr/telnet'
 
-puts "NETCONF v.#{Netconf::VERSION}"
+puts "NETCONF v#{Netconf::VERSION}"
 
 login = { :target => 'vsrx', :username => "jeremy", :password => "jeremy1" }
 
@@ -9,7 +9,6 @@ Netconf::Telnet.new( login ){ |dev|
   puts "Chassis: " + inv.xpath('chassis/description').text
   puts "Chassis Serial-Number: " + inv.xpath('chassis/serial-number').text
   
-  binding.pry
 }
 
 

data/examples/jnpr/get-inventory.rb

@@ -1,18 +1,15 @@
 require 'net/netconf'
 
-puts "NETCONF v.#{Netconf::VERSION}"
+puts "NETCONF v#{Netconf::VERSION}"
 
-login = { :target => '192.168.10.2', 
-  :username => "jeremy", 
-  :password => "jeremy1" }
+login = { :target => 'vsrx', :username => "jeremy", :password => "jeremy1" }
 
 Netconf::SSH.new( login ){ |dev|  
-
+    
   inv = dev.rpc.get_chassis_inventory  
 
   puts "Chassis: " + inv.xpath('chassis/description').text
-  puts "Chassis Serial-Number: " + inv.xpath('chassis/serial-number').text  
-    
+  puts "Chassis Serial-Number: " + inv.xpath('chassis/serial-number').text      
 }
 
 

data/examples/jnpr/scp.rb

@@ -1,7 +1,7 @@
 require 'net/netconf'
 require 'net/scp'
 
-login = { :target => 'vsrx', :username => "jeremy" }
+login = { :target => 'vsrx', :username => "jeremy", :password => "jeremy1" }
 
 file_name = __FILE__  
 

data/lib/net/netconf.rb

@@ -7,7 +7,10 @@ require 'net/netconf/transport'
 require 'net/netconf/ssh'
 
 module Netconf  
-  VERSION = "0.2.1"   
+  VERSION = "0.2.2"   
+  
+  NAMESPACE = "urn:ietf:params:xml:ns:netconf:base:1.0"
+  
   DEFAULT_OS_TYPE = :JUNOS  
   DEFAULT_TIMEOUT = 10
   DEFAULT_WAITIO = 0

data/lib/net/netconf/rpc_std.rb

@@ -5,15 +5,12 @@ module Netconf
     MSG_END_RE = /\]\]>\]\]>[\r\n]*$/
     MSG_CLOSE_SESSION = '<rpc><close-session/></rpc>'       
     MSG_HELLO = <<-EOM
-<hello>
+<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
   <capabilities>
-    <capability>urn:ietf:params:xml:ns:netconf:base:1.0</capability>
-    <capability>urn:ietf:params:xml:ns:netconf:base:1.0#candidate</capability>
-    <capability>urn:ietf:params:xml:ns:netconf:base:1.0#confirmed-commit</capability>
-    <capability>urn:ietf:params:xml:ns:netconf:base:1.0#validate</capability>
-    <capability>urn:ietf:params:xml:ns:netconf:base:1.0#url?protocol=http,ftp,file</capability>
+    <capability>urn:ietf:params:netconf:base:1.0</capability>
   </capabilities>
-</hello>    
+</hello>
+]]>]]>
 EOM
 
   module Standard

data/lib/net/netconf/serial.rb

@@ -68,13 +68,17 @@ module Netconf
       self
     end
     
-    def trans_hello
+    def trans_receive_hello
       hello_str = trans_receive()
       so_xml = hello_str.index("\n") + 1
       hello_str.slice!(0, so_xml)
       hello_str
     end
     
+    def trans_send_hello
+      nil
+    end
+    
     def trans_close
       @trans.write Netconf::RPC::MSG_CLOSE_SESSION
       @trans.close
@@ -115,7 +119,10 @@ module Netconf
       
         begin                   
           
-          rx_some = @trans.readpartial( DEFAULT_RDBLKSZ )                         
+          rx_some = @trans.readpartial( DEFAULT_RDBLKSZ )                       
+          
+          $stdout.puts rx_some
+          
           rx_buf += rx_some
           break if rx_buf.match( on_re )
           

data/lib/net/netconf/telnet.rb

@@ -33,13 +33,7 @@ module Netconf
       trans_start_netconf() 
       self
     end
-    
-    def trans_hello
-      hello_str = trans_receive()
-      so_xml = hello_str.index("\n") + 1      # skip over the last issued command      
-      hello_str[so_xml .. -1]
-    end
-    
+        
     def trans_close
       @trans.write Netconf::RPC::MSG_CLOSE_SESSION
       @trans.close

data/lib/net/netconf/transport.rb

@@ -22,6 +22,7 @@ module Netconf
       @os_type = @args[:os_type] || Netconf::DEFAULT_OS_TYPE
             
       @rpc = Netconf::RPC::Executor.new( self, @os_type )
+      @rpc_message_id = 1
       
       if block_given?
         open( &block = nil )      # do not pass this block to open()
@@ -38,19 +39,31 @@ module Netconf
       # block is used to deal with special open processing ...
       # this is *NOT* the block passed to initialize()
       raise Netconf::OpenError unless trans_open( &block )      
-      @state = :NETCONF_OPEN            
-      
-      hello_rsp = Nokogiri::XML( trans_hello() )
+            
+      # read the <hello> from the server and parse out
+      # the capabilities and session-id
       
+      hello_rsp = Nokogiri::XML( trans_receive_hello() )
+      hello_rsp.remove_namespaces!
+            
       @capabilities = hello_rsp.xpath('//capability').map{ |c| c.text }
-      @session_id = hello_rsp.xpath('//session-id').text            
+      @session_id = hello_rsp.xpath('//session-id').text
+            
+      # send the <hello> 
+      trans_send_hello()
+      
+      @state = :NETCONF_OPEN            
       self      
     end
     
-    def trans_hello
+    def trans_receive_hello
       trans_receive()
     end
     
+    def trans_send_hello
+      trans_send( Netconf::RPC::MSG_HELLO )
+    end
+    
     def has_capability?( capability )
       @capabilities.select{|c| c.include? capability }.pop
       # note: the caller could also simply use #grep on @capabilities
@@ -71,7 +84,14 @@ module Netconf
     
     def rpc_exec( cmd_nx )
       raise Netconf::StateError unless @state == :NETCONF_OPEN         
-
+      
+      # add the mandatory message-id and namespace to the RPC
+      
+      rpc_nx = cmd_nx.parent.root
+      rpc_nx.default_namespace = Netconf::NAMESPACE
+      rpc_nx['message-id'] = @rpc_message_id.to_s
+      @rpc_message_id += 1
+      
       # send the XML command through the transport and 
       # receive the response; then covert it to a Nokogiri XML
       # object so we can process it.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netconf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -63,6 +63,7 @@ files:
 - lib/net/netconf/telnet.rb
 - lib/net/netconf/transport.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
@@ -76,7 +77,7 @@ files:
 - examples/jnpr/get-inventory-telnet.rb
 - examples/jnpr/get-inventory.rb
 - examples/jnpr/scp.rb
-homepage: https://github.com/Juniper-Workflow
+homepage: https://github.com/Juniper-Workflow/net-netconf
 licenses: []
 post_install_message: 
 rdoc_options: []