diff options
| author | Neil Lathwood <neil@lathwood.co.uk> | 2018-02-21 10:36:38 +0000 |
|---|---|---|
| committer | Neil Lathwood <neil@lathwood.co.uk> | 2018-02-21 10:36:38 +0000 |
| commit | 9156243b9debfc0bc2b05dfe98a910ce5153bf49 (patch) | |
| tree | 57cc5ec5539bb38f1055af79314b74a6d20cfd7b | |
| parent | 7c108b6b7a3277aac44455b93a587d1d01a58041 (diff) | |
| parent | a42d1bad82e37975d674b560b18bc153a2786669 (diff) | |
rebased
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | docs/Model-Notes/Comware.md | 10 | ||||
| -rw-r--r-- | docs/Model-Notes/README.md | 1 | ||||
| -rw-r--r-- | lib/oxidized/model/aosw.rb | 2 | ||||
| -rw-r--r-- | lib/oxidized/model/br6910.rb | 2 | ||||
| -rw-r--r-- | lib/oxidized/model/procurve.rb | 4 |
6 files changed, 18 insertions, 3 deletions
@@ -3,7 +3,7 @@ MAINTAINER Samer Abdel-Hafez <sam@arahant.net> RUN add-apt-repository ppa:brightbox/ruby-ng && \ apt-get update && \ - apt-get install -y ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ + apt-get install -y ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ libffi-dev RUN mkdir -p /tmp/oxidized COPY . /tmp/oxidized/ diff --git a/docs/Model-Notes/Comware.md b/docs/Model-Notes/Comware.md new file mode 100644 index 0000000..31eb002 --- /dev/null +++ b/docs/Model-Notes/Comware.md @@ -0,0 +1,10 @@ +Comware Configuration +===================== + +If you find 3Com comware devices aren't being backed up this may be due to prompt detection not matching +because a previous login message is disabled after the first prompt. You can disable this on the devices +themselves by running this command: + +`info-center source default channel 1 log state off debug state off` + +[Reference](https://github.com/ytti/oxidized/issues/1171) diff --git a/docs/Model-Notes/README.md b/docs/Model-Notes/README.md index 636c9fa..20a0381 100644 --- a/docs/Model-Notes/README.md +++ b/docs/Model-Notes/README.md @@ -11,6 +11,7 @@ Use the table below for more information on the Vendor/Model caveats. Vendor | Model |Updated ----------------|-----------------|---------------- +3COM|[Comware](Comware.md)|15 Feb 2018 Arista|[EOS](EOS.md)|05 Feb 2018 Huawei|[VRP](VRP-Huawei.md)|17 Nov 2017 Juniper|[MX/QFX/EX/SRX/J Series](JunOS.md)|18 Jan 2018 diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb index a85ead7..71fde2e 100644 --- a/lib/oxidized/model/aosw.rb +++ b/lib/oxidized/model/aosw.rb @@ -11,7 +11,7 @@ class AOSW < Oxidized::Model # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored. comment '# ' - prompt /^\(?.+\)?\s?[#>]/ + prompt /^\(?.+\)?\s[#>]/ cmd :all do |cfg| cfg.each_line.to_a[1..-2].join diff --git a/lib/oxidized/model/br6910.rb b/lib/oxidized/model/br6910.rb index b5c9bcf..df93793 100644 --- a/lib/oxidized/model/br6910.rb +++ b/lib/oxidized/model/br6910.rb @@ -1,7 +1,7 @@ class BR6910 < Oxidized::Model
- prompt /^Vty-[0-9]\#$/
+ prompt /^([\w.@()-]+[#>]\s?)$/
comment '! '
# not possible to disable paging prior to show running-config
diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb index 11d7ea9..444fb5b 100644 --- a/lib/oxidized/model/procurve.rb +++ b/lib/oxidized/model/procurve.rb @@ -47,6 +47,10 @@ class Procurve < Oxidized::Model comment cfg end + cmd 'show system power-supply' do |cfg| + comment cfg + end + cmd 'show interfaces transceiver' do |cfg| comment cfg end |