morpheus-cli 6.0.2 → 6.1.1

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

@@ -544,13 +544,12 @@ EOT
   def update_cart(args)
     options = {}
     params = {}
-    payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("--name [name]")
       opts.on('--name [NAME]', String, "Set an optional name for your catalog order") do |val|
         options[:options]['name'] = val.to_s
       end
-      build_standard_update_options(opts, options, [:sigdig])
+      build_standard_update_options(opts, options, [:payloads, :sigdig])
       opts.footer = <<-EOT
 Update your cart settings, such as name.
 EOT
@@ -560,29 +559,26 @@ EOT
     connect(options)
     # fetch current cart
     # cart = @service_catalog_interface.get_cart()['cart']
-    payload = {}
     update_cart_object_key = 'order'
-    if options[:payload]
-      payload = options[:payload]
+    payloads = parse_payloads(options, update_cart_object_key) do |payload|
       payload.deep_merge!({update_cart_object_key => parse_passed_options(options)})
-    else
-      payload.deep_merge!({update_cart_object_key => parse_passed_options(options)})
-      payload.deep_merge!({update_cart_object_key => params})
       if payload[update_cart_object_key].empty? # || options[:no_prompt]
         raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
     end
-    @service_catalog_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.update_cart(payload)
-      return
-    end
-    json_response = @service_catalog_interface.update_cart(payload)
-    #cart = json_response['cart']
-    #cart = @service_catalog_interface.get_cart()['cart']
-    render_response(json_response, options, 'cart') do
-      print_green_success "Updated cart"
-      get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
+    process_payloads(payloads, options) do |payload|
+      @service_catalog_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_catalog_interface.dry.update_cart(payload)
+        next
+      end
+      json_response = @service_catalog_interface.update_cart(payload)
+      #cart = json_response['cart']
+      #cart = @service_catalog_interface.get_cart()['cart']
+      render_response(json_response, options, 'cart') do
+        print_green_success "Updated cart"
+        get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
     end
     return 0, nil
   end
@@ -590,7 +586,6 @@ EOT
   def add(args)
     options = {}
     params = {}
-    payload = {}
     type_id = nil
     workflow_context = nil
     workflow_target = nil
@@ -613,7 +608,7 @@ EOT
         workflow_target = val.to_s
       end
       opts.add_hidden_option('--sigdig')
-      build_standard_update_options(opts, options, [:sigdig])
+      build_standard_update_options(opts, options, [:payloads, :sigdig])
       opts.footer = <<-EOT
 Add an item to your cart
 [type] is required, this is name or id of a catalog item type.
@@ -626,13 +621,8 @@ EOT
     if args.count > 0
       type_id = args.join(" ")
     end
-    payload = {}
     add_item_object_key = 'item'
-    payload = {add_item_object_key => {} }
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({add_item_object_key => parse_passed_options(options)})
-    else
+    payloads = parse_payloads(options, add_item_object_key) do |payload|
       payload.deep_merge!({add_item_object_key => parse_passed_options(options)})
       # prompt for Type
       if type_id
@@ -725,49 +715,45 @@ EOT
     if options[:validate_only]
       params['validate'] = true
     end
-    @service_catalog_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.create_cart_item(payload, params)
-      return
-    end
-    json_response = @service_catalog_interface.create_cart_item(payload, params)
-    cart_item = json_response['item']
-    render_response(json_response, options) do
-      if options[:validate_only]
-        if json_response['success']
-          print_h2 "Validated Cart Item", [], options
-          cart_item_columns = {
-            "Type" => lambda {|it| it['type']['name'] rescue '' },
-            #"Qty" => lambda {|it| it['quantity'] },
-            "Price" => lambda {|it| it['price'] ? format_money(it['price'] , it['currency'], {sigdig:options[:sigdig] || default_sigdig}) : "No pricing configured" },
-            "Status" => lambda {|it| 
-              status_string = format_catalog_item_status(it)
-              if it['errorMessage'].to_s != ""
-                status_string << " - #{it['errorMessage']}"
-              end
-              status_string
-            },
-            #"Config" => lambda {|it| truncate_string(format_name_values(it['config']), 50) }
-          }
-          print as_pretty_table([cart_item], cart_item_columns.upcase_keys!)
-          print reset, "\n"
-          print_green_success(json_response['msg'] || "Item is valid")
-          print reset, "\n"
+    process_payloads(payloads, options) do |payload|
+      @service_catalog_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_catalog_interface.dry.create_cart_item(payload, params)
+        next
+      end
+      json_response = @service_catalog_interface.create_cart_item(payload, params)
+      cart_item = json_response['item']
+      render_response(json_response, options) do
+        if options[:validate_only]
+          if json_response['success']
+            print_h2 "Validated Cart Item", [], options
+            cart_item_columns = {
+              "Type" => lambda {|it| it['type']['name'] rescue '' },
+              #"Qty" => lambda {|it| it['quantity'] },
+              "Price" => lambda {|it| it['price'] ? format_money(it['price'] , it['currency'], {sigdig:options[:sigdig] || default_sigdig}) : "No pricing configured" },
+              "Status" => lambda {|it| 
+                status_string = format_catalog_item_status(it)
+                if it['errorMessage'].to_s != ""
+                  status_string << " - #{it['errorMessage']}"
+                end
+                status_string
+              },
+              #"Config" => lambda {|it| truncate_string(format_name_values(it['config']), 50) }
+            }
+            print as_pretty_table([cart_item], cart_item_columns.upcase_keys!)
+            print reset, "\n"
+            print_green_success(json_response['msg'] || "Item is valid")
+            print reset, "\n"
+          else
+            # not needed because it will be http 400
+            print_rest_errors(json_response, options)
+          end
         else
-          # not needed because it will be http 400
-          print_rest_errors(json_response, options)
+          print_green_success "Added item to cart"
+          get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
         end
-      else
-        print_green_success "Added item to cart"
-        get_cart([] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     end
-    if json_response['success']
-      return 0, nil
-    else
-      # not needed because it will be http 400
-      return 1, json_response['msg'] || 'request failed'
-    end
   end
 
   def update_cart_item(args)
@@ -882,7 +868,6 @@ EOT
   def checkout(args)
     options = {}
     params = {}
-    payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_standard_add_options(opts, options, [:auto_confirm, :sigdig])
@@ -936,7 +921,6 @@ EOT
   def add_order(args)
     options = {}
     params = {}
-    payload = {}
     type_id = nil
     workflow_context = nil
     workflow_target = nil
@@ -961,7 +945,7 @@ EOT
       opts.on('--target ID', String, "Target Resource (Instance or Server) for operational workflow types") do |val|
         workflow_target = val.to_s
       end
-      build_standard_add_options(opts, options, [:sigdig])
+      build_standard_add_options(opts, options, [:payloads, :sigdig])
       opts.footer = <<-EOT
 Place an order for new inventory.
 This allows creating a new order without using the cart.
@@ -978,14 +962,8 @@ EOT
     end
     payload = {}
     order_object_key = 'order'
-    payload = {order_object_key => {} }
-    passed_options = parse_passed_options(options)
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({order_object_key => passed_options}) unless passed_options.empty?
-    else
-      payload.deep_merge!({order_object_key => passed_options}) unless passed_options.empty?
-
+    payloads = parse_payloads(options, order_object_key) do |payload|
+      payload.deep_merge!({order_object_key => {}})
       # Prompt for 1-N Types
       # still_prompting = options[:no_prompt] != true
       still_prompting = true
@@ -1106,36 +1084,32 @@ EOT
       params['validate'] = true
       #payload['validate'] = true
     end
-    @service_catalog_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.create_order(payload, params)
-      return
-    end
-    json_response = @service_catalog_interface.create_order(payload, params)
-    order = json_response['order'] || json_response['cart']
-    render_response(json_response, options) do
-      if options[:validate_only]
-        if json_response['success']
-          print_h2 "Review Order", [], options
-          print_order_details(order, options)
-          print_green_success(json_response['msg'] || "Order is valid")
-          print reset, "\n"
+    process_payloads(payloads, options) do |payload|
+      @service_catalog_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_catalog_interface.dry.create_order(payload, params)
+        next
+      end
+      json_response = @service_catalog_interface.create_order(payload, params)
+      order = json_response['order'] || json_response['cart']
+      render_response(json_response, options) do
+        if options[:validate_only]
+          if json_response['success']
+            print_h2 "Review Order", [], options
+            print_order_details(order, options)
+            print_green_success(json_response['msg'] || "Order is valid")
+            print reset, "\n"
+          else
+            # not needed because it will be http 400
+            print_rest_errors(json_response, options)
+          end
         else
-          # not needed because it will be http 400
-          print_rest_errors(json_response, options)
+          print_green_success "Order placed"
+          print_h2 "Order Details", [], options
+          print_order_details(order, options)
         end
-      else
-        print_green_success "Order placed"
-        print_h2 "Order Details", [], options
-        print_order_details(order, options)
       end
     end
-    if json_response['success']
-      return 0, nil
-    else
-      # not needed because it will be http 400
-      return 1, json_response['msg'] || 'request failed'
-    end
   end
 
   def remove(args)

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

@@ -297,7 +297,29 @@ EOT
             if access.count > 0
               access.each {|it| it['access'] = format_access_string(it['access'], available_access_levels)}
 
-              if ['features', 'instance_types'].include?(field)
+              if ['features'].include?(field)
+                if access.find {|it| !it['subCategory'].to_s.empty? }
+                  rows = access.collect do |it|
+                    {
+                      code: it['code'],
+                      name: it['name'],
+                      category: it['subCategory'].to_s.titleize,
+                      access: format_access_string(it['access']),
+                    }
+                  end
+                  if options[:sort]
+                    rows.sort! {|a,b| a[options[:sort]] <=> b[options[:sort]] }
+                  else
+                    rows.sort! {|a,b| [a[:category],a[:name],a[:code]] <=> [b[:category],b[:name],b[:code]] }
+                  end
+                  if options[:direction] == 'desc'
+                    rows.reverse!
+                  end
+                  print as_pretty_table(rows, [:category, :name, :code, :access], options)
+                else
+                  print as_pretty_table(access, [:name, :code, :access], options)
+                end
+              elsif ['instance_types','report_types'].include?(field)
                 print as_pretty_table(access, [:name, :code, :access], options)
               else
                 print as_pretty_table(access, [:name, :access], options)
@@ -422,7 +444,29 @@ EOT
             if access.count > 0
               access.each {|it| it['access'] = format_access_string(it['access'], available_access_levels)}
 
-              if ['features', 'instance_types', 'report_types'].include?(field)
+              if ['features'].include?(field)
+                if access.find {|it| !it['subCategory'].to_s.empty? }
+                  rows = access.collect do |it|
+                    {
+                      code: it['code'],
+                      name: it['name'],
+                      category: it['subCategory'].to_s.titleize,
+                      access: format_access_string(it['access']),
+                    }
+                  end
+                  if options[:sort]
+                    rows.sort! {|a,b| a[options[:sort]] <=> b[options[:sort]] }
+                  else
+                    rows.sort! {|a,b| [a[:category],a[:name],a[:code]] <=> [b[:category],b[:name],b[:code]] }
+                  end
+                  if options[:direction] == 'desc'
+                    rows.reverse!
+                  end
+                  print as_pretty_table(rows, [:category, :name, :code, :access], options)
+                else
+                  print as_pretty_table(access, [:name, :code, :access], options)
+                end
+              elsif ['instance_types','report_types'].include?(field)
                 print as_pretty_table(access, [:name, :code, :access], options)
               else
                 print as_pretty_table(access, [:name, :access], options)

data/lib/morpheus/cli/mixins/backups_helper.rb

@@ -12,7 +12,7 @@ module Morpheus::Cli::BackupsHelper
     @backups_interface
   end
 
-  def backup_jobs_interfaces
+  def backup_jobs_interface
     raise "#{self.class} has not defined @backup_jobs_interface" if @backup_jobs_interface.nil?
     @backup_jobs_interface
   end

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -719,7 +719,7 @@ module Morpheus::Cli::ProvisioningHelper
     service_plan = nil
 
     prompt_service_plan = -> {
-      service_plans_json = instances_interface.service_plans({zoneId: cloud_id, layoutId: layout['id'], siteId: group_id}.merge(resource_pool.nil? ? {} : {'resourcePoolId' => resource_pool['id']}))
+      service_plans_json = instances_interface.service_plans({zoneId: cloud_id, layoutId: layout['id'], siteId: group_id}.merge(resource_pool.nil? ? {} : {'poolId' => resource_pool['id'], 'resourcePoolId' => resource_pool['id']}))
       service_plans = service_plans_json["plans"]
       if locked_fields.include?('plan.id')
         plan_id = options[:options]['plan']['id'] rescue nil
@@ -773,8 +773,8 @@ module Morpheus::Cli::ProvisioningHelper
         has_zone_pools = provision_type && provision_type["id"] && provision_type["hasZonePools"]
         if has_zone_pools
           # pluck out the resourcePoolId option type to prompt for
-          resource_pool_option_type = option_type_list.find {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
-          option_type_list = option_type_list.reject {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
+          resource_pool_option_type = option_type_list.find {|opt| ['poolId','resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
+          option_type_list = option_type_list.reject {|opt| ['poolId','resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
 
           resource_pool_options = options_interface.options_for_source('zonePools', {groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], layoutId: layout["id"]}.merge(service_plan.nil? ? {} : {planId: service_plan["id"]}))['data']
           if options[:resource_pool]
@@ -836,7 +836,7 @@ module Morpheus::Cli::ProvisioningHelper
       # add selectable datastores for resource pool
       if options[:select_datastore]
         begin
-          selectable_datastores = datastores_interface.list({'zoneId' => cloud_id, 'siteId' => group_id, 'resourcePoolId' => resource_pool['id']})
+          selectable_datastores = datastores_interface.list({'zoneId' => cloud_id, 'siteId' => group_id, 'poolId' => resource_pool['id'], 'resourcePoolId' => resource_pool['id']})
           service_plan['datastores'] = {'clusters' => [], 'datastores' => []}
           ['clusters', 'datastores'].each do |type|
             service_plan['datastores'][type] ||= []
@@ -1538,7 +1538,7 @@ module Morpheus::Cli::ProvisioningHelper
             
             if datastore_options.empty? && storage_type['hasDatastore'] != false
               begin
-                datastore_res = datastores_interface.list({'resourcePoolId' => current_root_volume['resourcePoolId'], 'zoneId' => options['zoneId'], 'siteId' => options['siteId']})['datastores']
+                datastore_res = datastores_interface.list({'poolId' => current_root_volume['resourcePoolId'], 'resourcePoolId' => current_root_volume['resourcePoolId'], 'zoneId' => options['zoneId'], 'siteId' => options['siteId']})['datastores']
                 datastore_res.each do |opt|
                   datastore_options << {'name' => opt['name'], 'value' => opt['id']}
                 end
@@ -1578,7 +1578,7 @@ module Morpheus::Cli::ProvisioningHelper
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
     network_interfaces = []
     api_params = {zoneId: zone_id, provisionTypeId: provision_type_id}.merge(options[:api_params] || {})
-    if pool_id.to_s =~ /\A\d{1,}\Z/
+    if pool_id
       api_params[:poolId] = pool_id 
     end
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.0.2"
+    VERSION = "6.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.1.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -260,7 +260,9 @@ files:
 - lib/morpheus/api/library_spec_templates_interface.rb
 - lib/morpheus/api/license_interface.rb
 - lib/morpheus/api/load_balancer_monitors_interface.rb
+- lib/morpheus/api/load_balancer_pool_nodes_interface.rb
 - lib/morpheus/api/load_balancer_pools_interface.rb
+- lib/morpheus/api/load_balancer_pools_secondary_interface.rb
 - lib/morpheus/api/load_balancer_profiles_interface.rb
 - lib/morpheus/api/load_balancer_types_interface.rb
 - lib/morpheus/api/load_balancer_virtual_servers_interface.rb
@@ -434,6 +436,7 @@ files:
 - lib/morpheus/cli/commands/library_upgrades_command.rb
 - lib/morpheus/cli/commands/license.rb
 - lib/morpheus/cli/commands/load_balancer_monitors.rb
+- lib/morpheus/cli/commands/load_balancer_pool_nodes.rb
 - lib/morpheus/cli/commands/load_balancer_pools.rb
 - lib/morpheus/cli/commands/load_balancer_profiles.rb
 - lib/morpheus/cli/commands/load_balancer_types.rb