Merge branch 'add_systests'

Makefile

@@ -25,4 +25,4 @@ unit-test: build
 
 system-test: build
 	go test -v github.com/contiv/netplugin/systemtests/singlehost 
-	go test -v github.com/contiv/netplugin/systemtests/twohosts
+	go test --timeout 20m -v github.com/contiv/netplugin/systemtests/twohosts

netd.go

@@ -511,7 +511,7 @@ func main() {
 		defHostLabel,
 		"label used to identify endpoints homed for this host, default is host name")
 	flagSet.BoolVar(&opts.publishVtep,
-		"do-not-publish-vtep",
+		"publish-vtep",
 		true,
 		"publish the vtep when allowed by global policy")
 

netdcli/cfg.go

@@ -152,9 +152,9 @@ func processAdditions(stateDriver core.StateDriver, allCfg *netmaster.Config) (e
 
 func processDeletions(stateDriver core.StateDriver, allCfg *netmaster.Config) (err error) {
 	for _, tenant := range allCfg.Tenants {
-		err = netmaster.DeleteTenant(stateDriver, &tenant)
+		err = netmaster.DeleteEndpoints(stateDriver, &tenant)
 		if err != nil {
-			log.Printf("error deleting tenant '%s' \n", err)
+			log.Printf("error deleting endpoints '%s' \n", err)
 			continue
 		}
 
@@ -164,9 +164,9 @@ func processDeletions(stateDriver core.StateDriver, allCfg *netmaster.Config) (e
 			continue
 		}
 
-		err = netmaster.DeleteEndpoints(stateDriver, &tenant)
+		err = netmaster.DeleteTenant(stateDriver, &tenant)
 		if err != nil {
-			log.Printf("error deleting endpoints '%s' \n", err)
+			log.Printf("error deleting tenant '%s' \n", err)
 			continue
 		}
 	}

netmaster/netmaster.go

@@ -205,7 +205,11 @@ func DeleteTenant(stateDriver core.StateDriver, tenant *ConfigTenant) error {
 		return err
 	}
 
-	return DeleteTenantId(stateDriver, tenant.Name)
+	if len(tenant.Networks) == 0 {
+		return DeleteTenantId(stateDriver, tenant.Name)
+	}
+
+	return nil
 }
 
 func validateNetworkConfig(tenant *ConfigTenant) error {
@@ -455,6 +459,9 @@ func DeleteNetworks(stateDriver core.StateDriver, tenant *ConfigTenant) error {
 	}
 
 	for _, network := range tenant.Networks {
+		if len(network.Endpoints) > 0 {
+			continue
+		}
 		nwMasterCfg := &MasterNwConfig{StateDriver: stateDriver}
 		err = nwMasterCfg.Read(network.Name)
 		if err != nil {

netutils/netutils.go

@@ -213,6 +213,7 @@ func ParseTagRanges(ranges string, tagType string) ([]TagRange, error) {
 
 func GetLocalIp() (string, error) {
 	var addrs []netlink.Addr
+	localIpAddr := ""
 
 	for idx := 0; idx < 3; idx++ {
 		linkName := "eth" + strconv.Itoa(idx)
@@ -228,11 +229,16 @@ func GetLocalIp() (string, error) {
 			return "", err
 		}
 		if len(addrs) > 0 {
-			return addrs[0].IP.String(), nil
+			localIpAddr = addrs[0].IP.String()
 		}
 	}
 
-	return "", errors.New("local ip not found")
+	err := errors.New("local ip not found")
+	if localIpAddr != "" {
+		err = nil
+	}
+
+	return localIpAddr, err
 }
 
 func ParseCIDR(cidrStr string) (string, uint, error) {