morpheus-cli 4.1.8 → 4.1.9

data/lib/morpheus/cli/hosts.rb

@@ -5,6 +5,7 @@ require 'optparse'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/accounts_helper'
 require 'morpheus/cli/mixins/provisioning_helper'
+require 'morpheus/cli/mixins/logs_helper'
 require 'morpheus/cli/option_types'
 require 'json'
 
@@ -12,6 +13,7 @@ class Morpheus::Cli::Hosts
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::LogsHelper
   set_command_name :hosts
   set_command_description "View and manage hosts (servers)."
   register_subcommands :list, :count, :get, :view, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, :run_workflow, :make_managed, :upgrade_agent
@@ -37,7 +39,7 @@ class Morpheus::Cli::Hosts
     @server_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).server_types
     @logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
     @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @active_group_id = Morpheus::Cli::Groups.active_group
+    @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @execution_request_interface = @api_client.execution_request
     @clusters_interface = @api_client.clusters
   end
@@ -562,8 +564,24 @@ class Morpheus::Cli::Hosts
 
   def logs(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 30 days ago.") do |val|
+        options[:start] = parse_time(val) #.utc.iso8601
+      end
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End timestamp. Default is now.") do |val|
+        options[:end] = parse_time(val) #.utc.iso8601
+      end
+      opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
+        params['level'] = params['level'] ? [params['level'], val].flatten : val
+      end
+      opts.on('--table', '--table', "Format ouput as a table.") do
+        options[:table] = true
+      end
+      opts.on('-a', '--all', "Display all details: entire message." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -574,54 +592,47 @@ class Morpheus::Cli::Hosts
     connect(options)
     begin
       server = find_host_by_name_or_id(args[0])
-      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
+      params['query'] = params.delete('phrase') if params['phrase']
+      params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction
+      params['startMs'] = (options[:start].to_i * 1000) if options[:start]
+      params['endMs'] = (options[:end].to_i * 1000) if options[:end]
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.server_logs([server['id']], params)
         return
       end
       json_response = @logs_interface.server_logs([server['id']], params)
-      render_result = render_with_format(json_response, options, 'data')
+      render_result = json_response['logs'] ? render_with_format(json_response, options, 'logs') : render_with_format(json_response, options, 'data')
       return 0 if render_result
       
-      logs = json_response
       title = "Host Logs: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})"
       subtitles = parse_list_subtitles(options)
+      if options[:start]
+        subtitles << "Start: #{options[:start]}".strip
+      end
+      if options[:end]
+        subtitles << "End: #{options[:end]}".strip
+      end
       if params[:query]
         subtitles << "Search: #{params[:query]}".strip
       end
-      # todo: startMs, endMs, sorts insteaad of sort..etc
+      # if params['containers']
+      #   subtitles << "Containers: #{params['containers']}".strip
+      # end
+      if params['level']
+        subtitles << "Level: #{params['level']}"
+      end
       print_h1 title, subtitles, options
-      if logs['data'].empty?
-        puts "#{cyan}No logs found.#{reset}"
+      logs = json_response['data'] || json_response['logs']
+      if logs.empty?
+        print "#{cyan}No logs found.#{reset}\n"
       else
-        if logs['data'].empty?
-          puts "#{cyan}No logs found.#{reset}"
-        else
-          logs['data'].each do |log_entry|
-            log_level = ''
-            case log_entry['level']
-            when 'INFO'
-              log_level = "#{blue}#{bold}INFO#{reset}"
-            when 'DEBUG'
-              log_level = "#{white}#{bold}DEBUG#{reset}"
-            when 'WARN'
-              log_level = "#{yellow}#{bold}WARN#{reset}"
-            when 'ERROR'
-              log_level = "#{red}#{bold}ERROR#{reset}"
-            when 'FATAL'
-              log_level = "#{red}#{bold}FATAL#{reset}"
-            end
-            puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}"
-          end
-          print_results_pagination({'meta'=>{'total'=>json_response['total'],'size'=>json_response['data'].size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
-        end
-        print reset, "\n"
-        return 0
+        print format_log_records(logs, options)
+        print_results_pagination({'meta'=>{'total'=>(json_response['total']['value'] rescue json_response['total']),'size'=>logs.size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
       end
+      print reset, "\n"
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/instances.rb

@@ -6,6 +6,7 @@ require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/accounts_helper'
 require 'morpheus/cli/mixins/provisioning_helper'
 require 'morpheus/cli/mixins/processes_helper'
+require 'morpheus/cli/mixins/logs_helper'
 require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::Instances
@@ -13,6 +14,7 @@ class Morpheus::Cli::Instances
   include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::ProcessesHelper
+  include Morpheus::Cli::LogsHelper
   set_command_name :instances
   set_command_description "View and manage instances."
   register_subcommands :list, :count, :get, :view, :add, :update, :update_notes, :remove, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :console, :status_check, {:containers => :list_containers}, :scaling, {:'scaling-update' => :scaling_update}
@@ -36,11 +38,13 @@ class Morpheus::Cli::Instances
     @logs_interface = @api_client.logs
     @tasks_interface = @api_client.tasks
     @instance_types_interface = @api_client.instance_types
+    @library_layouts_interface = @api_client.library_layouts
     @clouds_interface = @api_client.clouds
+    @clouds_datastores_interface = @api_client.cloud_datastores
     @servers_interface = @api_client.servers
     @provision_types_interface = @api_client.provision_types
     @options_interface = @api_client.options
-    @active_group_id = Morpheus::Cli::Groups.active_group
+    @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @execution_request_interface = @api_client.execution_request
   end
   
@@ -312,6 +316,15 @@ class Morpheus::Cli::Instances
       opts.on("--layout-size NUMBER", Integer, "Apply a multiply factor of containers/vms within the instance") do |val|
         options[:layout_size] = val.to_i
       end
+      opts.on( '-l', '--layout LAYOUT', "Layout ID" ) do |val|
+        options[:layout] = val
+      end
+      opts.on( '-p', '--plan PLAN', "Service plan ID") do |val|
+        options[:service_plan] = val
+      end
+      opts.on( '--resource-pool ID', String, "Resource pool ID" ) do |val|
+        options[:resource_pool] = val
+      end
       opts.on("--workflow ID", String, "Automation: Workflow ID") do |val|
         options[:workflow_id] = val
       end
@@ -359,7 +372,7 @@ class Morpheus::Cli::Instances
 
     # use active group by default
     options[:group] ||= @active_group_id
-
+    options[:select_datastore] = true
     options[:name_required] = true
     begin
       payload = nil
@@ -1015,9 +1028,42 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
+      # opts.on('--hosts HOSTS', String, "Filter logs to specific Host ID(s)") do |val|
+      #   params['servers'] = val.to_s.split(",").collect {|it| it.to_s.strip }.select {|it| it }.compact
+      # end
+      # opts.on('--servers HOSTS', String, "alias for --hosts") do |val|
+      #   params['servers'] = val.to_s.split(",").collect {|it| it.to_s.strip }.select {|it| it }.compact
+      # end
+      # opts.on('--vms HOSTS', String, "alias for --hosts") do |val|
+      #   params['servers'] = val.to_s.split(",").collect {|it| it.to_s.strip }.select {|it| it }.compact
+      # end
       opts.on( '-n', '--node NODE_ID', "Scope logs to specific Container or VM" ) do |node_id|
         options[:node_id] = node_id.to_i
       end
+      # opts.on('--container CONTAINER', String, "Filter logs to specific Container ID(s)") do |val|
+      #   params['containers'] = val.to_s.split(",").collect {|it| it.to_s.strip }.select {|it| it }.compact
+      # end
+      # opts.on('--nodes HOST', String, "alias for --containers") do |val|
+      #   params['containers'] = val.to_s.split(",").collect {|it| it.to_s.strip }.select {|it| it }.compact
+      # end
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 30 days ago.") do |val|
+        options[:start] = parse_time(val) #.utc.iso8601
+      end
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End timestamp. Default is now.") do |val|
+        options[:end] = parse_time(val) #.utc.iso8601
+      end
+      # opts.on('--interval TIME','--interval TIME', "Interval of time to include, in seconds. Default is 30 days ago.") do |val|
+      #   options[:interval] = parse_time(val).utc.iso8601
+      # end
+      opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
+        params['level'] = params['level'] ? [params['level'], val].flatten : val
+      end
+      opts.on('--table', '--table', "Format ouput as a table.") do
+        options[:table] = true
+      end
+      opts.on('-a', '--all', "Display all details: entire message." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1029,53 +1075,62 @@ class Morpheus::Cli::Instances
     begin
       instance = find_instance_by_name_or_id(args[0])
       container_ids = instance['containers']
-      if options[:node_id] && container_ids.include?(options[:node_id])
-        container_ids = [options[:node_id]]
+      if options[:node_id]
+        if container_ids.include?(options[:node_id])
+          container_ids = [options[:node_id]]
+        else
+          print_red_alert "Instance does not include node #{options[:node_id]}"
+          return 1
+        end
       end
       params.merge!(parse_list_options(options))
-      params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      params['query'] = params.delete('phrase') if params['phrase']
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction
+      params['startMs'] = (options[:start].to_i * 1000) if options[:start]
+      params['endMs'] = (options[:end].to_i * 1000) if options[:end]
+      params['interval'] = options[:interval].to_s if options[:interval]
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.container_logs(container_ids, params)
         return
       end
       json_response = @logs_interface.container_logs(container_ids, params)
-      render_result = render_with_format(json_response, options, 'data')
+      render_result = json_response['logs'] ? render_with_format(json_response, options, 'logs') : render_with_format(json_response, options, 'data')
       return 0 if render_result
       
-      logs = json_response
       title = "Instance Logs: #{instance['name']} (#{instance['instanceType'] ? instance['instanceType']['name'] : ''})"
       subtitles = parse_list_subtitles(options)
+      if options[:start]
+        subtitles << "Start: #{options[:start]}".strip
+      end
+      if options[:end]
+        subtitles << "End: #{options[:end]}".strip
+      end
+      if params[:query]
+        subtitles << "Search: #{params[:query]}".strip
+      end
+      if params['servers']
+        subtitles << "Servers: #{params['servers']}".strip
+      end
+      if params['containers']
+        subtitles << "Containers: #{params['containers']}".strip
+      end
       if params[:query]
         subtitles << "Search: #{params[:query]}".strip
       end
-      # todo: startMs, endMs, sorts insteaad of sort..etc
+      if params['level']
+        subtitles << "Level: #{params['level']}"
+      end
+      logs = json_response['data'] || json_response['logs']
       print_h1 title, subtitles, options
-      if logs['data'].empty?
-        puts "#{cyan}No logs found.#{reset}"
+      if logs.empty?
+        print "#{cyan}No logs found.#{reset}\n"
       else
-        logs['data'].each do |log_entry|
-          log_level = ''
-          case log_entry['level']
-          when 'INFO'
-            log_level = "#{blue}#{bold}INFO#{reset}"
-          when 'DEBUG'
-            log_level = "#{white}#{bold}DEBUG#{reset}"
-          when 'WARN'
-            log_level = "#{yellow}#{bold}WARN#{reset}"
-          when 'ERROR'
-            log_level = "#{red}#{bold}ERROR#{reset}"
-          when 'FATAL'
-            log_level = "#{red}#{bold}FATAL#{reset}"
-          end
-          puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}"
-        end
-        print_results_pagination({'meta'=>{'total'=>json_response['total'],'size'=>json_response['data'].size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
+        print format_log_records(logs, options)
+        print_results_pagination({'meta'=>{'total'=>(json_response['total']['value'] rescue json_response['total']),'size'=>logs.size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
       end
       print reset, "\n"
       return 0
-      
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1086,6 +1141,11 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
+      opts.on('-a', '--all', "Display all details: containers|vms, and scaling." ) do
+        options[:details] = true
+        options[:include_containers] = true
+        options[:include_scaling] = true
+      end
       opts.on( nil, '--containers', "Display Instance Containers" ) do
         options[:include_containers] = true
       end
@@ -1556,55 +1616,47 @@ class Morpheus::Cli::Instances
       return 1 if instance.nil?
 
       options[:options] ||= {}
-      
+      options[:select_datastore] = true
+      options[:name_required] = true
+
+      # defaults derived from clone
+      options[:default_name] = instance['name'] + '-clone' if instance['name']
+      options[:default_group] = instance['group']['id'] if instance['group']
+      options[:default_cloud] = instance['cloud']['name'] if instance['cloud']
+      options[:default_plan] = instance['plan']['name'] if instance['plan']
+      options[:default_resource_pool] = instance['config']['resourcePoolId'] if instance['config']
+      options[:default_config] = instance['config']
+      options[:default_security_group] = instance['config']['securityGroups'][0]['id'] if instance['config'] && (instance['config']['securityGroups'] || []).count > 0
+
+      # immutable derived from clone
+      options[:instance_type_code] = instance['instanceType']['code'] if instance['instanceType']
+      options[:version] = instance['instanceVersion']
+      options[:layout] = instance['layout']['id'] if instance['layout']
+
+      # volume defaults
+      options[:options]['volumes'] = instance['volumes']
+
+      # network defaults
+      options[:options]['networkInterfaces'] = instance['interfaces']
+
       # use the -g GROUP or active group by default
       #options[:options]['group'] ||= (options[:group] || @active_group_id)
       # support [new-name] 
       if args[1]
         options[:options]['name'] = args[1]
       end
-      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) || ['networkInterfaces'].include?(k)} : {}
       payload = {}
       if options[:payload]
         payload = options[:payload]
       else
-        payload = {
+        new_instance_payload = prompt_new_instance(options)
 
-        }
-
-        # Name
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for the new instance'}], options[:options], @api_client, options[:params])
-        payload['name'] = v_prompt['name'] unless v_prompt['name'].to_s.empty?
-        
-        # Group
-        group = nil
-        if options[:group].nil?
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => get_available_groups(), 'defaultValue' => instance['group']['id']}], options[:options], @api_client, options[:params])
-          options[:group] = v_prompt['group'] unless v_prompt['group'].to_s.empty?
-        else
-          #options[:group] = instance['group']['id']
-        end
-        if options[:group]
-          group = find_group_by_name_or_id_for_provisioning(options[:group])
-          return 1 if group.nil?
-          payload['group'] = {id: group['id']}
-        end
-        # Cloud
-        cloud = nil
-        if group
-          if options[:cloud].nil?
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'selectOptions' => get_available_clouds(group['id']), 'defaultValue' => instance['cloud']['id']}], options[:options], @api_client, options[:params])
-            options[:cloud] = v_prompt['cloud'] unless v_prompt['cloud'].to_s.empty?
-          else
-            #options[:cloud] = instance['cloud']['id']
-          end
-          cloud = find_zone_by_name_or_id(nil, options[:cloud])
-          return 1 if cloud.nil?
-          if cloud
-            payload['cloud'] = {id: cloud['id']}
-          end
-        end
-        
+        # adjust for differences between new and clone payloads
+        payload = new_instance_payload.delete('instance')
+        payload.deep_merge!(new_instance_payload)
+        payload['cloud'] = {'id' => payload.delete('zoneId')}
+        payload['group'] = payload.delete('site')
       end
       unless passed_options.empty?
         passed_options.delete('cloud')
@@ -3215,7 +3267,7 @@ class Morpheus::Cli::Instances
       # end
       params = {}
       params.merge!(parse_list_options(options))
-      # params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      # params['query'] = params.delete('phrase') if params['phrase']
       @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.history(instance['id'], params)
@@ -3348,7 +3400,6 @@ class Morpheus::Cli::Instances
       instance = find_instance_by_name_or_id(args[0])
       params = {}
       params.merge!(parse_list_options(options))
-      params[:query] = params.delete(:phrase) unless params[:phrase].nil?
       @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.history_details(instance['id'], process_id, params)

data/lib/morpheus/cli/jobs_command.rb

@@ -5,7 +5,7 @@ class Morpheus::Cli::JobsCommand
   include Morpheus::Cli::AccountsHelper
 
   set_command_name :'jobs'
-  set_command_hidden
+
   register_subcommands :list, :get, :add, :update, :execute, :remove
   register_subcommands :list_executions, :get_execution, :get_execution_event
   set_default_subcommand :list

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -11,6 +11,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
   set_command_name :'library-instance-types'
   register_subcommands :list, :get, :add, :update, :remove
   register_subcommands({:'update-logo' => :update_logo})
+  register_subcommands({:'toggle-featured' => :toggle_featured})
 
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -300,12 +301,11 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       end
 
       print_green_success "Added Instance Type #{params['name']}"
-
-      #list([])
-
+      _get(json_response['instanceType']['id'], options)
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
@@ -349,21 +349,71 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       @library_instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_instance_types_interface.dry.update(instance_type['id'], payload)
-        return
+        return 0
       end
       
       json_response = @library_instance_types_interface.update(instance_type['id'], payload)
       
       if options[:json]
         print JSON.pretty_generate(json_response), "\n"
-        return
+        return 0
       end
 
       print_green_success "Updated Instance Type #{params['name'] || instance_type['name']}"
-      #list([])
+      _get(json_response['instanceType']['id'], options)
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
+    end
+  end
+
+  def toggle_featured(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [options]")
+      # opts.on('--featured [on|off]', String, "Featured flag") do |val|
+      #   params['featured'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      # end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Toggle featured flag for an instance type." + "\n" +
+                    "[name] is required. This is the name or id of a instance type."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      instance_type = find_instance_type_by_name_or_id(args[0])
+      return 1 if instance_type.nil?
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        instance_type_payload = {}
+        instance_type_payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload = {'instanceType' => instance_type_payload}
+      end
+      @library_instance_types_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @library_instance_types_interface.dry.toggle_featured(instance_type['id'], params, payload)
+        return 0
+      end
+      
+      json_response = @library_instance_types_interface.toggle_featured(instance_type['id'], params, payload)
+      
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return 0
+      end
+      print_green_success "Updated Instance Type #{params['name'] || instance_type['name']}"
+      _get(instance_type['id'], options)
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
     end
   end
 
@@ -408,13 +458,13 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       json_response = @library_instance_types_interface.update_logo(instance_type['id'], logo_file)
       if options[:json]
         print JSON.pretty_generate(json_response), "\n"
-        return
+        return 0
       end
       print_green_success "Updated Instance Type #{instance_type['name']} logo"
-      #list([])
+      _get(instance_type['id'], options)
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end