A device discovery tool should include both Layer 3 (devices) and Layer 2 discovery (port-to-port connectivity).