- gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pySim-shell: improve command "desc"
by laforge 17 Sep '24

17 Sep '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38194?usp=email ) Change subject: pySim-shell: improve command "desc" ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/38194/comment/6f7c0e21_a5ac505e?usp=em… : PS1, Line 783: self._cmd.poutput(" actual_size: %s" % str(self._cmd.lchan.selected_file_size())) one might also add the total/max file size of a BerTlvEF here. (can be a separate patch in the future). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38194?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98e139ba2bf35df5524245cdd96f5c52cf09b986 Gerrit-Change-Number: 38194 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 17:59:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: runtime: add new API functions to get the record len and file size
by laforge 17 Sep '24

17 Sep '24

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38193?usp=email ) Change subject: runtime: add new API functions to get the record len and file size ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ica7811c04161d8098b40c7219ed6b939df716cfd Gerrit-Change-Number: 38193 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 17 Sep 2024 17:55:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: pySim-shell: improve command "desc"
by dexter 17 Sep '24

17 Sep '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38194?usp=email ) Change subject: pySim-shell: improve command "desc" ...................................................................... pySim-shell: improve command "desc" The "desc" command displays a string with a file description, let's also display some size information as part of the description as well. Related: OS#5714 Change-Id: I98e139ba2bf35df5524245cdd96f5c52cf09b986 --- M pySim-shell.py 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/94/38194/1 diff --git a/pySim-shell.py b/pySim-shell.py index 7db77f0..cabe2aa 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -56,7 +56,7 @@ from pySim.utils import sanitize_pin_adm, tabulate_str_list, boxed_heading_str, dec_iccid, sw_match from pySim.card_handler import CardHandler, CardHandlerAuto -from pySim.filesystem import CardMF, CardEF, CardDF, CardADF +from pySim.filesystem import CardMF, CardEF, CardDF, CardADF, LinFixedEF, TransparentEF from pySim.ts_102_221 import pin_names from pySim.ts_102_222 import Ts102222Commands from pySim.gsm_r import DF_EIRENE @@ -766,9 +766,21 @@ """Display human readable file description for the currently selected file""" desc = self._cmd.lchan.selected_file.desc if desc: - self._cmd.poutput(desc) + self._cmd.poutput("%s: %s" % (self._cmd.lchan.selected_file, desc)) else: - self._cmd.poutput("no description available") + self._cmd.poutput("%s: no description available" % self._cmd.lchan.selected_file) + self._cmd.poutput(" file structure: %s" % self._cmd.lchan.selected_file_structure()) + if isinstance(self._cmd.lchan.selected_file, LinFixedEF): + self._cmd.poutput(" record length:") + self._cmd.poutput(" minimum_length: %s" % str(self._cmd.lchan.selected_file.rec_len[0])) + self._cmd.poutput(" recommended_length: %s" % str(self._cmd.lchan.selected_file.rec_len[1])) + self._cmd.poutput(" actual_length: %s" % str(self._cmd.lchan.selected_file_record_len())) + self._cmd.poutput(" number of records: %s" % str(self._cmd.lchan.selected_file_num_of_rec())) + elif isinstance(self._cmd.lchan.selected_file, TransparentEF): + self._cmd.poutput(" file size:") + self._cmd.poutput(" minimum_size: %s" % str(self._cmd.lchan.selected_file.size[0])) + self._cmd.poutput(" recommended_size: %s" % str(self._cmd.lchan.selected_file.size[1])) + self._cmd.poutput(" actual_size: %s" % str(self._cmd.lchan.selected_file_size())) verify_adm_parser = argparse.ArgumentParser() verify_adm_parser.add_argument('--pin-is-hex', action='store_true', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38194?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I98e139ba2bf35df5524245cdd96f5c52cf09b986 Gerrit-Change-Number: 38194 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: runtime: add new API functions to get the record len and file size
by dexter 17 Sep '24

17 Sep '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38193?usp=email ) Change subject: runtime: add new API functions to get the record len and file size ...................................................................... runtime: add new API functions to get the record len and file size We have an API function to get the number of records, let's now also add API functions to get the record length and the overall size of the currently selected file. Related: OS#5714 Change-Id: Ica7811c04161d8098b40c7219ed6b939df716cfd --- M pySim/runtime.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/93/38193/1 diff --git a/pySim/runtime.py b/pySim/runtime.py index b903ccb..898008e 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -211,6 +211,12 @@ def selected_file_num_of_rec(self) -> Optional[int]: return self.selected_file_fcp['file_descriptor'].get('num_of_rec') + def selected_file_record_len(self) -> Optional[int]: + return self.selected_file_fcp['file_descriptor'].get('record_len') + + def selected_file_size(self) -> Optional[int]: + return self.selected_file_fcp.get('file_size') + def get_cwd(self) -> CardDF: """Obtain the current working directory. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ica7811c04161d8098b40c7219ed6b939df716cfd Gerrit-Change-Number: 38193 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in pysim[master]: filesystem: pass total_len to construct of when encoding file contents
by dexter 17 Sep '24

17 Sep '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38195?usp=email ) Change subject: filesystem: pass total_len to construct of when encoding file contents ...................................................................... filesystem: pass total_len to construct of when encoding file contents In our construct models we frequently use a context parameter "total_len", we also pass this parameter to construct when we decode files, but we do not pass it when we generate files. This is a problem, because when total_len is used in the construct model, this parameter must be known also when decoding the file. Let's make sure that the total_len is properly determined and and passed to construct (via pyosmocom) Related: OS#5714 Change-Id: I1b7a51594fbc5d9fe01132c39354a2fa88d53f9b --- M pySim/filesystem.py M pySim/runtime.py M requirements.txt 3 files changed, 36 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/38195/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 43a72f2..5258569 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -179,7 +179,7 @@ """Return a dict of {'identifier': self} tuples. Args: - alias : Add an alias with given name to 'self' + alias : Add an alias with given name to 'self' flags : Specify which selectables to return 'FIDS' and/or 'NAMES'; If not specified, all selectables will be returned. Returns: @@ -743,7 +743,17 @@ return t.to_dict() return {'raw': raw_bin_data.hex()} - def encode_bin(self, abstract_data: dict) -> bytearray: + def _get_size(self, total_len : int = None): + if total_len is not None: + return {"total_len" : total_len} + elif self.size[1] is not None: + return {"total_len" : self.size[1]} + elif self.size[0] is not None: + return {"total_len" : self.size[0]} + else: + return {"total_len" : None} + + def encode_bin(self, abstract_data: dict, total_len : int = None) -> bytearray: """Encode abstract representation into raw (binary) data. A derived class would typically provide an _encode_bin() or _encode_hex() method @@ -762,7 +772,7 @@ if callable(method): return h2b(method(abstract_data)) if self._construct: - return build_construct(self._construct, abstract_data) + return build_construct(self._construct, abstract_data, self._get_size(total_len)) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -770,7 +780,7 @@ raise NotImplementedError( "%s encoder not yet implemented. Patches welcome." % self) - def encode_hex(self, abstract_data: dict) -> str: + def encode_hex(self, abstract_data: dict, total_len : int = None) -> str: """Encode abstract representation into raw (hex string) data. A derived class would typically provide an _encode_bin() or _encode_hex() method @@ -790,7 +800,7 @@ raw_bin_data = method(abstract_data) return b2h(raw_bin_data) if self._construct: - return b2h(build_construct(self._construct, abstract_data)) + return b2h(build_construct(self._construct, abstract_data, self._get_size(total_len))) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1030,7 +1040,17 @@ return t.to_dict() return {'raw': raw_hex_data} - def encode_record_hex(self, abstract_data: dict, record_nr: int) -> str: + def __get_rec_len(self, total_len : int = None): + if total_len is not None: + return {"total_len" : total_len} + elif self.rec_len[1] is not None: + return {"total_len" : self.rec_len[1]} + elif self.rec_len[0] is not None: + return {"total_len" : self.rec_len[0]} + else: + return {"total_len" : None} + + def encode_record_hex(self, abstract_data: dict, record_nr: int, total_len: int = None) -> str: """Encode abstract representation into raw (hex string) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1051,7 +1071,7 @@ raw_bin_data = method(abstract_data, record_nr=record_nr) return b2h(raw_bin_data) if self._construct: - return b2h(build_construct(self._construct, abstract_data)) + return b2h(build_construct(self._construct, abstract_data, self.__get_rec_len(total_len))) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1059,7 +1079,7 @@ raise NotImplementedError( "%s encoder not yet implemented. Patches welcome." % self) - def encode_record_bin(self, abstract_data: dict, record_nr : int) -> bytearray: + def encode_record_bin(self, abstract_data: dict, record_nr : int, total_len : int = None) -> bytearray: """Encode abstract representation into raw (binary) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1079,7 +1099,7 @@ if callable(method): return h2b(method(abstract_data, record_nr=record_nr)) if self._construct: - return build_construct(self._construct, abstract_data) + return build_construct(self._construct, abstract_data, self.__get_rec_len(total_len)) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1224,7 +1244,7 @@ return t.to_dict() return {'raw': raw_hex_data} - def encode_record_hex(self, abstract_data: dict) -> str: + def encode_record_hex(self, abstract_data: dict, total_len : int = None) -> str: """Encode abstract representation into raw (hex string) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1243,7 +1263,7 @@ if callable(method): return b2h(method(abstract_data)) if self._construct: - return b2h(filter_dict(build_construct(self._construct, abstract_data))) + return b2h(filter_dict(build_construct(self._construct, abstract_data, self._get_size(total_len)))) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) @@ -1251,7 +1271,7 @@ raise NotImplementedError( "%s encoder not yet implemented. Patches welcome." % self) - def encode_record_bin(self, abstract_data: dict) -> bytearray: + def encode_record_bin(self, abstract_data: dict, total_len : int = None) -> bytearray: """Encode abstract representation into raw (binary) data. A derived class would typically provide an _encode_record_bin() or _encode_record_hex() @@ -1270,7 +1290,7 @@ if callable(method): return h2b(method(abstract_data)) if self._construct: - return filter_dict(build_construct(self._construct, abstract_data)) + return filter_dict(build_construct(self._construct, abstract_data, self._get_size(total_len))) if self._tlv: t = self._tlv() if inspect.isclass(self._tlv) else self._tlv t.from_dict(abstract_data) diff --git a/pySim/runtime.py b/pySim/runtime.py index 898008e..5281857 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -518,7 +518,7 @@ Args: data : abstract data which is to be encoded and written """ - data_hex = self.selected_file.encode_hex(data) + data_hex = self.selected_file.encode_hex(data, self.selected_file_size()) return self.update_binary(data_hex) def read_record(self, rec_nr: int = 0): @@ -568,7 +568,7 @@ rec_nr : Record number to read data_hex : Abstract data to be written """ - data_hex = self.selected_file.encode_record_hex(data, rec_nr) + data_hex = self.selected_file.encode_record_hex(data, rec_nr, self.selected_file_record_len()) return self.update_record(rec_nr, data_hex) def retrieve_data(self, tag: int = 0): diff --git a/requirements.txt b/requirements.txt index 99fd5f9..25e3654 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ jsonpath-ng construct>=2.9.51 bidict -pyosmocom>=0.0.2 +pyosmocom>=0.0.3 pyyaml>=5.1 termcolor colorlog -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38195?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1b7a51594fbc5d9fe01132c39354a2fa88d53f9b Gerrit-Change-Number: 38195 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in pysim[master]: ts_51_011: replace encoding of EF.MSISDN with construct model
by dexter 17 Sep '24

17 Sep '24

Attention is currently required from: dexter, laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ts_51_011: replace encoding of EF.MSISDN with construct model ...................................................................... ts_51_011: replace encoding of EF.MSISDN with construct model The encoding of EF.MSISDN is currently done with enc_msisdn and dec_msisdn from utils.py. Let's replace this with a construct based model, similar to the one we already use with EF.ADN Related: OS#5714 Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a --- M pySim/ts_51_011.py 1 file changed, 17 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/17/38117/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a Gerrit-Change-Number: 38117 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/s1ap: add E-RAB RELEASE templates
by laforge 17 Sep '24

17 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38144?usp=email ) Change subject: library/s1ap: add E-RAB RELEASE templates ...................................................................... library/s1ap: add E-RAB RELEASE templates Change-Id: I2e9305da80934ea68e3eca8215a9c16de48b37fd --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 236 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 60dd063..4f0b5ee 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1200,4 +1200,240 @@ } } +/* 9.1.3.5 E-RAB RELEASE COMMAND */ +template (value) S1AP_PDU +ts_S1AP_RABReleaseCmd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABList rab_items) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeReleasedList, + criticality := ignore, + value_ := { e_RABList := rab_items } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABReleaseCmd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABList rab_items := ?) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeReleasedList, + criticality := ignore, + value_ := { e_RABList := rab_items } + } + } + } + } + } +} + +/* 9.1.3.6 E-RAB RELEASE RESPONSE */ +template (value) S1AP_PDU +ts_S1AP_RABReleaseRsp(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABReleaseListBearerRelComp rab_items) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { e_RABReleaseListBearerRelComp := rab_items } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABReleaseRsp(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABReleaseListBearerRelComp rab_items := ?) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABRelease, + criticality := reject, + value_ := { + e_RABReleaseResponse := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { e_RABReleaseListBearerRelComp := rab_items } + } + } + } + } + } +} + +/* 9.1.3.7 E-RAB RELEASE INDICATION */ +template (value) S1AP_PDU +ts_S1AP_RABReleaseInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABList rab_items) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABReleaseIndication, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleasedList, + criticality := ignore, + value_ := { E_RABList := rab_items } + } + } + } + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABReleaseInd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABList rab_items := ?) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABReleaseIndication, + criticality := reject, + value_ := { + e_RABReleaseCommand := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABReleasedList, + criticality := ignore, + value_ := { E_RABList := rab_items } + } + } + } + } + } +} + +/* 9.2.1.36 E-RAB List */ +template (value) E_RABList +ts_E_RABList(template (value) E_RABItem it) := { + { + id := S1AP_Constants.id_E_RABItem, + criticality := ignore, + value_ := { E_RABItem := it } + } +} +template (present) E_RABList +tr_E_RABList(template (present) E_RABItem it := ?) := { + { + id := S1AP_Constants.id_E_RABItem, + criticality := ignore, + value_ := { E_RABItem := it } + } +} + +template (value) E_RABItem +ts_E_RABItem(template (value) E_RAB_ID rab_id, + template (value) Cause cause := {nas := normal_release}) := { + e_RAB_ID := rab_id, + cause := cause, + iE_Extensions := omit +} +template (present) E_RABItem +tr_E_RABItem(template (present) E_RAB_ID rab_id := ?, + template (present) Cause cause := ?) := { + e_RAB_ID := rab_id, + cause := cause, + iE_Extensions := * +} + +/* E-RAB Release List */ +template (value) E_RABReleaseListBearerRelComp +ts_E_RABReleaseListBearerRelComp(template (value) E_RABReleaseItemBearerRelComp it) := { + { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { E_RABReleaseItemBearerRelComp := it } + } +} +template (present) E_RABReleaseListBearerRelComp +tr_E_RABReleaseListBearerRelComp(template (present) E_RABReleaseItemBearerRelComp it := ?) := { + { + id := S1AP_Constants.id_E_RABReleaseListBearerRelComp, + criticality := ignore, + value_ := { E_RABReleaseItemBearerRelComp := it } + } +} + +template (value) E_RABReleaseItemBearerRelComp +ts_E_RABReleaseItemBearerRelComp(template (value) E_RAB_ID rab_id) := { + e_RAB_ID := rab_id, + iE_Extensions := omit +} +template (present) E_RABReleaseItemBearerRelComp +tr_E_RABReleaseItemBearerRelComp(template (present) E_RAB_ID rab_id := ?) := { + e_RAB_ID := rab_id, + iE_Extensions := * +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38144?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: I2e9305da80934ea68e3eca8215a9c16de48b37fd Gerrit-Change-Number: 38144 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: derive functions from f_TC_e_rab_setup()
by laforge 17 Sep '24

17 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?usp=email ) Change subject: s1gw: derive functions from f_TC_e_rab_setup() ...................................................................... s1gw: derive functions from f_TC_e_rab_setup() ... to avoid code duplication when adding more E-RAB related TCs. While at it, allow establishing multiple E-RABs. Change-Id: I1bff371da6337ecd7710219d1c86f0fff82ad17f --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 124 insertions(+), 50 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index d90609d..7737676 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -281,4 +281,117 @@ f_pfcp_handle_assoc_setup_req(); } } + +/* 256 is maxnoofE-RABs (see S1AP_Constants.asn) */ +type record length(1..256) of ERab ERabList; +type record ERab { + E_RAB_ID erab_id, /* ::= INTEGER (0..15, ...) */ + ERabParams u2c, /* UPF -> Core params */ + ERabParams c2u, /* Core -> UPF params */ + ERabParams a2u, /* Access -> UPF params */ + ERabParams u2a /* UPF -> Access params */ +}; + +type record ERabParams { + GTP_TEID teid, /* ::= OCTET STRING (SIZE (4)) */ + charstring tla /* Transport Layer Address */ +}; + +private const MME_UE_S1AP_ID c_MME_UE_ID := 4242; + +function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABToBeSetupListBearerSUReq items; + var template (value) E_RABLevelQoSParameters qos_params; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + qos_params := valueof(ts_E_RABLevelQoSParameters); + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABToBeSetupItemBearerSUReq item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2c; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_S1AP_RABToBeSetupItemBearerSUReq(rab_id := erabs[i].erab_id, + qos_params := qos_params, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := ''O); + items[i] := ts_S1AP_RABToBeSetupListBearerSUReq(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_erab_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABToBeSetupListBearerSUReq items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABToBeSetupItemBearerSUReq item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].a2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_S1AP_RABToBeSetupItemBearerSUReq(rab_id := erabs[i].erab_id, + qos_params := ?, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := ''O); + items[i] := tr_S1AP_RABToBeSetupListBearerSUReq(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); + return pdu; +} + +function f_ConnHdlr_tx_erab_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABSetupListBearerSURes items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABSetupItemBearerSURes item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2a; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_S1AP_RABSetupItemBearerSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := ts_S1AP_RABSetupListBearerSURes(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_erab_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABSetupListBearerSURes items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABSetupItemBearerSURes item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].c2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_S1AP_RABSetupItemBearerSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := tr_S1AP_RABSetupListBearerSURes(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); + return pdu; +} + } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index eb65ce5..1896e30 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -250,10 +250,13 @@ } function f_TC_e_rab_setup(charstring id) runs on ConnHdlr { - const integer mme_id := 7; - const integer enb_id := 9; - const integer erab_id := 6; - var S1AP_PDU pdu; + const ERab erab := { + erab_id := 0, + u2c := {'42424242'O, "1.2.3.4"}, + c2u := {'42424242'O, mp_s1gw_mme_ip}, + a2u := {'24242424'O, "4.3.2.1"}, + u2a := {'24242424'O, mp_s1gw_enb_ip} + }; f_ConnHdlr_register_pfcp(); f_ConnHdlr_s1ap_register(g_pars.genb_id); @@ -261,55 +264,13 @@ f_ConnHdlr_s1ap_setup(g_pars.genb_id); log("eNB <- [S1GW] <- MME: E-RAB SETUP REQUEST"); - var template (value) E_RABToBeSetupListBearerSUReq items_req; - var E_RABToBeSetupItemBearerSUReq item_req := { - e_RAB_ID := erab_id, - e_RABlevelQoSParameters := { - qCI := 5, - allocationRetentionPriority := { - priorityLevel := 1, - pre_emptionCapability := shall_not_trigger_pre_emption, - pre_emptionVulnerability := not_pre_emptable, - iE_Extensions := omit - }, - gbrQosInformation := omit, - iE_Extensions := omit - }, - transportLayerAddress := -, - gTP_TEID := f_rnd_octstring(4), - nAS_PDU := ''O, - iE_Extensions := omit - }; - - /* MME -> S1GW */ - item_req.transportLayerAddress := oct2bit(f_inet_addr("1.2.3.4")); - items_req := ts_S1AP_RABToBeSetupListBearerSUReq(item_req); - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(mme_id, enb_id, items_req)); - - /* S1GW -> eNB */ - item_req.transportLayerAddress := oct2bit(f_inet_addr(mp_s1gw_mme_ip)); - items_req := ts_S1AP_RABToBeSetupListBearerSUReq(item_req); - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(mme_id, enb_id, items_req)); + f_ConnHdlr_tx_erab_setup_req({erab}); + f_ConnHdlr_rx_erab_setup_req({erab}); log("eNB -> [S1GW] -> MME: E-RAB SETUP RESPONSE"); - var template (value) E_RABSetupListBearerSURes items_res; - var E_RABSetupItemBearerSURes item_res := { - e_RAB_ID := erab_id, - transportLayerAddress := -, - gTP_TEID := f_rnd_octstring(4), - iE_Extensions := omit - }; - - /* eNB -> S1GW */ - item_res.transportLayerAddress := oct2bit(f_inet_addr("4.3.2.1")); - items_res := ts_S1AP_RABSetupListBearerSURes(item_res); - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); - - /* S1GW -> MME */ - item_res.transportLayerAddress := oct2bit(f_inet_addr(mp_s1gw_enb_ip)); - items_res := ts_S1AP_RABSetupListBearerSURes(item_res); - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_id, enb_id, items_res)); + f_ConnHdlr_tx_erab_setup_rsp({erab}); + f_ConnHdlr_rx_erab_setup_rsp({erab}); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38062?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: I1bff371da6337ecd7710219d1c86f0fff82ad17f Gerrit-Change-Number: 38062 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: fix TC_e_rab_setup: handle PFCP Session related PDUs
by laforge 17 Sep '24

17 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38102?usp=email ) Change subject: s1gw: fix TC_e_rab_setup: handle PFCP Session related PDUs ...................................................................... s1gw: fix TC_e_rab_setup: handle PFCP Session related PDUs S1GW_Tests.TC_e_rab_setup is failing since we introduced the PFCP support to osmo-s1gw. The IUT now requires co-located UPF, which we need to emulate in the testsuite. This patch patch adds the following API: * S1GW_ConnHdlr.f_ConnHdlr_rx_session_establish_req(), * S1GW_ConnHdlr.f_ConnHdlr_tx_session_establish_resp(), * S1GW_ConnHdlr.f_ConnHdlr_rx_session_modify_req(), * S1GW_ConnHdlr.f_ConnHdlr_tx_session_modify_resp(), and makes use of it in S1GW_Tests.TC_e_rab_setup. Change-Id: Ibbb326badaa1e3df968c137f3e4b576ca5c6f94d --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 174 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 7737676..cd61123 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -51,7 +51,10 @@ type record ConnHdlrPars { integer idx, Global_ENB_ID genb_id, - charstring statsd_prefix + charstring statsd_prefix, + charstring pfcp_loc_addr, + charstring pfcp_rem_addr, + ERabList erabs }; template Global_ENB_ID @@ -289,7 +292,9 @@ ERabParams u2c, /* UPF -> Core params */ ERabParams c2u, /* Core -> UPF params */ ERabParams a2u, /* Access -> UPF params */ - ERabParams u2a /* UPF -> Access params */ + ERabParams u2a, /* UPF -> Access params */ + OCT8 pfcp_loc_seid, + OCT8 pfcp_rem_seid optional }; type record ERabParams { @@ -394,4 +399,139 @@ return pdu; } +function f_ConnHdlr_rx_session_establish_req(in ERab erab) +runs on ConnHdlr return PDU_PFCP { + var OCT4 addr := f_inet_addr(g_pars.pfcp_rem_addr); + + /* Packet Detection Rules */ + var template (present) Outer_Header_Removal ohr; + var template (present) Create_PDR pdr1; + var template (present) Create_PDR pdr2; + + ohr := tr_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4); + pdr1 := tr_PFCP_Create_PDR(pdr_id := 1, /* -- for Core -> Access */ + pdi := tr_PFCP_PDI(CORE), + ohr := ohr, + far_id := 1); + pdr2 := tr_PFCP_Create_PDR(pdr_id := 2, /* -- for Access -> Core */ + pdi := tr_PFCP_PDI(ACCESS), + ohr := ohr, + far_id := 2); + + /* Forwarding Action Rules */ + var template (present) Outer_Header_Creation ohc2; + var template (present) Forwarding_Parameters fpars2; + var template (present) Create_FAR far1; + var template (present) Create_FAR far2; + + ohc2 := tr_PFCP_Outer_Header_Creation_GTP_ipv4(erab.u2c.teid, + f_inet_addr(erab.u2c.tla)); + fpars2 := tr_PFCP_Forwarding_Parameters(CORE, ohc2); + + far1 := tr_PFCP_Create_FAR(far_id := 1, /* -- for Core -> Access */ + aa := tr_PFCP_Apply_Action_DROP, + fp := omit); + far2 := tr_PFCP_Create_FAR(far_id := 2, /* -- for Access -> Core */ + aa := tr_PFCP_Apply_Action_FORW, + fp := fpars2); + + /* The final Session Establishment Request PDU */ + var template (present) PDU_PFCP tr_pdu; + tr_pdu := tr_PFCP_Session_Est_Req(node_id := tr_PFCP_Node_ID_ipv4(addr), + cp_f_seid := tr_PFCP_F_SEID_ipv4(addr), + create_pdr := {pdr1, pdr2}, + create_far := {far1, far2}); + return f_ConnHdlr_pfcp_expect(tr_pdu); +} + +function f_ConnHdlr_tx_session_establish_resp(in ERab erab, + in PDU_PFCP req) +runs on ConnHdlr { + var OCT4 addr := f_inet_addr(g_pars.pfcp_loc_addr); + var PFCP_Session_Establishment_Request serq; + + serq := req.message_body.pfcp_session_establishment_request; + + /* Created Packet Detection Rules */ + var template (value) Created_PDR pdr1; + var template (value) Created_PDR pdr2; + pdr1 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id, + local_F_TEID := ts_PFCP_F_TEID_ipv4(erab.c2u.teid, + f_inet_addr(erab.c2u.tla))); + pdr2 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id, + local_F_TEID := ts_PFCP_F_TEID_ipv4(erab.a2u.teid, + f_inet_addr(erab.a2u.tla))); + + /* The final Session Establishment Response PDU */ + var template (value) PDU_PFCP resp; + resp := ts_PFCP_Session_Est_Resp(seq_nr := req.sequence_number, + node_id := ts_PFCP_Node_ID_ipv4(addr), + seid := erab.pfcp_rem_seid, + f_seid := ts_PFCP_F_SEID_ipv4(addr, erab.pfcp_loc_seid), + created_pdr := {pdr1, pdr2}); + PFCP.send(resp); +} + +function f_ConnHdlr_rx_session_modify_req(in ERab erab) +runs on ConnHdlr return PDU_PFCP { + /* Forwarding Action Rules */ + var template (present) Outer_Header_Creation ohc1; + var template (present) Update_Forwarding_Parameters fpars1; + var template (present) Update_FAR far1; + + ohc1 := tr_PFCP_Outer_Header_Creation_GTP_ipv4(erab.u2a.teid, + f_inet_addr(erab.u2a.tla)); + fpars1 := tr_PFCP_Update_Forwarding_Parameters(ohc := ohc1); + + far1 := tr_PFCP_Update_FAR(far_id := 1, /* -- for Core -> Access */ + aa := tr_PFCP_Apply_Action_FORW, + fp := fpars1); + + /* The final Session Modification Request PDU */ + var template (present) PDU_PFCP tr_pdu; + tr_pdu := tr_PFCP_Session_Mod_Req(seid := erab.pfcp_loc_seid, + update_far := far1); + return f_ConnHdlr_pfcp_expect(tr_pdu); +} + +function f_ConnHdlr_tx_session_modify_resp(in ERab erab, + in PDU_PFCP req) +runs on ConnHdlr { + /* The final Session Modification Response PDU */ + var template (value) PDU_PFCP resp; + resp := ts_PFCP_Session_Mod_Resp(seq_nr := req.sequence_number, + seid := erab.pfcp_rem_seid); + PFCP.send(resp); +} + +function f_ConnHdlr_erab_setup_req(inout ERabList erabs) +runs on ConnHdlr { + log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); + f_ConnHdlr_tx_erab_setup_req(erabs); + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + log("UPF <- S1GW: PFCP Session Establishment Request for E-RAB ID ", erabs[i].erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_establish_req(erabs[i]); + /* store peer's SEID, so that it can be used in outgoing PDUs later */ + erabs[i].pfcp_rem_seid := pdu.message_body.pfcp_session_establishment_request.CP_F_SEID.seid; + log("UPF -> S1GW: PFCP Session Establishment Response for E-RAB ID ", erabs[i].erab_id); + f_ConnHdlr_tx_session_establish_resp(erabs[i], pdu); + } + log("[eNB <- S1GW] <- MME: E-RAB SETUP REQUEST"); + f_ConnHdlr_rx_erab_setup_req(erabs); +} + +function f_ConnHdlr_erab_setup_rsp(in ERabList erabs) +runs on ConnHdlr { + log("[eNB -> S1GW] -> MME: E-RAB SETUP RESPONSE"); + f_ConnHdlr_tx_erab_setup_rsp(erabs); + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(erabs[i]); + log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); + f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); + } + log("eNB -> [S1GW -> MME]: E-RAB SETUP RESPONSE"); + f_ConnHdlr_rx_erab_setup_rsp(erabs); +} + } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 1896e30..fb4ee9b 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -111,10 +111,38 @@ template (value) ConnHdlrPars t_ConnHdlrPars(integer idx := 0, - charstring statsd_prefix := mp_statsd_prefix) := { + integer num_erabs := 1, + charstring statsd_prefix := mp_statsd_prefix, + charstring pfcp_loc_addr := mp_upf_bind_ip, + charstring pfcp_rem_addr := mp_s1gw_upf_ip) := { idx := idx, genb_id := ts_Global_ENB_ID(idx), - statsd_prefix := statsd_prefix + statsd_prefix := statsd_prefix, + pfcp_loc_addr := pfcp_loc_addr, + pfcp_rem_addr := pfcp_rem_addr, + erabs := f_gen_erab_list(idx, num_erabs) +} + +private function f_gen_erab_list(integer idx, integer num_erabs) +return ERabList { + var OCT6 seid_prefix := char2oct("TTCN-3"); + var ERabList erabs; + + for (var integer id := 0; id < num_erabs; id := id + 1) { + var OCT2 uid := int2oct(idx, 1) & int2oct(id, 1); + + erabs[id] := { + erab_id := id, /* sequentially assign E-RAB IDs */ + u2c := {'0001'O & uid, "127.0.0.1"}, + c2u := {'0101'O & uid, "127.0.1.1"}, + a2u := {'0202'O & uid, "127.0.2.2"}, + u2a := {'0002'O & uid, "127.0.0.2"}, + pfcp_loc_seid := seid_prefix & uid, + pfcp_rem_seid := omit /* assigned by S1GW */ + }; + } + + return erabs; } function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars) @@ -250,27 +278,13 @@ } function f_TC_e_rab_setup(charstring id) runs on ConnHdlr { - const ERab erab := { - erab_id := 0, - u2c := {'42424242'O, "1.2.3.4"}, - c2u := {'42424242'O, mp_s1gw_mme_ip}, - a2u := {'24242424'O, "4.3.2.1"}, - u2a := {'24242424'O, mp_s1gw_enb_ip} - }; - f_ConnHdlr_register_pfcp(); f_ConnHdlr_s1ap_register(g_pars.genb_id); f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); f_ConnHdlr_s1ap_setup(g_pars.genb_id); - log("eNB <- [S1GW] <- MME: E-RAB SETUP REQUEST"); - f_ConnHdlr_tx_erab_setup_req({erab}); - f_ConnHdlr_rx_erab_setup_req({erab}); - - - log("eNB -> [S1GW] -> MME: E-RAB SETUP RESPONSE"); - f_ConnHdlr_tx_erab_setup_rsp({erab}); - f_ConnHdlr_rx_erab_setup_rsp({erab}); + f_ConnHdlr_erab_setup_req(g_pars.erabs); + f_ConnHdlr_erab_setup_rsp(g_pars.erabs); f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38102?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: Ibbb326badaa1e3df968c137f3e4b576ca5c6f94d Gerrit-Change-Number: 38102 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_setup3 (3 E-RABs at a time)
by laforge 17 Sep '24

17 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38146?usp=email ) Change subject: s1gw: add TC_e_rab_setup3 (3 E-RABs at a time) ...................................................................... s1gw: add TC_e_rab_setup3 (3 E-RABs at a time) The idea is to verify setup and release of 3 E-RABs at a time. Change-Id: I6a0a10f826309d8a952c77c23170df3d201e7640 --- M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 2 files changed, 15 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index ebeda6d..b643f37 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -291,8 +291,19 @@ f_ConnHdlr_s1ap_disconnect(); f_ConnHdlr_s1ap_unregister(g_pars.genb_id); } +/* 1 E-RAB at a time */ testcase TC_e_rab_setup() runs on test_CT { - var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := 1)); + var ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_e_rab_setup), pars); + vc_conn.done; +} +/* 3 E-RABs at a time */ +testcase TC_e_rab_setup3() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := 3)); var ConnHdlr vc_conn; f_init(); @@ -331,6 +342,7 @@ execute( TC_conn_term_by_mme() ); execute( TC_conn_term_mme_unavail() ); execute( TC_e_rab_setup() ); + execute( TC_e_rab_setup3() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 87cd893..f7b0c3b 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,9 +1,10 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='6' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='7' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_mme_unavail' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_e_rab_setup3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38146?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: I6a0a10f826309d8a952c77c23170df3d201e7640 Gerrit-Change-Number: 38146 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log