TT#116100 bin/scenario.pl: add alias info to csv

Change-Id: Id38dfe44c12dd0e32e268c501b8c6f54fa036f6e
mr9.5.1
Victor Seva 4 years ago
parent e738085679
commit ac24a71c53

@ -119,6 +119,7 @@ sub manage_phones
$ids->{$key_dom}->{$subs}->{ac} = $subs_data->{ac} = $phone_ac; $ids->{$key_dom}->{$subs}->{ac} = $subs_data->{ac} = $phone_ac;
$ids->{$key_dom}->{$subs}->{sn} = $subs_data->{sn} = $phone_sn++; $ids->{$key_dom}->{$subs}->{sn} = $subs_data->{sn} = $phone_sn++;
$ids->{$key_dom}->{$subs}->{phone_number} = $subs_data->{cc} . $subs_data->{ac} . $subs_data->{sn}; $ids->{$key_dom}->{$subs}->{phone_number} = $subs_data->{cc} . $subs_data->{ac} . $subs_data->{sn};
$subs_data->{phone_number} = $ids->{$key_dom}->{$subs}->{phone_number};
} }
foreach my $subs (sort keys %{$data->{subscribers}->{$domain}}) { foreach my $subs (sort keys %{$data->{subscribers}->{$domain}}) {
my $subs_data = $data->{subscribers}->{$domain}->{$subs}; my $subs_data = $data->{subscribers}->{$domain}->{$subs};
@ -176,9 +177,13 @@ sub get_subs_info
} else { } else {
$data->{devid} = $username; $data->{devid} = $username;
$data->{auth_username} = $username; $data->{auth_username} = $username;
eval { $data->{number} = $subs->{cc}.$subs->{ac}.$subs->{sn}; } unless defined($presence); eval { $data->{number} = $subs->{phone_number}; } unless defined($presence);
} }
$data->{'pbx_extension'} = $subs->{'pbx_extension'}; $data->{'pbx_extension'} = $subs->{'pbx_extension'};
$data->{alias} = [];
foreach (@{$subs->{alias_numbers}}) {
push(@{$data->{alias}}, $_->{phone_number});
}
} }
else else
{ {
@ -279,6 +284,7 @@ sub generate
} catch { } catch {
$scen->{devid} = $scen->{username}; $scen->{devid} = $scen->{username};
$scen->{auth_username} = $scen->{username}; $scen->{auth_username} = $scen->{username};
$scen->{alias} = [];
}; };
$scen->{password} = "" unless defined($scen->{password}); $scen->{password} = "" unless defined($scen->{password});
# by default proto is udp # by default proto is udp
@ -289,10 +295,23 @@ sub generate
$scen->{password} = "wrongpass"; $scen->{password} = "wrongpass";
} }
my $auth = "[authentication username=$scen->{auth_username} password=$scen->{password}]"; my $auth = "[authentication username=$scen->{auth_username} password=$scen->{password}]";
my $csv_data = [$scen->{devid}, $auth, $scen->{domain}, $test_uuid, $scen->{'pbx_extension'}]; my $csv_data = [
$scen->{devid},
$auth,
$scen->{domain},
$test_uuid,
$scen->{'pbx_extension'},
@{$scen->{alias}}, # must be the last one!!
];
$csv->{caller}->print($io_caller, $csv_data); $csv->{caller}->print($io_caller, $csv_data);
network_data($scen); network_data($scen);
$csv_data = ["sipp_scenario".sprintf("%02i", $id).".xml", $scen->{proto}, $scen->{ip}, $scen->{port}, $scen->{mport}]; $csv_data = [
"sipp_scenario".sprintf("%02i", $id).".xml",
$scen->{proto},
$scen->{ip},
$scen->{port},
$scen->{mport},
];
$csv->{scenario}->print($io_scenario, $csv_data); $csv->{scenario}->print($io_scenario, $csv_data);
foreach my $resp (@{$scen->{responders}}) foreach my $resp (@{$scen->{responders}})
{ {
@ -304,6 +323,7 @@ sub generate
} else { } else {
$resp->{devid} = $resp->{username}; $resp->{devid} = $resp->{username};
$resp->{auth_username} = $resp->{username}; $resp->{auth_username} = $resp->{username};
$resp->{alias} = [];
} }
$resp->{password} = "" unless defined($resp->{password}); $resp->{password} = "" unless defined($resp->{password});
# by default responder is active # by default responder is active
@ -313,7 +333,15 @@ sub generate
# by default proto is udp # by default proto is udp
$resp->{proto} = "udp" unless defined($resp->{proto}); $resp->{proto} = "udp" unless defined($resp->{proto});
$auth = "[authentication username=$resp->{auth_username} password=$resp->{password}]"; $auth = "[authentication username=$resp->{auth_username} password=$resp->{password}]";
$csv_data = [$resp->{devid}, $resp->{number}, $auth, $resp->{domain}, $test_uuid, $resp->{'pbx_extension'}]; $csv_data = [
$resp->{devid},
$resp->{number},
$auth,
$resp->{domain},
$test_uuid,
$resp->{'pbx_extension'},
@{$resp->{alias}}, # must be the last one!!
];
$csv->{callee}->print($io_callee, $csv_data); $csv->{callee}->print($io_callee, $csv_data);
$csv_data = [ $csv_data = [
"sipp_scenario_responder".sprintf("%02i", $res_id).".xml", "sipp_scenario_responder".sprintf("%02i", $res_id).".xml",

Loading…
Cancel
Save