Merge pull request #537 from nertwork/master

This PR is to fix the cumulus

2 files changed, 11 insertions, 5 deletions

diff --git a/lib/oxidized/model/cumulus.rb b/lib/oxidized/model/cumulus.rb
index 68d856e..dc6792a 100644
--- a/lib/oxidized/model/cumulus.rb
+++ b/lib/oxidized/model/cumulus.rb
@@ -1,6 +1,6 @@
 class Cumulus < Oxidized::Model
   
-  prompt /^((\w*)@(.*)([>#]\s)+)$/
+  prompt /^((\w*)@(.*)):/
   comment  '# '
   
   
@@ -22,7 +22,7 @@ class Cumulus < Oxidized::Model
     cfg += cmd 'cat /etc/hosts'
     
     cfg += add_comment 'THE INTERFACES'
-    cfg += cmd 'cat /etc/network/interfaces'
+    cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-'
     
     cfg += add_comment 'RESOLV.CONF'
     cfg += cmd 'cat /etc/resolv.conf'
@@ -30,6 +30,9 @@ class Cumulus < Oxidized::Model
     cfg += add_comment 'NTP.CONF'
     cfg += cmd 'cat /etc/ntp.conf'
     
+    cfg += add_comment 'IP Routes'
+    cfg += cmd 'netstat -rn'
+
     cfg += add_comment 'QUAGGA DAEMONS'
     cfg += cmd 'cat /etc/quagga/daemons'
     
@@ -55,10 +58,13 @@ class Cumulus < Oxidized::Model
     cfg += cmd 'cat /etc/cumulus/switchd.conf'
     
     cfg += add_comment 'ACL'
-    cfg += cmd 'iptables -L'
+    cfg += cmd 'iptables -L -n'
     
     cfg += add_comment 'VERSION'
     cfg += cmd 'cat /etc/cumulus/etc.replace/os-release'
+
+    cfg += add_comment 'License'
+    cfg += cmd 'cl-license'
     
   end
   
@@ -73,4 +79,4 @@ class Cumulus < Oxidized::Model
   end
  
 
-end
\ No newline at end of file
+end
diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb
index 40996a8..023f184 100644
--- a/lib/oxidized/version.rb
+++ b/lib/oxidized/version.rb
@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.16.1'
+  VERSION = '0.16.2'
 end