Switch cli tenant controller to use base class