Updating to latest netplugin

Author: abhi

netmaster/daemon.go

@@ -194,8 +194,6 @@ func (d *daemon) registerRoutes(router *mux.Router) {
 	s.HandleFunc(fmt.Sprintf("/%s", master.GetServicesRESTEndpoint),
 		get(true, d.services))
 
-	// See if we need to create the default tenant
-	go objApi.CreateDefaultTenant()
 }
 
 // XXX: This function should be returning logical state instead of driver state

netmaster/objApi/apiController.go

@@ -25,7 +25,6 @@ import (
 	"github.com/contiv/objdb/modeldb"
 	"strconv"
 	"strings"
-	"time"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"

netplugin/netd.go

@@ -685,7 +685,6 @@ func processServiceLBEvent(netPlugin *plugin.NetPlugin, opts cliOpts, svcLBCfg *
 	} else {
 		err = netPlugin.AddServiceLB(serviceID, spec)
 		operStr = "create"
-		dockplugin.DNSBridge.AddService(serviceID, svcLBCfg.ServiceName, svcLBCfg.Network, svcLBCfg.Tenant, svcLBCfg.IPAddress)
 	}
 	if err != nil {
 		log.Errorf("Service Load Balancer %s failed.Error:%s", operStr, err)

systemtests/basic_test.go

@@ -34,7 +34,7 @@ func (s *systemtestSuite) testBasicStartRemoveContainer(c *C, encap string) {
 	}), IsNil)
 
 	for i := 0; i < s.iterations; i++ {
-		containers, err := s.runContainers(s.containers, false, "private", nil)
+		containers, err := s.runContainers(s.containers, false, "private", nil, nil)
 		c.Assert(err, IsNil)
 
 		if s.fwdMode == "routing" && encap == "vlan" {