vlan: Fail when unknown command line parameters are being passed

[people/ms/network.git] / src / hooks / ports / vlan

diff --git a/src/hooks/ports/vlan b/src/hooks/ports/vlan
index 5457c54445f86565786297a6a36ef9ffac002906..39dbfffb9f3a762289f872a0183d8c443e2f3f9a 100644 (file)
--- a/src/hooks/ports/vlan
+++ b/src/hooks/ports/vlan
@@ -21,11 +21,15 @@
 
 . /usr/lib/network/header-port
 
-HOOK_SETTINGS="HOOK ADDRESS PARENT_DEVICE TAG"
+HOOK_SETTINGS=(
+       "ADDRESS"
+       "PARENT_DEVICE"
+       "TAG"
+)
 
 PORT_PARENTS_VAR="PARENT"
 
-function hook_check() {
+hook_check_settings() {
        assert isset PARENT_DEVICE
        assert isinteger TAG
 
@@ -47,87 +51,67 @@ function hook_check() {
        done
 }
 
-function hook_create() {
+hook_find_port_name() {
+       assert isset PARENT_DEVICE
+       assert isset TAG
+
+       print "${PARENT_DEVICE}${VLAN_PORT_INTERFIX}${TAG}"
+}
+
+hook_parse_cmdline() {
        while [ $# -gt 0 ]; do
                case "${1}" in
                        --parent-device=*)
-                               PARENT_DEVICE=$(cli_get_val ${1})
+                               PARENT_DEVICE=$(cli_get_val "${1}")
                                ;;
                        --address=*)
-                               ADDRESS=$(cli_get_val ${1})
+                               ADDRESS=$(cli_get_val "${1}")
+
+                               # Validate address
+                               if ! mac_is_valid "${ADDRESS}"; then
+                                       error "Invalid MAC address given: ${ADDRESS}"
+                                       return ${EXIT_CONF_ERROR}
+                               fi
                                ;;
                        --tag=*)
-                               TAG=$(cli_get_val ${1})
+                               TAG=$(cli_get_val "${1}")
                                ;;
-                       *)
-                               warning "Unknown argument '${1}'"
+                       -*)
+                               error "Unknown argument '${1}'"
+                               return ${EXIT_CONF_ERROR}
                                ;;
                esac
                shift
        done
 
-       local port="${PARENT_DEVICE}${VLAN_PORT_INTERFIX}${TAG}"
-
-       port_settings_write "${port}" ${HOOK_SETTINGS}
-
-       exit ${EXIT_OK}
-}
-
-function hook_edit() {
-       local port=${1}
-       assert isset port
-       shift
-
-       port_settings_read "${port}" ${HOOK_SETTINGS}
-
-       while [ $# -gt 0 ]; do
-               case "${1}" in
-                       --address=*)
-                               ADDRESS=$(cli_get_val ${1})
-                               ;;
-                       *)
-                               warning "Unknown argument '${1}'"
-                               ;;
-               esac
-               shift
-       done
-
-       port_settings_write "${port}" ${HOOK_SETTINGS}
-
-       exit ${EXIT_OK} 
+       # Generate a random MAC address if none given
+       if ! isset ADDRESS; then
+               ADDRESS="$(mac_generate)"
+       fi
 }
 
-function hook_up() {
-       local port=${1}
+hook_create() {
+       local port="${1}"
        assert isset port
 
-       if ! device_exists ${port}; then
-               # Read configuration file.
-               port_settings_read "${port}" ${HOOK_SETTINGS}
+       device_exists "${port}" && exit ${EXIT_OK}
 
-               vlan_create ${port} ${PARENT_DEVICE} ${TAG} ${ADDRESS}
-       fi
+       # Read configruation
+       port_settings_read "${port}"
 
-       # Bring up the device.
-       device_set_up ${port}
+       # Create the VLAN device
+       vlan_create "${port}" "${PARENT_DEVICE}" "${TAG}" "${ADDRESS}"
 
        exit ${EXIT_OK}
 }
 
-function hook_down() {
-       local port=${1}
+hook_remove() {
+       local port="${1}"
        assert isset port
 
-       # Exit, if the port does not exist.
-       if ! device_exists ${port}; then
-               exit ${EXIT_OK}
+       if device_exists "${port}"; then
+               vlan_remove "${port}"
        fi
 
-       # Tear down the port.
-       device_set_down ${port}
-
-       # Remove the port.
-       vlan_remove ${port}
-
        exit ${EXIT_OK}
 }