Bugfix and suppress MTU feature

redhat-nfvpe · Mar 27, 2019 · d5ca935 · d5ca935
1 parent 09665c1
commit d5ca935
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/cmd/kokotap/kokotap.go b/cmd/kokotap/kokotap.go
@@ -48,6 +48,7 @@ type kokotapPodArgs struct {
 	ContainerRuntime string
 	PodName          string
 	VxlanID          int
+	VxlanPort        int // UDP port, optional
 	IFName           string
 	Sender           struct {
 		Node          string
@@ -128,12 +129,13 @@ spec:
 		senderPod, podargs.Sender.Node, senderPod, podargs.Image,
 		podargs.Sender.ContainerID,
 		podargs.Sender.MirrorType, podargs.Sender.MirrorIF, podargs.IFName,
-		podargs.Sender.VxlanEgressIP, podargs.Sender.VxlanIP, podargs.VxlanID)
+		podargs.Sender.VxlanEgressIP, podargs.Sender.VxlanIP, podargs.VxlanID, podargs.VxlanPort)
 
 	if podargs.Receiver.Node != "" {
 		yaml = yaml + fmt.Sprintf(kokoTapPodDockerReceiverTemplate,
 			receiverPod, podargs.Receiver.Node, receiverPod, podargs.Image,
-			podargs.IFName, podargs.Receiver.VxlanEgressIP, podargs.Receiver.VxlanIP, podargs.VxlanID)
+			podargs.IFName, podargs.Receiver.VxlanEgressIP, podargs.Receiver.VxlanIP,
+			podargs.VxlanPort, podargs.VxlanID)
 	}
 
 	return yaml
@@ -196,12 +198,13 @@ spec:
 		senderPod, podargs.Sender.Node, senderPod, podargs.Image,
 		podargs.Sender.ContainerID,
 		podargs.Sender.MirrorType, podargs.Sender.MirrorIF, podargs.IFName,
-		podargs.Sender.VxlanEgressIP, podargs.Sender.VxlanIP, podargs.VxlanID)
+		podargs.Sender.VxlanEgressIP, podargs.Sender.VxlanIP, podargs.VxlanID, podargs.VxlanPort)
 
 	if podargs.Receiver.Node != "" {
 		yaml = yaml + fmt.Sprintf(kokoTapPodCrioReceiverTemplate,
 			receiverPod, podargs.Receiver.Node, receiverPod, podargs.Image,
-			podargs.IFName, podargs.Receiver.VxlanEgressIP, podargs.Receiver.VxlanIP, podargs.VxlanID)
+			podargs.IFName, podargs.Receiver.VxlanEgressIP, podargs.Receiver.VxlanIP,
+			podargs.VxlanPort, podargs.VxlanID)
 	}
 
 	return yaml
@@ -254,6 +257,7 @@ func (podargs *kokotapPodArgs) ParseKokoTapArgs(args *kokotapArgs) error {
 	podargs.Sender.MirrorType = args.MirrorType
 	podargs.Sender.MirrorIF = args.PodIFName
 	podargs.VxlanID = args.VxlanID
+	podargs.VxlanPort = args.VxlanPort
 
 	if args.DestNode != "" && args.DestIP == nil {
 		destNode, err := kubeClient.GetNode(args.DestNode)

diff --git a/cmd/kokotap_pod/kokotap_pod.go b/cmd/kokotap_pod/kokotap_pod.go
@@ -223,13 +223,15 @@ func main() {
 		done <- true
 	}()
 
-	var egressMTU int
+	//var egressMTU int
 	var egressTxQLen int
 	if veth.MirrorEgress != "" {
-		egressMTU, err = koko.GetMTU(veth.MirrorEgress)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "XXX:%v\n", err)
-		}
+		/*
+			egressMTU, err = koko.GetMTU(veth.MirrorEgress)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "XXX:%v\n", err)
+			}
+		*/
 		egressTxQLen, err = veth.GetEgressTxQLen()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "XXX:%v\n", err)
@@ -246,10 +248,12 @@ func main() {
 
 	// Cleanup
 	if veth.MirrorEgress != "" {
-		err = koko.SetMTU(veth.MirrorEgress, egressMTU)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "XXX:%v\n", err)
-		}
+		/*
+			err = koko.SetMTU(veth.MirrorEgress, egressMTU)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "XXX:%v\n", err)
+			}
+		*/
 		err = veth.SetEgressTxQLen(egressTxQLen)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "XXX:%v\n", err)