fix MTU parameter in egress-v4-cni plugin

cmd/aws-vpc-cni/main.go

@@ -217,19 +217,12 @@ func isValidJSON(inFile string) error {
 	return json.Unmarshal([]byte(inFile), &result)
 }
 
-func generateJSON(jsonFile string, outFile string) error {
+func generateJSON(jsonFile string, outFile string, nodeIP string) error {
 	byteValue, err := ioutil.ReadFile(jsonFile)
 	if err != nil {
 		return err
 	}
 
-	var nodeIP string
-	nodeIP, err = getNodePrimaryV4Address()
-	if err != nil {
-		log.Errorf("Failed to get Node IP")
-		return err
-	}
-
 	vethPrefix := getEnv(envVethPrefix, defaultVethPrefix)
 	mtu := getEnv(envEniMTU, defaultMTU)
 	podSGEnforcingMode := getEnv(envPodSGEnforcingMode, defaultPodSGEnforcingMode)
@@ -391,8 +384,16 @@ func _main() int {
 	//	return 1
 	//}
 
+	// Get node IP for conflist
+	var nodeIP string
+	nodeIP, err = getNodePrimaryV4Address()
+	if err != nil {
+		log.Errorf("Failed to get Node IP, error: %v", err)
+		return 1
+	}
+
 	log.Infof("Copying config file... ")
-	err = generateJSON(defaultAWSconflistFile, tmpAWSconflistFile)
+	err = generateJSON(defaultAWSconflistFile, tmpAWSconflistFile, nodeIP)
 	if err != nil {
 		log.WithError(err).Errorf("Failed to generate 10-awsconflist")
 		return 1

cmd/aws-vpc-cni/main_test.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	awsConflist = "../../misc/10-aws.conflist"
+	devNull     = "/dev/null"
+	nodeIP      = "10.0.0.0"
+)
+
+// Validate that generateJSON runs against default conflist without error
+func TestGenerateJSON(t *testing.T) {
+	err := generateJSON(awsConflist, devNull, nodeIP)
+	assert.NoError(t, err)
+}
+
+// Validate that generateJSON runs without error when bandwidth plugin is added to default conflist
+func TestGenerateJSONPlusBandwidth(t *testing.T) {
+	_ = os.Setenv(envEnBandwidthPlugin, "true")
+	err := generateJSON(awsConflist, devNull, nodeIP)
+	assert.NoError(t, err)
+}

misc/10-aws.conflist

@@ -15,7 +15,7 @@
     {
       "name": "egress-v4-cni",
       "type": "egress-v4-cni",
-      "mtu": 9001,
+      "mtu": "9001",
       "enabled": "__EGRESSV4PLUGINENABLED__",
       "randomizeSNAT": "__RANDOMIZESNAT__",
       "nodeIP": "__NODEIP__",
@@ -34,4 +34,4 @@
       "snat": true
     }
   ]
-}
+}