try to retrieve platform from sonic-environment if not specified by flag

Author: iljarotar

cmd/generate.go

@@ -1,14 +1,14 @@
 package cmd
 
 import (
+	"bufio"
 	"encoding/json"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 
 	"github.com/metal-stack/sonic-configdb-utils/configdb"
-	"github.com/metal-stack/sonic-configdb-utils/platform"
+	p "github.com/metal-stack/sonic-configdb-utils/platform"
 	"github.com/metal-stack/sonic-configdb-utils/values"
 	"github.com/spf13/cobra"
 )
@@ -17,66 +17,62 @@ var generateCmd = &cobra.Command{
 	Use:   "generate",
 	Short: "Generate a config_db.json",
 	Run: func(cmd *cobra.Command, args []string) {
-		platformFile, _ := cmd.Flags().GetString("platform-file")
-		if platformFile == "" {
-			fmt.Println("missing platform.json file; please provide a platform.json file via --platform-file flag")
-			os.Exit(1)
+		configDir, _ := cmd.Flags().GetString("sonic-config-dir")
+
+		sonicPlatform, _ := cmd.Flags().GetString("platform")
+		if sonicPlatform == "" {
+			var err error
+			sonicPlatform, err = retrieveSonicPlatform(configDir)
+			if err != nil {
+				fmt.Printf("failed to retrieve sonic platform: %v\n", err)
+				os.Exit(1)
+			}
 		}
 
-		bytes, err := os.ReadFile(platformFile)
-		if err != nil {
-			fmt.Printf("failed to read platform.json file, %v\n", err)
-			os.Exit(1)
-		}
+		deviceDir, _ := cmd.Flags().GetString("device-dir")
+		platformFile := fmt.Sprintf("%s/%s/platform.json", deviceDir, sonicPlatform)
 
-		platform, err := platform.UnmarshalPlatformJSON(bytes)
+		platformBytes, err := os.ReadFile(platformFile)
 		if err != nil {
-			fmt.Printf("failed to parse platform.json, %v\n", err)
+			fmt.Printf("failed to read platform.json file: %v\n", err)
 			os.Exit(1)
 		}
 
-		inputFile, _ := cmd.Flags().GetString("input")
-		if inputFile == "" {
-			fmt.Println("missing input values; please provide an input file via --input flag")
+		platform, err := p.UnmarshalPlatformJSON(platformBytes)
+		if err != nil {
+			fmt.Printf("failed to parse platform.json: %v\n", err)
 			os.Exit(1)
 		}
 
-		bytes, err = os.ReadFile(inputFile)
+		inputFile, _ := cmd.Flags().GetString("input-file")
+		inputBytes, err := os.ReadFile(inputFile)
 		if err != nil {
 			fmt.Printf("failed to read input file, %v\n", err)
 			os.Exit(1)
 		}
 
-		values, err := values.UnmarshalValues(bytes)
+		values, err := values.UnmarshalValues(inputBytes)
 		if err != nil {
 			fmt.Printf("failed to parse input file, %v\n", err)
 			os.Exit(1)
 		}
 
-		config, err := configdb.GenerateConfigDB(values, platform)
+		configDB, err := configdb.GenerateConfigDB(values, platform)
 		if err != nil {
 			fmt.Printf("failed to generate config, %v\n", err)
 			os.Exit(1)
 		}
 
-		bytes, err = json.MarshalIndent(config, "", "  ")
+		configBytes, err := json.MarshalIndent(configDB, "", "  ")
 		if err != nil {
 			fmt.Printf("failed to serialize json, %v\n", err)
 			os.Exit(1)
 		}
 
-		fileInfo, err := os.Lstat(inputFile)
-		if err != nil {
-			fmt.Printf("failed to retrieve file info for %s, %v\n", inputFile, err)
-			os.Exit(1)
-		}
-
-		outputFile, _ := cmd.Flags().GetString("output")
-		if outputFile == "" {
-			outputFile = filenameWithoutExtension(inputFile) + ".json"
-		}
+		outputFileName, _ := cmd.Flags().GetString("output-file-name")
+		outputFile := fmt.Sprintf("%s/%s", configDir, outputFileName)
 
-		err = os.WriteFile(outputFile, bytes, fileInfo.Mode())
+		err = os.WriteFile(outputFile, configBytes, 0644)
 		if err != nil {
 			fmt.Printf("failed to write file, %v", err)
 			os.Exit(1)
@@ -87,11 +83,28 @@ var generateCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(generateCmd)
 
-	generateCmd.Flags().StringP("input", "i", "", "input file to generate the config_db.json from")
-	generateCmd.Flags().StringP("platform-file", "f", "", "path to a vendor-specific platform.json file")
-	generateCmd.Flags().StringP("output", "o", "", "output file")
+	generateCmd.Flags().String("device-dir", "/usr/share/sonic/device", "directory that holds all vendor specific files")
+	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-name", "o", "config_db.json", "output file name")
+	generateCmd.Flags().StringP("platform", "p", "", "sonic platform")
+	generateCmd.Flags().String("sonic-config-dir", "/etc/sonic", "where to store the generated config_db.json")
 }
 
-func filenameWithoutExtension(name string) string {
-	return strings.TrimSuffix(filepath.Base(name), filepath.Ext(name))
+func retrieveSonicPlatform(configDir string) (string, error) {
+	sonicEnvFile := fmt.Sprintf("%s/sonic-environment", configDir)
+	f, err := os.Open(sonicEnvFile)
+	if err != nil {
+		return "", err
+	}
+	defer f.Close()
+
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		if line := scanner.Text(); strings.Contains(line, "PLATFORM=") {
+			sonicPlatform, _ := strings.CutPrefix(line, "PLATFORM=")
+			return sonicPlatform, nil
+		}
+	}
+
+	return "", fmt.Errorf("no platform information found")
 }

…ected_1_x86_64-accton_as7726_32x-r0.json tests/1/expected.jsontests/expected_1_x86_64-accton_as7726_32x-r0.json renamed to tests/1/expected.json tests/expected_1_x86_64-accton_as7726_32x-r0.json renamed to tests/1/expected.json

@@ -0,0 +1,4 @@
+some irrelevant line
+PLATFORM=x86_64-accton_as7726_32x-r0
+some more irrelevant
+lines

…input_1_x86_64-accton_as7726_32x-r0.yaml tests/1/sonic-config.yamltests/input_1_x86_64-accton_as7726_32x-r0.yaml renamed to tests/1/sonic-config.yaml tests/input_1_x86_64-accton_as7726_32x-r0.yaml renamed to tests/1/sonic-config.yaml

@@ -0,0 +1,4 @@
+some irrelevant line
+PLATFORM=x86_64-accton_as7726_32x-r0
+some more irrelevant
+lines

tests/1/sonic-environment

@@ -0,0 +1,4 @@
+some irrelevant line
+PLATFORM=x86_64-accton_as4630_54te-r0
+some more irrelevant
+lines