From 0174cd7ec96f43445dbaa2b8b200de10ff154af8 Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Thu, 22 Jun 2017 00:21:06 +0200
Subject: [PATCH] TT#17650 Use single-quotes for patterns in YAML files
Per the spec these kinds of values need to be single-quoted.
Change-Id: I7ebe85f0b8acc6e91845e1d27e2231cb0c7c0e3a
---
README | 6 +++---
disabled/invite_peerout_emergency/peer.yml | 4 ++--
disabled/invite_peerout_emergency/rewrite.yml | 8 ++++----
scenarios/incoming_hih/peer.yml | 2 +-
scenarios/incoming_peer/peer.yml | 6 +++---
scenarios/invite_blockout_ncos/ncos.yml | 2 +-
scenarios/invite_concurrent_max_out/peer.yml | 8 ++++----
.../invite_concurrent_max_out_per_account/peer.yml | 8 ++++----
scenarios/invite_peerout/peer.yml | 4 ++--
scenarios/invite_peerout_failover/peer.yml | 12 ++++++------
scenarios/invite_peerout_max_out/peer.yml | 8 ++++----
scenarios/invite_peerout_rewrite/peer.yml | 4 ++--
scenarios/invite_peerout_rewrite/rewrite.yml | 8 ++++----
scenarios/invite_peerout_rewrite_pv_regex/peer.yml | 4 ++--
.../invite_peerout_rewrite_pv_regex/rewrite.yml | 12 ++++++------
scenarios_lnp/incoming_peer/peer.yml | 6 +++---
.../incoming_peer_unallocated_authoritative/peer.yml | 2 +-
scenarios_lnp/invite/peer.yml | 4 ++--
scenarios_lnp/invite_ncos_black/ncos.yml | 4 ++--
scenarios_lnp/invite_ncos_black/peer.yml | 4 ++--
scenarios_lnp/invite_ncos_black/rewrite.yml | 4 ++--
scenarios_lnp/invite_ncos_white/ncos.yml | 4 ++--
scenarios_lnp/invite_ncos_white/peer.yml | 8 ++++----
scenarios_lnp/invite_peerout/peer.yml | 4 ++--
scenarios_lnp/invite_peerout/rewrite.yml | 4 ++--
scenarios_lnp/invite_peerout_rn/peer.yml | 4 ++--
26 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/README b/README
index 7aafaf5c..4cb1e105 100644
--- a/README
+++ b/README
@@ -248,13 +248,13 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
inboundrules:
- group_id: peer_00_group
field: "ruri_uri"
- pattern: ".*"
+ pattern: '.*'
priority: 50
enabled: 1
hosts:
diff --git a/disabled/invite_peerout_emergency/peer.yml b/disabled/invite_peerout_emergency/peer.yml
index 1da9197b..105b4ccb 100644
--- a/disabled/invite_peerout_emergency/peer.yml
+++ b/disabled/invite_peerout_emergency/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: "emergency"
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/disabled/invite_peerout_emergency/rewrite.yml b/disabled/invite_peerout_emergency/rewrite.yml
index 21a4cbc3..bee0252a 100644
--- a/disabled/invite_peerout_emergency/rewrite.yml
+++ b/disabled/invite_peerout_emergency/rewrite.yml
@@ -1,13 +1,13 @@
rw_00:
- direction: in
field: callee
- match_pattern: "^([1-9][0-9]{2})$"
- replace_pattern: "emergency_\1"
+ match_pattern: '^([1-9][0-9]{2})$'
+ replace_pattern: 'emergency_\1'
priority: 1
description: Emergency in
- direction: out
field: callee
- match_pattern: "^emergency_([1-9][0-9]+)$"
- replace_pattern: "\1"
+ match_pattern: '^emergency_([1-9][0-9]+)$'
+ replace_pattern: '\1'
priority: 1
description: Emergency out
diff --git a/scenarios/incoming_hih/peer.yml b/scenarios/incoming_hih/peer.yml
index eb0e497e..0852a726 100644
--- a/scenarios/incoming_hih/peer.yml
+++ b/scenarios/incoming_hih/peer.yml
@@ -14,7 +14,7 @@ peer_00:
inboundrules:
- group_id: peer_00_group
field: "ruri_uri"
- pattern: ".*"
+ pattern: '.*'
priority: 50
enabled: 1
hosts:
diff --git a/scenarios/incoming_peer/peer.yml b/scenarios/incoming_peer/peer.yml
index 6f2ba1ab..50f5f6c7 100644
--- a/scenarios/incoming_peer/peer.yml
+++ b/scenarios/incoming_peer/peer.yml
@@ -14,13 +14,13 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
inboundrules:
- group_id: peer_00_group
field: "ruri_uri"
- pattern: ".*"
+ pattern: '.*'
priority: 50
enabled: 1
hosts:
diff --git a/scenarios/invite_blockout_ncos/ncos.yml b/scenarios/invite_blockout_ncos/ncos.yml
index 5c761f26..b26f4ec3 100644
--- a/scenarios/invite_blockout_ncos/ncos.yml
+++ b/scenarios/invite_blockout_ncos/ncos.yml
@@ -5,5 +5,5 @@ ncos_test_00:
description: test ncos level
reseller_id: 1
patterns:
- - pattern: "^431"
+ - pattern: '^431'
description: block local area calls
diff --git a/scenarios/invite_concurrent_max_out/peer.yml b/scenarios/invite_concurrent_max_out/peer.yml
index b3a6d0ea..e95ee59c 100644
--- a/scenarios/invite_concurrent_max_out/peer.yml
+++ b/scenarios/invite_concurrent_max_out/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
@@ -40,8 +40,8 @@ peer_01:
rules:
- group_id: peer_01_group
callee_prefix: ""
- callee_pattern: "^44.+"
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: '^44.+'
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_01_group
diff --git a/scenarios/invite_concurrent_max_out_per_account/peer.yml b/scenarios/invite_concurrent_max_out_per_account/peer.yml
index b3a6d0ea..e95ee59c 100644
--- a/scenarios/invite_concurrent_max_out_per_account/peer.yml
+++ b/scenarios/invite_concurrent_max_out_per_account/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
@@ -40,8 +40,8 @@ peer_01:
rules:
- group_id: peer_01_group
callee_prefix: ""
- callee_pattern: "^44.+"
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: '^44.+'
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_01_group
diff --git a/scenarios/invite_peerout/peer.yml b/scenarios/invite_peerout/peer.yml
index 7b344450..4a462cc2 100644
--- a/scenarios/invite_peerout/peer.yml
+++ b/scenarios/invite_peerout/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios/invite_peerout_failover/peer.yml b/scenarios/invite_peerout_failover/peer.yml
index a0d48b81..98cd139c 100644
--- a/scenarios/invite_peerout_failover/peer.yml
+++ b/scenarios/invite_peerout_failover/peer.yml
@@ -20,18 +20,18 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
- group_id: peer_01_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
- group_id: peer_02_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios/invite_peerout_max_out/peer.yml b/scenarios/invite_peerout_max_out/peer.yml
index cfa75fab..55be6b2d 100644
--- a/scenarios/invite_peerout_max_out/peer.yml
+++ b/scenarios/invite_peerout_max_out/peer.yml
@@ -17,13 +17,13 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
- group_id: peer_01_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios/invite_peerout_rewrite/peer.yml b/scenarios/invite_peerout_rewrite/peer.yml
index 7b344450..4a462cc2 100644
--- a/scenarios/invite_peerout_rewrite/peer.yml
+++ b/scenarios/invite_peerout_rewrite/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios/invite_peerout_rewrite/rewrite.yml b/scenarios/invite_peerout_rewrite/rewrite.yml
index 8964cd72..f4c9dae2 100644
--- a/scenarios/invite_peerout_rewrite/rewrite.yml
+++ b/scenarios/invite_peerout_rewrite/rewrite.yml
@@ -1,13 +1,13 @@
rw_00:
- direction: in
field: callee
- match_pattern: "^(00|\+)([1-9][0-9]+)$"
- replace_pattern: "\2"
+ match_pattern: '^(00|\+)([1-9][0-9]+)$'
+ replace_pattern: '\2'
priority: 1
description: International to E.164
- direction: in
field: caller
- match_pattern: "^(00|\+)([1-9][0-9]+)$"
- replace_pattern: "\2"
+ match_pattern: '^(00|\+)([1-9][0-9]+)$'
+ replace_pattern: '\2'
priority: 1
description: International to E.164
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/peer.yml b/scenarios/invite_peerout_rewrite_pv_regex/peer.yml
index 7b344450..4a462cc2 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/peer.yml
+++ b/scenarios/invite_peerout_rewrite_pv_regex/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios/invite_peerout_rewrite_pv_regex/rewrite.yml b/scenarios/invite_peerout_rewrite_pv_regex/rewrite.yml
index 9b110e5e..279b092c 100644
--- a/scenarios/invite_peerout_rewrite_pv_regex/rewrite.yml
+++ b/scenarios/invite_peerout_rewrite_pv_regex/rewrite.yml
@@ -1,19 +1,19 @@
rw_00:
- direction: in
field: callee
- match_pattern: "^(00|\+)([1-9][0-9]+)$"
- replace_pattern: "\2"
+ match_pattern: '^(00|\+)([1-9][0-9]+)$'
+ replace_pattern: '\2'
priority: 1
description: International to E.164
- direction: in
field: caller
- match_pattern: "^(00|\+)([1-9][0-9]+)$"
- replace_pattern: "\2"
+ match_pattern: '^(00|\+)([1-9][0-9]+)$'
+ replace_pattern: '\2'
priority: 1
description: International to E.164
- direction: out
field: caller
- match_pattern: "^$avp(s:caller_cc)$avp(s:caller_ac)([1-9][0-9]+)$"
- replace_pattern: "\1"
+ match_pattern: '^$avp(s:caller_cc)$avp(s:caller_ac)([1-9][0-9]+)$'
+ replace_pattern: '\1'
priority: 1
description: E.164 to local
diff --git a/scenarios_lnp/incoming_peer/peer.yml b/scenarios_lnp/incoming_peer/peer.yml
index c2c08df4..ef6bc222 100644
--- a/scenarios_lnp/incoming_peer/peer.yml
+++ b/scenarios_lnp/incoming_peer/peer.yml
@@ -14,7 +14,7 @@ peer_00:
inboundrules:
- group_id: peer_00_group
field: "ruri_uri"
- pattern: ".*"
+ pattern: '.*'
priority: 50
enabled: 1
hosts:
@@ -40,8 +40,8 @@ peer_01:
rules:
- group_id: peer_01_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_01_group
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml b/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
index eb0e497e..0852a726 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/peer.yml
@@ -14,7 +14,7 @@ peer_00:
inboundrules:
- group_id: peer_00_group
field: "ruri_uri"
- pattern: ".*"
+ pattern: '.*'
priority: 50
enabled: 1
hosts:
diff --git a/scenarios_lnp/invite/peer.yml b/scenarios_lnp/invite/peer.yml
index 7b344450..4a462cc2 100644
--- a/scenarios_lnp/invite/peer.yml
+++ b/scenarios_lnp/invite/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios_lnp/invite_ncos_black/ncos.yml b/scenarios_lnp/invite_ncos_black/ncos.yml
index 51a80e7f..13af802f 100644
--- a/scenarios_lnp/invite_ncos_black/ncos.yml
+++ b/scenarios_lnp/invite_ncos_black/ncos.yml
@@ -5,7 +5,7 @@ ncos_black:
description: test ncos level
reseller_id: 1
patterns:
- - pattern: "^439991"
+ - pattern: '^439991'
description: block LNP call
ncos_white:
data:
@@ -14,5 +14,5 @@ ncos_white:
description: test ncos level
reseller_id: 1
patterns:
- - pattern: "^439991"
+ - pattern: '^439991'
description: allow LNP call
diff --git a/scenarios_lnp/invite_ncos_black/peer.yml b/scenarios_lnp/invite_ncos_black/peer.yml
index 7b344450..4a462cc2 100644
--- a/scenarios_lnp/invite_ncos_black/peer.yml
+++ b/scenarios_lnp/invite_ncos_black/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios_lnp/invite_ncos_black/rewrite.yml b/scenarios_lnp/invite_ncos_black/rewrite.yml
index 64c835cb..47c16ab0 100644
--- a/scenarios_lnp/invite_ncos_black/rewrite.yml
+++ b/scenarios_lnp/invite_ncos_black/rewrite.yml
@@ -1,7 +1,7 @@
rw_00:
- direction: out
field: caller
- match_pattern: "^(.+)$"
- replace_pattern: "${callee_lnp_prefix}\1"
+ match_pattern: '^(.+)$'
+ replace_pattern: '${callee_lnp_prefix}\1'
priority: 1
description: LNP prefix
diff --git a/scenarios_lnp/invite_ncos_white/ncos.yml b/scenarios_lnp/invite_ncos_white/ncos.yml
index 51a80e7f..13af802f 100644
--- a/scenarios_lnp/invite_ncos_white/ncos.yml
+++ b/scenarios_lnp/invite_ncos_white/ncos.yml
@@ -5,7 +5,7 @@ ncos_black:
description: test ncos level
reseller_id: 1
patterns:
- - pattern: "^439991"
+ - pattern: '^439991'
description: block LNP call
ncos_white:
data:
@@ -14,5 +14,5 @@ ncos_white:
description: test ncos level
reseller_id: 1
patterns:
- - pattern: "^439991"
+ - pattern: '^439991'
description: allow LNP call
diff --git a/scenarios_lnp/invite_ncos_white/peer.yml b/scenarios_lnp/invite_ncos_white/peer.yml
index 4cbf40f2..30307b9a 100644
--- a/scenarios_lnp/invite_ncos_white/peer.yml
+++ b/scenarios_lnp/invite_ncos_white/peer.yml
@@ -17,13 +17,13 @@ peer_00:
rules:
- group_id: peer_00_group0
callee_prefix: "439991"
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
- group_id: peer_00_group1
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group0
diff --git a/scenarios_lnp/invite_peerout/peer.yml b/scenarios_lnp/invite_peerout/peer.yml
index 7b344450..4a462cc2 100644
--- a/scenarios_lnp/invite_peerout/peer.yml
+++ b/scenarios_lnp/invite_peerout/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group
diff --git a/scenarios_lnp/invite_peerout/rewrite.yml b/scenarios_lnp/invite_peerout/rewrite.yml
index c94b0e5f..2f881fd3 100644
--- a/scenarios_lnp/invite_peerout/rewrite.yml
+++ b/scenarios_lnp/invite_peerout/rewrite.yml
@@ -1,7 +1,7 @@
rw_00:
- direction: lnp
field: callee
- match_pattern: "^0043([0-9]+)$"
- replace_pattern: "0043$avp(s:callee_lnp_prefix)\1"
+ match_pattern: '^0043([0-9]+)$'
+ replace_pattern: '0043$avp(s:callee_lnp_prefix)\1'
priority: 1
description: add LNP prefix
diff --git a/scenarios_lnp/invite_peerout_rn/peer.yml b/scenarios_lnp/invite_peerout_rn/peer.yml
index 7b344450..4a462cc2 100644
--- a/scenarios_lnp/invite_peerout_rn/peer.yml
+++ b/scenarios_lnp/invite_peerout_rn/peer.yml
@@ -14,8 +14,8 @@ peer_00:
rules:
- group_id: peer_00_group
callee_prefix: ""
- callee_pattern: ""
- caller_pattern: "^sip:.+@spce.test"
+ callee_pattern: ''
+ caller_pattern: '^sip:.+@spce.test'
description: ""
hosts:
- group_id: peer_00_group