pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email )
Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare
......................................................................
stp: ipa: Introduce test TC_combinedlset_loadshare
Test combined linkset loadsharing on IPA AS.
Change-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247
Related: SYS#7112
---
M stp/STP_Tests_IPA.cfg
M stp/STP_Tests_IPA.ttcn
M stp/expected-results.xml
M stp/osmo-stp-ipa.confmerge
4 files changed, 152 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/30/40530/1
diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg
index 9e9538e..8f6c24a 100644
--- a/stp/STP_Tests_IPA.cfg
+++ b/stp/STP_Tests_IPA.cfg
@@ -62,6 +62,20 @@
local_port := 20007
},
{
+ asp_name := "ipa-asp-LS0-0-0",
+ as_name := "ipa-as-LS0-0",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20010
+ },
+ {
+ asp_name := "ipa-asp-LS0-1-0",
+ as_name := "ipa-as-LS0-1",
+ is_server := false,
+ remote_port := 5000,
+ local_port := 20011
+ },
+ {
asp_name := "ipa-asp-client0",
as_name := "ipa-as-client0",
is_server := true,
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 3fb0ace..e619144 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -425,8 +425,8 @@
"ipa-asp-loadshare-receiver1"
};
var IpaConfigs ipa_configs := ipa_build_configs(asps);
if (unknwon_dynamic_asp) {
- ipa_configs[0].local_port := 3010;
- ipa_configs[1].local_port := 3011;
+ ipa_configs[0].local_port := 9998;
+ ipa_configs[1].local_port := 9999;
}
f_init_ipa(ipa_configs := ipa_configs);
@@ -528,6 +528,114 @@
f_tc_tmt_loadshare_sls(true);
}
+/* Test AS Loadsharing, (distributing traffic within linksets/ASs of a
combined linkset).
+ * STP routing table is configured with 1 combined linkset towards PC 32 mask
/14 with 2
+ * AS routes ("ipa-as-LS0-0", "ipa-as-LS0-1") with same priority, each using 1
+ * ASP ("ipa-asp-LS0-0-0", "ipa-asp-LS0-1-0").
+ * We take advantage of the fact that AS "ipa-as-loadshare-receiver" is never
used
+ * to transmit in other tests and use it here for the routing of its configured
+ * "point-code override dpc 32" towards the "ipa-as-LS0-{0,1}" in the STP
config.
+ */
+private function f_tc_combinedlset_loadshare(boolean unknwon_dynamic_asp)
+runs on IPA_CT {
+ var integer i;
+
+ var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-receiver0",
+ "ipa-asp-loadshare-receiver1",
+ "ipa-asp-LS0-0-0",
+ "ipa-asp-LS0-1-0" };
+ var IpaConfigs ipa_configs := ipa_build_configs(asps);
+ if (unknwon_dynamic_asp) {
+ ipa_configs[0].local_port := 9998;
+ ipa_configs[1].local_port := 9999;
+ }
+
+ f_init_ipa(ipa_configs := ipa_configs);
+
+ /* bring up the 'sender' side (single ASP in AS) */
+ f_connect_ipa(0);
+ /* activate the first 'receiver' side ASP */
+ f_connect_ipa(2);
+
+ /* verify traffic is routed from sender to [sole] receiver */
+ for (i := 0; i < 10; i := i+1) {
+ f_test_traffic(0, 2);
+ }
+
+ /* activate the second 'receiver' side ASP */
+ f_connect_ipa(3);
+
+ /* verify traffic is routed from sender to new receiver */
+ const integer iter_per_asp := 20;
+ const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */
+ var integer num_rx_1 := 0;
+ var integer num_rx_2 := 0;
+ var Integers sls_num_rx_1 := {};
+ var Integers sls_num_rx_2 := {};
+ for (i := 0; i < NUM_SLS; i := i + 1) {
+ sls_num_rx_1 := sls_num_rx_1 & {0};
+ sls_num_rx_2 := sls_num_rx_2 & {0};
+ }
+ for (i := 0; i < iter_per_asp; i := i+1) {
+ var octetstring data := f_SCCP_UDT();
+ f_IPA_send(0, data);
+ alt {
+ [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1);
+ [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2);
+ }
+ }
+
+ /* All traffic should still be sent to the same receiver, since
+ * OPC+DPC+SLS cannot change in IPA ASPs.
+ * However, depending on how the SLS seed tables were allocated, it can
+ * be that STP was routing through Alternative Route and now that the
+ * 2nd receiver is up it is now routing to it (Normal Route). Account
+ * for both scenarios. */
+ if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 ==
iter_per_asp and num_rx_1 == 0))) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected
all traffic through same receiver!");
+ }
+
+
+ /* activate the second 'sender' side ASP */
+ f_connect_ipa(1);
+
+ num_rx_1 := 0;
+ num_rx_2 := 0;
+ sls_num_rx_1 := {};
+ sls_num_rx_2 := {};
+ for (i := 0; i < NUM_SLS; i := i + 1) {
+ sls_num_rx_1 := sls_num_rx_1 & {0};
+ sls_num_rx_2 := sls_num_rx_2 & {0};
+ }
+ for (i := 0; i < 2*iter_per_asp; i := i+1) {
+ var octetstring data := f_SCCP_UDT();
+ f_IPA_send(i mod 2, data);
+ alt {
+ [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1);
+ [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2);
+ }
+ }
+ /* Make sure traffic was sent over both ASPs and that it was
distributed: */
+ if (num_rx_1 == 0) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0
packets in 1st ASP!");
+ }
+ if (num_rx_2 == 0) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0
packets in 2nd ASP!");
+ }
+ if (num_rx_1 + num_rx_2 != 2*iter_per_asp) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Rx ", num_rx_1 + num_rx_2 ,"
packets in total vs exp ", 2*iter_per_asp));
+ }
+ setverdict(pass);
+}
+testcase TC_combinedlset_loadshare() runs on IPA_CT {
+ f_tc_combinedlset_loadshare(false);
+}
+/* same as above, with "accept-asp-connections dynamic-permitted" and clients
from unknown ASPs */
+testcase TC_unknown_client_dynamic_combinedlset_loadshare() runs on IPA_CT {
+ f_tc_combinedlset_loadshare(true);
+}
+
private function f_IPA_ping(integer idx) runs on IPA_CT
{
var IpaCcmMsgtype ipa_ping_msg := IPAC_MSGT_PING;
@@ -641,6 +749,8 @@
execute( TC_tmt_loadshare_roundrobin() );
execute( TC_tmt_loadshare_sls() );
execute( TC_unknown_client_dynamic_tmt_loadshare() );
+ execute( TC_combinedlset_loadshare() );
+ execute( TC_unknown_client_dynamic_combinedlset_loadshare() );
execute( TC_beat() );
execute( TC_beat_timeout() );
diff --git a/stp/expected-results.xml b/stp/expected-results.xml
index 646ca7b..91115d9 100644
--- a/stp/expected-results.xml
+++ b/stp/expected-results.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<testsuite name='STP_Tests' tests='60' failures='0' errors='0' skipped='0'
inconc='0' time='MASKED'>
+<testsuite name='STP_Tests' tests='62' failures='0' errors='0' skipped='0'
inconc='0' time='MASKED'>
<testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/>
<testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/>
@@ -59,6 +59,8 @@
<testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin'
time='MASKED'/>
<testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls'
time='MASKED'/>
<testcase classname='STP_Tests_IPA'
name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/>
+ <testcase classname='STP_Tests_IPA' name='TC_combinedlset_loadshare'
time='MASKED'/>
+ <testcase classname='STP_Tests_IPA'
name='TC_unknown_client_dynamic_combinedlset_loadshare' time='MASKED'/>
<testcase classname='STP_Tests_IPA' name='TC_beat' time='MASKED'/>
<testcase classname='STP_Tests_IPA' name='TC_beat_timeout' time='MASKED'/>
<testcase classname='STP_Tests_IPA' name='TC_clnt_beat_timeout'
time='MASKED'/>
diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge
index 954f175..ef95384 100644
--- a/stp/osmo-stp-ipa.confmerge
+++ b/stp/osmo-stp-ipa.confmerge
@@ -53,6 +53,26 @@
point-code override dpc 34
asp ipa-asp-override-receiver0
asp ipa-asp-override-receiver1
+ ! CombinedLinkset-loadsharing AS(P)s:
+ asp ipa-asp-LS0-0-0 20010 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ asp ipa-asp-LS0-1-0 20011 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ as ipa-as-LS0-0 ipa
+ point-code override dpc 38
+ routing-key 0 44
+ asp ipa-asp-LS0-0-0
+ as ipa-as-LS0-1 ipa
+ point-code override dpc 39
+ routing-key 0 45
+ asp ipa-asp-LS0-1-0
+ ! CLIENT
asp ipa-asp-client0 6001 7001 ipa
local-ip 127.0.0.1
remote-ip 127.0.0.1
@@ -68,6 +88,9 @@
!
route-table system
update route 31 16777215 linkset ipa-as-loadshare-receiver
+ ! These 2 below are used in TC_combinedlset_loadshare to route traffic from
ipa-as-loadshare-receiver towards:
+ update route 32 16777215 linkset ipa-as-LS0-0 priority 6
+ update route 32 16777215 linkset ipa-as-LS0-1 priority 6
update route 33 16777215 linkset ipa-as-override-receiver
!
!SERVERS:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247
Gerrit-Change-Number: 40530
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
