morpheus-cli 3.6.13 → 3.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fb19688b8a20fe1f3f2555769b6737f870ff8a82b5af0955cc5c369936d6b27
-  data.tar.gz: 38408f32dda58a1455c5c6acc04726b6787e94731b655ddb881ed512d2f4ee7a
+  metadata.gz: aec984aa936c4514cf97141863e02468799a227e98d1f09862a5f7be773cd512
+  data.tar.gz: d491b1541ae9e74d02ba9857a475b7ab15ac7eac0901c55937bb07b5d953be71
 SHA512:
-  metadata.gz: 563dcf0b9203f1894d5159f8d31b08c066a4aaa6de99da1a9509ad0f968be79aeac2be5e659822ca50c7c663acb5d3ce02becc693c3cf1157ec19f2442e487ab
-  data.tar.gz: e959d4df1d7c084f86417d69b502e4c731efb1cdf7e45eb70c2a2858aaad5fe9876dd524a185453deafc3ab01e1f051ba8ae989f89904412ecc576d44be1fdf1
+  metadata.gz: 4d1da2f8325d05492b0e03ce8a28e7a6301361b84ce78526761de0a86a78a1d2003e11abb2fb00b4f520016cbef8a3b9a4b72aee85fe7034d9cf33505bf3b7f4
+  data.tar.gz: 1916a80f9e8b895806e40f3c29f47139b2cf2d97ad91bef6f91e000bb8233defcd71725bc09cd986e0730eba39aff45667afd9d4891e142709c39966f8da934d

data/lib/morpheus/cli/apps.rb

@@ -51,6 +51,9 @@ class Morpheus::Cli::Apps
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
         options[:created_by] = val
       end
+      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List apps."
     end
@@ -1474,9 +1477,9 @@ class Morpheus::Cli::Apps
     end
   end
 
-  def print_apps_table(apps, opts={})
+  def print_apps_table(apps, options={})
     
-    table_color = opts[:color] || cyan
+    table_color = options[:color] || cyan
     rows = apps.collect do |app|
       tiers_str = format_app_tiers(app)
       instances_str = (app['instanceCount'].to_i == 1) ? "1 Instance" : "#{app['instanceCount']} Instances"
@@ -1486,12 +1489,14 @@ class Morpheus::Cli::Apps
       cpu_usage_str = !stats ? "" : generate_usage_bar((stats['cpuUsage'] || stats['cpuUsagePeak']).to_f, 100, {max_bars: 10})
       memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
       storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
-      # if stats['maxMemory'] && stats['maxMemory'].to_i != 0
-      #   memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(7, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
-      # end
-      # if stats['maxStorage'] && stats['maxStorage'].to_i != 0
-      #   storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(7, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
-      # end
+      if options[:details]
+        if stats['maxMemory'] && stats['maxMemory'].to_i != 0
+          memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(8, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
+        end
+        if stats['maxStorage'] && stats['maxStorage'].to_i != 0
+          storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(8, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
+        end
+      end
       {
         id: app['id'],
         name: app['name'],
@@ -1528,7 +1533,7 @@ class Morpheus::Cli::Apps
     #   columns = options[:include_fields]
     # end
     # print cyan
-    print as_pretty_table(rows, columns, opts) #{color: table_color}
+    print as_pretty_table(rows, columns, options) #{color: table_color}
     print reset,"\n"
   end
 

data/lib/morpheus/cli/hosts.rb

@@ -96,6 +96,9 @@ class Morpheus::Cli::Hosts
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
         options[:created_by] = val
       end
+      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List hosts."
     end
@@ -193,12 +196,14 @@ class Morpheus::Cli::Hosts
             cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
             memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
             storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
-            # if stats['maxMemory'] && stats['maxMemory'].to_i != 0
-            #   memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(7, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
-            # end
-            # if stats['maxStorage'] && stats['maxStorage'].to_i != 0
-            #   storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(7, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
-            # end
+            if options[:details]
+              if stats['maxMemory'] && stats['maxMemory'].to_i != 0
+                memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(8, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
+              end
+              if stats['maxStorage'] && stats['maxStorage'].to_i != 0
+                storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(8, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
+              end
+            end
             row = {
               id: server['id'],
               tenant: server['account'] ? server['account']['name'] : server['accountId'],

data/lib/morpheus/cli/instances.rb

@@ -62,6 +62,9 @@ class Morpheus::Cli::Instances
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
         options[:created_by] = val
       end
+      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List instances."
     end
@@ -157,12 +160,14 @@ class Morpheus::Cli::Instances
             cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
             memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
             storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
-            # if stats['maxMemory'] && stats['maxMemory'].to_i != 0
-            #   memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(7, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
-            # end
-            # if stats['maxStorage'] && stats['maxStorage'].to_i != 0
-            #   storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(7, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
-            # end
+            if options[:details]
+              if stats['maxMemory'] && stats['maxMemory'].to_i != 0
+                memory_usage_str = memory_usage_str + cyan + format_bytes_short(stats['usedMemory']).strip.rjust(8, ' ')  + " / " + format_bytes_short(stats['maxMemory']).strip
+              end
+              if stats['maxStorage'] && stats['maxStorage'].to_i != 0
+                storage_usage_str = storage_usage_str + cyan + format_bytes_short(stats['usedStorage']).strip.rjust(8, ' ') + " / " + format_bytes_short(stats['maxStorage']).strip
+              end
+            end
             row = {
               id: instance['id'],
               name: instance['name'],
@@ -2781,7 +2786,7 @@ class Morpheus::Cli::Instances
       opts.on( nil, '--output', "Display process output." ) do
         options[:show_output] = true
       end
-      opts.on(nil, '--details', "Display more details. Shows everything, untruncated." ) do
+      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
         options[:show_events] = true
         options[:show_output] = true
         options[:details] = true

data/lib/morpheus/cli/tenants_command.rb

@@ -229,8 +229,12 @@ class Morpheus::Cli::TenantsCommand
 
   def update(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
+      opts.on('--active [on|off]', String, "Can be used to disable a network") do |val|
+        params['active'] = val.to_s.empty? || val.to_s == 'on' || val.to_s == 'true'
+      end
       build_option_type_options(opts, options, update_account_option_types)
       build_common_options(opts, options, [:options, :json, :remote, :dry_run])
     end
@@ -246,7 +250,7 @@ class Morpheus::Cli::TenantsCommand
       exit 1 if account.nil?
 
       #params = Morpheus::Cli::OptionTypes.prompt(update_account_option_types, options[:options], @api_client, options[:params])
-      params = options[:options] || {}
+      params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
       if params.empty?
         puts optparse
@@ -254,15 +258,15 @@ class Morpheus::Cli::TenantsCommand
       end
 
       #puts "parsed params is : #{params.inspect}"
-      account_keys = ['name', 'description', 'currency', 'instanceLimits']
-      account_payload = params.select {|k,v| account_keys.include?(k) }
+      #account_keys = ['name', 'description', 'currency', 'instanceLimits']
+      account_payload = params
       account_payload['currency'] = account_payload['currency'].upcase unless account_payload['currency'].to_s.empty?
-      if !account_payload['instanceLimits']
-        account_payload['instanceLimits'] = {}
-        account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-        account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-        account_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
-      end
+      # if !account_payload['instanceLimits']
+      #   account_payload['instanceLimits'] = {}
+      #   account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
+      #   account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
+      #   account_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
+      # end
       if params['role'].to_s != ''
         role = find_role_by_name(nil, params['role'])
         exit 1 if role.nil?

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.13"
+    VERSION = "3.6.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.13
+  version: 3.6.14
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler