morpheus-cli 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49afeaaa11ed794659cc20a46d3fc145990269dc96f1394a1cd95160bbc2f786
-  data.tar.gz: cdcf88755b1638f3d1816dde28dcfea8f8c6be27b9300bdfc3c6e4798d3937dd
+  metadata.gz: c8074c5d41cd8ca2aa6f199a0b85f22f7c2b8d3647b2788604d42424b7abbd9b
+  data.tar.gz: 8176b21a71b63466b537ca4d43933e06411ae374cbb159ab451f4e37042299e5
 SHA512:
-  metadata.gz: 56f27f9ab0323061846e4b3df32d570efff1b944083fe27700a9d729540ad605a1a39a5c2005cc5a0e19880d5f039a7aa3dbc12ff2c31c9b511426ec736f83a7
-  data.tar.gz: 7d98ac1e35e7929f3f73ff3968d3a2d1221629d1a2c07d7cdd916b2aa184ca2d30041eaeaf2ac5d53c653650a0a36e0c39a33bebbb9bf02bdcf3e4f84e5173c8
+  metadata.gz: 05414d569b3e9d323ca0ebf0ff86778e9656f84b92af1a2e6520e826351dc444eb1c6d6721ef7137ffbe603be703832dcd15f4e14c31f28005b6de7c2cc454f8
+  data.tar.gz: fca09ddb93cf6cc58401d1652803a61d220fe9999427a931b0fed515c5a8e0a2933013299323722739a7f65c9b9b42edffe4a62972cad85e9b5651a4fcded2df

data/Dockerfile

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

data/lib/morpheus/api/appliance_settings_interface.rb

@@ -25,6 +25,13 @@ class Morpheus::ApplianceSettingsInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def locales(params={})
+    url = "#{base_path}/locales"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def maintenance(params={}, payload={})
     url = "#{base_path}/maintenance"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/virtual_images_interface.rb

@@ -44,6 +44,12 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def convert(id, payload)
+    url = "#{@base_url}/api/virtual-images/#{id}/convert"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
   def destroy(id, params={})
     url = "#{@base_url}/api/virtual-images/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

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

@@ -7,7 +7,7 @@ class Morpheus::Cli::ApplianceSettingsCommand
   set_command_name :'appliance-settings'
 
   register_subcommands :get, :update, :toggle_maintenance, :'reindex'
-  
+
   set_default_subcommand :get
 
   def connect(opts)
@@ -33,7 +33,7 @@ class Morpheus::Cli::ApplianceSettingsCommand
       raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
       return 1
     end
-    
+
     begin
       @appliance_settings_interface.setopts(options)
 
@@ -220,6 +220,25 @@ class Morpheus::Cli::ApplianceSettingsCommand
       opts.on("--stats-retainment-period DAYS", Integer, "Stats retainment period. The number of days stats should be available. Can be 30, 60, or 90.") do |val|
         params['statsRetainmentPeriod'] = val.to_i
       end
+      opts.on("--cloud-sync-interval-seconds SECONDS", Integer, "Cloud sync interval in seconds") do |val|
+        params['cloudSyncIntervalSeconds'] = val.to_i
+      end
+      opts.on("--cluster-sync-interval-seconds SECONDS", Integer, "Cluster sync interval in seconds") do |val|
+        params['clusterSyncIntervalSeconds'] = val.to_i
+      end
+      opts.on("--usage-retainment-period DAYS", Integer, "Retainment period for usage records") do |val|
+        params['usageRetainmentPeriod'] = val.to_i
+      end
+      opts.on("--invoice-retainment-period DAYS", Integer, "Retainment period for invoice records") do |val|
+        params['invoiceRetainmentPeriod'] = val.to_i
+      end
+      opts.on("--max-option-list-size NUMBER", Integer, "Max option list size (x10^3)") do |val|
+        params['maxOptionListSize'] = val.to_i
+      end
+      opts.on("--default-locale STRING", String, "Default locale for the appliance") do |val|
+        params['defaultLocale'] = val == 'null' ? nil : val
+      end
+
       build_common_options(opts, options, [:json, :payload, :dry_run, :quiet, :remote])
     end
 

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

@@ -506,7 +506,7 @@ class Morpheus::Cli::Apps
               # prompt for cloudFormation config
               # todo
             else
-              print yellow, "Unknown template type: #{template_type})", "\n"
+              print yellow, "Unknown template type: #{blueprint_type})", "\n"
             end
           end
         end

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

@@ -1183,7 +1183,7 @@ EOT
 
     # Details (zoneType.optionTypes)
 
-    if cloud_type && cloud_type['optionTypes']
+    if cloud_type && cloud_type['optionTypes'] && cloud_type['code'] != 'standard'
       if !cloud_type['optionTypes'].find {|opt| opt['type'] == 'credential'}
         tmp_option_types << {'fieldName' => 'type', 'fieldLabel' => 'Credentials', 'type' => 'credential', 'optionSource' => 'credentials', 'required' => true, 'defaultValue' => 'local', 'config' => {'credentialTypes' => get_cloud_type_credential_types(cloud_type['code'])}, 'displayOrder' => 7}
         cloud_type['optionTypes'].select {|opt| ['username', 'password', 'serviceUsername', 'servicePassword'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}

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

@@ -6,7 +6,7 @@ class Morpheus::Cli::VirtualImages
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
 
-  register_subcommands :list, :get, :add, :add_file, :remove_file, :update, :remove, :types => :virtual_image_types
+  register_subcommands :list, :get, :add, :add_file, :remove_file, :update, :remove, :convert, :types => :virtual_image_types
   register_subcommands :list_locations, :get_location, :remove_location
 
   # def initialize() 
@@ -302,7 +302,7 @@ EOT
     options = {}
     tenants_list = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [options]")
+      opts.banner = subcommand_usage("[image] [options]")
       opts.on('--tenants LIST', Array, "Tenant Access, comma separated list of account IDs") do |list|
         if list.size == 1 && list[0] == 'null' # hacky way to clear it
           tenants_list = []
@@ -324,7 +324,7 @@ EOT
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a virtual image." + "\n" +
-                    "[name] is required. This is the name or id of a virtual image."
+                    "[image] is required. This is the name or id of a virtual image."
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -377,6 +377,56 @@ EOT
     
   end
 
+  def convert(args)
+    image_name = args[0]
+    options = {}
+    # storageProviderId, format, name
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[image] [options]")
+      opts.on('-n', '--name NAME', String, "Name (optional) of the new converted image. Default is name of the original image.") do |val|
+        options[:options]['name'] = val
+      end
+      opts.on('-f', '--format FORMAT', String, "Format (optional). Default is 'qcow2'") do |val|
+        options[:options]['format'] = val
+      end
+      opts.on('--storageProvider VALUE', String, "Storage Provider ID (optional). Default is storage provider of the original image.") do |val|
+        options[:options]['storageProvider'] = val.to_s
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Convert a virtual image to a new format." + "\n" +
+        "[image] is required. This is the name or id of a virtual image."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1, max:4)
+
+    connect(options)
+
+    virtual_image = find_virtual_image_by_name_or_id(image_name)
+    return 1, "Virtual image not found for #{image_name}" if virtual_image.nil?
+
+    passed_options = parse_passed_options(options)
+    payload = nil
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({virtual_image_object_key => passed_options}) unless passed_options.empty?
+    else
+      virtual_image_payload = passed_options
+      virtual_image_payload['storageProvider'] = {'id' => virtual_image_payload['storageProvider']} unless virtual_image_payload['storageProvider'].nil?
+      payload = virtual_image_payload
+    end
+    @virtual_images_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @virtual_images_interface.dry.convert(virtual_image['id'], payload)
+      return
+    end
+    json_response = @virtual_images_interface.convert(virtual_image['id'], payload)
+    render_response(json_response, options, 'virtualImage') do
+      print_green_success "Updated virtual image #{virtual_image['name']}"
+      _get(virtual_image["id"], {}, options)
+    end
+    return 0, nil
+  end
+
   def virtual_image_types(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -621,7 +671,7 @@ EOT
     do_gzip = false
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [filepath]")
+      opts.banner = subcommand_usage("[image] [filepath]")
       opts.on('--filename FILENAME', String, "Filename for uploaded file. Derived from [filepath] by default." ) do |val|
         file_name = val
       end
@@ -633,7 +683,7 @@ EOT
       end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "Upload a virtual image file." + "\n" +
-                    "[name] is required. This is the name or id of a virtual image." + "\n" +
+                    "[image] is required. This is the name or id of a virtual image." + "\n" +
                     "[filepath] or --url is required. This is location of the virtual image file."
     end
     optparse.parse!(args)
@@ -700,7 +750,7 @@ EOT
   def remove_file(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [filename]")
+      opts.banner = subcommand_usage("[image] [filename]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)

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

@@ -509,13 +509,15 @@ module Morpheus::Cli::PrintHelper
     bars = []
     percent = 0
     percent_sigdig = opts[:percent_sigdig] || 2
-    if max_value.to_i == 0
+    if max_value.nil?
       percent = 0
+    elsif max_value == 0
+      percent = used_value.to_f == 0 ? 0 : 100
     else
       percent = ((used_value.to_f / max_value.to_f) * 100)
     end
     unlimited_label = opts[:unlimited_label] || "n/a" 
-    percent_label = ((used_value.nil? || max_value.to_f == 0.0) ? unlimited_label : "#{percent.round(percent_sigdig)}%").rjust(6, ' ')
+    percent_label = (max_value.nil? ? unlimited_label : "#{percent.round(percent_sigdig)}%").rjust(6, ' ')
     bar_display = ""
     if percent > 100
       max_bars.times { bars << "|" }

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

@@ -508,16 +508,17 @@ module Morpheus::Cli::ProvisioningHelper
 
     while instance_name.nil? do
       name_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Instance Name', 'type' => 'text', 'required' => options[:name_required], 'defaultValue' => options[:default_name]}], options[:options])
-
-      if name_prompt['name'].nil? && !options[:name_required]
+      name = name_prompt['name']
+      if name.nil? && !options[:name_required]
         break
       else
-        if instances_interface.list({name: name_prompt['name']})['instances'].empty?
-          instance_name = name_prompt['name']
+        if instances_interface.list({name: name})['instances'].empty?
+          instance_name = name
         else
-          print_red_alert "Name must be unique"
+          print_red_alert "Name must be unique, #{name} already exists"
+          options[:options].delete('name')
           exit 1 if no_prompt
-          if options[:default_name] == name_prompt['name']
+          if options[:default_name] == name
             options[:default_name] += '-2'
           end
         end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.0"
+    VERSION = "8.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix