morpheus-cli 6.1.0 → 6.1.1

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/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.1.0"
+    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.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-20 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