morpheus-cli 4.1.4 → 4.1.5

data/lib/morpheus/cli/monitoring_incidents_command.rb

@@ -6,7 +6,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   include Morpheus::Cli::MonitoringHelper
 
   set_command_name :'monitor-incidents'
-  register_subcommands :list, :stats, :get, :history, :notifications, :update, :close, :reopen, :mute, :unmute
+  register_subcommands :list, :stats, :get, :history, :notifications, :update, :close, :reopen, :mute, :unmute, :add
   register_subcommands :'mute-all' => :mute_all
   register_subcommands :'unmute-all' => :unmute_all
 
@@ -159,7 +159,76 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       exit 1
     end
   end
-  
+
+  def add(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.on("-c", "--comment STRING", String, "Comment on this incident. Updates summary field.") do |val|
+        params['comment'] = val == 'null' ? nil : val
+      end
+      opts.on("--resolution STRING", String, "Description of the resolution to this incident") do |val|
+        params['resolution'] = val == 'null' ? nil : val
+      end
+      opts.on("--status STATUS", String, "Set status (open or closed)") do |val|
+        params['status'] = val
+      end
+      opts.on("--severity STATUS", String, "Set severity (critical, warning or info)") do |val|
+        params['severity'] = val
+      end
+      opts.on("--name STRING", String, "Set display name (subject)") do |val|
+        params['name'] = val == 'null' ? nil : val
+      end
+      opts.on("--startDate TIME", String, "Set start time") do |val|
+        begin
+          params['startDate'] = parse_time(val).utc.iso8601
+        rescue => e
+          raise OptionParser::InvalidArgument.new "Failed to parse --startDate '#{val}'. Error: #{e}"
+        end
+      end
+      opts.on("--endDate TIME", String, "Set end time") do |val|
+        begin
+          params['endDate'] = parse_time(val).utc.iso8601
+        rescue => e
+          raise OptionParser::InvalidArgument.new "Failed to parse --endDate '#{val}'. Error: #{e}"
+        end
+      end
+      opts.on("--inUptime BOOL", String, "Set 'In Availability'") do |val|
+        params['inUptime'] = ['true','on'].include?(val.to_s.strip)
+      end
+      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+    end
+
+    optparse.parse!(args)
+    connect(options)
+
+    begin
+      params['name'] = params['name'] || 'No subject'
+      params['startDate'] = params['startDate'] || Time.now.utc.iso8601
+      payload = { 'incident' => params }
+
+      @monitoring_incidents_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @monitoring_incidents_interface.dry.create(payload)
+        return
+      end
+
+      json_response = @monitoring_incidents_interface.create(payload)
+
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        print_green_success "Created incident #{json_response['incident']['id']}"
+        _get(json_response['incident']['id'], options)
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -170,7 +239,11 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       opts.on(nil,'--notifications', "Display Incident Notifications") do |val|
         options[:show_notifications] = true
       end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on('-a','--all', "Display All Details (History, Notifications)") do
+        options[:show_history] = true
+        options[:show_notifications] = true
+      end
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :query, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -236,7 +309,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       issues = json_response["issues"]
       if issues && !issues.empty?
         print_h2 "Issues"
-        print_incident_history_table(issues, options)
+        print_incident_issues_table(issues, options)
       else
         print "\n"
         puts "No checks involved in this incident"
@@ -265,7 +338,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         # gotta go get it
         notifications_json_response = @monitoring_incidents_interface.notifications(incident["id"], {max: 10})
         notification_items = notifications_json_response["notifications"]
-        if notification_items && notification_items.empty?
+        if notification_items && !notification_items.empty?
           print_h2 "Notifications"
           print_incident_notifications_table(notification_items, options)
           print_results_pagination(notifications_json_response, {:label => "notification", :n_label => "notifications"})
@@ -374,14 +447,14 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         return 0
       end
       notification_items = json_response['notifications']
-      title = "Incident Notifications: #{incident['id']}: #{incident['displayName'] || incident['name']}"
+      title = "Incident Notifications [#{incident['id']}] #{incident['displayName'] || incident['name']}"
       subtitles = []
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if notification_items.empty?
         print cyan,"No notifications found.",reset,"\n"
       else
-        print_incident_history_table(notification_items, options)
+        print_incident_notifications_table(notification_items, options)
         print_results_pagination(json_response, {:label => "notification", :n_label => "notifications"})
       end
       print reset,"\n"
@@ -396,7 +469,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      opts.on("-c", "--comment STRING", String, "Comment on this incident") do |val|
+      opts.on("-c", "--comment STRING", String, "Comment on this incident. Updates summary field.") do |val|
         params['comment'] = val == 'null' ? nil : val
       end
       opts.on("--resolution STRING", String, "Description of the resolution to this incident") do |val|
@@ -467,7 +540,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         print_green_success "Updated incident #{incident['id']}"
-        _get(incident['id'], {})
+        _get(incident['id'], options)
       end
 
     rescue RestClient::Exception => e
@@ -479,10 +552,11 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def mute(args)
     options = {}
-    params = {'enabled' => true}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       opts.on(nil, "--disable", "Disable mute state instead, the same as unmute") do
+        params['muted'] = false
         params['enabled'] = false
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
@@ -518,7 +592,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         else
           print_green_success "Unmuted incident #{incident['id']}"
         end
-        _get(incident['id'], {})
+        _get(incident['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -529,7 +603,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def unmute(args)
     options = {}
-    params = {'enabled' => false}
+    params = {'muted' => false, 'enabled' => false} # enabled was used pre 3.6.5
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
       build_common_options(opts, options, [:payload, :json, :dry_run, :quiet, :remote])
@@ -562,7 +636,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         print_green_success "Unmuted incident #{incident['id']}"
-        _get(incident['id'], {})
+        _get(incident['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -573,7 +647,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def mute_all(args)
     options = {}
-    params = {'enabled' => true}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on(nil, "--disable", "Disable mute state instead, the same as unmute-all") do
@@ -621,7 +695,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   def unmute_all(args)
     options = {}
-    params = {'enabled' => false}
+    params = {'muted' => false, 'enabled' => false}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:payload, :json, :dry_run, :quiet, :remote])
@@ -698,7 +772,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         print "\n"
       elsif !options[:quiet]
         print_green_success json_response["msg"] || "Incident #{incident['id']} is now closed"
-        # _get(incident['id'] {})
+        # _get(incident['id'] options)
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -747,7 +821,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         print "\n"
       elsif !options[:quiet]
         print_green_success json_response["msg"] || "Incident #{incident['id']} is now open"
-        # _get(incident['id'] {})
+        # _get(incident['id'] options)
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -757,58 +831,5 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
   private
 
-  def print_incidents_table(incidents, opts={})
-    columns = [
-      {"ID" => lambda {|incident| incident['id'] } },
-      {"SEVERITY" => lambda {|incident| format_severity(incident['severity']) } },
-      {"NAME" => lambda {|incident| incident['displayName'] || incident['name'] || 'No Subject' } },
-      {"TIME" => lambda {|incident| format_local_dt(incident['startDate']) } },
-      {"STATUS" => lambda {|incident| format_monitoring_incident_status(incident) } },
-      {"DURATION" => lambda {|incident| format_duration(incident['startDate'], incident['endDate']) } }
-    ]
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(incidents, columns, opts)
-  end
-
-  def print_incident_history_table(history_items, opts={})
-    columns = [
-      # {"ID" => lambda {|issue| issue['id'] } },
-      {"SEVERITY" => lambda {|issue| format_severity(issue['severity']) } },
-      {"AVAILABLE" => lambda {|issue| format_boolean issue['available'] } },
-      {"TYPE" => lambda {|issue| issue["attachmentType"] } },
-      {"NAME" => lambda {|issue| issue['name'] } },
-      {"DATE CREATED" => lambda {|issue| format_local_dt(issue['startDate']) } }
-    ]
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(history_items, columns, opts)
-  end
-
-  def print_incident_notifications_table(notifications, opts={})
-    columns = [
-      {"NAME" => lambda {|notification| notification['recipient'] ? notification['recipient']['name'] : '' } },
-      {"DELIVERY TYPE" => lambda {|notification| notification['addressTypes'].to_s } },
-      {"NOTIFIED ON" => lambda {|notification| format_local_dt(notification['dateCreated']) } },
-      # {"AVAILABLE" => lambda {|notification| format_boolean notification['available'] } },
-      # {"TYPE" => lambda {|notification| notification["attachmentType"] } },
-      # {"NAME" => lambda {|notification| notification['name'] } },
-      {"DATE CREATED" => lambda {|notification| 
-        date_str = format_local_dt(notification['startDate']).to_s
-        if notification['pendingUtil']
-          "(pending) #{date_str}"
-        else
-          date_str
-        end
-      } }
-    ]
-    #event['pendingUntil']
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(notifications, columns, opts)
-  end
 
 end

data/lib/morpheus/cli/network_pools_command.rb

@@ -229,14 +229,20 @@ class Morpheus::Cli::NetworkPoolsCommand
         end
         
         # Network Pool Type
-        network_type_id = nil
+        network_type_code = nil
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Pool Type', 'type' => 'select', 'optionSource' => 'networkPoolTypes', 'required' => true, 'description' => 'Choose a network pool type.'}], options, @api_client, {})
-        network_type_id = v_prompt['type']
-        if network_type_id.nil? || network_type_id.to_s.empty?
-          print_red_alert "Pool Type not found by id '#{options['type']}'"
+        network_type_code = v_prompt['type']
+        if network_type_code.nil? || network_type_code.to_s.empty?
+          print_red_alert "Pool Type not found by code '#{options['type']}'"
           return 1
         end
-        payload['networkPool']['type'] = {'id' => network_type_id.to_i }
+        # pre 4.1.1 expects ID
+        if network_type_code.to_s =~ /\A\d{1,}\Z/
+          payload['networkPool']['type'] = {'id' => network_type_code }
+        else
+          payload['networkPool']['type'] = {'code' => network_type_code }
+        end
+        # payload['networkPool']['type'] = network_type_code # this works too, simpler
 
         # IP Ranges
         if ip_range_list
@@ -283,9 +289,29 @@ class Morpheus::Cli::NetworkPoolsCommand
       opts.on('--name VALUE', String, "Name for this network pool") do |val|
         options['name'] = val
       end
-      opts.on('--type VALUE', String, "Type of network pool") do |val|
-        options['description'] = val
-      end
+      opts.on('--code VALUE', String, "Code") do |val|
+        options['code'] = val
+      end
+      opts.on('--category VALUE', String, "Category") do |val|
+        options['category'] = val
+      end
+      # todo all of these
+      # internalId
+      # externalId
+      # dnsDomain
+      # dnsSearchPath
+      # hostPrefix
+      # httpProxy
+      # dnsServers
+      # dnsSuffixList
+      # dhcpServer
+      # dhcpIp
+      # gateway
+      # netmask
+      # subnetAddress
+      # poolEnabled
+      # tftpServer
+      # bootFile
       opts.on('--ip-ranges LIST', Array, "IP Ranges, comma separated list IP ranges in the format start-end.") do |list|
         if list.size == 1 && list[0] == 'null' # hacky way to clear it
           ip_range_list = []
@@ -333,22 +359,12 @@ class Morpheus::Cli::NetworkPoolsCommand
         # Name
         if options['name']
           payload['networkPool']['name'] = options['name']
-        else
-          # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this network pool.'}], options)
-          # payload['networkPool']['name'] = v_prompt['name']
         end
-        
-        # Network Pool Type
-        # network_type_id = nil
-        # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Pool Type', 'type' => 'select', 'optionSource' => 'networkPoolTypes', 'required' => true, 'description' => 'Choose a network pool type.'}], options, @api_client, {})
-        # network_type_id = v_prompt['type']
-        # if network_type_id.nil? || network_type_id.to_s.empty?
-        #   print_red_alert "Pool Type not found by id '#{options['type']}'"
-        #   return 1
-        # end
-        # payload['networkPool']['type'] = {'id' => network_type_id.to_i }
-        if options['type']
-          payload['networkPool']['type'] = {'id' => options['type'].to_i }
+        if options['category']
+          payload['networkPool']['category'] = options['category']
+        end
+        if options['code']
+          payload['networkPool']['code'] = options['code']
         end
 
         # IP Ranges

data/lib/morpheus/cli/power_schedules_command.rb

@@ -745,7 +745,7 @@ class Morpheus::Cli::PowerSchedulesCommand
   end
 
   def find_instance_by_name(name)
-    instances = @instances_interface.get({name: name.to_s})['instances']
+    instances = @instances_interface.list({name: name.to_s})['instances']
     if instances.empty?
       print_red_alert "Instance not found by name #{name}"
       return nil

data/lib/morpheus/cli/remote.rb

@@ -11,31 +11,35 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::Remote
   include Morpheus::Cli::CliCommand
 
-  register_subcommands :list, :add, :get, :update, :remove, :use, :unuse, :current, :setup, :check
+  register_subcommands :list, :add, :get, :update, :rename, :remove, :use, :unuse, :current
+  register_subcommands :setup, :teardown, :check, :'check-all'
+
   set_default_subcommand :list
 
   def initialize()
     @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
 
+  def connect(opts={})
+    connect_opts = {:skip_verify_access_token => true}.merge(opts)
+    @api_client = establish_remote_appliance_connection(connect_opts)
+    @setup_interface = @api_client.setup
+  end
+
   def handle(args)
-    # if args.count == 0
-    #   list(args)
-    # else
-    #   handle_subcommand(args)
-    # end
     handle_subcommand(args)
   end
 
   def list(args)
     options = {}
+    params = {}
     show_all_activity = false
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
       opts.on("-a",'--all', "Show all the appliance activity details") do
         show_all_activity = true
       end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields])
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields])
       opts.footer = <<-EOT
 This outputs a list of the configured remote appliances. It also indicates
 the current appliance. The current appliance is where morpheus will send 
@@ -44,10 +48,11 @@ EOT
     end
     optparse.parse!(args)
     if args.count > 0
-      raise ::OptionParser::NeedlessArgument.new("#{args.join(' ')}")
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
-    @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-    appliances = ::Morpheus::Cli::Remote.load_all_remotes({})
+    #connect(options)
+    params.merge!(parse_list_options(options))
+    appliances = ::Morpheus::Cli::Remote.load_all_remotes(params)
     # if appliances.empty?
     #   raise_command_error "You have no appliances configured. See the `remote add` command."
     # end
@@ -63,13 +68,16 @@ EOT
       puts records_as_csv(appliances, options)
       return 0
     end
-
-    print_h1 "Morpheus Appliances", [], options
     if appliances.empty?
-      print yellow
-      puts "You have no appliances configured. See the `remote add` command."
-      print reset, "\n"
+      if params[:phrase]
+        print cyan,"0 remotes matched '#{params[:phrase]}'", reset, "\n"
+      else
+        print yellow,"You have no appliances configured. See the `remote add` command.", reset, "\n"
+      end
     else
+      title = "Morpheus Appliances"
+      subtitles = parse_list_subtitles(options)
+      print_h1 title, subtitles, options
       print cyan
       columns = [
         {:active => {:display_name => "", :display_method => lambda {|it| it[:active] ? "=>" : "" } } },
@@ -89,7 +97,7 @@ EOT
           print cyan, "\n# => #{@appliance_name} is the current remote appliance\n", reset
         #end
       else
-        print "\n# => No current remote appliance, see `remote use`\n", reset
+        print cyan, "\n# => No current remote appliance, see `remote use`\n", reset
       end
       print reset, "\n"
     end
@@ -102,12 +110,12 @@ EOT
     params = {}
     new_appliance_map = {}
     use_it = false
-    is_insecure = nil
+    secure = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       banner = subcommand_usage("[name] [url]")
       banner_args = <<-EOT
     [name]                           The name for your appliance. eg. mymorph
-    [url]                            The url of your appliance eg. https://morpheus.mycompany.com
+    [url]                            The url of your appliance eg. https://demo.mymorpheus.com
 EOT
       opts.banner = banner + "\n" + banner_args
       opts.on(nil, '--use', "Make this the current appliance" ) do
@@ -120,26 +128,23 @@ EOT
         new_appliance_map[:active] = true
       end
       opts.on(nil, "--secure", "Prevent insecure HTTPS communication.  This is enabled by default.") do
-        params[:secure] = true
+        secure = true
       end
       opts.on(nil, "--insecure", "Allow insecure HTTPS communication.  i.e. Ignore SSL errors.") do
-        params[:insecure] = true
+        secure = false
       end
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
 This will add a new remote appliance to your morpheus client configuration.
-If the new remote is your one and only, --use is automatically applied and 
-it will be made the current remote appliance.
+If this is your first remote, --use is automatically applied so
+it will become the current remote appliance.
 This command will prompt you to login and/or setup a fresh appliance.
-Prompting can be skipped with use of the --quiet option.
+To skip login/setup, use the --quiet option.
 EOT
     end
     optparse.parse!(args)
-    if args.count < 2
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} add expects 2 arguments: [name] [url]"
-      puts_error optparse
-      return 1
+    if args.count > 2
+      raise_command_error "wrong number of arguments, expected 0-2 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
 
     # load current appliances
@@ -150,40 +155,75 @@ EOT
       new_appliance_map[:active] = true
     end
 
-    # validate options
-    # construct new appliance map
-    # and save it in the config file
-    new_appliance_name = args[0].to_sym
+    new_appliance_name = args[0] if args[0]
+    url = args[1] if args[1]
 
-    # for the sake of sanity
-    if [:current, :all].include?(new_appliance_name)
-      raise_command_error "The specified appliance name is invalid: '#{args[0]}'"
-    end
-    # unique name
-    if appliances[new_appliance_name] != nil
-      raise_command_error "Remote appliance already configured with the name '#{args[0]}'"
+    # Name
+    still_prompting = true
+    while still_prompting do
+      if new_appliance_name.to_s.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'A unique name for the remote Morpheus appliance. Example: local'}], options[:options])
+        new_appliance_name = v_prompt['name']
+      end
+
+      # for the sake of sanity
+      if [:current, :all].include?(new_appliance_name.to_sym)
+        raise_command_error "The specified appliance name '#{new_appliance_name}' is invalid."
+        new_appliance_name = nil
+      end
+      # unique name
+      existing_appliance = appliances[new_appliance_name.to_sym]
+      if existing_appliance
+        print_error red,"The specified appliance name '#{new_appliance_name}' already exists with the URL #{existing_appliance[:url] || existing_appliance[:host]}",reset,"\n"
+        new_appliance_name = nil
+      end
+
+      if new_appliance_name.to_s.empty?
+        if options[:no_prompt]
+          return 1
+        end
+        still_prompting = true
+      else
+        still_prompting = false
+      end
     end
-    new_appliance_map[:name] = new_appliance_name
 
-    if params[:insecure]
-      new_appliance_map[:insecure] = true
-    elsif params[:secure]
-      new_appliance_map.delete(:insecure)
+    new_appliance_map[:name] = new_appliance_name.to_sym
+
+    # URL
+    still_prompting = true
+    while still_prompting do
+      if !url
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'url', 'fieldLabel' => 'URL', 'type' => 'text', 'required' => true, 'description' => 'The URL of the remote Morpheus appliance. Example: https://10.0.2.2'}], options[:options])
+        url = v_prompt['url']
+      end
+
+      if url !~ /^https?\:\/\/.+/
+        print_error red,"The specified appliance url '#{url}' is invalid.",reset,"\n"
+        still_prompting = true
+        url = nil
+      else
+        still_prompting = false
+      end
     end
-    if params[:url] || params[:host]
-      url = params[:url] || params[:host]
+
+    # let's replace :host with :url
+    new_appliance_map[:host] = url
+    new_appliance_map[:url] = url
+
+    # Insecure?
+    if url.include?('https:') && secure.nil?
+      # This is kind of annoying to always see, just default to true, use --insecure if you need to.
+      #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'secure', 'fieldLabel' => 'Secure', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'description' => 'Prevent insecure HTTPS communication.  This is enabled by default.'}], options[:options])
+      #secure = v_prompt['secure'].to_s == 'true' || v_prompt['secure'].to_s == 'on'
     end
 
-    url = args[1]
-    if url !~ /^https?\:\/\/.+/
-      raise_command_error "The specified appliance url is invalid: '#{args[1]}'"
-      #puts optparse
-      return 1
+    if secure == false
+      new_appliance_map[:insecure] = true
     end
-    new_appliance_map[:host] = url
 
     # save it
-    appliance = ::Morpheus::Cli::Remote.save_remote(new_appliance_name, new_appliance_map)
+    appliance = ::Morpheus::Cli::Remote.save_remote(new_appliance_name.to_sym, new_appliance_map)
 
     if !options[:quiet]
       # print_green_success "Added remote #{new_appliance_name}"
@@ -195,7 +235,7 @@ EOT
       print cyan
       puts "Inspecting remote appliance url: #{appliance[:host]} ..."
     end
-    appliance = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name)
+    appliance, check_json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name.to_sym)
     if !options[:quiet]
       print cyan
       puts "Status is: #{format_appliance_status(appliance)}"
@@ -215,10 +255,23 @@ EOT
       return exit_code, err
     end
 
+    if options[:json]
+      puts as_json(check_json_response, options)
+      return exit_code, err
+    end
+
     # check_cmd_result = check_appliance([new_appliance_name, "--quiet"])
     # check_cmd_result = check_appliance([new_appliance_name])
 
     if appliance[:status] == 'fresh' # || appliance[:setup_needed] == true
+
+      if !appliance[:active]
+        if ::Morpheus::Cli::OptionTypes::confirm("Would you like to switch to using this remote now?", options.merge({default: true}))
+          use([appliance[:name]])
+          appliance[:active] = true # just in case, could reload instead with load_active_remote()
+        end
+      end
+
       print cyan
       puts "It looks like this appliance needs to be setup. Starting setup ..."
       return setup([new_appliance_name])
@@ -274,58 +327,33 @@ EOT
     options = {}
     checkall = false
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = <<-EOT
-#{subcommand_usage("[name]")}
-    [name] is required. This is the name of the remote. Use 'current' to check the active appliance."
-EOT
-      #opts.banner = "#{opts.banner}\n" + "    " + "[name] is required. This is the name of the remote. Use 'current' to check the active appliance."
-      opts.on("-a",'--all', "Refresh all appliances") do
-        checkall = true
-      end
-      build_common_options(opts, options, [:quiet])
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :quiet, :dry_run, :remote])
       opts.footer = <<-EOT
-This can be used to refresh a remote appliance.
-It makes an api request to the configured appliance url to check the status and version.
-[name] is required. This is the name of the remote. Use 'current' to check the active appliance."
+Check the status of a remote appliance.
+[name] is optional. This is the name of a remote.  Default is the current remote. Can be passed as 'all'. to perform remote check-all.
+This makes a request to the configured appliance url and updates the status and version.
 EOT
     end
     optparse.parse!(args)
-    id_list = nil
-    checkall = true if args[0] == "all" and args.size == 1 # sure, why not
-    if checkall
-      # id_list = ::Morpheus::Cli::Remote.appliances.keys # sort ?
-      return _check_all_appliances()
-    elsif args.count < 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} update expects argument [name] or option --all"
-      puts_error optparse
-      return 1
+    
+    if args.count == 0
+      id_list = ['current']
     else
       id_list = parse_id_list(args)
     end
+    # trick for remote check all
+    if id_list.length == 1 && id_list[0].to_s.downcase == 'all'
+      return _check_all_appliances(options)
+    end
     #connect(options)
     return run_command_for_each_arg(id_list) do |arg|
       _check_appliance(arg, options)
     end
   end
 
-  def _check_all_appliances()
-    # reresh all appliances and then display the list view
-    id_list = ::Morpheus::Cli::Remote.appliances.keys # sort ?
-    if id_list.size > 1
-      print cyan
-      print "Checking #{id_list.size} appliances "
-    end
-    id_list.each do |appliance_name|
-      print "."
-      ::Morpheus::Cli::Remote.refresh_remote(appliance_name)
-    end
-    print "\n"
-    list([])
-
-  end
-
   def _check_appliance(appliance_name, options)
+    exit_code, err = 0, nil
     begin
       appliance = nil
       if appliance_name == "current"
@@ -337,35 +365,35 @@ EOT
       else
         appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
         if !appliance
-          raise_command_error "Remote appliance not found by the name '#{appliance_name}'"
+          raise_command_error "Remote not found by the name '#{appliance_name}'"
         end
       end
 
-      # found appliance
-      # now refresh it
+      # found appliance, now refresh it
       
       start_time = Time.now
   
-      Morpheus::Logging::DarkPrinter.puts "checking remote appliance url: #{appliance[:host]} ..." if Morpheus::Logging.debug?      
+      # print cyan
+      # print "Checking remote url: #{appliance[:host]} ..."
 
-      appliance = ::Morpheus::Cli::Remote.refresh_remote(appliance_name)
+      appliance, check_json_response = ::Morpheus::Cli::Remote.refresh_remote(appliance_name)
 
       took_sec = (Time.now - start_time)
 
-      if options[:quiet]
-        return 0
-      end
+      exit_code = (appliance[:status] == 'ready' || appliance[:status] == 'fresh') ? 0 : 1
 
-      Morpheus::Logging::DarkPrinter.puts "remote appliance check completed in #{took_sec.round(3)}s" if Morpheus::Logging.debug?
+      if exit_code == 0
+        if appliance[:error]
+          exit_code = 1
+          err = "Check Failed: #{appliance[:error]}"
+        end
+      end
 
-      # puts "remote #{appliance[:name]} status: #{format_appliance_status(appliance)}"
+      render_result = render_with_format(check_json_response, options)
+      return exit_code if render_result
 
-      # if options[:json]
-      #   print JSON.pretty_generate(json_response), "\n"
-      #   return
-      # end
+      print_green_success "Completed remote check of #{appliance_name} in #{took_sec.round(3)}s"
 
-      # show user latest info
       return _get(appliance[:name], {})
 
     rescue RestClient::Exception => e
@@ -374,16 +402,119 @@ EOT
     end
   end
 
+  def check_all(args)
+    options = {}
+    checkall = false
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:quiet])
+      opts.footer = <<-EOT
+Refresh all remote appliances.
+This makes a request to each of the configured appliance urls and updates the status and version.
+EOT
+    end
+    optparse.parse!(args)
+
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect() # needed?
+    _check_all_appliances(options)
+  end
+  
+  def _check_all_appliances(options)
+    start_time = Time.now
+    # reresh all appliances and then display the list view
+    id_list = ::Morpheus::Cli::Remote.appliances.keys # sort ?
+    if id_list.size > 1
+      print cyan
+      puts "Checking #{id_list.size} appliances"
+    elsif id_list.size == 1
+      puts "Checking #{Morpheus::Cli::Remote.appliances.keys.first}"
+    end
+    id_list.each do |appliance_name|
+      #print "."
+      appliance, check_json_response = ::Morpheus::Cli::Remote.refresh_remote(appliance_name)
+    end
+    took_sec = (Time.now - start_time)
+    print_green_success "Completed remote check of #{id_list.size} #{id_list.size == 1 ? 'appliance' : 'appliances'} in #{took_sec.round(3)}s"
+    
+    if options[:quiet]
+      return 0
+    end
+    list([])
+    return 0
+  end
+
+  def rename(args)
+    options = {}
+    params = {}
+    use_it = false
+    is_insecure = nil
+    new_name = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [new name]")
+      opts.on(nil, "--name NAME", "Update the name of your remote appliance") do |val|
+        new_name = val
+      end
+      
+      # opts.on(nil, '--use', "Make this the current appliance" ) do
+      #   use_it = true
+      #   params[:active] = true
+      # end
+      build_common_options(opts, options, [:auto_confirm, :quiet])
+            opts.footer = <<-EOT
+Rename a remote.
+This changes your client configuration remote name, not the appliance itself.
+[name] is required. This is the current name of a remote.
+[new name] is required. This is the new name for the remote. This must not already be in use.
+EOT
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "#{command_name} rename expects argument [name]."
+      puts_error optparse
+      return 1
+    end
+    appliance_name = args[0].to_sym
+    new_appliance_name = args[1].to_sym
+    appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
+    if !appliance
+      raise_command_error "Remote appliance not found by the name '#{appliance_name}'"
+    end
+    # don't allow overwrite yet
+    matching_appliance = ::Morpheus::Cli::Remote.load_remote(new_appliance_name)
+    if matching_appliance
+      raise_command_error "Remote appliance already exists with the name '#{new_appliance_name}'"
+    end
+    
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to rename #{appliance_name} to  #{new_appliance_name}?", options)
+      return 9, "aborted command"
+    end
+    # this does all the work
+    ::Morpheus::Cli::Remote.rename_remote(appliance_name, new_appliance_name)
+
+    print_green_success "Renamed remote #{appliance_name} to #{new_appliance_name}"
+    # todo: just go ahead and refresh it now...
+    # _check(appliance_name, {:quiet => true})
+    # appliance, check_json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name)
+    # print new appliance details
+    _get(new_appliance_name, {})
+    return 0, nil
+  end
+
   def update(args)
     options = {}
     params = {}
     use_it = false
     is_insecure = nil
+    new_name = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      # opts.on(nil, "--name STRING", "Update the name of your remote appliance") do |val|
-      #   params['name'] = val
-      # end
+      opts.on(nil, "--name NAME", "Update the name of your remote appliance") do |val|
+        new_name = val
+      end
       opts.on("--url URL", String, "Update the url of your remote appliance") do |val|
         params[:host] = val
       end
@@ -437,7 +568,7 @@ EOT
     print_green_success "Updated remote #{appliance_name}"
     # todo: just go ahead and refresh it now...
     # _check(appliance_name, {:quiet => true})
-    appliance = ::Morpheus::Cli::Remote.refresh_remote(appliance_name)
+    appliance, check_json_response = ::Morpheus::Cli::Remote.refresh_remote(appliance_name)
     # print new appliance details
     _get(appliance[:name], {})
     return 0, nil
@@ -467,37 +598,56 @@ EOT
   end
 
   def _get(appliance_name, options)
+    exit_code, err = 0, nil
     begin
       appliance = nil
       if appliance_name == "current"
         appliance = ::Morpheus::Cli::Remote.load_active_remote()
         if !appliance
-          raise_command_error "No current appliance, see `remote use`."
+          err = "No current appliance, see `remote use`."
+          exit_code = 1
         end
         appliance_name = appliance[:name]
       else
         appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
         if !appliance
-          raise_command_error "Remote appliance not found by the name '#{appliance_name}'"
+          err = "Remote appliance not found by the name '#{appliance_name}'"
+          exit_code = 1
         end
       end
 
+      if options[:quiet]
+        return exit_code, err
+      end
+
       if options[:json]
-        json_response = {remote_appliance: appliance} # mock payload
-        puts as_json(json_response, options)
-        return
+        json_response = {'appliance' => appliance} # mock payload
+        puts as_json(json_response, options, "appliance")
+        return exit_code, err
       end
 
-      if options[:url_only]
-        print cyan, appliance[:host],"\n",reset
-        return 0
+      if options[:yaml]
+        json_response = {'appliance' => appliance} # mock payload
+        puts as_yaml(json_response, options, "appliance")
+        return exit_code, err
       end
-      # expando
-      # appliance = OStruct.new(appliance)
 
-      # todo: just go ahead and refresh it now...
-      # _check(appliance_name, {:quiet => true})
-      # appliance = ::Morpheus::Cli::Remote.refresh_remote(appliance_name)
+      
+
+      if options[:url_only]
+        if appliance
+          print cyan, (appliance[:url] || appliance[:host]),"\n",reset
+          return exit_code, err
+        else
+          print_error red, err,"\n",reset
+          return exit_code, err
+        end
+      end
+      
+      if exit_code != 0
+        print_error red, err,"\n",reset
+        return exit_code, err
+      end
 
       if appliance[:active]
         # print_h1 "Current Remote Appliance: #{appliance[:name]}"
@@ -542,39 +692,58 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      # opts.on( '-f', '--force', "Remote appliance anyway??" ) do
-      #   options[:default] = true
-      # end
-      opts.footer = "This will delete an appliance from your list."
       build_common_options(opts, options, [:auto_confirm, :quiet])
+      opts.footer = <<-EOT
+This will delete the specified remote appliance(s) from your local configuration.
+[name] is required. This is the name of a remote. More than one can be passed.
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      #raise_command_error "#{command_name} remove requires argument [name].", optparse
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} remove requires argument [name]."
-      puts_error optparse
-      return 1, nil
+    if args.count == 0
+      #id_list = ['current']
+      raise_command_error "wrong number of arguments, expected 1-N and got 0\n#{optparse}"
+    else
+      id_list = parse_id_list(args)
     end
-    appliance_name = args[0].to_sym
+    #connect(options)
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to delete #{id_list.size == 1 ? 'remote' : 'remotes'}: #{anded_list(id_list)}?", options)
+      return 9, "aborted command"
+    end
+    return run_command_for_each_arg(id_list) do |arg|
+      _remove_appliance(arg, options)
+    end
+  end
+
+  def _remove_appliance(appliance_name, options)
+    
+    appliance_name = appliance_name.to_sym
     appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
     if !appliance
       raise_command_error "Remote appliance not found by the name '#{appliance_name}'"
     end
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to delete '#{appliance_name}' from your list of remote appliances?", options)
-      return 9, "aborted command" # new exit code for aborting confirmation
+    
+
+    appliances = ::Morpheus::Cli::Remote.appliances
+
+    if appliances[appliance_name].nil?
+      if options[:quiet]
+        return 1
+      end
+      print_red_alert "Remote does not exist with name '#{appliance_name.to_s}'"
+      return 1
     end
 
     # ok, delete it
+
     ::Morpheus::Cli::Remote.delete_remote(appliance_name)
 
     # return result
     if options[:quiet]
-      return 0, nil
+      return 0
     end
     print_green_success "Deleted remote #{appliance_name}"
-    list([])
-    return 0, nil
+    # list([])
+    return 0
   end
 
   def use(args)
@@ -587,36 +756,37 @@ EOT
                     "You may override this with the --remote option in your commands."
     end
     optparse.parse!(args)
-    if args.count < 1
+    if args.count != 1
       print_error Morpheus::Terminal.angry_prompt
       puts_error  "#{command_name} use expects argument [name]."
       puts_error optparse
       return 1
     end
+    current_appliance_name, current_appliance_url = @appliance_name, @appliance_url 
     appliance_name = args[0].to_sym
     appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
     if !appliance
       raise_command_error "Remote appliance not found by the name '#{appliance_name}'"
     end
     
-    if appliance[:active] == true
-      if !options[:quiet]
-        print cyan
-        puts "Using remote #{appliance_name} (still)"
-      end
-      return true
-    end
     # appliance = ::Morpheus::Cli::Remote.set_active_appliance(appliance_name)
     appliance[:active] = true
     appliance = ::Morpheus::Cli::Remote.save_remote(appliance_name, appliance)
+
+    if options[:quiet]
+      return 0
+    end
+
+    if current_appliance_name.to_s == appliance_name.to_s
+      print green, "Using remote #{appliance_name} (still)", reset, "\n"
+    else
+      print green, "Using remote #{appliance_name}", reset, "\n"
+    end
     
     # recalculate session variables
     ::Morpheus::Cli::Remote.recalculate_variable_map()
 
-    if !options[:quiet]
-      puts "#{cyan}Using remote #{appliance_name}#{reset}"
-    end
-    return true
+    return 0
   end
 
   def unuse(args)
@@ -624,18 +794,21 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
       opts.footer = "" +
-        "This clears the current remote appliance.\n" +
-        "You will need to use an appliance, or pass the --remote option to your commands."
+        "This clears the current remote appliance.\n"
       build_common_options(opts, options, [])
     end
     optparse.parse!(args)
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    #connect(options)
     @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
     if !@appliance_name
-      puts "You are not using any appliance"
-      return false
+      print yellow,"You are not using any appliance",reset,"\n"
+      return 0
     end
     Morpheus::Cli::Remote.clear_active_appliance()
-    puts "You are no longer using the appliance #{@appliance_name}"
+    print cyan, "You are no longer using the appliance #{@appliance_name}", reset, "\n"
     # recalculate session variables
     ::Morpheus::Cli::Remote.recalculate_variable_map()
     return true
@@ -658,12 +831,15 @@ EOT
                     "The default behavior is the same as 'remote get current'."
     end
     optparse.parse!(args)
-
-    if !@appliance_name
-      print yellow, "No current appliance, see `remote use`\n", reset
-      return 1
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
-
+    connect(options)
+    # if !@appliance_name
+    #   print yellow, "No current appliance, see `remote use`\n", reset
+    #   return 1
+    # end
+    #connect(options)
     if name_only
       print cyan, @appliance_name,"\n",reset
       return 0
@@ -683,67 +859,223 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:options, :json, :dry_run])
-      opts.on('-I','--insecure', "Allow insecure HTTPS communication.  i.e. bad SSL certificate.") do |val|
-        options[:insecure] = true
-        Morpheus::RestClient.enable_ssl_verification = false
+      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :quiet, :remote])
+      opts.on('--hubmode MODE','--hubmode MODE', "Choose an option for hub registration possible values are login, register, skip.") do |val|
+        options[:hubmode] = val.to_s.downcase
       end
-      opts.footer = "This can be used to initialize a new appliance.\n" + 
-                    "You will be prompted to create the master account.\n" + 
-                    "This is only available on a new, freshly installed, remote appliance."
+      opts.footer = "Initialize a fresh appliance.\n" + 
+                    "You will be prompted to create the master tenant and admin user.\n" + 
+                    "If Morpheus Hub registration is enabled, you may login or register to retrieve a license key.\n" + 
+                    "Setup is only available on a new, freshly installed, remote appliance\n" + 
+                    "and it may only be used successfully once."
     end
     optparse.parse!(args)
+    
+    # first arg as remote name otherwise the active appliance is connected to
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    if args[0]
+      options[:remote] = args[0]
+    end
+    connect(options)
 
     if !@appliance_name
       print yellow, "No active appliance, see `remote use`\n", reset
       return false
     end
 
-    # this works without any authentication!
-    # it will allow anyone to use it, if there are no users/accounts in the system.
-    #@api_client = establish_remote_appliance_connection(options)
-    #@setup_interface = @api_client.setup
-    @setup_interface = Morpheus::SetupInterface.new(@appliance_url)
-    appliance_status_json = nil
-    begin
-      appliance_status_json = @setup_interface.get()
-      if appliance_status_json['success'] != true
-        print red, "Setup not available for appliance #{@appliance_name} - #{@appliance_url}.\n", reset
-        print red, "#{appliance_status_json['msg']}\n", reset
+    # construct payload
+    payload = nil
+    if options[:payload]
+      payload = options[:payload]
+    else
+      params = {}
+      params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+
+      # this works without any authentication!
+      # it will allow anyone to use it, if there are no users/accounts in the system.
+      #@api_client = establish_remote_appliance_connection(options)
+      @setup_interface = @api_client.setup #use me
+      # @setup_interface = Morpheus::SetupInterface.new({url:@appliance_url,access_token:@access_token})
+      appliance_status_json = nil
+      begin
+        appliance_status_json = @setup_interface.get()
+        if appliance_status_json['success'] != true
+          print_error red, "Setup not available for appliance #{@appliance_name} - #{@appliance_url}.\n", reset
+          print_error red, "#{appliance_status_json['msg']}\n", reset
+          return false
+        end
+      rescue RestClient::Exception => e
+        print_rest_exception(e, options)
         return false
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return false
-    end
-    
-    payload = {}
-
-    if appliance_status_json['hubRegistrationEnabled']
-      link = File.join(@appliance_url, '/setup')
-      print red, "Sorry, setup with hub registration is not yet available.\n", reset
-      print "You can use the UI to setup your appliance.\n"
-      print "Go to #{link}\n", reset
-      # if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-      #   system "start #{link}"
-      # elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-      #   system "open #{link}"
-      # elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-      #   system "xdg-open #{link}"
-      # end
-      return false
-    else
-      print_h1 "Morpheus Appliance Setup", [], options
-
-      puts "It looks like you're the first one here."
-      puts "Let's initialize your remote appliance at #{@appliance_url}"
 
+      # retrieved hub.enabled and hub.url 
+      hub_settings = appliance_status_json['hubSettings'] || appliance_status_json['hub'] || {}
 
+      # store login/registration info in here, for prompt default values
+      hub_info = nil
+      print cyan
+      print_h2 "Remote Setup: #{@appliance_name} - #{@appliance_url}"
       
+      print cyan
+      puts "Welcome to the setup of your new Morpheus Appliance #{@appliance_name} @ #{@appliance_url}"
+      puts "It looks like you're the first here, so let's begin."
+
+      hubmode = nil
+      hub_init_payload = nil # gets included as payload for hub scoped like hub.email
+      if hub_settings['enabled']
+
+        # Hub Registration
+          hub_action_dropdown = [
+            {'name' => 'Login to existing hub account', 'value' => 'login', 'isDefault' => true}, 
+            {'name' => 'Register a new hub account', 'value' => 'register'}, 
+            {'name' => 'Skip this step and manually install a license later.', 'value' => 'skip'},
+            {'name' => 'Abort', 'value' => 'abort'}
+          ]
+          
+
+        print cyan
+        puts "Morpheus Hub registration is enabled for your appliance."
+        puts "This step will connect to the Morpheus Hub at #{hub_settings['url']}"
+        puts "This is done to retrieve and install the license key for your appliance."
+        puts "You have several options for how to proceed:"
+        hub_action_dropdown.each_with_index do |hub_action, idx|
+          puts "#{idx+1}. #{hub_action['name']} [#{hub_action['value']}]"
+        end
+        print "\n", reset
+
+        while hubmode == nil do
+          
+          options[:options]['hubmode'] = options[:hubmode] if options.key?(:hubmode)
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hubmode', 'fieldLabel' => 'Choose Hub Mode', 'type' => 'select', 'selectOptions' => hub_action_dropdown, 'required' => true, 'defaultValue' => 'login'}], options[:options])
+          hubmode = v_prompt['hubmode']
+
+          if hubmode == 'login'
+
+            # print cyan
+            # puts "MORPHEUS HUB #{hub_settings['url']}"
+            # puts "The Command Center for DevOps"
+            # print reset
+
+            # Hub Login
+            print_h2 "Morpheus Hub Login @ #{hub_settings['url']}", options
+            hub_login_option_types = [
+              {'fieldContext' => 'hub', 'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'description' => 'Email Address of existing Morpheus Hub user to link with.'},
+              {'fieldContext' => 'hub', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'description' => 'Password of existing Morpheus Hub user.'},
+            ]
+            v_prompt = Morpheus::Cli::OptionTypes.prompt(hub_login_option_types, options[:options])
+            hub_login_payload = v_prompt['hub']
+            hub_login_response = nil
+            begin
+              hub_login_response = @setup_interface.hub_login(hub_login_payload)
+              hub_init_payload = hub_login_payload
+              hub_info = {'email' => hub_login_payload['email'], 'password' => hub_login_payload['password'] }
+              hub_info.deep_merge!(hub_login_response['data']['info']) if (hub_login_response['data'] && hub_login_response['data']['info'])
+              hub_info.deep_merge!(hub_login_response['hub']) if hub_login_response['hub'].is_a?(Hash)
+              print_green_success "Logged into Morpheus Hub as #{hub_info['email']}"
+            rescue RestClient::Exception => e
+              hub_login_response = parse_rest_exception(e)
+              error_msg = hub_login_response["msg"] || "Hub login failed."
+              print_error red,error_msg,reset,"\n"
+              hubmode = nil
+              #print_rest_exception(e, options)
+              #exit 1
+            end
+            
+            # DEBUG
+            if options[:debug] && hub_login_response
+              print_h2 "JSON response for hub login"
+              Morpheus::Logging::DarkPrinter.puts as_json(hub_login_response)
+            end
+
+          elsif hubmode == 'register'
+            # Hub Registration
+            print_h2 "Morpheus Hub Registration", options
+            hub_register_option_types = [
+              {'fieldContext' => 'hub', 'fieldName' => 'companyName', 'fieldLabel' => 'Company Name', 'type' => 'text', 'required' => true, 'description' => 'Company Name of new Morpheus Hub account to be created.'},
+              {'fieldContext' => 'hub', 'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text', 'required' => true, 'description' => 'First Name of new Morpheus Hub user.'},
+              {'fieldContext' => 'hub', 'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => true, 'description' => 'Last Name of new Morpheus Hub user.'},
+              {'fieldContext' => 'hub', 'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'description' => 'Email Address of new Morpheus Hub user.'}
+            ]
+            v_prompt = Morpheus::Cli::OptionTypes.prompt(hub_register_option_types, options[:options])
+            hub_register_payload = v_prompt['hub']
+
+            # Password prompt with re-prompting if no match
+            need_password = true
+            if options[:no_prompt]
+              if options[:options]['hub'] && options[:options]['hub']['password']
+                options[:options]['hub']['confirmPassword'] = options[:options]['hub']['password']
+              end
+            end
+            while need_password do
+              password_option_types = [
+                {'fieldContext' => 'hub', 'fieldName' => 'password', 'fieldLabel' => 'Create Password', 'type' => 'password', 'required' => true, 'description' => 'Confirm password of new Morpheus Hub user.'},
+                {'fieldContext' => 'hub', 'fieldName' => 'confirmPassword', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'description' => 'Confirm password of new Morpheus Hub user.'}
+              ]
+              v_prompt = Morpheus::Cli::OptionTypes.prompt(password_option_types, options[:options])
+              if v_prompt['hub']['password'] == v_prompt['hub']['confirmPassword']
+                hub_register_payload.deep_merge!(v_prompt['hub'])
+                need_password = false
+              else
+                print_error red, "Password confirmation does not match. Re-enter your new password.", reset, "\n"
+              end
+            end
+
+            begin
+              hub_register_response = @setup_interface.hub_register(hub_register_payload)
+              hub_init_payload = hub_register_payload
+              hub_info = {'email' => hub_register_payload['email'], 'password' => hub_register_payload['password'] }
+              hub_info.deep_merge!(hub_register_payload)
+              hub_info.deep_merge!(hub_register_response['data']['info']) if (hub_register_response['data'] && hub_register_response['data']['info'])
+              hub_info.deep_merge!(hub_register_response['hub']) if hub_register_response['hub'].is_a?(Hash)
+              print_green_success "Registered with Morpheus Hub as #{hub_info['email']}"
+              # uh ok so that means the init() request can use login
+              # this avoid duplicate email error
+              # but it can also just omit hubMode from the init() payload to achieve the same thing.
+              # hubmode = nil
+            rescue RestClient::Exception => e
+              hub_register_response = parse_rest_exception(e)
+              error_msg = hub_register_response["msg"] || "Hub Registration failed."
+              print_error red,error_msg,reset,"\n"
+              hubmode = nil
+              #print_rest_exception(e, options)
+              #exit 1
+            end
+            
+            # DEBUG
+            if options[:debug] && hub_register_response
+              print_h2 "JSON response for hub registration"
+              Morpheus::Logging::DarkPrinter.puts as_json(hub_register_response)
+            end
+            
+          elsif hubmode == 'skip'
+            print cyan,"Skipping hub registraton for now...",reset,"\n"
+            # puts "You may enter a license key later."
+          elsif hubmode == 'abort'
+            return 9, "aborted command"
+          else
+            hubmode = nil
+          end
+        end
+      end
+
+      # ok, we're done with the hub.
+      # now build the payload for POST /api/setup/init
+
+      payload = {}
+      payload.deep_merge!(params)
+
+      # print cyan
+      #print_h1 "Morpheus Appliance Setup", [], options
+      #print cyan
+      #puts "Initializing remote appliance at URL: #{@appliance_url}"
+
       # Master Account
-      print_h2 "Create Master Account", options
+      print_h2 "Create Master Tenant", options
       account_option_types = [
-        {'fieldName' => 'accountName', 'fieldLabel' => 'Master Account Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+        {'fieldName' => 'accountName', 'fieldLabel' => 'Master Tenant Name', 'type' => 'text', 'required' => true, 'defaultValue' => (hub_info ? hub_info['companyName'] : nil), 'description' => 'A unique name for the Master Tenant (account).'},
       ]
       v_prompt = Morpheus::Cli::OptionTypes.prompt(account_option_types, options[:options])
       payload.merge!(v_prompt)
@@ -751,88 +1083,207 @@ EOT
       # Master User
       print_h2 "Create Master User", options
       user_option_types = [
-        {'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text', 'required' => false, 'displayOrder' => 1},
-        {'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
-        {'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'required' => true, 'displayOrder' => 3},
-        {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'displayOrder' => 4},
+        {'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text', 'required' => false, 'defaultValue' => (hub_info ? hub_info['firstName'] : nil), 'description' => 'First name of the user.'},
+        {'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => false, 'defaultValue' => (hub_info ? hub_info['lastName'] : nil), 'description' => 'Last name of the user.'},
+        {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'defaultValue' => (hub_info ? hub_info['email'] : nil), 'description' => 'A unique email address for the user.'},
+        {'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'required' => true, 'description' => 'A unique username for the master user.'}
       ]
       v_prompt = Morpheus::Cli::OptionTypes.prompt(user_option_types, options[:options])
       payload.merge!(v_prompt)
 
       # Password prompt with re-prompting if no match
-      password_option_types = [
-        {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
-        {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 7},
-      ]
-      v_prompt = Morpheus::Cli::OptionTypes.prompt(password_option_types, options[:options])
-      while v_prompt['passwordConfirmation'] != v_prompt['password']
-        print red, "Password confirmation does not match. Re-enter your new password.", reset, "\n"
+      need_password = true
+      if options[:no_prompt]
+        options[:options]['confirmPassword'] = payload['password']
+        payload['confirmPassword'] = payload['password'] if payload['password']
+      end
+      while need_password do
+        password_option_types = [
+          {'fieldName' => 'password', 'fieldLabel' => 'Create Password', 'type' => 'password', 'required' => true, 'description' => 'Create a new password for the user.'},
+          {'fieldName' => 'confirmPassword', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'description' => 'Confirm the new password for the user.'},
+        ]
         v_prompt = Morpheus::Cli::OptionTypes.prompt(password_option_types, options[:options])
+        if v_prompt['password'] == v_prompt['confirmPassword']
+          payload.deep_merge!(v_prompt)
+          need_password = false
+        else
+          print_error red, "Password confirmation does not match. Re-enter your new password.", reset, "\n"
+        end
       end
-      payload.merge!(v_prompt)
 
-      # Extra settings
+      # Appliance Settings
+      default_appliance_url = appliance_status_json['applianceUrl']
+      if default_appliance_url && default_appliance_url.include?('10.0.2.2:8080') # ignore this default value.
+        default_appliance_url = @appliance_url
+      end
+      default_appliance_name = appliance_status_json['applianceName']
+      if default_appliance_name.nil?
+        default_appliance_name = @appliance_name
+      end
       print_h2 "Initial Setup", options
       extra_option_types = [
-        {'fieldName' => 'applianceName', 'fieldLabel' => 'Appliance Name', 'type' => 'text', 'required' => true, 'defaultValue' => nil},
-        {'fieldName' => 'applianceUrl', 'fieldLabel' => 'Appliance URL', 'type' => 'text', 'required' => true, 'defaultValue' => appliance_status_json['applianceUrl']},
-        {'fieldName' => 'backups', 'fieldLabel' => 'Enable Backups', 'type' => 'checkbox', 'required' => false, 'defaultValue' => 'off'},
-        {'fieldName' => 'monitoring', 'fieldLabel' => 'Enable Monitoring', 'type' => 'checkbox', 'required' => false, 'defaultValue' => 'on'},
-        {'fieldName' => 'logs', 'fieldLabel' => 'Enable Logs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => 'on'}
+        {'fieldName' => 'applianceName', 'fieldLabel' => 'Appliance Name', 'type' => 'text', 'required' => true, 'defaultValue' => default_appliance_name, 'description' => 'A name for identifying your morpheus appliance.'},
+        {'fieldName' => 'applianceUrl', 'fieldLabel' => 'Appliance URL', 'type' => 'text', 'required' => true, 'defaultValue' => default_appliance_url, 'description' => 'Appliance URL. Can be used for integrations and callbacks.'},
+        {'fieldName' => 'backups', 'fieldLabel' => 'Enable Backups', 'type' => 'checkbox', 'required' => false, 'defaultValue' => 'off', 'description' => 'Backups. Default is off. This means backups are created automatically during provisioning.'},
+        {'fieldName' => 'monitoring', 'fieldLabel' => 'Enable Monitoring', 'type' => 'checkbox', 'required' => false, 'defaultValue' => 'on', 'description' => 'Enable Monitoring. This means checks are created automatically during provisioning.'},
+        {'fieldName' => 'logs', 'fieldLabel' => 'Enable Logs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => 'on', 'description' => 'Enable Logs. This means container logs are collected.'}
       ]
       v_prompt = Morpheus::Cli::OptionTypes.prompt(extra_option_types, options[:options])
       payload.merge!(v_prompt)
-
-      begin
-        @setup_interface.setopts(options)
-        if options[:dry_run]
-          print_dry_run @setup_interface.dry.init(payload)
-          return
-        end
-        if !options[:json]
-          print "Initializing the appliance...\n"
-        end
-        json_response = @setup_interface.init(payload)
-      rescue RestClient::Exception => e
-        print_rest_exception(e, options)
-        return false
+      
+      # include hubmode and hub params for login or registration
+      # actually we remove hubMode because it has already been setup, probably just now,
+      # and the init() request will just used the same creds instead of 
+      # reauthenticated/registering with the hub
+      if hubmode
+        payload['hubMode'] = hubmode
       end
-
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-        return
+      if hub_init_payload
+        payload['hub'] = hub_init_payload
+      end
+      if hubmode == 'register' || hubmode == 'login'
+        payload.delete('hubMode')
+        payload.delete('hub')
       end
-      print "\n"
-      print cyan, "You have successfully setup the appliance.\n"
-      #print cyan, "You may now login with the command `login`.\n"
-      # uh, just use Credentials.login(username, password, {save: true})
-      cmd_res = Morpheus::Cli::Login.new.login(['--username', payload['username'], '--password', payload['password'], '-q'])
-      # print "\n"
-      print cyan, "You are now logged in as the System Admin #{payload['username']}.\n"
-      print reset
-      #print "\n"
 
+    end
+      
+    # ok, make the api request
+    @setup_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @setup_interface.dry.init(payload)
+      return
+    end
+
+    json_response = @setup_interface.init(payload)
+
+    render_result = render_with_format(json_response, options)
+    return 0 if render_result
+
+    if options[:json]
+      print JSON.pretty_generate(json_response)
+      print "\n"
+      return
+    end
+    print "\n"
+    print green,"Setup complete for remote #{@appliance_name} - #{@appliance_url}",reset,"\n"
+    #print cyan, "You may now login with the command `login`.\n"
+    # uh, just use Credentials.login(username, password, {save: true})
+    cmd_res = Morpheus::Cli::Login.new.login(['--username', payload['username'], '--password', payload['password'], '-q'] + (options[:remote] ? ["-r",options[:remote]] : []))
+    # print "\n"
+    print cyan, "You are now logged in as the System Admin #{payload['username']}.\n"
+    print reset
+    #print "\n"
+
+    if hubmode == 'skip'
       if ::Morpheus::Cli::OptionTypes::confirm("Would you like to apply your License Key now?", options.merge({:default => true}))
-        cmd_res = Morpheus::Cli::License.new.apply([])
+        cmd_res = Morpheus::Cli::License.new.apply([] + (options[:remote] ? ["-r",options[:remote]] : []))
         # license_is_valid = cmd_res != false
       end
+    end
 
-      if ::Morpheus::Cli::OptionTypes::confirm("Do you want to create the first group now?", options.merge({:default => true}))
-        cmd_res = Morpheus::Cli::Groups.new.add(['--use'])
+    if ::Morpheus::Cli::OptionTypes::confirm("Do you want to create the first group now?", options.merge({:default => true}))
+      cmd_res = Morpheus::Cli::Groups.new.add(['--use'] + (options[:remote] ? ["-r",options[:remote]] : []))
 
-        #print "\n"
+      #print "\n"
 
-        # if cmd_res !=
-          if ::Morpheus::Cli::OptionTypes::confirm("Do you want to create the first cloud now?", options.merge({:default => true}))
-            cmd_res = Morpheus::Cli::Clouds.new.add([])
-            #print "\n"
-          end
-        # end
+      # if cmd_res !=
+        if ::Morpheus::Cli::OptionTypes::confirm("Do you want to create the first cloud now?", options.merge({:default => true}))
+          cmd_res = Morpheus::Cli::Clouds.new.add([] + (options[:remote] ? ["-r",options[:remote]] : []))
+          #print "\n"
+        end
+      # end
+    end
+    print "\n",reset
+
+  end
+
+
+  # this is just for testing new appliances really
+  # it can be used
+  def teardown(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      opts.footer = "Provides a way to uninitialize a fresh appliance. Useful for testing appliance setup."
+    end
+    optparse.parse!(args)
+    
+    # first arg as remote name otherwise the active appliance is connected to
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    if args[0]
+      options[:remote] = args[0]
+    end
+    connect(options)
+
+    if !@appliance_name
+      print yellow, "No active appliance, see `remote use`\n", reset
+      return false
+    end
+
+    unless options[:quiet]
+      print yellow
+      print "\n"
+      puts "WARNING: You are about to reset your appliance installation."
+      puts "It's only possible to perform teardown when the appliance has just been installed."
+      puts "This provides a way to reset your appliance and run setup again."
+      print reset
+      print "\n"
+    end
+
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like teardown appliance '#{@appliance_name}'.", options)
+      return 9, "aborted command" # new exit code for aborting confirmation
+    end
+
+    #@setup_interface = @api_client.setup
+
+    # construct payload
+
+    params = {}
+    params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+
+    # this works without any authentication!
+    # it will allow anyone to use it, if there are no users/accounts in the system.
+    #@api_client = establish_remote_appliance_connection(options)
+    #@setup_interface = @api_client.setup
+    @setup_interface = Morpheus::SetupInterface.new({url:@appliance_url,access_token:@access_token, very_ssl:false})
+    json_response = nil
+    begin
+      json_response = @setup_interface.teardown(params)
+      if json_response['success'] != true
+        print_error red, (json_response['msg'] || "Teardown failed").to_s, reset, "\n"
+        return false
       end
-      print "\n",reset
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return false
+    end
+
+
+    # ok, make the api request and render the response or print a message
+    @setup_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @setup_interface.dry.teardown(params)
+      return
+    end
 
+    json_response = @setup_interface.teardown(params)
+
+    render_result = render_with_format(json_response, options)
+    return 0 if render_result
+    if options[:quiet]
+      return 0
     end
+    if json_response['msg']
+      print_green_success json_response['msg']
+    else
+      print_green_success "Teardown complete for remote #{@appliance_name} - #{@appliance_url}. Now see `remote setup`"
+    end
+    return 0
+
   end
 
   def format_appliance_status(app_map, return_color=cyan)
@@ -842,18 +1293,18 @@ EOT
     out = ""
     if status_str == "new"
       out << "#{cyan}#{status_str.upcase}#{return_color}"
+    elsif status_str == "fresh"
+      # maybe just green instead?
+      out << "#{magenta}#{status_str.upcase}#{return_color}"
     elsif status_str == "ready"
       out << "#{green}#{status_str.upcase}#{return_color}"
-    elsif status_str == "unreachable"
+    elsif status_str == "http-error"
+      out << "#{red}#{status_str.upcase}#{return_color}"
+    elsif ['error', 'net-error', 'ssl-error', 'http-timeout', 'unreachable', 'unrecognized'].include?(status_str)
       out << "#{red}#{status_str.upcase}#{return_color}"
-    elsif ['error', 'net-error', 'ssl-error', 'http-timeout', 'unreachable']
-      out << "#{red}#{status_str.upcase.gsub('-',' ')}#{return_color}"
-    elsif status_str == "fresh" 
-      # cold appliance, needs setup
-      out << "#{magenta}#{status_str.upcase}#{return_color}"
     else
       # dunno
-      out << "#{status_str}"
+      out << "#{yellow}#{status_str.upcase}#{return_color}"
     end
     out
   end
@@ -915,7 +1366,8 @@ EOT
           blurbs << "Last checked #{format_duration(app_map[:last_check][:timestamp])} ago."
         end
         if app_map[:last_check][:error]
-          blurbs << "Error: #{app_map[:last_check][:error]}"
+          last_error_msg = truncate_string(app_map[:last_check][:error], 250)
+          blurbs << "Error: #{last_error_msg}"
         end
         if app_map[:last_check][:http_status]
           blurbs << "HTTP #{app_map[:last_check][:http_status]}"
@@ -987,6 +1439,39 @@ EOT
         #   last_command_result: v[:last_command_result]
         # }
       end
+      
+      # filter results
+      params[:phrase] = params['phrase'] if params['phrase']
+      params[:name] = params['name'] if params['name']
+      params[:url] = params['url'] if params['url']
+      # params[:insecure] = params['insecure'] if params['insecure']
+      params[:max]  = params['max'] if params['max']
+      params[:offset] = params['offset'] if params['offset']
+      params[:sort] = params['sort'] if params['sort']
+      params[:direction] = params['direction'] if params['direction']
+      
+
+      if all_appliances
+        # apply filters
+        if params[:phrase]
+          all_appliances = all_appliances.select do |app|
+            app_name = app[:name] || app['name']
+            app_url = app[:url] || app['url'] || app[:host]
+            app_name.to_s.include?(params[:phrase]) || app_url.to_s.include?(params[:phrase])
+          end
+        end
+        # apply sort
+        sort_key = params[:sort] ? params[:sort].to_sym : :name
+        if params['direction'] == 'desc'
+          all_appliances = all_appliances.sort {|a,b| b[sort_key] <=> a[sort_key] }
+        else
+          all_appliances = all_appliances.sort {|a,b| a[sort_key] <=> b[sort_key] }
+        end
+        # limit
+        if params[:max]
+          all_appliances = all_appliances.first(params[:max])
+        end
+      end
       return all_appliances
     end
 
@@ -1110,6 +1595,76 @@ EOT
       return app_map
     end
 
+    # use this to rename, it update appliances file and others.
+    # oh maybe just put this in the command handler
+    #
+    # first check if the requested name exits
+    # and that the new name does not exist.
+    #
+    # clone it and delete the old one.
+    # todo: switch replace symbols with strings please, makes for nicer appliances.yaml 
+    def rename_remote(app_name, new_app_name)
+      app_name = app_name.to_sym
+      new_app_name = new_app_name.to_sym
+      cur_appliances = self.appliances #.clone
+      app_map = cur_appliances[app_name]
+      if app_map.nil?
+        print_red_alert "A remote not found by the name '#{app_name}'"
+        #print "Did you mean one of these commands: #{suggestions.join(', ')?", reset, "\n"
+        return nil
+      end
+      if cur_appliances[new_app_name]
+        print_red_alert "A remote already exists with name '#{new_app_name}'."
+        puts "First, you must rename or remove the existing remote."
+        return nil
+      end
+      
+      # clone the existing data
+
+      # copy remote
+      new_appliance_map = app_map.clone()
+      new_appliance_map[:name] = new_app_name # inject name
+      save_remote(new_app_name, new_appliance_map)
+
+      # clone credentials...just overwrite keys there, f it.
+      old_wallet = ::Morpheus::Cli::Credentials.new(app_name, nil).load_saved_credentials()
+      if old_wallet
+        ::Morpheus::Cli::Credentials.new(new_app_name, nil).save_credentials(new_app_name, old_wallet)
+        #::Morpheus::Cli::Credentials.new(app_name, nil).clear_saved_credentials(app_name)
+      end
+      # clone groups...just overwrite keys there, f it.
+      old_active_group = ::Morpheus::Cli::Groups.active_group(app_name)
+      if old_active_group
+        ::Morpheus::Cli::Groups.set_active_group(new_app_name, old_active_group)
+        #::Morpheus::Cli::Groups.clear_active_group(app_name)
+      end
+       
+      # delete stuff last
+      
+      # delete creds
+      if old_wallet
+        ::Morpheus::Cli::Credentials.new(app_name, nil).clear_saved_credentials(app_name)
+      end
+      
+      # delete groups
+      if old_active_group
+        ::Morpheus::Cli::Groups.clear_active_group(app_name)
+      end
+
+      # delete remote
+      delete_remote(app_name)
+
+      # this is all redundant after above
+      # # this should be a class method too
+      # ::Morpheus::Cli::Credentials.new(app_name, nil).clear_saved_credentials(app_name)
+      # # delete from groups too..
+      # ::Morpheus::Cli::Groups.clear_active_group(app_name)
+      # # recalculate session variables
+      # recalculate_variable_map()
+      # return the deleted value
+      return app_map
+    end
+
     def delete_remote(app_name)
       app_name = app_name.to_sym
       cur_appliances = self.appliances #.clone
@@ -1149,7 +1704,8 @@ EOT
         Morpheus::RestClient.enable_ssl_verification = false
       end
       # Morpheus::RestClient.enable_http = app_map[:insecure].to_s == 'true'
-      setup_interface = Morpheus::SetupInterface.new(app_url)
+      setup_interface = Morpheus::SetupInterface.new({url:app_url, verify_ssl: (app_map[:insecure] != true)})
+      check_json_response = nil
       begin
         now = Time.now.to_i
         app_map[:last_check] = {}
@@ -1191,6 +1747,9 @@ EOT
       rescue OpenSSL::SSL::SSLError => err
         app_map[:status] = 'ssl-error'
         app_map[:last_check][:error] = err.message
+      rescue JSON::ParserError => err
+        app_map[:status] = 'unrecognized'
+        app_map[:last_check][:error] = err.message
       rescue RestClient::Exception => err
         app_map[:status] = 'http-error'
         app_map[:http_status] = err.response ? err.response.code : nil
@@ -1198,7 +1757,7 @@ EOT
         # fallback to /ping for older appliance versions (pre 2.10.5)
         begin
           Morpheus::Logging::DarkPrinter.puts "falling back to remote check via /ping ..." if Morpheus::Logging.debug?
-          setup_interface.ping()
+          check_json_response = @setup_interface.ping()
           app_map[:last_check][:ping_fallback] = true
           app_map[:last_check][:http_status] = 200
           app_map[:last_check][:success] = true
@@ -1228,7 +1787,7 @@ EOT
       save_remote(app_name, app_map)
 
       # return the updated data
-      return app_map
+      return app_map, check_json_response
 
     end