Replace get_persistent_connection_options with get_options Remove special case for network sub_plugin in _set_plugin_options Try to avoid mock connection pretending to be persistent Rename variables->options to reflect what they actually are Gather options for ssh_type_conn on network_cli Drop reliance on sub_plugin["type"]