morpheus-cli 4.1.10 → 4.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090c9aa2420e68bbded20a8277e475990ce50a2b45adc63cb93d9d3f2fb3cf79'
-  data.tar.gz: e60d21d206cdf6de9a8658597e3f2bfa58cb193693306029df243755384247b5
+  metadata.gz: eeb2d7ec5bf66114a982cf7167ffbc735298681c111d32b5763250ee517c8c63
+  data.tar.gz: 2cba59bb697b00839d91d1c86caa3bdd843c9728b359ddc7559c53df76d7432f
 SHA512:
-  metadata.gz: eae9a2c5fea6a4da28738c130ed8d4087aece62b6770ec15a19ce8bfe845b05fe78be2ced93d62d9dacc2ae895359a6eebd126a7941b8cdb8ee546f2943b8f4b
-  data.tar.gz: dff2a2f2511f56b9f4da2b278f3cd49aacc7dea276b711a484c8448115abf3db9d743a0db2bf9ea7c5c9ce1aa5bff51fdcf83e604e3c8d2ce6b892dbe4eef3de
+  metadata.gz: c369bb2c1db1042532cd5c8ba443c0a3cb1d4a6da31267a1ef0b3f907add7f02f6e13c616ce9f264c77a7501ff277bf3f83f11cb20977b202d693e7c24cae194
+  data.tar.gz: 4554a65db783b20932aa54677b7b0811a3692543f1654c0bdc9e8f9b77496d71adb5e9b00a7cf0c21bdbf6372249cf044cd8f9b71865cab74e4ea973a997b97b

data/Dockerfile

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

data/lib/morpheus/api/networks_interface.rb

@@ -26,14 +26,14 @@ class Morpheus::NetworksInterface < Morpheus::APIClient
   def create(payload)
     url = "#{@base_url}/api/networks"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json, timeout: 300}
     execute(opts)
   end
 
   def update(id, payload)
     url = "#{@base_url}/api/networks/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json, timeout: 300}
     execute(opts)
   end
 

data/lib/morpheus/cli/instances.rb

@@ -491,7 +491,7 @@ class Morpheus::Cli::Instances
         params['powerScheduleType'] = val == "null" ? nil : val
       end
       opts.on('--created-by ID', String, "Created By User ID") do |val|
-        params['createdById'] = val
+        options[:created_by_id] = val
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
@@ -543,13 +543,16 @@ class Morpheus::Cli::Instances
           payload['instance'].deep_merge!(params)
         end
       else
-        if params.empty?
+        if params.empty? && options[:created_by_id].nil?
           print_red_alert "Specify at least one option to update"
           puts optparse
           exit 1
         end
         payload = {}
         payload['instance'] = params
+        if options[:created_by_id]
+          payload['createdById'] = options[:created_by_id].to_i
+        end
       end
       @instances_interface.setopts(options)
       if options[:dry_run]

data/lib/morpheus/cli/library_cluster_layouts_command.rb

@@ -199,13 +199,14 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
               short_name: container['shortName'],
               version: container['containerVersion'],
               category: container['category'],
-              count: server['nodeCount']
+              count: server['nodeCount'],
+              priority: server['priorityOrder']
           }
         end
 
         if nodes.count > 0
           print_h2 "#{node_type.capitalize} Nodes"
-          puts as_pretty_table(nodes, [:id, :name, :short_name, :version, :category, :count])
+          puts as_pretty_table(nodes, [:id, :name, :short_name, :version, :category, :count, :priority])
         end
       end
       print reset,"\n"
@@ -266,10 +267,10 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.on('-o', '--option-types LIST', Array, "Option types, comma separated list of option type IDs") do |val|
         options[:optionTypes] = val
       end
-      opts.on('--masters LIST', Array, "List of master. Comma separated container types IDs in format id[/count], ex: 100,101/3") do |val|
+      opts.on('--masters LIST', Array, "List of master. Comma separated container types IDs in format id[/count/priority], ex: 100,101/3/0") do |val|
         options[:masters] = val
       end
-      opts.on('--workers LIST', Array, "List of workers. Comma separated container types IDs in format id[/count], ex: 100,101/3") do |val|
+      opts.on('--workers LIST', Array, "List of workers. Comma separated container types IDs in format id[/count/priority], ex: 100,101/3/1") do |val|
         options[:workers] = val
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -412,34 +413,38 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
         params['optionTypes'] = option_types if option_types
 
         # nodes
+        priority = 0
         ['master', 'worker'].each do |node_type|
           nodes = []
           if cluster_type["has#{node_type.capitalize}s"]
             if options["#{node_type}s".to_sym]
               options["#{node_type}s".to_sym].each do |container_type_id|
-                count = 1
+                node_count = 1
                 if container_type_id.include?('/')
                   parts = container_type_id.split('/')
                   container_type_id = parts[0]
-                  count = parts[1].to_i if parts.count > 1
+                  node_count = parts[1].to_i if parts.count > 1
+                  priority = parts[2].to_i if parts.count > 2
                 end
 
                 if @library_container_types_interface.get(nil, container_type_id.to_i).nil?
                   print_red_alert "Container type #{container_type_id} not found"
                   exit 1
                 else
-                  nodes << {'nodeCount' => count, 'containerType' => {'id' => container_type_id.to_i}}
+                  nodes << {'nodeCount' => node_count, 'priorityOrder' => priority, 'containerType' => {'id' => container_type_id.to_i}}
                 end
               end
             else
               avail_container_types = @library_container_types_interface.list(nil, {'technology' => provision_type['code'], 'max' => 1000})['containerTypes'].collect {|it| {'name' => it['name'], 'value' => it['id']}}
               while !avail_container_types.empty? && Morpheus::Cli::OptionTypes.confirm("Add #{nodes.empty? ? '' : 'another '}#{node_type} node?", {:default => false}) do
                 container_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'select', 'fieldLabel' => "#{node_type.capitalize} Node", 'selectOptions' => avail_container_types, 'required' => true}],options[:options],@api_client,{}, options[:no_prompt], true)['value']
-                count = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => "#{node_type.capitalize} Node Count", 'required' => true, 'defaultValue' => 1}], options[:options], @api_client, {}, options[:no_prompt])['value']
-                nodes << {'nodeCount' => count, 'containerType' => {'id' => container_type_id.to_i}}
+                node_count = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => "#{node_type.capitalize} Node Count", 'required' => true, 'defaultValue' => 1}], options[:options], @api_client, {}, options[:no_prompt])['value']
+                priority = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'value', 'type' => 'number', 'fieldLabel' => "#{node_type.capitalize} Priority", 'required' => true, 'defaultValue' => priority}], options[:options], @api_client, {}, options[:no_prompt])['value']
+                nodes << {'nodeCount' => node_count, 'priorityOrder' => priority, 'containerType' => {'id' => container_type_id.to_i}}
                 avail_container_types.reject! {|it| it['value'] == container_type_id}
               end
             end
+            priority += 1
           end
           params["#{node_type}s"] = nodes
         end
@@ -526,13 +531,13 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.on(nil, '--clear-opt-types', "Removes all options") do
         params['optionTypes'] = []
       end
-      opts.on('--masters LIST', Array, "List of master nodes. Comma separated container types IDs in format id[/count], ex: 100,101/3") do |val|
+      opts.on('--masters LIST', Array, "List of master. Comma separated container types IDs in format id[/count/priority], ex: 100,101/3/0") do |val|
         options[:masters] = val
       end
       opts.on('--clear-masters', Array, "Removes all master nodes") do
         params['masters'] = []
       end
-      opts.on('--workers LIST', Array, "List of workers. Comma separated container types IDs in format id[/count], ex: 100,101/3") do |val|
+      opts.on('--workers LIST', Array, "List of workers. Comma separated container types IDs in format id[/count/priority], ex: 100,101/3/1") do |val|
         options[:workers] = val
       end
       opts.on('--clear-workers', Array, "Removes all worker nodes") do
@@ -619,18 +624,22 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
               exit 1
             else
               options["#{node_type}s".to_sym].each do |container_type_id|
-                count = 1
+                node_count = 1
+                priority = nil
                 if container_type_id.include?('/')
                   parts = container_type_id.split('/')
                   container_type_id = parts[0]
-                  count = parts[1].to_i if parts.count > 1
+                  node_count = parts[1].to_i if parts.count > 1
+                  priority = parts[2].to_i if parts.count > 2
                 end
 
                 if @library_container_types_interface.get(nil, container_type_id.to_i).nil?
                   print_red_alert "Container type #{container_type_id} not found"
                   exit 1
                 else
-                  nodes << {'nodeCount' => count, 'containerType' => {'id' => container_type_id.to_i}}
+                  node = {'nodeCount' => node_count, 'containerType' => {'id' => container_type_id.to_i}}
+                  node['priorityOrder'] = priority if !priority.nil?
+                  nodes << node
                 end
               end
             end

data/lib/morpheus/cli/library_resource_specs_command.rb

@@ -41,17 +41,8 @@ class Morpheus::Cli::LibraryResourceSpecsCommand
       end
       # do it
       json_response = @resource_specs_interface.list(params)
-      # print result and return output
-      if options[:json]
-        puts as_json(json_response, options, "specs")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['specTemplates'], options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "specs")
-        return 0
-      end
+      render_result = render_with_format(json_response, options, 'specTemplates')
+      return 0 if render_result
       resource_specs = json_response['specTemplates']
       title = "Morpheus Library - Resource Spec Templates"
       subtitles = []

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.1.10"
+    VERSION = "4.1.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.10
+  version: 4.1.11
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -438,7 +438,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance