VOL-1377: Bug fixes during tech profile download at ONU
Tested default tech profile downloaded successfully at ONU and verfied the same in physical ONU device
patch: Ran go-fmted and fixed "make lint" errors
Change-Id: I00b0795d35b851357dc9e1b6b1366ef6b5450f29
diff --git a/rw_core/core/device_agent.go b/rw_core/core/device_agent.go
index fcac69c..9782fee 100755
--- a/rw_core/core/device_agent.go
+++ b/rw_core/core/device_agent.go
@@ -891,6 +891,14 @@
// First port
log.Debugw("addLogicalPortToMap-first-port-to-add", log.Fields{"deviceId": agent.deviceId})
cloned.Ports = make([]*voltha.Port, 0)
+ } else {
+ for _, p := range cloned.Ports {
+ if p.Type == port.Type && p.PortNo == port.PortNo {
+ log.Debugw("port already exists", log.Fields{"port": *port})
+ return nil
+ }
+ }
+
}
cp := proto.Clone(port).(*voltha.Port)
// Set the admin state of the port to ENABLE if the operational state is ACTIVE
diff --git a/rw_core/core/logical_device_agent.go b/rw_core/core/logical_device_agent.go
index c07335e..2f85c45 100644
--- a/rw_core/core/logical_device_agent.go
+++ b/rw_core/core/logical_device_agent.go
@@ -473,7 +473,7 @@
if changed {
// Launch a routine to decompose the flows
if err := agent.decomposeAndSendFlows(&ofp.Flows{Items: updatedFlows}, lDevice.FlowGroups, agent.includeDefaultFlows); err != nil {
- log.Errorf("decomposing-and-sending-flows", log.Fields{"logicalDeviceId": agent.logicalDeviceId})
+ log.Errorw("decomposing-and-sending-flows", log.Fields{"logicalDeviceId": agent.logicalDeviceId})
return err
}
@@ -1035,7 +1035,7 @@
}
// Get all the logical ports on that logical device
if lDevice, err := agent.getLogicalDeviceWithoutLock(); err != nil {
- log.Errorf("unknown-logical-device", log.Fields{"error": err, "logicalDeviceId": agent.logicalDeviceId})
+ log.Errorw("unknown-logical-device", log.Fields{"error": err, "logicalDeviceId": agent.logicalDeviceId})
return err
} else {
//TODO: Find a better way to refresh only missing routes