morpheus-cli 5.0.0 → 5.2.2

data/lib/morpheus/cli/setup.rb

@@ -9,7 +9,7 @@ class Morpheus::Cli::Setup
   
   set_command_name :setup
   
-  register_subcommands :init
+  # register_subcommands :init
 
   # no authorization needed
   def connect(options={})

data/lib/morpheus/cli/shell.rb

@@ -92,6 +92,13 @@ class Morpheus::Cli::Shell
   def recalculate_auto_complete_commands
     @morpheus_commands = Morpheus::Cli::CliRegistry.all.keys.reject {|k| [:shell].include?(k) }
     @shell_commands = [:clear, :history, :reload, :help, :exit]
+    @shell_command_descriptions = {
+      :clear => "Clear terminal output and move cursor to the top", 
+      :history => "View morpheus shell command history", 
+      :reload => "Reload the shell, can be useful when developing", 
+      :help => "Print this help", 
+      :exit => "Exit the morpheus shell"
+    }
     @alias_commands = Morpheus::Cli::CliRegistry.all_aliases.keys
     @exploded_commands = []
     Morpheus::Cli::CliRegistry.all.each do |cmd, klass|
@@ -336,6 +343,11 @@ class Morpheus::Cli::Shell
     #Morpheus::Logging::DarkPrinter.puts "Shell command: #{input}"
     input = input.to_s.strip
 
+    # allow pasting in commands that have 'morpheus ' prefix
+    if input[0..(prog_name.size)] == "#{prog_name} "
+      input = input[(prog_name.size + 1)..-1] || ""
+    end
+
     if !input.empty?
 
       if input == 'exit'
@@ -345,26 +357,36 @@ class Morpheus::Cli::Shell
         return 0
         #exit 0
       elsif input == 'help'
+        out = ""
         if @temporary_shell_mode
-          puts "You are in a (temporary) morpheus shell"
+          out << "You are in a (temporary) morpheus shell\n"
         else
-          puts "You are in a morpheus shell."
+          out << "You are in a morpheus shell.\n"
         end
-        puts "See the available commands below."
+        out <<  "See the available commands below.\n"
 
-        puts "\nCommands:"
+        out << "\nCommands:"
         # commands = @morpheus_commands + @shell_commands
-        @morpheus_commands.sort.each {|cmd|
-          puts "\t#{cmd.to_s}"
+        # @morpheus_commands.sort.each {|cmd|
+        #   out <<  "\t#{cmd.to_s}\n"
+        # }
+        sorted_commands = Morpheus::Cli::CliRegistry.all.values.sort { |x,y| x.command_name.to_s <=> y.command_name.to_s }
+        sorted_commands.each {|cmd|
+          # JD: not ready to show description yet, gotta finish filling in every command first
+          # maybe change 'View and manage' to something more concise like 'Manage'
+          # out << "\t#{cmd.command_name.to_s.ljust(28, ' ')} #{cmd.command_description}\n"
+          out << "\t#{cmd.command_name.to_s}\n"
         }
         #puts "\n"
-        puts "\nShell Commands:"
+        out <<  "\nShell Commands:\n"
         @shell_commands.each {|cmd|
-          puts "\t#{cmd.to_s}"
+          # out << "\t#{cmd.to_s.ljust(28, ' ')} #{@shell_command_descriptions ? @shell_command_descriptions[cmd] : ''}\n"
+          out <<  "\t#{cmd.to_s}\n"
         }
-        puts "\n"
-        puts "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
-        #print "\n"
+        out << "\n"
+        out << "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
+        out << "\n"
+        print out
         return 0
       elsif input =~ /^\s*#/
         Morpheus::Logging::DarkPrinter.puts "ignored comment: #{input}" if Morpheus::Logging.debug?

data/lib/morpheus/cli/tasks.rb

@@ -27,34 +27,31 @@ class Morpheus::Cli::Tasks
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
+      opts.banner = subcommand_usage("[search]")
       opts.on('-t', '--type x,y,z', Array, "Filter by task type code(s)") do |val|
         params['taskTypeCodes'] = val
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
+      opts.footer = "List tasks."
     end
     optparse.parse!(args)
+    connect(options)
     if args.count > 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+      options[:phrase] = args.join(" ")
     end
-    connect(options)
-    begin
-      params.merge!(parse_list_options(options))
-      @tasks_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @tasks_interface.dry.list(params)
-        return
-      end
-      json_response = @tasks_interface.list(params)
-
-      render_result = render_with_format(json_response, options, 'tasks')
-      return 0 if render_result
-      
+    params.merge!(parse_list_options(options))
+    @tasks_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @tasks_interface.dry.list(params)
+      return
+    end
+    json_response = @tasks_interface.list(params)
+    tasks = json_response['tasks']
+    render_response(json_response, options, 'tasks') do
       title = "Morpheus Tasks"
       subtitles = []
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
-      tasks = json_response['tasks']
       if tasks.empty?
         print cyan,"No tasks found.",reset,"\n"
       else
@@ -63,11 +60,13 @@ class Morpheus::Cli::Tasks
         print_results_pagination(json_response)
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    if tasks.empty?
+      return 1, "no tasks found"
+    else
+      return 0, nil
+    end
+    
   end
 
   def get(args)
@@ -334,10 +333,9 @@ class Morpheus::Cli::Tasks
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
-    if args.count > 1
-      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
-    end
+    #verify_args!(args:args, count:1, optparse:optparse)
     if args[0]
+      # task_name = args[0]
       task_name = args[0]
     end
     # if task_name.nil? || task_type_name.nil?
@@ -425,6 +423,9 @@ class Morpheus::Cli::Tasks
             has_file_content = true
             it['fieldContext'] = nil
             it['fieldName'] = 'file'
+            # this should be required right!? fix api optionType data plz
+            it['required'] = true
+            it['defaultValue'] = 'local'
           else
             if it['fieldContext'].nil? || it['fieldContext'] == ''
               it['fieldContext'] = 'taskOptions'
@@ -658,9 +659,7 @@ class Morpheus::Cli::Tasks
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
-    if args.count != 1
-      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
-    end
+    verify_args!(args:args, count:1, optparse:optparse)
     task_name = args[0]
     connect(options)
     begin
@@ -734,7 +733,6 @@ class Morpheus::Cli::Tasks
 
   def remove(args)
     params = {}
-    task_name = args[0]
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[task]")
@@ -744,10 +742,8 @@ class Morpheus::Cli::Tasks
       end
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, count:1, optparse:optparse)
+    task_name = args[0]
     connect(options)
     begin
       task = find_task_by_name_or_id(task_name)
@@ -820,6 +816,7 @@ class Morpheus::Cli::Tasks
     if args.count != 1
       raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
+    verify_args!(args:args, count:1, optparse:optparse)
     task_name = args[0]
     connect(options)
     begin

data/lib/morpheus/cli/usage_command.rb

@@ -2,18 +2,18 @@ require 'morpheus/cli/cli_command'
 
 # CLI command usages
 # UI is Costing - Usage
-# API is /billing and returns usages
+# API is /usage and returns usages
 class Morpheus::Cli::UsageCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::OptionSourceHelper
 
   set_command_name :'usage'
 
-  register_subcommands :list #, :list_tenant, :list_clouds, :list_zones, :list_zones, :list_zones, :list_zones
+  register_subcommands :list, :get
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @billing_interface = @api_client.billing
+    @usage_interface = @api_client.usage
   end
 
   def handle(args)
@@ -33,10 +33,10 @@ class Morpheus::Cli::UsageCommand
         options[:cloud] = val
       end
       opts.on('--start DATE', String, "Start date in the format YYYY-MM-DD.") do |val|
-        params['startDate'] = val #parse_time(val).utc.iso8601
+        params['startDate'] = val # parse_time(val).utc.iso8601
       end
-      opts.on('--end DATE', String, "End date in the format YYYY-MM-DD. Default is now.") do |val|
-        params['endDate'] = val #parse_time(val).utc.iso8601
+      opts.on('--end DATE', String, "End date in the format YYYY-MM-DD. Default is the current date.") do |val|
+        params['endDate'] = val # parse_time(val).utc.iso8601
       end
       opts.on('--sigdig DIGITS', "Significant digits when rounding cost values for display as currency. Default is 5.") do |val|
         options[:sigdig] = val.to_i
@@ -64,12 +64,12 @@ class Morpheus::Cli::UsageCommand
       }
     end
 
-    @billing_interface.setopts(options)
+    @usage_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @billing_interface.dry.list(params)
+      print_dry_run @usage_interface.dry.list(params)
       return
     end
-    json_response = @billing_interface.list(params)
+    json_response = @usage_interface.list(params)
     usages = json_response[usage_list_key]
     render_response(json_response, options, usage_list_key) do
       print_h1 "Morpheus Usages", parse_list_subtitles(options), options
@@ -85,6 +85,7 @@ class Morpheus::Cli::UsageCommand
           "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
           "End Date" => lambda {|it| format_local_dt(it['endDate']) },
           "Usage Status" => lambda {|it| format_usage_status(it) },
+          "Usage Cost" => lambda {|it| format_money(it['costDetails']['cost'], it['currency'] || 'USD', {sigdig: (options[:sigdig] || 5)}) },
           "Usage Price" => lambda {|it| format_money(it['price'], it['currency'] || 'USD', {sigdig: (options[:sigdig] || 5)}) },
         }
         print as_pretty_table(usages, list_columns.upcase_keys!, options)
@@ -99,6 +100,58 @@ class Morpheus::Cli::UsageCommand
     end
   end
 
+  def get(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[usage]")
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a specific usage.
+[usage] is required. This is the id of a usage record.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
+    connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, params, options)
+    end
+  end
+
+  def _get(id, params, options)
+    usage = nil
+    @usage_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @usage_interface.dry.get(id, params)
+      return
+    end
+    json_response = @usage_interface.get(id, params)
+    usage = json_response[usage_object_key]
+    render_response(json_response, options, usage_object_key) do
+      print_h1 "Usage Details", [], options
+      print cyan
+      show_columns = {
+        "ID" => 'id',
+        "Cloud" => 'zoneName',
+        "Type" => lambda {|it| format_usage_type(it) },
+        "Name" => 'name',
+        "Plan" => 'planName',
+        "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+        "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+        "Usage Status" => lambda {|it| format_usage_status(it) },
+        "Usage Cost" => lambda {|it| format_money(it['costDetails']['cost'], it['currency'] || 'USD', {sigdig: (options[:sigdig] || 5)}) },
+        "Usage Price" => lambda {|it| format_money(it['price'], it['currency'] || 'USD', {sigdig: (options[:sigdig] || 5)}) },
+      }
+      print_description_list(show_columns, usage)
+
+      # print_h2 "Applicable Prices"
+      
+      print reset,"\n"
+    end
+    return 0, nil
+  end
   
   private
 
@@ -141,9 +194,9 @@ class Morpheus::Cli::UsageCommand
     #return usage['status'].to_s.capitalize
     status_string = usage['status'].to_s
     if status_string == 'stopped'
-      return "#{cyan}#{status_string.upcase}#{return_color}"
+      return "#{red}#{status_string.upcase}#{return_color}"
     else
-      return "#{cyan}#{status_string.upcase}#{return_color}"
+      return "#{green}#{status_string.upcase}#{return_color}"
     end
   end
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.0.0"
+    VERSION = "5.2.2"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -8,6 +8,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::VirtualImages
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::ProvisioningHelper
 
   register_subcommands :list, :get, :add, :add_file, :remove_file, :update, :remove, :types => :virtual_image_types
   alias_subcommand :details, :get
@@ -27,6 +28,7 @@ class Morpheus::Cli::VirtualImages
   end
 
   def list(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
@@ -42,42 +44,48 @@ class Morpheus::Cli::VirtualImages
       opts.on('--system', "System Images" ) do
         options[:filterType] = 'System'
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on('--tags Name=Value',String, "Filter by tags (metadata name value pairs).") do |val|
+        val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          options[:tags] ||= {}
+          options[:tags][k] ||= []
+          options[:tags][k] << (v || '')
+        end
+      end
+      opts.on('-a', '--details', "Show more details." ) do
+        options[:details] = true
+      end
+      build_standard_list_options(opts, options)
       opts.footer = "List virtual images."
     end
     optparse.parse!(args)
     connect(options)
-    begin
-      params = {}
-      params.merge!(parse_list_options(options))
-      if options[:imageType]
-        params[:imageType] = options[:imageType]
-      end
-      if options[:filterType]
-        params[:filterType] = options[:filterType]
-      end
-      @virtual_images_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @virtual_images_interface.dry.get(params)
-        return
-      end
-      json_response = @virtual_images_interface.get(params)
-
-      if options[:json]
-        puts as_json(json_response, options, "virtualImages")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "virtualImages")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response["virtualImages"], options)
-        return 0
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    if options[:imageType]
+      params[:imageType] = options[:imageType]
+    end
+    if options[:filterType]
+      params[:filterType] = options[:filterType]
+    end
+    if options[:tags]
+      options[:tags].each do |k,v|
+        params['tags.' + k] = v
       end
-
-      
-      images = json_response['virtualImages']
+    end
+    @virtual_images_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @virtual_images_interface.dry.list(params)
+      return
+    end
+    json_response = @virtual_images_interface.list(params)
+    images = json_response['virtualImages']
+    render_response(json_response, options, 'virtualImages') do
       title = "Morpheus Virtual Images"
-      subtitles = []
+      subtitles = parse_list_subtitles(options)
       if options[:imageType]
         subtitles << "Image Type: #{options[:imageType]}".strip
       end
@@ -91,129 +99,188 @@ class Morpheus::Cli::VirtualImages
       if images.empty?
         print cyan,"No virtual images found.",reset,"\n"
       else
-        rows = images.collect do |image|
-          image_type = virtual_image_type_for_name_or_code(image['imageType'])
-          image_type_display = image_type ? "#{image_type['name']}" : image['imageType']
-          {name: image['name'], id: image['id'], type: image_type_display, source: image['userUploaded'] ? "#{green}UPLOADED#{cyan}" : (image['systemImage'] ? 'SYSTEM' : "#{white}SYNCED#{cyan}"), storage: !image['storageProvider'].nil? ? image['storageProvider']['name'] : 'Default', size: image['rawSize'].nil? ? 'Unknown' : "#{Filesize.from("#{image['rawSize']} B").pretty}"}
+        virtual_image_column_definitions = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Type" => lambda {|it| 
+            # yick, api should return the type with every virtualImage
+            image_type = virtual_image_type_for_name_or_code(it['imageType'])
+            image_type ? "#{image_type['name']}" : it['imageType']
+          },
+          "Operating System" => lambda {|it| it['osType'] ? it['osType']['name'] : "" }, 
+          "Storage" => lambda {|it| !it['storageProvider'].nil? ? it['storageProvider']['name'] : 'Default' }, 
+          "Size" => lambda {|it| it['rawSize'].nil? ? 'Unknown' : "#{Filesize.from("#{it['rawSize']} B").pretty}" },
+          "Visibility" => lambda {|it| it['visibility'] },
+          # "Tenant" => lambda {|it| it['account'].instance_of?(Hash) ? it['account']['name'] : it['ownerId'] },
+          "Tenants" => lambda {|it| format_list(it['accounts'].collect {|a| a['name'] }, '', 3) rescue '' },
+          "Source" => lambda {|it| format_virtual_image_source(it) }, 
+          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+          "Tags" => lambda {|it| it['tags'] ? it['tags'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
+        }
+        if json_response['multiTenant'] != true
+          virtual_image_column_definitions.delete("Visibility")
+          virtual_image_column_definitions.delete("Tenants")
+        end
+        if options[:details] != true
+          virtual_image_column_definitions.delete("Tags")
+          virtual_image_column_definitions.delete("Created")
+          virtual_image_column_definitions.delete("Updated")
         end
-        columns = [:id, :name, :type, :storage, :size, :source]
-        columns = options[:include_fields] if options[:include_fields]
-        print cyan
-        print as_pretty_table(rows, columns, options)
+        print as_pretty_table(images, virtual_image_column_definitions.upcase_keys!, options)
         print_results_pagination(json_response)
       end
       print reset,"\n"
-      
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    end
+    if images.empty?
+      return -1, "no virtual images found"
+    else
+      return 0, nil
     end
   end
 
   def get(args)
+    params = {}
     options = {}
-    show_details = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
-      opts.on('--details', "Show more details." ) do
-        show_details = true
-      end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "Get details about a virtual image." + "\n" +
-                    "[name] is required. This is the name or id of a virtual image."
+      opts.banner = subcommand_usage("[image]")
+      opts.on('-a', '--details', "Show more details." ) do
+        options[:details] = true
+      end
+      opts.on('--tags LIST', String, "Metadata tags in the format 'name:value, name:value'") do |val|
+        options[:tags] = val
+      end
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a virtual image.
+[image] is required. This is the name or id of a virtual image.
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
-    image_name = args[0]
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
-    begin
-      @virtual_images_interface.setopts(options)
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @virtual_images_interface.dry.get(args[0].to_i)
+    id_list = parse_id_list(args)
+    # lookup IDs if names are given
+    id_list = id_list.collect do |id|
+      if id.to_s =~ /\A\d{1,}\Z/
+        id
+      else
+        image = find_virtual_image_by_name_or_id(id)
+        if image
+          image['id']
         else
-          print_dry_run @virtual_images_interface.dry.get({name:args[0]})
+          raise_command_error "virtual image not found for name '#{id}'"
         end
-        return
-      end
-      image = find_virtual_image_by_name_or_id(image_name)
-      return 1 if image.nil?
-      # refetch
-      json_response = @virtual_images_interface.get(image['id'])
-      if options[:json]
-        puts as_json(json_response, options, "virtualImage")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "virtualImage")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv([json_response["virtualImage"]], options)
-        return 0
       end
+    end
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, params, options)
+    end
+  end
 
+  def _get(id, params, options)
+      @virtual_images_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @virtual_images_interface.dry.get(id.to_i)
+        return
+      end
+      json_response = @virtual_images_interface.get(id.to_i)
       image = json_response['virtualImage']
+      image_config = image['config'] || {}
+      image_volumes = image['volumes'] || []
       image_files = json_response['cloudFiles'] || json_response['files']
-
-
       image_type = virtual_image_type_for_name_or_code(image['imageType'])
       image_type_display = image_type ? "#{image_type['name']}" : image['imageType']
-      print_h1 "Virtual Image Details"
-      print cyan
-      description_cols = {
-        "ID" => 'id',
-        "Name" => 'name',
-        "Type" => lambda {|it| image_type_display },
-        "Storage" => lambda {|it| !image['storageProvider'].nil? ? image['storageProvider']['name'] : 'Default' }, 
-        "Size" => lambda {|it| image['rawSize'].nil? ? 'Unknown' : "#{Filesize.from("#{image['rawSize']} B").pretty}" },
-        "Source" => lambda {|it| image['userUploaded'] ? "#{green}UPLOADED#{cyan}" : (image['systemImage'] ? 'SYSTEM' : "#{white}SYNCED#{cyan}") }, 
-        # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-        # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-      }
-      advanced_description_cols = {
-        "OS Type" => lambda {|it| it['osType'] ? it['osType']['name'] : "" },
-        "Min Memory" => lambda {|it| it['minRam'].to_i != 0 ? Filesize.from("#{it['minRam']} B").pretty : "" },
-        "Cloud Init?" => lambda {|it| format_boolean it['osType'] },
-        "Install Agent?" => lambda {|it| format_boolean it['osType'] },
-        "SSH Username" => lambda {|it| it['sshUsername'] },
-        "SSH Password" => lambda {|it| it['sshPassword'] },
-        "User Data" => lambda {|it| it['userData'] },
-        "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
-        "Tenants" => lambda {|it| format_tenants(it['accounts']) },
-        "Auto Join Domain?" => lambda {|it| format_boolean it['isAutoJoinDomain'] },
-        "VirtIO Drivers Loaded?" => lambda {|it| format_boolean it['virtioSupported'] },
-        "VM Tools Installed?" => lambda {|it| format_boolean it['vmToolsInstalled'] },
-        "Force Guest Customization?" => lambda {|it| format_boolean it['isForceCustomization'] },
-        "Trial Version" => lambda {|it| format_boolean it['trialVersion'] },
-        "Sysprep Enabled?" => lambda {|it| format_boolean it['isSysprep'] },
-      }
-      if show_details
-        description_cols.merge!(advanced_description_cols)
-      end
-      print_description_list(description_cols, image)
-
-      if image_files
-        print_h2 "Files (#{image_files.size})"
-        # image_files.each {|image_file|
-        #   pretty_filesize = Filesize.from("#{image_file['size']} B").pretty
-        #   print cyan,"  =  #{image_file['name']} [#{pretty_filesize}]", "\n"
-        # }
-        image_file_rows = image_files.collect do |image_file|
-          
-          {filename: image_file['name'], size: Filesize.from("#{image_file['size']} B").pretty}
+      render_response(json_response, options, 'virtualImage') do
+        print_h1 "Virtual Image Details", [], options
+        description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Type" => lambda {|it| image_type_display },
+          "Operating System" => lambda {|it| it['osType'] ? it['osType']['name'] : "" }, 
+          "Storage" => lambda {|it| !image['storageProvider'].nil? ? image['storageProvider']['name'] : 'Default' }, 
+          "Size" => lambda {|it| image['rawSize'].nil? ? 'Unknown' : "#{Filesize.from("#{image['rawSize']} B").pretty}" },
+          "Azure Publisher" => lambda {|it| image_config['publisher'] },
+          "Azure Offer" => lambda {|it| image_config['offer'] },
+          "Azure Sku" => lambda {|it| image_config['sku'] },
+          "Azure Version" => lambda {|it| image_config['version'] },
+          "Source" => lambda {|it| format_virtual_image_source(it) }, 
+          "Tags" => lambda {|it| it['tags'] ? it['tags'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
+          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        }
+        description_cols.delete("Tags") if image['tags'].nil? || image['tags'].empty?
+        if image['imageType'] == "azure-reference" || image['imageType'] == "azure"
+          description_cols.delete("Size")
+          description_cols.delete("Storage")
+          description_cols["Source"] = lambda {|it| "#{bold}#{cyan}AZURE#{reset}#{cyan}" }
+        else
+          description_cols.delete("Azure Publisher")
+          description_cols.delete("Azure Sku")
+          description_cols.delete("Azure Offer")
+          description_cols.delete("Azure Version")
+        end
+        advanced_description_cols = {
+          #"OS Type" => lambda {|it| it['osType'] ? it['osType']['name'] : "" }, # displayed above as Operating System
+          "Min Memory" => lambda {|it| it['minRam'].to_i != 0 ? Filesize.from("#{it['minRam']} B").pretty : "" },
+          "Min Disk" => lambda {|it| it['minDisk'].to_i != 0 ? Filesize.from("#{it['minDisk']} B").pretty : "" },
+          "Cloud Init?" => lambda {|it| format_boolean it['osType'] },
+          "Install Agent?" => lambda {|it| format_boolean it['osType'] },
+          "SSH Username" => lambda {|it| it['sshUsername'] },
+          "SSH Password" => lambda {|it| it['sshPassword'] },
+          "User Data" => lambda {|it| it['userData'] },
+          "Owner" => lambda {|it| it['tenant'].instance_of?(Hash) ? it['tenant']['name'] : it['ownerId'] },
+          "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+          "Tenants" => lambda {|it| format_tenants(it['accounts']) },
+          "Auto Join Domain?" => lambda {|it| format_boolean it['isAutoJoinDomain'] },
+          "VirtIO Drivers Loaded?" => lambda {|it| format_boolean it['virtioSupported'] },
+          "VM Tools Installed?" => lambda {|it| format_boolean it['vmToolsInstalled'] },
+          "Force Guest Customization?" => lambda {|it| format_boolean it['isForceCustomization'] },
+          "Trial Version" => lambda {|it| format_boolean it['trialVersion'] },
+          "Sysprep Enabled?" => lambda {|it| format_boolean it['isSysprep'] },
+        }
+        if options[:details]
+          description_cols.merge!(advanced_description_cols)
+        end
+        print_description_list(description_cols, image)
+
+        if image_volumes && !image_volumes.empty?
+          print_h2 "Volumes", options
+          image_volume_rows = image_volumes.collect do |image_volume|
+            {name: image_volume['name'], size: Filesize.from("#{image_volume['rawSize']} B").pretty}
+          end
+          print cyan
+          print as_pretty_table(image_volume_rows, [:name, :size])
+          print cyan
+          # print "\n", reset
         end
-        print cyan
-        print as_pretty_table(image_file_rows, [:filename, :size])
-        # print reset,"\n"
+
+        if image_files
+          print_h2 "Files (#{image_files.size})"
+          # image_files.each {|image_file|
+          #   pretty_filesize = Filesize.from("#{image_file['size']} B").pretty
+          #   print cyan,"  =  #{image_file['name']} [#{pretty_filesize}]", "\n"
+          # }
+          # size property changed to GB to match volumes
+          # contentLength is bytes
+          image_file_rows = image_files.collect do |image_file|
+            {filename: image_file['name'], size: Filesize.from("#{image_file['contentLength'] || image_file['size']} B").pretty}
+          end
+          print cyan
+          print as_pretty_table(image_file_rows, [:filename, :size])
+          # print reset,"\n"
+        end
+
+        if options[:details] && image_config && !image_config.empty?
+          print_h2 "Config", options
+          print cyan
+          print as_description_list(image_config, image_config.keys, options)
+          # print "\n", reset
+        end
+
+        print reset,"\n"
       end
-      print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
+      return 0, nil
   end
 
   def update(args)
@@ -229,60 +296,68 @@ class Morpheus::Cli::VirtualImages
           tenants_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       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('--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
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a virtual image." + "\n" +
                     "[name] is required. This is the name or id of a virtual image."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
 
     connect(options)
-    begin
-      image = find_virtual_image_by_name_or_id(image_name)
-      return 1 if image.nil?
-
-      payload = nil
-      if options[:payload]
-        payload = options[:payload]
-        # support -O OPTION switch on top of --payload
-        if options[:options]
-          payload['virtualImage'] ||= {}
-          payload['virtualImage'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
-        end
+    
+    virtual_image = find_virtual_image_by_name_or_id(image_name)
+    return 1 if virtual_image.nil?
+
+    passed_options = parse_passed_options(options)
+    payload = nil
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({virtual_image_object_key => passed_options}) unless passed_options.empty?
+    else
+      virtual_image_payload = passed_options
+      if tenants_list
+        virtual_image_payload['accounts'] = tenants_list
+      end
+      # metadata tags
+      if options[:tags]
+        virtual_image_payload['tags'] = parse_metadata(options[:tags])
       else
-        params = options[:options] || {}
-        if params.empty? && tenants_list.nil?
-          puts optparse
-          option_lines = update_virtual_image_option_types().collect {|it| "\t-O #{it['fieldContext'] ? (it['fieldContext'] + '.') : ''}#{it['fieldName']}=\"value\"" }.join("\n")
-          puts "\nAvailable Options:\n#{option_lines}\n\n"
-          exit 1
-        end
-        if tenants_list
-          params['accounts'] = tenants_list
-        end
-        payload = {'virtualImage' => params}
+        # tags = prompt_metadata(options)
+        # payload[virtual_image_object_key]['tags'] = tags of tags
       end
-      @virtual_images_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @virtual_images_interface.dry.update(image['id'], payload)
-        return
+      # metadata tags
+      if options[:add_tags]
+        virtual_image_payload['addTags'] = parse_metadata(options[:add_tags])
       end
-      response = @virtual_images_interface.update(image['id'], payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        if !response['success']
-          exit 1
-        end
-      else
-        print "\n", cyan, "Virtual Image #{image['name']} updated", reset, "\n\n"
+      if options[:remove_tags]
+        virtual_image_payload['removeTags'] = parse_metadata(options[:remove_tags])
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+      if virtual_image_payload.empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
+      end
+      payload = {'virtualImage' => virtual_image_payload}
+    end
+    @virtual_images_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @virtual_images_interface.dry.update(virtual_image['id'], payload)
+      return
+    end
+    json_response = @virtual_images_interface.update(virtual_image['id'], payload)
+    render_response(json_response, options, 'virtualImage') do
+      print_green_success "Updated virtual image #{virtual_image['name']}"
+      _get(virtual_image["id"], {}, options)
     end
+    return 0, nil
+    
   end
 
   def virtual_image_types(args)
@@ -339,6 +414,19 @@ class Morpheus::Cli::VirtualImages
       opts.on( '-U', '--url URL', "Image File URL. This can be used instead of uploading local files." ) do |val|
         file_url = val
       end
+      opts.on( '-c', '--cloud CLOUD', "Cloud to scope image to, certain types require a cloud to be selected, eg. Azure Reference" ) do |val|
+        # options[:cloud] = val
+        options[:options]['cloud'] = val
+      end
+      opts.on( '--azure-offer OFFER', String, "Azure Reference offer value, only applies to Azure Reference" ) do |val|
+        options[:options]['offer'] = val
+      end
+      opts.on( '--azure-sku SKU', String, "Azure SKU value, only applies to Azure Reference" ) do |val|
+        options[:options]['sku'] = val
+      end
+      opts.on( '--azure-version VERSION', String, "Azure Version value, only applies to Azure Reference" ) do |val|
+        options[:options]['version'] = val
+      end
       opts.on('--tenants LIST', Array, "Tenant Access, comma separated list of account IDs") do |list|
         if list.size == 1 && list[0] == 'null' # hacky way to clear it
           tenants_list = []
@@ -346,7 +434,13 @@ class Morpheus::Cli::VirtualImages
           tenants_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      opts.on('--tags LIST', String, "Metadata tags in the format 'name:value, name:value'") do |val|
+        options[:tags] = val
+      end
+      # build_option_type_options(opts, options, add_virtual_image_option_types)
+      # build_option_type_options(opts, options, add_virtual_image_advanced_option_types)
+      build_standard_add_options(opts, options)
+
       opts.footer = "Create a virtual image."
     end
     optparse.parse!(args)
@@ -368,26 +462,43 @@ class Morpheus::Cli::VirtualImages
       options[:options]['name'] ||= image_name
     end
 
-    if image_type_name
-      image_type = virtual_image_type_for_name_or_code(image_type_name)
-      # fix issue with api returning imageType vmware instead of vmdk
-      if image_type.nil? && image_type_name == 'vmware'
-        image_type = virtual_image_type_for_name_or_code('vmdk')
-      elsif image_type.nil? && image_type_name == 'vmdk'
-        image_type = virtual_image_type_for_name_or_code('vmware')
+     payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'virtualImage' => parse_passed_options(options)})
+    else
+      payload.deep_merge!({'virtualImage' => parse_passed_options(options)})
+      virtual_image_payload = {}
+      # v_prompt = Morpheus::Cli::OptionTypes.prompt(add_virtual_image_option_types, options[:options], @api_client, options[:params])
+      if image_type_name
+        image_type = virtual_image_type_for_name_or_code(image_type_name)
+        # fix issue with api returning imageType vmware instead of vmdk
+        if image_type.nil? && image_type_name == 'vmware'
+          image_type = virtual_image_type_for_name_or_code('vmdk')
+        elsif image_type.nil? && image_type_name == 'vmdk'
+          image_type = virtual_image_type_for_name_or_code('vmware')
+        end
+        if image_type.nil?
+          print_red_alert "Virtual Image Type not found by code '#{image_type_name}'"
+          return 1
+        end
+        # options[:options] ||= {}
+        # options[:options]['imageType'] ||= image_type['code']
+      else
+        image_type_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'imageType', 'fieldLabel' => 'Image Type', 'type' => 'select', 'optionSource' => 'virtualImageTypes', 'required' => true, 'description' => 'Select Virtual Image Type.', 'displayOrder' => 2}],options[:options],@api_client,{})
+        image_type = virtual_image_type_for_name_or_code(image_type_prompt['imageType'])
       end
-      if image_type.nil?
-        print_red_alert "Virtual Image Type not found by code '#{image_type_name}'"
-        return 1
+
+      # azure requires us to search the marketplace to select publisher, cloud, offerm sku
+      if image_type['code'] == "azure-reference" || image_type['code'] == "azure"
+        cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'optionSource' => 'clouds', 'required' => true, 'description' => 'Select Azure Cloud.', :fmt=>:natural}],options[:options],@api_client, {zoneTypeWhiteList: 'azure'})
+        cloud_id = cloud_prompt['cloud'].to_i
+
+        marketplace_config = prompt_azure_marketplace(cloud_id, options)
+        virtual_image_payload['config'] ||= {}
+        virtual_image_payload['config'].deep_merge!(marketplace_config)
       end
-      # options[:options] ||= {}
-      # options[:options]['imageType'] ||= image_type['code']
-    else
-      image_type_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'imageType', 'fieldLabel' => 'Image Type', 'type' => 'select', 'optionSource' => 'virtualImageTypes', 'required' => true, 'description' => 'Select Virtual Image Type.', 'displayOrder' => 2}],options[:options],@api_client,{})
-      image_type = virtual_image_type_for_name_or_code(image_type_prompt['imageType'])
-    end
 
-    begin
       my_option_types = add_virtual_image_option_types(image_type, !file_url)
       # if options[:no_prompt]
       #   my_option_types.each do |it| 
@@ -396,9 +507,9 @@ class Morpheus::Cli::VirtualImages
       #     end
       #   end
       # end
-      params = Morpheus::Cli::OptionTypes.prompt(my_option_types, options[:options], @api_client, options[:params])
-      params.deep_compact!
-      virtual_image_payload = {}.merge(params)
+      v_prompt = Morpheus::Cli::OptionTypes.prompt(my_option_types, options[:options], @api_client, options[:params])
+      v_prompt.deep_compact!
+      virtual_image_payload.deep_merge!(v_prompt)
       virtual_image_files = virtual_image_payload.delete('virtualImageFiles')
       virtual_image_payload['imageType'] = image_type['code']
       storage_provider_id = virtual_image_payload.delete('storageProviderId')
@@ -408,65 +519,74 @@ class Morpheus::Cli::VirtualImages
       if tenants_list
         virtual_image_payload['accounts'] = tenants_list
       end
+      # metadata tags
+        if options[:tags]
+          tags = parse_metadata(options[:tags])
+          virtual_image_payload['tags'] = tags if tags
+        else
+          # tags = prompt_metadata(options)
+          # virtual_image_payload['tags'] = tags of tags
+        end
       # fix issue with api returning imageType vmware instead of vmdk
       if virtual_image_payload && virtual_image_payload['imageType'] == 'vmware'
         virtual_image_payload['imageType'] == 'vmdk'
       end
-      payload = {virtualImage: virtual_image_payload}
-      @virtual_images_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @virtual_images_interface.dry.create(payload)
-        if file_url
-          print_dry_run @virtual_images_interface.dry.upload_by_url(":id", file_url, file_name)
-        elsif virtual_image_files && !virtual_image_files.empty?
-          virtual_image_files.each do |key, filepath|
-            print_dry_run @virtual_images_interface.dry.upload(":id", "(Contents of file #{filepath})")
-          end
-        end
-        return
-      end
-
-      json_response = @virtual_images_interface.create(payload)
-      virtual_image = json_response['virtualImage']
-
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-      elsif !options[:quiet]
-        print "\n", cyan, "Virtual Image #{virtual_image['name']} created successfully", reset, "\n\n"
-      end
+      #payload = {'virtualImage' => virtual_image_payload}
+      payload.deep_merge!({'virtualImage' => virtual_image_payload})
+    end
 
-      # now upload the file, do this in the background maybe?
+    @virtual_images_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @virtual_images_interface.dry.create(payload)
       if file_url
-        unless options[:quiet]
-          print cyan, "Uploading file by url #{file_url} ...", reset, "\n"
-        end
-        upload_json_response = @virtual_images_interface.upload_by_url(virtual_image['id'], file_url, file_name)
-        if options[:json]
-          print JSON.pretty_generate(upload_json_response)
-        end
+        print_dry_run @virtual_images_interface.dry.upload_by_url(":id", file_url, file_name)
       elsif virtual_image_files && !virtual_image_files.empty?
         virtual_image_files.each do |key, filepath|
-          unless options[:quiet]
-            print cyan, "Uploading file (#{key}) #{filepath} ...", reset, "\n"
-          end
-          image_file = File.new(filepath, 'rb')
-          upload_json_response = @virtual_images_interface.upload(virtual_image['id'], image_file, file_name)
-          if options[:json]
-            print JSON.pretty_generate(upload_json_response)
-          end
+          print_dry_run @virtual_images_interface.dry.upload(":id", "(Contents of file #{filepath})")
         end
-      else
-        puts cyan, "No files uploaded.", reset
       end
+      return
+    end
+
+    json_response = @virtual_images_interface.create(payload)
+    virtual_image = json_response['virtualImage']
+
+    # if options[:json]
+    #   print JSON.pretty_generate(json_response)
+    # elsif !options[:quiet]
+    #   print "\n", cyan, "Virtual Image #{virtual_image['name']} created successfully", reset, "\n\n"
+    # end
 
-      if !options[:json]
-        get([virtual_image['id']])
+    # now upload the file, do this in the background maybe?
+    if file_url
+      unless options[:quiet]
+        print cyan, "Uploading file by url #{file_url} ...", reset, "\n"
+      end
+      upload_json_response = @virtual_images_interface.upload_by_url(virtual_image['id'], file_url, file_name)
+      # if options[:json]
+      #   print JSON.pretty_generate(upload_json_response)
+      # end
+    elsif virtual_image_files && !virtual_image_files.empty?
+      virtual_image_files.each do |key, filepath|
+        unless options[:quiet]
+          print cyan, "Uploading file (#{key}) #{filepath} ...", reset, "\n"
+        end
+        image_file = File.new(filepath, 'rb')
+        upload_json_response = @virtual_images_interface.upload(virtual_image['id'], image_file, file_name)
+        # if options[:json]
+        #   print JSON.pretty_generate(upload_json_response)
+        # end
       end
+    else
+      # puts cyan, "No files uploaded.", reset
+    end
 
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    render_response(json_response, options, 'virtualImage') do
+      print_green_success "Added virtual image #{virtual_image['name']}"
+      return _get(virtual_image["id"], {}, options)
     end
+    return 0, nil
+    
   end
 
   def add_file(args)
@@ -676,16 +796,17 @@ class Morpheus::Cli::VirtualImages
     tmp_option_types = [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       #{'fieldName' => 'imageType', 'fieldLabel' => 'Image Type', 'type' => 'select', 'optionSource' => 'virtualImageTypes', 'required' => true, 'description' => 'Select Virtual Image Type.', 'displayOrder' => 2},
-      {'fieldName' => 'osType', 'fieldLabel' => 'OS Type', 'type' => 'select', 'optionSource' => 'osTypes', 'required' => false, 'description' => 'Select OS Type.', 'displayOrder' => 3},
-      {'fieldName' => 'minRam', 'fieldLabel' => 'Minimum Memory (MB)', 'type' => 'number', 'required' => false, 'description' => 'Minimum Memory (MB)', 'displayOrder' => 4},
-      {'fieldName' => 'isCloudInit', 'fieldLabel' => 'Cloud Init Enabled?', 'type' => 'checkbox', 'required' => false, 'description' => 'Cloud Init Enabled?', 'displayOrder' => 4},
-      {'fieldName' => 'installAgent', 'fieldLabel' => 'Install Agent?', 'type' => 'checkbox', 'required' => false, 'description' => 'Install Agent?', 'displayOrder' => 4},
-      {'fieldName' => 'sshUsername', 'fieldLabel' => 'SSH Username', 'type' => 'text', 'required' => false, 'description' => 'Enter an SSH Username', 'displayOrder' => 5},
-      {'fieldName' => 'sshPassword', 'fieldLabel' => 'SSH Password', 'type' => 'password', 'required' => false, 'description' => 'Enter an SSH Password', 'displayOrder' => 6},
-      {'fieldName' => 'storageProviderId', 'type' => 'select', 'fieldLabel' => 'Storage Provider', 'optionSource' => 'storageProviders', 'required' => false, 'description' => 'Select Storage Provider.', 'displayOrder' => 7},
+      {'fieldName' => 'osType', 'fieldLabel' => 'Operating System', 'type' => 'select', 'optionSource' => 'osTypes', 'required' => false, 'description' => 'Select Operating System.', 'displayOrder' => 3},
+      {'fieldName' => 'minRamGB', 'fieldLabel' => 'Minimum Memory (GB)', 'type' => 'number', 'required' => false, 'description' => 'Minimum Memory (GB)', 'displayOrder' => 4},
+      # {'fieldName' => 'minDiskGB', 'fieldLabel' => 'Minimum Disk (GB)', 'type' => 'number', 'required' => false, 'description' => 'Minimum Memory (GB)', 'displayOrder' => 4},
+      {'fieldName' => 'isCloudInit', 'fieldLabel' => 'Cloud Init Enabled?', 'type' => 'checkbox', 'defaultValue' => 'off', 'required' => false, 'description' => 'Cloud Init Enabled?', 'displayOrder' => 5},
+      {'fieldName' => 'installAgent', 'fieldLabel' => 'Install Agent?', 'type' => 'checkbox', 'defaultValue' => 'off', 'required' => false, 'description' => 'Install Agent?', 'displayOrder' => 6},
+      {'fieldName' => 'sshUsername', 'fieldLabel' => 'SSH Username', 'type' => 'text', 'required' => false, 'description' => 'Enter an SSH Username', 'displayOrder' => 7},
+      {'fieldName' => 'sshPassword', 'fieldLabel' => 'SSH Password', 'type' => 'password', 'required' => false, 'description' => 'Enter an SSH Password', 'displayOrder' => 8},
+      {'fieldName' => 'storageProviderId', 'type' => 'select', 'fieldLabel' => 'Storage Provider', 'optionSource' => 'storageProviders', 'required' => false, 'description' => 'Select Storage Provider.', 'displayOrder' => 9},
       {'fieldName' => 'userData', 'fieldLabel' => 'Cloud-Init User Data', 'type' => 'textarea', 'required' => false, 'displayOrder' => 10},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private', 'displayOrder' => 40},
-      {'fieldName' => 'isAutoJoinDomain', 'fieldLabel' => 'Auto Join Domain?', 'type' => 'checkbox', 'required' => false, 'description' => 'Auto Join Domain?', 'category' => 'advanced', 'displayOrder' => 40},
+      {'fieldName' => 'isAutoJoinDomain', 'fieldLabel' => 'Auto Join Domain?', 'type' => 'checkbox', 'defaultValue' => 'off', 'required' => false, 'description' => 'Auto Join Domain?', 'category' => 'advanced', 'displayOrder' => 40},
       {'fieldName' => 'virtioSupported', 'fieldLabel' => 'VirtIO Drivers Loaded?', 'type' => 'checkbox', 'defaultValue' => 'on', 'required' => false, 'description' => 'VirtIO Drivers Loaded?',  'category' => 'advanced', 'displayOrder' => 40},
       {'fieldName' => 'vmToolsInstalled', 'fieldLabel' => 'VM Tools Installed?', 'type' => 'checkbox', 'defaultValue' => 'on', 'required' => false, 'description' => 'VM Tools Installed?',  'category' => 'advanced', 'displayOrder' => 40},
       {'fieldName' => 'isForceCustomization', 'fieldLabel' => 'Force Guest Customization?', 'type' => 'checkbox', 'defaultValue' => 'off', 'required' => false, 'description' => 'Force Guest Customization?',  'category' => 'advanced', 'displayOrder' => 40},
@@ -696,22 +817,25 @@ class Morpheus::Cli::VirtualImages
     image_type_code = image_type ? image_type['code'] : nil
     if image_type_code
       if image_type_code == 'ami'
-        tmp_option_types << {'fieldName' => 'externalId', 'fieldLabel' => 'AMI id', 'type' => 'text', 'required' => false, 'displayOrder' => 10}
+        tmp_option_types << {'fieldName' => 'externalId', 'fieldLabel' => 'AMI id', 'type' => 'text', 'required' => false, 'displayOrder' => 11}
         if include_file_selection
-          tmp_option_types << {'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
+          tmp_option_types << {'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'displayOrder' => 12}
         end
       elsif image_type_code == 'vmware' || image_type_code == 'vmdk'
         if include_file_selection
-          tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'OVF File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
-          tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageDescriptorFile', 'fieldLabel' => 'VMDK File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
+          tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'OVF File', 'type' => 'file', 'required' => false, 'displayOrder' => 11}
+          tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageDescriptorFile', 'fieldLabel' => 'VMDK File', 'type' => 'file', 'required' => false, 'displayOrder' => 12}
         end
       elsif image_type_code == 'pxe'
-        tmp_option_types << {'fieldName' => 'config.menu', 'fieldLabel' => 'Menu', 'type' => 'text', 'required' => false, 'displayOrder' => 10}
-        tmp_option_types << {'fieldName' => 'imagePath', 'fieldLabel' => 'Image Path', 'type' => 'text', 'required' => true, 'displayOrder' => 10}
+        tmp_option_types << {'fieldName' => 'config.menu', 'fieldLabel' => 'Menu', 'type' => 'text', 'required' => false, 'displayOrder' => 11}
+        tmp_option_types << {'fieldName' => 'imagePath', 'fieldLabel' => 'Image Path', 'type' => 'text', 'required' => true, 'displayOrder' => 12}
         tmp_option_types.reject! {|opt| ['isCloudInit', 'installAgent', 'sshUsername', 'sshPassword'].include?(opt['fieldName'])}
+      elsif image_type_code == 'azure' || image_type_code == 'azure-reference'
+        # Azure Marketplace Prompt happens elsewhere
+        tmp_option_types.reject! {|opt| ['storageProviderId', 'userData', 'sshUsername', 'sshPassword'].include?(opt['fieldName'])}
       else
         if include_file_selection
-          tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'description' => 'Choose an image file to upload', 'displayOrder' => 10}
+          tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => false, 'description' => 'Choose an image file to upload', 'displayOrder' => 11}
         end
       end
     end
@@ -721,7 +845,10 @@ class Morpheus::Cli::VirtualImages
 
   def update_virtual_image_option_types(image_type = nil)
     list = add_virtual_image_option_types(image_type)
-    list.each {|it| it['required'] = false }
+    list.each {|it| 
+      it.delete('required')
+      it.delete('defaultValue')
+    }
     list
   end
 
@@ -735,5 +862,53 @@ class Morpheus::Cli::VirtualImages
       ""
     end
   end
+  
+  def prompt_azure_marketplace(cloud_id, options)
+    rtn = {}
+    publisher_value, offer_value, sku_value, version_value = nil, nil, nil, nil
+
+    # Marketplace Publisher & Offer
+    marketplace_api_params = {'zoneId' => cloud_id}
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'offer', 'fieldLabel' => 'Azure Marketplace Offer', 'type' => 'typeahead', 'optionSource' => 'searchAzureMarketplace', 'required' => true, 'description' => "Select Azure Marketplace Offer."}], options[:options],@api_client, marketplace_api_params)
+    # offer_value = v_prompt['marketplace']
+    # actually need both offer and publisher of these to query correctly..sigh
+    marketplace_option = Morpheus::Cli::OptionTypes.get_last_select()
+    offer_value = marketplace_option['offer']
+    publisher_value = marketplace_option['publisher']
+
+    # SKU & VERSION
+    if options[:options] && options[:options]['sku'] && options[:options]['version']
+      # the value to match on is actually sku|version
+      options[:options]['sku'] = options[:options]['sku'] + '|' + options[:options]['version']
+    end
+    sku_api_params = {'zoneId' => cloud_id, publisher: publisher_value, offer: offer_value}
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sku', 'fieldLabel' => 'Azure Marketplace SKU', 'type' => 'select', 'optionSource' => 'searchAzureMarketplaceSkus', 'required' => true, 'description' => "Select Azure Marketplace SKU and Version, the format is SKU|Version"}], options[:options],@api_client, sku_api_params)
+    # marketplace_option = Morpheus::Cli::OptionTypes.get_last_select()
+    # sku_value = marketplace_option['sku']
+    # version_value = marketplace_option['version']
+    sku_value = v_prompt['sku']
+    if sku_value && sku_value.include?("|")
+      sku_value, version_value = sku_value.split("|")
+    end
+
+    rtn['publisher'] = publisher_value
+    rtn['offer'] = offer_value
+    rtn['sku'] = sku_value
+    rtn['version'] = version_value
+    return rtn
+  end
+
+  def format_virtual_image_source(virtual_image, return_color=cyan)
+    out = ""
+    if virtual_image['userUploaded']
+      # out << "#{green}UPLOADED#{return_color}"
+      out << "#{cyan}UPLOADED#{return_color}"
+    elsif virtual_image['systemImage']
+      out << "#{cyan}SYSTEM#{return_color}"
+    else
+      out << "#{cyan}SYNCED#{return_color}"
+    end
+    out
+  end
 
 end