morpheus-cli 3.5.1.1 → 3.5.1.2

data/lib/morpheus/cli/image_builder_command.rb

@@ -342,7 +342,7 @@ class Morpheus::Cli::ImageBuilderCommand
       opts.on('--keepResults VALUE', String, "Keep only the most recent builds. Older executions will be deleted along with their associated Virtual Images. The value 0 disables this functionality.") do |val|
         options['keepResults'] = val.to_i
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :quiet])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet])
     end
     optparse.parse!(args)
     if args.count > 1
@@ -351,20 +351,29 @@ class Morpheus::Cli::ImageBuilderCommand
     end
     connect(options)
     begin
-      options.merge!(options[:options]) if options[:options] # so -O var= works..
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support options top of --payload
+        options.merge!(options[:options]) if options[:options] # so -O var= works..
+        option_params = options.reject {|k,v| k.is_a?(Symbol) }
+        payload.deep_merge!({'imageBuild' => option_params}) unless option_params.empty?
+      else
+        options.merge!(options[:options]) if options[:options] # so -O var= works..
+
+        # use the -g GROUP or active group by default
+        # options['group'] ||=  @active_group_id
+        
+        # support first arg as name instead of --name
+        if args[0] && !options['name']
+          options['name'] = args[0]
+        end
 
-      # use the -g GROUP or active group by default
-      # options['group'] ||=  @active_group_id
-      
-      # support first arg as name instead of --name
-      if args[0] && !options['name']
-        options['name'] = args[0]
+        image_build_payload = prompt_new_image_build(options)
+        return 1 if !image_build_payload
+        payload = {'imageBuild' => image_build_payload}
       end
 
-      image_build_payload = prompt_new_image_build(options)
-      return 1 if !image_build_payload
-      payload = {'imageBuild' => image_build_payload}
-
       if options[:dry_run]
         print_dry_run @image_builds_interface.dry.create(payload)
         return
@@ -461,7 +470,7 @@ class Morpheus::Cli::ImageBuilderCommand
         # 0 disables it
         # options['deleteOldResults'] = (options['keepResults'] > 0)
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :quiet])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet])
     end
     optparse.parse!(args)
     if args.count != 1
@@ -472,9 +481,20 @@ class Morpheus::Cli::ImageBuilderCommand
     begin
       image_build = find_image_build_by_name_or_id(args[0])
       return 1 if !image_build
-      image_build_payload = prompt_edit_image_build(image_build, options)
-      return 1 if !image_build_payload
-      payload = {imageBuild: image_build_payload}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support options top of --payload
+        options.merge!(options[:options]) if options[:options] # so -O var= works..
+        option_params = options.reject {|k,v| k.is_a?(Symbol) }
+        payload.deep_merge!({'imageBuild' => option_params}) unless option_params.empty?
+      else
+        options.merge!(options[:options]) if options[:options] # so -O var= works..
+        image_build_payload = prompt_edit_image_build(image_build, options)
+        return 1 if !image_build_payload
+        payload = {'imageBuild' => image_build_payload}
+      end
+
       if options[:dry_run]
         print_dry_run @image_builds_interface.dry.update(image_build["id"], payload)
         return

data/lib/morpheus/cli/policies_command.rb

@@ -58,7 +58,7 @@ class Morpheus::Cli::PoliciesCommand
       opts.on( '-G', '--global', "Global policies only" ) do
         params[:global] = true
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List policies."
     end
     optparse.parse!(args)
@@ -390,7 +390,8 @@ class Morpheus::Cli::PoliciesCommand
           return 1
         end
         # payload['policy']['policyTypeId'] = policy_type['id']
-        payload['policy']['policyType'] = {'id' => policy_type['id']}
+        # payload['policy']['policyType'] = {'id' => policy_type['id']}
+        payload['policy']['policyType'] = {'code' => policy_type['code']}
 
         # Scope
         if user
@@ -692,7 +693,7 @@ class Morpheus::Cli::PoliciesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List policy types."
     end
     optparse.parse!(args)
@@ -712,7 +713,14 @@ class Morpheus::Cli::PoliciesCommand
       json_response = @policies_interface.list_policy_types()
       policy_types = json_response['policyTypes']
       if options[:json]
-        puts as_json(json_response)
+        puts as_json(json_response, options, "policyTypes")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "policyTypes")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(policy_types, options)
+        return 0
       else
         print_h1 "Morpheus Policy Types"
         rows = policy_types.collect {|policy_type| 

data/lib/morpheus/cli/{power_scheduling_command.rb → power_schedules_command.rb}

@@ -1,13 +1,9 @@
 require 'morpheus/cli/cli_command'
 
-class Morpheus::Cli::PowerSchedulingCommand
+class Morpheus::Cli::PowerSchedulesCommand
   include Morpheus::Cli::CliCommand
   # include Morpheus::Cli::ProvisioningHelper
-
-  # this is the only type of schedule right now
-  #set_command_name :'schedules'
-  #set_command_name :'scheduling'
-  set_command_name :'power-scheduling'
+  set_command_name :'power-schedules'
 
   register_subcommands :list, :get, :add, :update, :remove
   register_subcommands :'add-instances' => :add_instances
@@ -17,7 +13,7 @@ class Morpheus::Cli::PowerSchedulingCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @power_scheduling_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).power_scheduling
+    @power_schedules_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).power_schedules
     @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
     @servers_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).servers
   end
@@ -38,21 +34,21 @@ class Morpheus::Cli::PowerSchedulingCommand
     begin
       params.merge!(parse_list_options(options))
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.list(params)
+        print_dry_run @power_schedules_interface.dry.list(params)
         return
       end
-      json_response = @power_scheduling_interface.list(params)
+      json_response = @power_schedules_interface.list(params)
       if options[:json]
-        puts as_json(json_response, options, "powerScheduleTypes")
+        puts as_json(json_response, options, "schedules")
         return 0
       elsif options[:csv]
-        puts records_as_csv(json_response['powerScheduleTypes'], options)
+        puts records_as_csv(json_response['schedules'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options, "powerScheduleTypes")
+        puts as_yaml(json_response, options, "schedules")
         return 0
       end
-      schedules = json_response['powerScheduleTypes']
+      schedules = json_response['schedules']
       title = "Morpheus Power Schedules"
       subtitles = []
       subtitles += parse_list_subtitles(options)
@@ -107,18 +103,18 @@ class Morpheus::Cli::PowerSchedulingCommand
         return 1
       end
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.get(schedule['id'])
+        print_dry_run @power_schedules_interface.dry.get(schedule['id'])
         return
       end
-      json_response = @power_scheduling_interface.get(schedule['id'])
-      schedule = json_response['powerScheduleType']
+      json_response = @power_schedules_interface.get(schedule['id'])
+      schedule = json_response['schedule']
       instances = json_response['instances'] || []
       servers = json_response['servers'] || []
       if options[:json]
-        puts as_json(json_response, options, "powerScheduleType")
+        puts as_json(json_response, options, "schedule")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options, "powerScheduleType")
+        puts as_yaml(json_response, options, "schedule")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['schedule']], options)
@@ -236,10 +232,10 @@ class Morpheus::Cli::PowerSchedulingCommand
         payload = {'schedule' => params}
       end
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.create(payload)
+        print_dry_run @power_schedules_interface.dry.create(payload)
         return
       end
-      json_response = @power_scheduling_interface.create(payload)
+      json_response = @power_schedules_interface.create(payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -311,13 +307,13 @@ class Morpheus::Cli::PowerSchedulingCommand
       else
         # merge -O options into normally parsed options
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        payload = {'powerScheduleType' => params}
+        payload = {'schedule' => params}
       end
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.update(schedule["id"], payload)
+        print_dry_run @power_schedules_interface.dry.update(schedule["id"], payload)
         return
       end
-      json_response = @power_scheduling_interface.update(schedule["id"], payload)
+      json_response = @power_schedules_interface.update(schedule["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -356,17 +352,17 @@ class Morpheus::Cli::PowerSchedulingCommand
       end
 
       # payload = {
-      #   'powerScheduleType' => {id: schedule["id"]}
+      #   'schedule' => {id: schedule["id"]}
       # }
-      # payload['powerScheduleType'].merge!(schedule)
+      # payload['schedule'].merge!(schedule)
       payload = params
 
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.destroy(schedule["id"])
+        print_dry_run @power_schedules_interface.dry.destroy(schedule["id"])
         return
       end
 
-      json_response = @power_scheduling_interface.destroy(schedule["id"])
+      json_response = @power_schedules_interface.destroy(schedule["id"])
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -416,10 +412,10 @@ class Morpheus::Cli::PowerSchedulingCommand
         payload = {'instances' => instances.collect {|it| it['id'] } }
       end
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.add_instances(schedule["id"], payload)
+        print_dry_run @power_schedules_interface.dry.add_instances(schedule["id"], payload)
         return 0
       end
-      json_response = @power_scheduling_interface.add_instances(schedule["id"], payload)
+      json_response = @power_schedules_interface.add_instances(schedule["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -474,10 +470,10 @@ class Morpheus::Cli::PowerSchedulingCommand
         payload = {'instances' => instances.collect {|it| it['id'] } }
       end
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.remove_instances(schedule["id"], payload)
+        print_dry_run @power_schedules_interface.dry.remove_instances(schedule["id"], payload)
         return 0
       end
-      json_response = @power_scheduling_interface.remove_instances(schedule["id"], payload)
+      json_response = @power_schedules_interface.remove_instances(schedule["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -532,10 +528,10 @@ class Morpheus::Cli::PowerSchedulingCommand
         payload = {'servers' => servers.collect {|it| it['id'] } }
       end
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.add_servers(schedule["id"], payload)
+        print_dry_run @power_schedules_interface.dry.add_servers(schedule["id"], payload)
         return 0
       end
-      json_response = @power_scheduling_interface.add_servers(schedule["id"], payload)
+      json_response = @power_schedules_interface.add_servers(schedule["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -590,10 +586,10 @@ class Morpheus::Cli::PowerSchedulingCommand
         payload = {'servers' => servers.collect {|it| it['id'] } }
       end
       if options[:dry_run]
-        print_dry_run @power_scheduling_interface.dry.remove_servers(schedule["id"], payload)
+        print_dry_run @power_schedules_interface.dry.remove_servers(schedule["id"], payload)
         return 0
       end
-      json_response = @power_scheduling_interface.remove_servers(schedule["id"], payload)
+      json_response = @power_schedules_interface.remove_servers(schedule["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
@@ -624,8 +620,8 @@ class Morpheus::Cli::PowerSchedulingCommand
 
   def find_schedule_by_id(id)
     begin
-      json_response = @power_scheduling_interface.get(id.to_i)
-      return json_response['powerScheduleType']
+      json_response = @power_schedules_interface.get(id.to_i)
+      return json_response['schedule']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
         print_red_alert "Power Schedule not found by id #{id}"
@@ -636,7 +632,7 @@ class Morpheus::Cli::PowerSchedulingCommand
   end
 
   def find_schedule_by_name(name)
-    schedules = @power_scheduling_interface.list({name: name.to_s})['powerScheduleTypes']
+    schedules = @power_schedules_interface.list({name: name.to_s})['schedules']
     if schedules.empty?
       print_red_alert "Power Schedule not found by name #{name}"
       return nil

data/lib/morpheus/cli/shell.rb

@@ -335,6 +335,7 @@ class Morpheus::Cli::Shell
   end
 
   def execute_command(input)
+
     #Morpheus::Logging::DarkPrinter.puts "Shell command: #{input}"
     input = input.to_s.strip
 
@@ -529,6 +530,7 @@ class Morpheus::Cli::Shell
         return Morpheus::Cli::SourceCommand.new.handle(input.split[1..-1])
       end
       cmd_result = nil
+      @return_to_log_level = Morpheus::Logging.log_level
       begin
         argv = Shellwords.shellsplit(input)
         cmd_name = argv[0]
@@ -553,12 +555,12 @@ class Morpheus::Cli::Shell
         @history_logger.error "#{e.message}" if @history_logger
         cmd_result = Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).handle_error(e) # lol
         # exit 1
-      end
-
-      if @return_to_log_level
-        Morpheus::Logging.set_log_level(@return_to_log_level)
-        ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
-        @return_to_log_level = nil
+      ensure
+        if @return_to_log_level
+          Morpheus::Logging.set_log_level(@return_to_log_level)
+          ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
+          @return_to_log_level = nil
+        end
       end
 
       # commands should be a number or nil (treated as 0)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.5.1.1"
+    VERSION = "3.5.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.5.1.1
+  version: 3.5.1.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,6 +173,7 @@ files:
 - lib/morpheus/api/dashboard_interface.rb
 - lib/morpheus/api/deploy_interface.rb
 - lib/morpheus/api/deployments_interface.rb
+- lib/morpheus/api/execute_schedules_interface.rb
 - lib/morpheus/api/group_policies_interface.rb
 - lib/morpheus/api/groups_interface.rb
 - lib/morpheus/api/image_builder_boot_scripts_interface.rb
@@ -209,7 +210,7 @@ files:
 - lib/morpheus/api/options_interface.rb
 - lib/morpheus/api/packages_interface.rb
 - lib/morpheus/api/policies_interface.rb
-- lib/morpheus/api/power_scheduling_interface.rb
+- lib/morpheus/api/power_schedules_interface.rb
 - lib/morpheus/api/provision_types_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
@@ -251,6 +252,7 @@ files:
 - lib/morpheus/cli/edit_profile_command.rb
 - lib/morpheus/cli/edit_rc_command.rb
 - lib/morpheus/cli/error_handler.rb
+- lib/morpheus/cli/execute_schedules_command.rb
 - lib/morpheus/cli/expression_parser.rb
 - lib/morpheus/cli/groups.rb
 - lib/morpheus/cli/hosts.rb
@@ -296,7 +298,7 @@ files:
 - lib/morpheus/cli/option_types.rb
 - lib/morpheus/cli/packages_command.rb
 - lib/morpheus/cli/policies_command.rb
-- lib/morpheus/cli/power_scheduling_command.rb
+- lib/morpheus/cli/power_schedules_command.rb
 - lib/morpheus/cli/preseed_scripts_command.rb
 - lib/morpheus/cli/recent_activity_command.rb
 - lib/morpheus/cli/remote.rb