pespin submitted this change.
stp: Initial split into several testenv config
As a first step, split the generic config into 3 configs, one per
module.
The idea is to have a different config for a given set of related tests
running on a specific network topology/setup.
This helps in simplifying the test conditions, which allows easily
adding new topologies to test, validate specific scenarios or debug
existing ones.
For instance, to test Combined linkset loadsharing, we'll need to set up
some sort of scenario where we have at least 2 AS with each at least 1
ASP.
Change-Id: I4ec8e1bbc8e71d8bd421dfbd5356bf1937ce2bb4
---
A stp/STP_Tests_IPA.cfg
M stp/STP_Tests_IPA.ttcn
A stp/STP_Tests_IPA_M3UA.cfg
M stp/STP_Tests_IPA_M3UA.ttcn
A stp/STP_Tests_M3UA.cfg
M stp/STP_Tests_M3UA.ttcn
A stp/osmo-stp-ipa-m3ua.confmerge
A stp/osmo-stp-ipa.confmerge
A stp/osmo-stp-m3ua.confmerge
M stp/osmo-stp.cfg
D stp/testenv.cfg
A stp/testenv_ipa-m3ua.cfg
A stp/testenv_ipa.cfg
A stp/testenv_m3ua.cfg
14 files changed, 442 insertions(+), 277 deletions(-)
diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg
new file mode 100644
index 0000000..d1ab417
--- /dev/null
+++ b/stp/STP_Tests_IPA.cfg
@@ -0,0 +1,28 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./STP_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+STP_Tests_IPA.mp_ipa_as_names := {
+ "ipa-as-loadshare-sender",
+ "ipa-as-loadshare-sender",
+ "ipa-as-loadshare-receiver",
+ "ipa-as-loadshare-receiver",
+ "ipa-as-dynamic-asp",
+ "ipa-as-override-sender",
+ "ipa-as-override-receiver",
+ "ipa-as-override-receiver"
+};
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+STP_Tests_IPA.control
diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn
index 3e484cb..5fb8423 100644
--- a/stp/STP_Tests_IPA.ttcn
+++ b/stp/STP_Tests_IPA.ttcn
@@ -43,15 +43,7 @@
charstring mp_local_ipa_ip := "127.0.0.1";
integer mp_stp_ipa_port := 5000;
integer mp_local_ipa_port := 20000;
- AspNameArray mp_ipa_as_names := {"ipa-as-loadshare-sender",
- "ipa-as-loadshare-sender",
- "ipa-as-loadshare-receiver",
- "ipa-as-loadshare-receiver",
- "ipa-as-dynamic-asp",
- "ipa-as-override-sender",
- "ipa-as-override-receiver",
- "ipa-as-override-receiver"
- };
+ AspNameArray mp_ipa_as_names := {};
}
type component IPA_CT extends Test_CT {
diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg
new file mode 100644
index 0000000..be16ccf
--- /dev/null
+++ b/stp/STP_Tests_IPA_M3UA.cfg
@@ -0,0 +1,38 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./STP_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+STP_Tests_IPA.mp_ipa_as_names := {
+ "ipa-as-dynamic-asp"
+};
+
+/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
+STP_Tests_M3UA.mp_m3ua_configs := {
+ /* as-sender: One ASP within AS */
+ {
+ asp_name := "asp-sender",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 23,
+ routing_ctx := 1023
+ }
+ };
+/* number of M3UA clients in ATS */
+STP_Tests_M3UA.mp_m3ua_num_clients := 1;
+/* number of M3UA servers in ATS */
+STP_Tests_M3UA.mp_m3ua_num_servers := 0;
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+STP_Tests_IPA_M3UA.control
diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn
index 08ca5aa..4fcd506 100644
--- a/stp/STP_Tests_IPA_M3UA.ttcn
+++ b/stp/STP_Tests_IPA_M3UA.ttcn
@@ -65,12 +65,15 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
var OCT4 rctx_sender := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
var OCT4 pc_sender := int2oct(f_m3ua_cli_config(0).point_code, 4);
var OCT4 pc_receiver := int2oct(5, 4);
- f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, rctx_sender);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_sender);
/* send a well-formed, encoded SCCP message via M3UA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -80,10 +83,10 @@
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
var template (value) M3UA_Protocol_Data tx_pd;
tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc);
- f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1);
+ f_M3UA_send(m3ua_idx, ts_M3UA_DATA(rctx_sender, tx_pd), 1);
/* expect to receive it via IPA */
- f_IPA_exp(4, sccp_enc);
+ f_IPA_exp(ipa_idx, sccp_enc);
f_clear_m3ua();
}
@@ -97,12 +100,15 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
var OCT4 pc_sender := int2oct(5, 4);
var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4);
- f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, rctx_receiver);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -110,12 +116,12 @@
var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H));
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
- f_IPA_send(4, sccp_enc);
+ f_IPA_send(ipa_idx, sccp_enc);
/* expect to receive it via M3UA */
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, sccp_enc);
- f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_clear_m3ua();
}
@@ -130,12 +136,15 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
var OCT4 pc_sender := int2oct(5, 4);
var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4);
- f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, rctx_receiver);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
@@ -144,13 +153,13 @@
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
var octetstring sccp_enc := enc_PDU_SCCP(sccp);
f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national");
- f_IPA_send(4, sccp_enc);
+ f_IPA_send(ipa_idx, sccp_enc);
/* expect to receive it via M3UA */
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, c_M3UA_NI_NATIONAL,
'00'O, ?, sccp_enc);
- f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator international");
f_clear_m3ua();
}
@@ -165,19 +174,22 @@
f_init_m3ua();
f_init_ipa();
+ const integer ipa_idx := 0;
+ const integer m3ua_idx := 0;
+
var OCT4 pc_sender := int2oct(5, 4);
var OCT4 rctx_receiver := int2oct(f_m3ua_cli_config(0).routing_ctx, 4);
var OCT4 pc_receiver := int2oct(f_m3ua_cli_config(0).point_code, 4);
- f_connect_ipa(4);
- f_M3UA_asp_up_act(0, omit, rctx_receiver);
+ f_connect_ipa(ipa_idx);
+ f_M3UA_asp_up_act(m3ua_idx, omit, rctx_receiver);
/* send a well-formed, encoded SCCP message via IPA */
var octetstring data := f_rnd_octstring_rnd_len(100);
var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H));
var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H));
var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data));
- f_IPA_send(4, enc_PDU_SCCP(sccp));
+ f_IPA_send(ipa_idx, enc_PDU_SCCP(sccp));
/* patch point codes into addresses */
called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H));
@@ -188,7 +200,7 @@
var template (present) M3UA_Protocol_Data rx_pd;
rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?,
enc_PDU_SCCP(sccp_exp));
- f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd));
+ f_M3UA_exp(m3ua_idx, tr_M3UA_DATA(rctx_receiver, rx_pd));
f_clear_m3ua();
}
diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg
new file mode 100644
index 0000000..d5894a1
--- /dev/null
+++ b/stp/STP_Tests_M3UA.cfg
@@ -0,0 +1,95 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"../Common.cfg"
+# testsuite specific configuration, not expected to change
+"./STP_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+
+[MODULE_PARAMETERS]
+/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
+STP_Tests_M3UA.mp_m3ua_configs := {
+ /* as-sender: One ASP within AS */
+ {
+ asp_name := "asp-sender",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 23,
+ routing_ctx := 1023
+ },
+ /* as-receiver: Two ASP within AS */
+ {
+ asp_name := "asp-receiver0",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 10000,
+ point_code := 42,
+ routing_ctx := 1042
+ }, {
+ asp_name := "asp-receiver1",
+ use_tcp := false,
+ remote_port := 2905,
+ local_port := 10001,
+ point_code := 42,
+ routing_ctx := 1042
+ },
+ /* as-sender-tcp: One ASP within AS */
+ {
+ asp_name := "asp-sender-tcp",
+ use_tcp := true,
+ remote_port := 2905,
+ local_port := 9999,
+ point_code := 123,
+ routing_ctx := 1123
+ },
+ /* as-client: One ASP within AS */
+ {
+ asp_name := "asp-client0",
+ use_tcp := false,
+ remote_port := 2906,
+ local_port := 10002,
+ point_code := 55,
+ routing_ctx := 1055
+ },
+ /* as-client60-norctx */
+ {
+ asp_name := "asp-client60-norctx0",
+ use_tcp := false,
+ remote_port := 2907,
+ local_port := 11060,
+ point_code := 60,
+ routing_ctx := -
+ },
+ /* as-client61-norctx */
+ {
+ asp_name := "asp-client61-norctx0",
+ use_tcp := false,
+ remote_port := 2907,
+ local_port := 11061,
+ point_code := 61,
+ routing_ctx := -
+ },
+ /* as-client-tcp: One ASP within AS */
+ {
+ asp_name := "asp-client0-tcp",
+ use_tcp := true,
+ remote_port := 2906,
+ local_port := 10002,
+ point_code := 155,
+ routing_ctx := 1155
+ }
+ };
+/* number of M3UA clients in ATS */
+STP_Tests_M3UA.mp_m3ua_num_clients := 4;
+/* number of M3UA servers in ATS */
+STP_Tests_M3UA.mp_m3ua_num_servers := 4;
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+STP_Tests_M3UA.control
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index eddd0b1..a78dec5 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -45,82 +45,11 @@
/* local IP addresses */
HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" };
/* Clients first, servers afterwards, match mp_m3ua_num_{clients,servers} */
- M3uaConfigs mp_m3ua_configs := {
- /* as-sender: One ASP within AS */
- {
- asp_name := "asp-sender",
- use_tcp := false,
- remote_port := 2905,
- local_port := 9999,
- point_code := 23,
- routing_ctx := 1023
- },
- /* as-receiver: Two ASP within AS */
- {
- asp_name := "asp-receiver0",
- use_tcp := false,
- remote_port := 2905,
- local_port := 10000,
- point_code := 42,
- routing_ctx := 1042
- }, {
- asp_name := "asp-receiver1",
- use_tcp := false,
- remote_port := 2905,
- local_port := 10001,
- point_code := 42,
- routing_ctx := 1042
- },
- /* as-sender-tcp: One ASP within AS */
- {
- asp_name := "asp-sender-tcp",
- use_tcp := true,
- remote_port := 2905,
- local_port := 9999,
- point_code := 123,
- routing_ctx := 1123
- },
- /* as-client: One ASP within AS */
- {
- asp_name := "asp-client0",
- use_tcp := false,
- remote_port := 2906,
- local_port := 10002,
- point_code := 55,
- routing_ctx := 1055
- },
- /* as-client60-norctx */
- {
- asp_name := "asp-client60-norctx0",
- use_tcp := false,
- remote_port := 2907,
- local_port := 11060,
- point_code := 60,
- routing_ctx := -
- },
- /* as-client61-norctx */
- {
- asp_name := "asp-client61-norctx0",
- use_tcp := false,
- remote_port := 2907,
- local_port := 11061,
- point_code := 61,
- routing_ctx := -
- },
- /* as-client-tcp: One ASP within AS */
- {
- asp_name := "asp-client0-tcp",
- use_tcp := true,
- remote_port := 2906,
- local_port := 10002,
- point_code := 155,
- routing_ctx := 1155
- }
- };
+ M3uaConfigs mp_m3ua_configs := {};
/* number of M3UA clients in ATS */
- integer mp_m3ua_num_clients := 4;
+ integer mp_m3ua_num_clients := 0;
/* number of M3UA servers in ATS */
- integer mp_m3ua_num_servers := 4;
+ integer mp_m3ua_num_servers := 0;
integer mp_recovery_timeout_msec := 2000;
charstring mp_sccp_service_type := "mtp3_itu";
}
diff --git a/stp/osmo-stp-ipa-m3ua.confmerge b/stp/osmo-stp-ipa-m3ua.confmerge
new file mode 100644
index 0000000..ce3123b
--- /dev/null
+++ b/stp/osmo-stp-ipa-m3ua.confmerge
@@ -0,0 +1,36 @@
+cs7 instance 0
+ !
+ !M3UA AS/ASP:
+ !
+ asp asp-sender 9999 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ as as-sender m3ua
+ asp asp-sender
+ routing-key 1023 23
+ !
+ ! IPA DYNAMIC AS:
+ !
+ as ipa-as-dynamic-asp ipa
+ routing-key 0 5
+ point-code override dpc 23
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+ update route 23 16777215 linkset as-sender
+ route-table system
+ update route 5 16777215 linkset ipa-as-dynamic-asp
+ !
+ !SERVERS:
+ !
+ listen m3ua 2905
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
+ listen ipa 5000
+ accept-asp-connections dynamic-permitted
diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge
new file mode 100644
index 0000000..712e2a9
--- /dev/null
+++ b/stp/osmo-stp-ipa.confmerge
@@ -0,0 +1,72 @@
+cs7 instance 0
+ !
+ ! IPA AS/ASP:
+ !
+ asp ipa-asp-loadshare-sender0 20000 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ asp ipa-asp-loadshare-sender1 20001 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ as ipa-as-loadshare-sender ipa
+ routing-key 0 6
+ point-code override dpc 31
+ asp ipa-asp-loadshare-sender0
+ asp ipa-asp-loadshare-sender1
+ asp ipa-asp-loadshare-receiver0 20002 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ asp ipa-asp-loadshare-receiver1 20003 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ as ipa-as-loadshare-receiver ipa
+ traffic-mode loadshare
+ routing-key 0 7
+ point-code override dpc 32
+ asp ipa-asp-loadshare-receiver0
+ asp ipa-asp-loadshare-receiver1
+ ! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
+ ! OVERRIDE:
+ asp ipa-asp-override-sender 20005 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ as ipa-as-override-sender ipa
+ routing-key 0 6
+ point-code override dpc 33
+ asp ipa-asp-override-sender
+ asp ipa-asp-override-receiver0 20006 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ asp ipa-asp-override-receiver1 20007 5000 ipa
+ local-ip 127.0.0.1
+ remote-ip 127.0.0.1
+ role sg
+ sctp-role server
+ as ipa-as-override-receiver ipa
+ traffic-mode override
+ routing-key 0 8
+ point-code override dpc 34
+ asp ipa-asp-override-receiver0
+ asp ipa-asp-override-receiver1
+ ! DYNAMIC AS:
+ as ipa-as-dynamic-asp ipa
+ routing-key 0 5
+ point-code override dpc 23
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+ update route 31 16777215 linkset ipa-as-loadshare-receiver
+ update route 33 16777215 linkset ipa-as-override-receiver
+ update route 5 16777215 linkset ipa-as-dynamic-asp
+ !
+ !SERVERS:
+ !
+ listen ipa 5000
+ accept-asp-connections dynamic-permitted
diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge
new file mode 100644
index 0000000..2140553
--- /dev/null
+++ b/stp/osmo-stp-m3ua.confmerge
@@ -0,0 +1,108 @@
+cs7 instance 0
+ !
+ ! M3UA-TCP AS/ASP:
+ !
+ asp asp-sender-tcp 9999 2905 m3ua tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ transport-role server
+ asp asp-client0-tcp 10002 2906 m3ua tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ transport-role client
+ as as-sender-tcp m3ua
+ asp asp-sender-tcp
+ routing-key 1123 123
+ as as-client-tcp m3ua
+ routing-key 1155 155
+ asp asp-client0-tcp
+ !
+ !M3UA AS/ASP:
+ !
+ asp asp-sender 9999 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ asp asp-receiver0 10000 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ asp asp-receiver1 10001 2905 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role sg
+ sctp-role server
+ asp asp-client0 10002 2906 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ sctp-role client
+ asp asp-client60-norctx0 11060 2907 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ sctp-role client
+ asp asp-client61-norctx0 11061 2907 m3ua
+ local-ip 127.0.0.1
+ local-ip ::1
+ remote-ip 127.0.0.1
+ remote-ip ::1
+ role asp
+ sctp-role client
+ as as-sender m3ua
+ asp asp-sender
+ routing-key 1023 23
+ as as-receiver m3ua
+ asp asp-receiver0
+ asp asp-receiver1
+ routing-key 1042 42
+ as as-client m3ua
+ routing-key 1055 55
+ asp asp-client0
+ as as-client60-norctx m3ua
+ routing-key 0 60
+ asp asp-client60-norctx0
+ as as-client61-norctx m3ua
+ routing-key 0 61
+ asp asp-client61-norctx0
+ !
+ ! ROUTING TABLE:
+ !
+ route-table system
+ update route 123 16777215 linkset as-sender-tcp
+ update route 155 16777215 linkset as-client-tcp
+ route-table system
+ update route 23 16777215 linkset as-sender
+ update route 42 16777215 linkset as-receiver
+ update route 55 16777215 linkset as-client
+ update route 60 16777215 linkset as-client60-norctx
+ update route 61 16777215 linkset as-client61-norctx
+ !
+ !SERVERS:
+ !
+ listen m3ua 2905 tcp
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
+ listen m3ua 2905
+ local-ip 127.0.0.1
+ local-ip ::1
+ accept-asp-connections dynamic-permitted
diff --git a/stp/osmo-stp.cfg b/stp/osmo-stp.cfg
index 355bf20..241382d 100644
--- a/stp/osmo-stp.cfg
+++ b/stp/osmo-stp.cfg
@@ -24,171 +24,3 @@
!
cs7 instance 0
point-code format 24
- asp asp-sender-tcp 9999 2905 m3ua tcp
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- transport-role server
- asp asp-client0-tcp 10002 2906 m3ua tcp
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- transport-role client
- as as-sender-tcp m3ua
- asp asp-sender-tcp
- routing-key 1123 123
- as as-client-tcp m3ua
- routing-key 1155 155
- asp asp-client0-tcp
- route-table system
- update route 123 16777215 linkset as-sender-tcp
- update route 155 16777215 linkset as-client-tcp
- listen m3ua 2905 tcp
- local-ip 127.0.0.1
- local-ip ::1
- accept-asp-connections dynamic-permitted
-!
-!M3UA AS/ASP:
-!
- asp asp-sender 9999 2905 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- sctp-role server
- asp asp-receiver0 10000 2905 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- sctp-role server
- asp asp-receiver1 10001 2905 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role sg
- sctp-role server
- asp asp-client0 10002 2906 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- sctp-role client
- asp asp-client60-norctx0 11060 2907 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- sctp-role client
- asp asp-client61-norctx0 11061 2907 m3ua
- local-ip 127.0.0.1
- local-ip ::1
- remote-ip 127.0.0.1
- remote-ip ::1
- role asp
- sctp-role client
- as as-sender m3ua
- asp asp-sender
- routing-key 1023 23
- as as-receiver m3ua
- asp asp-receiver0
- asp asp-receiver1
- routing-key 1042 42
- as as-client m3ua
- routing-key 1055 55
- asp asp-client0
- as as-client60-norctx m3ua
- routing-key 0 60
- asp asp-client60-norctx0
- as as-client61-norctx m3ua
- routing-key 0 61
- asp asp-client61-norctx0
-!
-! IPA AS/ASP:
-!
- asp ipa-asp-loadshare-sender0 20000 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- asp ipa-asp-loadshare-sender1 20001 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- as ipa-as-loadshare-sender ipa
- routing-key 0 6
- point-code override dpc 31
- asp ipa-asp-loadshare-sender0
- asp ipa-asp-loadshare-sender1
- asp ipa-asp-loadshare-receiver0 20002 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- asp ipa-asp-loadshare-receiver1 20003 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- as ipa-as-loadshare-receiver ipa
- traffic-mode loadshare
- routing-key 0 7
- point-code override dpc 32
- asp ipa-asp-loadshare-receiver0
- asp ipa-asp-loadshare-receiver1
-! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3.
-! OVERRIDE:
- asp ipa-asp-override-sender 20005 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- as ipa-as-override-sender ipa
- routing-key 0 6
- point-code override dpc 33
- asp ipa-asp-override-sender
- asp ipa-asp-override-receiver0 20006 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- asp ipa-asp-override-receiver1 20007 5000 ipa
- local-ip 127.0.0.1
- remote-ip 127.0.0.1
- role sg
- sctp-role server
- as ipa-as-override-receiver ipa
- traffic-mode override
- routing-key 0 8
- point-code override dpc 34
- asp ipa-asp-override-receiver0
- asp ipa-asp-override-receiver1
-! DYNAMIC AS:
- as ipa-as-dynamic-asp ipa
- routing-key 0 5
- point-code override dpc 23
-!
-! ROUTING TABLE:
-!
- route-table system
- update route 23 16777215 linkset as-sender
- update route 42 16777215 linkset as-receiver
- update route 55 16777215 linkset as-client
- update route 60 16777215 linkset as-client60-norctx
- update route 61 16777215 linkset as-client61-norctx
- update route 31 16777215 linkset ipa-as-loadshare-receiver
- update route 33 16777215 linkset ipa-as-override-receiver
- update route 5 16777215 linkset ipa-as-dynamic-asp
-!
-!SERVERS:
-!
- listen m3ua 2905
- local-ip 127.0.0.1
- local-ip ::1
- accept-asp-connections dynamic-permitted
- listen ipa 5000
- accept-asp-connections dynamic-permitted
diff --git a/stp/testenv.cfg b/stp/testenv.cfg
deleted file mode 100644
index a0f14e1..0000000
--- a/stp/testenv.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-[testsuite]
-program=STP_Tests
-config=STP_Tests.cfg
-
-[stp]
-program=osmo-stp
-make=libosmo-sigtran
-package=osmo-stp
-copy=osmo-stp.cfg
-vty_port=4239
diff --git a/stp/testenv_ipa-m3ua.cfg b/stp/testenv_ipa-m3ua.cfg
new file mode 100644
index 0000000..144e6a9
--- /dev/null
+++ b/stp/testenv_ipa-m3ua.cfg
@@ -0,0 +1,11 @@
+[testsuite]
+program=STP_Tests
+config=STP_Tests_IPA_M3UA.cfg
+
+[stp]
+prepare=osmo-config-merge osmo-stp.cfg osmo-stp-ipa-m3ua.confmerge > osmo-stp-ipa-m3ua.cfg
+program=osmo-stp -c osmo-stp-ipa-m3ua.cfg
+make=libosmo-sigtran
+package=osmo-stp libosmocore-utils
+copy=osmo-stp.cfg osmo-stp-ipa-m3ua.confmerge
+vty_port=4239
diff --git a/stp/testenv_ipa.cfg b/stp/testenv_ipa.cfg
new file mode 100644
index 0000000..91320e1
--- /dev/null
+++ b/stp/testenv_ipa.cfg
@@ -0,0 +1,11 @@
+[testsuite]
+program=STP_Tests
+config=STP_Tests_IPA.cfg
+
+[stp]
+prepare=osmo-config-merge osmo-stp.cfg osmo-stp-ipa.confmerge > osmo-stp-ipa.cfg
+program=osmo-stp -c osmo-stp-ipa.cfg
+make=libosmo-sigtran
+package=osmo-stp libosmocore-utils
+copy=osmo-stp.cfg osmo-stp-ipa.confmerge
+vty_port=4239
diff --git a/stp/testenv_m3ua.cfg b/stp/testenv_m3ua.cfg
new file mode 100644
index 0000000..d645d4d
--- /dev/null
+++ b/stp/testenv_m3ua.cfg
@@ -0,0 +1,11 @@
+[testsuite]
+program=STP_Tests
+config=STP_Tests_M3UA.cfg
+
+[stp]
+prepare=osmo-config-merge osmo-stp.cfg osmo-stp-m3ua.confmerge > osmo-stp-m3ua.cfg
+program=osmo-stp -c osmo-stp-m3ua.cfg
+make=libosmo-sigtran
+package=osmo-stp libosmocore-utils
+copy=osmo-stp.cfg osmo-stp-m3ua.confmerge
+vty_port=4239
To view, visit change 40323. To unsubscribe, or for help writing mail filters, visit settings.