robustness-dymmy-int

added robustness for the hanging resources when a deployment fails.

clab/netlink.go

@@ -7,10 +7,27 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+func (c *cLab) InitVirtualWiring() {
+	log.Debug("delete dummyA eth link")
+	var cmd *exec.Cmd
+	var err error
+	cmd = exec.Command("sudo", "ip", "link", "del", "dummyA")
+	err = runCmd(cmd)
+	if err != nil {
+		log.Debugf("%s failed with: %v", cmd.String(), err)
+	}
+	cmd = exec.Command("sudo", "ip", "link", "del", "dummyB")
+	err = runCmd(cmd)
+	if err != nil {
+		log.Debugf("%s failed with: %v", cmd.String(), err)
+	}
+}
+
 // CreateVirtualWiring provides the virtual topology between the containers
 func (c *cLab) CreateVirtualWiring(id int, link *Link) (err error) {
 	log.Infof("Create virtual wire : %s, %s, %s, %s", link.A.Node.LongName, link.B.Node.LongName, link.A.EndpointName, link.B.EndpointName)
 
+
 	CreateDirectory("/run/netns/", 0755)
 
 	var src, dst string
@@ -226,6 +243,7 @@ func (c *cLab) DeleteVirtualWiring(id int, link *Link) (err error) {
 			log.Debugf("%s failed with: %v", cmd.String(), err)
 		}
 	}
+
 	return nil
 }
 

cmd/deploy.go

@@ -72,6 +72,8 @@ var deployCmd = &cobra.Command{
 				log.Error(err)
 			}
 		}
+		// cleanup hanging resources if a deployment failed before
+		c.InitVirtualWiring()
 		// wire the links between the nodes based on cabling plan
 		for i, link := range c.Links {
 			if err = c.CreateVirtualWiring(i, link); err != nil {

cmd/destroy.go

@@ -78,6 +78,7 @@ var destroyCmd = &cobra.Command{
 				log.Error(err)
 			}
 		}
+		c.InitVirtualWiring()
 	},
 }