From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Aug 2015 12:30:33 +0000 (+0200)
Subject: config hooks: Rename hook functions to align with ports
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a6b2397ef175167b579e39bb3b5cbd08b5cbd8a;p=people%2Fstevee%2Fnetwork.git

config hooks: Rename hook functions to align with ports

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/bash-completion/network b/src/bash-completion/network
index a95490dc..a9579f86 100644
--- a/src/bash-completion/network
+++ b/src/bash-completion/network
@@ -332,7 +332,7 @@ _network_zone_subcommand() {
 	local args="${words[@]:1}"
 	case "${cmd}" in
 		config)
-			# TODO
+			_network_zone_subcommand_config "${zone}" ${args}
 			;;
 		port)
 			_network_zone_subcommand_port "${zone}" ${args}
@@ -340,6 +340,26 @@ _network_zone_subcommand() {
 	esac
 }
 
+_network_zone_subcommand_config() {
+	local zone="${1}"
+	shift
+
+	local words=( $@ )
+
+	local commands="new destroy"
+	local cmd="$(_network_find_on_cmdline "${commands}")"
+	if [[ -z "${cmd}" ]]; then
+		COMPREPLY=( $(compgen -W "${commands}" -- "${cur}") )
+		return 0
+	fi
+
+	case "${cmd}" in
+		new)
+			_network_complete_hooks "config"
+			;;
+	esac
+}
+
 _network_zone_subcommand_port() {
 	local zone="${1}"
 	shift
diff --git a/src/functions/functions.hook b/src/functions/functions.hook
index 88a99ff7..b99023d5 100644
--- a/src/functions/functions.hook
+++ b/src/functions/functions.hook
@@ -204,7 +204,7 @@ hook_valid_command_config() {
 	local cmd="${1}"
 
 	case "${cmd}" in
-		create|remove|edit|up|down|status)
+		new|destroy|edit|up|down|status)
 			return ${EXIT_TRUE}
 			;;
 	esac
@@ -249,7 +249,7 @@ hook_valid_command_zone() {
 			return ${EXIT_TRUE}
 			;;
 
-		config_create|config_edit|config_remove|config_show)
+		config_new|config_destroy|config_edit|config_show)
 			return ${EXIT_TRUE}
 			;;
 
diff --git a/src/functions/functions.zone b/src/functions/functions.zone
index c46cae94..6b924598 100644
--- a/src/functions/functions.zone
+++ b/src/functions/functions.zone
@@ -477,15 +477,15 @@ zone_config() {
 	assert zone_exists "${zone}"
 
 	case "${cmd}" in
-		create)
-			zone_config_create "${zone}" "$@"
+		new)
+			zone_config_new "${zone}" "$@"
+			;;
+		destroy)
+			zone_config_destroy "${zone}" "$@"
 			;;
 		edit)
 			zone_config_edit "${zone}" "$@"
 			;;
-		remove)
-			zone_config_remove "${zone}" "$@"
-			;;
 		*)
 			error "Unrecognized argument: ${cmd}"
 			cli_usage root-zone-config-subcommands
@@ -507,16 +507,16 @@ zone_config_cmd() {
 	hook_zone_exec "${hook}" "config_${cmd}" "${zone}" "$@"
 }
 
-zone_config_create() {
-	zone_config_cmd "create" "$@"
+zone_config_new() {
+	zone_config_cmd "new" "$@"
 }
 
-zone_config_edit() {
-	zone_config_cmd "edit" "$@"
+zone_config_destroy() {
+	zone_config_cmd "destroy" "$@"
 }
 
-zone_config_remove() {
-	zone_config_cmd "remove" "$@"
+zone_config_edit() {
+	zone_config_cmd "edit" "$@"
 }
 
 zone_config_show() {
diff --git a/src/header-config b/src/header-config
index 71cd5ad0..b697797b 100644
--- a/src/header-config
+++ b/src/header-config
@@ -18,3 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
+
+hook_new() {
+	cmd_not_implemented
+}
diff --git a/src/header-zone b/src/header-zone
index e9b7c913..c445d55f 100644
--- a/src/header-zone
+++ b/src/header-zone
@@ -162,7 +162,7 @@ hook_config() {
 
 	local ret
 	case "${action}" in
-		create|edit|rem|show)
+		new|destroy|edit|show)
 			hook_config_${action} "${zone}" "$@"
 			exit $?
 			;;
@@ -199,18 +199,18 @@ hook_config_cmd() {
 	hook_config_exec "${hook_config}" "${cmd}" "${zone}" "$@"
 }
 
-hook_config_create() {
+hook_config_new() {
 	assert [ $# -ge 2 ]
 
-	hook_config_cmd "create" "$@"
+	hook_config_cmd "new" "$@"
 }
 
-hook_config_edit() {
-	hook_config_cmd "edit" "$@"
+hook_config_destroy() {
+	hook_config_cmd "destroy" "$@"
 }
 
-hook_config_remove() {
-	hook_config_cmd "remove" "$@"
+hook_config_edit() {
+	hook_config_cmd "edit" "$@"
 }
 
 hook_config_show() {