Refactor destroyOVSInterface to avoid failing

Author: feiskyer

pkg/kubestack/kubestack.go

@@ -43,9 +43,10 @@ func NewKubeHandler(driver *common.OpenStack) *KubeHandler {
 }
 
 func (h *KubeHandler) Serve(addr string) error {
+	glog.V(1).Infof("Starting kubestack at %s", addr)
 	l, err := net.Listen("tcp", addr)
 	if err != nil {
-		glog.Fatal("Failed to listen: %s", addr)
+		glog.Fatalf("Failed to listen: %s", addr)
 		return err
 	}
 	return h.server.Serve(l)

pkg/plugins/openvswitch/openvswitch.go

@@ -352,31 +352,37 @@ func (p *OVSPlugin) SetupInterface(podName, podInfraContainerID string, port *po
 }
 
 func (p *OVSPlugin) destroyOVSInterface(podName, podInfraContainerID, portID string) error {
-	_, qvo := p.buildVethName(portID)
-	output, err := exec.RunCommand("ip", "link", "set", "dev", qvo, "down")
+	qvb, qvo := p.buildVethName(portID)
+	bridge := p.buildBridgeName(portID)
+
+	output, err := exec.RunCommand("brctl", "delif", bridge, qvb)
 	if err != nil {
-		glog.Warningf("Warning: DestroyInterface failed: %v, %v", output, err)
+		glog.Warningf("Warning: brctl delif %s failed: %v, %v", qvb, output, err)
 	}
 
-	output, err = exec.RunCommand("ip", "link", "delete", "dev", qvo)
+	output, err = exec.RunCommand("ip", "link", "set", "dev", bridge, "down")
+	if err != nil {
+		glog.Warningf("Warning: set bridge %s down failed: %v, %v", bridge, output, err)
+	}
+
+	output, err = exec.RunCommand("brctl", "delbr", bridge)
 	if err != nil {
-		glog.Warningf("Warning: DestroyInterface failed: %v, %v", output, err)
+		glog.Warningf("Warning: delete bridge %s failed: %v, %v", bridge, output, err)
 	}
 
 	output, err = exec.RunCommand("ovs-vsctl", "-vconsole:off", "--if-exists", "del-port", qvo)
 	if err != nil {
-		glog.Warningf("Warning: DestroyInterface failed: %v, %v", output, err)
+		glog.Warningf("Warning: ovs del-port %s failed: %v, %v", qvo, output, err)
 	}
 
-	bridge := p.buildBridgeName(portID)
-	output, err = exec.RunCommand("ip", "link", "set", "dev", bridge, "down")
+	output, err = exec.RunCommand("ip", "link", "set", "dev", qvo, "down")
 	if err != nil {
-		glog.Warningf("Warning: DestroyInterface failed: %v, %v", output, err)
+		glog.Warningf("Warning: set dev %s down failed: %v, %v", qvo, output, err)
 	}
 
-	output, err = exec.RunCommand("brctl", "delbr", bridge)
+	output, err = exec.RunCommand("ip", "link", "delete", "dev", qvo)
 	if err != nil {
-		glog.Warningf("Warning: DestroyInterface failed: %v, %v", output, err)
+		glog.Warningf("Warning: delete dev %s failed: %v, %v", qvo, output, err)
 	}
 
 	return nil