wip: release-4.6: test ovn2.13-20.12.0-5.bz1839102.el8.fdn

Dockerfile

@@ -32,6 +32,7 @@ RUN yum install -y  \
 	selinux-policy && \
 	yum clean all
 
+COPY ovn2.13-20.12.0-5.bz1839102.el8fdn.x86_64.rpm ovn2.13-central-20.12.0-5.bz1839102.el8fdn.x86_64.rpm ovn2.13-host-20.12.0-5.bz1839102.el8fdn.x86_64.rpm ovn2.13-vtep-20.12.0-5.bz1839102.el8fdn.x86_64.rpm /root/
 RUN INSTALL_PKGS=" \
 	openssl firewalld-filesystem \
 	libpcap iproute strace \
@@ -44,6 +45,7 @@ RUN INSTALL_PKGS=" \
 	# openvswitch2.13-2.13.0-57.el8fdp
 	yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False "openvswitch2.13 == 2.13.0-57.el8fdp" "openvswitch2.13-devel == 2.13.0-57.el8fdp" && \
 	yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False "ovn2.13 == 20.06.2-11.el8fdp" "ovn2.13-central == 20.06.2-11.el8fdp" "ovn2.13-host == 20.06.2-11.el8fdp" "ovn2.13-vtep == 20.06.2-11.el8fdp" && \
+	rpm -Uhv --force --nodeps /root/ovn2.13*.rpm && \
 	yum clean all && rm -rf /var/cache/*
 
 RUN mkdir -p /var/run/openvswitch && \

go-controller/pkg/cni/helper_linux.go

@@ -379,7 +379,7 @@ func (pr *PodRequest) ConfigureInterface(namespace string, podName string, ifInf
 		klog.Warningf("Failed to settle addresses: %q", err)
 	}
 
-	if err = waitForPodFlows(ifInfo.MAC.String()); err != nil {
+	if err = waitForPodFlows(hostIface.Name); err != nil {
 		return nil, fmt.Errorf("timed out waiting for pod flows for pod: %s, error: %v", podName, err)
 	}
 

go-controller/pkg/cni/ovs.go

@@ -53,6 +53,17 @@ func ovsSet(table, record string, values ...string) error {
 	return err
 }
 
+func ovsGet(table, record, column, key string) (string, error) {
+	args := []string{"--if-exists", "get", table, record}
+	if key != "" {
+		args = append(args, fmt.Sprintf("%s:%s", column, key))
+	} else {
+		args = append(args, column)
+	}
+	output, err := ovsExec(args...)
+	return strings.Trim(strings.TrimSpace(string(output)), "\""), err
+}
+
 // Returns the given column of records that match the condition
 func ovsFind(table, column, condition string) ([]string, error) {
 	output, err := ovsExec("--no-heading", "--format=csv", "--data=bare", "--columns="+column, "find", table, condition)
@@ -98,18 +109,23 @@ func ofctlExec(args ...string) (string, error) {
 	return stdoutStr, nil
 }
 
-func waitForPodFlows(mac string) error {
+func isIfaceOvnInstalledSet(ifaceName string) error {
+	out, err := ovsGet("Interface", ifaceName, "external-ids", "ovn-installed")
+	if err == nil && out == "true" {
+		klog.V(5).Infof("Interface %s has ovn-installed=true", ifaceName)
+		return nil
+	}
+
+	// Try again
+	return fmt.Errorf("still waiting for OVS port %s to have ovn-installed", ifaceName)
+}
+
+func waitForPodFlows(ifaceName string) error {
 	return wait.PollImmediate(200*time.Millisecond, 20*time.Second, func() (bool, error) {
-		// Query the flows by mac address
-		query := fmt.Sprintf("table=9,dl_src=%s", mac)
-		// ovs-ofctl dumps error on stderr, so stdout will only dump flow data if matches the query.
-		stdout, err := ofctlExec("dump-flows", "br-int", query)
-		if err != nil {
-			return false, nil
-		}
-		if len(stdout) == 0 {
-			return false, nil
+		if err := isIfaceOvnInstalledSet(ifaceName); err == nil {
+			//success
+			return true, nil
 		}
-		return true, nil
+		return false, nil
 	})
 }