morpheus-cli 5.5.2.2 → 5.5.3

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

@@ -661,7 +661,7 @@ EOT
         Dir.chdir(base_working_dir)
         fmap = nil
         full_file_pattern = File.expand_path(file_pattern)
-        if File.exists?(full_file_pattern)
+        if File.exist?(full_file_pattern)
           if File.directory?(full_file_pattern)
             fmap = {'path' => full_file_pattern, 'pattern' => '**/*'}
           else

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

@@ -121,7 +121,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
         else
           params['config'] = config_map
           options[:options]['config'] = params['config'] # or file_content
@@ -131,7 +131,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -141,7 +141,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -215,7 +215,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
         else
           params['config'] = config_map
           options[:options]['config'] = params['config'] # or file_content
@@ -225,7 +225,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -235,7 +235,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -329,7 +329,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
         else
           params['config'] = config_map
           options[:options]['config'] = params['config'] # or file_content
@@ -339,7 +339,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -349,7 +349,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map

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

@@ -6,10 +6,9 @@ class Morpheus::Cli::Doc
   include Morpheus::Cli::CliCommand
 
   set_command_name :'doc'
-  #set_command_name :'access'
   register_subcommands :list
-  register_subcommands :get => :swagger
-  register_subcommands :download => :download_swagger
+  register_subcommands :get => :openapi
+  register_subcommands :download => :download_openapi
 
   # hidden until doc complete (or close to it)
   set_command_hidden
@@ -68,12 +67,12 @@ EOT
     return exit_code, err
   end
 
-  def swagger(args)
+  def openapi(args)
     exit_code, err = 0, nil
     params, options = {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on(nil, "--refresh", "Refresh the document. By default the swagger.yml and swagger.json are cached by the server.") do
+      opts.on(nil, "--refresh", "Refresh the document. By default the openapi.yml and openapi.json are cached by the server.") do
         params['refresh'] = true
       end
       opts.on('-g', '--generate', "Alias for --refresh") do
@@ -81,7 +80,7 @@ EOT
       end
       build_standard_get_options(opts, options, [], [:csv])
       opts.footer = <<-EOT
-Print the Morpheus API Swagger Documentation (openapi).
+Print the Morpheus API OpenAPI Documentation (swagger).
 The default format is JSON. Supports json or yaml.
 EOT
     end
@@ -97,13 +96,13 @@ EOT
     @doc_interface.setopts(options)
     if options[:dry_run]
       params['format'] = openapi_format
-      print_dry_run @doc_interface.dry.swagger(params)
+      print_dry_run @doc_interface.dry.openapi(params)
       return 0, nil
     end
-    json_response = @doc_interface.swagger(params)
+    json_response = @doc_interface.openapi(params)
     # default format is to print header and json
     render_response(json_response, options) do
-      title = "Morpheus API swagger.#{openapi_format}"
+      title = "Morpheus API openapi.#{openapi_format}"
       print_h1 title, options
       print cyan
       print as_json(json_response, options)
@@ -112,7 +111,7 @@ EOT
     return exit_code, err
   end
 
-  def download_swagger(args)
+  def download_openapi(args)
     exit_code, err = 0, nil
     params, options = {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -122,7 +121,7 @@ EOT
         options[:yaml] = true
         options[:format] = :yaml
       end
-      opts.on(nil, "--refresh", "Refresh the document. By default the swagger.yml and swagger.json are cached by the server.") do
+      opts.on(nil, "--refresh", "Refresh the document. By default the openapi.yml and openapi.json are cached by the server.") do
         params['refresh'] = true
       end
       opts.on('-g', '--generate', "Alias for --refresh") do
@@ -136,7 +135,7 @@ EOT
       end
       build_common_options(opts, options, [:dry_run, :quiet, :remote])
       opts.footer = <<-EOT
-Download the Morpheus API Swagger Documentation (openapi).
+Download the Morpheus API OpenAPI Documentation (swagger).
 [local-file] is required. This is the full local filepath for the downloaded file.
 The default format is JSON. Supports json or yaml.
 EOT
@@ -159,17 +158,17 @@ EOT
     # execute the api request
     @doc_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @doc_interface.dry.download_swagger(outfile, params)
+      print_dry_run @doc_interface.dry.download_openapi(outfile, params)
       return 0, nil
     end
-    print cyan + "Downloading swagger.#{openapi_format} to #{outfile} ... " if !options[:quiet]
-    http_response = @doc_interface.download_swagger(outfile, params)
+    print cyan + "Downloading openapi.#{openapi_format} to #{outfile} ... " if !options[:quiet]
+    http_response = @doc_interface.download_openapi(outfile, params)
     if http_response.code.to_i == 200
       print green + "SUCCESS" + reset + "\n" if !options[:quiet]
       return 0, nil
     else
       print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n" if !options[:quiet]
-      if File.exists?(outfile) && File.file?(outfile)
+      if File.exist?(outfile) && File.file?(outfile)
         Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
         File.delete(outfile)
       end

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

@@ -161,7 +161,7 @@ class Morpheus::Cli::ExecutionRequestCommand
       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}"
@@ -249,7 +249,7 @@ class Morpheus::Cli::ExecutionRequestCommand
       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}"

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

@@ -190,7 +190,7 @@ class Morpheus::Cli::FileCopyRequestCommand
         filename = v_prompt['file']
       end
       full_filename = File.expand_path(filename)        
-      if !File.exists?(full_filename)
+      if !File.exist?(full_filename)
         print_red_alert "File not found: #{full_filename}"
         return 1
       end
@@ -266,12 +266,12 @@ class Morpheus::Cli::FileCopyRequestCommand
       filename = args[1]
     end
     outfile = File.expand_path(filename)
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       print_red_alert "[file] is invalid. It is the name of an existing directory: #{outfile}"
       return 1
     end
     destination_dir = File.dirname(outfile)
-    if !Dir.exists?(destination_dir)
+    if !Dir.exist?(destination_dir)
       if do_mkdir
         print cyan,"Creating local directory #{destination_dir}",reset,"\n"
         FileUtils.mkdir_p(destination_dir)
@@ -280,7 +280,7 @@ class Morpheus::Cli::FileCopyRequestCommand
         return 1
       end
     end
-    if File.exists?(outfile)
+    if File.exist?(outfile)
       if do_overwrite
         # uhh need to be careful wih the passed filepath here..
         # don't delete, just overwrite.
@@ -320,7 +320,7 @@ class Morpheus::Cli::FileCopyRequestCommand
           print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
         end
         # F it, just remove a bad result
-        if File.exists?(outfile) && File.file?(outfile)
+        if File.exist?(outfile) && File.file?(outfile)
           Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
           File.delete(outfile)
         end

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

@@ -559,7 +559,7 @@ EOT
       build_option_type_options(opts, options, update_wiki_page_option_types)
       opts.on('--file FILE', "File containing the wiki content. This can be used instead of --content") do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -732,7 +732,7 @@ public
 
     def save_groups(groups_map)
       fn = groups_file_path
-      if !Dir.exists?(File.dirname(fn))
+      if !Dir.exist?(File.dirname(fn))
         FileUtils.mkdir_p(File.dirname(fn))
       end
       File.open(fn, 'w') {|f| f.write groups_map.to_yaml } #Store

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

@@ -610,11 +610,11 @@ class Morpheus::Cli::HealthCommand
     outfile = args[0]
     outfile = File.expand_path(outfile)
     
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise_command_error("[file] is invalid. It is the name of an existing directory: #{outfile}", args, optparse)
     end
     destination_dir = File.dirname(outfile)
-    if !Dir.exists?(destination_dir)
+    if !Dir.exist?(destination_dir)
       if do_mkdir
         print cyan,"Creating local directory #{destination_dir}",reset,"\n"
         FileUtils.mkdir_p(destination_dir)
@@ -622,7 +622,7 @@ class Morpheus::Cli::HealthCommand
         raise_command_error("[file] is invalid. Directory not found: #{destination_dir}", args, optparse)
       end
     end
-    if File.exists?(outfile)
+    if File.exist?(outfile)
       if do_overwrite
         # uhh need to be careful wih the passed filepath here..
         # don't delete, just overwrite.
@@ -654,7 +654,7 @@ class Morpheus::Cli::HealthCommand
         print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
       end
       # F it, just remove a bad result
-      if File.exists?(outfile) && File.file?(outfile)
+      if File.exist?(outfile) && File.file?(outfile)
         Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
         File.delete(outfile)
       end

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

@@ -7,7 +7,7 @@ class Morpheus::Cli::Hosts
   include Morpheus::Cli::LogsHelper
   set_command_name :hosts
   set_command_description "View and manage hosts (servers)."
-  register_subcommands :list, :count, :get, :view, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, 
+  register_subcommands :list, :count, :get, :view, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, :restart,
                        :run_workflow, :make_managed, :upgrade_agent, :snapshots, :software, :software_sync, :update_network_label,
                        {:'types' => :list_types},
                        {:exec => :execution_request},
@@ -1243,6 +1243,44 @@ class Morpheus::Cli::Hosts
     end
   end
 
+   def restart(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Restart a host.\n" +
+                    "[name] is required. This is the name or id of a host."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      server = find_host_by_name_or_id(args[0])
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart the server '#{server['name']}'?", options)
+        exit 1
+      end
+     @servers_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.restart(server['id'])
+        return
+      end
+      json_response = @servers_interface.restart(server['id'])
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif !options[:quiet]
+        print_green_success "Restarting #{server["name"]}"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
   def resize(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -1280,7 +1318,7 @@ class Morpheus::Cli::Hosts
       end
 
       # prompt for service plan
-      service_plans_json = @servers_interface.service_plans({zoneId: cloud_id, serverTypeId: server_type_id})
+      service_plans_json = @servers_interface.service_plans({zoneId: cloud_id, serverTypeId: server_type_id, serverId: server['id']})
       service_plans = service_plans_json["plans"]
       service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
       service_plans_dropdown.each do |plan|
@@ -1288,7 +1326,7 @@ class Morpheus::Cli::Hosts
           plan['name'] = "#{plan['name']} (current)"
         end
       end
-      plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this server'}],options[:options])
+      plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'defaultValue' => plan_id, 'description' => 'Choose the appropriately sized plan for this server'}],options[:options])
       service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['plan'].to_i }
       payload[:server][:plan] = {id: service_plan["id"]}
 
@@ -1550,7 +1588,7 @@ class Morpheus::Cli::Hosts
       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}"
@@ -1883,7 +1921,7 @@ class Morpheus::Cli::Hosts
       build_option_type_options(opts, options, update_wiki_page_option_types)
       opts.on('--file FILE', "File containing the wiki content. This can be used instead of --content") do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"

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

@@ -972,7 +972,7 @@ class Morpheus::Cli::ImageBuilderCommand
       payload['config'] = options['config']
     elsif options['configFile']
       config_file = File.expand_path(options['configFile'])
-      if !File.exists?(config_file) || !File.file?(config_file)
+      if !File.exist?(config_file) || !File.file?(config_file)
         print_red_alert "File not found: #{config_file}"
         return false
       end