diff options
author | Satoshi Fujii <fujii-satoshi@jp.fujitsu.com> | 2020-11-02 07:45:57 +0000 |
---|---|---|
committer | Satoshi Fujii <fujii-satoshi@jp.fujitsu.com> | 2020-11-02 07:45:57 +0000 |
commit | e97a00243313385c1532d184b4ed1b8de7a1a518 (patch) | |
tree | a90dd2731dbe570d7dd56fe8056c6bba56a284d1 /src/kube2msb/msb_client.go | |
parent | 66c00e4df2bcb8f6142d6f5573e4db3f429cfeb4 (diff) |
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
Diffstat (limited to 'src/kube2msb/msb_client.go')
-rw-r--r-- | src/kube2msb/msb_client.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/kube2msb/msb_client.go b/src/kube2msb/msb_client.go index 9e16d00..0a6d17b 100644 --- a/src/kube2msb/msb_client.go +++ b/src/kube2msb/msb_client.go @@ -28,8 +28,8 @@ const ( ) type Client interface { - Register(string) - DeRegister(string) + Register(string, string) + DeRegister(string, string) } type MSBAgent struct { @@ -51,7 +51,7 @@ func newMSBAgent(s string) (*MSBAgent, error) { return &MSBAgent{url: s}, nil } -func (client *MSBAgent) Register(serviceInfo string) { +func (client *MSBAgent) Register(ip, serviceInfo string) { var ( sas = []*ServiceAnnotation{} ) @@ -62,6 +62,7 @@ func (client *MSBAgent) Register(serviceInfo string) { } for _, sa := range sas { + sa.IP = ip su := ServiceAnnotation2ServiceUnit(sa) body, _ := json.Marshal(su) postURL := client.url + urlPrefix @@ -76,7 +77,7 @@ func (client *MSBAgent) Register(serviceInfo string) { } } -func (client *MSBAgent) DeRegister(serviceInfo string) { +func (client *MSBAgent) DeRegister(ip, serviceInfo string) { var ( sas = []*ServiceAnnotation{} ) @@ -88,6 +89,7 @@ func (client *MSBAgent) DeRegister(serviceInfo string) { } for _, sa := range sas { + sa.IP = ip var deleteURL string if sa.Version == "" { deleteURL = client.url + urlPrefix + "/" + sa.ServiceName + "/version/" + "null" + "/nodes/" + sa.IP + "/" + sa.Port |