[VOL-2736]host and port should be specified as a single argument not as two separate arguments
Change-Id: I312fe753ac0fe62c942f335371e6449809ecfb85
diff --git a/VERSION b/VERSION
index b48ce58..55f20a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.12
+3.1.13
diff --git a/pkg/adapters/common/adapter_proxy_test.go b/pkg/adapters/common/adapter_proxy_test.go
index 800f80b..3ba8290 100644
--- a/pkg/adapters/common/adapter_proxy_test.go
+++ b/pkg/adapters/common/adapter_proxy_test.go
@@ -25,6 +25,7 @@
"github.com/opencord/voltha-protos/v3/go/voltha"
"github.com/phayes/freeport"
"github.com/stretchr/testify/assert"
+ "strconv"
"testing"
)
@@ -53,7 +54,7 @@
Response: &voltha.Device{Id: "testDeviceId"},
},
}
- backend := db.NewBackend("etcd", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := db.NewBackend("etcd", embedEtcdServerHost+":"+strconv.Itoa(embedEtcdServerPort), defaultTimeout, defaultPathPrefix)
adapter := NewAdapterProxy(mockKafkaIcProxy, "testAdapterTopic", "testCoreTopic", backend)
assert.NotNil(t, adapter)
@@ -67,8 +68,7 @@
Response: &voltha.Device{Id: "testDeviceId"},
},
}
-
- backend := db.NewBackend("etcd", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := db.NewBackend("etcd", embedEtcdServerHost+":"+strconv.Itoa(embedEtcdServerPort), defaultTimeout, defaultPathPrefix)
adapter := NewAdapterProxy(mockKafkaIcProxy, "testAdapterTopic", "testCoreTopic", backend)
@@ -112,8 +112,7 @@
Response: &voltha.Device{Id: "testDeviceId"},
},
}
-
- backend := db.NewBackend("etcd", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := db.NewBackend("etcd", embedEtcdServerHost+":"+strconv.Itoa(embedEtcdServerPort), defaultTimeout, defaultPathPrefix)
adapter := NewAdapterProxy(mockKafkaIcProxy, "testAdapterTopic", "testCoreTopic", backend)
@@ -141,8 +140,7 @@
Response: &voltha.Device{Id: "testDeviceId"},
},
}
-
- backend := db.NewBackend("etcd", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := db.NewBackend("etcd", embedEtcdServerHost+":"+strconv.Itoa(embedEtcdServerPort), defaultTimeout, defaultPathPrefix)
adapter := NewAdapterProxy(mockKafkaIcProxy, "testAdapterTopic", "testCoreTopic", backend)
diff --git a/pkg/config/configmanager.go b/pkg/config/configmanager.go
index ef71b07..24988be 100644
--- a/pkg/config/configmanager.go
+++ b/pkg/config/configmanager.go
@@ -96,7 +96,7 @@
kvStoreEventChan chan *kvstore.Event
}
-func NewConfigManager(kvClient kvstore.Client, kvStoreType, kvStoreHost string, kvStorePort int, kvStoreTimeout time.Duration) *ConfigManager {
+func NewConfigManager(kvClient kvstore.Client, kvStoreType, kvStoreAddress string, kvStoreTimeout time.Duration) *ConfigManager {
var kvStorePrefix string
if prefix, present := os.LookupEnv("KV_STORE_DATAPATH_PREFIX"); present {
kvStorePrefix = prefix
@@ -111,8 +111,7 @@
Backend: &db.Backend{
Client: kvClient,
StoreType: kvStoreType,
- Host: kvStoreHost,
- Port: kvStorePort,
+ Address: kvStoreAddress,
Timeout: kvStoreTimeout,
PathPrefix: kvStorePrefix,
},
diff --git a/pkg/db/backend.go b/pkg/db/backend.go
index 20bacad..1e23a0f 100644
--- a/pkg/db/backend.go
+++ b/pkg/db/backend.go
@@ -20,7 +20,6 @@
"context"
"errors"
"fmt"
- "strconv"
"time"
"github.com/opencord/voltha-lib-go/v3/pkg/db/kvstore"
@@ -38,9 +37,8 @@
type Backend struct {
Client kvstore.Client
StoreType string
- Host string
- Port int
Timeout time.Duration
+ Address string
PathPrefix string
alive bool // Is this backend connection alive?
liveness chan bool // channel to post alive state
@@ -49,24 +47,22 @@
}
// NewBackend creates a new instance of a Backend structure
-func NewBackend(storeType string, host string, port int, timeout time.Duration, pathPrefix string) *Backend {
+func NewBackend(storeType string, address string, timeout time.Duration, pathPrefix string) *Backend {
var err error
b := &Backend{
StoreType: storeType,
- Host: host,
- Port: port,
+ Address: address,
Timeout: timeout,
LivenessChannelInterval: DefaultLivenessChannelInterval,
PathPrefix: pathPrefix,
alive: false, // connection considered down at start
}
- address := host + ":" + strconv.Itoa(port)
if b.Client, err = b.newClient(address, timeout); err != nil {
logger.Errorw("failed-to-create-kv-client",
log.Fields{
- "type": storeType, "host": host, "port": port,
+ "type": storeType, "address": address,
"timeout": timeout, "prefix": pathPrefix,
"error": err.Error(),
})
diff --git a/pkg/db/backend_test.go b/pkg/db/backend_test.go
index f96ed19..b8c66bd 100644
--- a/pkg/db/backend_test.go
+++ b/pkg/db/backend_test.go
@@ -18,15 +18,15 @@
import (
"context"
- "os"
- "testing"
- "time"
-
mocks "github.com/opencord/voltha-lib-go/v3/pkg/mocks/etcd"
"github.com/phayes/freeport"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
+ "os"
+ "strconv"
+ "testing"
+ "time"
)
const (
@@ -62,14 +62,14 @@
}
func provisionBackendWithEmbeddedEtcdServer(t *testing.T) *Backend {
- backend := NewBackend("etcd", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := NewBackend("etcd", embedEtcdServerHost+":"+strconv.Itoa(embedEtcdServerPort), defaultTimeout, defaultPathPrefix)
assert.NotNil(t, backend)
assert.NotNil(t, backend.Client)
return backend
}
func provisionBackendWithDummyEtcdServer(t *testing.T) *Backend {
- backend := NewBackend("etcd", embedEtcdServerHost, dummyEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := NewBackend("etcd", embedEtcdServerHost+":"+strconv.Itoa(dummyEtcdServerPort), defaultTimeout, defaultPathPrefix)
assert.NotNil(t, backend)
assert.NotNil(t, backend.Client)
return backend
@@ -77,14 +77,14 @@
// Create instance using Etcd Kvstore
func TestNewBackend_EtcdKvStore(t *testing.T) {
- backend := NewBackend("etcd", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ address := embedEtcdServerHost + ":" + strconv.Itoa(embedEtcdServerPort)
+ backend := NewBackend("etcd", address, defaultTimeout, defaultPathPrefix)
// Verify all attributes of backend have got set correctly
assert.NotNil(t, backend)
assert.NotNil(t, backend.Client)
assert.Equal(t, backend.StoreType, "etcd")
- assert.Equal(t, backend.Host, embedEtcdServerHost)
- assert.Equal(t, backend.Port, embedEtcdServerPort)
+ assert.Equal(t, backend.Address, address)
assert.Equal(t, backend.Timeout, defaultTimeout)
assert.Equal(t, backend.PathPrefix, defaultPathPrefix)
assert.Equal(t, backend.alive, false) // backend is not alive at start
@@ -94,7 +94,7 @@
// Create instance using Consul Kvstore
func TestNewBackend_ConsulKvStore(t *testing.T) {
- backend := NewBackend("consul", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := NewBackend("consul", embedEtcdServerHost+":"+strconv.Itoa(embedEtcdServerPort), defaultTimeout, defaultPathPrefix)
// Verify kvstore type attribute of backend has got set correctly
assert.NotNil(t, backend)
@@ -104,7 +104,7 @@
// Create instance using Invalid Kvstore; instance creation should fail
func TestNewBackend_InvalidKvstore(t *testing.T) {
- backend := NewBackend("unknown", embedEtcdServerHost, embedEtcdServerPort, defaultTimeout, defaultPathPrefix)
+ backend := NewBackend("unknown", embedEtcdServerHost+":"+strconv.Itoa(embedEtcdServerPort), defaultTimeout, defaultPathPrefix)
assert.NotNil(t, backend)
assert.Nil(t, backend.Client)
diff --git a/pkg/grpc/server.go b/pkg/grpc/server.go
index 43f2912..fa5c521 100644
--- a/pkg/grpc/server.go
+++ b/pkg/grpc/server.go
@@ -17,7 +17,6 @@
import (
"context"
- "fmt"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
@@ -62,7 +61,6 @@
type GrpcServer struct {
gs *grpc.Server
address string
- port int
secure bool
services []func(*grpc.Server)
probe ReadyProbe // optional
@@ -75,14 +73,12 @@
*/
func NewGrpcServer(
address string,
- port int,
certs *GrpcSecurity,
secure bool,
probe ReadyProbe,
) *GrpcServer {
server := &GrpcServer{
address: address,
- port: port,
secure: secure,
GrpcSecurity: certs,
probe: probe,
@@ -95,9 +91,7 @@
*/
func (s *GrpcServer) Start(ctx context.Context) {
- host := fmt.Sprintf("%s:%d", s.address, s.port)
-
- lis, err := net.Listen("tcp", host)
+ lis, err := net.Listen("tcp", s.address)
if err != nil {
logger.Fatalf("failed to listen: %v", err)
}
diff --git a/pkg/grpc/server_test.go b/pkg/grpc/server_test.go
index df3911c..729ffc7 100644
--- a/pkg/grpc/server_test.go
+++ b/pkg/grpc/server_test.go
@@ -38,12 +38,12 @@
}
func TestNewGrpcServer(t *testing.T) {
- server := NewGrpcServer("127.0.0.1", 1234, nil, false, nil)
+ server := NewGrpcServer("127.0.0.1:1234", nil, false, nil)
assert.NotNil(t, server)
}
func TestMkServerInterceptorNoProbe(t *testing.T) {
- server := NewGrpcServer("127.0.0.1", 1234, nil, false, nil)
+ server := NewGrpcServer("127.0.0.1:1234", nil, false, nil)
assert.NotNil(t, server)
f := mkServerInterceptor(server)
@@ -64,7 +64,7 @@
func TestMkServerInterceptorReady(t *testing.T) {
probe := &MockReadyProbe{Ready: true}
- server := NewGrpcServer("127.0.0.1", 1234, nil, false, probe)
+ server := NewGrpcServer("127.0.0.1:1234", nil, false, probe)
assert.NotNil(t, server)
f := mkServerInterceptor(server)
@@ -85,7 +85,7 @@
func TestMkServerInterceptorNotReady(t *testing.T) {
probe := &MockReadyProbe{Ready: false}
- server := NewGrpcServer("127.0.0.1", 1234, nil, false, probe)
+ server := NewGrpcServer("127.0.0.1:1234", nil, false, probe)
assert.NotNil(t, server)
f := mkServerInterceptor(server)
diff --git a/pkg/kafka/client.go b/pkg/kafka/client.go
index 0919a0c..0d9e3a5 100755
--- a/pkg/kafka/client.go
+++ b/pkg/kafka/client.go
@@ -39,6 +39,7 @@
const (
DefaultKafkaHost = "127.0.0.1"
DefaultKafkaPort = 9092
+ DefaultKafkaAddress = DefaultKafkaHost + ":" + string(DefaultKafkaPort)
DefaultGroupName = "voltha"
DefaultSleepOnError = 1
DefaultProducerFlushFrequency = 10
diff --git a/pkg/kafka/endpoint_manager_test.go b/pkg/kafka/endpoint_manager_test.go
index de7d028..3790221 100644
--- a/pkg/kafka/endpoint_manager_test.go
+++ b/pkg/kafka/endpoint_manager_test.go
@@ -29,6 +29,7 @@
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"math"
+ "strconv"
"testing"
"time"
)
@@ -77,7 +78,7 @@
return status.Error(codes.Internal, "Embedded server failed to start")
}
- ep.backend = db.NewBackend("etcd", "127.0.0.1", kvClientPort, timeout, "service/voltha")
+ ep.backend = db.NewBackend("etcd", "127.0.0.1"+":"+strconv.Itoa(kvClientPort), timeout, "service/voltha")
return nil
}
diff --git a/pkg/kafka/kafka_inter_container_library.go b/pkg/kafka/kafka_inter_container_library.go
index beda537..9f9fbfc 100644
--- a/pkg/kafka/kafka_inter_container_library.go
+++ b/pkg/kafka/kafka_inter_container_library.go
@@ -79,8 +79,7 @@
// interContainerProxy represents the messaging proxy
type interContainerProxy struct {
- kafkaHost string
- kafkaPort int
+ kafkaAddress string
defaultTopic *Topic
defaultRequestHandlerInterface interface{}
deviceDiscoveryTopic *Topic
@@ -107,15 +106,9 @@
type InterContainerProxyOption func(*interContainerProxy)
-func InterContainerHost(host string) InterContainerProxyOption {
+func InterContainerAddress(address string) InterContainerProxyOption {
return func(args *interContainerProxy) {
- args.kafkaHost = host
- }
-}
-
-func InterContainerPort(port int) InterContainerProxyOption {
- return func(args *interContainerProxy) {
- args.kafkaPort = port
+ args.kafkaAddress = address
}
}
@@ -145,9 +138,8 @@
func newInterContainerProxy(opts ...InterContainerProxyOption) *interContainerProxy {
proxy := &interContainerProxy{
- kafkaHost: DefaultKafkaHost,
- kafkaPort: DefaultKafkaPort,
- doneCh: make(chan struct{}),
+ kafkaAddress: DefaultKafkaAddress,
+ doneCh: make(chan struct{}),
}
for _, option := range opts {
diff --git a/pkg/kafka/kafka_inter_container_library_test.go b/pkg/kafka/kafka_inter_container_library_test.go
index f32c16c..09286ad 100644
--- a/pkg/kafka/kafka_inter_container_library_test.go
+++ b/pkg/kafka/kafka_inter_container_library_test.go
@@ -22,29 +22,19 @@
func TestDefaultKafkaProxy(t *testing.T) {
actualResult := newInterContainerProxy()
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.kafkaAddress, DefaultKafkaAddress)
assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
}
-func TestKafkaProxyOptionHost(t *testing.T) {
- actualResult := newInterContainerProxy(InterContainerHost("10.20.30.40"))
- assert.Equal(t, actualResult.kafkaHost, "10.20.30.40")
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
- assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
-}
-
-func TestKafkaProxyOptionPort(t *testing.T) {
- actualResult := newInterContainerProxy(InterContainerPort(1020))
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, 1020)
+func TestKafkaProxyOptionAddress(t *testing.T) {
+ actualResult := newInterContainerProxy(InterContainerAddress("10.20.30.40:1020"))
+ assert.Equal(t, actualResult.kafkaAddress, "10.20.30.40:1020")
assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
}
func TestKafkaProxyOptionTopic(t *testing.T) {
actualResult := newInterContainerProxy(DefaultTopic(&Topic{Name: "Adapter"}))
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.kafkaAddress, DefaultKafkaAddress)
assert.Equal(t, actualResult.defaultRequestHandlerInterface, interface{}(nil))
assert.Equal(t, actualResult.defaultTopic.Name, "Adapter")
}
@@ -55,20 +45,17 @@
func TestKafkaProxyOptionTargetInterface(t *testing.T) {
var m *myInterface
actualResult := newInterContainerProxy(RequestHandlerInterface(m))
- assert.Equal(t, actualResult.kafkaHost, DefaultKafkaHost)
- assert.Equal(t, actualResult.kafkaPort, DefaultKafkaPort)
+ assert.Equal(t, actualResult.kafkaAddress, DefaultKafkaAddress)
assert.Equal(t, actualResult.defaultRequestHandlerInterface, m)
}
func TestKafkaProxyChangeAllOptions(t *testing.T) {
var m *myInterface
actualResult := newInterContainerProxy(
- InterContainerHost("10.20.30.40"),
- InterContainerPort(1020),
+ InterContainerAddress("10.20.30.40:1020"),
DefaultTopic(&Topic{Name: "Adapter"}),
RequestHandlerInterface(m))
- assert.Equal(t, actualResult.kafkaHost, "10.20.30.40")
- assert.Equal(t, actualResult.kafkaPort, 1020)
+ assert.Equal(t, actualResult.kafkaAddress, "10.20.30.40:1020")
assert.Equal(t, actualResult.defaultRequestHandlerInterface, m)
assert.Equal(t, actualResult.defaultTopic.Name, "Adapter")
}
@@ -80,8 +67,7 @@
client := NewSaramaClient()
probe := newInterContainerProxy(
- InterContainerHost("10.20.30.40"),
- InterContainerPort(1020),
+ InterContainerAddress("10.20.30.40:1020"),
DefaultTopic(&Topic{Name: "Adapter"}),
RequestHandlerInterface(m),
MsgClient(client),
diff --git a/pkg/kafka/sarama_client.go b/pkg/kafka/sarama_client.go
index 468e546..581cf49 100755
--- a/pkg/kafka/sarama_client.go
+++ b/pkg/kafka/sarama_client.go
@@ -47,8 +47,7 @@
// SaramaClient represents the messaging proxy
type SaramaClient struct {
cAdmin sarama.ClusterAdmin
- KafkaHost string
- KafkaPort int
+ KafkaAddress string
producer sarama.AsyncProducer
consumer sarama.Consumer
groupConsumers map[string]*scc.Consumer
@@ -86,15 +85,9 @@
type SaramaClientOption func(*SaramaClient)
-func Host(host string) SaramaClientOption {
+func Address(address string) SaramaClientOption {
return func(args *SaramaClient) {
- args.KafkaHost = host
- }
-}
-
-func Port(port int) SaramaClientOption {
- return func(args *SaramaClient) {
- args.KafkaPort = port
+ args.KafkaAddress = address
}
}
@@ -202,8 +195,7 @@
func NewSaramaClient(opts ...SaramaClientOption) *SaramaClient {
client := &SaramaClient{
- KafkaHost: DefaultKafkaHost,
- KafkaPort: DefaultKafkaPort,
+ KafkaAddress: DefaultKafkaAddress,
}
client.consumerType = DefaultConsumerType
client.producerFlushFrequency = DefaultProducerFlushFrequency
@@ -695,15 +687,14 @@
}
func (sc *SaramaClient) createClusterAdmin() error {
- kafkaFullAddr := fmt.Sprintf("%s:%d", sc.KafkaHost, sc.KafkaPort)
config := sarama.NewConfig()
config.Version = sarama.V1_0_0_0
// Create a cluster Admin
var cAdmin sarama.ClusterAdmin
var err error
- if cAdmin, err = sarama.NewClusterAdmin([]string{kafkaFullAddr}, config); err != nil {
- logger.Errorw("cluster-admin-failure", log.Fields{"error": err, "broker-address": kafkaFullAddr})
+ if cAdmin, err = sarama.NewClusterAdmin([]string{sc.KafkaAddress}, config); err != nil {
+ logger.Errorw("cluster-admin-failure", log.Fields{"error": err, "broker-address": sc.KafkaAddress})
return err
}
sc.cAdmin = cAdmin
@@ -841,8 +832,7 @@
//config.Producer.RequiredAcks = sarama.WaitForAll
config.Producer.RequiredAcks = sarama.WaitForLocal
- kafkaFullAddr := fmt.Sprintf("%s:%d", sc.KafkaHost, sc.KafkaPort)
- brokers := []string{kafkaFullAddr}
+ brokers := []string{sc.KafkaAddress}
if producer, err := sarama.NewAsyncProducer(brokers, config); err != nil {
logger.Errorw("error-starting-publisher", log.Fields{"error": err})
@@ -862,8 +852,7 @@
config.Consumer.MaxProcessingTime = time.Duration(sc.maxProcessingTime) * time.Millisecond
config.Consumer.Offsets.Initial = sarama.OffsetNewest
config.Metadata.Retry.Max = sc.metadataMaxRetry
- kafkaFullAddr := fmt.Sprintf("%s:%d", sc.KafkaHost, sc.KafkaPort)
- brokers := []string{kafkaFullAddr}
+ brokers := []string{sc.KafkaAddress}
if consumer, err := sarama.NewConsumer(brokers, config); err != nil {
logger.Errorw("error-starting-consumers", log.Fields{"error": err})
@@ -887,8 +876,7 @@
//config.Consumer.MaxProcessingTime = time.Duration(DefaultMaxProcessingTime) * time.Millisecond
config.Consumer.Offsets.Initial = initialOffset
//config.Consumer.Offsets.Initial = sarama.OffsetOldest
- kafkaFullAddr := fmt.Sprintf("%s:%d", sc.KafkaHost, sc.KafkaPort)
- brokers := []string{kafkaFullAddr}
+ brokers := []string{sc.KafkaAddress}
topics := []string{topic.Name}
var consumer *scc.Consumer
diff --git a/pkg/ponresourcemanager/ponresourcemanager.go b/pkg/ponresourcemanager/ponresourcemanager.go
index 4cccb84..5c10b5e 100755
--- a/pkg/ponresourcemanager/ponresourcemanager.go
+++ b/pkg/ponresourcemanager/ponresourcemanager.go
@@ -22,7 +22,6 @@
"encoding/json"
"errors"
"fmt"
- "strconv"
"time"
bitmap "github.com/boljen/go-bitmap"
@@ -140,8 +139,7 @@
DeviceType string
DeviceID string
Backend string // ETCD, or consul
- Host string // host ip of the KV store
- Port int // port number for the KV store
+ Address string // address of the KV store
OLTModel string
KVStore *db.Backend
KVStoreForConfig *db.Backend
@@ -167,11 +165,10 @@
return nil, errors.New("unsupported-kv-store")
}
-func SetKVClient(Technology string, Backend string, Host string, Port int, configClient bool) *db.Backend {
- addr := Host + ":" + strconv.Itoa(Port)
+func SetKVClient(Technology string, Backend string, Addr string, configClient bool) *db.Backend {
// TODO : Make sure direct call to NewBackend is working fine with backend , currently there is some
// issue between kv store and backend , core is not calling NewBackend directly
- kvClient, err := newKVClient(Backend, addr, KVSTORE_RETRY_TIMEOUT)
+ kvClient, err := newKVClient(Backend, Addr, KVSTORE_RETRY_TIMEOUT)
if err != nil {
logger.Fatalw("Failed to init KV client\n", log.Fields{"err": err})
return nil
@@ -187,8 +184,7 @@
kvbackend := &db.Backend{
Client: kvClient,
StoreType: Backend,
- Host: Host,
- Port: Port,
+ Address: Addr,
Timeout: KVSTORE_RETRY_TIMEOUT,
PathPrefix: pathPrefix}
@@ -196,27 +192,26 @@
}
// NewPONResourceManager creates a new PON resource manager.
-func NewPONResourceManager(Technology string, DeviceType string, DeviceID string, Backend string, Host string, Port int) (*PONResourceManager, error) {
+func NewPONResourceManager(Technology string, DeviceType string, DeviceID string, Backend string, Address string) (*PONResourceManager, error) {
var PONMgr PONResourceManager
PONMgr.Technology = Technology
PONMgr.DeviceType = DeviceType
PONMgr.DeviceID = DeviceID
PONMgr.Backend = Backend
- PONMgr.Host = Host
- PONMgr.Port = Port
- PONMgr.KVStore = SetKVClient(Technology, Backend, Host, Port, false)
+ PONMgr.Address = Address
+ PONMgr.KVStore = SetKVClient(Technology, Backend, Address, false)
if PONMgr.KVStore == nil {
logger.Error("KV Client initilization failed")
return nil, errors.New("Failed to init KV client")
}
// init kv client to read from the config path
- PONMgr.KVStoreForConfig = SetKVClient(Technology, Backend, Host, Port, true)
+ PONMgr.KVStoreForConfig = SetKVClient(Technology, Backend, Address, true)
if PONMgr.KVStoreForConfig == nil {
logger.Error("KV Config Client initilization failed")
return nil, errors.New("Failed to init KV Config client")
}
// Initialize techprofile for this technology
- if PONMgr.TechProfileMgr, _ = tp.NewTechProfile(&PONMgr, Backend, Host, Port); PONMgr.TechProfileMgr == nil {
+ if PONMgr.TechProfileMgr, _ = tp.NewTechProfile(&PONMgr, Backend, Address); PONMgr.TechProfileMgr == nil {
logger.Error("Techprofile initialization failed")
return nil, errors.New("Failed to init tech profile")
}
diff --git a/pkg/ponresourcemanager/ponresourcemanager_test.go b/pkg/ponresourcemanager/ponresourcemanager_test.go
index c2a651e..b91107c 100644
--- a/pkg/ponresourcemanager/ponresourcemanager_test.go
+++ b/pkg/ponresourcemanager/ponresourcemanager_test.go
@@ -138,7 +138,7 @@
func TestExcludeReservedGemPortIdFromThePool(t *testing.T) {
PONRMgr, err := NewPONResourceManager("gpon", "onu", "olt1",
- "etcd", "1", 1)
+ "etcd", "1:1")
if err != nil {
return
}
diff --git a/pkg/techprofile/config.go b/pkg/techprofile/config.go
index 8a304be..fe3e4a2 100644
--- a/pkg/techprofile/config.go
+++ b/pkg/techprofile/config.go
@@ -76,8 +76,7 @@
// TechprofileFlags represents the set of configurations used
type TechProfileFlags struct {
- KVStoreHost string
- KVStorePort int
+ KVStoreAddress string
KVStoreType string
KVStoreTimeout time.Duration
KVBackend *db.Backend
@@ -93,12 +92,11 @@
DefaultNumGemPorts uint32
}
-func NewTechProfileFlags(KVStoreType string, KVStoreHost string, KVStorePort int) *TechProfileFlags {
+func NewTechProfileFlags(KVStoreType string, KVStoreAddress string) *TechProfileFlags {
// initialize with default values
var techProfileFlags = TechProfileFlags{
KVBackend: nil,
- KVStoreHost: KVStoreHost,
- KVStorePort: KVStorePort,
+ KVStoreAddress: KVStoreAddress,
KVStoreType: KVStoreType,
KVStoreTimeout: defaultKVStoreTimeout,
DefaultTPName: defaultTechProfileName,
diff --git a/pkg/techprofile/tech_profile.go b/pkg/techprofile/tech_profile.go
index 00208d6..afe5c09 100644
--- a/pkg/techprofile/tech_profile.go
+++ b/pkg/techprofile/tech_profile.go
@@ -243,12 +243,11 @@
}
func (t *TechProfileMgr) SetKVClient() *db.Backend {
- addr := t.config.KVStoreHost + ":" + strconv.Itoa(t.config.KVStorePort)
- kvClient, err := newKVClient(t.config.KVStoreType, addr, t.config.KVStoreTimeout)
+ kvClient, err := newKVClient(t.config.KVStoreType, t.config.KVStoreAddress, t.config.KVStoreTimeout)
if err != nil {
logger.Errorw("failed-to-create-kv-client",
log.Fields{
- "type": t.config.KVStoreType, "host": t.config.KVStoreHost, "port": t.config.KVStorePort,
+ "type": t.config.KVStoreType, "address": t.config.KVStoreAddress,
"timeout": t.config.KVStoreTimeout, "prefix": t.config.TPKVPathPrefix,
"error": err.Error(),
})
@@ -257,8 +256,7 @@
return &db.Backend{
Client: kvClient,
StoreType: t.config.KVStoreType,
- Host: t.config.KVStoreHost,
- Port: t.config.KVStorePort,
+ Address: t.config.KVStoreAddress,
Timeout: t.config.KVStoreTimeout,
PathPrefix: t.config.TPKVPathPrefix}
@@ -281,10 +279,10 @@
return nil, errors.New("unsupported-kv-store")
}
-func NewTechProfile(resourceMgr iPonResourceMgr, KVStoreType string, KVStoreHost string, KVStorePort int) (*TechProfileMgr, error) {
+func NewTechProfile(resourceMgr iPonResourceMgr, KVStoreType string, KVStoreAddress string) (*TechProfileMgr, error) {
var techprofileObj TechProfileMgr
logger.Debug("Initializing techprofile Manager")
- techprofileObj.config = NewTechProfileFlags(KVStoreType, KVStoreHost, KVStorePort)
+ techprofileObj.config = NewTechProfileFlags(KVStoreType, KVStoreAddress)
techprofileObj.config.KVBackend = techprofileObj.SetKVClient()
if techprofileObj.config.KVBackend == nil {
logger.Error("Failed to initialize KV backend\n")