oxidized 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfbcf124c9f12166a20cf549f684d7b6b5edb3ab
-  data.tar.gz: 9a317c8cc4dd290297ac00cf4888b855b1f10303
+  metadata.gz: 685b7ced661d1682eb3702d88419a71e17069868
+  data.tar.gz: 0e3194c5964e0f803d70382e0f227c25d0a574b4
 SHA512:
-  metadata.gz: 2ad3cf531b7be26691abe59a8581be106c07b5a039c5eafec5dae3f170b28e9d7d3f8bb45cfe4516787604ddddec27b52d9ac55644e7c64ba11ffb4601e03d54
-  data.tar.gz: 72ad3d8512564340980e742c98f70977ffc8b5f9b5212a44b194f116afd1b3915f9348df9b066a531ce89ce67313ebceb44e816ed7dad4dcb36aa50820763955
+  metadata.gz: 4bfa8faf73182f97fd614db4b5530e6e37bcc632b3d0380d5dfff9d6f5336c17be6dffc833b3c7a25c82a88e0841788e92f4c51340a6729eee931ceadfec0685
+  data.tar.gz: 5929ddbd24859dfcb219deeba837f5070a5cea4327eb9b8b0b643c09045fbf59cc82d4d1759de7dc5f1913445d91fe0e397e22d2eb9cf5b78322de5d953b25ce

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.3.0
+- FEATURE: *FIXME* bunch of stuff I did for richih, docs needed
+
+# 0.2.4
+- FEATURE: Cisco SMB (Nikola series VxWorks) model by @thetamind
+- FEATURE: Extreme Networks XOS model (access by sjm)
+- FEATURE: Brocade NOS (Network Operating System) (access by sjm)
+- BUGFIX: Match exactly to node[:name] if node[name] is an ip address.
+
 # 0.2.3
 - BUGFIX: rescue @ssh.close when far end closes disgracefully (ALU ISAM)
 - BUGFIX: bugfixes to models

data/README.md

@@ -1,12 +1,38 @@
-# Pitch
- * automatically adds/removes threads to meet configured retrieval interval
- * restful API to move node immediately to head-of-queue (GET/POST /node/next/[NODE])
-   * syslog udp+file example to catch config change event (ios/junos) and trigger config fetch
-   * will signal ios/junos user who made change, which output module can (git does) use (via POST)
-   * 'git blame' will show for each line who and when the change was made
- * restful API to reload list of nodes (GET /reload)
- * restful API to fetch configurations (/node/fetch/[NODE] or /node/fetch/group/[NODE])
- * restful API to show list of nodes (GET /nodes)
+# Oxidized
+
+Oxidized is a network device configration backup tool. Its a RANCID replacment!
+
+* automatically adds/removes threads to meet configured retrieval interval
+* restful API to move node immediately to head-of-queue (GET/POST /node/next/[NODE])
+  * syslog udp+file example to catch config change event (ios/junos) and trigger config fetch
+  * will signal ios/junos user who made change, which output module can (git does) use (via POST)
+  * 'git blame' will show for each line who and when the change was made
+* restful API to reload list of nodes (GET /reload)
+* restful API to fetch configurations (/node/fetch/[NODE] or /node/fetch/group/[NODE])
+* restful API to show list of nodes (GET /nodes)
+
+[Youtube Video: Oxidized TREX 2014 presentation](http://youtu.be/kBQ_CTUuqeU#t=3h)
+
+#### Index
+1. [Supported OS Types](#supported-os-types)
+2. [Installation](#installation)
+    * [Debian](#debian)
+    * [CentOS, Oracle Linux, Red Hat Linux version 6](#centos-oracle-linux-red-hat-linux-version 6)
+3. [Initial Configuration](#configuration)
+4. [Installing Ruby 2.1.2 using RVM](#installing-ruby-2.1.2-using-rvm)
+5. [Cookbook](#cookbook)
+    * [Debugging](#debugging)
+    * [Privileged mode](#privileged-mode)
+    * [Source: CSV](#source-csv)
+    * [Source: SQLite](#source-sqlite)
+    * [Output: GIT](#output-git)
+    * [Output: File](#output-file)
+    * [Advanced Configuration](#advanced-configuration)
+6. [Ruby API](#ruby-api)
+    * [Input](#input)
+    * [Output](#output)
+    * [Source](#source)
+    * [Model](#model)
 
 # Supported OS types
 
@@ -19,12 +45,16 @@
  * Arista EOS
  * Brocade Fabric OS
  * Brocade Ironware
+ * Brocade NOS (Network Operating System)
  * Brocade Vyatta
  * Cisco AireOS
  * Cisco ASA
  * Cisco IOS
  * Cisco IOS-XR
+ * Cisco NXOS
+ * Cisco SMB (Nikola series)
  * DELL PowerConnect
+ * Extreme Networks XOS
  * Force10 FTOS
  * FortiGate FortiOS
  * HP ProCurve
@@ -33,159 +63,257 @@
  * Juniper ScreenOS (Netscreen)
  * Ubiquiti AirOS
 
-# Install
-
- * Debian
-   1. apt-get install ruby ruby-dev libsqlite3-dev libssl-dev
-   2. gem install oxidized
-   3. gem install oxidized-script oxidized-web # if you don't install oxidized-web, make sure you remove "rest" from your config
-   4. oxidized
-   5. vi ~/.config/oxidized/config
-   6. (maybe point to your rancid/router.db or copy it there)
-   7. oxidized
-
- * CentOS, Oracle Linux, Red Hat Linux version 6
-   1. Install Ruby 1.9.3 or greater
-     * For Ruby 2.1.2 installation instructions see "Installing Ruby 2.1.2 using RVM"
-   2. Install Oxidized dependencies
-     * yum install cmake sqlite-devel openssl-devel 
-   3. Install Oxidized daemon and Web front-end from Ruby Gems 
-     * gem install oxidized
-     * gem install oxidized-script oxidized-web
-   4. Start Oxidized, this will create initial configuration
-     * oxidized
-   5. Edit Oxidized configuration and create device database
-     * vi ~/.config/oxidized/config
-     * vi ~/.config/oxidized/router.db
-   6. If you are using file system storage create config directory
-     * mkdir -p ~/.config/oxidized/configs/default
-   7. Start Oxidized
-     * oxidized 
-
- * Installing Ruby 2.1.2 using RVM
-   1. Install Ruby 2.1.2 build dependencies
-     * yum install curl gcc-c++ patch readline readline-devel zlib zlib-devel 
-     * yum install libyaml-devel libffi-devel openssl-devel make cmake 
-     * yum install bzip2 autoconf automake libtool bison iconv-devel
-   2. Install RVM
-     * curl -L get.rvm.io | bash -s stable
-   3. Setup RVM environment
-     * source /etc/profile.d/rvm.sh
-   4. Compile and install Ruby 2.1.2
-     * rvm install 2.1.2
-   5. Set Ruby 2.1.2 as default
-     * rvm use --default 2.1.2
-
-# API
-## Input
- * gets config from nodes
- * must implement 'connect', 'get', 'cmd'
- * 'ssh' and 'telnet' implemented
 
-## Output
- * stores config
- * must implement 'store' (may implement 'fetch')
- * 'git' and 'file' (store as flat ascii) implemented
+# Installation
+## Debian
+Install all required packages and gems.
+
+```shell
+apt-get install ruby ruby-dev libsqlite3-dev libssl-dev pkg-config cmake
+gem install rugged
+gem install oxidized
+gem install oxidized-script oxidized-web # if you don't install oxidized-web, make sure you remove "rest" from your config
+```
+
+## CentOS, Oracle Linux, Red Hat Linux version 6
+Install Ruby 1.9.3 or greater (for Ruby 2.1.2 installation instructions see "Installing Ruby 2.1.2 using RVM"), then install Oxidized dependencies
+```shell
+yum install cmake sqlite-devel openssl-devel
+```
+
+Now lets install oxidized via Rubygems:
+```shell
+gem install oxidized
+gem install oxidized-script oxidized-web
+```
+
+# Configuration
+
+Oxidized configuration is in YAML format. Configuration files are subsequently sourced from ```/etc/oxidized/config``` then ```~/.config/oxidized/config```. The hashes will be merged, this might be useful for storing source information in a system wide file and  user specific configuration in the home directory (to only include a staff specific username and password). Eg. if many users are using ```oxs```, see [Oxidized::Script](https://github.com/ytti/oxidized-script).
+
+To initialize a default configuration in your home directory ```~/.config/oxidized/config```, simply run ```oxidized``` once. If you don't further configure anything from the output and source sections, it'll extend the examples on a subsequent ```oxidized``` execution. This is useful to see what options for a specific source or output backend are available.
 
 ## Source
- * gets list of nodes to poll
- * must implement 'load'
- * source can have 'name', 'model', 'group', 'username', 'password', 'input', 'output', 'prompt'
-   * name - name of the devices
-   * model - model to use ios/junos/xyz, model is loaded dynamically when needed (Also default in config file)
-   * input - method to acquire config, loaded dynamically as needed (Also default in config file)
-   * output - method to store config, loaded dynamically as needed (Also default in config file)
-   * prompt - prompt used for node (Also default in config file, can be specified in model too)
- * 'sql' and 'csv' (supports any format with single entry per line, like router.db)
 
-## Model
- * lists commands to gather from given device model
- * can use 'cmd', 'prompt', 'comment', 'cfg'
- * cfg is executed in input/output/source context
- * cmd is executed in instance of model
- * 'junos', 'ios', 'ironware' and 'powerconnect' implemented
+Oxidized supports ```CSV``` and ```SQLite``` as source backends. The CSV backend reads nodes from a rancid compatible router.db file. The SQLite backend will fire queries against a database and map certain fields to model items. Take a look at the [Cookbook](#cookbook) for more details.
+
+## Outputs
+
+Possible outputs are either ```file``` or ```git```. The file backend takes a destination directory as argument and will keep a file per device, with most recent running version of a device. The GIT backend (recommended) will initialize an empty GIT repository in the specified path and create a new commit on every configuration change. Take a look at the [Cookbook](#cookbook) for more details.
+
+Maps define how to map a model's fields to model [model fields](https://github.com/ytti/oxidized/tree/master/lib/oxidized/model). Most of the settings should be self explanatory, log is ignored if Syslog::Logger exists (>=2.0) and syslog is used instead.
+
+First create the directory where the CSV ```output``` is going to store device configs and start Oxidized once.
+```
+mkdir ~/.config/oxidized/configs
+oxidized
+```
+
+Now tell Oxidized where it finds a list of network devices to backup configuration from. You can either use CSV or SQLite as source. To create a CVS source add the following snippet:
+
+```
+source:
+  default: csv
+  csv:
+    file: ~/.config/oxidized/router.db
+    delimiter: !ruby/regexp /:/
+    map:
+      name: 0
+      model: 1
+```
+
+Now lets create a file based device database (you might want to switch to SQLite later on). Put your routers in ```~/.config/oxidized/router.db``` (file format is compatible with rancid). Simply add an item per line:
+
+```
+router01.example.com:ios
+switch01.example.com:procurve
+router02.example.com:ios
+```
+
+Run ```oxidized``` again to take the first backups.
+
+# Installing Ruby 2.1.2 using RVM
+
+Install Ruby 2.1.2 build dependencies
+```
+yum install curl gcc-c++ patch readline readline-devel zlib zlib-devel
+yum install libyaml-devel libffi-devel openssl-devel make cmake
+yum install bzip2 autoconf automake libtool bison iconv-devel
+```
+
+Install RVM
+```
+curl -L get.rvm.io | bash -s stable
+```
+
+Setup RVM environment and compile and install Ruby 2.1.2 and set it as default
+```
+source /etc/profile.d/rvm.sh
+rvm install 2.1.2
+rvm use --default 2.1.2
+```
 
-## Media
- * TREX 2014 presentation - http://youtu.be/kBQ_CTUuqeU#t=3h
 
 ## Cookbook
+### Debugging
+In case a model plugin doesn't work correctly (ios, procurve, etc.), you can enable live debugging of SSH/Telnet sessions. Just add a ```debug``` option, specifying a log file destination to the ```input``` section.
+
+The following example will log an active ssh session to ```/home/fisakytt/.config/oxidized/log_input-ssh``` and telnet to ```log_input-telnet```. The file will be truncated on each consecutive ssh/telnet session, so you need to put a ```tailf``` or ```tail -f``` on that file!
+
+```
+input:
+  default: ssh, telnet
+  debug: ~/.config/oxidized/log_input
+  ssh:
+    secure: false
+```
+
+### Privileged mode
+
+To start privileged mode before pulling the configuration, Oxidized needs to send the enable command. You can globally enable this, by adding the following snippet to the global section of the configuration file.
+
+```
+vars:
+   enable: S3cre7
+```
+
+### Source: CSV
+
+One line per device, colon seperated.
+
+```
+source:
+  default: csv
+  csv:
+    file: /var/lib/oxidized/router.db
+    delimiter: !ruby/regexp /:/
+    map:
+      name: 0
+      model: 1
+      username: 2
+      password: 3
+    var_map:
+      enable: 4
+```
+
+### Source: SQLite
+
+One row per device, filtered by hostname.
 
-### Configuration I use in one environment
 ```
----
-username: LANA
-password: LANAAAAAAA
-output:
-  default: git
-  git:
-    user: Oxidized
-    email: o@example.com
-    repo: "/usr/local/lan/oxidized.git"
 source:
   default: sql
   sql:
     adapter: sqlite
-    database: "/usr/local/lan/corona.db"
-    table: device
+    database: "/var/lib/oxidized/devices.db"
+    table: devices
     map:
-      name: ptr
+      name: fqdn
       model: model
+      username: username
+      password: password
+    var_map:
+      enable: enable
 ```
 
-### Configuration you end up after first run
-If you don't configure output and source, it'll further fill them with example
-configs for your chosen output/source in subsequent runs
+### Output: File
+
+Parent directory needs to be created manually, one file per device, with most recent running config.
+
+```
+output:
+  file:
+    directory: /var/lib/oxidized/configs
+```
+
+### Output: Git
+
+```
+output:
+  default: git
+  git:
+    user: Oxidized
+    email: o@example.com
+    repo: "/var/lib/oxidized/devices.git"
+```
+
+### Advanced Configuration
+
+Below is an advanced example configuration. You will be able to (optinally) override options per device. The router.db format used is ```hostname:model:username:password:enable_password```. Hostname and model will be the only required options, all others override the global configuration sections.
+
 ```
 ---
-username: username
-password: password
+username: oxidized
+password: S3cr3tx
 model: junos
 interval: 3600
-log: "/home/fisakytt/.config/oxidized/log"
+log: ~/.config/oxidized/log
 debug: false
 threads: 30
-timeout: 30
+timeout: 20
+retries: 3
 prompt: !ruby/regexp /^([\w.@-]+[#>]\s?)$/
+vars:
+  enable: S3cr3tx
+groups: {}
 rest: 127.0.0.1:8888
-vars: {}
 input:
   default: ssh, telnet
+  debug: false
   ssh:
     secure: false
-output:
-  default: git
-source:
-  default: csv
-model_map:
-  cisco: ios
-  juniper: junos
-```
-
-Output and Source could be:
-```
 output:
   default: git
   git:
-    user: Oxidized
-    email: o@example.com
-    repo: "/home/fisakytt/.config/oxidized/oxidized.git"
+      user: Oxidized
+      email: oxidized@example.com
+      repo: "~/.config/oxidized/oxidized.git"
 source:
   default: csv
   csv:
-    file: "/home/fisakytt/.config/oxidized/router.db"
+    file: ~/.config/oxidized/router.db
     delimiter: !ruby/regexp /:/
     map:
       name: 0
       model: 1
+      username: 2
+      password: 3
+    var_map:
+      enable: 4
+model_map:
+  cisco: ios
+  juniper: junos
 ```
-which reads nodes from rancid compatible router.db maps their model names to
-model names oxidized expects, stores config in git, will try ssh first then
-telnet, wont crash on changed ssh keys.
 
-Hopefully most of them are obvious, log is ignored if Syslog::Logger exists
-(>=2.0) and syslog is used instead.
 
-System wide configurations can be stored in /etc/oxidized/config, this might be
-useful for storing for example source information, if many users are using
-oxs/Oxidized::Script, which would allow user specific config only to include
-username+password.
+# Ruby API
+
+The following objects exist in Oxidized.
+
+## Input
+ * gets config from nodes
+ * must implement 'connect', 'get', 'cmd'
+ * 'ssh' and 'telnet' implemented
+
+## Output
+ * stores config
+ * must implement 'store' (may implement 'fetch')
+ * 'git' and 'file' (store as flat ascii) implemented
+
+## Source
+ * gets list of nodes to poll
+ * must implement 'load'
+ * source can have 'name', 'model', 'group', 'username', 'password', 'input', 'output', 'prompt'
+   * name - name of the devices
+   * model - model to use ios/junos/xyz, model is loaded dynamically when needed (Also default in config file)
+   * input - method to acquire config, loaded dynamically as needed (Also default in config file)
+   * output - method to store config, loaded dynamically as needed (Also default in config file)
+   * prompt - prompt used for node (Also default in config file, can be specified in model too)
+ * 'sql' and 'csv' (supports any format with single entry per line, like router.db)
+
+## Model
+ * lists commands to gather from given device model
+ * can use 'cmd', 'prompt', 'comment', 'cfg'
+ * cfg is executed in input/output/source context
+ * cmd is executed in instance of model
+ * 'junos', 'ios', 'ironware' and 'powerconnect' implemented

data/lib/oxidized/cli.rb

@@ -16,11 +16,13 @@ module Oxidized
     private
 
     def initialize
+      Log.info "Oxidized starting, running as pid #{$$}"
       _args, @opts = parse_opts
       CFG.debug = true if @opts[:debug]
     end
 
     def crash error
+      Log.fatal "Oxidized crashed, crashfile written in #{Config::Crash}"
       open Config::Crash, 'w' do |file|
         file.puts '-' * 50
         file.puts Time.now.utc

data/lib/oxidized/config.rb

@@ -51,6 +51,6 @@ module Oxidized
 
   Log.level = Logger::INFO unless CFG.debug
   raise NoConfig, 'edit ~/.config/oxidized/config' if CFGS.create
-  Log.file  = CFG.log if CFG.log
+  Log.file = CFG.log if CFG.log
 
 end

data/lib/oxidized/log.rb

@@ -12,6 +12,7 @@ module Oxidized
        super target
      end
      def file= target
+       FileUtils.mkdir_p File.dirname(target)
        @logdev = LogDevice.new target
      end
     end

data/lib/oxidized/model/aosw.rb

@@ -1,7 +1,8 @@
 class AOSW < Oxidized::Model
 
-  # AOSW - Alcatel-Lucent OS - Wireless 
-  # Used in Alcatel OAW-4750 WLAN controller (Aruba)
+  # AOSW Aruba Wireless
+  # Used in Alcatel OAW-4750 WLAN controller
+  # Also Dell controllers
 
   comment  '# '
   prompt /^\([^)]+\) #/
@@ -16,8 +17,7 @@ class AOSW < Oxidized::Model
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = cfg.each_line.take_while { |line| not line.match /Output \d Config/i }
-    comment cfg.join
+    clean cfg
   end
 
   cmd 'show slots' do |cfg|
@@ -40,4 +40,18 @@ class AOSW < Oxidized::Model
     pre_logout 'exit'
   end
 
+  def clean cfg
+    out = []
+    cfg.each_line do |line|
+      # drop the temperature, fan speed and voltage, which change each run
+      next if line.match /Output \d Config/i
+      next if line.match /(Tachometers|Temperatures|Voltages)/
+      next if line.match /((Card|CPU) Temperature|Chassis Fan|VMON1[0-9])/
+      next if line.match /[0-9]+ (RPM|mV|C)$/
+      out << line.strip
+    end
+    out = out.join "\n"
+    out << "\n"
+  end
+
 end

data/lib/oxidized/model/asa.rb

@@ -3,7 +3,7 @@ class ASA < Oxidized::Model
   # Cisco ASA model #
   # Only SSH supported for the sake of security
 
-  prompt /^\r*([\w]+[#>]\s?)$/
+  prompt /^\r*([\w.@()-\/]+[#>]\s?)$/
   comment  '! '
 
   cmd :all do |cfg|
@@ -16,11 +16,10 @@ class ASA < Oxidized::Model
     cfg
   end
 
-  cmd 'show clock' do |cfg|
-    comment cfg
-  end
-
   cmd 'show version' do |cfg|
+    # avoid commits due to uptime / ixo-router01 up 2 mins 28 secs / ixo-router01 up 1 days 2 hours
+    cfg = cfg.each_line.select { |line| not line.match /\s+up\s+\d+\s+/ }
+    cfg = cfg.join
     comment cfg
   end
 

data/lib/oxidized/model/ciscosmb.rb

@@ -0,0 +1,48 @@
+class CiscoSMB < Oxidized::Model
+
+  # Cisco Small Business 200, 300, 500, and ESW2 series switches
+  # http://www.cisco.com/c/en/us/support/switches/small-business-300-series-managed-switches/products-release-notes-list.html
+
+  prompt /^\r?([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    lines = cfg.each_line.to_a[1..-2]
+    # Remove \r from beginning of response
+    lines[0].gsub!(/^\r.*?/, '') if lines.length > 0
+    lines.join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.to_a[0..-1].join
+    cfg.gsub! /^Current configuration : [^\n]*\n/, ''
+    cfg.sub! /^(ntp clock-period).*/, '! \1'
+    cfg.gsub! /^\ tunnel\ mpls\ traffic-eng\ bandwidth[^\n]*\n*(
+                  (?:\ [^\n]*\n*)*
+                  tunnel\ mpls\ traffic-eng\ auto-bw)/mx, '\1'
+    cfg
+  end
+
+  cfg :telnet, :ssh do
+    username /^User Name:/
+    password /^\r?Password:$/
+    post_login 'terminal datadump' # Disable pager
+    post_login 'terminal width 0'
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/ios.rb

@@ -37,9 +37,9 @@ class IOS < Oxidized::Model
   end
 
   cmd 'show running-config' do |cfg|
-    cfg = cfg.each_line.to_a[3..-1].join
+    cfg = cfg.each_line.to_a[3..-1]
+    cfg = cfg.reject { |line| line.match /^ntp clock-period / }.join
     cfg.gsub! /^Current configuration : [^\n]*\n/, ''
-    cfg.sub! /^(ntp clock-period).*/, '! \1'
     cfg.gsub! /^\ tunnel\ mpls\ traffic-eng\ bandwidth[^\n]*\n*(
                   (?:\ [^\n]*\n*)*
                   tunnel\ mpls\ traffic-eng\ auto-bw)/mx, '\1'

data/lib/oxidized/model/model.rb

@@ -1,3 +1,5 @@
+require_relative 'outputs'
+
 module Oxidized
   class Model
     include Oxidized::Config::Vars
@@ -77,17 +79,16 @@ module Oxidized
     def cmd string, &block
       out = @input.cmd string
       return false unless out
-      out = Oxidized::String.new out
       self.class.cmds[:all].each do |all_block|
-        out = instance_exec out, string, &all_block
+        out = instance_exec Oxidized::String.new(out), string, &all_block
       end
       if vars :remove_secret
         self.class.cmds[:secret].each do |all_block|
-          out = instance_exec out, string, &all_block
+          out = instance_exec Oxidized::String.new(out), string, &all_block
         end
       end
-      out = instance_exec out, &block if block
-      out
+      out = instance_exec Oxidized::String.new(out), &block if block
+      process_cmd_output out, string
     end
 
     def output
@@ -124,20 +125,20 @@ module Oxidized
     end
 
     def get
-      data, pre = '', ''
+      outputs = Outputs.new
       procs = self.class.procs
       self.class.cmds[:cmd].each do |command, block|
         out = cmd command, &block
         return false unless out
-        data << out.to_s
+        outputs << out
       end
       procs[:pre].each do |pre_proc|
-        pre << instance_eval(&pre_proc).to_s
+        outputs.unshift Oxidized::String.new(instance_eval(&pre_proc))
       end
       procs[:post].each do |post_proc|
-        data << instance_eval(&post_proc).to_s
+        outputs << Oxidized::String.new(instance_eval(&post_proc))
       end
-      pre + data
+      outputs
     end
 
     def comment _comment
@@ -148,5 +149,15 @@ module Oxidized
       data
     end
 
+    private
+
+    def process_cmd_output output, name
+      if output.class != Oxidized::String
+        output = Oxidized::String.new output
+      end
+      output.set_cmd(name)
+      output
+    end
+
   end
 end

data/lib/oxidized/model/nos.rb

@@ -0,0 +1,45 @@
+class NOS < Oxidized::Model
+
+  # Brocade Network Operating System
+
+  prompt /^(?:\e\[..h)?[\w.-]+# $/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show license' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show chassis' do |cfg|
+    comment cfg.each_line.reject { |line| line.match /Time/ }.join
+  end
+
+  cfg 'show system' do |cfg|
+    commen cfg.each_line.reject { |line| line.match /Time/ or line.match /speed/ }
+  end
+
+  cmd 'show running-config'
+
+  cfg :telnet do
+    username /^.* login: /
+    username /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    #post_login 'terminal width 0'
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/nxos.rb

@@ -0,0 +1,23 @@
+class NXOS < Oxidized::Model
+
+  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  comment '! '
+
+  cmd 'show version' do |cfg|
+    cfg = cfg.each_line.take_while { |line| not line.match(/uptime/i) }
+    comment cfg.join ""
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end 
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^!Time:[^\n]*\n/, ''
+  end
+
+  cfg :ssh do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/outputs.rb

@@ -0,0 +1,41 @@
+module Oxidized
+  class Model
+    class Outputs
+
+      def to_cfg
+        type_to_str(nil)
+      end
+
+      def type_to_str want_type
+        type(want_type).map { |out| out }.join
+      end
+
+      def << output
+        @outputs << output
+      end
+
+      def unshift output
+        @outputs.unshift output
+      end
+
+      def all
+        @outputs
+      end
+
+      def type type
+        @outputs.select { |out| out.type==type }
+      end
+
+      def types
+        @outputs.map { |out| out.type }.uniq.compact
+      end
+
+      private
+
+      def initialize
+        @outputs = []
+      end
+
+    end
+  end
+end

data/lib/oxidized/model/powerconnect.rb

@@ -14,12 +14,14 @@ class PowerConnect < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    comment cfg
+    cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
+    comment cfg.join("\n") + "\n"
   end
 
   cmd 'show system' do |cfg|
-    cfg = cfg.each_line.take_while { |line| not line.match(/uptime/i) }
-    comment cfg.join "\n"
+    cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
+    cfg = cfg[0..-28]<<" "
+    comment cfg.join("\n")
   end
 
   cmd 'show running-config'
@@ -31,8 +33,10 @@ class PowerConnect < Oxidized::Model
 
   cfg :telnet, :ssh do
     if vars :enable
-      send "enable\n"
-      send vars(:enable) + "\n"
+      post_login do
+        send "enable\n"
+        send vars(:enable) + "\n"
+      end
     end
 
     post_login "terminal length 0"

data/lib/oxidized/model/xos.rb

@@ -0,0 +1,40 @@
+class XOS < Oxidized::Model
+
+  # Extreme Networks XOS
+
+  prompt /^*?[\w .-]+# $/
+  comment  '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join.rstrip
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show diagnostics' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show licenses' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show switch'do |cfg|
+    comment cfg.each_line.reject { |line| line.match /Time:/ or line.match /boot/i }.join
+  end
+
+  cmd 'show configuration'
+
+  cfg :telnet do
+    username /^login:/
+    password /^passowrd:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'disable clipaging'
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/nodes.rb

@@ -9,16 +9,11 @@ module Oxidized
     def load node_want=nil
       with_lock do
         new = []
-        node_want_ip = (IPAddr.new(node_want) rescue false) if node_want
         @source = CFG.source.default
         Oxidized.mgr.add_source @source
         Oxidized.mgr.source[@source].new.load.each do |node|
-
           # we want to load specific node(s), not all of them
-          if node_want
-            next unless node_want_ip == node[:ip] or node_want.match(node[:name])
-          end
-
+          next unless node_want? node_want, node
           begin
             _node = Node.new node
             new.push _node
@@ -28,10 +23,25 @@ module Oxidized
             Log.error "node %s is not resolvable, raised %s with message '%s'" % [node, err.class, err.message]
           end
         end
+        Log.info "Loaded #{size} nodes"
         size == 0 ? replace(new) : update_nodes(new)
       end
     end
 
+    def node_want? node_want, node
+      return true unless node_want
+      node_want_ip = (IPAddr.new(node_want) rescue false)
+      name_is_ip   = (IPAddr.new(node[:name]) rescue false)
+      if name_is_ip and node_want_ip == node[:name]
+        true
+      elsif node[:ip] and node_want_ip == node[:ip]
+        true
+      elsif node_want.match node[:name]
+        true unless name_is_ip
+      end
+    end
+
+
     def list
       with_lock do
         map { |e| e.serialize }

data/lib/oxidized/output/file.rb

@@ -14,14 +14,14 @@ class OxidizedFile < Output
     end
   end
 
-  def store node, data, opt={}
+  def store node, outputs, opt={}
     file = @cfg.directory
     if opt[:group]
       file = File.join File.dirname(file), opt[:group]
     end
     FileUtils.mkdir_p file
     file = File.join file, node
-    open(file, 'w') { |fh| fh.write data }
+    open(file, 'w') { |fh| fh.write outputs.to_cfg }
   end
 
   def fetch node, group

data/lib/oxidized/output/git.rb

@@ -21,23 +21,32 @@ class Git < Output
     end
   end
 
-  def store file, data, opt={}
-    msg   = opt[:msg]
-    user  = (opt[:user]  or @cfg.user)
-    email = (opt[:email] or @cfg.email)
-    repo  = @cfg.repo
-    if opt[:group]
-      repo = File.join File.dirname(repo), opt[:group] + '.git'
-    end
-    begin
-      repo = Rugged::Repository.new repo
-      update_repo repo, file, data, msg, user, email
-    rescue Rugged::OSError, Rugged::RepositoryError
-      Rugged::Repository.init_at repo, :bare
-      retry
+  def store file, outputs, opt={}
+    @msg   = opt[:msg]
+    @user  = (opt[:user]  or @cfg.user)
+    @email = (opt[:email] or @cfg.email)
+    @opt   = opt
+    repo   = @cfg.repo
+
+    outputs.types.each do |type|
+      type_cfg = ''
+      type_repo = File.join File.dirname(repo), type + '.git'
+      outputs.type(type).each do |output|
+        (type_cfg << output; next) if not output.name
+        type_file = file + '--' + output.name
+        if @cfg.type_as_directory?
+          type_file = type + '/' + type_file
+          type_repo = repo
+        end
+        update type_repo, type_file, output
+      end
+      update type_repo, file, type_cfg
     end
+
+    update repo, file, outputs.to_cfg
   end
 
+
   def fetch node, group
     begin
       repo = @cfg.repo
@@ -55,6 +64,18 @@ class Git < Output
 
   private
 
+  def update repo, file, data
+    return if data.empty?
+    if @opt[:group]
+      repo = File.join File.dirname(repo), @opt[:group] + '.git'
+    end
+    repo = Rugged::Repository.new repo
+    update_repo repo, file, data, @msg, @user, @email
+  rescue Rugged::OSError, Rugged::RepositoryError
+    Rugged::Repository.init_at repo, :bare
+    retry
+  end
+
   def update_repo repo, file, data, msg, user, email
     oid = repo.write data, :blob
     index = repo.index

data/lib/oxidized/output/output.rb

@@ -1,5 +1,10 @@
 module Oxidized
   class Output
     class NoConfig < OxidizedError; end
+
+    def cfg_to_str cfg
+      cfg.select{ |h| h[:type]=='cfg' }.map{ |h| h[:data] }.join
+    end
+
   end
 end

data/lib/oxidized/source/csv.rb

@@ -19,6 +19,7 @@ class CSV < Source
   def load
     nodes = []
     open(@cfg.file).each_line do |line|
+      next if line.match /^\s*#/
       data  = line.chomp.split @cfg.delimiter
       next if data.empty?
       # map node parameters

data/lib/oxidized/string.rb

@@ -1,13 +1,32 @@
 module Oxidized
   # Used in models, contains convenience methods
   class String < String
+    attr_accessor :type, :cmd, :name
+
     # @return [Oxidized::String] copy of self with last line removed
     def cut_tail
       Oxidized::String.new each_line.to_a[0..-2].join
     end
+
     # @return [Oxidized::String] copy of self with first line removed
     def cut_head
       Oxidized::String.new each_line.to_a[1..-1].join
     end
+
+    # sets @cmd and @name unless @name is already set
+    def set_cmd command
+      @cmd  = command
+      @name = @cmd.strip.gsub(/\s+/, '_') if @name == nil
+    end
+
+    def initialize str=''
+      super
+      if str.class == Oxidized::String
+        @cmd  = str.cmd
+        @name = str.name
+        @type = str.type
+      end
+    end
+
   end
 end

data/oxidized.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.2.3'
+  s.version           = '0.2.4'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
-  s.authors           = [ 'Saku Ytti' ]
-  s.email             = %w( saku@ytti.fi )
+  s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez' ]
+  s.email             = %w( saku@ytti.fi sam@arahant.net )
   s.homepage          = 'http://github.com/ytti/oxidized'
   s.summary           = 'feeble attempt at rancid'
   s.description       = 'software to fetch configuration from network devices and store them'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Saku Ytti
+- Samer Abdel-Hafez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -55,6 +56,7 @@ dependencies:
 description: software to fetch configuration from network devices and store them
 email:
 - saku@ytti.fi
+- sam@arahant.net
 executables:
 - oxidized
 extensions: []
@@ -88,6 +90,7 @@ files:
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb
 - lib/oxidized/model/asa.rb
+- lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/eos.rb
 - lib/oxidized/model/fabricos.rb
 - lib/oxidized/model/fortios.rb
@@ -98,12 +101,16 @@ files:
 - lib/oxidized/model/isam.rb
 - lib/oxidized/model/junos.rb
 - lib/oxidized/model/model.rb
+- lib/oxidized/model/nos.rb
+- lib/oxidized/model/nxos.rb
+- lib/oxidized/model/outputs.rb
 - lib/oxidized/model/powerconnect.rb
 - lib/oxidized/model/procurve.rb
 - lib/oxidized/model/screenos.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/vrp.rb
 - lib/oxidized/model/vyatta.rb
+- lib/oxidized/model/xos.rb
 - lib/oxidized/node.rb
 - lib/oxidized/node/stats.rb
 - lib/oxidized/nodes.rb