commit 318a12929b98c1870aa1d0ceda11256648c8cd65
author Neha Sharma <neha.sharma70@infosys.com> Thu May 14 19:53:26 2020 +0000
committer Scott Baker <scottb@opennetworking.org> Mon Jun 08 17:22:11 2020 +0000
tree 8c885823206e70929e3a294f735112d1d0ce9f44
parent 9b0ac0a0d7148e9a716662036e684b87bc19ad4c

[VOL-2736]host and port should be specified as a single argument not as two separate arguments

Change-Id: Id964d8e0d2e5867937de3efd239dd8a9250a56bb

cmd/ofagent/config.go

diff --git a/cmd/ofagent/config.go b/cmd/ofagent/config.go
index 33bda04..ba8b710 100644
--- a/cmd/ofagent/config.go
+++ b/cmd/ofagent/config.go
@@ -36,8 +36,7 @@
 	ConnectionMaxRetries      int
 	KVStoreType               string
 	KVStoreTimeout            time.Duration
-	KVStoreHost               string
-	KVStorePort               int
+	KVStoreAddress            string
 	InstanceID                string
 }
 
@@ -121,9 +120,7 @@
 
 	flag.DurationVar(&(config.KVStoreTimeout), "kv_store_request_timeout", 5*time.Second, "The default timeout when making a kv store request")
 
-	flag.StringVar(&(config.KVStoreHost), "kv_store_host", "voltha-etcd-cluster-client.voltha.svc.cluster.local", "KV store host")
-
-	flag.IntVar(&(config.KVStorePort), "kv_store_port", 2379, "KV store port")
+	flag.StringVar(&(config.KVStoreAddress), "kv_store_address", "voltha-etcd-cluster-client.voltha.svc.cluster.local:2379", "KV store address")
 
 	flag.StringVar(&(config.LogLevel), "log_level", "WARN", "Log level")
 

cmd/ofagent/main.go

diff --git a/cmd/ofagent/main.go b/cmd/ofagent/main.go
index d32fecc..14b38ed 100644
--- a/cmd/ofagent/main.go
+++ b/cmd/ofagent/main.go
@@ -27,7 +27,6 @@
 	"github.com/opencord/voltha-lib-go/v3/pkg/probe"
 	"github.com/opencord/voltha-lib-go/v3/pkg/version"
 	"os"
-	"strconv"
 	"time"
 )
 
@@ -45,14 +44,14 @@
 	fmt.Println(version.VersionInfo.String("  "))
 }
 
-func setLogConfig(ctx context.Context, kvStoreHost, kvStoreType string, kvStorePort int, kvStoreTimeout time.Duration) (kvstore.Client, error) {
-	client, err := kvstore.NewEtcdClient(kvStoreHost+":"+strconv.Itoa(kvStorePort), kvStoreTimeout, log.WarnLevel)
+func setLogConfig(ctx context.Context, kvStoreAddress, kvStoreType string, kvStoreTimeout time.Duration) (kvstore.Client, error) {
+	client, err := kvstore.NewEtcdClient(kvStoreAddress, kvStoreTimeout, log.WarnLevel)
 
 	if err != nil {
 		return nil, err
 	}
 
-	cm := conf.NewConfigManager(client, kvStoreType, kvStoreHost, kvStorePort, kvStoreTimeout)
+	cm := conf.NewConfigManager(client, kvStoreType, kvStoreAddress, kvStoreTimeout)
 	go conf.StartLogLevelConfigProcessing(cm, ctx)
 	return client, nil
 }
@@ -128,7 +127,7 @@
 	 */
 	ctx := context.WithValue(context.Background(), probe.ProbeContextKey, p)
 
-	client, err := setLogConfig(ctx, config.KVStoreHost, config.KVStoreType, config.KVStorePort, config.KVStoreTimeout)
+	client, err := setLogConfig(ctx, config.KVStoreAddress, config.KVStoreType, config.KVStoreTimeout)
 	if err != nil {
 		logger.Warnw("unable-to-create-kvstore-client", log.Fields{"error": err})
 	}