pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41426?usp=email )
Change subject: Configure all ttcn-3 SCCP endpoints to match IUT ss7
network-indicator
......................................................................
Configure all ttcn-3 SCCP endpoints to match IUT ss7 network-indicator
Most of the configs were so far configured to use Network Indicator
"National Network", while our osmocom IUT programs are by default
configured to use "International Network".
Since libosmo-sigtran.git 875198f4914a2d59667deee9d1c1c4ce6e5e1129 the
NI is validated at the rx path, so tests started failing and showed
wrong configs were being used.
Change-Id: I32d36dbb294632c340df3dba2a0f249189449699
---
M SCCP_Test/SCCP_Testcases.cfg
M SCCP_Test/SCCP_Testcases.ttcn
M bsc/BSC_Tests.default
M bsc/BSC_Tests.ttcn
M bsc/BSC_Tests_SCCPlite.cfg
M hnbgw/HNBGW_Tests.default
M library/IPA_Emulation.ttcnpp
M msc/MSC_Tests.default
M sccp/SCCP_Tests.default
M sgsn/SGSN_Tests.default
M smlc/SMLC_Tests.cfg
M smlc/SMLC_Tests.ttcn
M stp/STP_Tests_TCAP.cfg
13 files changed, 35 insertions(+), 35 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/SCCP_Test/SCCP_Testcases.cfg b/SCCP_Test/SCCP_Testcases.cfg
index 9920cf0..1548346 100644
--- a/SCCP_Test/SCCP_Testcases.cfg
+++ b/SCCP_Test/SCCP_Testcases.cfg
@@ -37,7 +37,7 @@
SCCP_Testcases.tsp_own_GT := '14377760'H
SCCP_Testcases.tsp_remote_GT := '14375760'H
SCCP_Testcases.tsp_SSN := 1 //8:MSC 5:MAP see 3.4.2.2/Q.713
-SCCP_Testcases.tsp_SIO := '83'O //SCCP national
+SCCP_Testcases.tsp_SIO := '03'O // NI=International, SI=SCCP
SCCP_Testcases.tsp_own_SPC := 23
SCCP_Testcases.tsp_remote_SPC := 1// max value on 14 bits
SCCP_Testcases.tsp_SLS := 0
diff --git a/SCCP_Test/SCCP_Testcases.ttcn b/SCCP_Test/SCCP_Testcases.ttcn
index bf93380..ed53c6a 100644
--- a/SCCP_Test/SCCP_Testcases.ttcn
+++ b/SCCP_Test/SCCP_Testcases.ttcn
@@ -41,7 +41,7 @@
hexstring tsp_own_GT := '0614377760'H;
hexstring tsp_remote_GT := '0614375760'H;
integer tsp_SSN := 2; //8:MSC 5:MAP see 3.4.2.2/Q.713
- octetstring tsp_SIO := '83'O;//SCCP national
+ octetstring tsp_SIO := '03'O; //NI=International, SI=SCCP
integer tsp_own_SPC := 461087; // =0x07091E
integer tsp_remote_SPC := 461086; // =0x07091D
integer tsp_SLS := 0;
diff --git a/bsc/BSC_Tests.default b/bsc/BSC_Tests.default
index fe5ec86..e23cdea 100644
--- a/bsc/BSC_Tests.default
+++ b/bsc/BSC_Tests.default
@@ -53,7 +53,7 @@
own_ssn := 254,
peer_pc := 187, # 0.23.3 osmo-bsc
peer_ssn := 254,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1
}
},
@@ -71,7 +71,7 @@
own_ssn := 254,
peer_pc := 187,# 0.23.3 osmo-bsc
peer_ssn := 254,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 2
}
},
@@ -89,7 +89,7 @@
own_ssn := 254,
peer_pc := 187, # 0.23.3 osmo-bsc
peer_ssn := 254,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 3
}
}
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index ef3867b..11e8784 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -709,7 +709,7 @@
own_ssn := 252, /* SMLC side SSN */
peer_pc := 187, /* 0.23.3 osmo-bsc */
peer_ssn := 250, /* BSC side SSN */
- sio := '83'O,
+ sio := '03'O, /* NI=International, SI=SCCP */
rctx := 6
};
boolean mp_enable_lcs_tests := true;
diff --git a/bsc/BSC_Tests_SCCPlite.cfg b/bsc/BSC_Tests_SCCPlite.cfg
index 7e5b4b2..e254379 100644
--- a/bsc/BSC_Tests_SCCPlite.cfg
+++ b/bsc/BSC_Tests_SCCPlite.cfg
@@ -30,7 +30,7 @@
own_ssn := 254,
peer_pc := 187, # 0.23.3 osmo-bsc
peer_ssn := 254,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
}
diff --git a/hnbgw/HNBGW_Tests.default b/hnbgw/HNBGW_Tests.default
index 5cafb12..5fa13d4 100644
--- a/hnbgw/HNBGW_Tests.default
+++ b/hnbgw/HNBGW_Tests.default
@@ -49,7 +49,7 @@
own_ssn := 142,
peer_pc := 189, # 0.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1
}
},
@@ -67,7 +67,7 @@
own_ssn := 142,
peer_pc := 189, # 0.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 3
}
},
@@ -85,7 +85,7 @@
own_ssn := 142,
peer_pc := 189, # 0.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 5
}
},
@@ -103,7 +103,7 @@
own_ssn := 142,
peer_pc := 189, # 0.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 7
}
},
@@ -122,7 +122,7 @@
own_ssn := 142,
peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 2
}
},
@@ -140,7 +140,7 @@
own_ssn := 142,
peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 4
}
},
@@ -158,7 +158,7 @@
own_ssn := 142,
peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 6
}
},
@@ -176,7 +176,7 @@
own_ssn := 142,
peer_pc := 189, # 2237, 1.23.5 osmo-hnbgw
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 8
}
}
diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp
index 9105f41..1c9f28b 100644
--- a/library/IPA_Emulation.ttcnpp
+++ b/library/IPA_Emulation.ttcnpp
@@ -375,7 +375,7 @@
#ifdef IPA_EMULATION_SCCP
template ASP_MTP3_TRANSFERind ts_MTP3_XFER_ind(integer opc, octetstring data)
:= {
- sio := { '10'B, '00'B, '0011'B },
+ sio := { '00'B, '00'B, '0011'B },
opc := opc,
dpc := 0,
sls := 0,
diff --git a/msc/MSC_Tests.default b/msc/MSC_Tests.default
index 61fa94c..0b8c8e6 100644
--- a/msc/MSC_Tests.default
+++ b/msc/MSC_Tests.default
@@ -59,7 +59,7 @@
own_ssn := 254,
peer_pc := 185,
peer_ssn := 254,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
},
@@ -77,7 +77,7 @@
own_ssn := 254,
peer_pc := 185,
peer_ssn := 254,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1
}
},
@@ -95,7 +95,7 @@
own_ssn := 142,
peer_pc := 185,
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 2
}
}
diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default
index 6dda647..417af49 100644
--- a/sccp/SCCP_Tests.default
+++ b/sccp/SCCP_Tests.default
@@ -24,7 +24,7 @@
own_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
peer_pc := 1,
peer_ssn := 202, /* sscp_test_server.c: SSN_TEST_ECHO */
- sio := '03'O, /* NI=Internal, SCCP */
+ sio := '03'O, /* NI=International, SCCP */
rctx := 0
}
};
diff --git a/sgsn/SGSN_Tests.default b/sgsn/SGSN_Tests.default
index 330dc1b..9081b5f 100644
--- a/sgsn/SGSN_Tests.default
+++ b/sgsn/SGSN_Tests.default
@@ -54,7 +54,7 @@
own_ssn := 142,
peer_pc := 188, # 0.23.4
peer_ssn := 142,
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 2
}
}
diff --git a/smlc/SMLC_Tests.cfg b/smlc/SMLC_Tests.cfg
index f1a7001..05b4aa1 100644
--- a/smlc/SMLC_Tests.cfg
+++ b/smlc/SMLC_Tests.cfg
@@ -24,7 +24,7 @@
own_ssn := 250, /* BSC side SSN */
peer_pc := 190, /* 0.23.6 osmo-smlc */
peer_ssn := 252, /* SMLC side SSN */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1
}
};
diff --git a/smlc/SMLC_Tests.ttcn b/smlc/SMLC_Tests.ttcn
index 671f483..393d69f 100644
--- a/smlc/SMLC_Tests.ttcn
+++ b/smlc/SMLC_Tests.ttcn
@@ -108,7 +108,7 @@
own_ssn := 250, /* BSC side SSN */
peer_pc := 190, /* 0.23.6 osmo-smlc */
peer_ssn := 252, /* SMLC side SSN */
- sio := '83'O,
+ sio := '03'O, /* NI=International, SI=SCCP */
rctx := 1
}
};
diff --git a/stp/STP_Tests_TCAP.cfg b/stp/STP_Tests_TCAP.cfg
index 0ba90d7..a096d26 100644
--- a/stp/STP_Tests_TCAP.cfg
+++ b/stp/STP_Tests_TCAP.cfg
@@ -28,7 +28,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 5,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1000
}
},
@@ -47,7 +47,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 5,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1000
}
},
@@ -67,7 +67,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 25,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1001
}
},
@@ -86,7 +86,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 25,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1001
}
},
@@ -106,7 +106,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 24,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1002
}
},
@@ -125,7 +125,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 24,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 1002
}
},
@@ -147,7 +147,7 @@
own_ssn := 6, /* HLR (MAP) */
peer_pc := 23,
peer_ssn := 8, /* MSC (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
},
@@ -168,7 +168,7 @@
own_ssn := 6, /* HLR (MAP) */
peer_pc := 23,
peer_ssn := 8, /* MSC (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
},
@@ -190,7 +190,7 @@
own_ssn := 6, /* HLR (MAP) */
peer_pc := 7,
peer_ssn := 8, /* MSC (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
},
@@ -211,7 +211,7 @@
own_ssn := 6, /* HLR (MAP) */
peer_pc := 7,
peer_ssn := 8, /* MSC (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
},
@@ -233,7 +233,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 6,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
},
@@ -254,7 +254,7 @@
own_ssn := 8, /* MSC (MAP) */
peer_pc := 6,
peer_ssn := 6, /* HLR (MAP) */
- sio := '83'O,
+ sio := '03'O, # NI=International, SI=SCCP
rctx := 0
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41426?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I32d36dbb294632c340df3dba2a0f249189449699
Gerrit-Change-Number: 41426
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
