network August 2018

network@lists.ipfire.org

2 participants
2 discussions

[PATCH] Fix hook for static address configuration.
by Stefan Schantl 15 Sep '18

15 Sep '18

Add the required hook_new function and "id" information which have been introduced in earlier commits to make this hook work again. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/hooks/configs/static | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/hooks/configs/static b/src/hooks/configs/static index 91bba8a..37f3d32 100644 --- a/src/hooks/configs/static +++ b/src/hooks/configs/static @@ -52,6 +52,8 @@ hook_check_config_settings() { hook_parse_cmdline() { local protocol + local id="${1}" + shift while [ $# -gt 0 ]; do case "${1}" in @@ -153,12 +155,34 @@ hook_parse_cmdline() { fi # Check any conflicts - if zone_config_check_same_setting "${zone}" "static" "ADDRESS" "${ADDRESS}"; then + if zone_config_check_same_setting "${zone}" "static" "${id}" "ADDRESS" "${ADDRESS}"; then error "A static configuration with the same address is already configured" return ${EXIT_CONF_ERROR} fi } +hook_new() { + local zone="${1}" + shift + + if zone_config_hook_is_configured ${zone} "static"; then + log ERROR "You can configure the static hook only once for a zone" + return ${EXIT_ERROR} + fi + + local id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then + # Return an error if the parsing of the cmd line fails + return ${EXIT_ERROR} + fi + + zone_config_settings_write "${zone}" "${HOOK}" "${id}" + + exit ${EXIT_OK} +} + hook_up() { local zone="${1}" local config="${2}" -- 2.17.1

3 3

[PATCH 1/2] Add new test zone-new-bridge
by Jonatan Schlag 11 Aug '18

11 Aug '18

This test checks if we can create a new zone of type bridge. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 15 +++++++++------ test/nitsi/test/zone-new-bridge/.gitignore | 3 +++ test/nitsi/test/zone-new-bridge/recipe | 9 +++++++++ test/nitsi/test/zone-new-bridge/settings.in | 9 +++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 test/nitsi/test/zone-new-bridge/.gitignore create mode 100644 test/nitsi/test/zone-new-bridge/recipe create mode 100644 test/nitsi/test/zone-new-bridge/settings.in diff --git a/Makefile.am b/Makefile.am index 4a0c4ea..1ea715e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -601,21 +601,24 @@ CLEANFILES += \ NITSI_TESTS = \ test/nitsi/test/hello-world \ test/nitsi/test/make-check \ - test/nitsi/test/raw-device-get-by-mac + test/nitsi/test/raw-device-get-by-mac \ + test/nitsi/test/zone-new-bridge EXTRA_DIST += \ test/nitsi/test/hello-world/recipe \ test/nitsi/test/hello-world/settings \ test/nitsi/test/make-check/recipe.in \ - test/nitsi/test/make-check/settings.in - test/nitsi/test/raw-device-get-by-mac/recipe\ - test/nitsi/test/raw-device-get-by-mac/settings.in - + test/nitsi/test/make-check/settings.in \ + test/nitsi/test/raw-device-get-by-mac/recipe \ + test/nitsi/test/raw-device-get-by-mac/settings.in \ + test/nitsi/test/zone-new-bridge/recipe \ + test/nitsi/test/zone-new-bridge/settings.in CLEANFILES += \ test/nitsi/test/make-check/recipe \ test/nitsi/test/make-check/settings \ - test/nitsi/test/raw-device-get-by-mac/settings + test/nitsi/test/raw-device-get-by-mac/settings \ + test/nitsi/test/zone-new-bridge/settings NITSI_ENVIRONMENT = diff --git a/test/nitsi/test/zone-new-bridge/.gitignore b/test/nitsi/test/zone-new-bridge/.gitignore new file mode 100644 index 0000000..8a9bd77 --- /dev/null +++ b/test/nitsi/test/zone-new-bridge/.gitignore @@ -0,0 +1,3 @@ +/log +/recipe.log +/settings diff --git a/test/nitsi/test/zone-new-bridge/recipe b/test/nitsi/test/zone-new-bridge/recipe new file mode 100644 index 0000000..d6dcfb7 --- /dev/null +++ b/test/nitsi/test/zone-new-bridge/recipe @@ -0,0 +1,9 @@ +include: ../../include/make-install +include: ../../include/network-settings +include: ../../include/network-reset +alice: network zone new upl0 bridge +# this returns zero if the device exists +alice: ip link show upl0 +alice: ls /sys/class/net/upl0 +# check that the config dir exists +alice: ls /etc/network/zones/upl0 diff --git a/test/nitsi/test/zone-new-bridge/settings.in b/test/nitsi/test/zone-new-bridge/settings.in new file mode 100644 index 0000000..207cfa0 --- /dev/null +++ b/test/nitsi/test/zone-new-bridge/settings.in @@ -0,0 +1,9 @@ +[GENERAL] +name = zone-new-bridge +description = This test checks if we can create a new zone of the type 'bridge' + +copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz +copy_to = /root/ + +[VIRTUAL_ENVIRONMENT] +path = ../../virtual-environment/basic -- 2.11.0

1 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network August 2018