fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32281 )
Change subject: osmo_vty: re.escape() the VTY prompt in connect()
......................................................................
osmo_vty: re.escape() the VTY prompt in connect()
The VTY prompt may contain regular expression metacharacters in it,
so the self.re_prompt will not match as expected. One example is
the modem app in osmocom-bb.git using promot 'OsmocomBB(modem)'.
Change-Id: Ibada798a214be97409b55556724f558b67da7365
Related: osmo-python-tests.git I47b1f1c1765acb1b935dcbcc54bbb5eb539db4f0
---
M src/osmo_gsm_tester/obj/osmo_vty.py
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/81/32281/1
diff --git a/src/osmo_gsm_tester/obj/osmo_vty.py b/src/osmo_gsm_tester/obj/osmo_vty.py
index 6fee5dc..1b414c9 100644
--- a/src/osmo_gsm_tester/obj/osmo_vty.py
+++ b/src/osmo_gsm_tester/obj/osmo_vty.py
@@ -178,7 +178,7 @@
if not self.prompt:
raise VtyInterfaceExn('Could not find application name; needed to decode prompts.'
' Initial data was: %r' % data)
- self.re_prompt = re.compile('^%s(?:\(([\w-]*)\))?([#>]) (.*)$' % self.prompt)
+ self.re_prompt = re.compile('^%s(?:\(([\w-]*)\))?([#>]) (.*)$' % re.escape(self.prompt))
def disconnect(self):
'''Disconnect.
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32281
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ibada798a214be97409b55556724f558b67da7365
Gerrit-Change-Number: 32281
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32279 )
Change subject: osmo_ms_driver: Store Mobile and VirtPhy content under test rundir
......................................................................
osmo_ms_driver: Store Mobile and VirtPhy content under test rundir
Change-Id: I89223e0d77bcb3e6921be683d705161009630a2c
---
M src/osmo_ms_driver/starter.py
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/79/32279/1
diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py
index 559e392..5d8611c 100644
--- a/src/osmo_ms_driver/starter.py
+++ b/src/osmo_ms_driver/starter.py
@@ -54,7 +54,7 @@
def start(self, loop, testenv=None):
if testenv is not None: # overwrite run_dir to store files if run from inside osmo-gsm-tester:
- self.run_dir = util.Dir(testenv.suite().get_run_dir().new_dir(self.name()))
+ self.run_dir = util.Dir(testenv.test().get_run_dir().new_dir(self.name()))
if len(self._phy_filename.encode()) > 107:
raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename)
@@ -136,7 +136,7 @@
def start(self, loop, testenv=None):
if testenv is not None: # overwrite run_dir to store files if run from inside osmo-gsm-tester:
- self.run_dir = util.Dir(testenv.suite().get_run_dir().new_dir(self.name()))
+ self.run_dir = util.Dir(testenv.test().get_run_dir().new_dir(self.name()))
lua_filename = self.write_lua_cfg()
mob_filename = self.write_mob_cfg(lua_filename, self._phy_filename)
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32279
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I89223e0d77bcb3e6921be683d705161009630a2c
Gerrit-Change-Number: 32279
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: msuraev.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32278 )
Change subject: gprs_rlcmac: convert from C++ to C
......................................................................
Patch Set 6: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7260ad1a67ebdc09767a679e579fead262f1627a
Gerrit-Change-Number: 32278
Gerrit-PatchSet: 6
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Apr 2023 14:13:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32278 )
Change subject: gprs_rlcmac: convert from C++ to C
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7260ad1a67ebdc09767a679e579fead262f1627a
Gerrit-Change-Number: 32278
Gerrit-PatchSet: 6
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Wed, 12 Apr 2023 13:34:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: osmith, fixeria.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269
to look at the new patch set (#3).
Change subject: bts/oml: Repurpose test TC_ipa_rsl_connect_nack
......................................................................
bts/oml: Repurpose test TC_ipa_rsl_connect_nack
The old test was not really correct, since it is fine for the BTS to ACK
the RSL CONNECT despite later on failing to connect the RSL link.
RSL_CONNECT is really just setting the attributes (it could even be
replaced by SETATTR in the future), and connect happens later on.
This can still be found out by the BSC because the BBTRANSC will never
transition to a Enabled state until the RSL link becomes up.
This patch repurposes the existent test to do some more meaningful check
in a case the RSL CONNECT can be answered with a NACK. This scenario was
actually failing to be properly checked in osmo-bts until recently, so
it is expected that it will fail (and even crash) older versions of
osmo-bts.
Depends: osmo-bts.git Change-Id If27639ae1727fc5232e1a964a1b29f50c8805d80
Related: OS#5964
Change-Id: I10df611f0086d34a5482f7c8a79703938313ab3d
---
M bts/BTS_Tests_OML.ttcn
M library/AbisOML_Types.ttcn
2 files changed, 39 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/32269/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269
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: I10df611f0086d34a5482f7c8a79703938313ab3d
Gerrit-Change-Number: 32269
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith, fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269 )
Change subject: bts/oml: Repurpose test TC_ipa_rsl_connect_nack
......................................................................
Patch Set 2:
(3 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269/comment/ee17d22a_3ac0…
PS2, Line 9: it is fine for the BTS to ACK
: the RSL CONNECT despite later on failing to connect the RSL link
> > RSL_CONNECT is really just setting the attributes ... and connect happens later on […]
We discussed this intenrally with @fixeria.
I tested again and I confirm that nanoBTS doesn't attempt TCP connecting until it is sent the OPSTART command for the BBTRANSC object from the BSC.
Hence, IP address in RSL CONNECT message is not really tested because no TCP socket is created, and 0.0.0.0 is considered to be "use same remote address as per OML link) which is inherently valid since the OML link is up.
I also just checked: nanoBTS sends OPSTART ACK even before sending the TCP SYN to port 3003 (RSL), so yeah, it ACKs and then attempts creating the RSL socket, as I expected.
The real knowledge that the nanoBTS is prepared comes from the fact that it sends a StateChng Report to EnabledOk once it has a successful connect on the TCP/IPA/RSL link. That happens after the IPA handshake is successful apparently.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269/comment/68b3ebf9_feef…
PS2, Line 23: Change-Id: I10df611f0086d34a5482f7c8a79703938313ab3d
> Related: OS#5964
Ack
Patchset:
PS2:
> (not resolved)
ACK, I'll move the test to the end.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32269
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: I10df611f0086d34a5482f7c8a79703938313ab3d
Gerrit-Change-Number: 32269
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 12 Apr 2023 12:36:52 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment