fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35368?usp=email )
Change subject: ttcn3-pcu-test: set PCUIFv12 for both -master and -latest
......................................................................
ttcn3-pcu-test: set PCUIFv12 for both -master and -latest
osmo-pcu v1.4.0 (recently tagged) now also speaks PCUIFv12.
Change-Id: If0b2209af645f391817f65b4227736b52ca59e2e
Related: OS#6191
---
M ttcn3-pcu-test/PCU_Tests.cfg
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/jenkins.sh
M ttcn3-pcu-test/sns/PCU_Tests.cfg
4 files changed, 16 insertions(+), 22 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg
index b3f3b8f..8404f79 100644
--- a/ttcn3-pcu-test/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/PCU_Tests.cfg
@@ -35,7 +35,7 @@
}
}
Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"
-PCUIF_Types.mp_pcuif_version := 11
+PCUIF_Types.mp_pcuif_version := 12
[MAIN_CONTROLLER]
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 06f833e..d63229b 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -11,16 +11,7 @@
set_pcuif_version() {
if image_suffix_is_2023q1; then
- sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1
- fi
-
- # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is
- # executed for current master. For latest the PCUIF module parameter must stay at v.11
- # since in osmo-pcu-latest PCUIF v.12 is not yet supported. After the next release, PCUIF
- # v.12 will be supported in osmo-pcu-latest as well and this function, including the
- # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed.
- if image_suffix_is_master; then
- sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 12/g' $1
+ sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1
fi
}
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index 116f06c..dca6dc0 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -11,16 +11,7 @@
set_pcuif_version() {
if image_suffix_is_2023q1; then
- sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1
- fi
-
- # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is
- # executed for current master. For latest the PCUIF module parameter must stay at v.11
- # since in osmo-pcu-latest PCUIF v.12 is not yet supported. After the next release, PCUIF
- # v.12 will be supported in osmo-pcu-latest as well and this function, including the
- # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed.
- if image_suffix_is_master; then
- sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 12/g' $1
+ sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1
fi
}
diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg
index d62f52d..2b11462 100644
--- a/ttcn3-pcu-test/sns/PCU_Tests.cfg
+++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg
@@ -59,7 +59,7 @@
}
}
}
-PCUIF_Types.mp_pcuif_version := 11
+PCUIF_Types.mp_pcuif_version := 12
[MAIN_CONTROLLER]
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35368?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If0b2209af645f391817f65b4227736b52ca59e2e
Gerrit-Change-Number: 35368
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35369?usp=email )
Change subject: ttcn3-bts-test: set PCUIFv12 for both -master and -latest
......................................................................
ttcn3-bts-test: set PCUIFv12 for both -master and -latest
osmo-bts v1.7.2 (recently tagged) now also speaks PCUIFv12.
Take a chance to fix ttcn3-bts-test-2023q1 by setting PCUIFv10.
Change-Id: I70f0c30d6c514614095dcbbcac5d025001861fbc
---
M ttcn3-bts-test/generic/BTS_Tests.cfg
M ttcn3-bts-test/jenkins.sh
M ttcn3-bts-test/oml/BTS_Tests.cfg
M ttcn3-bts-test/virtphy/BTS_Tests.cfg
4 files changed, 18 insertions(+), 10 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg
index 634d60d..cd1e739 100644
--- a/ttcn3-bts-test/generic/BTS_Tests.cfg
+++ b/ttcn3-bts-test/generic/BTS_Tests.cfg
@@ -18,7 +18,7 @@
BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10"
BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10"
BTS_Tests.mp_l1_supports_gprs := true
-PCUIF_Types.mp_pcuif_version := 11;
+PCUIF_Types.mp_pcuif_version := 12;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 08df03c..4128e08 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -122,13 +122,8 @@
}
set_pcuif_version() {
- # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is
- # executed for current master. For latest the PCUIF module parameter must stay at v.11
- # since in osmo-bts-latest PCUIF v.12 is not yet supported. After the next release, PCUIF
- # v.12 will be supported in osmo-bts-latest as well and this function, including the
- # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed.
- if image_suffix_is_master; then
- sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 12/g' $1
+ if image_suffix_is_2023q1; then
+ sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1
fi
}
diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg
index 74afc44..1311336 100644
--- a/ttcn3-bts-test/oml/BTS_Tests.cfg
+++ b/ttcn3-bts-test/oml/BTS_Tests.cfg
@@ -19,7 +19,7 @@
BTS_Tests_OML.mp_oml_ip := "172.18.9.10"
BTS_Tests_OML.mp_oml_port := 3002
BTS_Tests_OML.mp_pcu_socket := "/data/unix/pcu_sock"
-PCUIF_Types.mp_pcuif_version := 11;
+PCUIF_Types.mp_pcuif_version := 12;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/virtphy/BTS_Tests.cfg b/ttcn3-bts-test/virtphy/BTS_Tests.cfg
index fe8afe4..f71c524 100644
--- a/ttcn3-bts-test/virtphy/BTS_Tests.cfg
+++ b/ttcn3-bts-test/virtphy/BTS_Tests.cfg
@@ -17,7 +17,7 @@
BTS_Tests.mp_ctrl_ip := "172.18.9.20"
BTS_Tests.mp_l1_supports_gprs := true
BTS_Tests.mp_bts_trxc_port := -1;
-PCUIF_Types.mp_pcuif_version := 11;
+PCUIF_Types.mp_pcuif_version := 12;
[MAIN_CONTROLLER]
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35369?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I70f0c30d6c514614095dcbbcac5d025001861fbc
Gerrit-Change-Number: 35369
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372?usp=email )
Change subject: library/PCUIF_Types: clean up, drop remains of PCUIFv10
......................................................................
Patch Set 3:
(2 comments)
File library/PCUIF_CodecPort.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372/comment/186953a0_e5e5…
PS3, Line 41: if (ischosen(pout.data.u.data_cnf)) { fix_padding(pout.data.u.data_cnf); }
> we don't need the same for data_cnf2?
Nope, because `data_cnf2` contains no data, but only a message ID.
File library/PCUIF_Types.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372/comment/6bd32d23_9b41…
PS3, Line 51: /* RFU, removed in PCUIFv11 ('02'O), */
> RFU?
Reserved for Future Use.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibfe8558cb9f335d8c29348063b0ff02b138dd4c7
Gerrit-Change-Number: 35372
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 15 Dec 2023 13:14:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372?usp=email )
Change subject: library/PCUIF_Types: clean up, drop remains of PCUIFv10
......................................................................
Patch Set 3:
(2 comments)
File library/PCUIF_CodecPort.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372/comment/921ce1dc_55af…
PS3, Line 41: if (ischosen(pout.data.u.data_cnf)) { fix_padding(pout.data.u.data_cnf); }
we don't need the same for data_cnf2?
File library/PCUIF_Types.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372/comment/c03bfd03_5550…
PS3, Line 51: /* RFU, removed in PCUIFv11 ('02'O), */
RFU?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35372?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibfe8558cb9f335d8c29348063b0ff02b138dd4c7
Gerrit-Change-Number: 35372
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 15 Dec 2023 13:12:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35373?usp=email )
Change subject: library/RLCMAC_EncDec: fix segfault in encode_trailing_padding_spb()
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
Patchset:
PS2:
Makes sense to avoid segfaulting. In the long term we probably want, as the code in there says, trigger some sort of exception which causte Dynamic test Error, so that the ttcn3 code is fixed.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35373?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ib0992a50026f0e0deebb959788ed6e79c5286fec
Gerrit-Change-Number: 35373
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 15 Dec 2023 13:06:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment