fixing merge issue

Author: abhi

netmaster/mastercfg/servicelbState.go

@@ -54,8 +54,7 @@ type CfgServiceLBState struct {
 
 // Write the state
 func (s *CfgServiceLBState) Write() error {
-	id := s.ServiceName + "\\" + s.Tenant
-	key := fmt.Sprintf(serviceLBConfigPath, id)
+	key := fmt.Sprintf(serviceLBConfigPath, s.ID)
 	return s.StateDriver.WriteState(key, s, json.Marshal)
 }
 
@@ -72,8 +71,7 @@ func (s *CfgServiceLBState) ReadAll() ([]core.State, error) {
 
 // Clear removes the configuration from the state store.
 func (s *CfgServiceLBState) Clear() error {
-	id := s.ServiceName + "\\" + s.Tenant
-	key := fmt.Sprintf(serviceLBConfigPath, id)
+	key := fmt.Sprintf(serviceLBConfigPath, s.ID)
 	return s.StateDriver.ClearState(key)
 }
 

netmaster/objApi/objapi_test.go

@@ -804,7 +804,7 @@ func verifyServiceCreate(t *testing.T, tenant, network, serviceName string, port
 
 	serviceLbState := mastercfg.CfgServiceLBState{}
 	serviceLbState.StateDriver = stateStore
-	serviceLbState.ID = serviceName + "\\" + tenant
+	serviceLbState.ID = serviceName + ":" + tenant
 
 	err = serviceLbState.Read(serviceLbState.ID)
 	if err != nil {
@@ -834,7 +834,7 @@ func verifyServiceDelete(t *testing.T, tenant, serviceName string) {
 
 	serviceLbState := mastercfg.CfgServiceLBState{}
 	serviceLbState.StateDriver = stateStore
-	serviceLbState.ID = serviceName + "\\" + tenant
+	serviceLbState.ID = serviceName + ":" + tenant
 
 	err := serviceLbState.Read(serviceLbState.ID)
 	if err == nil {
@@ -882,8 +882,8 @@ func verifyProviderUpdate(t *testing.T, providerIP, network, containerID,
 
 	svcProvider := &mastercfg.SvcProvider{}
 	svcProvider.StateDriver = stateStore
-	svcProvider.ID = service + "\\" + tenant
-	svcProvider.ServiceName = service + "\\" + tenant
+	svcProvider.ID = service + ":" + tenant
+	svcProvider.ServiceName = service + ":" + tenant
 	err := svcProvider.Read(svcProvider.ID)
 	if err != nil {
 		t.Fatalf("Error reading from service provider state %s", err)