morpheus-cli 4.2.19 → 4.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 016e1e5944640601028a71e3ab47affa1bc478ce84f67153e64082f4c2a66054
-  data.tar.gz: e9a23006ef89a10875b7cd75fe67cab362d4a444e9c85d5ff2cbd2ac0496ebbb
+  metadata.gz: 53993967f9a5131702de6bd1d35c1f4f476b87cc56bff1a130737aacca8001a9
+  data.tar.gz: 7a86d5a5a788d57aa6f09d5f567f056d96f530e7d2eb2201b943c9115fa4701b
 SHA512:
-  metadata.gz: 0eeedbb93fd5da660cb68578efb3d81e1f1565461b48557ca405e40e2ae34b9916325feba18dea0af7d234fff7004a72adbe6b1750a8dda17ac0b538b0af9318
-  data.tar.gz: e5c7f57aa7f1ffa962d23bba8faa341bf98fb653042c332e7998a940e03988dd71539f6fcf84fb152eb0896a8bedc1a918156ddef6626d71fb34785f63582318
+  metadata.gz: 2c2ec20a5cd5f47cb1ca3c05867e7063cf5d78fba739467bbc3a8e6e82da0b4a59993a76668ab2e29b518d3aee85a4af3c6859adb150d8eaa643abbb54472214
+  data.tar.gz: 651c4897a8a28d8d476f0c80e73137c9530dc1cfabcc2b59898ee32cbccc27c321676d285825e61c1085630c0cb2abf8be72cb1ddfc86b33764472b3486f759c

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.19
+RUN gem install morpheus-cli -v 4.2.20
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/cloud_resource_pools_command.rb

@@ -326,6 +326,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
+        options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a resource pool." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud."
@@ -437,6 +440,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         else
           payload['resourcePool']['active'] = true
         end
+
+        # Default
+        if options['defaultPool'] != nil
+          payload['resourcePool']['defaultPool'] = options['defaultPool']
+        end
         
         # Visibility
         if options['visibility'] != nil
@@ -552,6 +560,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
+        options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a resource pool." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud." + "\n"
@@ -641,6 +652,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         if options['active'] != nil
           payload['resourcePool']['active'] = options['active']
         end
+
+        # Default
+        if options['defaultPool'] != nil
+          payload['resourcePool']['defaultPool'] = options['defaultPool']
+        end
         
         # Visibility
         if options['visibility'] != nil

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -244,15 +244,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     options = {}
     params = {}
     logo_file = nil
-    option_type_ids = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_option_type_options(opts, options, add_instance_type_option_types())
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
-          option_type_ids = []
+          params['optionTypes'] = []
         else
-          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -348,6 +347,13 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_instance_type_option_types())
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+        if list.nil?
+          params['optionTypes'] = []
+        else
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
       opts.footer = "Update an instance type." + "\n" +
                     "[name] is required. This is the name or id of a instance type."
     end
@@ -375,6 +381,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         params['hasSettings'] = ['on','true','1'].include?(params['hasSettings'].to_s) if params.key?('hasSettings')
         params['hasAutoScale'] = ['on','true','1'].include?(params['hasAutoScale'].to_s) if params.key?('hasAutoScale')
         params['hasDeployment'] = ['on','true','1'].include?(params['hasDeployment'].to_s) if params.key?('hasDeployment')
+        if params['optionTypes']
+          prompt_results = prompt_for_option_types(params, options, @api_client)
+          if prompt_results[:success]
+            params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
+        end
         if params.empty?
           puts optparse
           #option_lines = update_instance_type_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.19"
+    VERSION = "4.2.20"
   end
 end

metadata

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