Merge pull request #404 from jojimt/dns

Update service plugin to reflect epg key changes

Author: shaleman

svcplugin/bridge/bridge.go

@@ -83,7 +83,7 @@ func (b *Bridge) AddService(srvID string, srvName string, nwName string, tenantN
 		log.Errorf("Service registration failed for %v. Error: %s",
 			service, err)
 	}
-	b.services[srvName+nwName] = append(b.services[srvName+nwName], service)
+	b.services[srvName] = append(b.services[srvName], service)
 }
 
 // RemoveService removes service from registry when triggered from dockplugin
@@ -98,7 +98,7 @@ func (b *Bridge) RemoveService(srvID string, srvName string, nwName string, tena
 		log.Warningf("Service removal failed for service %v. Error: %s:",
 			service, err)
 	}
-	delete(b.services, srvName+nwName)
+	delete(b.services, srvName)
 }
 
 func (b *Bridge) createService(srvID string, srvName string, nwName string, tenantName string, srvIP string) *Service {

svcplugin/skydns2extension/skydns2.go

@@ -79,5 +79,5 @@ func (r *Skydns2Adapter) Refresh(service *bridge.Service) error {
 }
 
 func (r *Skydns2Adapter) servicePath(service *bridge.Service) string {
-	return "/skydns/" + service.Tenant + "/" + service.Network + "/" + service.Name + "/" + service.ID
+	return "/skydns/" + service.Tenant + "/" + service.Name + "/" + service.ID
 }

systemtests/basic_test.go

@@ -172,8 +172,8 @@ func (s *systemtestSuite) testBasicSvcDiscovery(c *C, encap string) {
 		}
 
 		// Check name resolution
-		c.Assert(s.pingTestByName(containers, fmt.Sprintf("svc1%d.private.default", i)), IsNil)
-		c.Assert(s.pingTestByName(containers, fmt.Sprintf("svc2%d.private.default", i)), IsNil)
+		c.Assert(s.pingTestByName(containers, fmt.Sprintf("svc1%d.default", i)), IsNil)
+		c.Assert(s.pingTestByName(containers, fmt.Sprintf("svc2%d.default", i)), IsNil)
 
 		// cleanup
 		c.Assert(s.removeContainers(containers), IsNil)