]>
git.ipfire.org Git - nitsi.git/log
Jonatan Schlag [Fri, 29 Jun 2018 09:56:39 +0000 (11:56 +0200)]
Fix in back_at_prompt check
When we get a line startign with '[' and the prompt is already in the
buffer the pattern matches and we get wrong return code and are not back
at the prompt.
We now check if we have a line in the buffer and if so, we are not at
the prompt. The promtp is not terminated by \n
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 25 Jun 2018 10:51:43 +0000 (12:51 +0200)]
Make all class names CamelCase
Fixes: #11718
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 23 Jun 2018 07:59:39 +0000 (09:59 +0200)]
Fix check if we get an valid recipe file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 23 Jun 2018 07:53:58 +0000 (09:53 +0200)]
Add the ability to set all settings from the command line
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 23 Jun 2018 07:49:45 +0000 (09:49 +0200)]
Fix check if we get correct files for settings and recipe
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 23 Jun 2018 07:45:54 +0000 (09:45 +0200)]
Add new function settings_parse_copy_from
When we get the copy_from settings from the command line we need
different parsing as if we get the setting from a file.
To avoid code duplication I maked this a function useable at both places
in the code.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 21 Jun 2018 08:15:25 +0000 (10:15 +0200)]
Add better debugging messages
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 21 Jun 2018 08:11:53 +0000 (10:11 +0200)]
Initialize settings dict with defaults values
Even when we never change parts of the dict later we need to make sure that we
have at least some good default values in it.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 21 Jun 2018 07:52:21 +0000 (09:52 +0200)]
Support also a file as base for the log file dir
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 20 Jun 2018 12:04:48 +0000 (14:04 +0200)]
We can now run a test also from a standalone recipe file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 20 Jun 2018 09:57:00 +0000 (11:57 +0200)]
Add self.settings and store all settings in a dictionary
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 19 Jun 2018 11:21:03 +0000 (13:21 +0200)]
Provide fallback value if we fail to read the setting
We can now go on if we fail to get a setting.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 19 Jun 2018 08:37:14 +0000 (10:37 +0200)]
Rename DEFAULT section to GENERAL
DEFAULT is a special section of the configparser so we should not use
this as a section name.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 19 Jun 2018 08:30:46 +0000 (10:30 +0200)]
Make config parsing more robust against errors
This just catches any errors when we parse our config
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 19 Jun 2018 08:23:51 +0000 (10:23 +0200)]
Remove name from virtual_environment configuration
This option was never used and is useless
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 14 Jun 2018 07:17:02 +0000 (09:17 +0200)]
Parse settings completely before parsing the copy_from setting
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 14 Jun 2018 07:13:54 +0000 (09:13 +0200)]
Raise an exception when we do no found important files of a test
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 14 Jun 2018 07:12:55 +0000 (09:12 +0200)]
Allow including of recipe files
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 9 Jun 2018 12:15:34 +0000 (14:15 +0200)]
Make class names camel-case
Fixes: #11718
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 9 Jun 2018 12:14:28 +0000 (14:14 +0200)]
Improve logging of disk handling
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 9 Jun 2018 12:12:09 +0000 (14:12 +0200)]
Fix check if defining of network was successful
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 9 Jun 2018 11:47:35 +0000 (13:47 +0200)]
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/jschlag/nitsi
Jonatan Schlag [Sat, 9 Jun 2018 11:42:32 +0000 (13:42 +0200)]
Make all parameters in the ini file lower-case
Fixes: #11733
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 9 Jun 2018 11:42:32 +0000 (13:42 +0200)]
Make all parameters in the ini file lower-case
Fixes: #11733
Signed-off-by: Jonatan Schlag <jonatan@familyschlag.de>
Jonatan Schlag [Wed, 6 Jun 2018 14:32:05 +0000 (16:32 +0200)]
Supporting the a single statement in a recipe
We now can use the all statement without any other statements.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 6 Jun 2018 13:24:54 +0000 (15:24 +0200)]
Improve recipe parsing
We now allow empty lines and comments.
Fixes: #11746
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 6 Jun 2018 12:57:52 +0000 (14:57 +0200)]
Improve handling of file which should be copied into the image
We now check if a the file or directory exists and throw an exception
when not. We also handle absolute and relativ paths in the right way.
Fixes: #11748
Fixes: #11747
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 4 Jun 2018 08:39:35 +0000 (10:39 +0200)]
Set log level of login to info
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 4 Jun 2018 08:38:22 +0000 (10:38 +0200)]
Set the log level by command line argument
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 28 May 2018 13:03:33 +0000 (15:03 +0200)]
Improve log output
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 21 May 2018 08:12:18 +0000 (10:12 +0200)]
Catch exceptions to avoid crashing the cleanup
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 21 May 2018 08:03:36 +0000 (10:03 +0200)]
Raise exception instead of dropping them
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 21 May 2018 07:59:37 +0000 (09:59 +0200)]
machine: Improve log messages and stop process of a machine
We can now go on if the machine state was incomplete eg if no snapshot
was made.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 19 May 2018 08:48:52 +0000 (10:48 +0200)]
Improving error message and undefining of network objects
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 19 May 2018 08:46:50 +0000 (10:46 +0200)]
Fix logging name of networks
Before everything was logged under network.xml which is not useful
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Michael Tremer [Fri, 18 May 2018 13:33:59 +0000 (14:33 +0100)]
.gitignore: Don't list generated nitsi script as untracked file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Michael Tremer [Fri, 18 May 2018 13:33:58 +0000 (14:33 +0100)]
.gitignore: Don't list generated man pages as untracked files
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Michael Tremer [Fri, 18 May 2018 13:33:56 +0000 (14:33 +0100)]
man: Improve grammar, spelling and syntax of nitsi.recipe.5
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Michael Tremer [Fri, 18 May 2018 13:33:55 +0000 (14:33 +0100)]
man: Fix spelling, wording and formatting of nitsi.settings.5
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Michael Tremer [Fri, 18 May 2018 13:33:54 +0000 (14:33 +0100)]
man: the nitsi.settings and nitsi.recipe pages should be category 5
This is the correct category for file formats and is referenced
like this in nitsi.1 already.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Michael Tremer [Fri, 18 May 2018 13:33:53 +0000 (14:33 +0100)]
man: Fix spelling issues, wording and wrong page references in nitsi.1
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Michael Tremer [Fri, 11 May 2018 12:30:11 +0000 (13:30 +0100)]
Makefile: Ship nitsi.in in tarball
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Michael Tremer [Fri, 11 May 2018 12:30:09 +0000 (13:30 +0100)]
m4: Ship AX_PYTHON_MODULE
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Michael Tremer [Fri, 11 May 2018 12:30:08 +0000 (13:30 +0100)]
Makefile: Remove any excessive whitespace
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 16 May 2018 12:37:48 +0000 (14:37 +0200)]
Cleanup imports part 2
Fixes: #11717
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 16 May 2018 12:34:43 +0000 (14:34 +0200)]
Fix return codes once again
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 16 May 2018 12:16:30 +0000 (14:16 +0200)]
network: fix logging
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 16 May 2018 12:12:02 +0000 (14:12 +0200)]
Fix syntax and variable name in logging
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 14 May 2018 14:50:01 +0000 (16:50 +0200)]
Sort imports: part 1
Fixes: #11717
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 13 May 2018 17:17:21 +0000 (19:17 +0200)]
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/jschlag/nitsi
Jonatan Schlag [Sun, 13 May 2018 17:16:08 +0000 (19:16 +0200)]
Add main() function
Fixes: #11719
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 13 May 2018 15:49:22 +0000 (17:49 +0200)]
Fix argument parsing of '--version'
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 13 May 2018 15:18:59 +0000 (17:18 +0200)]
Improve return codes
This commit adds different return codes for erros in recipe parsing,
test errors and other errors.
We now return 1 when the test fails, 2 when the recipe parsing fails, 3
on other erros and 0 when everything works fine.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 11 May 2018 12:29:58 +0000 (14:29 +0200)]
Move tests and virtual environment example into examples subfolder
Fixes: #11723
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 11 May 2018 12:29:58 +0000 (14:29 +0200)]
Move tests and virtual environment example into examples subfolder
Fixes: #11723
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 11 May 2018 12:25:01 +0000 (14:25 +0200)]
Add man pages for nitsi
Fixes: #11722
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 9 May 2018 11:32:32 +0000 (13:32 +0200)]
Format the name in the log file always with the same length
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 9 May 2018 07:58:51 +0000 (09:58 +0200)]
Use one time to which all serial connection output is relativ
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 9 May 2018 07:42:28 +0000 (09:42 +0200)]
Add logging to test.log of all serial connection output
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 9 May 2018 07:36:40 +0000 (09:36 +0200)]
Log exeptions when we try to login
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Wed, 9 May 2018 07:35:20 +0000 (09:35 +0200)]
Add logger.py to makefile
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 7 May 2018 14:53:36 +0000 (16:53 +0200)]
Add logging to a general log file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 5 May 2018 18:17:50 +0000 (20:17 +0200)]
Add --version command
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 5 May 2018 15:31:50 +0000 (17:31 +0200)]
Add configure.ac and Makefile.am and make them work
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 5 May 2018 15:27:45 +0000 (17:27 +0200)]
Add .gitignore
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 1 May 2018 08:27:16 +0000 (10:27 +0200)]
Recipe: split only at the first occurrence of :
We would break break link like https:// when we split at anny occurrence
of :
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 1 May 2018 08:24:32 +0000 (10:24 +0200)]
Improve log messages in recipe.py
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 1 May 2018 08:23:20 +0000 (10:23 +0200)]
Log all messages to a recipe with the name of the corresponding test
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 1 May 2018 07:37:50 +0000 (09:37 +0200)]
Log all messages for a machine using the name of this machine
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 1 May 2018 07:36:36 +0000 (09:36 +0200)]
Set the log level of a serial connection to info
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 09:06:34 +0000 (11:06 +0200)]
We now use the logging module
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 09:05:02 +0000 (11:05 +0200)]
Add new test and improve our example test to show our new possibilities
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 09:03:58 +0000 (11:03 +0200)]
Remove now unuseful xml file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 08:35:25 +0000 (10:35 +0200)]
Update the settings of the virtual environment
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 08:34:32 +0000 (10:34 +0200)]
Update example test settings
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 08:32:50 +0000 (10:32 +0200)]
Do not exit when fail to load the recipe
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 08:31:10 +0000 (10:31 +0200)]
self.con is already the connection to the libvirt daemon
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sun, 29 Apr 2018 08:06:53 +0000 (10:06 +0200)]
Open only one connection to the libvirt daemon
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 15:49:25 +0000 (17:49 +0200)]
Add nitsi executable
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 15:46:51 +0000 (17:46 +0200)]
Move recipe class into an own file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 15:44:44 +0000 (17:44 +0200)]
Move network class into an own file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 14:31:17 +0000 (16:31 +0200)]
Move the virtual_environ class into an own file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 14:19:07 +0000 (16:19 +0200)]
Move machine class into an own file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 14:13:33 +0000 (16:13 +0200)]
Move the serial_connection class into a seperated file
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 13:57:46 +0000 (15:57 +0200)]
Rename the connection class to serial_connection
This reflects our naming scheme better
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 13:55:01 +0000 (15:55 +0200)]
Rename the vm class to machine
This reflects naming scheme better
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Fri, 27 Apr 2018 13:52:07 +0000 (15:52 +0200)]
Drop unused code
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Tue, 24 Apr 2018 07:25:45 +0000 (09:25 +0200)]
Support copying of files into all machines
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 23 Apr 2018 13:21:16 +0000 (15:21 +0200)]
Support comma seperated list of machines
We now support something like:
alice,bob: echo
Be carefull:
alice, bob:
will break our parsing
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 23 Apr 2018 13:04:42 +0000 (15:04 +0200)]
Add support for the all: statement
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 23 Apr 2018 11:40:04 +0000 (13:40 +0200)]
Always try to clean up all virtual machines and networks
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 23 Apr 2018 11:38:01 +0000 (13:38 +0200)]
Code cleanup in recipe parse
I cleaned up the code to avoid multiple identical code statements and to
improve readability.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Mon, 23 Apr 2018 11:28:00 +0000 (13:28 +0200)]
Add basic support for the include statement
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 21 Apr 2018 11:24:32 +0000 (13:24 +0200)]
Correctly handle exit codes
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 21 Apr 2018 11:23:47 +0000 (13:23 +0200)]
Return exit code of executed commands
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 21 Apr 2018 11:18:51 +0000 (13:18 +0200)]
login: also check lines for login, which do not start with a l
When we get 'alice login:' the lines do not start with an 'l' so we can
not assume that all lines which start not with an 'l' are not our login
line.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 21 Apr 2018 11:16:15 +0000 (13:16 +0200)]
On login print all lines without doing further processing
We increase the speed by 5 when we print all lines which are terminated
by \n when we get the full boot log. The line we a re logging for is not
terminated by \n
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Sat, 21 Apr 2018 11:01:07 +0000 (13:01 +0200)]
Add new function line_in_buffer
This functions check if we can read line out of our buffer.
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 19 Apr 2018 11:17:12 +0000 (13:17 +0200)]
Adapt the test to our current functionality
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Jonatan Schlag [Thu, 19 Apr 2018 11:16:37 +0000 (13:16 +0200)]
Add a working virtual environment config
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>