aosw.rb in oxidized-0.31.0

- old
+ new

@@ -10,10 +10,16 @@
   # Support for IAP & Instant Controller tested with 115, 205, 215 & 325 running 6.4.4.8-4.2.4.5_57965
   # Support for Mobility Access Switches tested with S2500-48P & S2500-24P running 7.4.1.4_54199 and S2500-24P running 7.4.1.7_57823
   # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored.
 
   comment '# '
-  prompt /^([\w\(:.@-]+(\)?\s?)[#>]\s?)$/
+  # see /spec/model/aosw_spec.rb for prompt examples
+  prompt /^\(?[\w\:.@-]+\)? ?[*^]?(\[[\w\/]+\] ?)?[#>] ?$/
+
+  # Ignore cariage returns - also for the prompt
+  expect "\r" do |data, re|
+    data.gsub re, ''
+  end
 
   cmd :all do |cfg|
     cfg.cut_both
   end
 