morpheus-cli 3.6.12 → 3.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 662d9e93e1e871b6f955e6db6da0534fd9018f303fa9f77be33b4985e9b7aeff
-  data.tar.gz: e9728d099bc08d4f9a2ffbd1292e8d9d8ebe337e56673e10673fd464e9d03a46
+  metadata.gz: 2fb19688b8a20fe1f3f2555769b6737f870ff8a82b5af0955cc5c369936d6b27
+  data.tar.gz: 38408f32dda58a1455c5c6acc04726b6787e94731b655ddb881ed512d2f4ee7a
 SHA512:
-  metadata.gz: 9e55742378c6bd60dff897dad5b773e8127e82eae92b77b896954beb419b0853c5a576865ead400cad65fa4a6617a2b6d8e308a9d5d604725ada4b7dd1d49550
-  data.tar.gz: b8237f9eae9f570e0efc86ebb05f322a723bcf9b349c9621d7335732e96009d249d0089c88e6a41e26f51c611f5130c44058cbca3e7614393a9469bbfeae0ed0
+  metadata.gz: 563dcf0b9203f1894d5159f8d31b08c066a4aaa6de99da1a9509ad0f968be79aeac2be5e659822ca50c7c663acb5d3ce02becc693c3cf1157ec19f2442e487ab
+  data.tar.gz: e959d4df1d7c084f86417d69b502e4c731efb1cdf7e45eb70c2a2858aaad5fe9876dd524a185453deafc3ab01e1f051ba8ae989f89904412ecc576d44be1fdf1

data/lib/morpheus/api/clouds_interface.rb

@@ -8,9 +8,9 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def cloud_types()
+  def cloud_types(params={})
     url = "#{@base_url}/api/zone-types"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end

data/lib/morpheus/cli/account_groups_command.rb

@@ -3,7 +3,6 @@ require 'yaml'
 require 'io/console'
 require 'rest_client'
 require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/accounts_helper'
 require 'morpheus/cli/mixins/infrastructure_helper'
@@ -20,7 +19,7 @@ class Morpheus::Cli::AccountGroupsCommand
   # lives under image-builder domain right now
   set_command_hidden
   def command_name
-    "account groups"
+    "tenants groups"
   end
 
   def initialize()
@@ -44,18 +43,19 @@ class Morpheus::Cli::AccountGroupsCommand
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:account, :list, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "List groups for a tenant account."
+      opts.banner = subcommand_usage("[tenant]")
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List tenant groups."
     end
     optparse.parse!(args)
+    if args.count == 1
+      options[:account] = args[0]
+    else
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
     connect(options)
     begin
       # load account
-      if options[:account].nil? && options[:account_id].nil? && options[:account_name].nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: -a [account]\n#{optparse}"
-        return 1
-      end
       account = find_account_from_options(options)
       return 1 if account.nil?
       account_id = account['id']
@@ -78,14 +78,14 @@ class Morpheus::Cli::AccountGroupsCommand
         return 0
       end
       groups = json_response['groups']
-      title = "Morpheus Groups - Account: #{account['name']}"
+      title = "Morpheus Groups - Tenant: #{account['name']}"
       subtitles = []
       subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
+      print_h1 title, subtitles, options
       if groups.empty?
         print yellow,"No groups currently configured.",reset,"\n"
       else
-        print_groups_table(groups)
+        print_groups_table(groups, options)
         print_results_pagination(json_response)
       end
       print reset,"\n"
@@ -98,41 +98,39 @@ class Morpheus::Cli::AccountGroupsCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[group]")
-      build_common_options(opts, options, [:account, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "This outputs details about a specific group for a tenant account."
+      opts.banner = subcommand_usage("[tenant] [group]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a tenant group."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
+    if args.count == 2
+      options[:account] = args[0]
+      options[:group] = args[1]
+    else
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
     begin
-      # load account
-      if options[:account].nil? && options[:account_id].nil? && options[:account_name].nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: -a [account]\n#{optparse}"
-        return 1
-      end
+
       account = find_account_from_options(options)
       return 1 if account.nil?
       account_id = account['id']
 
       if options[:dry_run]
         @account_groups_interface.setopts(options)
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @account_groups_interface.dry.get(account_id, args[0].to_i)
+        if options[:group].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @account_groups_interface.dry.get(account_id, options[:group].to_i)
         else
-          print_dry_run @account_groups_interface.dry.get(account_id, {name: args[0]})
+          print_dry_run @account_groups_interface.dry.get(account_id, {name: options[:group]})
         end
         return
       end
 
-      group = find_account_group_by_name_or_id(account_id, args[0])
+      group = find_account_group_by_name_or_id(account_id, options[:group])
       @account_groups_interface.setopts(options)
       return 1 if group.nil?
       # skip redundant request
-      # json_response = @account_groups_interface.dry.get(account_id, args[0].to_i)
+      # json_response = @account_groups_interface.dry.get(account_id, options[:group].to_i)
       json_response = {"group" => group}
       
       if options[:json]
@@ -146,7 +144,7 @@ class Morpheus::Cli::AccountGroupsCommand
         return 0
       end
 
-      print_h1 "Group Details"
+      print_h1 "Group Details", options
       print cyan
       description_cols = {
         "ID" => 'id',
@@ -179,35 +177,34 @@ class Morpheus::Cli::AccountGroupsCommand
     params = {}
     use_it = false
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[tenant] [name]")
       build_option_type_options(opts, options, add_group_option_types())
       # opts.on( '-l', '--location LOCATION', "Location" ) do |val|
       #   params[:location] = val
       # end
 
-      build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
-      opts.footer = "Create a new group for a tenant account."
+      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      opts.footer = "Create a new tenant group."
     end
     optparse.parse!(args)
-    # if args.count < 1
-    #   puts optparse
-    #   exit 1
-    # end
+    if args.count == 1
+      options[:account] = args[0]
+    elsif args.count == 2
+      options[:account] = args[0]
+      options[:group] = args[1]
+    else
+      raise_command_error "wrong number of arguments, expected 1-2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
     connect(options)
     begin
-      # load account
-      if options[:account].nil? && options[:account_id].nil? && options[:account_name].nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: -a [account]\n#{optparse}"
-        return 1
-      end
       account = find_account_from_options(options)
       return 1 if account.nil?
       account_id = account['id']
 
       group_payload = {}
-      if args[0]
-        group_payload[:name] = args[0]
-        options[:options]['name'] = args[0] # to skip prompt
+      if options[:group]
+        group_payload[:name] = options[:group]
+        options[:options]['name'] = options[:group] # to skip prompt
       end
       if params[:location]
         group_payload[:name] = params[:location]
@@ -242,31 +239,28 @@ class Morpheus::Cli::AccountGroupsCommand
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[group] [options]")
+      opts.banner = subcommand_usage("[tenant] [group] [options]")
       build_option_type_options(opts, options, update_group_option_types())
       # opts.on( '-l', '--location LOCATION', "Location" ) do |val|
       #   params[:location] = val
       # end
       build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
-      opts.footer = "Update an existing group for a tenant account."
+      opts.footer = "Update an existing tenant group."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
+    if args.count == 2
+      options[:account] = args[0]
+      options[:group] = args[1]
+    else
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
     begin
-      # load account
-      if options[:account].nil? && options[:account_id].nil? && options[:account_name].nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: -a [account]\n#{optparse}"
-        return 1
-      end
       account = find_account_from_options(options)
       return 1 if account.nil?
       account_id = account['id']
 
-      group = find_account_group_by_name_or_id(account_id, args[0])
+      group = find_account_group_by_name_or_id(account_id, options[:group])
       return 1 if group.nil?
 
       group_payload = {id: group['id']}
@@ -303,32 +297,30 @@ class Morpheus::Cli::AccountGroupsCommand
   def add_cloud(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[group]", "[cloud]")
+      opts.banner = subcommand_usage("[tenant] [group] [cloud]")
       build_common_options(opts, options, [:account, :json, :dry_run, :remote])
-      opts.footer = "Add a cloud to a group."
+      opts.footer = "Add a cloud to a tenant group."
     end
     optparse.parse!(args)
-    if args.count < 2
-      puts optparse
-      exit 1
+    if args.count == 3
+      options[:account] = args[0]
+      options[:group] = args[1]
+      options[:cloud] = args[2]
+    else
+      raise_command_error "wrong number of arguments, expected 3 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
     begin
-      # load account
-      if options[:account].nil? && options[:account_id].nil? && options[:account_name].nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: -a [account]\n#{optparse}"
-        return 1
-      end
       account = find_account_from_options(options)
       return 1 if account.nil?
       account_id = account['id']
 
-      group = find_account_group_by_name_or_id(account_id, args[0])
+      group = find_account_group_by_name_or_id(account_id, options[:group])
       return 1 if group.nil?
 
       # err, this is going to find public clouds only, not those in the subaccount
       # good enough for now?
-      cloud = find_cloud_by_name_or_id(args[1])
+      cloud = find_cloud_by_name_or_id(options[:cloud])
       current_zones = group['zones']
       found_zone = current_zones.find {|it| it["id"] == cloud["id"] }
       if found_zone
@@ -360,32 +352,30 @@ class Morpheus::Cli::AccountGroupsCommand
   def remove_cloud(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[group]", "[cloud]")
+      opts.banner = subcommand_usage("[tenant] [group] [cloud]")
       build_common_options(opts, options, [:account, :json, :dry_run, :remote])
-      opts.footer = "Remove a cloud from a group."
+      opts.footer = "Remove a cloud from a tenant group."
     end
     optparse.parse!(args)
-    if args.count < 2
-      puts optparse
-      exit 1
+    if args.count == 3
+      options[:account] = args[0]
+      options[:group] = args[1]
+      options[:cloud] = args[2]
+    else
+      raise_command_error "wrong number of arguments, expected 3 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
     begin
-      # load account
-      if options[:account].nil? && options[:account_id].nil? && options[:account_name].nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: -a [account]\n#{optparse}"
-        return 1
-      end
       account = find_account_from_options(options)
       return 1 if account.nil?
       account_id = account['id']
 
-      group = find_account_group_by_name_or_id(account_id, args[0])
+      group = find_account_group_by_name_or_id(account_id, options[:group])
       return 1 if group.nil?
 
       # err, this is going to find public clouds only, not those in the subaccount
       # good enough for now?
-      cloud = find_cloud_by_name_or_id(args[1])
+      cloud = find_cloud_by_name_or_id(options[:cloud])
       current_zones = group['zones']
       found_zone = current_zones.find {|it| it["id"] == cloud["id"] }
       if !found_zone
@@ -417,29 +407,25 @@ class Morpheus::Cli::AccountGroupsCommand
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[group]")
-      build_common_options(opts, options, [:account, :json, :dry_run, :auto_confirm, :remote])
-      opts.footer = "Delete a group."
-      # more info to display here
+      opts.banner = subcommand_usage("[tenant] [group]")
+      build_common_options(opts, options, [:json, :dry_run, :auto_confirm, :remote])
+      opts.footer = "Delete a tenant group."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
+    if args.count == 2
+      options[:account] = args[0]
+      options[:group] = args[1]
+    else
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
 
     begin
-      # load account
-      if options[:account].nil? && options[:account_id].nil? && options[:account_name].nil?
-        puts_error "#{Morpheus::Terminal.angry_prompt}missing required option: -a [account]\n#{optparse}"
-        return 1
-      end
       account = find_account_from_options(options)
       return 1 if account.nil?
       account_id = account['id']
 
-      group = find_account_group_by_name_or_id(account_id, args[0])
+      group = find_account_group_by_name_or_id(account_id, options[:group])
       return 1 if group.nil?
       
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the group #{group['name']}?")
@@ -467,13 +453,10 @@ class Morpheus::Cli::AccountGroupsCommand
 
   protected
 
-  def print_groups_table(groups, opts={})
-    table_color = opts[:color] || cyan
-    active_group_id = @active_group_id # Morpheus::Cli::Groups.active_group
+  def print_groups_table(groups, options={})
+    table_color = options[:color] || cyan
     rows = groups.collect do |group|
-      is_active = @active_group_id && (@active_group_id == group['id'])
       {
-        active: (is_active ? "=>" : ""),
         id: group['id'],
         name: group['name'],
         location: group['location'],
@@ -482,7 +465,6 @@ class Morpheus::Cli::AccountGroupsCommand
       }
     end
     columns = [
-      {:active => {:display_name => ""}},
       {:id => {:width => 10}},
       {:name => {:width => 16}},
       {:location => {:width => 32}},
@@ -490,7 +472,7 @@ class Morpheus::Cli::AccountGroupsCommand
       {:server_count => {:display_name => "Hosts"}}
     ]
     print table_color
-    tp rows, columns
+    puts as_pretty_table(rows, columns, options)
     print reset
   end
 
@@ -542,13 +524,9 @@ class Morpheus::Cli::AccountGroupsCommand
       return nil
     elsif account_groups.size > 1
       print_red_alert "#{account_groups.size} group found by name #{name}"
-      # print_account_groups_table(account_groups, {color: red})
-      rows = account_groups.collect do |account_group|
-        {id: it['id'], name: it['name']}
-      end
-      print red
-      tp rows, [:id, :name]
-      print reset,"\n"
+      rows = account_groups.collect { |it| {id: it['id'], name: it['name']} }
+      print "\n"
+      puts as_pretty_table(rows, [:id, :name], {color:red})
       return nil
     else
       account_group = account_groups[0]

data/lib/morpheus/cli/apps.rb

@@ -3,7 +3,6 @@ require 'io/console'
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/accounts_helper'
 require 'morpheus/cli/mixins/provisioning_helper'
@@ -1487,6 +1486,12 @@ 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
       {
         id: app['id'],
         name: app['name'],
@@ -1512,23 +1517,19 @@ class Morpheus::Cli::Apps
       :containers,
       #:account,
       :status,
-      #{:dateCreated => {:display_name => "Date Created"} }
+      #{:dateCreated => {:display_name => "Date Created"} },
+      {:cpu => {:display_name => "MAX CPU"} },
+      :memory,
+      :storage
     ]
-    term_width = current_terminal_width()
-    if term_width > 120
-      columns += [
-        {:cpu => {:display_name => "MAX CPU"} },
-        :memory,
-        :storage
-      ]
-    end
+    
     # custom pretty table columns ...
     # if options[:include_fields]
     #   columns = options[:include_fields]
     # end
     # print cyan
     print as_pretty_table(rows, columns, opts) #{color: table_color}
-    print reset
+    print reset,"\n"
   end
 
   def format_app_status(app, return_color=cyan)