Minor fixup to auto egress IP deletion fix

Author: danwinship

pkg/network/node/egressip.go

@@ -213,8 +213,8 @@ func (eip *egressIPWatcher) deleteEgressIP(egressIP string) {
 		if err := eip.releaseEgressIP(egressIP, mark); err != nil {
 			utilruntime.HandleError(fmt.Errorf("Error releasing Egress IP %q: %v", egressIP, err))
 		}
-		node.assignedIPs.Delete(egressIP)
 	}
+	node.assignedIPs.Delete(egressIP)
 
 	if ns.assignedIP == egressIP {
 		ns.assignedIP = ""

pkg/network/node/egressip_test.go

@@ -246,7 +246,7 @@ func TestEgressIP(t *testing.T) {
 		t.Fatalf("Unexpected eip state: %#v", eip)
 	}
 
-	// Drop namespace EgressIP
+	// Drop namespace EgressIP (local)
 	eip.deleteNamespaceEgress(44)
 	err = assertNetlinkChange(eip, "release 172.17.0.102")
 	if err != nil {
@@ -297,6 +297,57 @@ func TestEgressIP(t *testing.T) {
 		t.Fatalf("Unexpected eip state: %#v", eip)
 	}
 
+	// Drop namespace EgressIP (remote)
+	eip.deleteNamespaceEgress(42)
+	err = assertNoNetlinkChanges(eip)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
+	flows, err = ovsif.DumpFlows("")
+	if err != nil {
+		t.Fatalf("Unexpected error dumping flows: %v", err)
+	}
+	err = assertFlowChanges(origFlows, flows,
+		flowChange{
+			kind:  flowRemoved,
+			match: []string{"table=100", "reg0=42", "172.17.0.3->tun_dst"},
+		},
+	)
+	if err != nil {
+		t.Fatalf("Unexpected flow changes: %v\nOrig: %#v\nNew: %#v", err, origFlows, flows)
+	}
+	origFlows = flows
+
+	if eip.namespacesByVNID[42] != nil || eip.namespacesByEgressIP["172.17.0.100"] != nil || eip.nodesByEgressIP["172.17.0.100"] != node3 {
+		t.Fatalf("Unexpected eip state: %#v", eip)
+	}
+
+	// Add namespace EgressIP back again after having removed it...
+	eip.updateNamespaceEgress(42, "172.17.0.100")
+	err = assertNoNetlinkChanges(eip)
+	if err != nil {
+		t.Fatalf("%v", err)
+	}
+	flows, err = ovsif.DumpFlows("")
+	if err != nil {
+		t.Fatalf("Unexpected error dumping flows: %v", err)
+	}
+	err = assertFlowChanges(origFlows, flows,
+		flowChange{
+			kind:  flowAdded,
+			match: []string{"table=100", "reg0=42", "172.17.0.3->tun_dst"},
+		},
+	)
+	if err != nil {
+		t.Fatalf("Unexpected flow changes: %v\nOrig: %#v\nNew: %#v", err, origFlows, flows)
+	}
+	origFlows = flows
+
+	ns42 = eip.namespacesByVNID[42]
+	if ns42 == nil || eip.namespacesByEgressIP["172.17.0.100"] != ns42 || eip.nodesByEgressIP["172.17.0.100"] != node3 {
+		t.Fatalf("Unexpected eip state: %#v", eip)
+	}
+
 	// Drop remote node EgressIP
 	eip.updateNodeEgress("172.17.0.3", []string{"172.17.0.100"})
 	err = assertNoNetlinkChanges(eip)