[VOL-3783] Unifying service address and port for kafka and etcd

Change-Id: Id85168f46f93e445ee2bc9cf5cab493322f10efe
diff --git a/internal/pkg/onuadaptercore/openonu.go b/internal/pkg/onuadaptercore/openonu.go
index e933173..598be4a 100644
--- a/internal/pkg/onuadaptercore/openonu.go
+++ b/internal/pkg/onuadaptercore/openonu.go
@@ -54,8 +54,7 @@
 	cm                          *conf.ConfigManager
 	config                      *config.AdapterFlags
 	numOnus                     int
-	KVStoreHost                 string
-	KVStorePort                 int
+	KVStoreAddress              string
 	KVStoreType                 string
 	KVStoreTimeout              time.Duration
 	mibTemplatesGenerated       map[string]bool
@@ -88,8 +87,7 @@
 	openOnuAc.adapterProxy = adapterProxy
 	openOnuAc.eventProxy = eventProxy
 	openOnuAc.kvClient = kvClient
-	openOnuAc.KVStoreHost = cfg.KVStoreHost
-	openOnuAc.KVStorePort = cfg.KVStorePort
+	openOnuAc.KVStoreAddress = cfg.KVStoreAddress
 	openOnuAc.KVStoreType = cfg.KVStoreType
 	openOnuAc.KVStoreTimeout = cfg.KVStoreTimeout
 	openOnuAc.mibTemplatesGenerated = make(map[string]bool)