From 710f8b7a8b6bf9eadcbde3ab4e65de896e3315b5 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 26 Oct 2022 14:34:55 +0200 Subject: [PATCH] TT#81700 bin/generate_test_tt2.py: support mr9.5 * in older releases we don't have server_ip info in scenarios_ids.yml Change-Id: If2909103a3792f956b6dadf6952b052dcd114fb4 --- bin/generate_test_tt2.py | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/bin/generate_test_tt2.py b/bin/generate_test_tt2.py index 7e469e17..748fd6e4 100755 --- a/bin/generate_test_tt2.py +++ b/bin/generate_test_tt2.py @@ -104,7 +104,10 @@ class Generator: def generate_rules(self, ids) -> list: rules = [] id_dom = ids["domains"][0] - server_ip = ids["server_ip"] + try: + server_ip = ids["server_ip"] + except KeyError: + server_ip = False def sip_rule(subs, tt, field): str_val = str(subs[field]) @@ -209,24 +212,24 @@ class Generator: ) ) - # server_ip rules - rules.append( - ( - r";socket=(sip|udp|tcp):{}:5060".format(server_ip), - r";socket=\1:[% server_ip %]:5060", + if server_ip: + rules.append( + ( + r";socket=(sip|udp|tcp):{}:5060".format(server_ip), + r";socket=\1:[% server_ip %]:5060", + ) + ) + rules.append( + (r"sip:([^@]+@){}".format(server_ip), r"sip:\1[% server_ip %]") ) - ) - rules.append( - (r"sip:([^@]+@){}".format(server_ip), r"sip:\1[% server_ip %]") - ) - rules.append((r"sip:{}".format(server_ip), f"sip:[% server_ip %]")) - rules.append( - ( - r"(udp|tcp):{}:5060".format(server_ip), - r"\1:[% server_ip %]:5060", + rules.append((r"sip:{}".format(server_ip), f"sip:[% server_ip %]")) + rules.append( + ( + r"(udp|tcp):{}:5060".format(server_ip), + r"\1:[% server_ip %]:5060", + ) ) - ) - sdp_rule(server_ip, "server_ip") + sdp_rule(server_ip, "server_ip") # priority on full match for idx, scen in enumerate(ids["scenarios"]):