Merge pull request #125 from kazubu/feature/preconf

feature: preconf

Author: slankdev

command_func.go

@@ -244,6 +244,13 @@ func CmdConf(c *cli.Context) error {
 		nodeinfo[node.Name] = node.Type
 	}
 
+	if len(tnconfig.PreConf) != 0 {
+		for _, preConf := range tnconfig.PreConf {
+			preConfCmds := shell.ExecCmd(preConf.Cmds)
+			utils.PrintCmds(os.Stdout, preConfCmds, verbose)
+		}
+	}
+
 	for _, nodeConfig := range tnconfig.NodeConfigs {
 		execConfCmds := nodeConfig.ExecConf(nodeinfo[nodeConfig.Name])
 		for _, execConfCmd := range execConfCmds {

configs/spec_template.yaml

@@ -2,6 +2,9 @@ precmd:
 - cmds:
   - cmd: ""
 preinit:
+- cmds:
+  - cmd: ""
+preconf:
 - cmds:
   - cmd: ""
 postinit:

internal/pkg/shell/shell.go

@@ -19,6 +19,7 @@ var log = l.New()
 type Tn struct {
 	PreCmd      []PreCmd     `yaml:"precmd"`
 	PreInit     []PreInit    `yaml:"preinit"`
+	PreConf     []PreConf    `yaml:"preconf"`
 	PostInit    []PostInit   `yaml:"postinit"`
 	PostFini    []PostFini   `yaml:"postfini"`
 	Nodes       []Node       `yaml:"nodes" mapstructure:"nodes"`
@@ -38,6 +39,11 @@ type PreInit struct {
 	Cmds []Cmd `yaml:"cmds" mapstructure:"cmds"`
 }
 
+// PreConf
+type PreConf struct {
+	Cmds []Cmd `yaml:"cmds" mapstructure:"cmds"`
+}
+
 // PostInit
 type PostInit struct {
 	Cmds []Cmd `yaml:"cmds" mapstructure:"cmds"`
@@ -232,6 +238,13 @@ func GenerateFile() (genContent string, err error) {
 			},
 		},
 	}
+	preconf := PreConf{
+		Cmds: []Cmd{
+			Cmd{
+				Cmd: "",
+			},
+		},
+	}
 	postinit := PostInit{
 		Cmds: []Cmd{
 			Cmd{
@@ -341,6 +354,7 @@ func GenerateFile() (genContent string, err error) {
 	tnconfig := &Tn{
 		PreCmd:      []PreCmd{precmd},
 		PreInit:     []PreInit{preinit},
+		PreConf:     []PreConf{preconf},
 		PostInit:    []PostInit{postinit},
 		PostFini:    []PostFini{postfini},
 		Nodes:       []Node{nodes},

internal/pkg/shell/shell_test.go

@@ -229,6 +229,7 @@ func TestTn_Exec(t *testing.T) {
 	type fields struct {
 		PreCmd      []PreCmd
 		PreInit     []PreInit
+		PreConf     []PreConf
 		PostInit    []PostInit
 		PostFini    []PostFini
 		Nodes       []Node
@@ -253,6 +254,7 @@ func TestTn_Exec(t *testing.T) {
 			tnconfig := &Tn{
 				PreCmd:      tt.fields.PreCmd,
 				PreInit:     tt.fields.PreInit,
+				PreConf:     tt.fields.PreConf,
 				PostInit:    tt.fields.PostInit,
 				PostFini:    tt.fields.PostFini,
 				Nodes:       tt.fields.Nodes,