morpheus-cli 5.5.1.4 → 5.5.2

data/lib/morpheus/cli/commands/library_cluster_layouts_command.rb

@@ -33,6 +33,12 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.on('--technology VALUE', String, "Filter by technology") do |val|
         params['provisionType'] = val
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List cluster layouts."
     end
@@ -77,10 +83,11 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
               name: layout['name'],
               cloud_type: layout_cloud_type(layout),
               version: layout['computeVersion'],
-              description: layout['description']
+              description: layout['description'],
+              labels: format_list(layout['labels'], '', 3)
           }
         end
-        print as_pretty_table(rows, [:id, :name, :cloud_type, :version, :description], options)
+        print as_pretty_table(rows, [:id, :name, :cloud_type, :version, :description, :labels], options)
         print_results_pagination(json_response, {:label => "node type", :n_label => "node types"})
       end
       print reset,"\n"
@@ -153,6 +160,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
         "Cloud Type" => lambda {|it| layout_cloud_type(it)},
         "Cluster Type" => lambda {|it| it['groupType'] ? it['groupType']['name'] : nil},
         "Technology" => lambda {|it| it['provisionType'] ? it['provisionType']['code'] : nil},
+        "Labels" => lambda {|it| format_list(it['labels'], '') },
         "Minimum Memory" => lambda {|it| printable_byte_size(it['memoryRequirement'])},
         "Workflow" => lambda {|it| it['taskSets'] && it['taskSets'].count > 0 ? it['taskSets'][0]['name'] : nil},
         "Description" => lambda {|it| it['description']},
@@ -220,6 +228,9 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.on('-n', '--name VALUE', String, "Name for this cluster layout") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-D', '--description VALUE', String, "Description") do |val|
         params['description'] = val
       end
@@ -487,6 +498,9 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.on('-n', '--name VALUE', String, "Name for this cluster layout") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-D', '--description VALUE', String, "Description") do |val|
         params['description'] = val
       end

data/lib/morpheus/cli/commands/library_container_scripts_command.rb

@@ -21,6 +21,12 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List container scripts."
     end
@@ -119,6 +125,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       description_cols = {
         "ID" => lambda {|it| it['id'] },
         "Name" => lambda {|it| it['name'] },
+        "Labels" => lambda {|it| format_list(it['labels']) rescue '' },
         "Type" => lambda {|it| format_container_script_type(it['scriptType']) },
         "Phase" => lambda {|it| format_container_script_phase(it['scriptPhase']) },
         "Run As User" => lambda {|it| it['runAsUser'] },
@@ -151,6 +158,9 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-t', '--type TYPE', "Script Type. i.e. bash, powershell. Default is bash.") do |val|
         params['scriptType'] = val
       end
@@ -242,6 +252,9 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('-t', '--type TYPE', "Script Type. i.e. bash, powershell. Default is bash.") do |val|
         params['scriptType'] = val
       end
@@ -411,6 +424,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
     columns = [
       {"ID" => lambda {|container_script| container_script['id'] } },
       {"NAME" => lambda {|container_script| container_script['name'] } },
+      {"LABELS" => lambda {|it| format_list(it['labels'], '', 3) rescue '' }},
       {"TYPE" => lambda {|container_script| format_container_script_type(container_script['scriptType']) } },
       {"PHASE" => lambda {|container_script| format_container_script_phase(container_script['scriptPhase']) } },
       {"OWNER" => lambda {|container_script| container_script['account'] ? container_script['account']['name'] : '' } },

data/lib/morpheus/cli/commands/library_container_templates_command.rb

@@ -22,6 +22,12 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -128,11 +134,13 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       description_cols = {
         "ID" => lambda {|it| it['id'] },
         "Name" => lambda {|it| it['name'] },
+        "Labels" => lambda {|it| format_list(it['labels']) rescue '' },
         "File Name" => lambda {|it| it['fileName'] },
         "File Path" => lambda {|it| it['filePath'] },
-        "Setting Category" => lambda {|it| it['settingCategory'] },
-        "Setting Name" => lambda {|it| it['settingName'] },
         "Phase" => lambda {|it| it['templatePhase'] },
+        "File Owner" => lambda {|it| it['fileOwner'] },
+        "Setting Name" => lambda {|it| it['settingName'] },
+        "Setting Category" => lambda {|it| it['settingCategory'] },
         "Owner" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         # "Enabled" => lambda {|it| format_boolean it['enabled'] },
         "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
@@ -156,33 +164,32 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
 
   def add(args)
     options = {}
-    params = {'templatePhase' => 'provision'}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
+      opts.on('--file-name VALUE', String, "File Name") do |val|
+        params['fileName'] = val
+      end
       opts.on('--fileName VALUE', String, "File Name") do |val|
         params['fileName'] = val
       end
-      opts.on('--filePath VALUE', String, "File Path") do |val|
+      opts.add_hidden_option('--fileName')
+      opts.on('--file-path VALUE', String, "File Path") do |val|
         params['filePath'] = val
       end
-      # opts.on('--code VALUE', String, "Code") do |val|
-      #   params['code'] = val
-      # end
-      # opts.on('--description VALUE', String, "Description") do |val|
-      #   params['description'] = val
-      # end
-      opts.on('--phase [start|stop|postProvision]', String, "Template Phase. Default is 'provision'") do |val|
-        params['scriptPhase'] = val
+      opts.on('--filePath VALUE', String, "File Path") do |val|
+        params['filePath'] = val
       end
-      opts.on('--category VALUE', String, "Category") do |val|
-        params['category'] = val
+      opts.add_hidden_option('--filePath')
+      opts.on('--phase [preProvision|provision|postProvision]', String, "Template Phase. Default is 'provision'") do |val|
+        params['templatePhase'] = val
       end
-      # opts.on('--enabled [on|off]', String, "Can be used to disable it") do |val|
-      #   options['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
-      # end
       opts.on('--template TEXT', String, "Contents of the template.") do |val|
         params['template'] = val
       end
@@ -205,31 +212,51 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
         #   params['filePath'] = File.dirname(full_filename)
         # end
       end
+      opts.on('--file-owner VALUE', String, "File Owner") do |val|
+        params['fileOwner'] = val
+      end
+      opts.on('--fileOwner VALUE', String, "File Owner") do |val|
+        params['fileOwner'] = val
+      end
+      opts.add_hidden_option('--fileOwner')
+      opts.on('--setting-name VALUE', String, "Setting Name") do |val|
+        params['settingName'] = val
+      end
+      opts.on('--settingName VALUE', String, "Setting Name") do |val|
+        params['settingName'] = val
+      end
+      opts.add_hidden_option('--settingName')
+      opts.on('--setting-category VALUE', String, "Setting Category") do |val|
+        params['settingCategory'] = val
+      end
+      opts.on('--settingCategory VALUE', String, "Setting Category") do |val|
+        params['settingCategory'] = val
+      end
+      opts.add_hidden_option('--settingCategory')
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create a new file template." + "\n" +
                     "[name] is required and can be passed as --name instead."
     end
     optparse.parse!(args)
-    if args.count > 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, max:1)
     # support [name] as first argument
     if args[0]
       params['name'] = args[0]
     end
     connect(options)
     begin
-      # construct payload
       payload = nil
+      arbitrary_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      create_payload = {}
+      create_payload.deep_merge!(params)
+      create_payload.deep_merge!(arbitrary_options)
       if options[:payload]
         payload = options[:payload]
+        payload.deep_merge!({'containerTemplate' => create_payload}) unless create_payload.empty?
       else
-        # merge -O options into normally parsed options
-        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        # todo: prompt?
-        payload = {'containerTemplate' => params}
+        prompt_result = Morpheus::Cli::OptionTypes.prompt(add_container_template_option_types, params.deep_merge(options[:options] || {}), @api_client)
+        create_payload.deep_merge!(prompt_result)
+        payload = {'containerTemplate' => create_payload}
       end
       @container_templates_interface.setopts(options)
       if options[:dry_run]
@@ -260,25 +287,26 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
+      opts.on('--file-name VALUE', String, "File Name") do |val|
+        params['fileName'] = val
+      end
       opts.on('--fileName VALUE', String, "File Name") do |val|
         params['fileName'] = val
       end
+      opts.add_hidden_option('--fileName')
+      opts.on('--file-path VALUE', String, "File Path") do |val|
+        params['filePath'] = val
+      end
       opts.on('--filePath VALUE', String, "File Path") do |val|
         params['filePath'] = val
       end
-      # opts.on('--code VALUE', String, "Code") do |val|
-      #   params['code'] = val
-      # end
-      # opts.on('--description VALUE', String, "Description") do |val|
-      #   params['description'] = val
-      # end
-      opts.on('--phase [start|stop]', String, "Template Phase") do |val|
-        params['scriptPhase'] = val
+      opts.add_hidden_option('--filePath')
+      opts.on('--phase [preProvision|provision|postProvision]', String, "Template Phase. Default is 'provision'") do |val|
+        params['templatePhase'] = val
       end
-
-      # opts.on('--enabled [on|off]', String, "Can be used to disable it") do |val|
-      #   options['enabled'] = !(val.to_s == 'off' || val.to_s == 'false')
-      # end
       opts.on('--template TEXT', String, "Contents of the template.") do |val|
         params['template'] = val
       end
@@ -291,22 +319,53 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
           exit 1
         end
       end
+      opts.on('--file-owner VALUE', String, "File Owner") do |val|
+        params['fileOwner'] = val
+      end
+      opts.on('--fileOwner VALUE', String, "File Owner") do |val|
+        params['fileOwner'] = val
+      end
+      opts.add_hidden_option('--fileOwner')
+      opts.on('--setting-name VALUE', String, "Setting Name") do |val|
+        params['settingName'] = val
+      end
+      opts.on('--settingName VALUE', String, "Setting Name") do |val|
+        params['settingName'] = val
+      end
+      opts.add_hidden_option('--settingName')
+      opts.on('--setting-category VALUE', String, "Setting Category") do |val|
+        params['settingCategory'] = val
+      end
+      opts.on('--settingCategory VALUE', String, "Setting Category") do |val|
+        params['settingCategory'] = val
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Update a file template." + "\n" +
                     "[name] is required. This is the name or id of a file template."
     end
     optparse.parse!(args)
-    if args.count != 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     begin
       container_template = find_container_template_by_name_or_id(args[0])
       if container_template.nil?
         return 1
       end
+
+      payload = nil
+      arbitrary_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      update_payload = {}
+      update_payload.deep_merge!(params)
+      update_payload.deep_merge!(arbitrary_options)
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'containerTemplate' => update_payload}) unless update_payload.empty?
+      else
+        prompt_result = Morpheus::Cli::OptionTypes.no_prompt(update_container_template_option_types, params.deep_merge(options[:options] || {}), @api_client)
+        update_payload.deep_merge!(prompt_result)
+        payload = {'containerTemplate' => update_payload}
+      end
+
       # construct payload
       payload = nil
       if options[:payload]
@@ -343,10 +402,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       build_common_options(opts, options, [:json, :dry_run, :quiet, :auto_confirm])
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      return 127
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
 
     begin
@@ -427,6 +483,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
     columns = [
       {"ID" => lambda {|container_template| container_template['id'] } },
       {"NAME" => lambda {|container_template| container_template['name'] } },
+      {"LABELS" => lambda {|it| format_list(it['labels'], '', 3) rescue '' }},
       {"FILE NAME" => lambda {|container_template| container_template['fileName'] } },
       {"FILE PATH" => lambda {|container_template| container_template['filePath'] } },
       {"SETTING CATEGORY" => lambda {|container_template| container_template['settingCategory'] } },
@@ -439,5 +496,31 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
     print as_pretty_table(container_templates, columns, opts)
   end
 
+  def add_container_template_option_types()
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'fileName', 'fieldLabel' => 'File Name', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'filePath', 'fieldLabel' => 'File Path', 'type' => 'text', 'required' => false},
+      {'fieldName' => 'templatePhase', 'fieldLabel' => 'Phase', 'type' => 'select', 'optionSource' => 'containerTemplatePhases', 'defaultValue' => 'provision', 'required' => true},
+      {'fieldName' => 'template', 'fieldLabel' => 'Template', 'type' => 'code-editor', 'required' => true},
+      {'fieldName' => 'fileOwner', 'fieldLabel' => 'File Owner', 'type' => 'text'},
+      {'fieldName' => 'settingName', 'fieldLabel' => 'Setting Name', 'type' => 'text'},
+      {'fieldName' => 'settingCategory', 'fieldLabel' => 'Setting Category', 'type' => 'text'},
+    ]
+  end
+
+  def add_container_template_advanced_option_types()
+    []
+  end
+
+  def update_container_template_option_types()
+    option_types = add_container_template_option_types.collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+    option_types.reject! {|it| it['fieldName'] == 'type' }
+    option_types
+  end
+
+  def update_container_template_advanced_option_types()
+    add_container_template_advanced_option_types().collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+  end
 
 end

data/lib/morpheus/cli/commands/library_container_types_command.rb

@@ -41,6 +41,12 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.on('--category VALUE', String, "Filter by category") do |val|
         params['category'] = val
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List node types."
     end
@@ -151,6 +157,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         "Name" => lambda {|it| it['name'] },
         "Short Name" => lambda {|it| it['shortName'] },
         "Version" => lambda {|it| it['containerVersion'] },
+        "Labels" => lambda {|it| format_list(it['labels'], '', 3) },
         "Technology" => lambda {|it| format_container_type_technology(it) },
         "Category" => lambda {|it| it['category'] },
         "Virtual Image" => lambda {|it| 
@@ -246,6 +253,9 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.on('--name VALUE', String, "Name for this node type") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('--shortName VALUE', String, "Short Name") do |val|
         params['shortName'] = val
       end
@@ -396,14 +406,14 @@ class Morpheus::Cli::LibraryContainerTypesCommand
 
         # SCRIPTS
         if script_ids
-          params['scripts'] = script_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+          params['scripts'] = script_ids.collect {|it| it.to_i }
         else
           # prompt
         end
 
         # FILE TEMPLATES
         if file_template_ids
-          params['templates'] = file_template_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+          params['templates'] = file_template_ids.collect {|it| it.to_i }
         else
           # prompt
         end
@@ -455,6 +465,9 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.on('--name VALUE', String, "Name for this layout") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       opts.on('--shortName VALUE', String, "Short Name") do |val|
         params['shortName'] = val
       end
@@ -547,14 +560,14 @@ class Morpheus::Cli::LibraryContainerTypesCommand
 
         # SCRIPTS
         if script_ids
-          params['scripts'] = script_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+          params['scripts'] = script_ids.collect {|it| it.to_i }
         else
           # prompt
         end
 
         # FILE TEMPLATES
         if file_template_ids
-          params['templates'] = file_template_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+          params['templates'] = file_template_ids.collect {|it| it.to_i }
         else
           # prompt
         end

data/lib/morpheus/cli/commands/library_instance_types_command.rb

@@ -6,7 +6,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({:'update-logo' => :update_logo,:'update-dark-logo' => :update_dark_logo})
   register_subcommands({:'toggle-featured' => :toggle_featured})
 
   def initialize()
@@ -42,6 +42,12 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.on('--featured [true|false]',String, "Filter by featured.") do |val|
         params['featured'] = (val.to_s.downcase != 'false' && val.to_s.downcase != 'off')
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List instance types."
     end
@@ -147,6 +153,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         "Code" => lambda {|it| it['code'] },
         "Description" => lambda {|it| it['description'] },
         "Technology" => lambda {|it| format_instance_type_technology(it) },
+        "Labels" => lambda {|it| format_list(it['labels'], '') },
         "Category" => lambda {|it| it['category'].to_s.capitalize },
         # "Logo" => lambda {|it| it['logo'].to_s },
         "Visiblity" => lambda {|it| it['visibility'].to_s.capitalize },
@@ -179,6 +186,19 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         # print cyan,"No option types found for this layout.","\n",reset
       end
 
+      price_sets = instance_type['priceSets']
+      if price_sets && price_sets.size > 0
+        print_h2 "Price Sets"
+        price_set_columns = [
+          {"ID" => lambda {|it| it['id'] } },
+          {"NAME" => lambda {|it| it['name'] } },
+          {"PRICE UNIT" => lambda {|it| it['priceUnit'] } },
+        ]
+        print as_pretty_table(price_sets, price_set_columns)
+      else
+        # print cyan,"No price sets found for this instance type.","\n",reset
+      end
+
       instance_type_evars = instance_type['environmentVariables']
       if instance_type_evars && instance_type_evars.size > 0
         print_h2 "Environment Variables"
@@ -223,7 +243,8 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
           {"TECHNOLOGY" => lambda {|layout| 
             layout['provisionType'] ? layout['provisionType']['name'] : ''
           } },
-          {"DESCRIPTION" => lambda {|layout| layout['description'] } }
+          {"DESCRIPTION" => lambda {|layout| layout['description'] } },
+          {"LABELS" => lambda {|layout| format_list(layout['labels'], '') } }
         ]
         print as_pretty_table(instance_type_layouts, layout_columns)
       else
@@ -252,6 +273,12 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
           params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
+      opts.on('--price-sets [LIST]', Array, 'Price set(s), comma separated list of price set IDs') do |list|
+        params['priceSets'] = list.collect {|it| it.to_s.strip.empty? || !it.to_i ? nil : it.to_s.strip}.compact.uniq.collect {|it| {'id' => it.to_i}}
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Create a new instance type."
     end
@@ -344,6 +371,9 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_instance_type_option_types())
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
@@ -352,6 +382,9 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
           params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('--price-sets [LIST]', Array, 'Price set(s), comma separated list of price set IDs') do |list|
+        params['priceSets'] = list.collect {|it| it.to_s.strip.empty? || !it.to_i ? nil : it.to_s.strip}.compact.uniq.collect {|it| {'id' => it.to_i}}
+      end
       opts.footer = "Update an instance type." + "\n" +
                     "[name] is required. This is the name or id of a instance type."
     end
@@ -478,10 +511,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
                     "[file] is required. This is the path of the logo file"
     end
     optparse.parse!(args)
-    if args.count < 2
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:2)
     connect(options)
     layout_id = args[0]
     filename = args[1]
@@ -490,7 +520,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       exit 1 if instance_type.nil?
       logo_file = nil
       if filename == 'null'
-        filename = 'null' # clear it
+        logo_file = 'null' # clear it
       else
         filename = File.expand_path(filename)
         if !File.exists?(filename)
@@ -517,6 +547,54 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     end
   end
 
+  def update_dark_logo(args)
+    options = {}
+    params = {}
+    filename = nil
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[name] [file]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update the dark logo for an instance type." + "\n" +
+                    "[name] is required. This is the name or id of a instance type." + "\n" +
+                    "[file] is required. This is the path of the dark logo file"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    layout_id = args[0]
+    filename = args[1]
+    begin
+      instance_type = find_instance_type_by_name_or_id(layout_id)
+      exit 1 if instance_type.nil?
+      dark_logo_file = nil
+      if filename == 'null'
+        dark_logo_file = 'null' # clear it
+      else
+        filename = File.expand_path(filename)
+        if !File.exists?(filename)
+          print_red_alert "File not found: #{filename}"
+          exit 1
+        end
+        dark_logo_file = File.new(filename, 'rb')
+      end
+      @library_instance_types_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @library_instance_types_interface.dry.update_logo(instance_type['id'], nil, dark_logo_file)
+        return
+      end
+      json_response = @library_instance_types_interface.update_logo(instance_type['id'], nil, dark_logo_file)
+      if options[:json]
+        print JSON.pretty_generate(json_response), "\n"
+        return 0
+      end
+      print_green_success "Updated Instance Type #{instance_type['name']} dark logo"
+      _get(instance_type['id'], options)
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|