aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2023-09-13tests/test_py3: fix deprecated loop argHEADmasterOliver Smith1-1/+1
The loop arg has been removed in python 3.10. The same event loop will be used without passing the argument, so it can be removed. Fix for: TypeError: gather() got an unexpected keyword argument 'loop' Related: https://stackoverflow.com/a/60315290 Related: https://docs.python.org/3/library/asyncio-task.html#asyncio.gather Change-Id: I776bc463246e7a1a9adbb7c06012353d65694507
2023-09-13contrib/jenkins: do install --userOliver Smith2-1/+2
Don't install to /usr/local. Fix for: error: can't create or remove files in install directory Change-Id: Iebed8e3832047e8f19e5a88fcddd1a8242b9f096
2023-09-13Bump version: 0.2.1 → 0.3.00.3.0Pau Espin Pedrol1-0/+14
Change-Id: I56fbc66dd7bbf50a966063a00f8a8e6c583d7d56
2023-06-01osmoutil: return proc's return code from end_proc()Vadim Yanitskiy1-2/+3
Change-Id: I1e11fcb6c5a587c27fc00920b6e157862d972fd9 Related: OS#5665
2023-05-26systemd: depend on networking-online.targetOliver Smith2-0/+4
Related: SYS#6400 Change-Id: Ifbac18a38e086e42c67499b7818cdf08629d0000
2023-05-24setup.py: do not install scripts/{soap,ctrl2cgi}.pyVadim Yanitskiy1-2/+0
These scripts have been deprecated and are not maintained anymore. Change-Id: Iffe8f752793127077f25df13167ccc5190e54ff6
2023-05-23osmoutil: print return code in end_proc()Vadim Yanitskiy1-1/+2
Change-Id: If11616be6e9afc85814fa0b494e231cc7530459c Related: OS#5665
2023-04-25debian: set compat level to 10Oliver Smith2-3/+3
Related: OS#5958 Change-Id: Ib45ad7c44cdefa4c5acab2da09f24796253a133d
2023-03-25InteractVty: re.escape() the VTY prompt in connect()Vadim Yanitskiy1-1/+1
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: I47b1f1c1765acb1b935dcbcc54bbb5eb539db4f0
2022-07-06Bump version: 0.2.10.2.1Oliver Smith2-1/+121
Tag a new release and to update debian/changelog, with the intention to bring this package to the latest feed (and not only nightly). Related: OS#5604 Change-Id: I4cb57c82f4ef28e59495bbe406a042209d210add
2022-06-18update git URLs (git -> https; gitea)Harald Welte1-3/+3
Change-Id: I9adbf43ae589461c34814157ff41e403dc54091c
2021-12-14treewide: remove FSF addressOliver Smith8-32/+0
Remove the paragraph about writing to the Free Software Foundation's mailing address. The FSF has changed addresses in the past, and may do so again. In 2021 this is not useful, let's rather have a bit less boilerplate at the start of source files. Change-Id: Ifd7b7e548c9c6db140fa8cbc8a3c8dfaf4603d18
2021-05-18osmo_ipa: Fix parsing ERROR msgs in CTRL ifacePau Espin Pedrol1-1/+1
The UserManual documentation specifies errors to use the "ERROR" keyword, not the "ERR" one. Furthermore, libosmocore (reference implementation) sends "ERROR" too. Change-Id: I82cbe8ad0ab51fa073ac3b2d0b959a1610f683b1
2021-04-04Use proper python3 shebang in all modulesVadim Yanitskiy8-8/+8
Change-Id: I1295be505f4ec30e809297a474b689e6c0cdf505
2021-01-12README: Drop python2 referencesPau Espin Pedrol1-2/+0
Python2 support was dropped recently, remove references informing how to install python2 modules (operation would fail). Change-Id: Iffe403377afe9534dbd61d65bfd52e479e125e68
2020-07-15remove_tmpdir(): Support recursion / sub-directoriesHarald Welte1-4/+2
The existing code assumed that tmpdir only contained regular files, not an entire hierarchy of files with sub-directories or the like. In case sub-directories exist, the current code fails as follows: line 176, in test_all_apps remove_tmpdir(tmpdir) File "/usr/local/lib/python3.5/dist-packages/osmopython-0.2.0-py3.5.egg/EGG-INFO/scripts/osmotestconfig.py", line 142, in remove_tmpdir os.unlink(os.path.join(tmpdir, f)) IsADirectoryError: [Errno 21] Is a directory: 'writtenconfig/ericsson' Change-Id: I896b99032d94ba0cdd340a8eed7c7b625661ad69
2019-12-17update version to 0.2.0 to mark python2 deprecationHarald Welte1-1/+1
Change-Id: Ie0e0bef3167648ad54e191378dfe170e1493c27e
2019-12-11Drop python2 support (again)Oliver Smith13-77/+28
Re-apply reverted commit Iabda95073faa2191fd117e9637e0858c589e9d9e ("Drop python2 support"), but with additional changes to make the scripts actually work with python3 and to make it build without python2. I have verified, that the contrib/jenkins.sh scripts of all Osmocom repositories (with their python3 patches on top) are working with this patch and that all Osmocom repositories with the python3 patches build in OBS (tested in own namespace). All related patches for changing from python2 to 3 in other repositories must be merged shortly after this one, as soon as the build slaves were (automatically) updated to have the new osmo-python-tests installed: https://gerrit.osmocom.org/q/topic:drop-py2 New fixes: * osmopy/obscvty.py: verify: fix compare Comparing maps in python3 does not work the same as in python2. Convert them to lists first, so the compare works as intended again. Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestvty.py", line 57, in test_history assert(self.vty.w_verify(test_str, [t1])) AssertionError * osmopy/obscvty.py: use enc/dec with send/recv Fix error: self.socket.send("%s\r" % request) TypeError: a bytes-like object is required, not 'str' * scripts/osmotestconfig.py: use encode() before writing to file Fix error: File "/home/user/code/osmo-dev/src/osmo-python-tests/scripts/osmotestconfig.py", line 91, in copy_config tmpfile.write(open(config).read()) File "/usr/lib/python3.5/tempfile.py", line 622, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' * debian/control: add --buildsystem=pybuild. Otherwise "--with python3" is ignored and the build fails if python2 is not installed, with: Can't exec "pyversions": No such file or directory at /usr/[...]/python_distutils.pm line 120. Related: OS#2819 Change-Id: I3ffc3519bf6c22536a49dad7a966188ddad351a7
2019-12-06Revert "Drop python2 support"Oliver Smith13-22/+71
This reverts commit fb1dc7c405f6114687338382149bfc775597935a. I was under the impression, that all previous scripts were already working with python 3. But as it turns out, this isn't true. Reverting, so I can properly post follow-up patches, that fix the issues before we apply this "drop python2" patch again. Related: OS#2819 Change-Id: Ic1559d1a9f7839fa86a841d62a04b22e1caed466
2019-12-05Drop python2 supportOliver Smith13-71/+22
Remove all compatibility code for python2. All scripts are already python 3 compatible since I80e5850a8978d78cda793e2192ef4bd3fd54a121 and I1b4a629f12863c498a8681b555f57b4e255cebfb. dpkg-buildpackage shows that it is still invoking setup.py with python in addition to python3, on debian stretch. But after spending quite some time on trying to convince it to not care about python2 without success (trying different variables, overrides, --without python2 flags etc.), I'm leaving it as is. The resulting package is the python3 package, which is what we want. Related: OS#2819 Change-Id: Iabda95073faa2191fd117e9637e0858c589e9d9e
2019-10-31osmo_interact_vty.py: fix py3 encoding bugNeels Hofmeyr1-1/+1
That code in common.py is hit when invoking via osmo_interact_vty.py. It has a unicode string already, its attempt to decode hits a python exception (no 'decode' method). Must be a long standing bug that no-one saw because we're only ever using the osmo_verify_transcript_vty.py variant. Change-Id: I1b4a629f12863c498a8681b555f57b4e255cebfb
2019-08-23vty.py: Fix endl removed when pkt buffer content ends exactly on a newline charosmith/before-py2-dropPau Espin Pedrol1-3/+10
As a result, osmo_interact_vty.py was printing incorrect output: """ - <param name='shutdown' doc='Remove the APN from administrative shut-down' /> - </params> + <param name='shutdown' doc='Remove the APN from administrative shut-down' /> </params """ Change-Id: Ib1dbf39db1b27331ea4c39051e550a87780d9f76
2019-07-08tweak READMENeels Hofmeyr1-5/+15
Most importantly, mention 'python3 setup.py'. Tweak indenting and some wording. Change-Id: Id8c277de280b54d04edcafa77ed93017d6da473d
2019-06-26osmo_trap2cgi.py: Don't recurse in ctrl_client()Daniel Willmann1-15/+18
Use a loop instead. Without it the script will eventually crash with a RecursionError. File "/usr/bin/osmo_trap2cgi.py", line 211, in conn_client await ctrl_client(proxy, reader, writer) File "/usr/bin/osmo_trap2cgi.py", line 202, in ctrl_client proxy.dispatch(wr, data) [...] File "/usr/bin/osmo_trap2cgi.py", line 202, in ctrl_client proxy.dispatch(wr, data) File "/usr/bin/osmo_trap2cgi.py", line 201, in ctrl_client [...] RecursionError: maximum recursion depth exceeded in comparison Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Related: SYS#4399
2019-06-19osmo-trap2cgi: Remove invalid specifier for /etcDaniel Willmann1-1/+1
On prod-bscnat the specifier %E (for /etc) does not exist so let's not use it. Change-Id: Ia3d8838475c2cc8f9f4ba3a0bc5483c6e1645f8f Related: SYS#4399
2019-03-26deb: fix wrong changelog dateMax1-1/+1
Issue was discovered with lintian - likely a copy-paste error. Change-Id: Ie73b1f29bd13e68e9b5e05896f1f048bc8108d17
2019-02-04osmo-trap2cgi: Fix script installation and dependenciesDaniel Willmann2-1/+2
* Install systemd file with debian * Depend on python3-aiohttp in python3-osmopy-utils as it is required for osmo-trap2cgi Related: SYS#4399 Sponsored-by: On-Waves ehf Change-Id: I6add5f37b63dd5fcfdefe0459b539e0050d03897
2019-01-08Add initial version of asyncio trap2cgi scriptMax5-1/+247
It uses the same config file format to simplify migration from ctrl2cgi.py Change-Id: I7428cbfbc9f1b80ce42a70be555a38a3497d1cf9 Related: SYS#4399
2019-01-07ctrl2cgi: update shared helperMax2-24/+32
* split hash generation into simpler functions * move them into helper file * split log init into separate function This facilitates code sharing with new version of ctrl2cgi proxy in folow-up patches. Change-Id: Ic5c349349d2c246f934d6701435b1a2d9de77de1 Related: SYS#4399
2019-01-07Mark soap.py as deprecatedMax1-1/+1
It might be removed in one of the future releases as we move away from Twisted. Let's mark it as deprecated to make sure it won't be a surprise. Change-Id: Iefd69e7712d456e3bc42c3277bbfa103a2448bb6
2019-01-07ctrl2cgi: update default parameters in configMax1-0/+2
Change-Id: I8e013fefaafb3f2417701676a74d499e44b30191
2018-12-23ctrl2cgi: explicitly ignore unrelated TRAPsMax1-12/+6
Previously we've tried to determine the type of TRAP and handle as many as possible via generic method dispatcher similar to parent class. Let's make code simpler by explicitly ignoring all but 'location-state' TRAPs. This should also reduce debug log output because we'll only log the TRAP variable for ignored messages instead of entire content. Change-Id: I42b715cb82eb309950ff387649726504b6c7cf61 Related: SYS#4399
2018-12-21ctrl2cgi: update commentsMax1-2/+7
* remove obsolete comments * add missing function comments Change-Id: I5ace594adbccf7ce7eda2c19aa639a4f46285c25
2018-12-21ctrl2cgi: account wait and http times separatelyMax1-4/+13
Save and propagate separate timestamp for HTTP request duration to distinguish between time spent waiting on connection limit availability from actual http request time. Change-Id: I14d1db5206864ac9ab7c64f96f67139113ab3fcf Related: SYS#4399
2018-12-13scripts/*.py: mark as executableOliver Smith4-0/+0
osmo-mgw's configure.ac won't find osmotestvty.py, unless it is executable. This allows passing its ./configure with placing the scripts dir of osmo-python-tests in PATH, instead of installing it. Change-Id: If6cefd32d0dc544093db08efc114db86b9bb18b0
2018-12-06twisted: remove low-level logging in dispatchersMax1-2/+0
The same messages are better handled in derived classes using message-specific functions instead of generic dispatchers. Change-Id: I4a054eec9ef7ab39e15ac0cd64834a251d4fb2d7
2018-12-06Trap handlers: adjust http error logMax2-2/+2
Log repr() of error because it's more conscience which makes it easier to read the logs: in case of "e" there's additional "Failure instance: Traceback (failure with no frames)" prefix which is pretty useless because we won't have proper tracebacks for deferred anyway. Change-Id: I39870b83cacee9a589636974d04e356ef0d32345
2018-12-05ctrl2cgi: make http request timeout configurableMax1-5/+6
Change-Id: I7839121da831aeab0be7e599049bf79471f845fd Related: SYS#4399
2018-12-05ctrl2cgi: log request timeMax1-6/+9
Log http request timestamp and duration on debug loglevel. This is especially helpful while troubleshooting issues with multiple concurrent requests under significant load while network issues are present. Change-Id: I11c8ac67a2730a9c6912694e5b83bbdf08fe357d Related: SYS#4399
2018-12-05Trap handlers: log request/reply as info levelMax3-3/+3
Log the basic location-state trap triggering request and command reply as info level - that way we can receive useful information without turning on full debug output. Change-Id: If8eae9f36292930571954becf6613fada43d301c
2018-12-05Trap handlers: propagate expected BSC id to command processorMax3-8/+8
When receiving commands for particular BSC, log BSC id known at the time when request was made, not the one which is part of the reply. Change-Id: I6acdfddb9a1132f978f2b55c769559b0c29eb3e8
2018-12-05ctrl2cgi: add config file exampleMax1-0/+5
Change-Id: I1e5c37a75cf21184d5bd3ef01b452d45c8f6d7ac
2018-12-05ctrl2cgi: properly limit number of requestsMax1-8/+8
Manual acquire()/release() of semaphore does not limit number of concurrent requests when combined with explicit yield. Fix this by using semaphore.run() and removing inilineCallbacks decorator. Change-Id: I47b8b9f5b726ca0905bb7c023d63b325c7f7d85f Related: SYS#4399
2018-12-05ctrl2cgi: fix broken config overrideMax1-45/+21
Previously command-line arguments without defaults took precedence over config file variables while values from config file which had command-line counterparts with default value were silently ignored. Let's fix this by making config file option mandatory values and removing overlap between command-line and config file parameters. Change-Id: I471b5a6497eadce6456e835233fdaba88a593324 Related: SYS#4399
2018-12-05Trap handlers: always log to stdoutMax4-9/+5
Since the scripts are intended to be used as systemd services, there's no need in separate logging via syslog: systemd will take care of properly collecting and storing script output. Hence we can drop extra options and function parameters. Change-Id: Ifcad1877d45d43b3a2e617775a1c9b256e190591 Related: SYS#4399
2018-11-28Improve code styleMax3-23/+21
* reorder imports to make pylint3 happy * drop unused imports * use proper spacing for list constants * don't use reserved names for internal variables The check was run as follows: pylint3 -d C0103,C0301,C0410,C0326,R0913,R0901 ... to disable useless warnings. Change-Id: I5b90ee790f73dc509081401776911f25e43f1801
2018-11-28Move command processing into shared functionMax3-15/+19
Change-Id: I4e40607a9aa5e03a7b3f5b68e4261828209a5813
2018-11-28Drop unused Trap() classMax1-59/+0
Change-Id: Ic2066a66f99a059fc65cf3092170e248288c04d4
2018-11-28ctrl2cgi: fix deferred callbacksMax1-18/+7
Previously handle_reply() was marked as deferred callback unlike soap.py where it's synchronous function. This seems to be causing issues where some of the callbacks are not yield properly. Let's move to the known-to-work semantics of soap.py where async functions are limited to Trap() class. Change-Id: Ib2c28dd7f79cbd28d475de93750703659ddd18f1 Related: SYS#4399
2018-11-28osmo_ctrl.py: properly ignore out-of-order trapsMax1-1/+7
Sometimes when we set variable we might receive arbitrary number of TRAP messages before we get SET_REPLY. Those could be either separate messages or combined together with SET_REPLY depending on tcp buffering at server side. Let's handle this gracefully by skipping over all TRAP messages. An example command which often triggers this behavior: ./osmo_ctrl.py -s -d 127.0.0.1 -p 4249 bts.0.location (date +%s)",fix2d,1,2,3" Change-Id: Ia6de02c2f13a56f0381c97a9ab02c6c7a31cc32f Related: SYS#4399
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 04:18:37 +0000