Add support to use existing bridge NetworkAttachementDefinition (#175)

- Add bridgeinfo to various output data targets

Author: sjug

cmd/k8s-netperf/k8s-netperf.go

@@ -51,6 +51,7 @@ var (
 	debug            bool
 	bridge           string
 	bridgeNetwork    string
+	bridgeNamespace  string
 	promURL          string
 	id               string
 	searchURL        string
@@ -123,12 +124,14 @@ var rootCmd = &cobra.Command{
 			cleanup(client)
 		}
 		s := config.PerfScenarios{
-			HostNetwork: full,
-			NodeLocal:   nl,
-			AcrossAZ:    acrossAZ,
-			RestConfig:  *rconfig,
-			Configs:     cfg,
-			ClientSet:   client,
+			HostNetwork:     full,
+			NodeLocal:       nl,
+			AcrossAZ:        acrossAZ,
+			RestConfig:      *rconfig,
+			Configs:         cfg,
+			ClientSet:       client,
+			BridgeNetwork:   bridge,
+			BridgeNamespace: bridgeNamespace,
 		}
 		if serverIPAddr != "" {
 			s.ExternalServer = true
@@ -213,6 +216,25 @@ var rootCmd = &cobra.Command{
 			}
 		}
 
+		// Validate bridge network configuration before creating pods
+		if bridge != "" && !vm {
+			// Create dynamic client for validation if not already created
+			var dynClient dynamic.Interface
+			if s.DClient != nil {
+				dynClient = s.DClient
+			} else {
+				dynClient, err = dynamic.NewForConfig(rconfig)
+				if err != nil {
+					log.Fatalf("Failed to create dynamic client for bridge validation: %v", err)
+				}
+			}
+
+			err = k8s.ValidateBridgeNetwork(client, dynClient, bridge, bridgeNamespace)
+			if err != nil {
+				log.Fatalf("Bridge network validation failed: %v", err)
+			}
+		}
+
 		// Build the SUT (Deployments)
 		err = k8s.BuildSUT(client, &s)
 		if err != nil {
@@ -491,9 +513,22 @@ func executeWorkload(nc config.Config,
 		if s.VM {
 			npr.UdnInfo = npr.UdnInfo + " - " + s.UdnPluginBinding
 		}
-		//when using a bridge
+	} else if s.BridgeNetwork != "" {
+		// For regular pods, extract bridge IP from network status
+		serverIP, err = k8s.ExtractBridgeIp(s.Server.Items[0], s.BridgeNetwork, s.BridgeNamespace)
+		if err != nil {
+			log.Errorf("Failed to extract bridge IP: %v", err)
+			// Fall back to default IP
+			serverIP = s.Server.Items[0].Status.PodIP
+		}
+		log.Debugf("Using bridge network IP: %s (interface: net1)", serverIP)
+
+		// Set bridge info similar to UdnInfo
+		npr.BridgeInfo = fmt.Sprintf("%s/%s", s.BridgeNamespace, s.BridgeNetwork)
 	} else if s.BridgeServerNetwork != "" {
+		// For VMs, use static bridge IP from JSON config
 		serverIP = strings.Split(s.BridgeServerNetwork, "/")[0]
+		npr.BridgeInfo = fmt.Sprintf("VM Bridge (%s)", serverIP)
 	} else {
 		if hostNet {
 			serverIP = s.ServerHost.Items[0].Status.PodIP
@@ -595,8 +630,9 @@ func main() {
 	rootCmd.Flags().BoolVar(&udnl3, "udnl3", false, "Create and use a layer3 UDN as a primary network.")
 	rootCmd.MarkFlagsMutuallyExclusive("udnl2", "udnl3")
 	rootCmd.Flags().StringVar(&udnPluginBinding, "udnPluginBinding", "passt", "UDN with VMs only - the binding method of the UDN interface, select 'passt' or 'l2bridge'")
-	rootCmd.Flags().StringVar(&bridge, "bridge", "", "Name of the NNCP to be used for creating bridge interface - VM only.")
-	rootCmd.Flags().StringVar(&bridgeNetwork, "bridgeNetwork", "bridgeNetwork.json", "Json file for the network defined by the bridge interface - bridge should be enabled")
+	rootCmd.Flags().StringVar(&bridge, "bridge", "", "Name of the NetworkAttachmentDefinition to be used for bridge interface")
+	rootCmd.Flags().StringVar(&bridgeNamespace, "bridgeNamespace", "default", "Namespace of the NetworkAttachmentDefinition for bridge interface")
+	rootCmd.Flags().StringVar(&bridgeNetwork, "bridgeNetwork", "bridgeNetwork.json", "Json file for the VM network defined by the bridge interface - bridge should be enabled")
 	rootCmd.Flags().StringVar(&promURL, "prom", "", "Prometheus URL")
 	rootCmd.Flags().StringVar(&id, "uuid", "", "User provided UUID")
 	rootCmd.Flags().StringVar(&searchURL, "search", "", "OpenSearch URL, if you have auth, pass in the format of https://user:pass@url:port")

pkg/archive/archive.go

@@ -57,6 +57,7 @@ type Doc struct {
 	ClientVSwiitchMem float64          `json:"clientVswitchMem"`
 	ExternalServer    bool             `json:"externalServer"`
 	UdnInfo           string           `json:"udnInfo"`
+	BridgeInfo        string           `json:"bridgeInfo"`
 }
 
 // Connect returns a client connected to the desired cluster.
@@ -130,6 +131,7 @@ func BuildDocs(sr result.ScenarioResults, uuid string) ([]interface{}, error) {
 			ClientNodeInfo:    r.ClientNodeInfo,
 			ServerNodeInfo:    r.ServerNodeInfo,
 			UdnInfo:           r.UdnInfo,
+			BridgeInfo:        r.BridgeInfo,
 		}
 		UDPLossPercent, e := result.Average(r.LossSummary)
 		if e != nil {
@@ -174,6 +176,7 @@ func commonCsvHeaderFields() []string {
 		"Service",
 		"External Server",
 		"UDN Info",
+		"Bridge Info",
 		"Duration",
 		"Parallelism",
 		"# of Samples",
@@ -198,6 +201,7 @@ func commonCsvDataFields(row result.Data) []string {
 		fmt.Sprint(row.Service),
 		fmt.Sprint(row.ExternalServer),
 		fmt.Sprint(row.UdnInfo),
+		fmt.Sprint(row.BridgeInfo),
 		strconv.Itoa(row.Duration),
 		strconv.Itoa(row.Parallelism),
 		strconv.Itoa(row.Samples),

pkg/config/config.go

@@ -42,6 +42,8 @@ type PerfScenarios struct {
 	VMHost              string
 	Udn                 bool
 	UdnPluginBinding    string
+	BridgeNetwork       string
+	BridgeNamespace     string
 	BridgeServerNetwork string
 	BridgeClientNetwork string
 	ServerNodeInfo      metrics.NodeInfo

pkg/drivers/iperf.go

@@ -61,11 +61,16 @@ func (i *iperf3) Run(c *kubernetes.Clientset,
 	id := uuid.New()
 	file := fmt.Sprintf("/tmp/iperf-%s", id.String())
 	pod := client.Items[0]
-	var clientIp string
+	clientIp := pod.Status.PodIP
+
 	if perf.Udn {
-		clientIp, _ = k8s.ExtractUdnIp(pod)
-	} else {
-		clientIp = pod.Status.PodIP
+		if udnIp, _ := k8s.ExtractUdnIp(pod); udnIp != "" {
+			clientIp = udnIp
+		}
+	} else if perf.BridgeNetwork != "" {
+		if bridgeClientIp, err := k8s.ExtractBridgeIp(pod, perf.BridgeNetwork, perf.BridgeNamespace); err == nil {
+			clientIp = bridgeClientIp
+		}
 	}
 	log.Debugf("🔥 Client (%s,%s) starting iperf3 against server: %s", pod.Name, clientIp, serverIP)
 	config.Show(nc, i.driverName)

pkg/drivers/netperf.go

@@ -39,12 +39,17 @@ const omniOptions = "rt_latency,p99_latency,throughput,throughput_units,remote_r
 func (n *netperf) Run(c *kubernetes.Clientset, rc rest.Config, nc config.Config, client apiv1.PodList, serverIP string, perf *config.PerfScenarios) (bytes.Buffer, error) {
 	var stdout, stderr bytes.Buffer
 	pod := client.Items[0]
-	var clientIp string
 	log.Debugf("Server IP: %s", serverIP)
+	clientIp := pod.Status.PodIP
+
 	if perf.Udn {
-		clientIp, _ = k8s.ExtractUdnIp(pod)
-	} else {
-		clientIp = pod.Status.PodIP
+		if udnIp, _ := k8s.ExtractUdnIp(pod); udnIp != "" {
+			clientIp = udnIp
+		}
+	} else if perf.BridgeNetwork != "" {
+		if bridgeClientIp, err := k8s.ExtractBridgeIp(pod, perf.BridgeNetwork, perf.BridgeNamespace); err == nil {
+			clientIp = bridgeClientIp
+		}
 	}
 	log.Debugf("🔥 Client (%s,%s) starting netperf against server: %s", pod.Name, clientIp, serverIP)
 	config.Show(nc, n.driverName)

pkg/drivers/uperf.go

@@ -160,11 +160,16 @@ func (u *uperf) Run(c *kubernetes.Clientset, rc rest.Config, nc config.Config, c
 	var exec remotecommand.Executor
 
 	pod := client.Items[0]
-	var clientIp string
+	clientIp := pod.Status.PodIP
+
 	if perf.Udn {
-		clientIp, _ = k8s.ExtractUdnIp(pod)
-	} else {
-		clientIp = pod.Status.PodIP
+		if udnIp, _ := k8s.ExtractUdnIp(pod); udnIp != "" {
+			clientIp = udnIp
+		}
+	} else if perf.BridgeNetwork != "" {
+		if bridgeClientIp, err := k8s.ExtractBridgeIp(pod, perf.BridgeNetwork, perf.BridgeNamespace); err == nil {
+			clientIp = bridgeClientIp
+		}
 	}
 	log.Debugf("🔥 Client (%s,%s) starting uperf against server: %s", pod.Name, clientIp, serverIP)
 	config.Show(nc, u.driverName)