Fix registration failure due to improper handling braceshonolulu

mergeIP function did not handle braces '{' properly
and JSON structure was broken by the improper string replacement.

This change removes mergeIP func and IP address is passed directly
to Register and DeRegister functions.

Issue-ID: MSB-534
Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
Change-Id: Icc8a1f00fba5248218d45e4d9476042c5c331004

1 files changed, 4 insertions, 15 deletions

diff --git a/src/kube2msb/msb_work.go b/src/kube2msb/msb_work.go
index 5c40bae..a36bec9 100644
--- a/src/kube2msb/msb_work.go
+++ b/src/kube2msb/msb_work.go
@@ -17,7 +17,6 @@ package main
 
 import (
 	"log"
-	"strings"
 	"sync"
 )
 
@@ -49,7 +48,7 @@ func (client *MSBAgentWorker) AddService(ip, sInfo string) {
 		return
 	}
 
-	client.agent.Register(mergeIP(ip, sInfo))
+	client.agent.Register(ip, sInfo)
 }
 
 func (client *MSBAgentWorker) RemoveService(ip, sInfo string) {
@@ -61,7 +60,7 @@ func (client *MSBAgentWorker) RemoveService(ip, sInfo string) {
 		return
 	}
 
-	client.agent.DeRegister(mergeIP(ip, sInfo))
+	client.agent.DeRegister(ip, sInfo)
 }
 
 func (client *MSBAgentWorker) AddPod(ip, sInfo string) {
@@ -72,7 +71,7 @@ func (client *MSBAgentWorker) AddPod(ip, sInfo string) {
 		return
 	}
 
-	client.agent.Register(mergeIP(ip, sInfo))
+	client.agent.Register(ip, sInfo)
 }
 
 func (client *MSBAgentWorker) RemovePod(ip, sInfo string) {
@@ -83,15 +82,5 @@ func (client *MSBAgentWorker) RemovePod(ip, sInfo string) {
 		return
 	}
 
-	client.agent.DeRegister(mergeIP(ip, sInfo))
-}
-
-func mergeIP(ip, sInfo string) string {
-	insert := "{\"ip\":\"" + ip + "\","
-	parts := strings.Split(sInfo, "{")
-	out := parts[0]
-	for i := 1; i < len(parts); i++ {
-		out += insert + parts[i]
-	}
-	return out
+	client.agent.DeRegister(ip, sInfo)
 }