morpheus-cli 2.10.3 → 2.11.0

data/lib/morpheus/cli/instance_types.rb

@@ -52,7 +52,7 @@ class Morpheus::Cli::InstanceTypes
       if instance_type.nil?
         puts yellow,"No instance type found by name #{name}.",reset
       else
-        print "\n" ,cyan, bold, "Instance Type Details\n","==================", reset, "\n\n"
+        print_h1 "Instance Type Details"
         versions = instance_type['versions'].join(', ')
         print cyan, "=  #{instance_type['name']} (#{instance_type['code']}) - #{versions}\n"
         layout_names = instance_type['instanceTypeLayouts'].collect { |layout| layout['name'] }.uniq.sort
@@ -97,7 +97,7 @@ class Morpheus::Cli::InstanceTypes
       end
 
       instance_types = json_response['instanceTypes']
-      print "\n" ,cyan, bold, "Morpheus Instance Types\n","==================", reset, "\n\n"
+      print_h1 "Morpheus Instance Types"
       if instance_types.empty?
         puts yellow,"No instance types currently configured.",reset
       else

data/lib/morpheus/cli/instances.rb

@@ -11,7 +11,7 @@ class Morpheus::Cli::Instances
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
 
-  register_subcommands :list, :get, :add, :update, :remove, :stats, :stop, :start, :restart, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :firewall_enable, :firewall_disable, :run_workflow, :import_snapshot, :console, :status_check
+  register_subcommands :list, :get, :add, :update, :remove, :logs, :stats, :stop, :start, :restart, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :firewall_enable, :firewall_disable, :run_workflow, :import_snapshot, :console, :status_check
   alias_subcommand :details, :get
   set_default_subcommand :list
   
@@ -83,8 +83,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.create(payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
         instance_name = json_response["instance"]["name"]
         print_green_success "Provisioning instance #{instance_name}"
@@ -145,8 +144,7 @@ class Morpheus::Cli::Instances
       json_response = @instances_interface.update(instance["id"], payload)
 
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
         print_green_success "Updated instance #{instance['name']}"
         list([])
@@ -179,7 +177,7 @@ class Morpheus::Cli::Instances
     end
     if options[:json]
       mock_json = {status: instance['status'], exit: exit_code}
-      out << JSON.pretty_generate(mock_json)
+      out << as_json(mock_json, options)
       out << "\n"
     elsif !options[:quiet]
       out << cyan
@@ -195,7 +193,7 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -203,33 +201,40 @@ class Morpheus::Cli::Instances
       exit 1
     end
     connect(options)
+    ids = args
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _stats(arg, options)
+    end
+  end
+
+  def _stats(arg, options)
     begin
-      instance = find_instance_by_name_or_id(args[0])
+      instance = find_instance_by_name_or_id(arg)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.get(instance['id'])
-        return
+        return 0
       end
       json_response = @instances_interface.get(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"stats" => filter_data(json_response["stats"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
       end
       instance = json_response['instance']
       stats = json_response['stats'] || {}
-      print "\n" ,cyan, bold, "Instance Stats: #{instance['name']} (#{instance['instanceType']['name']})\n","==================", "\n\n", reset, cyan
-      puts "Status: #{format_instance_status(instance)}"
-      print "\n"
-      if ((stats['maxMemory'].to_i != 0) || (stats['maxStorage'].to_i != 0))
-        # stats_map = {}
-        # stats_map[:memory] = "#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}"
-        # stats_map[:storage] = "#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}"
-        # stats_map[:cpu] = "#{stats['usedCpu'].to_f.round(2)}%"
-        # tp [stats_map], :memory,:storage,:cpu
-        # print "\n"
-        print_stats_usage(stats)
-      else
-        print cyan, "No data.", "\n", reset
-      end
+      title = "Instance Stats: #{instance['name']} (#{instance['instanceType']['name']})"
+      print_h1 title
+      puts cyan + "Status: ".rjust(12) + format_instance_status(instance).to_s
+      puts cyan + "Nodes: ".rjust(12) + (instance['containers'] ? instance['containers'].count : '').to_s
+      # print "\n"
+      #print_h2 "Instance Usage"
+      print_stats_usage(stats)
       print reset, "\n"
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -281,7 +286,7 @@ class Morpheus::Cli::Instances
       opts.on( '-n', '--node NODE_ID', "Scope logs to specific Container or VM" ) do |node_id|
         options[:node_id] = node_id.to_i
       end
-      build_common_options(opts, options, [:list, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :json, :csv, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -295,32 +300,52 @@ class Morpheus::Cli::Instances
       if options[:node_id] && container_ids.include?(options[:node_id])
         container_ids = [options[:node_id]]
       end
-      query_params = { max: options[:max] || 100, offset: options[:offset] || 0, query: options[:phrase]}
+      params = {}
+      [:phrase, :offset, :max, :sort, :direction].each do |k|
+        params[k] = options[k] unless options[k].nil?
+      end
+      params[:query] = params.delete(:phrase) unless params[:phrase].nil?
       if options[:dry_run]
-        print_dry_run @logs_interface.dry.container_logs(container_ids, query_params)
+        print_dry_run @logs_interface.dry.server_logs([server['id']], params)
         return
       end
-      logs = @logs_interface.container_logs(container_ids, query_params)
+      if options[:dry_run]
+        print_dry_run @logs_interface.dry.container_logs(container_ids, params)
+        return
+      end
+      logs = @logs_interface.container_logs(container_ids, params)
+      output = ""
       if options[:json]
-        puts logs
+        output << as_json(logs, options)
       else
-        logs['data'].reverse.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}"
+        title = "Instance Logs: #{instance['name']} (#{instance['instanceType'] ? instance['instanceType']['name'] : ''})"
+        subtitles = []
+        if params[:query]
+          subtitles << "Search: #{params[:query]}".strip
+        end
+        # todo: startMs, endMs, sorts insteaad of sort..etc
+        print_h1 title, subtitles
+        if logs['data'].empty?
+          output << "#{cyan}No logs found.#{reset}\n"
+        else
+          logs['data'].reverse.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
+            output << "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}\n"
           end
-          puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}"
         end
-        print reset,"\n"
+        print output, reset, "\n"
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -332,7 +357,7 @@ class Morpheus::Cli::Instances
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -340,54 +365,67 @@ class Morpheus::Cli::Instances
       exit 1
     end
     connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(arg, options)
     begin
       if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @instances_interface.dry.get(args[0].to_i)
+        if arg.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @instances_interface.dry.get(arg.to_i)
         else
-          print_dry_run @instances_interface.dry.get({name:args[0]})
+          print_dry_run @instances_interface.dry.get({name:arg})
         end
         return
       end
-      instance = find_instance_by_name_or_id(args[0])
+      instance = find_instance_by_name_or_id(arg)
       json_response = @instances_interface.get(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
+        if options[:include_fields]
+          json_response = {"instance" => filter_data(json_response["instance"], options[:include_fields]) }
+        end
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"instance" => filter_data(json_response["instance"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
+      end
+
+      if options[:csv]
+        puts records_as_csv([json_response['instance']], options)
+        return 0
       end
       instance = json_response['instance']
       stats = json_response['stats'] || {}
       # load_balancers = stats = json_response['loadBalancers'] || {}
 
-      connection_string = ''
-      if !instance['connectionInfo'].nil? && instance['connectionInfo'].empty? == false
-        connection_string = "#{instance['connectionInfo'][0]['ip']}:#{instance['connectionInfo'][0]['port']}"
-      end
-
-      print "\n" ,cyan, bold, "Instance Details\n","==================", reset, "\n\n"
+      print_h1 "Instance Details"
       print cyan
-      puts "ID: #{instance['id']}"
-      puts "Name: #{instance['name']}"
-      puts "Description: #{instance['description']}"
-      puts "Group: #{instance['group'] ? instance['group']['name'] : ''}"
-      puts "Cloud: #{instance['cloud'] ? instance['cloud']['name'] : ''}"
-      puts "Type: #{instance['instanceType']['name']}"
-      puts "Plan: #{instance['plan'] ? instance['plan']['name'] : ''}"
-      puts "Environment: #{instance['instanceContext']}"
-      puts "Nodes: #{instance['containers'] ? instance['containers'].count : 0}"
-      puts "Connection: #{connection_string}"
-      #puts "Account: #{instance['account'] ? instance['account']['name'] : ''}"
-      puts "Status: #{format_instance_status(instance)}"
-      if ((stats['maxMemory'].to_i != 0) || (stats['maxStorage'].to_i != 0))
-        print "\n"
-        # stats_map = {}
-        # stats_map[:memory] = "#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}"
-        # stats_map[:storage] = "#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}"
-        # stats_map[:cpu] = "#{stats['usedCpu'].to_f.round(2)}%"
-        # tp [stats_map], :memory,:storage,:cpu
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        "Group" => lambda {|it| it['group'] ? it['group']['name'] : '' },
+        "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
+        "Type" => lambda {|it| it['instanceType']['name'] },
+        "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Environment" => 'instanceContext',
+        "Nodes" => lambda {|it| it['containers'] ? it['containers'].count : 0 },
+        "Connection" => lambda {|it| format_instance_connection_string(it) },
+        #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Status" => lambda {|it| format_instance_status(it) }
+      }
+      print_description_list(description_cols, instance)
+
+      if (stats)
+        print_h2 "Instance Usage"
         print_stats_usage(stats)
-      else
-        # print cyan, "No data.", "\n", reset
       end
       print reset, "\n"
 
@@ -419,19 +457,14 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.backups(instance['id'], params)
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
+        puts as_json(json_response, options)
         return
       end
       backups = json_response['backups']
       stats = json_response['stats'] || {}
       # load_balancers = stats = json_response['loadBalancers'] || {}
 
-      print "\n" ,cyan, bold, "Instance Backups\n","==================", reset, "\n\n"
-      print cyan
-      puts "ID: #{instance['id']}"
-      puts "Name: #{instance['name']}"
-      print "\n"
-      puts "Backups:"
+      print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
       backup_rows = backups.collect {|it| {id: it['id'], name: it['name'], dateCreated: it['dateCreated']} }
       print cyan
       tp backup_rows, [
@@ -494,8 +527,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.clone(instance['id'], payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
         print_green_success "Cloning instance #{instance['name']} to '#{payload['name']}'"
       end
@@ -527,16 +559,17 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.get_envs(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
+        puts as_json(json_response, options)
         return
       end
-      print "\n" ,cyan, bold, "#{instance['name']} (#{instance['instanceType']['name']})\n","==================", "\n\n", reset, cyan
+      print_h1 "Instance Envs: #{instance['name']} (#{instance['instanceType']['name']})"
+      print cyan
       envs = json_response['envs'] || {}
       if json_response['readOnlyEnvs']
         envs += json_response['readOnlyEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value'], :export => true}}
       end
       tp envs, :name, :value, :export
-      print "\n" ,cyan, bold, "Imported Envs\n","==================", "\n\n", reset, cyan
+      print_h2 "Imported Envs"
       imported_envs = json_response['importedEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value']}}
       tp imported_envs
       print reset, "\n"
@@ -575,7 +608,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.create_env(instance['id'], payload)
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
+        puts as_json(json_response, options)
         return
       end
       if !options[:quiet]
@@ -607,7 +640,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.del_env(instance['id'], args[1])
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
+        puts as_json(json_response, options)
         return
       end
       if !options[:quiet]
@@ -642,7 +675,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.stop(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
+        puts as_json(json_response, options)
         print "\n"
       end
       return
@@ -672,8 +705,8 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.start(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
+        return 0
       end
       return
     rescue RestClient::Exception => e
@@ -705,8 +738,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.restart(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       end
       return
     rescue RestClient::Exception => e
@@ -738,10 +770,9 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.suspend(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       end
-      return
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -771,10 +802,9 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.eject(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       end
-      return
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -804,12 +834,11 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.stop(instance['id'],false)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
         puts "Stopping service on #{args[0]}"
       end
-      return
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -836,12 +865,11 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.start(instance['id'],false)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
         puts "Starting service on #{args[0]}"
       end
-      return
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -871,8 +899,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.restart(instance['id'],false)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
         puts "Restarting service on instance #{args[0]}"
       end
@@ -947,8 +974,8 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.resize(instance['id'], payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
+        return 0
       else
         print_green_success "Resizing instance #{instance['name']}"
         list([])
@@ -982,12 +1009,12 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.backup(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
+        return 0
       else
         puts "Backup initiated."
+        return 0
       end
-      return
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1004,7 +1031,7 @@ class Morpheus::Cli::Instances
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID" ) do |val|
         options[:cloud] = val
       end
-      build_common_options(opts, options, [:list, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -1032,8 +1059,26 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.get(params)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        if options[:include_fields]
+          json_response = {"instances" => filter_data(json_response["instances"], options[:include_fields]) }
+        end
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"instances" => filter_data(json_response["instances"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
+      elsif options[:csv]
+        # merge stats to be nice here..
+        if json_response['instances']
+          all_stats = json_response['stats'] || {}
+          json_response['instances'].each do |it|
+            it['stats'] ||= all_stats[it['id'].to_s] || all_stats[it['id']]
+          end
+        end
+        puts records_as_csv(json_response['instances'], options)
       else
         instances = json_response['instances']
 
@@ -1048,12 +1093,55 @@ class Morpheus::Cli::Instances
         if params[:phrase]
           subtitles << "Search: #{params[:phrase]}".strip
         end
-        subtitle = subtitles.join(', ')
-        print "\n" ,cyan, bold, title, (subtitle.empty? ? "" : " - #{subtitle}"), "\n", "==================", reset, "\n\n"
+        print_h1 title, subtitles
         if instances.empty?
-          puts yellow,"No instances found.",reset
+          print yellow,"No instances found.",reset,"\n"
         else
-          print_instances_table(instances)
+          # print_instances_table(instances)
+          # server returns stats in a separate key stats => {"id" => {} }
+          # the id is a string right now..for some reason..
+          all_stats = json_response['stats'] || {} 
+          instances.each do |it|
+            if !it['stats']
+              found_stats = all_stats[it['id'].to_s] || all_stats[it['id']]
+              it['stats'] = found_stats # || {}
+            end
+          end
+
+          rows = instances.collect {|instance| 
+            stats = instance['stats']
+            cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
+            memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
+            storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
+            row = {
+              id: instance['id'],
+              name: instance['name'],
+              connection: format_instance_connection_string(instance),
+              environment: instance['instanceContext'],
+              nodes: instance['containers'].count,
+              status: format_instance_status(instance, cyan),
+              type: instance['instanceType']['name'],
+              group: !instance['group'].nil? ? instance['group']['name'] : nil,
+              cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil,
+              version: instance['instanceVersion'] ? instance['instanceVersion'] : '',
+              cpu: cpu_usage_str + cyan,
+              memory: memory_usage_str + cyan,
+              storage: storage_usage_str + cyan
+            }
+            row
+          }
+          columns = [:id, :name, :group, :cloud, :type, :version, :environment, :nodes, {:connection => {max_width: 20}}, :status]
+          term_width = current_terminal_width()
+          if term_width > 190
+            columns += [:cpu, :memory, :storage]
+          end
+          # custom pretty table columns ...
+          if options[:include_fields]
+            columns = options[:include_fields]
+          end
+          print cyan
+          print as_pretty_table(rows, columns, options)
+          print reset
           print_results_pagination(json_response)
         end
         print reset,"\n"
@@ -1095,8 +1183,8 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.destroy(instance['id'],query_params)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        print as_json(json_response, options), "\n"
+        return
       elsif !options[:quiet]
         list([])
       end
@@ -1126,8 +1214,8 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.firewall_disable(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        print as_json(json_response, options), "\n"
+        return
       elsif !options[:quiet]
         security_groups([args[0]])
       end
@@ -1157,8 +1245,8 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.firewall_enable(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        print as_json(json_response, options), "\n"
+        return
       elsif !options[:quiet]
         security_groups([args[0]])
       end
@@ -1188,21 +1276,24 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.security_groups(instance['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        print as_json(json_response, options), "\n"
         return
       end
       securityGroups = json_response['securityGroups']
-      print "\n" ,cyan, bold, "Morpheus Security Groups for Instance: #{instance['name']}\n","==================", reset, "\n\n"
-      print cyan, "Firewall Enabled=#{json_response['firewallEnabled']}\n\n"
+      print_h1 "Morpheus Security Groups for Instance: #{instance['name']}"
+      print cyan
+      print_description_list({"Firewall Enabled" => lambda {|it| format_boolean it['firewallEnabled'] } }, json_response)
+      #print cyan, "Firewall Enabled=#{json_response['firewallEnabled']}\n\n"
       if securityGroups.empty?
-        puts yellow,"No security groups currently applied.",reset
+        print yellow,"\n","No security groups currently applied.",reset,"\n"
       else
+        print "\n"
         securityGroups.each do |securityGroup|
           print cyan, "=  #{securityGroup['id']} (#{securityGroup['name']}) - (#{securityGroup['description']})\n"
         end
+        print "\n"
       end
-      print reset,"\n"
+      print reset, "\n"
 
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -1245,8 +1336,7 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.apply_security_groups(instance['id'], payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        print as_json(json_response, options), "\n"
         return
       end
       if !options[:quiet]
@@ -1303,8 +1393,8 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.workflow(instance['id'],workflow['id'], workflow_payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        print as_json(json_response, options), "\n"
+        return
       else
         puts "Running workflow..."
       end
@@ -1358,12 +1448,11 @@ class Morpheus::Cli::Instances
       end
       json_response = @instances_interface.import_snapshot(instance['id'], payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
         puts "Snapshot import initiated."
       end
-      return
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1405,30 +1494,25 @@ class Morpheus::Cli::Instances
     end
   end
 
-  def print_instances_table(instances, opts={})
-    table_color = opts[:color] || cyan
-    rows = instances.collect do |instance|
-      connection_string = ''
-      if !instance['connectionInfo'].nil? && instance['connectionInfo'].empty? == false
-        connection_string = "#{instance['connectionInfo'][0]['ip']}:#{instance['connectionInfo'][0]['port']}"
-      end
-      {
-        id: instance['id'],
-        name: instance['name'],
-        connection: connection_string,
-        environment: instance['instanceContext'],
-        nodes: instance['containers'].count,
-        status: format_instance_status(instance, table_color),
-        type: instance['instanceType']['name'],
-        group: !instance['group'].nil? ? instance['group']['name'] : nil,
-        cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil
-      }
-    end
-
-    print table_color
-    tp rows, :id, :name, :group, :cloud, :type, :environment, :nodes, :connection, :status
-    print reset
-  end
+  # def print_instances_table(instances, opts={})
+  #   table_color = opts[:color] || cyan
+  #   rows = instances.collect {|instance| 
+  #     {
+  #       id: instance['id'],
+  #       name: instance['name'],
+  #       connection: format_instance_connection_string(instance),
+  #       environment: instance['instanceContext'],
+  #       nodes: instance['containers'].count,
+  #       status: format_instance_status(instance, table_color),
+  #       type: instance['instanceType']['name'],
+  #       group: !instance['group'].nil? ? instance['group']['name'] : nil,
+  #       cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil
+  #     }
+  #   }
+  #   print table_color
+  #   tp rows, :id, :name, :group, :cloud, :type, :environment, :nodes, :connection, :status
+  #   print reset
+  # end
 
   def format_instance_status(instance, return_color=cyan)
     out = ""
@@ -1445,6 +1529,12 @@ class Morpheus::Cli::Instances
     out
   end
 
+  def format_instance_connection_string(instance)
+    if !instance['connectionInfo'].nil? && instance['connectionInfo'].empty? == false
+      connection_string = "#{instance['connectionInfo'][0]['ip']}:#{instance['connectionInfo'][0]['port']}"
+    end
+  end
+
   def clone_instance_option_types(connected=true)
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for the new instance'},