Merge pull request #906 from BSWANG/main

fix vf config format

Author: l1b0k

plugin/driver/vf/vf.go

@@ -28,8 +28,17 @@ type Configs struct {
 	EniVFs []*Config `json:"eniVFs"`
 }
 
-func parse(config []byte) (*Configs, error) {
+func parse(path string, config []byte) (*Configs, error) {
 	var configs Configs
+	if path == defaultNUSAConfigPath {
+		configs.EniVFs = make([]*Config, 0)
+		err := json.Unmarshal(config, &configs.EniVFs)
+		if err != nil {
+			return nil, err
+		}
+		return &configs, nil
+	}
+
 	err := json.Unmarshal(config, &configs)
 	if err != nil {
 		return nil, err
@@ -45,7 +54,7 @@ func GetBDFbyVFID(path string, vfID int) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	config, err := parse(configContent)
+	config, err := parse(path, configContent)
 	if err != nil {
 		return "", err
 	}

plugin/driver/vf/vf_test.go

@@ -9,6 +9,37 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestParse(t *testing.T) {
+	t.Run("valid config eni controller", func(t *testing.T) {
+		config := []byte(`[{"bdf": "0000:1:1.6","mac": "cc:48:15:ff:00:09","vf_id": 9,"pf_id": 2}]`)
+		configs, err := parse(defaultNUSAConfigPath, config)
+		require.NoError(t, err)
+		assert.Len(t, configs.EniVFs, 1)
+		assert.Equal(t, "0000:1:1.6", configs.EniVFs[0].BDF)
+		assert.Equal(t, 9, configs.EniVFs[0].VfID)
+		assert.Equal(t, 2, configs.EniVFs[0].PfID)
+	})
+	t.Run("invalid config eni controller", func(t *testing.T) {
+		config := []byte(`{"eniVFs": [{ "pf_id": 0,"vf_id": 0,"bdf": "0000:1:2.5"}]}`)
+		_, err := parse(defaultNUSAConfigPath, config)
+		require.NotNil(t, err)
+	})
+	t.Run("valid config vpc eni agent", func(t *testing.T) {
+		config := []byte(`{"eniVFs": [{"pf_id": 1,"vf_id": 9,"bdf": "0000:1:1.6"}]}`)
+		configs, err := parse("/var/run/hc-eni-host/vf-topo-vpc", config)
+		require.NoError(t, err)
+		assert.Len(t, configs.EniVFs, 1)
+		assert.Equal(t, "0000:1:1.6", configs.EniVFs[0].BDF)
+		assert.Equal(t, 9, configs.EniVFs[0].VfID)
+		assert.Equal(t, 1, configs.EniVFs[0].PfID)
+	})
+	t.Run("invalid config vpc eni agent", func(t *testing.T) {
+		config := []byte(`[{"bdf": "0000:1:1.6","mac": "cc:48:15:ff:00:09","vf_id": 9,"pf_id": 2}]`)
+		_, err := parse("/var/run/hc-eni-host/vf-topo-vpc", config)
+		require.NotNil(t, err)
+	})
+}
+
 // TestGetPFBDF tests the getPFBDF function with mocked sysfs structure
 func TestGetPFBDF(t *testing.T) {
 	t.Run("invalid BDF format", func(t *testing.T) {