acouzens
/
osmo-ttcn3-hacks
forked from ttcn3/osmo-ttcn3-hacks
1
0
Fork 0
Code Pull Requests Activity

PCUIF: upgrade to PCUIF v12 

We have added an additional bts_model field to the PCUIF_info_ind. This
also means that we have to increment the PCUIF version number since
adding fields is a major change to the protocol. This patch updates the
related TTCN3 record and also increments the PCUIF version number.

Related: OS#6191
Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047
Change-Id: Ib1516e66c70f021adee49f41bd707803fc06f9cf
This commit is contained in:
Philipp Maier 2023-11-01 16:55:45 +01:00 committed by dexter
parent 9e3c233c7a
commit e0666ea5bc
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bts/BTS_Tests.default
View File

@ -29,7 +29,7 @@ mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC;
[MODULE_PARAMETERS]
Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS";
PCUIF_Types.mp_pcuif_version := 11;
PCUIF_Types.mp_pcuif_version := 12;
# Configuration for each individual transceiver
BTS_Tests.mp_trx_pars := {

21
library/PCUIF_Types.ttcn
View File

@ -17,11 +17,11 @@ import from Native_Functions all;
modulepar {
/* PCUIF version supported by the IUT */
PCUIF_Version mp_pcuif_version := 11;
PCUIF_Version mp_pcuif_version := 12;
};
const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts";
type integer PCUIF_Version (9..11); /* supported versions */
type integer PCUIF_Version (9..12); /* supported versions */
type enumerated PCUIF_MsgType {
PCU_IF_MSG_DATA_REQ ('00'O),
@ -78,6 +78,16 @@ type record PCUIF_Flags {
BIT3 spare2
} with { variant "" };
type enumerated PCUIF_bts_model {
PCU_IF_BTS_MODEL_UNSPEC ('00'O),
PCU_IF_BTS_MODEL_LC15 ('01'O),
PCU_IF_BTS_MODEL_OC2G ('02'O),
PCU_IF_BTS_MODEL_OCTPHY ('03'O),
PCU_IF_BTS_MODEL_SYSMO ('04'O),
PCU_IF_BTS_MODEL_TRX ('05'O),
PCU_IF_BTS_MODEL_RBS ('06'O)
} with { variant "FIELDLENGTH(8)" };
type enumerated PCUIF_TextType {
PCU_VERSION (0),
PCU_OML_ALERT (1)
@ -200,7 +210,9 @@ type record PCUIF_info_ind {
record length(2) of uint16_t nsvci,
record length(2) of uint16_t local_port,
record length(2) of uint16_t remote_port,
PCUIF_RemoteAddr remote_addr
PCUIF_RemoteAddr remote_addr,
PCUIF_bts_model bts_model
} with { variant "" };
type enumerated PCUIF_AddrType {
@ -979,7 +991,8 @@ template PCUIF_Message tr_PCUIF_INFO_IND(template uint8_t bts_nr := ?,
nsvci := ?,
local_port := ?,
remote_port := ?,
remote_addr := ?
remote_addr := ?,
bts_model := ?
}
}
}

2
pcu/PCU_Tests.default
View File

@ -29,7 +29,7 @@ SGSN_Components.mp_gb_cfg := {
}
};
Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU";
PCUIF_Types.mp_pcuif_version := 11;
PCUIF_Types.mp_pcuif_version := 12;
[TESTPORT_PARAMETERS]
*.PCU.socket_type := "SEQPACKET"

3
pcu/PCU_Tests.ttcn
View File

@ -111,7 +111,8 @@ friend template (value) PCUIF_info_ind ts_PCUIF_INFO_default(template (value) PC
local_port := { mp_nsconfig.nsvc[0].provider.ip.remote_udp_port, 0 },
remote_port := { mp_nsconfig.nsvc[0].provider.ip.local_udp_port, 0 },
remote_addr := f_PCUIF_RemoteAddr(
f_PCUIF_AF2addr_type(mp_nsconfig.nsvc[0].provider.ip.address_family), mp_nsconfig.nsvc[0].provider.ip.local_ip)
f_PCUIF_AF2addr_type(mp_nsconfig.nsvc[0].provider.ip.address_family), mp_nsconfig.nsvc[0].provider.ip.local_ip),
bts_model := PCU_IF_BTS_MODEL_UNSPEC
}
/* Passed in RAN-INFO message from emulated neighbor using RIM */

2
pcu/PCU_Tests_SNS.cfg
View File

@ -54,7 +54,7 @@ SGSN_Components.mp_nsconfig := {
}
}
}
PCUIF_Types.mp_pcuif_version := 11
PCUIF_Types.mp_pcuif_version := 12
[TESTPORT_PARAMETERS]

2
pcu/PCU_Tests_SNSv6.cfg
View File

@ -26,7 +26,7 @@ SGSN_Components.mp_nsconfig := {
}
}
}
PCUIF_Types.mp_pcuif_version := 11
PCUIF_Types.mp_pcuif_version := 12
[TESTPORT_PARAMETERS]