morpheus-cli 5.0.1 → 5.2.3

data/lib/morpheus/cli/groups.rb

@@ -52,7 +52,7 @@ class Morpheus::Cli::Groups
     end
     json_response = @groups_interface.list(params)
     exit_code, err = 0, nil
-    render_response(json_response, options) do
+    render_response(json_response, options, "groups") do
       groups = json_response['groups']
       subtitles = []
       subtitles += parse_list_subtitles(options)

data/lib/morpheus/cli/health_command.rb

@@ -30,6 +30,7 @@ class Morpheus::Cli::HealthCommand
       opts.on('-a', '--all', "Display all details: CPU, Memory, Database, etc." ) do
         options[:details] = true
         options[:show_cpu] = true
+        options[:show_threads] = true
         options[:show_memory] = true
         options[:show_database] = true
         options[:show_elastic] = true
@@ -47,6 +48,9 @@ class Morpheus::Cli::HealthCommand
       opts.on('--cpu', "Display CPU details" ) do
         options[:show_cpu] = true
       end
+      opts.on('--threads', "Display Thread details" ) do
+        options[:show_threads] = true
+      end
       opts.on('--memory', "Display Memory details" ) do
         options[:show_memory] = true
       end
@@ -184,6 +188,59 @@ class Morpheus::Cli::HealthCommand
         end
       end
 
+      # Threads ()
+      if options[:show_threads]
+        print_h2 "Threads", options
+        if health['threads'].nil?
+          print yellow,"No thread information returned.",reset,"\n\n"
+        else
+          print cyan
+
+          thread_summary_columns = {
+            "Thread Count" => lambda {|it| it['totalThreads'].size rescue '' },
+            "Busy Threads" => lambda {|it| it['busyThreads'].size rescue '' },
+            "Running Threads" => lambda {|it| it['runningThreads'].size rescue '' },
+            "Blocked Threads" => lambda {|it| it['blockedThreads'].size rescue '' },
+          }
+          print_description_list(thread_summary_columns, health['threads'], options)
+
+
+          thread_columns = [
+            {"Name".upcase => lambda {|it| it['name']} },
+            {"Status".upcase => lambda {|it| 
+              # hrmm
+              status_string = (it['status'] || it['state']).to_s.downcase
+              status_color = cyan
+              # if status_string.include?('waiting')
+              #   status_color = yellow
+              # end
+              "#{status_color}#{status_string.upcase}#{cyan}"
+            } },
+            # {"CPU Time" => lambda {|it| it['cpuTime'].to_s } },
+            # {"CPU Time" => lambda {|it| format_human_duration(it['cpuTime'].to_f / 1000) rescue '' } },
+            {"CPU Percent" => lambda {|it| it['cpuPercent'].to_i.to_s + '%' } }
+          ]
+
+          if health['threads']['busyThreads'] && health['threads']['busyThreads'].size > 0
+            print_h2 "Busy Threads"
+            print cyan
+            print as_pretty_table(health['threads']['busyThreads'], thread_columns, options)
+          end
+
+          if health['threads']['runningThreads'] && health['threads']['runningThreads'].size > 0
+            print_h2 "Running Threads"
+            print cyan
+            print as_pretty_table(health['threads']['runningThreads'], thread_columns, options)
+          end
+
+          if health['threads']['blockedThreads'] && health['threads']['blockedThreads'].size > 0
+            print_h2 "Blocked Threads"
+            print cyan
+            print as_pretty_table(health['threads']['blockedThreads'], thread_columns, options)
+          end
+        end
+      end
+
       # Memory
       if options[:show_memory]
         if health['memory'].nil?

data/lib/morpheus/cli/hosts.rb

@@ -17,7 +17,7 @@ class Morpheus::Cli::Hosts
   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, :snapshots,
+                       :run_workflow, :make_managed, :upgrade_agent, :snapshots, :software,
                        {:'types' => :list_types},
                        {:exec => :execution_request},
                        :wiki, :update_wiki
@@ -54,13 +54,6 @@ class Morpheus::Cli::Hosts
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on('-a', '--all', "Display all details: memory and storage usage used / max values." ) do
-        options[:details] = true
-      end
-      opts.on('--details', "Display all details: alias for --all" ) do
-        options[:details] = true
-      end
-      opts.add_hidden_option('--details')
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
       end
@@ -86,6 +79,17 @@ class Morpheus::Cli::Hosts
         # params[:clusterId] = val
         options[:cluster] = val
       end
+      opts.on( '--plan NAME', String, "Filter by Plan name(s)" ) do |val|
+        # commas used in names a lot so use --plan one --plan two
+        params['plan'] ||= []
+        params['plan'] << val
+      end
+      opts.on( '--plan-id ID', String, "Filter by Plan id(s)" ) do |val|
+        params['planId'] = parse_id_list(val)
+      end
+      opts.on( '--plan-code CODE', String, "Filter by Plan code(s)" ) do |val|
+        params['planCode'] = parse_id_list(val)
+      end
       opts.on( '', '--vm', "Show only virtual machines" ) do |val|
         params[:vm] = true
       end
@@ -113,9 +117,6 @@ class Morpheus::Cli::Hosts
       opts.on( '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
-      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
-        options[:details] = true
-      end
       opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
         val.split(",").each do |value_pair|
           k,v = value_pair.strip.split("=")
@@ -130,6 +131,12 @@ class Morpheus::Cli::Hosts
       opts.on('--non-tag-compliant', "Displays only servers with tag compliance warnings." ) do
         params[:tagCompliant] = false
       end
+      opts.on('--stats', "Display values for memory and storage usage used / max values." ) do
+        options[:stats] = true
+      end
+      opts.on('-a', '--details', "Display all details: hostname, private ip, plan, stats, etc." ) do
+        options[:details] = true
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List hosts."
     end
@@ -258,7 +265,7 @@ class Morpheus::Cli::Hosts
             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})
-            if options[:details]
+            if options[:details] || options[:stats]
               if stats['maxMemory'] && stats['maxMemory'].to_i != 0
                 memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(8, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
               end
@@ -269,12 +276,14 @@ class Morpheus::Cli::Hosts
             row = {
               id: server['id'],
               name: server['name'],
+              external_name: server['externalName'],
               hostname: server['hostname'],
               platform: server['serverOs'] ? server['serverOs']['name'].upcase : 'N/A',
               type: server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged',
               tenant: server['account'] ? server['account']['name'] : server['accountId'],
               owner: server['owner'] ? server['owner']['username'] : server['owner'],
               cloud: server['zone'] ? server['zone']['name'] : '',
+              plan: server['plan'] ? server['plan']['name'] : '',
               ip: server['externalIp'],
               internal_ip: server['internalIp'],
               nodes: server['containers'] ? server['containers'].size : '',
@@ -293,11 +302,13 @@ class Morpheus::Cli::Hosts
           columns = {
             "ID" => :id,
             "Name" => :name,
+            "External Name" => :external_name,
             "Hostname" => :hostname,
             "Type" => :type,
             "Owner" => :owner,
             "Tenant" => :tenant,
             "Cloud" => :cloud,
+            "Plan" => :plan,
             "IP" => :ip,
             "Private IP" => :internal_ip,
             "Nodes" => :nodes,
@@ -310,7 +321,9 @@ class Morpheus::Cli::Hosts
             "Updated" => :updated,
           }
           if options[:details] != true
+            columns.delete("External Name")
             columns.delete("Hostname")
+            columns.delete("Plan")
             columns.delete("Private IP")
             columns.delete("Owner")
             columns.delete("Tenant")
@@ -318,6 +331,10 @@ class Morpheus::Cli::Hosts
             columns.delete("Created")
             columns.delete("Updated")
           end
+          # hide External Name if there are none
+          if !servers.find {|it| it['externalName'] && it['externalName'] != it['name']}
+            columns.delete("External Name")
+          end
           if !multi_tenant
             columns.delete("Tenant")
           end
@@ -344,7 +361,7 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+      opts.on( '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
@@ -513,9 +530,10 @@ class Morpheus::Cli::Hosts
         puts records_as_csv([json_response['server']], options)
         return 0
       end
-      server = json_response['server']
+      server = json_response['server'] || json_response['host'] || {}
       #stats = server['stats'] || json_response['stats'] || {}
       stats = json_response['stats'] || {}
+      tags = server['tags'] || server['metadata']
       title = "Host Details"
       print_h1 title, [], options
       print cyan
@@ -524,6 +542,7 @@ class Morpheus::Cli::Hosts
         "Name" => 'name',
         "Hostname" => 'hostname',
         "Description" => 'description',
+        "Tags" => lambda {|it| tags ? format_metadata(tags) : '' },
         "Owner" => lambda {|it| it['owner'] ? it['owner']['username'] : '' },
         "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         #"Group" => lambda {|it| it['group'] ? it['group']['name'] : '' },
@@ -547,6 +566,7 @@ class Morpheus::Cli::Hosts
       # server_columns.delete("Tenant") if multi_tenant != true
       server_columns.delete("Cost") if server['hourlyCost'].to_f == 0
       server_columns.delete("Price") if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
+      server_columns.delete("Tags") if tags.nil? || tags.empty?
 
       print_description_list(server_columns, server)
 
@@ -973,6 +993,19 @@ class Morpheus::Cli::Hosts
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
       end
+      opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
+        options[:tags] = val
+      end
+      opts.on('--metadata LIST', String, "Alias for --tags.") do |val|
+        options[:tags] = val
+      end
+      opts.add_hidden_option('--metadata')
+      opts.on('--add-tags TAGS', String, "Add Tags in the format 'name:value, name:value'. This will only add/update tags.") do |val|
+        options[:add_tags] = val
+      end
+      opts.on('--remove-tags TAGS', String, "Remove Tags in the format 'name, name:value'. This removes tags, the :value component is optional and must match if passed.") do |val|
+        options[:remove_tags] = val
+      end
       # opts.on('--created-by ID', String, "Created By User ID") do |val|
       #   params['createdById'] = val
       # end
@@ -991,6 +1024,18 @@ class Morpheus::Cli::Hosts
       new_group = nil
       passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       params.deep_merge!(passed_options) unless passed_options.empty?
+      # metadata tags
+      if options[:tags]
+        params['tags'] = parse_metadata(options[:tags])
+      else
+        # params['tags'] = prompt_metadata(options)
+      end
+      if options[:add_tags]
+        params['addTags'] = parse_metadata(options[:add_tags])
+      end
+      if options[:remove_tags]
+        params['removeTags'] = parse_metadata(options[:remove_tags])
+      end
       payload = nil
       if options[:payload]
         payload = options[:payload]
@@ -1902,7 +1947,8 @@ class Morpheus::Cli::Hosts
           snapshot_column_definitions = {
             "ID" => lambda {|it| it['id'] },
             "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['snapshotType'] ? (it['snapshotType']['name'] || it['snapshotType']['code']) : '' },
+            "Description" => lambda {|it| it['description'] },
+            # "Type" => lambda {|it| it['snapshotType'] },
             "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
             "Status" => lambda {|it| format_snapshot_status(it) }
           }
@@ -1919,6 +1965,55 @@ class Morpheus::Cli::Hosts
     end
   end
 
+  def software(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[host]")
+      build_standard_list_options(opts, options)
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    begin
+      server = find_host_by_name_or_id(args[0])
+      return 1 if server.nil?
+      params = {}
+      params.merge!(parse_list_options(options))
+      @servers_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.software(server['id'], params)
+        return
+      end
+      json_response = @servers_interface.software(server['id'], params)
+      software = json_response['software']
+      render_response(json_response, options, 'software') do
+        print_h1 "Software: #{server['name']}", [], options
+        if software.empty?
+          print cyan,"No software found",reset,"\n"
+        else
+          software_column_definitions = {
+            # "ID" => lambda {|it| it['id'] },
+            "Name" => lambda {|it| it['name'] },
+            "Version" => lambda {|it| it['packageVersion'] },
+            "Publisher" => lambda {|it| it['packagePublisher'] },
+            # "Release" => lambda {|it| it['packageRelease'] },
+            # "Type" => lambda {|it| it['packageType'] },
+            # "Architecture" => lambda {|it| it['architecture'] },
+            # "Install Date" => lambda {|it| format_local_dt(it['installDate']) },
+          }
+          print cyan
+          print as_pretty_table(software, software_column_definitions.upcase_keys!, options)
+          print_results_pagination({size: software.size, total: software.size})
+        end
+        print reset, "\n"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
   def find_host_by_id(id)
@@ -2071,7 +2166,7 @@ class Morpheus::Cli::Hosts
    def make_managed_option_types(connected=true)
     [
       #{'fieldName' => 'account', 'fieldLabel' => 'Account', 'type' => 'select', 'optionSource' => 'accounts', 'required' => true},
-      {'fieldName' => 'sshUsername', 'fieldLabel' => 'SSH Username', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'sshUsername', 'fieldLabel' => 'SSH Username', 'type' => 'text'},
       {'fieldName' => 'sshPassword', 'fieldLabel' => 'SSH Password', 'type' => 'password', 'required' => false},
       {'fieldName' => 'serverOs', 'fieldLabel' => 'OS Type', 'type' => 'select', 'optionSource' => 'osTypes', 'required' => false},
     ]

data/lib/morpheus/cli/instances.rb

@@ -19,7 +19,7 @@ class Morpheus::Cli::Instances
                        :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, 
                        :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
                        :backup, :backups, :resize, :clone, :envs, :setenv, :delenv, 
-                       :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :snapshots,
+                       :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :snapshot, :snapshots,
                        :console, :status_check, {:containers => :list_containers}, 
                        :scaling, {:'scaling-update' => :scaling_update},
                        :wiki, :update_wiki,
@@ -80,9 +80,6 @@ class Morpheus::Cli::Instances
         options[:owner] = val
       end
       opts.add_hidden_option('--created-by')
-      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
-        options[:details] = true
-      end
       opts.on('--status STATUS', "Filter by status i.e. provisioning,running,starting,stopping") do |val|
         params['status'] = (params['status'] || []) + val.to_s.split(',').collect {|s| s.strip }.select {|s| s != "" }
       end
@@ -92,6 +89,17 @@ class Morpheus::Cli::Instances
       opts.on('--pending-removal-only', "Only instances pending removal.") do
         options[:deleted] = true
       end
+      opts.on( '--plan NAME', String, "Filter by Plan name(s)" ) do |val|
+        # commas used in names a lot so use --plan one --plan two
+        params['plan'] ||= []
+        params['plan'] << val
+      end
+      opts.on( '--plan-id ID', String, "Filter by Plan id(s)" ) do |val|
+        params['planId'] = parse_id_list(val)
+      end
+      opts.on( '--plan-code CODE', String, "Filter by Plan code(s)" ) do |val|
+        params['planCode'] = parse_id_list(val)
+      end
       opts.on('--labels label',String, "Filter by labels (keywords).") do |val|
         val.split(",").each do |k|
           options[:labels] ||= []
@@ -106,6 +114,12 @@ class Morpheus::Cli::Instances
           options[:tags][k] << (v || '')
         end
       end
+      opts.on('--stats', "Display values for memory and storage usage used / max values." ) do
+        options[:stats] = true
+      end
+      opts.on('-a', '--details', "Display all details: plan, stats, etc" ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List instances."
     end
@@ -216,7 +230,7 @@ class Morpheus::Cli::Instances
             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})
-            if options[:details]
+            if options[:details] || options[:stats]
               if stats['maxMemory'] && stats['maxMemory'].to_i != 0
                 memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(8, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
               end
@@ -234,8 +248,9 @@ class Morpheus::Cli::Instances
               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,
+              group: instance['group'] ? instance['group']['name'] : nil,
+              cloud: instance['cloud'] ? instance['cloud']['name'] : nil,
+              plan: instance['plan'] ? instance['plan']['name'] : '',
               version: instance['instanceVersion'] ? instance['instanceVersion'] : '',
               created: format_local_dt(instance['dateCreated']),
               cpu: cpu_usage_str + cyan,
@@ -249,12 +264,13 @@ class Morpheus::Cli::Instances
               {:created => {:display_name => "CREATED"}}, 
               # {:tenant => {:display_name => "TENANT"}}, 
               {:user => {:display_name => "OWNER", :max_width => 20}}, 
+              :plan,
               :nodes, {:connection => {:max_width => 30}}, :status, :cpu, :memory, :storage]
           # custom pretty table columns ... this is handled in as_pretty_table now(), 
           # todo: remove all these.. and try to always pass rows as the json data itself..
-          # if options[:include_fields]
-          #   columns = options[:include_fields]
-          # end
+          if options[:details] != true
+            columns.delete(:plan)
+          end
           print cyan
           print as_pretty_table(rows, columns, options)
           print reset
@@ -443,17 +459,58 @@ class Morpheus::Cli::Instances
       options[:instance_name] = args[0]
     end
 
-    # use active group by default
-    options[:group] ||= @active_group_id
-    options[:select_datastore] = true
-    options[:name_required] = true
     begin
       payload = nil
       if options[:payload]
         payload = options[:payload]
         # support -O OPTION switch on top of --payload
         payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # obviously should support every option that prompt supports on top of -- payload as well
+        # group, cloud and type for now
+        # todo: also support :layout, service_plan, :resource_pool, etc.
+        group = nil
+        if options[:group]
+          group = find_group_by_name_or_id_for_provisioning(options[:group])
+          if group.nil?
+            return 1, "group not found by #{options[:group]}"
+          end
+          #payload["siteId"] = group["id"]
+          payload.deep_merge!({"instance" => {"site" => {"id" => group["id"]} } })
+        end
+        if options[:cloud]
+          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+          if cloud.nil?
+            return 1, "cloud not found by #{options[:cloud]}"
+          end
+          payload["zoneId"] = cloud["id"]
+          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        end
+        if options[:cloud]
+          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+          if cloud.nil?
+            return 1, "cloud not found by #{options[:cloud]}"
+          end
+          payload["zoneId"] = cloud["id"]
+          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        end
+        if options[:instance_type_code]
+          # should just use find_instance_type_by_name_or_id
+          # note that the api actually will match name name or code
+          instance_type = (options[:instance_type_code].to_s =~ /\A\d{1,}\Z/) ? find_instance_type_by_id(options[:instance_type_code]) : find_instance_type_by_code(options[:instance_type_code])
+          if instance_type.nil?
+            return 1, "instance type not found by #{options[:cloud]}"
+          end
+          payload.deep_merge!({"instance" => {"type" => instance_type["code"] } })
+          payload.deep_merge!({"instance" => {"instanceType" => {"code" => instance_type["code"]} } })
+        end
+
       else
+        # use active group by default
+        options[:group] ||= @active_group_id
+        options[:select_datastore] = true
+        options[:name_required] = true
         # prompt for all the instance configuration options
         # this provisioning helper method handles all (most) of the parsing and prompting
         # and it relies on the method to exit non-zero on error, like a bad CLOUD or TYPE value
@@ -546,16 +603,17 @@ class Morpheus::Cli::Instances
       opts.on('--group GROUP', String, "Group Name or ID") do |val|
         options[:group] = val
       end
-      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
-        options[:metadata] = val
+      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        params['labels'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
       end
-      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
-        options[:metadata] = val
+      opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
+        options[:tags] = val
       end
-      opts.add_hidden_option('--metadata')
-      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        # todo switch this from 'tags' to 'labels'
-        params['tags'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      opts.on('--add-tags TAGS', String, "Add Tags in the format 'name:value, name:value'. This will only add/update tags.") do |val|
+        options[:add_tags] = val
+      end
+      opts.on('--remove-tags TAGS', String, "Remove Tags in the format 'name, name:value'. This removes tags, the :value component is optional and must match if passed.") do |val|
+        options[:remove_tags] = val
       end
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
@@ -611,32 +669,17 @@ class Morpheus::Cli::Instances
         payload['instance']['site'] = {'id' => group['id']}
       end
       # metadata tags
-      # if options[:options]['metadata'].is_a?(Array) && !options[:metadata]
-      #   options[:metadata] = options[:options]['metadata']
-      # end
-      if options[:metadata]
-        metadata = []
-        if options[:metadata] == "[]" || options[:metadata] == "null"
-          payload['instance']['metadata'] = []
-        elsif options[:metadata].is_a?(Array)
-          payload['instance']['metadata'] = options[:metadata]
-        else
-          # parse string into format name:value, name:value
-          # merge IDs from current metadata
-          # todo: should allow quoted semicolons..
-          metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
-          metadata_list = metadata_list.collect do |it|
-            metadata_pair = it.split(":")
-            if metadata_pair.size == 1 && it.include?("=")
-              metadata_pair = it.split("=")
-            end
-            row = {}
-            row['name'] = metadata_pair[0].to_s.strip
-            row['value'] = metadata_pair[1].to_s.strip
-            row
-          end
-          payload['instance']['metadata'] = metadata_list
-        end
+      if options[:tags]
+        # api version 4.2.5 and later supports tags, older versions expect metadata
+        # todo: use tags instead like everywhere else
+        # payload['instance']['tags'] = parse_metadata(options[:tags])
+        payload['instance']['metadata'] = parse_metadata(options[:tags])
+      end
+      if options[:add_tags]
+        payload['instance']['addTags'] = parse_metadata(options[:add_tags])
+      end
+      if options[:remove_tags]
+        payload['instance']['removeTags'] = parse_metadata(options[:remove_tags])
       end
       if payload['instance'].empty? && params.empty? && options[:owner].nil?
         raise_command_error "Specify at least one option to update.\n#{optparse}"
@@ -1237,7 +1280,18 @@ class Morpheus::Cli::Instances
       instance = json_response['instance']
       stats = instance['stats'] || json_response['stats'] || {}
       # load_balancers = json_response['loadBalancers'] || {}
-
+      # metadata tags used to be returned as metadata and are now returned as tags
+      # the problem is tags is what we used to call Labels (keywords)
+      # the api will change to tags and labels, so handle the old format as long as metadata is returned.
+      labels = nil
+      tags = nil
+      if instance.key?('labels')
+        labels = instance['labels']
+        tags = instance['tags']
+      else
+        labels = instance['tags']
+        tags = instance['metadata']
+      end
       # containers are fetched via separate api call
       containers = nil
       if options[:include_containers]
@@ -1278,8 +1332,8 @@ class Morpheus::Cli::Instances
         # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Environment" => 'instanceContext',
-        "Labels" => lambda {|it| it['tags'] ? it['tags'].join(',') : '' },
-        "Metadata" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
+        "Labels" => lambda {|it| labels ? labels.join(',') : '' },
+        "Tags" => lambda {|it| tags ? tags.collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
         "Owner" => lambda {|it| 
           if it['owner']
             (it['owner']['username'] || it['owner']['id'])
@@ -1298,11 +1352,14 @@ class Morpheus::Cli::Instances
         "Connection" => lambda {|it| format_instance_connection_string(it) },
         "Status" => lambda {|it| format_instance_status(it) }
       }
+      description_cols.delete("Labels") if labels.nil? || labels.empty?
+      description_cols.delete("Tags") if tags.nil? || tags.empty?
       description_cols.delete("Power Schedule") if instance['powerSchedule'].nil?
       description_cols.delete("Expire Date") if instance['expireDate'].nil?
       description_cols.delete("Shutdown Date") if instance['shutdownDate'].nil?
       description_cols["Removal Date"] = lambda {|it| format_local_dt(it['removalDate'])} if instance['status'] == 'pendingRemoval'
       description_cols.delete("Last Deployment") if instance['lastDeploy'].nil?
+      #description_cols.delete("Environment") if instance['instanceContext'].nil?
       print_description_list(description_cols, instance)
 
       if instance['statusMessage']
@@ -2616,6 +2673,48 @@ class Morpheus::Cli::Instances
     end
   end
 
+  def snapshot(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      opts.on( '--name VALUE', String, "Snapshot Name. Default is server name + timestamp" ) do |val|
+        options[:options]['name'] = val
+      end
+      opts.on( '--description VALUE', String, "Snapshot Description." ) do |val|
+        options[:options]['description'] = val
+      end
+      build_standard_add_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Create a snapshot for an instance.
+[instance] is required. This is the name or id of an instance
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    instance = find_instance_by_name_or_id(args[0])
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to snapshot the instance '#{instance['name']}'?", options)
+      exit 1
+    end
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'snapshot' => parse_passed_options(options)})
+    else
+      payload.deep_merge!({'snapshot' => parse_passed_options(options)})
+    end
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.snapshot(instance['id'], payload)
+      return
+    end
+    json_response = @instances_interface.snapshot(instance['id'], payload)
+    render_response(json_response, options, 'snapshots') do
+      print_green_success "Snapshot initiated."
+    end
+    return 0, nil
+  end
+
   def remove(args)
     options = {}
     query_params = {}
@@ -2925,6 +3024,10 @@ class Morpheus::Cli::Instances
       # no pagination yet
       # build_standard_list_options(opts, options)
       build_standard_get_options(opts, options)
+            opts.footer = <<-EOT
+List snapshots for an instance.
+[instance] is required. This is the name or id of an instance
+EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -2947,7 +3050,8 @@ class Morpheus::Cli::Instances
           snapshot_column_definitions = {
             "ID" => lambda {|it| it['id'] },
             "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['snapshotType'] ? (it['snapshotType']['name'] || it['snapshotType']['code']) : '' },
+            "Description" => lambda {|it| it['description'] },
+            # "Type" => lambda {|it| it['snapshotType'] },
             "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
             "Status" => lambda {|it| format_snapshot_status(it) }
           }
@@ -3876,51 +3980,6 @@ private
     end
   end
 
-  def format_instance_status(instance, return_color=cyan)
-    out = ""
-    status_string = instance['status'].to_s
-    if status_string == 'running'
-      out << "#{green}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'provisioning'
-      out << "#{cyan}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'stopped' or status_string == 'failed'
-      out << "#{red}#{status_string.upcase}#{return_color}"
-    else
-      out << "#{yellow}#{status_string.upcase}#{return_color}"
-    end
-    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 format_container_status(container, return_color=cyan)
-    out = ""
-    status_string = container['status'].to_s
-    if status_string == 'running'
-      out << "#{green}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'provisioning'
-      out << "#{cyan}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'stopped' or status_string == 'failed'
-      out << "#{red}#{status_string.upcase}#{return_color}"
-    else
-      out << "#{yellow}#{status_string.upcase}#{return_color}"
-    end
-    out
-  end
-
-  def format_container_connection_string(container)
-    if !container['ports'].nil? && container['ports'].empty? == false
-      connection_string = "#{container['ip']}:#{container['ports'][0]['external']}"
-    else
-      # eh? more logic needed here i think, see taglib morph:containerLocationMenu
-      connection_string = "#{container['ip']}"
-    end
-  end
-
   def instance_scaling_option_types(instance=nil)
     
     # Group
@@ -3974,17 +4033,6 @@ private
     list
   end
 
-  def format_instance_container_display_name(instance, plural=false)
-    #<span class="info-label">${[null,'docker'].contains(instance.layout?.provisionType?.code) ? 'Containers' : 'Virtual Machines'}:</span> <span class="info-value">${instance.containers?.size()}</span>
-    v = plural ? "Containers" : "Container"
-    if instance && instance['layout'] && instance['layout'].key?("provisionTypeCode")
-      if [nil, 'docker'].include?(instance['layout']["provisionTypeCode"])
-        v = plural ? "Virtual Machines" : "Virtual Machine"
-      end
-    end
-    return v
-  end
-
   def print_instance_threshold_description_list(instance_threshold)
     description_cols = {
       # "Instance" => lambda {|it| "#{instance['id']} - #{instance['name']}" },