From f998b1645d5aaef65926b636ea5b58a1ea8e065b Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Fri, 26 Feb 2016 13:59:36 +0100 Subject: [PATCH] MT#7571 disable invite_speeddial scenario * bin/set_preferences.pl - use rewrite_rule_set with rewrite rule set name not id Change-Id: Ia87f835b78abab3cfb04f535cccb9cd65d38ed9c --- bin/set_preferences.pl | 19 ++++--------------- .../invite_speeddial/0005_test.yml.tt2 | 0 .../invite_speeddial/0007_test.yml.tt2 | 0 .../invite_speeddial/0009_test.yml.tt2 | 0 .../invite_speeddial/0010_test.yml.tt2 | 0 .../invite_speeddial/0011_test.yml.tt2 | 0 .../invite_speeddial/0012_test.yml.tt2 | 0 .../invite_speeddial/0013_test.yml.tt2 | 0 .../invite_speeddial/0014_test.yml.tt2 | 0 .../invite_speeddial/0016_test.yml.tt2 | 0 .../invite_speeddial/0018_test.yml.tt2 | 0 .../invite_speeddial/0019_test.yml.tt2 | 0 .../invite_speeddial/0020_test.yml.tt2 | 0 .../invite_speeddial/0021_test.yml.tt2 | 0 .../invite_speeddial/0022_test.yml.tt2 | 0 .../invite_speeddial/0023_test.yml.tt2 | 0 .../invite_speeddial/0025_test.yml.tt2 | 0 .../invite_speeddial/0027_test.yml.tt2 | 0 .../invite_speeddial/0029_test.yml.tt2 | 0 .../invite_speeddial/scenario.yml | 0 .../invite_speeddial/sipp_scenario00.xml | 0 .../invite_speeddial/sipp_scenario01.xml | 0 .../invite_speeddial/sipp_scenario02.xml | 0 .../invite_speeddial/sipp_scenario03.xml | 0 .../sipp_scenario_responder00.xml | 0 .../sipp_scenario_responder01.xml | 0 .../invite_speeddial/speeddial.yml | 0 27 files changed, 4 insertions(+), 15 deletions(-) rename {scenarios => scenarios_disabled}/invite_speeddial/0005_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0007_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0009_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0010_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0011_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0012_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0013_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0014_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0016_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0018_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0019_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0020_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0021_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0022_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0023_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0025_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0027_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/0029_test.yml.tt2 (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/scenario.yml (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/sipp_scenario00.xml (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/sipp_scenario01.xml (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/sipp_scenario02.xml (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/sipp_scenario03.xml (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/sipp_scenario_responder00.xml (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/sipp_scenario_responder01.xml (100%) rename {scenarios => scenarios_disabled}/invite_speeddial/speeddial.yml (100%) diff --git a/bin/set_preferences.pl b/bin/set_preferences.pl index 206ccf2a..8418c472 100755 --- a/bin/set_preferences.pl +++ b/bin/set_preferences.pl @@ -88,9 +88,9 @@ sub set_subscriber_preferences print Dumper $res; } if($res) { - print "prefs created for ${subscriber}\@${domain}\n"; + print "prefs created for ${subscriber}\@${domain} [$subs_id]\n"; } else { - die("Error: pref failed for ${subscriber}\@${domain}"); + die("Error: pref failed for ${subscriber}\@${domain} [$subs_id]"); } } else { @@ -119,7 +119,7 @@ sub set_domain_preferences print Dumper $res; } if($res) { - print "prefs created for ${domain}\n"; + print "prefs created for ${domain} [$domain_id]\n"; } else { die("Error: pref failed for ${domain}"); } @@ -150,7 +150,7 @@ sub set_peer_preferences print Dumper($res); } if($res) { - print "prefs created for ${name}\n"; + print "prefs created for ${name} [$peer_id]\n"; } else { die("Error: pref failed for ${name}"); } @@ -169,17 +169,6 @@ sub main { for my $key (keys %{$prefs}) { print "processing $key\n"; - if (exists($prefs->{$key}->{rewrite_rule_set})) - { - my $param = { reseller_id => 1, - name => $prefs->{$key}->{rewrite_rule_set} }; - my $rule_set_id = $api->check_rewriteruleset_exists($param); - if (defined $rule_set_id) { - $prefs->{$key}->{rewriteruleset_id} = $rule_set_id; - } else { - die("Error: No rewrite_rule_set:$prefs->{$key}->{rewrite_rule_set} found"); - } - } if ( $key =~ /@/ ) { my @fields = split /@/, $key; if (!$fields[0]) { diff --git a/scenarios/invite_speeddial/0005_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0005_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0005_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0005_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0007_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0007_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0007_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0007_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0009_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0009_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0009_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0009_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0010_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0010_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0010_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0010_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0011_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0011_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0011_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0011_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0012_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0012_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0012_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0012_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0013_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0013_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0013_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0013_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0014_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0014_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0014_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0014_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0016_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0016_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0016_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0016_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0018_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0018_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0018_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0018_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0019_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0019_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0019_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0019_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0020_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0020_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0020_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0020_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0021_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0021_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0021_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0021_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0022_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0022_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0022_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0022_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0023_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0023_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0023_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0023_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0025_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0025_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0025_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0025_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0027_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0027_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0027_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0027_test.yml.tt2 diff --git a/scenarios/invite_speeddial/0029_test.yml.tt2 b/scenarios_disabled/invite_speeddial/0029_test.yml.tt2 similarity index 100% rename from scenarios/invite_speeddial/0029_test.yml.tt2 rename to scenarios_disabled/invite_speeddial/0029_test.yml.tt2 diff --git a/scenarios/invite_speeddial/scenario.yml b/scenarios_disabled/invite_speeddial/scenario.yml similarity index 100% rename from scenarios/invite_speeddial/scenario.yml rename to scenarios_disabled/invite_speeddial/scenario.yml diff --git a/scenarios/invite_speeddial/sipp_scenario00.xml b/scenarios_disabled/invite_speeddial/sipp_scenario00.xml similarity index 100% rename from scenarios/invite_speeddial/sipp_scenario00.xml rename to scenarios_disabled/invite_speeddial/sipp_scenario00.xml diff --git a/scenarios/invite_speeddial/sipp_scenario01.xml b/scenarios_disabled/invite_speeddial/sipp_scenario01.xml similarity index 100% rename from scenarios/invite_speeddial/sipp_scenario01.xml rename to scenarios_disabled/invite_speeddial/sipp_scenario01.xml diff --git a/scenarios/invite_speeddial/sipp_scenario02.xml b/scenarios_disabled/invite_speeddial/sipp_scenario02.xml similarity index 100% rename from scenarios/invite_speeddial/sipp_scenario02.xml rename to scenarios_disabled/invite_speeddial/sipp_scenario02.xml diff --git a/scenarios/invite_speeddial/sipp_scenario03.xml b/scenarios_disabled/invite_speeddial/sipp_scenario03.xml similarity index 100% rename from scenarios/invite_speeddial/sipp_scenario03.xml rename to scenarios_disabled/invite_speeddial/sipp_scenario03.xml diff --git a/scenarios/invite_speeddial/sipp_scenario_responder00.xml b/scenarios_disabled/invite_speeddial/sipp_scenario_responder00.xml similarity index 100% rename from scenarios/invite_speeddial/sipp_scenario_responder00.xml rename to scenarios_disabled/invite_speeddial/sipp_scenario_responder00.xml diff --git a/scenarios/invite_speeddial/sipp_scenario_responder01.xml b/scenarios_disabled/invite_speeddial/sipp_scenario_responder01.xml similarity index 100% rename from scenarios/invite_speeddial/sipp_scenario_responder01.xml rename to scenarios_disabled/invite_speeddial/sipp_scenario_responder01.xml diff --git a/scenarios/invite_speeddial/speeddial.yml b/scenarios_disabled/invite_speeddial/speeddial.yml similarity index 100% rename from scenarios/invite_speeddial/speeddial.yml rename to scenarios_disabled/invite_speeddial/speeddial.yml