UNI port is derived from tunnelID and some bug fixes
Flow-manager now uses tunnel id to derive uniport needed for futher flow processing
Able to verify EAPOL/HSIA flows end to end with physical hardware ( Edgecore BAL OLT  & TWSH ONT kit) with  below work-around :

EAPOL flow from logical device , results in installing device flows in ONU device (due to default leaf device flows in core - leafDeviceDefaultRules),
This flow over-rides previously installed default 4091 private rule installed from techprofile download event , Hence removed default leaf flows in rw_core to overcome this problem.

Change-Id: Icdb96674545e1c58ea3f020f989a3c9dd06214bc
diff --git a/adaptercore/device_handler.go b/adaptercore/device_handler.go
index f077eef..3bb34db 100644
--- a/adaptercore/device_handler.go
+++ b/adaptercore/device_handler.go
@@ -130,6 +130,10 @@
 	}
 	// portNum := IntfIdToPortNo(intfId,portType)
 	portNum := intfId
+	if portType == voltha.Port_ETHERNET_NNI {
+		portNum = IntfIdToPortNo(intfId, portType)
+	}
+	// portNum := IntfIdToPortNo(intfId,portType)
 	label := GetportLabel(portNum, portType)
 	if len(label) == 0 {
 		log.Errorw("Invalid-port-label", log.Fields{"portNum": portNum, "portType": portType})