Merge pull request #17333 from openshift-cherrypick-robot/cherry-pick-17313-to-release-3.7

openshift-merge-robot · web-flow · commit 98f87140125d · 2017-11-20T11:25:43.000-08:00
Automatic merge from submit-queue. Automated cherry-pick of #17313 on release-3.7 This is an automated cherry-pick of #17313 /assign smarterclayton
diff --git a/pkg/network/node/ovscontroller.go b/pkg/network/node/ovscontroller.go
@@ -58,10 +58,11 @@ func (oc *ovsController) AlreadySetUp() bool {
 		return false
 	}
 	expectedVersionNote := oc.getVersionNote()
-	for _, flow := range flows {
-		parsed, err := ovs.ParseFlow(ovs.ParseForDump, flow)
-		if err == nil && parsed.Table == ruleVersionTable && parsed.NoteHasPrefix(expectedVersionNote) {
-			return true
+	// The "version" flow should be the last one, so scan from the end
+	for i := len(flows) - 1; i >= 0; i-- {
+		parsed, err := ovs.ParseFlow(ovs.ParseForDump, flows[i])
+		if err == nil && parsed.Table == ruleVersionTable {
+			return parsed.NoteHasPrefix(expectedVersionNote)
 		}
 	}
 	return false

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,11 @@ func (oc *ovsController) AlreadySetUp() bool {`
`58`	`58`	`return false`
`59`	`59`	`}`
`60`	`60`	`expectedVersionNote := oc.getVersionNote()`
`61`		`- for _, flow := range flows {`
`62`		`- parsed, err := ovs.ParseFlow(ovs.ParseForDump, flow)`
`63`		`- if err == nil && parsed.Table == ruleVersionTable && parsed.NoteHasPrefix(expectedVersionNote) {`
`64`		`- return true`
	`61`	`+ // The "version" flow should be the last one, so scan from the end`
	`62`	`+ for i := len(flows) - 1; i >= 0; i-- {`
	`63`	`+ parsed, err := ovs.ParseFlow(ovs.ParseForDump, flows[i])`
	`64`	`+ if err == nil && parsed.Table == ruleVersionTable {`
	`65`	`+ return parsed.NoteHasPrefix(expectedVersionNote)`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`return false`