Output generated config_db.json to different file than the current one (#13)

Author: iljarotar

cmd/generate.go

@@ -15,7 +15,7 @@ var generateCmd = &cobra.Command{
 	Use:   "generate",
 	Short: "Generate a config_db.json",
 	Run: func(cmd *cobra.Command, args []string) {
-		configDBFile, _ := cmd.Flags().GetString("output")
+		configDBFile, _ := cmd.Flags().GetString("config-db")
 		configDBBytes, err := os.ReadFile(configDBFile)
 		if err != nil {
 			fmt.Printf("failed to read current config file, %v\n", err)
@@ -44,7 +44,7 @@ var generateCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		inputFile, _ := cmd.Flags().GetString("input")
+		inputFile, _ := cmd.Flags().GetString("input-file")
 		inputBytes, err := os.ReadFile(inputFile)
 		if err != nil {
 			fmt.Printf("failed to read input file, %v\n", err)
@@ -69,7 +69,8 @@ var generateCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = os.WriteFile(configDBFile, configDBBytes, 0644) //nolint:gosec
+		outputFile, _ := cmd.Flags().GetString("output-file")
+		err = os.WriteFile(outputFile, configDBBytes, 0644) //nolint:gosec
 		if err != nil {
 			fmt.Printf("failed to write file, %v", err)
 			os.Exit(1)
@@ -80,7 +81,8 @@ var generateCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(generateCmd)
 
-	generateCmd.Flags().StringP("input", "i", "sonic-config.yaml", "path to input file to generate the config_db.json from")
-	generateCmd.Flags().StringP("output", "o", "/etc/sonic/config_db.json", "path to output file")
+	generateCmd.Flags().StringP("input-file", "i", "sonic-config.yaml", "path to input file to generate the config_db.json from")
+	generateCmd.Flags().StringP("output-file", "o", "config_db.json", "path to output file")
 	generateCmd.Flags().String("device-dir", "/usr/share/sonic/device", "directory which holds all device-specific files")
+	generateCmd.Flags().StringP("config-db", "c", "/etc/sonic/config_db.json", "path to current config_db.json")
 }

tests/test.sh

@@ -1,26 +1,17 @@
 #!/bin/bash
 
-function test() {
-  test_dir=$1
-  cp $test_dir/current-config_db.json $test_dir/config_db.json
+for i in 1 2 3
+do
+  test_dir=$(pwd)/tests/$i
+  docker run --rm -v $(pwd)/tests/device:/usr/share/sonic/device:ro -v $test_dir:/sonic sonic-configdb-utils:local generate -c /sonic/current-config_db.json -i /sonic/sonic-config.yaml -o /sonic/config_db.json
+  diff --color=always $test_dir/expected.json $test_dir/config_db.json
 
-  docker run --rm -v $(pwd)/tests/device:/usr/share/sonic/device:ro -v $test_dir:/etc/sonic -v $test_dir:/sonic sonic-configdb-utils:local generate
-
-  if [ $? -eq 1 ]; then
-    rm -f $test_dir/config_db.json
+  if [[ $? != 0 ]]; then
+    echo TEST $i FAILED
+    rm -f $(pwd)/tests/$i/config_db.json
     exit 1
   fi
 
-  if [[ $(diff $test_dir/expected.json $test_dir/config_db.json) ]]; then
-    echo TEST in $test_dir FAILED
-    diff --color=always $test_dir/expected.json $test_dir/config_db.json
-    rm $test_dir/config_db.json
-    exit 1
-  fi
-
-  rm -f $test_dir/config_db.json
-}
-
-test $(pwd)/tests/1
-test $(pwd)/tests/2
-test $(pwd)/tests/3
+  echo TEST $i PASSED
+  rm -f $(pwd)/tests/$i/config_db.json
+done