- if (port != null) {
- NodeConnectorRef nodeConnectorRef = deviceContext.lookupNodeConnectorRef(port);
- if (nodeConnectorRef == null) {
- nodeConnectorRef = InventoryDataServiceUtil.nodeConnectorRefFromDatapathIdPortno(
- datapathId, port, OpenflowVersion.get(input.getVersion()), deviceContext.getDeviceState().getNodeInstanceIdentifier());
- deviceContext.storeNodeConnectorRef(port, nodeConnectorRef);
- }
+
+ // Try to create the NodeConnectorRef
+ BigInteger dataPathId = deviceInfo.getDatapathId();
+ NodeConnectorRef nodeConnectorRef = NodeConnectorRefToPortTranslator.toNodeConnectorRef(input, dataPathId);
+
+ // If we was able to create NodeConnectorRef, use it
+ if (nodeConnectorRef != null) {