morpheus-cli 5.3.4 → 5.4.3

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/snapshots.rb

@@ -0,0 +1,139 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::Snapshots
+  include Morpheus::Cli::CliCommand
+
+  set_command_name :snapshots
+  set_command_description "View or remove snapshot"
+  register_subcommands :get, :remove
+
+  alias_subcommand :details, :get
+  set_default_subcommand :get
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @snapshots_interface = @api_client.snapshots
+  end
+  
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def get(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.footer = "Get Snapshot details." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot."
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts_error "[id] argument is required"
+      puts_error optparse
+      return 1
+    end
+
+    connect(options)
+    id_list = parse_id_list(args)
+
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(arg, options)
+    begin
+
+      @snapshots_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @snapshots_interface.dry.get(arg.to_i)
+        return
+      end
+
+      json_response = @snapshots_interface.get(arg.to_i)
+      if options[:json]
+        puts as_json(json_response, options, "snapshot")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "snapshot")
+        return 0
+      end
+
+      if options[:csv]
+        puts records_as_csv([json_response['snapshot']], options)
+        return 0
+      end
+      snapshot = json_response['snapshot']
+
+      print_h1 "Snapshot Details"
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        "External Id" => 'externalId',
+        "Status" => 'status',
+        "State" => 'state',
+        "Snapshot Type" => 'snapshotType',
+        "Snapshot Created" => 'snapshotCreated',
+        "Cloud" => 'zone.name',
+        "Datastore" => 'datastore',
+        "Parent Snapshot" => 'parentSnapshot',
+        "Active" => 'currentlyActive',
+        "Date Created" => 'dateCreated'
+      }
+      print_description_list(description_cols, snapshot)
+
+      print reset, "\n"
+
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    instance = nil
+    snapshot_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Remove/Delete a snapshot." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot to delete."
+    end
+    
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    snapshot_id = args[0].to_i
+    connect(options)
+    begin
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove a snapshot?", options)
+        exit 1
+      end
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @snapshots_interface.dry.remove(snapshot_id, payload)
+        return
+      end
+      
+      json_response = @snapshots_interface.remove(snapshot_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshot delete initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+end

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

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
@@ -183,7 +179,7 @@ class Morpheus::Cli::Tasks
           task_option_config = {}
           task_option_columns = []
           task_type['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |optionType|
-            if optionType['fieldLabel'].to_s.downcase == 'script'
+            if optionType['code'] == 'script'
               script_content = task['taskOptions'][optionType['fieldName']]
             elsif optionType['fieldName'] == 'httpHeaders' || optionType['fieldName'] == 'webHeaders'
               http_headers = task['taskOptions']['httpHeaders'] || task['taskOptions']['webHeaders']
@@ -557,11 +553,11 @@ class Morpheus::Cli::Tasks
             payload['task']['retryCount'] = v_prompt['retryCount'].to_i unless v_prompt['retryCount'].nil?
           end
           # Retry Delay
-          if options[:options]['retryDelay']
-            payload['task']['retryDelay'] = options[:options]['retryDelay'].to_i
+          if options[:options]['retryDelaySeconds']
+            payload['task']['retryDelaySeconds'] = options[:options]['retryDelaySeconds'].to_i
           else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'retryDelay', 'fieldLabel' => 'Retry Delay', 'type' => 'number', 'defaultValue' => 10}], options[:options], @api_client)
-            payload['task']['retryDelay'] = v_prompt['retryDelay'].to_i unless v_prompt['retryDelay'].nil?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'retryDelaySeconds', 'fieldLabel' => 'Retry Delay', 'type' => 'number', 'defaultValue' => 10}], options[:options], @api_client)
+            payload['task']['retryDelaySeconds'] = v_prompt['retryDelaySeconds'].to_i unless v_prompt['retryDelaySeconds'].nil?
           end
         end
 

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)
@@ -802,7 +803,7 @@ EOT
       {'fieldName' => 'windowsPassword', 'fieldLabel' => 'Windows Password', 'type' => 'password'},
       {'fieldName' => 'defaultGroup', 'fieldLabel' => 'Default Group ID', 'type' => 'text'},
       {'fieldName' => 'defaultCloud', 'fieldLabel' => 'Default Cloud ID', 'type' => 'text'},
-      {'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona Name or Code or ID', 'type' => 'text'},
+      {'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona Name or Code or ID eg. standard, serviceCatalog or vdi', 'type' => 'text'},
       {'switch' => 'change-password', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Change user credentials to use a new password'},
       {'fieldName' => 'avatar', 'fieldLabel' => 'Avatar', 'type' => 'file', 'description' => 'Local filepath of image file to upload as user avatar'},
       {'fieldName' => 'desktopBackground', 'fieldLabel' => 'Desktop Background', 'type' => 'file', 'description' => 'Local filepath of image file to upload as user desktop background'},

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)