Merge "Add os-tenant-networks test"