Merge "Use get_tenant_network in get_server_ip"