fixeria submitted this change.

View Change

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved

tests/handover_cfg.vty: use more precise regex for forbidden lines

Current regex 'handover' is way too restrictive because it completely
forbids the use of word 'handover'.  Adding new VTY commands with this
word in the syntax makes this VTY test fail.

Use regex '^\s+handover', which only matches lines starting with
some whitespace and the word 'handover'.  Lines simply containing
the word 'handover' will be ignored.

Change-Id: I8a1550c6c97437832e05b6b4bebbcc33c2fa3d46
Related: SYS#5460
---
M tests/handover_cfg.vty
1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty
index fb3c73c..0f10133 100644
--- a/tests/handover_cfg.vty
+++ b/tests/handover_cfg.vty
@@ -6,7 +6,7 @@
 
 OsmoBSC# ### No handover config present
 OsmoBSC# show running-config
-... !handover
+... !^\s+handover
 
 OsmoBSC# ### Toggling handover on network level affects 'show network':
 OsmoBSC# configure terminal
@@ -44,17 +44,17 @@
 OsmoBSC(config-net)# show running-config
 ...
 network
-... !handover
+... !^\s+handover
  handover 1
-... !handover
+... !^\s+handover
  bts 0
-... !handover
+... !^\s+handover
   handover 0
-... !handover
+... !^\s+handover
  bts 1
-... !handover
+... !^\s+handover
   handover1 power budget interval 23
-... !handover
+... !^\s+handover
 
 OsmoBSC(config-net)# ### Set global default to 'off', now bts 1 also uses the global default of 'off':
 OsmoBSC(config-net)# handover 0
@@ -65,17 +65,17 @@
 OsmoBSC(config-net)# show running-config
 ...
 network
-... !handover
+... !^\s+handover
  handover 0
-... !handover
+... !^\s+handover
  bts 0
-... !handover
+... !^\s+handover
   handover 0
-... !handover
+... !^\s+handover
  bts 1
-... !handover
+... !^\s+handover
   handover1 power budget interval 23
-... !handover
+... !^\s+handover
 
 OsmoBSC(config-net)# ### Remove the global setting, i.e. use the factory default net level, with same effect:
 OsmoBSC(config-net)# handover default
@@ -89,15 +89,15 @@
 OsmoBSC(config-net)# show running-config
 ...
 network
-... !handover
+... !^\s+handover
  bts 0
-... !handover
+... !^\s+handover
   handover 0
-... !handover
+... !^\s+handover
  bts 1
-... !handover
+... !^\s+handover
   handover1 power budget interval 23
-... !handover
+... !^\s+handover
 
 OsmoBSC(config-net)# ### Re-enable net-level handover, but bts 0 remains disabled explicitly
 OsmoBSC(config-net)# handover 1
@@ -108,17 +108,17 @@
 OsmoBSC(config-net)# show running-config
 ...
 network
-... !handover
+... !^\s+handover
  handover 1
-... !handover
+... !^\s+handover
  bts 0
-... !handover
+... !^\s+handover
   handover 0
-... !handover
+... !^\s+handover
  bts 1
-... !handover
+... !^\s+handover
   handover1 power budget interval 23
-... !handover
+... !^\s+handover
 
 OsmoBSC(config-net)# ### Remove explicit setting of bts 0 to also use the global setting:
 OsmoBSC(config-net)# bts 0
@@ -133,15 +133,15 @@
 OsmoBSC(config-net-bts)# show running-config
 ...
 network
-... !handover
+... !^\s+handover
  handover 1
-... !handover
+... !^\s+handover
  bts 0
-... !handover
+... !^\s+handover
  bts 1
-... !handover
+... !^\s+handover
   handover1 power budget interval 23
-... !handover
+... !^\s+handover
 
 OsmoBSC(config-net-bts)# ### Verify that 'min rxlev' value range stops at -50
 OsmoBSC(config-net-bts)# handover2 min rxlev ?

To view, visit change 28411. To unsubscribe, or for help writing mail filters, visit settings.