oxidized 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 685b7ced661d1682eb3702d88419a71e17069868
-  data.tar.gz: 0e3194c5964e0f803d70382e0f227c25d0a574b4
+  metadata.gz: c4e125d54180398e4fd35652a8ca384c85d451ec
+  data.tar.gz: 46cef914c85dcaadfafcbde310d7c9bbc3707f0b
 SHA512:
-  metadata.gz: 4bfa8faf73182f97fd614db4b5530e6e37bcc632b3d0380d5dfff9d6f5336c17be6dffc833b3c7a25c82a88e0841788e92f4c51340a6729eee931ceadfec0685
-  data.tar.gz: 5929ddbd24859dfcb219deeba837f5070a5cea4327eb9b8b0b643c09045fbf59cc82d4d1759de7dc5f1913445d91fe0e397e22d2eb9cf5b78322de5d953b25ce
+  metadata.gz: 0261cf513efbab1d3bc06ff184c72e70d7371256628441501e2b1d2a44796531091f4fba0eee3b93130993030c4c3e1d78d8c33db01727c17af1760337640f32
+  data.tar.gz: 0662f963ddcbd6da7ab8e6e1cd12ef723c88511cd69ed4673e58e66f00657287cc39c6aec9b0e66bb4c2b441474aa76a67f5bab3a8b5ed7e16ddd1c845236272

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 0.3.0
 - FEATURE: *FIXME* bunch of stuff I did for richih, docs needed
+- FEATURE: ComWare model (by erJasp)
+- FEATURE: Add comment support for router.db file
+- FEATURE: Add input debugging and related configuration options
+- BUGFIX: Fix ASA model prompt
+- BUGFIX: Fix Aruba model display
+- BUGFIX: Fix changing output in PowerConnect model
 
 # 0.2.4
 - FEATURE: Cisco SMB (Nikola series VxWorks) model by @thetamind

data/README.md

@@ -57,6 +57,7 @@ Oxidized is a network device configration backup tool. Its a RANCID replacment!
  * Extreme Networks XOS
  * Force10 FTOS
  * FortiGate FortiOS
+ * HP Comware (HP A-series, H3C, 3Com)
  * HP ProCurve
  * Huawei VRP
  * Juniper JunOS

data/TODO.md

@@ -1,3 +1,17 @@
+# refactor core
+  * move state from memory to disk, sqlite probably
+  * allows us to retain stats etc over restart
+  * simplifies code
+  * keep only running nodes in memory
+  * negligible I/O cost, as majority is I/O wait getting config
+
+# separate login to owon package
+  * oxidized-script is not only use-case
+  * it would be good to have minimal package used to login to routers
+  * oxidized just one consumer of that functionality
+  * what to do with models, we need model to know how to login. Should models be separated to another package? oxidized-core, oxidized-models and oxidized-login?
+  * how can we allow interactive login in oxidized-login? With functional VTY etc? REPL loop in input/ssh and input/telnet?
+
 # thread number
   * think about algo
   * if job ended later than now-iteration have rand(node.size) == 0 to add thread
@@ -6,4 +20,4 @@
 
 # docs, testing
   * yard docs
-  * rspec tests
+  * minitest tests

data/extra/oxidized.init

@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# Written by Stefan Schlesinger / sts@ono.at / http://sts.ono.at
+#
+### BEGIN INIT INFO
+# Provides:          oxidized
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start Oxidized at boot time
+# Description:       Oxidized - Network Device Configuration Backup Tool
+### END INIT INFO
+
+set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/home/sts/oxidized/bin/oxidized
+NAME="oxidized"
+DESC="Oxidized - Network Device Configuration Backup Tool"
+ARGS=""
+USER="sts"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+if [ -r /etc/default/$NAME ]; then
+	. /etc/default/$NAME
+fi
+
+CONFIG="${CONFIG:-/etc/oxidized/config}"
+
+PIDFILE=/var/run/$NAME.pid
+
+do_start()
+{
+        start-stop-daemon --start --quiet --background --pidfile $PIDFILE --make-pidfile  \
+        --oknodo --chuid $USER --exec $DAEMON -- -c $CONFIG $ARGS
+}
+
+do_stop()
+{
+        start-stop-daemon --oknodo --stop --quiet -v --pidfile $PIDFILE \
+        --chuid $USER --retry KILL/10 -- -c $CONFIG $ARGS
+}
+
+case "$1" in
+  start)
+        if [ "$ENABLED" = "no" ]; then
+                log_failure_msg "Not starting $DESC: disabled via /etc/default/$NAME"
+                exit 0
+        fi
+
+        log_daemon_msg "Starting $DESC..." "$NAME"
+        if do_start ; then
+                log_end_msg 0
+        else
+                log_end_msg 1
+        fi
+        ;;
+  stop)
+        log_daemon_msg "Stopping $DESC..." "$NAME"
+        if do_stop ; then
+                log_end_msg 0
+        else
+                log_end_msg 1
+        fi
+        ;;
+
+  restart|force-reload)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+  status)
+	status_of_proc -p $PIDFILE $DAEMON $NAME
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

data/lib/oxidized/model/comware.rb

@@ -0,0 +1,41 @@
+class Comware < Oxidized::Model
+  # HP (A-series)/H3C/3Com Comware
+  
+  prompt /^(<[\w.-]+>)$/
+  comment '# '
+
+  # example how to handle pager
+  #expect /^\s*---- More ----$/ do |data, re|
+  #  send ' '
+  #  data.sub re, ''
+  #end
+
+  cmd :all do |cfg|
+    #cfg.gsub! /^.*\e\[42D/, ''        # example how to handle pager
+    cfg.each_line.to_a[1..-2].join
+  end
+ 
+  cfg :telnet do
+    username /^Username:$/
+    password /^Password:$/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'screen-length disable'
+    post_login 'undo terminal monitor'
+    pre_logout 'quit'
+  end
+
+  cmd 'display version' do |cfg|
+    cfg = cfg.each_line.select {|l| not l.match /uptime/ }.join
+    comment cfg
+  end
+
+  cmd 'display device' do |cfg|
+    comment cfg
+  end
+
+  cmd 'display current-configuration' do |cfg|
+    cfg
+  end
+end

data/oxidized.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.2.4'
+  s.version           = '0.3.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -68,6 +68,7 @@ files:
 - Rakefile
 - TODO.md
 - bin/oxidized
+- extra/oxidized.init
 - extra/rest_client.rb
 - extra/syslog.rb
 - lib/oxidized.rb
@@ -91,6 +92,7 @@ files:
 - lib/oxidized/model/aosw.rb
 - lib/oxidized/model/asa.rb
 - lib/oxidized/model/ciscosmb.rb
+- lib/oxidized/model/comware.rb
 - lib/oxidized/model/eos.rb
 - lib/oxidized/model/fabricos.rb
 - lib/oxidized/model/fortios.rb
@@ -144,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: feeble attempt at rancid