morpheus-cli 4.1.4 → 4.1.5

data/lib/morpheus/cli/command_error.rb

@@ -15,4 +15,8 @@ class Morpheus::Cli::CommandError < StandardError
     super(msg)
   end
 
+  # def inspect
+  #   to_s
+  # end
+
 end

data/lib/morpheus/cli/commands/standard/man_command.rb

@@ -294,7 +294,7 @@ You can use this to create isolated environments (sandboxes), within which to ex
 
 ```shell
 export MORPHEUS_CLI_HOME=~/morpheus_test
-morpheus remote add myremote https://testmorpheusappliance.mycompany.com --insecure
+morpheus remote add demo https://demo.mymorpheus.com --insecure
 morpheus instances list
 ```
 

data/lib/morpheus/cli/containers_command.rb

@@ -526,6 +526,7 @@ class Morpheus::Cli::ContainersCommand
       params = {}
       params.merge!(parse_list_options(options))
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.container_logs(containers, params)
@@ -546,7 +547,7 @@ class Morpheus::Cli::ContainersCommand
       if logs['data'].empty?
         puts "#{cyan}No logs found.#{reset}"
       else
-        logs['data'].reverse.each do |log_entry|
+        logs['data'].each do |log_entry|
           log_level = ''
           case log_entry['level']
           when 'INFO'

data/lib/morpheus/cli/credentials.rb

@@ -106,11 +106,18 @@ module Morpheus
             unless options[:quiet] || options[:no_prompt]
               # if username.empty? || password.empty?
                 if options[:test_only]
-                  print "Test Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}\n",reset
+                  print "Test Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}", "\n", reset
                 else
-                  print "Enter Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}\n",reset
+                  print "Enter Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}", "\n", reset
                 end
               # end
+              if options[:client_id].empty?
+                # print "Client ID: #{required_blue_prompt} #{options[:client_id]}", "\n", reset
+              else
+                if options[:client_id] != Morpheus::APIClient::CLIENT_ID
+                  print "Client ID: #{required_blue_prompt} #{options[:client_id]}", "\n", reset
+                end
+              end
               if username.empty?
                 print "Username: #{required_blue_prompt} "
                 username = $stdin.gets.chomp!
@@ -131,7 +138,7 @@ module Morpheus
               return nil
             end
             begin
-              auth_interface = Morpheus::AuthInterface.new(@appliance_url)
+              auth_interface = Morpheus::AuthInterface.new({url:@appliance_url, client_id: options[:client_id]})
               auth_interface.setopts(options)
               if options[:dry_run]
                 print_dry_run auth_interface.dry.login(username, password)
@@ -270,7 +277,7 @@ module Morpheus
         username = wallet['username']
 
         begin
-          auth_interface = Morpheus::AuthInterface.new(@appliance_url)
+          auth_interface = Morpheus::AuthInterface.new({url:@appliance_url})
           auth_interface.setopts(options)
           if options[:dry_run]
             print_dry_run auth_interface.dry.use_refresh_token(wallet['refresh_token'])
@@ -414,6 +421,44 @@ module Morpheus
           end
         end
       end
+
+      def rename_credentials(appliance_name, new_appliance_name)
+        # reloading file is better for now, otherwise you can lose credentials with multiple shells.
+        credential_map = load_credentials_file || {}
+
+        if new_appliance_name.to_s.empty?
+          puts "Cannot rename credentials without specifying a new name" 
+          return nil
+        elsif credential_map[new_appliance_name.to_s] || credential_map[new_appliance_name.to_sym]
+          # yes you can, maybe require --force?
+          puts "Cannot rename credentials to a name that already exists: #{new_appliance_name}" 
+          return nil
+        end
+        
+        # always remove symbol, which was used pre 3.6.9
+        credential_map.delete(appliance_name.to_sym)
+        begin
+          fn = credentials_file_path
+          if !Dir.exists?(File.dirname(fn))
+            FileUtils.mkdir_p(File.dirname(fn))
+          end
+          #Morpheus::Logging::DarkPrinter.puts "renaming credentials for #{appliance_name} to #{fn}" if Morpheus::Logging.debug?
+          Morpheus::Logging::DarkPrinter.puts "renaming credentials from #{appliance_name} to #{appliance_name}" if Morpheus::Logging.debug?
+          File.open(fn, 'w') {|f| f.write credential_map.to_yaml } #Store
+          FileUtils.chmod(0600, fn)
+          @@appliance_credentials_map = credential_map
+        rescue => e
+          puts "failed to save #{fn}. #{e}"  if Morpheus::Logging.debug?
+        ensure
+          # recalcuate echo vars
+          #puts "Recalculating variable maps for username change"
+          Morpheus::Cli::Echo.recalculate_variable_map()
+          # recalculate shell prompt after this change
+          if Morpheus::Cli::Shell.has_instance?
+            Morpheus::Cli::Shell.instance.reinitialize()
+          end
+        end
+      end
     end
   end
 end

data/lib/morpheus/cli/deployments.rb

@@ -36,10 +36,10 @@ class Morpheus::Cli::Deployments
       end
       @deployments_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @deployments_interface.dry.get(params)
+        print_dry_run @deployments_interface.dry.list(params)
         return
       end
-      json_response = @deployments_interface.get(params)
+      json_response = @deployments_interface.list(params)
       if options[:json]
         puts JSON.pretty_generate(json_response)
       else

data/lib/morpheus/cli/dot_file.rb

@@ -62,12 +62,12 @@ class Morpheus::Cli::DotFile
         if err.success?
           cmd_result = true
         else
-          puts "#{red} source file: #{@filename} line: #{line_num} command: #{line}#{reset} error: exited non zero - #{err}"
+          puts "#{red} source file: #{@filename}, line: #{line_num}, command: #{line}, error: #{err}#{reset}"
           cmd_result = false
         end
       rescue => err
         # raise err
-        puts "#{red} source file: #{@filename} line: #{line_num} command: #{line}#{reset} error: unexpected error - #{err}"
+        puts "#{red} source file: #{@filename}, line: #{line_num}, command: #{line}, error: #{err}#{reset}"
         cmd_result = false
       end
       if cmd_result == false

data/lib/morpheus/cli/error_handler.rb

@@ -16,6 +16,7 @@ class Morpheus::Cli::ErrorHandler
 
   def handle_error(err, options={})
     exit_code = 1
+    options = (options || {}).clone
     # heh
     if Morpheus::Logging.debug? && options[:debug].nil?
       options[:debug] = true
@@ -147,6 +148,8 @@ class Morpheus::Cli::ErrorHandler
     else
       @stderr.print red, "Error Communicating with the Appliance. #{e}", reset, "\n"
     end
+    # uh, having this print method return exit_code, err to standardize return values of methods that are still calling it, at the end just by chance..
+    return exit_code, err #.to_s
   end
 
   def print_rest_errors(response, options={})
@@ -178,7 +181,7 @@ class Morpheus::Cli::ErrorHandler
   end
 
   def print_rest_request(req)
-    @stderr.print "Request:"
+    @stderr.print "REQUEST"
     @stderr.print "\n"
     @stderr.print "#{req.method.to_s.upcase} #{req.url.inspect}"
     @stderr.print "\n"
@@ -187,10 +190,10 @@ class Morpheus::Cli::ErrorHandler
   def print_rest_response(res)
     # size = @raw_response ? File.size(@tf.path) : (res.body.nil? ? 0 : res.body.size)
     size = (res.body.nil? ? 0 : res.body.size)
-    @stderr.print "Response:"
+    @stderr.print "RESPONSE"
     @stderr.print "\n"
     display_size = Filesize.from("#{size} B").pretty rescue size
-    @stderr.print "HTTP #{res.net_http_res.code} - #{res.net_http_res.message} | #{(res['Content-type'] || '').gsub(/;.*$/, '')} #{display_size}"
+    @stderr.print "HTTP #{res.net_http_res.code} #{res.net_http_res.message} | #{(res['Content-type'] || '').gsub(/;.*$/, '')} #{display_size}"
     @stderr.print "\n"
     begin
       @stderr.print JSON.pretty_generate(JSON.parse(res.body))

data/lib/morpheus/cli/execute_schedules_command.rb

@@ -680,7 +680,7 @@ class Morpheus::Cli::ExecuteSchedulesCommand
   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/groups.rb

@@ -45,10 +45,10 @@ class Morpheus::Cli::Groups
       params.merge!(parse_list_options(options))
       @groups_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @groups_interface.get(params)
+        print_dry_run @groups_interface.list(params)
         return 0
       end
-      json_response = @groups_interface.get(params)
+      json_response = @groups_interface.list(params)
       render_result = render_with_format(json_response, options, 'groups')
       return 0 if render_result
 
@@ -69,7 +69,7 @@ class Morpheus::Cli::Groups
           #end
         else
           unless options[:remote]
-            print "\n# => No active group, see `groups use`\n", reset
+            print cyan, "\n# => No active group, see `groups use`\n", reset
           end
         end
       end
@@ -107,7 +107,7 @@ class Morpheus::Cli::Groups
         if arg.to_s =~ /\A\d{1,}\Z/
           print_dry_run @groups_interface.dry.get(arg.to_i)
         else
-          print_dry_run @groups_interface.dry.get({name:arg})
+          print_dry_run @groups_interface.dry.list({name:arg})
         end
         return 0
       end

data/lib/morpheus/cli/hosts.rb

@@ -577,6 +577,7 @@ class Morpheus::Cli::Hosts
       params = {}
       params.merge!(parse_list_options(options))
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      params[:order] = params[:direction] unless params[:direction].nil? # old api version expects order instead of direction
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.server_logs([server['id']], params)
@@ -600,7 +601,7 @@ class Morpheus::Cli::Hosts
         if logs['data'].empty?
           puts "#{cyan}No logs found.#{reset}"
         else
-          logs['data'].reverse.each do |log_entry|
+          logs['data'].each do |log_entry|
             log_level = ''
             case log_entry['level']
             when 'INFO'
@@ -1805,7 +1806,7 @@ class Morpheus::Cli::Hosts
         exit 1
       end
     else
-      json_results = @clouds_interface.get({groupId: group_id, name: val})
+      json_results = @clouds_interface.list({groupId: group_id, name: val})
       zone = json_results['zones'] ? json_results['zones'][0] : nil
       if zone.nil?
         print_red_alert "Cloud not found by name #{val}"

data/lib/morpheus/cli/image_builder_command.rb

@@ -739,27 +739,6 @@ class Morpheus::Cli::ImageBuilderCommand
     end
   end
 
-  # def find_group_by_name(name)
-  #   group_results = @groups_interface.get(name)
-  #   if group_results['groups'].empty?
-  #     print_red_alert "Group not found by name #{name}"
-  #     return nil
-  #   end
-  #   return group_results['groups'][0]
-  # end
-
-  # def find_cloud_by_name(group_id, name)
-  #   option_results = @options_interface.options_for_source('clouds',{groupId: group_id})
-  #   match = option_results['data'].find { |grp| grp['value'].to_s == name.to_s || grp['name'].downcase == name.downcase}
-  #   if match.nil?
-  #     print_red_alert "Cloud not found by name #{name}"
-  #     return nil
-  #   else
-  #     return match['value']
-  #   end
-  # end
-
-
   def format_image_build_status(image_build, return_color=cyan)
     out = ""
     return out if !image_build

data/lib/morpheus/cli/instances.rb

@@ -966,7 +966,7 @@ class Morpheus::Cli::Instances
                     "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
-    if args.count != 1
+    if args.count < 1
       raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
@@ -1011,6 +1011,7 @@ class Morpheus::Cli::Instances
   end
 
   def logs(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
@@ -1031,9 +1032,9 @@ class Morpheus::Cli::Instances
       if options[:node_id] && container_ids.include?(options[:node_id])
         container_ids = [options[:node_id]]
       end
-      params = {}
       params.merge!(parse_list_options(options))
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.container_logs(container_ids, params)
@@ -1054,7 +1055,7 @@ class Morpheus::Cli::Instances
       if logs['data'].empty?
         puts "#{cyan}No logs found.#{reset}"
       else
-        logs['data'].reverse.each do |log_entry|
+        logs['data'].each do |log_entry|
           log_level = ''
           case log_entry['level']
           when 'INFO'
@@ -1539,6 +1540,9 @@ class Morpheus::Cli::Instances
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID for the new instance" ) do |val|
         options[:cloud] = val
       end
+      opts.on("--create-user on|off", String, "User Config: Create Your User. Default is on") do |val|
+        options[:create_user] = !['false','off','0'].include?(val.to_s)
+      end
       build_common_options(opts, options, [:options, :payload, :auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1607,6 +1611,15 @@ class Morpheus::Cli::Instances
         passed_options.delete('group')
         payload.deep_merge!(passed_options)
       end
+      
+      # JD: this actually fixed a customer problem
+      # It appears to be important to pass this... not sure if config.createUser is necessary...
+      if options[:create_user].nil?
+        options[:create_user] = true
+      end
+      if options[:create_user] != nil
+        payload.deep_merge!({'createUser' => options[:create_user], 'config' =>{'createUser' => options[:create_user]}})
+      end
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to clone the instance #{instance['name']} as '#{payload['name']}'?", options)
         return 9, "aborted command"
       end
@@ -3626,7 +3639,7 @@ private
   end
 
   def find_workflow_by_name(name)
-    workflows = @task_sets_interface.get({name: name.to_s})['taskSets']
+    workflows = @task_sets_interface.list({name: name.to_s})['taskSets']
     if workflows.empty?
       print_red_alert "Workflow not found by name #{name}"
       return nil

data/lib/morpheus/cli/library_container_types_command.rb

@@ -315,7 +315,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         # err, these optionTypes have the fieldContext
         # so merge them at the root level of the request.
 
-        provision_types = @provision_types_interface.get({customSupported: true})['provisionTypes']
+        provision_types = @provision_types_interface.list({customSupported: true})['provisionTypes']
         if provision_types.empty?
           print_red_alert "No available provision types found!"
           return 1

data/lib/morpheus/cli/library_layouts_command.rb

@@ -331,7 +331,7 @@ class Morpheus::Cli::LibraryLayoutsCommand
           params['description'] = v_prompt['description'] if v_prompt['description']
         end
 
-        provision_types = @provision_types_interface.get({customSupported: true})['provisionTypes']
+        provision_types = @provision_types_interface.list({customSupported: true})['provisionTypes']
         if provision_types.empty?
           print_red_alert "No available provision types found!"
           exit 1

data/lib/morpheus/cli/library_upgrades_command.rb

@@ -288,7 +288,7 @@ class Morpheus::Cli::LibraryUpgradesCommand
         end
         
 
-        # provision_types = @provision_types_interface.get({customSupported: true})['provisionTypes']
+        # provision_types = @provision_types_interface.list({customSupported: true})['provisionTypes']
         # if provision_types.empty?
         #   print_red_alert "No available provision types found!"
         #   exit 1

data/lib/morpheus/cli/license.rb

@@ -6,8 +6,10 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::License
   include Morpheus::Cli::CliCommand
 
-  register_subcommands :get, :apply, :decode
-  alias_subcommand :details, :get
+  register_subcommands :get, :install, :uninstall, :test
+  # deprecated
+  register_subcommands :decode, :apply
+  #alias_subcommand :details, :get
 
   def initialize() 
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -25,50 +27,82 @@ class Morpheus::Cli::License
 
   def get(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :fields, :dry_run, :remote])
+      opts.footer = "Get details about the currently installed license.\n" +
+                    "This information includes license features and limits.\n" +
+                    "The actual secret license key value will never be returned."
     end
     optparse.parse!(args)
+    if args.count > 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
     connect(options)
     begin
+      # make api request
       @license_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @license_interface.dry.get()
-        return
+        return 0, nil
       end
-      json_result = @license_interface.get()
-      license = json_result['license']
-      used_memory = json_result['licenseUsedMemory']
-      if options[:json]
-        puts JSON.pretty_generate(json_result)
-      else
-        if license.nil?
-          puts_error "No license currently applied to the appliance."
-          return 1
-        else
-          print_h1 "License"
-          max_memory = "Unlimited"
-          max_storage = "Unlimited"
-          max_memory = Filesize.from("#{license['maxMemory']} B").pretty  if license['maxMemory'].to_i != 0
-          max_storage = Filesize.from("#{license['maxStorage']} B").pretty  if license['maxStorage'].to_i != 0
-          used_memory = Filesize.from("#{used_memory} B").pretty if used_memory.to_i != 0
-          print cyan
-          description_cols = {
-            "Account" => 'accountName',
-            "Product Tier" => lambda {|it| format_product_tier(it) },
-            "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-            "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-            "Memory" => lambda {|it| "#{used_memory} / #{max_memory}" },
-            "Max Storage" => lambda {|it| "#{max_storage}" },
-            "Max Instances" => lambda {|it| it["maxInstances"].to_i == 0 ? 'Unlimited' : it["maxInstances"] },
-            "Hard Limit" => lambda {|it| it[""] == false ? 'Yes' : 'No' },
-          }
-          print_description_list(description_cols, license)
-          print reset,"\n"
-        end
+      json_response = @license_interface.get()
+      # 200 OK, parse results
+      license = json_response['license']
+      used_memory = json_response['licenseUsedMemory']
+      
+      # Determine exit status and any error conditions for the command
+      exit_code = 0
+      err = nil
+      if license.nil?
+        exit_code = 1
+        err = "No license currently installed."
       end
-      return 0
+
+      # render common formats like dry run, curl, json , yaml , etc.
+      render_result = render_with_format(json_response, options)
+      return exit_code, err if render_result
+
+      if options[:quiet]
+        return exit_code, err
+      end
+      
+      # if exit_code != 0 
+      #   print_error red, err.to_s, reset, "\n"
+      #   return exit_code, err
+      # end
+      
+      # render output
+
+      print_h1 "License"
+      max_memory = "Unlimited"
+      max_storage = "Unlimited"
+      max_memory = Filesize.from("#{license['maxMemory']} B").pretty  if license['maxMemory'].to_i != 0
+      max_storage = Filesize.from("#{license['maxStorage']} B").pretty  if license['maxStorage'].to_i != 0
+      used_memory = Filesize.from("#{used_memory} B").pretty if used_memory.to_i != 0
+      print cyan
+      description_cols = {
+        "Account" => 'accountName',
+        "Product Tier" => lambda {|it| format_product_tier(it) },
+        "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+        "End Date" => lambda {|it| 
+          if it['endDate']
+            format_local_dt(it['endDate']).to_s + ' (' + format_duration(Time.now, it['endDate']).to_s + ')' 
+          else
+            'Never'
+          end
+          },
+        "Memory" => lambda {|it| "#{used_memory} / #{max_memory}" },
+        "Max Storage" => lambda {|it| "#{max_storage}" },
+        "Max Instances" => lambda {|it| it["maxInstances"].to_i == 0 ? 'Unlimited' : it["maxInstances"] },
+        "Hard Limit" => lambda {|it| it[""] == false ? 'Yes' : 'No' },
+      }
+      print_description_list(description_cols, license)
+      print reset,"\n"
+    
+    return exit_code, err
+      
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return false
@@ -76,6 +110,11 @@ class Morpheus::Cli::License
   end
 
   def apply(args)
+    print_error "#{yellow}DEPRECATION WARNING: `license apply` has been deprecated and replaced with `license install`. Please use `license install` instead.#{reset}\n"
+    install(args)
+  end
+
+  def install(args)
     options = {}
     account_name = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -83,6 +122,9 @@ class Morpheus::Cli::License
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
     connect(options)
     begin
       if args[0]
@@ -93,13 +135,13 @@ class Morpheus::Cli::License
       end
       @license_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @license_interface.dry.apply(key)
+        print_dry_run @license_interface.dry.install(key)
         return 0
       end
-      json_result = @license_interface.apply(key)
-      license = json_result['license']
+      json_response = @license_interface.install(key)
+      license = json_response['license']
       if options[:json]
-        puts JSON.pretty_generate(json_result)
+        puts JSON.pretty_generate(json_response)
       else
         print_green_success "License applied successfully!"
         # get([]) # show it
@@ -112,13 +154,22 @@ class Morpheus::Cli::License
   end
 
   def decode(args)
+    print_error "#{yellow}DEPRECATION WARNING: `license decode` has been deprecated and replaced with `license test`. Please use `license test` instead.#{reset}\n"
+    test(args)
+  end
+
+  def test(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[key]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
-      opts.footer = "Decode a license key."
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Test a license key.\n" +
+                    "This is a way to decode and view a license key before installing it."
     end
     optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
     connect(options)
     key = nil
     if args[0]
@@ -130,46 +181,108 @@ class Morpheus::Cli::License
     begin
       @license_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @license_interface.dry.decode(key)
+        print_dry_run @license_interface.dry.test(key)
         return
       end
-      json_result = @license_interface.decode(key)
-      license = json_result['license']
-      if options[:json]
-        puts JSON.pretty_generate(json_result)
-      else
-        if license.nil?
-          puts_error "Unable to decode license."
-          puts_error json_results['msg'] if json_results['msg']
-          return 1
-        else
-          print_h1 "License"
-          max_memory = "Unlimited"
-          max_storage = "Unlimited"
-          max_memory = Filesize.from("#{license['maxMemory']} B").pretty  if license['maxMemory'].to_i != 0
-          max_storage = Filesize.from("#{license['maxStorage']} B").pretty  if license['maxStorage'].to_i != 0
-          print cyan
-          description_cols = {
-            "Account" => 'accountName',
-            "Product Tier" => lambda {|it| format_product_tier(it) }, 
-            "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-            "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-            "Max Memory" => lambda {|it| max_memory },
-            "Max Storage" => lambda {|it| max_storage },
-            "Max Instances" => lambda {|it| it["maxInstances"].to_i == 0 ? 'Unlimited' : it["maxInstances"] },
-            "Hard Limit" => lambda {|it| it[""] == false ? 'Yes' : 'No' },
-          }
-          print_description_list(description_cols, license)
-          print reset,"\n"
-        end
+      json_response = @license_interface.test(key)
+      license = json_response['license']
+
+      exit_code, err = 0, nil
+      if license.nil?
+        err = "Unable to decode license."
+        exit_code = 1
+        #return err, exit_code
+      end
+      render_result = render_with_format(json_response, options)
+      if render_result
+        return exit_code, err
+      end
+      if options[:quiet]
+        return exit_code, err
+      end
+      if exit_code != 0
+        print_error red, err.to_s, reset, "\n"
+        return exit_code, err
+      end
+      
+      # all good
+      print_h1 "License"
+      max_memory = "Unlimited"
+      max_storage = "Unlimited"
+      max_memory = Filesize.from("#{license['maxMemory']} B").pretty  if license['maxMemory'].to_i != 0
+      max_storage = Filesize.from("#{license['maxStorage']} B").pretty  if license['maxStorage'].to_i != 0
+      print cyan
+      description_cols = {
+        "Account" => 'accountName',
+        "Product Tier" => lambda {|it| format_product_tier(it) }, 
+        "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+        "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+        "Max Memory" => lambda {|it| max_memory },
+        "Max Storage" => lambda {|it| max_storage },
+        "Max Instances" => lambda {|it| it["maxInstances"].to_i == 0 ? 'Unlimited' : it["maxInstances"] },
+        "Hard Limit" => lambda {|it| it[""] == false ? 'Yes' : 'No' },
+      }
+      print_description_list(description_cols, license)
+      print reset,"\n"
+      return exit_code, err
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def uninstall(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[key]")
+      build_common_options(opts, options, [:auto_confirm, :json, :yaml, :dry_run, :remote])
+      opts.footer = "Uninstall the current license key.\n" +
+                    "This clears out the current license key from the appliance.\n" +
+                    "The function of the remote appliance will be restricted without a license installed.\n" +
+                    "Be careful using this."
+    end
+    optparse.parse!(args)
+    if args.count > 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      @license_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @license_interface.dry.uninstall(params)
+        return
+      end
+      
+      unless options[:quiet]
+        print cyan,"#{bold}WARNING!#{reset}#{cyan} You are about to uninstall your license key.",reset,"\n"
+        print yellow, "Be careful using this. Make sure you have a copy of your key somewhere if you intend to use it again.",reset, "\n"
+        print "\n"
+      end
+      
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you want to uninstall the license key for remote #{@appliance_name} - #{@appliance_url}?")
+        return 9, "command aborted"
       end
+
+      json_response = @license_interface.uninstall(params)
+      
+      @apps_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @apps_interface.dry.wiki(app["id"], params)
+        return
+      end
+      render_result = render_with_format(json_response, options)
+      return 0 if render_result
+      return 0 if options[:quiet]
+      print_green_success "License uninstalled!"
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      return false
+      return 1
     end
   end
 
+
   def format_product_tier(license)
     product_tier = license['productTier'] || 'capacity'
     if product_tier == 'capacity'