April 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-gsm-tester[master]: osmo_vty: re.escape() the VTY prompt in connect()
by pespin 12 Apr '23

12 Apr '23

pespin has submitted this change. ( 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 Related: OS#6001 --- M src/osmo_gsm_tester/obj/osmo_vty.py 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified 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: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-tester[master]: osmo_vty: re.escape() the VTY prompt in connect()
by pespin 12 Apr '23

12 Apr '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32281 ) Change subject: osmo_vty: re.escape() the VTY prompt in connect() ...................................................................... Patch Set 2: Verified+1 -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 15:35:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-tester[master]: osmo_vty: re.escape() the VTY prompt in connect()
by pespin 12 Apr '23

12 Apr '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32281 ) Change subject: osmo_vty: re.escape() the VTY prompt in connect() ...................................................................... Patch Set 2: Code-Review+2 -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 15:35:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-tester[master]: osmo-mobile.cfg.tmpl: Improve logging
by pespin 12 Apr '23

12 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32280 ) Change subject: osmo-mobile.cfg.tmpl: Improve logging ...................................................................... osmo-mobile.cfg.tmpl: Improve logging Change-Id: I5fc07bd9332f6adac67b108f712fb99ee7cb3439 --- M src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl index 0a2cd6d..b2dc141 100644 --- a/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-mobile.cfg.tmpl @@ -1,3 +1,12 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging print category-hex 0 + logging print level 1 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all notice line vty bind 127.0.0.1 0 no gps enable -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32280 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: I5fc07bd9332f6adac67b108f712fb99ee7cb3439 Gerrit-Change-Number: 32280 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-tester[master]: osmo_ms_driver: Store Mobile and VirtPhy content under test rundir
by pespin 12 Apr '23

12 Apr '23

pespin has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, approved; Verified 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-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-tester[master]: osmo-mobile.cfg.tmpl: Improve logging
by pespin 12 Apr '23

12 Apr '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32280 ) Change subject: osmo-mobile.cfg.tmpl: Improve logging ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32280 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: I5fc07bd9332f6adac67b108f712fb99ee7cb3439 Gerrit-Change-Number: 32280 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 15:34:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-tester[master]: osmo-mobile.cfg.tmpl: Improve logging
by pespin 12 Apr '23

12 Apr '23

Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32280 ) Change subject: osmo-mobile.cfg.tmpl: Improve logging ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32280 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: I5fc07bd9332f6adac67b108f712fb99ee7cb3439 Gerrit-Change-Number: 32280 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

[S] Change in osmo-gsm-tester[master]: osmo_ms_driver: Store Mobile and VirtPhy content under test rundir
by pespin 12 Apr '23

12 Apr '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32279 ) Change subject: osmo_ms_driver: Store Mobile and VirtPhy content under test rundir ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Apr 2023 15:34:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-tester[master]: osmo_ms_driver: Store Mobile and VirtPhy content under test rundir
by pespin 12 Apr '23

12 Apr '23

Attention is currently required from: pespin. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/32279 ) Change subject: osmo_ms_driver: Store Mobile and VirtPhy content under test rundir ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- 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-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

[S] Change in osmo-gsm-tester[master]: osmo_vty: re.escape() the VTY prompt in connect()
by fixeria 12 Apr '23

12 Apr '23

fixeria has uploaded a new patch set (#2). ( 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 Related: OS#6001 --- M src/osmo_gsm_tester/obj/osmo_vty.py 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/81/32281/2 -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0