morpheus-cli 5.5.2.1 → 5.5.3

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

@@ -6,13 +6,15 @@ class Morpheus::Cli::ContainersCommand
   include Morpheus::Cli::LogsHelper
 
   set_command_name :containers
-
-  register_subcommands :get, :stop, :start, :restart, :suspend, :eject, :action, :actions, :logs
-  register_subcommands :exec => :execution_request
+  set_command_description "View and manage containers (nodes)."
+  register_subcommands :get, :stop, :start, :restart, :suspend, :eject, :action, :actions, :logs,
+    {:exec => :execution_request}, :clone_image, :import
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @containers_interface = @api_client.containers
+    @instances_interface = @api_client.instances
+    @provision_types_interface = @api_client.provision_types
     @logs_interface = @api_client.logs
     @execution_request_interface = @api_client.execution_request
   end
@@ -40,44 +42,40 @@ class Morpheus::Cli::ContainersCommand
       opts.on('--refresh-until STATUS', String, "Refresh until a specified status is reached.") do |val|
         options[:refresh_until_status] = val.to_s.downcase
       end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a container.
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+If more than one [id] is given, the command will execute for each one sequentially.
+
+Examples:
+    containers get 42
+    containers get 1 2 3
+    containers get 42 --refresh
+    containers get 42 --refresh 10 --refresh-until stopped
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts_error "[id] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
+    validate_container_ids!(id_list)
     return run_command_for_each_arg(id_list) do |arg|
       _get(arg, options)
     end
   end
 
   def _get(arg, options)
-    begin
-      @containers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @containers_interface.dry.get(arg.to_i)
-        return
-      end
-      #container = find_container_by_id(arg)
-      #return 1 if container.nil?
-      json_response = @containers_interface.get(arg.to_i)
-      if options[:json]
-        puts as_json(json_response, options, "container")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "container")
-        return 0
-      end
-
-      if options[:csv]
-        puts records_as_csv([json_response['container']], options)
-        return 0
-      end
-      container = json_response['container']
+    @containers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @containers_interface.dry.get(arg.to_i)
+      return
+    end
+    #container = find_container_by_id(arg)
+    #return 1 if container.nil?
+    json_response = @containers_interface.get(arg.to_i)
+    container = json_response['container']
+    render_response(json_response, options, "container") do
       # stats = json_response['stats'] || {}
       stats = container['stats'] || {}
       
@@ -139,49 +137,47 @@ class Morpheus::Cli::ContainersCommand
         }
         print_description_list(cost_columns, container)
       end
-
       print reset, "\n"
-
-      # refresh until a status is reached
-      if options[:refresh_until_status]
-        if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
-          options[:refresh_interval] = default_refresh_interval
-        end
-        statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
-        if !statuses.include?(container['status'])
-          print cyan
-          print cyan, "Refreshing in #{options[:refresh_interval] > 1 ? options[:refresh_interval].to_i : options[:refresh_interval]} seconds"
-          sleep_with_dots(options[:refresh_interval])
-          print "\n"
-          _get(arg, options)
-        end
+    end
+    # refresh until a status is reached
+    if options[:refresh_until_status]
+      if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
+        options[:refresh_interval] = default_refresh_interval
+      end
+      statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
+      if !statuses.include?(container['status'])
+        print cyan
+        print cyan, "Refreshing in #{options[:refresh_interval] > 1 ? options[:refresh_interval].to_i : options[:refresh_interval]} seconds"
+        sleep_with_dots(options[:refresh_interval])
+        print "\n"
+        _get(arg, options)
       end
-
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1 # , e
     end
+    return 0, nil
   end
 
 
   def stop(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Stop a container.
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+If more than one [id] is given, the command will execute for each one sequentially.
+
+Examples:
+    containers stop 42
+    containers stop 1 2 3 -y
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts_error "[id] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
-      return 9, "aborted command"
-    end
+    validate_container_ids!(id_list)
+    confirm!("Are you sure you would like to stop #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
     return run_command_for_each_arg(id_list) do |arg|
       _stop(arg, options)
     end
@@ -196,32 +192,33 @@ class Morpheus::Cli::ContainersCommand
       return 0
     end
     json_response = @containers_interface.stop(container['id'])
-    # just assume json_response["success"] == true,  it always is with 200 OK
-    if options[:json]
-      puts as_json(json_response, options)
-    elsif !options[:quiet]
+    render_response(json_response, options) do
       print green, "Stopping container #{container['id']}", reset, "\n"
     end
-    return 0
+    return 0, nil
   end
 
   def start(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Start a container.
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+If more than one [id] is given, the command will execute for each one sequentially.
+
+Examples:
+    containers start 42
+    containers start 1 2 3 -y
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts_error "[id] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to start #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
-      return 9, "aborted command"
-    end
+    validate_container_ids!(id_list)
+    confirm!("Are you sure you would like to start #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
     return run_command_for_each_arg(id_list) do |arg|
       _start(arg, options)
     end
@@ -236,32 +233,33 @@ class Morpheus::Cli::ContainersCommand
       return 0
     end
     json_response = @containers_interface.start(container['id'])
-    # just assume json_response["success"] == true,  it always is with 200 OK
-    if options[:json]
-      puts as_json(json_response, options)
-    elsif !options[:quiet]
+    render_response(json_response, options) do
       print green, "Starting container #{container['id']}", reset, "\n"
     end
-    return 0
+    return 0, nil
   end
 
   def restart(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Restart a container.
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+If more than one [id] is given, the command will execute for each one sequentially.
+
+Examples:
+    containers restart 42
+    containers restart 1 2 3 -y
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts_error "[id] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
-      return 9, "aborted command"
-    end
+    validate_container_ids!(id_list)
+    confirm!("Are you sure you would like to restart #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
     return run_command_for_each_arg(id_list) do |arg|
       _restart(arg, options)
     end
@@ -276,32 +274,33 @@ class Morpheus::Cli::ContainersCommand
       return 0
     end
     json_response = @containers_interface.restart(container['id'])
-    # just assume json_response["success"] == true,  it always is with 200 OK
-    if options[:json]
-      puts as_json(json_response, options)
-    elsif !options[:quiet]
+    render_response(json_response, options) do
       print green, "Restarting container #{container['id']}", reset, "\n"
     end
-    return 0
+    return 0, nil
   end
 
   def suspend(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Suspend a container.
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+If more than one [id] is given, the command will execute for each one sequentially.
+
+Examples:
+    containers suspend 42
+    containers suspend 1 2 3 -y
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts_error "[id] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to suspend #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
-      return 9, "aborted command"
-    end
+    validate_container_ids!(id_list)
+    confirm!("Are you sure you would like to suspend #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
     return run_command_for_each_arg(id_list) do |arg|
       _suspend(arg, options)
     end
@@ -316,32 +315,33 @@ class Morpheus::Cli::ContainersCommand
       return 0
     end
     json_response = @containers_interface.suspend(container['id'])
-    # just assume json_response["success"] == true,  it always is with 200 OK
-    if options[:json]
-      puts as_json(json_response, options)
-    elsif !options[:quiet]
+    render_response(json_response, options) do
       print green, "Suspending container #{container['id']}", reset, "\n"
     end
-    return 0
+    return 0, nil
   end
 
   def eject(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Eject a container.
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+If more than one [id] is given, the command will execute for each one sequentially.
+
+Examples:
+    containers eject 42
+    containers eject 1 2 3 -y
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts_error "[id] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to eject #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
-      return 9, "aborted command"
-    end
+    validate_container_ids!(id_list)
+    confirm!("Are you sure you would like to eject #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
     return run_command_for_each_arg(id_list) do |arg|
       _eject(arg, options)
     end
@@ -356,29 +356,31 @@ class Morpheus::Cli::ContainersCommand
       return 0
     end
     json_response = @containers_interface.eject(container['id'])
-    # just assume json_response["success"] == true,  it always is with 200 OK
-    if options[:json]
-      puts as_json(json_response, options)
-    elsif !options[:quiet]
+    render_response(json_response, options) do
       print green, "Ejecting container #{container['id']}", reset, "\n"
     end
-    return 0
+    return 0, nil
   end
 
   def actions(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[id list]")
-      opts.footer = "List the actions available to specified container(s)."
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.banner = subcommand_usage("[id]")
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+List the actions available to specified container(s).
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+
+Examples:
+    containers actions 42
+    containers actions 1 2 3
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
+    validate_container_ids!(id_list)
     containers = []
     id_list.each do |container_id|
       container = find_container_by_id(container_id)
@@ -393,58 +395,53 @@ class Morpheus::Cli::ContainersCommand
       return 1
     end
     container_ids = containers.collect {|container| container["id"] }
-    begin
-      # container = find_container_by_name_or_id(args[0])
-      @containers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @containers_interface.dry.available_actions(container_ids)
-        return 0
-      end
-      json_response = @containers_interface.available_actions(container_ids)
-      if options[:json]
-        puts as_json(json_response, options)
+    # container = find_container_by_name_or_id(args[0])
+    @containers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @containers_interface.dry.available_actions(container_ids.size == 1 ? container_ids[0] : container_ids)
+      return 0
+    end
+    json_response = @containers_interface.available_actions(container_ids.size == 1 ? container_ids[0] : container_ids)
+    render_response(json_response, options) do
+      title = "Container Actions: #{anded_list(id_list)}"
+      print_h1 title
+      available_actions = json_response["actions"]
+      if (available_actions && available_actions.size > 0)
+        print as_pretty_table(available_actions, [:name, :code])
+        print reset, "\n"
       else
-        title = "Container Actions: #{anded_list(id_list)}"
-        print_h1 title
-        available_actions = json_response["actions"]
-        if (available_actions && available_actions.size > 0)
-          print as_pretty_table(available_actions, [:name, :code])
-          print reset, "\n"
+        if container_ids.size > 1
+          print "#{yellow}The specified containers have no available actions in common.#{reset}\n\n"
         else
-          if container_ids.size > 1
-            print "#{yellow}The specified containers have no available actions in common.#{reset}\n\n"
-          else
-            print "#{yellow}No available actions#{reset}\n\n"
-          end
+          print "#{yellow}No available actions#{reset}\n\n"
         end
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def action(args)
     options = {}
     action_id = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[id list] -a CODE")
+      opts.banner = subcommand_usage("[id] -a CODE")
       opts.on('-a', '--action CODE', "Container Action CODE to execute") do |val|
         action_id = val.to_s
       end
-      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
-      opts.footer = "Execute an action for a container or containers"
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Execute an action for a container or containers
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+
+Examples:
+    containers action 42 -a docker-remove-node
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error "[id list] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
+    validate_container_ids!(id_list)
     containers = []
     id_list.each do |container_id|
       container = find_container_by_id(container_id)
@@ -489,29 +486,21 @@ class Morpheus::Cli::ContainersCommand
     end
 
     action_display_name = "#{container_action['name']} [#{container_action['code']}]"
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to perform action #{action_display_name} on #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
-      return 9, "aborted command"
-    end
+    confirm!("Are you sure you would like to perform action #{action_display_name} on #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}?", options)
 
     # return run_command_for_each_arg(containers) do |arg|
     #   _action(arg, action_id, options)
     # end
     @containers_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @containers_interface.dry.action(container_ids, action_id)
+      print_dry_run @containers_interface.dry.action(container_ids.size == 1 ? container_ids[0] : container_ids, action_id)
       return 0
     end
-    json_response = @containers_interface.action(container_ids, action_id)
-    # just assume json_response["success"] == true,  it always is with 200 OK
-    if options[:json]
-      puts as_json(json_response, options)
-    elsif !options[:quiet]
-      # containers.each do |container|
-      #   print green, "Action #{action_display_name} performed on container #{container['id']}", reset, "\n"
-      # end
+    json_response = @containers_interface.action(container_ids.size == 1 ? container_ids[0] : container_ids, action_id)
+    render_response(json_response, options) do
       print green, "Action #{action_display_name} performed on #{id_list.size == 1 ? 'container' : 'containers'} #{anded_list(id_list)}", reset, "\n"
     end
-    return 0
+    return 0, nil
   end
 
   def logs(args)
@@ -534,35 +523,35 @@ class Morpheus::Cli::ContainersCommand
       opts.on('-a', '--all', "Display all details: entire message." ) do
         options[:details] = true
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "List logs for a container.\n" +
-                    "[id] is required. This is the id of a container."
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+List logs for a container.
+[id] is required. This is the id of a container. Supports multiple [id] arguments.
+
+Examples:
+    containers logs 42 --level ERROR
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts_error "[id] argument is required"
-      puts_error optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
-    begin
-      containers = id_list # heh
-      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
-      params.merge!(parse_list_options(options))
-      params['query'] = params.delete('phrase') if params['phrase']
-      params[:order] = params[:direction] unless params[:direction].nil? # old api version expects order instead of direction
-      params['startMs'] = (options[:start].to_i * 1000) if options[:start]
-      params['endMs'] = (options[:end].to_i * 1000) if options[:end]
-      @logs_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @logs_interface.dry.container_logs(containers, params)
-        return
-      end
-      json_response = @logs_interface.container_logs(containers, params)
-      render_result = json_response['logs'] ? render_with_format(json_response, options, 'logs') : render_with_format(json_response, options, 'data')
-      return 0 if render_result
-
+    validate_container_ids!(id_list)
+
+    containers = id_list # heh
+    params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
+    params.merge!(parse_list_options(options))
+    params['query'] = params.delete('phrase') if params['phrase']
+    params[:order] = params[:direction] unless params[:direction].nil? # old api version expects order instead of direction
+    params['startMs'] = (options[:start].to_i * 1000) if options[:start]
+    params['endMs'] = (options[:end].to_i * 1000) if options[:end]
+    @logs_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @logs_interface.dry.container_logs(containers, params)
+      return
+    end
+    json_response = @logs_interface.container_logs(containers, params)
+    render_response(json_response, options, "logs") do
       logs = json_response
       title = "Container Logs: #{containers.join(', ')}"
       subtitles = parse_list_subtitles(options)
@@ -587,11 +576,8 @@ class Morpheus::Cli::ContainersCommand
         print_results_pagination({'meta'=>{'total'=>(json_response['total']['value'] rescue json_response['total']),'size'=>logs.size,'max'=>(json_response['max'] || options[:max]),'offset'=>(json_response['offset'] || options[:offset] || 0)}})
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def execution_request(args)
@@ -606,7 +592,7 @@ class Morpheus::Cli::ContainersCommand
       end
       opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           script_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -617,51 +603,46 @@ class Morpheus::Cli::ContainersCommand
         do_refresh = false
       end
       #build_option_type_options(opts, options, add_user_source_option_types())
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
-      opts.footer = "Execute an arbitrary command or script on a container." + "\n" +
-                    "[id] is required. This is the id a container." + "\n" +
-                    "[script] is required. This is the script that is to be executed."
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Execute an arbitrary command or script on a container.
+[id] is required. This is the id of a container.
+[script] is required and can be passed as --script of --file instead. This is the script that is to be executed.
+
+Examples:
+    containers exec 42 "uname -a"
+EOT
     end
     optparse.parse!(args)
     connect(options)
-    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)
     
     
-    begin
-      container = find_container_by_id(args[0])
-      return 1 if container.nil?
-      params['containerId'] = container['id']
-      # construct payload
-      payload = {}
-      if options[:payload]
-        payload = options[:payload]
-      else
-        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        # prompt for Script
-        if script_content.nil?
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'script', 'type' => 'code-editor', 'fieldLabel' => 'Script', 'required' => true, 'description' => 'The script content'}], options[:options])
-          script_content = v_prompt['script']
-        end
-        payload['script'] = script_content
-      end
-      @execution_request_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @execution_request_interface.dry.create(params, payload)
-        return 0
-      end
-      # do it
-      json_response = @execution_request_interface.create(params, payload)
-      # print and return result
-      if options[:quiet]
-        return 0
-      elsif options[:json]
-        puts as_json(json_response, options)
-        return 0
+    container = find_container_by_id(args[0])
+    return 1 if container.nil?
+    params['containerId'] = container['id']
+    # construct payload
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+    else
+      payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      # prompt for Script
+      if script_content.nil?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'script', 'type' => 'code-editor', 'fieldLabel' => 'Script', 'required' => true, 'description' => 'The script content'}], options[:options])
+        script_content = v_prompt['script']
       end
+      payload['script'] = script_content
+    end
+    @execution_request_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @execution_request_interface.dry.create(params, payload)
+      return 0
+    end
+    # do it
+    json_response = @execution_request_interface.create(params, payload)
+    # print and return result
+    render_response(json_response, options) do
       execution_request = json_response['executionRequest']
       print_green_success "Executing request #{execution_request['uniqueId']}"
       if do_refresh
@@ -669,11 +650,127 @@ class Morpheus::Cli::ContainersCommand
       else
         Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId']]+ (options[:remote] ? ["-r",options[:remote]] : []))
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
+  end
+
+  def import(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id] [image]")
+      opts.on( '--storage-provider VALUE', String, "Optional storage provider to use" ) do |val|
+        options[:options]['storageProviderId'] = val
+      end
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Import image template for a container.
+[id] is required. This is the id of a container.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    container = find_container_by_id(args[0])
+    return 1 if container.nil?
+    instance = find_instance_by_name_or_id(container['instance']['id'])
+    return 1 if instance.nil?
+    # need to GET provision type for exportServer == true
+    provision_type = load_container_provision_type(container, instance)
+    # todo: add this exportServer to the api too obviously (oh it is there.. but clone-image is not)
+    # if provision_type['exportServer'] != true
+    #   raise_command_error "import is not supported by provision type #{provision_type['name']}"
+    # end
+    payload = parse_payload(options)
+    if payload.nil?
+      payload = parse_passed_options(options)
+      container_import_option_types = [
+        {'fieldName' => 'storageProviderId', 'type' => 'select', 'fieldLabel' => 'Storage Provider', 'optionSource' => 'storageProviders', 'required' => false, 'description' => 'Select Storage Provider.'}
+      ]
+      payload.deep_merge! Morpheus::Cli::OptionTypes.prompt(container_import_option_types, options[:options], @api_client, {})
+    end
+    confirm!("Are you sure you would like to import container #{container['id']}?", options)
+    @containers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @containers_interface.dry.import(container['id'], payload)
+      return
+    end
+    json_response = @containers_interface.import(container['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Import initiated for container [#{container['id']}] #{container['name']}"
+    end
+    return 0, nil
+  end
+
+  def clone_image(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.on( '--name VALUE', String, "Image Name (Template Name). Default is server name + timestamp" ) do |val|
+        options[:options]['templateName'] = val
+      end
+      opts.on( '--folder VALUE', String, "Folder externalId or '/' to use the root folder" ) do |val|
+        options[:options]['zoneFolder'] = val
+      end
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Clone to image (template) for a container.
+[id] is required. This is the id of a container.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    container = find_container_by_id(args[0])
+    return 1 if container.nil?
+    # need to GET provision type for hasFolders == true and cloneTemplte == true
+    instance = find_instance_by_name_or_id(container['instance']['id'])
+    return 1 if instance.nil?
+    provision_type = load_container_provision_type(container, instance)
+    # todo: add this cloneTemplate check to the api too obviously
+    # if provision_type['cloneTemplate'] != true
+    #   raise_command_error "clone-image is not supported by provision type #{provision_type['name']}"
+    # end
+    payload = parse_payload(options)
+    if payload.nil?
+      payload = parse_passed_options(options)
+      if payload['templateName'].nil?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'templateName', 'type' => 'text', 'fieldLabel' => 'Image Name', 'description' => 'Choose a name for the new image template. Default is the server name + timestamp'}], options[:options])
+        if v_prompt['templateName'].to_s != ''
+          payload['templateName'] = v_prompt['templateName']
+        end
+      end
+      #if provision_type['code'] == 'vmware'
+      if provision_type && provision_type["hasFolders"]
+        if payload['zoneFolder'].nil?
+          # vmwareFolders moved from /api/options/vmwareFolders to /api/options/vmware/vmwareFolders
+          folder_prompt = nil
+          begin
+            folder_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneFolder', 'type' => 'select', 'optionSource' => 'vmwareFolders', 'optionSourceType' => 'vmware', 'fieldLabel' => 'Folder', 'description' => "Folder externalId or '/' to use the root folder", 'required' => true}], options[:options], @api_client, {siteId: instance['group']['id'], zoneId: instance['cloud']['id']})
+          rescue RestClient::Exception => e
+            Morpheus::Logging::DarkPrinter.puts "Failed to load folder options" if Morpheus::Logging.debug?
+            begin
+              folder_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneFolder', 'type' => 'select', 'optionSource' => 'vmwareFolders', 'fieldLabel' => 'Folder', 'description' => "Folder externalId or '/' to use the root folder", 'required' => true}], options[:options], @api_client, {siteId: instance['group']['id'], zoneId: instance['cloud']['id']})
+            rescue RestClient::Exception => e2
+              Morpheus::Logging::DarkPrinter.puts "Failed to load folder options from alternative endpoint too" if Morpheus::Logging.debug?
+            end
+          end
+          if folder_prompt && folder_prompt['zoneFolder'].to_s != ''
+            payload['zoneFolder'] = folder_prompt['zoneFolder']
+          end
+        end
+      end
+    end
+    confirm!("Are you sure you would like to clone as image container #{container['id']}?", options)
+    @containers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @containers_interface.dry.clone_image(container['id'], payload)
+      return
+    end
+    json_response = @containers_interface.clone_image(container['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Clone Image initiated for container [#{container['id']}] #{container['name']}"
+    end
+    return 0, nil
   end
 
 private
@@ -692,4 +789,52 @@ private
     end
   end
 
+  def validate_container_ids!(id_list)
+    id_list.each { |id| validate_container_id!(id) }
+  end
+
+  def validate_container_id!(id)
+    if id.to_s =~ /\A\d{1,}\Z/
+      true
+    else
+      raise_command_error "[id] argument is invalid, expected a number and got '#{id}'" #, args, optparse
+    end
+  end
+
+  def load_container_provision_type(container, instance=nil)
+    if instance.nil?
+      instance = find_instance_by_name_or_id(container['instance']['id'])
+      return 1 if instance.nil?
+    end
+    # todo: should be returned by containers api too, get from instance for old api versions
+    provision_type_code = container['containerType']['provisionTypeCode'] rescue nil
+    provision_type_code = provision_type_code || container['provisionType']['code'] rescue nil
+    if provision_type_code.nil?
+      return load_instance_provision_type(instance)
+    end
+    provision_type = nil
+    if provision_type_code
+      provision_type = provision_types_interface.list({code:provision_type_code})['provisionTypes'][0]
+      if provision_type.nil?
+        raise_command_error "Provision Type not found by code #{provision_type_code}"
+      end
+    else
+      raise_command_error "Unable to determine provision type for container #{container['id']}"
+    end
+    return provision_type
+  end
+
+  def load_instance_provision_type(instance)
+    provision_type_code = instance['layout']['provisionTypeCode'] rescue nil
+    provision_type = nil
+    if provision_type_code
+      provision_type = provision_types_interface.list({code:provision_type_code})['provisionTypes'][0]
+      if provision_type.nil?
+        raise_command_error "Provision Type not found by code #{provision_type_code}"
+      end
+    else
+      raise_command_error "Unable to determine provision type for instance #{instance['id']}"
+    end
+    return provision_type
+  end
 end