[VOL-2736]:host and port should be specified as a single argument not as two separate arguments
Change-Id: I14b59b4e42b1cf0821807cdb3dd6eef2094077da
diff --git a/cmd/openolt-adapter/main.go b/cmd/openolt-adapter/main.go
index 45cbf53..7650ad3 100644
--- a/cmd/openolt-adapter/main.go
+++ b/cmd/openolt-adapter/main.go
@@ -23,7 +23,6 @@
"fmt"
"os"
"os/signal"
- "strconv"
"syscall"
"time"
@@ -97,11 +96,11 @@
}
// Setup Log Config
- cm := conf.NewConfigManager(a.kvClient, a.config.KVStoreType, a.config.KVStoreHost, a.config.KVStorePort, a.config.KVStoreTimeout)
+ cm := conf.NewConfigManager(a.kvClient, a.config.KVStoreType, a.config.KVStoreAddress, a.config.KVStoreTimeout)
go conf.StartLogLevelConfigProcessing(cm, ctx)
// Setup Kafka Client
- if a.kafkaClient, err = newKafkaClient("sarama", a.config.KafkaAdapterHost, a.config.KafkaAdapterPort); err != nil {
+ if a.kafkaClient, err = newKafkaClient("sarama", a.config.KafkaAdapterAddress); err != nil {
logger.Fatalw("Unsupported-common-client", log.Fields{"error": err})
}
@@ -287,14 +286,13 @@
return nil, errors.New("unsupported-kv-store")
}
-func newKafkaClient(clientType, host string, port int) (kafka.Client, error) {
+func newKafkaClient(clientType, address string) (kafka.Client, error) {
logger.Infow("common-client-type", log.Fields{"client": clientType})
switch clientType {
case "sarama":
return kafka.NewSaramaClient(
- kafka.Host(host),
- kafka.Port(port),
+ kafka.Address(address),
kafka.ProducerReturnOnErrors(true),
kafka.ProducerReturnOnSuccess(true),
kafka.ProducerMaxRetries(6),
@@ -306,8 +304,7 @@
}
func (a *adapter) setKVClient() error {
- addr := a.config.KVStoreHost + ":" + strconv.Itoa(a.config.KVStorePort)
- client, err := newKVClient(a.config.KVStoreType, addr, a.config.KVStoreTimeout)
+ client, err := newKVClient(a.config.KVStoreType, a.config.KVStoreAddress, a.config.KVStoreTimeout)
if err != nil {
a.kvClient = nil
return err
@@ -318,12 +315,11 @@
}
func (a *adapter) startInterContainerProxy(ctx context.Context, retries int) (kafka.InterContainerProxy, error) {
- logger.Infow("starting-intercontainer-messaging-proxy", log.Fields{"host": a.config.KafkaAdapterHost,
- "port": a.config.KafkaAdapterPort, "topic": a.config.Topic})
+ logger.Infow("starting-intercontainer-messaging-proxy", log.Fields{"address": a.config.KafkaAdapterAddress,
+ "topic": a.config.Topic})
var err error
kip := kafka.NewInterContainerProxy(
- kafka.InterContainerHost(a.config.KafkaAdapterHost),
- kafka.InterContainerPort(a.config.KafkaAdapterPort),
+ kafka.InterContainerAddress(a.config.KafkaAdapterAddress),
kafka.MsgClient(a.kafkaClient),
kafka.DefaultTopic(&kafka.Topic{Name: a.config.Topic}))
count := 0
@@ -509,7 +505,7 @@
ad := newAdapter(cf)
p := &probe.Probe{}
- go p.ListenAndServe(fmt.Sprintf("%s:%d", ad.config.ProbeHost, ad.config.ProbePort))
+ go p.ListenAndServe(ad.config.ProbeAddress)
probeCtx := context.WithValue(ctx, probe.ProbeContextKey, p)
diff --git a/cmd/openolt-adapter/main_test.go b/cmd/openolt-adapter/main_test.go
index 5246348..bd5c81a 100644
--- a/cmd/openolt-adapter/main_test.go
+++ b/cmd/openolt-adapter/main_test.go
@@ -124,8 +124,7 @@
adapter := newMockAdapter()
type args struct {
clientType string
- host string
- port int
+ address string
}
tests := []struct {
name string
@@ -133,12 +132,12 @@
wantErr bool
}{
// TODO: Add test cases.
- {"newKafkaClient", args{clientType: "sarama", host: adapter.config.KafkaAdapterHost, port: adapter.config.KafkaAdapterPort}, false},
- {"newKafkaClient", args{clientType: "sarama", host: adapter.config.KafkaAdapterHost, port: adapter.config.KafkaAdapterPort}, false},
+ {"newKafkaClient", args{clientType: "sarama", address: adapter.config.KafkaAdapterAddress}, false},
+ {"newKafkaClient", args{clientType: "sarama", address: adapter.config.KafkaAdapterAddress}, false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- _, err := newKafkaClient(tt.args.clientType, tt.args.host, tt.args.port)
+ _, err := newKafkaClient(tt.args.clientType, tt.args.address)
if (err != nil) != tt.wantErr {
t.Errorf("newKafkaClient() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -153,8 +152,7 @@
ad := newMockAdapter()
kip := kafka.NewInterContainerProxy(
- kafka.InterContainerHost(ad.config.KafkaAdapterHost),
- kafka.InterContainerPort(ad.config.KafkaAdapterPort),
+ kafka.InterContainerAddress(ad.config.KafkaAdapterAddress),
kafka.MsgClient(&mockKafkaClient{}),
kafka.DefaultTopic(&kafka.Topic{Name: ad.config.Topic}))