[VOL-1435] Initial submission for device management integration
tests. This update also comprises of some fixes with kafka
consumer and random mac address generation.
Change-Id: I4f8081752af646c3ed218ab17a541abb1b70cf5c
diff --git a/adapters/common/utils.go b/adapters/common/utils.go
index 8cade8f..98468b0 100644
--- a/adapters/common/utils.go
+++ b/adapters/common/utils.go
@@ -23,7 +23,7 @@
//GetRandomSerialNumber returns a serial number formatted as "HOST:PORT"
func GetRandomSerialNumber() string {
- rand.Seed(time.Now().Unix())
+ rand.Seed(time.Now().UnixNano())
return fmt.Sprintf("%d.%d.%d.%d:%d",
rand.Intn(255),
rand.Intn(255),
@@ -35,7 +35,7 @@
//GetRandomMacAddress returns a random mac address
func GetRandomMacAddress() string {
- rand.Seed(time.Now().Unix())
+ rand.Seed(time.Now().UnixNano())
return fmt.Sprintf("%02x:%02x:%02x:%02x:%02x:%02x",
rand.Intn(128),
rand.Intn(128),
diff --git a/adapters/simulated_olt/adaptercore/simulated_olt.go b/adapters/simulated_olt/adaptercore/simulated_olt.go
index aa6e248..2dd7c67 100644
--- a/adapters/simulated_olt/adaptercore/simulated_olt.go
+++ b/adapters/simulated_olt/adaptercore/simulated_olt.go
@@ -99,7 +99,7 @@
func (so *SimulatedOLT) createDeviceTopic(device *voltha.Device) error {
log.Infow("create-device-topic", log.Fields{"deviceId": device.Id})
deviceTopic := kafka.Topic{Name: so.kafkaICProxy.DefaultTopic.Name + "_" + device.Id}
- if err := so.kafkaICProxy.SubscribeWithDefaultRequestHandler(deviceTopic); err != nil {
+ if err := so.kafkaICProxy.SubscribeWithDefaultRequestHandler(deviceTopic, kafka.OffsetOldest); err != nil {
log.Infow("create-device-topic-failed", log.Fields{"deviceId": device.Id, "error": err})
return err
}
diff --git a/adapters/simulated_onu/adaptercore/simulated_onu.go b/adapters/simulated_onu/adaptercore/simulated_onu.go
index 1aefcad..2d43944 100644
--- a/adapters/simulated_onu/adaptercore/simulated_onu.go
+++ b/adapters/simulated_onu/adaptercore/simulated_onu.go
@@ -97,7 +97,7 @@
func (so *SimulatedONU) createDeviceTopic(device *voltha.Device) error {
log.Infow("create-device-topic", log.Fields{"deviceId": device.Id})
deviceTopic := kafka.Topic{Name: so.kafkaICProxy.DefaultTopic.Name + "_" + device.Id}
- if err := so.kafkaICProxy.SubscribeWithDefaultRequestHandler(deviceTopic); err != nil {
+ if err := so.kafkaICProxy.SubscribeWithDefaultRequestHandler(deviceTopic, kafka.OffsetOldest); err != nil {
log.Infow("create-device-topic-failed", log.Fields{"deviceId": device.Id, "error": err})
return err
}