VOL-1494: Support for adding multiple logical uni
Also error handling in ofagent and system-test
now starts onos. Needed to update proto for ofagent
Change-Id: I0d061edc9f1bdac6ebaf7b2e9254e8ea69b3b2d5
diff --git a/rw_core/core/logical_device_agent.go b/rw_core/core/logical_device_agent.go
index 4a0488a..e4e855b 100644
--- a/rw_core/core/logical_device_agent.go
+++ b/rw_core/core/logical_device_agent.go
@@ -1319,10 +1319,8 @@
} else {
log.Debugw("adding-uni", log.Fields{"deviceId": childDevice.Id})
portCap.Port.RootPort = false
- //TODO: For now use the channel id assigned by the OLT as logical port number
- lPortNo := childDevice.ProxyAddress.ChannelId
- portCap.Port.Id = fmt.Sprintf("uni-%d", lPortNo)
- portCap.Port.OfpPort.PortNo = lPortNo
+ portCap.Port.Id = port.Label
+ portCap.Port.OfpPort.PortNo = port.PortNo
portCap.Port.OfpPort.Name = portCap.Port.Id
portCap.Port.DeviceId = childDevice.Id
portCap.Port.DevicePortNo = port.PortNo