morpheus-cli 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4160be97bfb96acf0fe1091e9e8d6ecde617bd2aba547ef1cfab8a11d6134ecf
-  data.tar.gz: 5e0675e4e1061595e560e2395625e7a7546813e68e09a8237ccd33d92aeb948d
+  metadata.gz: eb39926e3f31b77cdca9175335ca0260b720641e469a240618fc98816b2b98ee
+  data.tar.gz: ef40d39ffa3f4a6d51139524fee83dd990b082c326b528ad66a6a8e6629c43e0
 SHA512:
-  metadata.gz: a2992a310163d78082f7d748ca4ae50c673c32e7ae782497bb89f721135ed66509549c124290e9b4bd644cad2e3838c878331427ddd1090325f8946c7d30e731
-  data.tar.gz: 48ec07412e0cdcad359ea2dc050cc5017a9a39e368fb662e50b880628213fc4681b85da9cd5d8503ea7426be0fbac77b5e61d2dd8bc397ab13f0ce21695d2758
+  metadata.gz: 32d58f65d940360fdfb48ff00f88d7f2221dbe4ad1d50adbd441ee68ae79cf7fb5e1314b7d1644808a8795fa362b0e0698e0d89ef8f57187442880fc1a0fec40
+  data.tar.gz: 19f7a173551371d306edbbbde91ad910f96c5c77fe8c70ef09200ba85e50885e4533cfb36c1f6c26b3cacacb629d7459aabb569f03e71d07e0a5720e3134fc9c

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 6.0.1
+RUN gem install morpheus-cli -v 6.0.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/network_services_interface.rb

@@ -23,6 +23,22 @@ class Morpheus::NetworkServicesInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
+  def get_server(server_id)
+    execute(method: :get, url: "#{@base_url}/api/networks/servers/#{server_id}", params: {}, headers: {})
+  end
+
+  def list_servers()
+    execute(method: :get, url: "#{@base_url}/api/networks/servers", params: {}, headers: {})
+  end
+
+  def refresh(server_id)
+    url = "#{@base_url}/api/networks/servers/#{server_id}/refresh"
+
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers}
+    execute(opts)
+  end
+
   # def create(payload)
   #   url = "#{@base_url}/api/networks/services"
   #   headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

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

@@ -27,7 +27,11 @@ class Morpheus::Cli::CurlCommand
         curl_method = "DELETE"
       end
       opts.on( '--data DATA', String, "HTTP request body for use with POST and PUT, typically JSON." ) do |val|
-        curl_data = val
+        begin
+          options[:payload] = JSON.parse(val.to_s)
+        rescue => ex
+          raise ::OptionParser::InvalidOption.new("Failed to parse payload as JSON. Error: #{ex.message}")
+        end
       end
       opts.on('--absolute', "Absolute path, value can be used to prevent automatic using the automatic /api/ path prefix to the path by default.") do
         options[:absolute_path] = true

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

@@ -350,7 +350,7 @@ class Morpheus::Cli::InvoicesCommand
             if cost_rows.sum { |it| it[:extra].to_f } == 0
               cost_columns.delete("Extra".upcase)
             end
-            print as_pretty_table(cost_rows, cost_columns, options)
+            print as_pretty_table(cost_rows, cost_columns, options.merge(include_fields: nil))
           else
             print "\n"
             print yellow, "No invoice totals data", reset, "\n"

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

@@ -24,6 +24,9 @@ class Morpheus::Cli::LoadBalancers
     render_response(json_response, options, rest_object_key) do
       record = json_response[rest_object_key]
       options[:exclude_username] = record['username'].nil?
+      options[:exclude_owner] = record['owner'].nil?
+      options[:exclude_tenants] = record['tenants'].nil? || record['tenants'].empty?
+      options[:exclude_permissions] = record['resourcePermission'].nil?
       print_h1 rest_label, [], options
       print cyan
       print_description_list(rest_column_definitions(options), record, options)
@@ -125,6 +128,8 @@ EOT
       "Provider ID" => 'externalId'
     }
     columns.merge!({"Username" => 'username'}) if !options[:exclude_username]
+    columns.merge!({"Owner" => lambda { |it| it['owner']['name'] rescue '' }}) if !options[:exclude_owner]
+    columns.merge!({"Tenants" => lambda { |it| it['tenants'].collect {|tenant| tenant['name']}.join(', ') rescue '' }}) if !options[:exclude_tenants]
     columns.merge({
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }

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

@@ -7,7 +7,7 @@ class Morpheus::Cli::NetworkServicesCommand
   set_command_name :'network-services'
 
   # register_subcommands :list, :get, :add, :update, :remove
-  register_subcommands :list
+  register_subcommands :list, :refresh
   
   # set_default_subcommand :list
   
@@ -90,6 +90,43 @@ class Morpheus::Cli::NetworkServicesCommand
       exit 1
     end
   end
+
+  def refresh(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 = "Refresh a network integration/server.\n" +
+                    "[name] is required. This is the name or id of a network server/integration."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      server = find_network_server_by_name_or_id(args[0])
+      if !server
+        exit 1
+      end
+     @network_services_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_services_interface.dry.refresh(server['id'])
+        return
+      end
+      json_response = @network_services_interface.refresh(server['id'])
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif !options[:quiet]
+        print_green_success "Refreshing #{server["name"]}"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
   
 
   private
@@ -136,4 +173,26 @@ class Morpheus::Cli::NetworkServicesCommand
     end
   end
 
+  def find_network_server_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_server_by_id(val)
+    else
+      return find_network_service_by_name(val)
+    end
+  end
+
+  def find_network_server_by_id(id)
+    begin
+      json_response = @network_services_interface.get_server(id.to_i)
+      return json_response['networkServer']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Service not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
 end

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

@@ -326,6 +326,18 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on('--max-cores NUMBER', String, "Max cores") do |val|
         ((params['config'] ||= {})['ranges'] ||= {})['maxCores'] = val.to_i
       end
+      opts.on('--min-sockets NUMBER', String, "Min sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minSockets'] = val.to_i
+      end
+      opts.on('--max-sockets NUMBER', String, "Max sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxSockets'] = val.to_i
+      end
+      opts.on('--min-cores-per-socket NUMBER', String, "Min cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minCoresPerSocket'] = val.to_i
+      end
+      opts.on('--max-cores-per-socket NUMBER', String, "Max cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxCoresPerSocket'] = val.to_i
+      end
       add_perms_options(opts, options, ['plans', 'groupDefaults'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Create service plan"
@@ -429,6 +441,16 @@ class Morpheus::Cli::ServicePlanCommand
           {'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxCores', 'fieldLabel' => 'Max Cores', 'type' => 'number', 'displayOrder' => 8}
         ]
 
+        if provision_type['hasSocketRange']
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minSockets', 'fieldLabel' => 'Min Sockets', 'type' => 'number', 'displayOrder' => 9})
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxSockets', 'fieldLabel' => 'Max Sockets', 'type' => 'number', 'displayOrder' => 10})
+        end
+
+        if provision_type['hasCoresPerSocketRange']
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'minCoresPerSocket', 'fieldLabel' => 'Min Cores Per Socket', 'type' => 'number', 'displayOrder' => 11})
+          addn_options.push({'fieldContext' => 'config.ranges', 'fieldGroup' => 'Custom Ranges', 'fieldName' => 'maxCoresPerSocket', 'fieldLabel' => 'Max Cores Per Socket', 'type' => 'number', 'displayOrder' => 12})
+        end
+
         v_prompt = Morpheus::Cli::OptionTypes.prompt(addn_options, options[:options], @api_client, params)
         params.deep_merge!(v_prompt)
 
@@ -575,6 +597,18 @@ class Morpheus::Cli::ServicePlanCommand
       end
       opts.on('--max-cores NUMBER', String, "Max cores") do |val|
         ((params['config'] ||= {})['ranges'] ||= {})['maxCores'] = val.to_i
+      end
+       opts.on('--min-sockets NUMBER', String, "Min sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minSockets'] = val.to_i
+      end
+      opts.on('--max-sockets NUMBER', String, "Max sockets") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxSockets'] = val.to_i
+      end
+      opts.on('--min-cores-per-socket NUMBER', String, "Min cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['minCoresPerSocket'] = val.to_i
+      end
+      opts.on('--max-cores-per-socket NUMBER', String, "Max cores per socket") do |val|
+        ((params['config'] ||= {})['ranges'] ||= {})['maxCoresPerSocket'] = val.to_i
       end
       add_perms_options(opts, options, ['plans', 'groupDefaults'])
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])

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

@@ -777,15 +777,21 @@ module Morpheus::Cli::ProvisioningHelper
           option_type_list = option_type_list.reject {|opt| ['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']
-          resource_pool = resource_pool_options.find {|opt| opt['id'] == options[:resource_pool].to_i} if options[:resource_pool]
+          if options[:resource_pool]
+            resource_pool = resource_pool_options.find {|opt| opt['value'] == options[:resource_pool].to_s || opt['value'] == "pool-#{options[:resource_pool]}"}
+          end
           pool_required = provision_type["zonePoolRequired"]
-
+          # Should pool_id have the pool-,poolGroup- prefix or not?
+          use_pool_prefix = resource_pool_options.find {|opt| opt['value'].to_s.include?("pool") }
           if resource_pool
-            pool_id = resource_pool['id']
+            pool_id = resource_pool['id'] # id or value?
           else
             if options[:default_resource_pool]
               default_resource_pool = resource_pool_options.find {|rp| rp['id'] == options[:default_resource_pool]}
             end
+            if use_pool_prefix && options[:options]['config'] && options[:options]['config']['resourcePoolId'] && !options[:options]['config']['resourcePoolId'].to_s.include?("pool")
+              options[:options]['config']['resourcePoolId'] = "pool-" + options[:options]['config']['resourcePoolId'].to_s
+            end
             resource_pool_option_type ||= {'fieldContext' => 'config', 'fieldName' => 'resourcePoolId', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => pool_required, 'skipSingleOption' => true, 'description' => 'Select resource pool.', 'defaultValue' => default_resource_pool ? default_resource_pool['name'] : nil}
             resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{}, no_prompt, true)
             resource_pool_prompt.deep_compact!
@@ -796,7 +802,7 @@ module Morpheus::Cli::ProvisioningHelper
             elsif resource_pool_prompt[resource_pool_option_type['fieldName']]
               pool_id = resource_pool_prompt[resource_pool_option_type['fieldName']]
             end
-            resource_pool ||= resource_pool_options.find {|it| it['id'] == pool_id}
+            resource_pool ||= resource_pool_options.find {|it| it['value'].to_s == pool_id.to_s}
           end
         end
       end

data/lib/morpheus/cli/option_types.rb

@@ -582,6 +582,9 @@ module Morpheus
 
         if no_prompt
           if !value_found
+            if default_value == ""
+              default_value = nil
+            end
             if !default_value.nil? && !select_options.nil?
               matched_option = select_options.find {|it| it[value_field].to_s == default_value.to_s }
               if matched_option.nil?

data/lib/morpheus/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler