morpheus-cli 5.3.3 → 5.4.2

data/lib/morpheus/cli/{shell.rb → commands/shell.rb}

@@ -1,18 +1,6 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require "shellwords"
-require 'readline'
-require 'logger'
-require 'fileutils'
-require 'morpheus/cli/cli_registry'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/error_handler'
-require 'morpheus/cli/expression_parser'
-require 'morpheus/terminal'
-require 'morpheus/logging'
-require 'morpheus/benchmarking'
+require "shellwords"
+require "readline"
 
 #class Morpheus::Cli::Shell < Morpheus::Terminal
 class Morpheus::Cli::Shell
@@ -391,102 +379,14 @@ class Morpheus::Cli::Shell
       elsif input =~ /^\s*#/
         Morpheus::Logging::DarkPrinter.puts "ignored comment: #{input}" if Morpheus::Logging.debug?
         return 0
-      # this is a full blown command now
-      # elsif input =~ /^sleep/
-      #   sleep_sec = input.sub("sleep ", "").to_f
-      #   if (!(sleep_sec > 0))
-      #     # raise_command_error "sleep requires the argument [seconds]. eg. sleep 3.14"
-      #     puts_error  "sleep requires argument [seconds]. eg. sleep 3.14"
-      #     return false
-      #   end
-      #   log_history_command(input)
-      #   Morpheus::Logging::DarkPrinter.puts "sleeping for #{sleep_sec}s ... zzzZzzzZ" if Morpheus::Logging.debug?
-      #   begin
-      #     sleep(sleep_sec)
-      #   rescue Interrupt
-      #     Morpheus::Logging::DarkPrinter.puts "\nInterrupt. waking up from sleep early"
-      #   end
-      #   return 0
-      # elsif input =~ /^history/
-      #   n_commands = input.sub(/^history\s?/, '').sub(/\-n\s?/, '')
-      #   n_commands = n_commands.empty? ? 25 : n_commands.to_i
-      #   cmd_numbers = @history.keys.last(n_commands)
-      #   if cmd_numbers.size == 1
-      #     puts "Last command"
-      #   else
-      #     puts "Last #{cmd_numbers.size} commands"
-      #   end
-      #   cmd_numbers.each do |cmd_number|
-      #     cmd = @history[cmd_number]
-      #     puts "#{cmd_number.to_s.rjust(3, ' ')}  #{cmd}"
-      #   end
-      #   last_cmd = cmd_numbers.last ? @history[cmd_numbers.last] : nil
-      #   if input != last_cmd # no consecutive
-      #     log_history_command(input)
-      #   end
-      #   return 0
       elsif input == 'clear'
         print "\e[H\e[2J"
         return 0
-      # elsif input == 'flush-history' || input == 'flush_history'
-      #   file_path = history_file_path
-      #   if File.exists?(file_path)
-      #     File.truncate(file_path, 0)
-      #   end
-      #   @history = {}
-      #   @last_command_number = 0
-      #   @history_logger = load_history_logger
-      #   puts "history cleared!"
-      #   return 0
-      # elsif input == "edit rc"
-      #   fn = Morpheus::Cli::DotFile.morpheusrc_filename
-      #   editor = ENV['EDITOR'] # || 'nano'
-      #   if !editor
-      #     puts "You have no EDITOR defined. Use 'export EDITOR=emacs'"
-      #     #puts "Trying nano..."
-      #     #editor = "nano"
-      #   end
-      #   system("which #{editor} > /dev/null 2>&1")
-      #   has_editor = $?.success?
-      #   if has_editor
-      #     puts "opening #{fn} for editing with #{editor} ..."
-      #     system("#{editor} #{fn}")
-      #     puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
-      #   else
-      #     puts_error2 Morpheus::Terminal.angry_prompt
-      #     puts_error "The defined EDITOR '#{editor}' was not found on your system."
-      #   end
-      #   return 0 # $?
-      # elsif input == "edit profile"
-      #   fn = Morpheus::Cli::DotFile.morpheus_profile_filename
-      #   editor = ENV['EDITOR'] # || 'nano'
-      #   if !editor
-      #     puts "You have no EDITOR defined. Use 'export EDITOR=emacs'."
-      #     #puts "Trying nano..."
-      #     #editor = "nano"
-      #   end
-      #   system("which #{editor} > /dev/null 2>&1")
-      #   has_editor = $?.success?
-      #   if has_editor
-      #     puts "opening #{fn} for editing with #{editor} ..."
-      #     `#{editor} #{fn}`
-      #     puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
-      #   else
-      #     puts_error Morpheus::Terminal.angry_prompt
-      #     puts_error "The defined EDITOR '#{editor}' was not found on your system."
-      #   end
-      #   return 0 # $?
       elsif input == 'reload' || input == 'reload!'
-        # raise RestartShellPlease
-        #log_history_command(input)
-        # could just fork instead?
         # clear registry
         Morpheus::Cli::CliRegistry.instance.flush
         # reload code
         Morpheus::Cli.load!
-
-        # raise RestartShellPlease
-
         # execute startup scripts
         if File.exists?(Morpheus::Cli::DotFile.morpheus_profile_filename)
           Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename).execute()
@@ -494,7 +394,6 @@ class Morpheus::Cli::Shell
         if File.exists?(Morpheus::Cli::DotFile.morpheusrc_filename)
           Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheusrc_filename).execute()
         end
-        
         # recalculate shell environment
         reinitialize()
 
@@ -824,10 +723,10 @@ class Morpheus::Cli::Shell
       end
       if options[:show_pagination]
         if options[:phrase] || options[:sort] || options[:direction] || options[:offset]
-          print_results_pagination({:meta => history_result[:meta]})
+          print_results_pagination(history_result[:meta])
         else
           # default order is weird, it's the last page of results, 1-25 is misleading and showing the indexes is stranger
-          print_results_pagination({:meta => history_result[:meta]}, {:message =>"Viewing most recent %{size} of %{total} %{label}"})
+          print_results_pagination(history_result[:meta], {:message =>"Viewing most recent %{size} of %{total} %{label}"})
         end
         print reset, "\n"
       else

data/lib/morpheus/cli/commands/{standard/sleep_command.rb → sleep_command.rb}

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # This is for use in dotfile scripts
 class Morpheus::Cli::Sleep

data/lib/morpheus/cli/commands/{standard/source_command.rb → source_command.rb}

@@ -1,6 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts and the shell..
 class Morpheus::Cli::SourceCommand

data/lib/morpheus/cli/commands/{standard/ssl_verification_command.rb → ssl_verification_command.rb}

@@ -1,7 +1,4 @@
-require 'optparse'
-require 'morpheus/rest_client'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts
 class Morpheus::Cli::SslVerificationCommand

data/lib/morpheus/cli/{storage_providers_command.rb → commands/storage_providers_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::StorageProvidersCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/commands/storage_server_types.rb

@@ -0,0 +1,50 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::StorageServerTypes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::StorageServersHelper
+
+  set_command_description "View storage server types"
+  set_command_name :'storage-server-types'
+  register_subcommands :list, :get
+
+  # register_interfaces :storage_server_types
+
+  protected
+
+  def storage_server_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+    }
+  end
+
+  def storage_server_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+      "Creatable" => lambda {|it| format_boolean(it['creatable']) },
+      "Create Namespaces" => lambda {|it| format_boolean(it['createNamespaces']) },
+      "Create Groups" => lambda {|it| format_boolean(it['createGroups']) },
+      "Create Hosts" => lambda {|it| format_boolean(it['createHosts']) },
+      "Create Disks" => lambda {|it| format_boolean(it['createDisks']) },
+      "Has Namespaces" => lambda {|it| format_boolean(it['hasNamespaces']) },
+      "Has Groups" => lambda {|it| format_boolean(it['hasGroups']) },
+      "Has Hosts" => lambda {|it| format_boolean(it['hasHosts']) },
+      "Has Disks" => lambda {|it| format_boolean(it['hasDisks']) },
+      "Has File Browser" => lambda {|it| format_boolean(it['hasFileBrowser']) },
+    }
+  end
+
+  # overridden to support name or code
+  def find_storage_server_type_by_name_or_id(name)
+    storage_server_type_for_name_or_id(name)
+  end
+
+end
+

data/lib/morpheus/cli/commands/storage_servers.rb

@@ -0,0 +1,122 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::StorageServers
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::StorageServersHelper
+
+  set_command_name :'storage-servers'
+  set_command_description "View and manage storage servers."
+  register_subcommands :list, :get, :add, :update, :remove
+
+  # RestCommand settings
+  register_interfaces :storage_servers, :storage_server_types
+  set_rest_has_type true
+  # set_rest_type :storage_server_types
+
+  def render_response_for_get(json_response, options)
+    render_response(json_response, options, rest_object_key) do
+      record = json_response[rest_object_key]
+      print_h1 rest_label, [], options
+      print cyan
+      print_description_list(rest_column_definitions(options), record, options)
+      # show Storage Server Configuration
+      config = record['config']
+      if config && !config.empty?
+        print_h2 "Configuration"
+        print_description_list(config.keys, config)
+      end
+      print reset,"\n"
+    end
+  end
+
+  protected
+
+  def storage_server_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Service URL" => lambda {|it| it['serviceUrl'] },
+      "Tenants" => lambda {|it| 
+        if it['tenants'] && !it['tenants'].empty?
+          it['tenants'].collect {|account| account['name'] }.join(', ')
+        else
+          it['owner'] ? it['owner']['name'] : (it['account'] ? it['account']['name'] : nil)
+        end
+      },
+      "Status" => lambda {|it| format_storage_server_status(it) },
+    }
+  end
+
+  def storage_server_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Description" => 'description',
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Service URL" => lambda {|it| it['serviceUrl'] },
+      "Service Username" => lambda {|it| it['serviceUsername'] },
+      "Tenants" => lambda {|it| it['tenants'].collect {|account| account['name'] }.join(', ') },
+      "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : (it['account'] ? it['account']['name'] : nil) },
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Status" => lambda {|it| format_storage_server_status(it) },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
+  # overridden to work with name or code
+  # nope, api works with name=code now too
+  # def find_storage_server_type_by_name_or_id(name)
+  #   storage_server_type_for_name_or_id(name)
+  # end
+
+  def add_storage_server_option_types()
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true},
+#      {'fieldName' => 'type', 'fieldLabel' => 'Storage Server Type', 'type' => 'select', 'optionSource' => 'storageServerTypes', 'required' => true},
+    ]
+  end
+
+  def add_storage_server_advanced_option_types()
+    [
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'fieldGroup' => 'Advanced', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions'},
+      {'fieldName' => 'tenants', 'fieldLabel' => 'Tenants', 'fieldGroup' => 'Advanced', 'type' => 'multiSelect', 'optionSource' => lambda { |api_client, api_params| 
+        api_client.options.options_for_source("allTenants", {})['data']
+      }},
+    ]
+  end
+
+  def update_storage_server_option_types()
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text'},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox'},
+    ]
+  end
+
+  def update_storage_server_advanced_option_types()
+    add_storage_server_advanced_option_types()
+  end
+
+  def format_storage_server_status(storage_server, return_color=cyan)
+    out = ""
+    status_string = storage_server['status']
+    if storage_server['enabled'] == false
+      out << "#{red}DISABLED#{return_color}"
+    elsif status_string.nil? || status_string.empty? || status_string == "unknown"
+      out << "#{white}UNKNOWN#{return_color}"
+    elsif status_string == 'ok'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'syncing'
+      out << "#{yellow}#{status_string.upcase}#{return_color}"
+    else
+      out << "#{red}#{status_string ? status_string.upcase : 'N/A'}#{storage_server['statusMessage'] ? "#{return_color} - #{storage_server['statusMessage']}" : ''}#{return_color}"
+    end
+    out
+  end
+
+end

data/lib/morpheus/cli/commands/storage_volume_types.rb

@@ -0,0 +1,50 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::StorageVolumeTypes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::StorageVolumesHelper
+
+  set_command_name :'storage-volume-types'
+  register_subcommands :list, :get
+
+  # register_interfaces :storage_volume_types
+
+  protected
+
+  def build_list_options(opts, options, params)
+    opts.on('--name VALUE', String, "Filter by name") do |val|
+      params['name'] = val
+    end
+    opts.on('--category VALUE', String, "Filter by category") do |val|
+      params['category'] = val
+    end
+    # build_standard_list_options(opts, options)
+    super
+  end
+
+  def storage_volume_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+    }
+  end
+
+  def storage_volume_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      "Description" => 'description',
+    }
+  end
+
+  # overridden to support name or code
+  def find_storage_volume_type_by_name_or_id(name)
+    storage_volume_type_for_name_or_id(name)
+  end
+
+end
+

data/lib/morpheus/cli/commands/storage_volumes.rb

@@ -0,0 +1,103 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::StorageVolumes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::StorageVolumesHelper
+
+  set_command_name :'storage-volumes'
+  set_command_description "View and manage storage volumes."
+  register_subcommands %w{list get add remove}
+
+  # RestCommand settings
+  register_interfaces :storage_volumes, :storage_volume_types
+  set_rest_has_type true
+
+  protected
+
+  def build_list_options(opts, options, params)
+    opts.on('--storage-server VALUE', String, "Storage Server Name or ID") do |val|
+      options[:storage_server] = val
+    end
+    opts.on('-t', '--type TYPE', "Filter by type") do |val|
+      params['type'] = val
+    end
+    opts.on('--name VALUE', String, "Filter by name") do |val|
+      params['name'] = val
+    end
+    opts.on('--category VALUE', String, "Filter by category") do |val|
+      params['category'] = val
+    end
+    # build_standard_list_options(opts, options)
+    super
+  end
+
+  def parse_list_options!(args, options, params)
+    parse_parameter_as_resource_id!(:storage_server, options, params)
+    super
+  end
+
+  def storage_volume_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Source" => lambda {|it| format_storage_volume_source(it) },
+      "Storage" => lambda {|it| format_bytes(it['maxStorage']) },
+      "Status" => lambda {|it| format_storage_volume_status(it) },
+    }
+  end
+
+  def storage_volume_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Description" => 'description',
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : (it['account'] ? it['account']['name'] : nil) },
+      "Cloud" => lambda {|it| it['zone']['name'] rescue '' },
+      "Datastore" => lambda {|it| it['datastore']['name'] rescue '' },
+      "Storage Group" => lambda {|it| it['storageGroup']['name'] rescue '' },
+      "Storage Server" => lambda {|it| it['storageServer']['name'] rescue '' },
+      "Source" => lambda {|it| format_storage_volume_source(it) },
+      "Storage" => lambda {|it| format_bytes(it['maxStorage']) },
+      "Status" => lambda {|it| format_storage_volume_status(it) },
+    }
+  end
+
+  # overridden to work with name or code
+  # nope, api works with name=code now too
+  # def find_storage_volume_type_by_name_or_id(name)
+  #   storage_volume_type_for_name_or_id(name)
+  # end
+
+  def add_storage_volume_option_types()
+    [
+      {'fieldContext' => 'storageServer', 'fieldName' => 'id', 'fieldLabel' => 'Storage Server', 'type' => 'select', 'optionSource' => 'storageServers', 'optionParams' => {'createType' => 'block'}, 'required' => true},
+      {'fieldContext' => 'storageGroup', 'fieldName' => 'id', 'fieldLabel' => 'Storage Group', 'type' => 'select', 'optionSource' => 'storageGroups', 'required' => true},
+      {'shorthand' => '-t', 'fieldName' => 'type', 'fieldLabel' => 'Storage Volume Type', 'type' => 'select', 'optionSource' => 'storageVolumeTypes', 'required' => true},
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+    ]
+  end
+
+  def update_storage_volume_option_types()
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text'},
+    ]
+  end
+
+  def load_option_types_for_storage_volume(type_record, parent_record)
+    storage_volume_type = type_record
+    option_types = storage_volume_type['optionTypes']
+    # ughhh, all this to change a label for API which uses bytes and not MB
+    if option_types
+      size_option_type = option_types.find {|it| it['fieldName'] == 'maxStorage' }
+      if size_option_type
+        #size_option_type['fieldLabel'] = "Volume Size (bytes)"
+        size_option_type['fieldAddOn'] = "bytes"
+      end
+    end
+    return option_types
+  end
+
+end

data/lib/morpheus/cli/{subnets_command.rb → commands/subnets_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::SubnetsCommand
   include Morpheus::Cli::CliCommand
@@ -350,8 +346,13 @@ class Morpheus::Cli::SubnetsCommand
         if subnet_type_option_types && subnet_type_option_types.size > 0
           # prompt for option types
           subnet_type_params = Morpheus::Cli::OptionTypes.prompt(subnet_type_option_types,options[:options],@api_client, {networkId: network['id'], zoneId: network['zone']['id']})
-          payload['subnet'].deep_merge!(subnet_type_params['subnet'])
-
+          if subnet_type_params['subnet']
+            payload['subnet'].deep_merge!(subnet_type_params['subnet'])
+          end
+          if subnet_type_params['config']
+            payload['subnet']['config'] ||= {}
+            payload['subnet']['config'].deep_merge!(subnet_type_params['config'])
+          end
         else
           # DEFAULT INPUTS
 

data/lib/morpheus/cli/{tasks.rb → commands/tasks.rb}

@@ -1,7 +1,3 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Tasks
@@ -198,7 +194,14 @@ class Morpheus::Cli::Tasks
               end
             else
               task_option_types << optionType
-              task_option_columns << {(optionType['fieldLabel']) => lambda {|it| task['taskOptions'][optionType['fieldName']] || optionType['defaultValue'] } }
+              task_option_columns << {(optionType['fieldLabel']) => lambda {|it| 
+                value = task['taskOptions'][optionType['code']] || task['taskOptions'][optionType['fieldName']] || optionType['defaultValue']
+                if optionType['type'] == 'checkbox'
+                  value.to_s.empty? ? 'off' : value.to_s
+                else
+                  value.to_s
+                end
+              } }
             end
           end
         else
@@ -430,6 +433,10 @@ class Morpheus::Cli::Tasks
             if it['fieldContext'].nil? || it['fieldContext'] == ''
               it['fieldContext'] = 'taskOptions'
             end
+            # taskOptions should prompt for code instead of fieldName, oy vey
+            if it['fieldContext'] == 'taskOptions'
+              it['fieldName'] = it['code']
+            end
           end
         end
         # inject file_params into options for file-content prompt
@@ -444,8 +451,20 @@ class Morpheus::Cli::Tasks
           end
         end
         # prompt
+
+        # tasks are different in that they use the optionType code instead of fieldName for the key values
         input_options = Morpheus::Cli::OptionTypes.prompt(task_option_types, options[:options],@api_client, options[:params])
-        payload.deep_merge!({'task' => input_options})  unless input_options.empty?
+        # flatten taskOptions as serverside expects
+        if input_options['taskOptions']
+          input_options['taskOptions'] = Morpheus::RestClient.grails_params(input_options['taskOptions'])
+          # remove "off" checkbox values, like the UI does
+          input_options['taskOptions'].keys.each do |k|
+            if input_options['taskOptions'][k] == "off"
+              input_options['taskOptions'].delete(k)
+            end
+          end
+        end
+        payload.deep_merge!({'task' => input_options}) unless input_options.empty?
         
 
         # Target Options

data/lib/morpheus/cli/{tenants_command.rb → commands/tenants_command.rb}

@@ -1,11 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'json'
 
 class Morpheus::Cli::TenantsCommand
   include Morpheus::Cli::CliCommand
@@ -25,7 +18,7 @@ class Morpheus::Cli::TenantsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @accounts_interface = @api_client.accounts
     @roles_interface = @api_client.roles
   end

data/lib/morpheus/cli/commands/{standard/update_command.rb → update_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts and the shell..
 class Morpheus::Cli::UpdateCommand

data/lib/morpheus/cli/{user_groups_command.rb → commands/user_groups_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::UserGroupsCommand
   include Morpheus::Cli::CliCommand
@@ -13,7 +12,7 @@ class Morpheus::Cli::UserGroupsCommand
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @user_groups_interface = @api_client.user_groups
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @accounts_interface = @api_client.accounts
   end
 

data/lib/morpheus/cli/{user_settings_command.rb → commands/user_settings_command.rb}

@@ -17,7 +17,8 @@ class Morpheus::Cli::UserSettingsCommand
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @user_settings_interface = @api_client.user_settings
-    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @account_users_interface = @api_client.account_users
   end
 
   def handle(args)

data/lib/morpheus/cli/{user_sources_command.rb → commands/user_sources_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::UserSourcesCommand
   include Morpheus::Cli::CliCommand
@@ -22,7 +21,7 @@ class Morpheus::Cli::UserSourcesCommand
     @api_client = establish_remote_appliance_connection(opts)
     @user_sources_interface = @api_client.user_sources
     @accounts_interface = @api_client.accounts
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
   end
 
   def handle(args)