morpheus-cli 4.2.16 → 4.2.17

data/lib/morpheus/cli/subnets_command.rb

@@ -609,7 +609,7 @@ class Morpheus::Cli::SubnetsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[subnet]")
-      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Delete a subnet." + "\n" +
                     "[subnet] is required. This is the name or id of a subnet."
     end

data/lib/morpheus/cli/tenants_command.rb

@@ -41,23 +41,24 @@ class Morpheus::Cli::TenantsCommand
   def list(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.banner = subcommand_usage("[search phrase]")
+      build_standard_list_options(opts, options)
       opts.footer = "List tenants."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    options[:phrase] = args.join(" ") if args.count > 0
     connect(options)
-    begin
-      params = {}
-      params.merge!(parse_list_options(options))
-      @accounts_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.list(params)
-        return 0
-      end
-      json_response = @accounts_interface.list(params)
-      render_result = render_with_format(json_response, options, 'accounts')
-      return 0 if render_result
+
+    params = {}
+    params.merge!(parse_list_options(options))
+    @accounts_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @accounts_interface.dry.list(params)
+      return 0, nil
+    end
+    json_response = @accounts_interface.list(params)
+    render_response(json_response, options, "accounts") do
       accounts = json_response['accounts']
       title = "Morpheus Tenants"
       subtitles = []
@@ -66,15 +67,13 @@ class Morpheus::Cli::TenantsCommand
       if accounts.empty?
         print cyan,"No tenants found.",reset,"\n"
       else
-        print_accounts_table(accounts)
+        print cyan
+        print as_pretty_table(accounts, list_account_column_definitions, options)
         print_results_pagination(json_response)
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def count(args)
@@ -110,112 +109,89 @@ class Morpheus::Cli::TenantsCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :outfile, :dry_run, :remote])
+      opts.banner = subcommand_usage("[tenant]")
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a tenant (account).
+[tenant] is required. This is the name or id of a tenant. Supports 1-N arguments.
+EOT
     end
     optparse.parse!(args)
-    if args.count != 1
-      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
-    begin
-      @accounts_interface.setopts(options)
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @accounts_interface.dry.get(args[0].to_i)
-        else
-          print_dry_run @accounts_interface.dry.list({name:args[0]})
-        end
-        return
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(id, options={})
+    args = [id] # heh
+    @accounts_interface.setopts(options)
+    if options[:dry_run]
+      if args[0].to_s =~ /\A\d{1,}\Z/
+        print_dry_run @accounts_interface.dry.get(args[0].to_i)
+      else
+        print_dry_run @accounts_interface.dry.list({name:args[0]})
       end
-      account = find_account_by_name_or_id(args[0])
-      exit 1 if account.nil?
+      return
+    end
+    account = find_account_by_name_or_id(args[0])
+    exit 1 if account.nil?
 
-      json_response = {'account' => account}
-      render_result = render_with_format(json_response, options, 'account')
-      return 0 if render_result
+    json_response = {'account' => account}
+    render_result = render_with_format(json_response, options, 'account')
+    return 0 if render_result
 
-      print_h1 "Tenant Details", [], options
-      
-      description_cols = {
-        "ID" => 'id',
-        "Name" => 'name',
-        "Description" => 'description',
-        "Subdomain" => 'subdomain',
-        "Currency" => 'currency',
-        "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-        "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
-        "Status" => lambda {|it| 
-          status_state = nil
-          if account['active']
-            status_state = "#{green}ACTIVE#{cyan}"
-          else
-            status_state = "#{red}INACTIVE#{cyan}"
-          end
-          status_state
-        },
-      }
-      print_description_list(description_cols, account)
+    print_h1 "Tenant Details", [], options
+    
+    print_description_list(account_column_definitions, account, options)
 
-      print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
+    print reset,"\n"
+    return 0
+    
   end
 
+
   def add(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[options]")
+      opts.banner = subcommand_usage("[name]")
       build_option_type_options(opts, options, add_account_option_types)
-      build_common_options(opts, options, [:options, :json, :remote, :dry_run])
+      build_standard_add_options(opts, options)
+      opts.footer = <<-EOT
+Create a new tenant.
+[name] is required. Name
+[role] is required. Base Role name or ID
+EOT
     end
     optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:0, max:2)
+    options[:options]['name'] = args[0] if args[0]
+    #options[:options]['role'] = {'id' => args[1]} if args[1]
     connect(options)
-    begin
-      if args.count > 1
-        raise_command_error "wrong number of arguments. Expected 0-1 and received #{args.count} #{args.join(' ')}\n#{optparse}", args, 127
-        #puts_error  "#{Morpheus::Terminal.angry_prompt}wrong number of arguments. Expected 0-1 and received #{args.count} #{args.join(' ')}\n#{optparse}"
-        #return 127
-      end
-      if args[0]
-        options[:options]['name'] = args[0]
-      end
-      params = Morpheus::Cli::OptionTypes.prompt(add_account_option_types, options[:options], @api_client, options[:params])
-      #puts "parsed params is : #{params.inspect}"
-      account_keys = ['name', 'description', 'currency']
-      account_payload = params.select {|k,v| account_keys.include?(k) }
-      account_payload['currency'] = account_payload['currency'].to_s.empty? ? "USD" : account_payload['currency'].upcase
-      
-      if params['role'].to_s != ''
-        role = find_role_by_name(nil, params['role'])
-        exit 1 if role.nil?
-        account_payload['role'] = {id: role['id']}
-      end
-      payload = {account: account_payload}
-      if options[:dry_run] && options[:json]
-        puts as_json(payload, options)
-        return 0
-      end
-      @accounts_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.create(payload)
-        return
-      end
-      json_response = @accounts_interface.create(payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
-        print_green_success "Tenant #{account_payload['name']} added"
-        get([account_payload["name"]])
-      end
-
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    
+    object_key = 'account' # 'tenant' someday
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({object_key => parse_passed_options(options)})
+    else
+      payload.deep_merge!({object_key => parse_passed_options(options)})
+      v_prompt = Morpheus::Cli::OptionTypes.prompt(add_account_option_types, options[:options], @api_client, options[:params])
+      payload.deep_merge!({object_key => v_prompt})
+    end
+    @accounts_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @accounts_interface.dry.create(payload)
+      return
+    end
+    json_response = @accounts_interface.create(payload)
+    render_response(json_response, options, object_key) do
+      account = json_response[object_key]
+      print_green_success "Tenant #{account['name']} added"
+      return _get(account["id"], options)
     end
   end
 
@@ -223,68 +199,54 @@ class Morpheus::Cli::TenantsCommand
     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
+      opts.banner = subcommand_usage("[tenant]")
       build_option_type_options(opts, options, update_account_option_types)
-      build_common_options(opts, options, [:options, :json, :remote, :dry_run])
+      opts.on('--active [on|off]', String, "Can be used to disable a tenant") do |val|
+        options[:options]['active'] = val.to_s.empty? || val.to_s == 'on' || val.to_s == 'true'
+      end
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update an existing tenant.
+[tenant] is required. Tenant name or ID
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      print_red_alert "Specify at least one option to update"
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
-    begin
-      account = find_account_by_name_or_id(args[0])
-      exit 1 if account.nil?
 
-      #params = Morpheus::Cli::OptionTypes.prompt(update_account_option_types, options[:options], @api_client, options[:params])
-      params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-
-      if params.empty?
-        puts optparse
-        exit 1
-      end
-
-      #puts "parsed params is : #{params.inspect}"
-      #account_keys = ['name', 'description', 'currency']
-      account_payload = params
-      account_payload['currency'] = account_payload['currency'].upcase unless account_payload['currency'].to_s.empty?
-      
-      if params['role'].to_s != ''
-        role = find_role_by_name(nil, params['role'])
-        exit 1 if role.nil?
-        account_payload['role'] = {id: role['id']}
-      end
-      payload = {account: account_payload}
-      if options[:dry_run] && options[:json]
-        puts as_json(payload, options)
-        return 0
-      end
-      @accounts_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.update(account['id'], payload)
-        return
+    account = find_account_by_name_or_id(args[0])
+    return [1, "account not found"] if account.nil?
+    object_key = 'account' # 'tenant' someday
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({object_key => parse_passed_options(options)})
+    else
+      payload.deep_merge!({object_key => parse_passed_options(options)})
+      v_prompt = Morpheus::Cli::OptionTypes.prompt(update_account_option_types, options[:options].merge(:no_prompt => true), @api_client, options[:params])
+      payload.deep_merge!({object_key => v_prompt})
+      # remove empty role object.. todo: prompt() or deep_compact! needs to  handle this! 
+      if payload[object_key]['role'] && payload[object_key]['role'].empty?
+        payload[object_key].delete('role')
       end
-      json_response = @accounts_interface.update(account['id'], payload)
-
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
-        account_name = account_payload['name'] || account['name']
-        print_green_success "Tenant #{account_name} updated"
-        get([account_name])
+      if payload[object_key].empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    end
+    @accounts_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @accounts_interface.dry.update(account['id'], payload)
+      return
+    end
+    json_response = @accounts_interface.update(account['id'], payload)
+    render_response(json_response, options, object_key) do
+      account = json_response[object_key]
+      print_green_success "Tenant #{account['name']} updated"
+      return _get(account["id"], options)
     end
   end
 
+
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -333,13 +295,21 @@ class Morpheus::Cli::TenantsCommand
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldName' => 'role', 'fieldLabel' => 'Base Role', 'type' => 'text', 'displayOrder' => 3},
-      {'fieldName' => 'currency', 'fieldLabel' => 'Currency', 'type' => 'text', 'displayOrder' => 4}
+      {'fieldContext' => 'role', 'fieldName' => 'id', 'fieldLabel' => 'Base Role', 'type' => 'select', 'optionSource' => lambda { 
+        @roles_interface.list(nil, {roleType:'account'})['roles'].collect {|it|
+          {"name" => (it["authority"] || it["name"]), "value" => it["id"]}
+        }
+      }, 'displayOrder' => 3},
+      {'fieldName' => 'currency', 'fieldLabel' => 'Currency', 'type' => 'text', 'defaultValue' => 'USD', 'displayOrder' => 4}
     ]
   end
 
   def update_account_option_types
-    add_account_option_types
+    list = add_account_option_types()
+    # list = list.reject {|it| ["interval"].include? it['fieldName'] }
+    list.each {|it| it.delete('required') }
+    list.each {|it| it.delete('defaultValue') }
+    list
   end
 
 end

data/lib/morpheus/cli/user_groups_command.rb

@@ -25,19 +25,24 @@ class Morpheus::Cli::UserGroupsCommand
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.banner = subcommand_usage("[search phrase]")
+      build_standard_list_options(opts, options)
+      opts.footer = "List user groups."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    options[:phrase] = args.join(" ") if args.count > 0
     connect(options)
-    begin
-      params.merge!(parse_list_options(options))
-      @user_groups_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @user_groups_interface.dry.list(nil, params)
-        return
-      end
-      json_response = @user_groups_interface.list(nil, params)
+    
+    params.merge!(parse_list_options(options))
+    @user_groups_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @user_groups_interface.dry.list(nil, params)
+      return
+    end
+    json_response = @user_groups_interface.list(nil, params)
+
+    render_response(json_response, options, "userGroups") do
       if options[:json]
         puts as_json(json_response, options, "userGroups")
         return 0
@@ -56,15 +61,13 @@ class Morpheus::Cli::UserGroupsCommand
       if user_groups.empty?
         print cyan,"No user groups found.",reset,"\n"
       else
-        print_user_groups_table(user_groups, options)
-        print_results_pagination(json_response, {:label => "user group", :n_label => "user groups"})
-        # print_results_pagination(json_response)
+        print cyan
+        print as_pretty_table(user_groups, list_user_group_column_definitions, options)
+        print_results_pagination(json_response)
       end
       print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
   
   def get(args)
@@ -113,18 +116,7 @@ class Morpheus::Cli::UserGroupsCommand
 
       print_h1 "User Group Details"
       print cyan
-      description_cols = {
-        "ID" => lambda {|it| it['id'] },
-        #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
-        "Name" => lambda {|it| it['name'] },
-        "Description" => lambda {|it| it['description'] },
-        "Server Group" => lambda {|it| it['serverGroup'] },
-        "Sudo Access" => lambda {|it| format_boolean it['sudoAccess'] },
-        # "Shared User" => lambda {|it| format_boolean it['sharedUser'] },
-        "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-        "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-      }
-      print_description_list(description_cols, user_group)
+      print_description_list(user_group_column_definitions, user_group, options)
 
       ## Users
       print_h2 "Users (#{users.size})"
@@ -518,41 +510,4 @@ class Morpheus::Cli::UserGroupsCommand
     print as_pretty_table(user_groups, columns, opts)
   end
 
-  def find_user_group_by_name_or_id(account_id, val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_user_group_by_id(account_id, val)
-    else
-      return find_user_group_by_name(account_id, val)
-    end
-  end
-
-  def find_user_group_by_id(account_id, id)
-    begin
-      json_response = @user_groups_interface.get(account_id, id.to_i)
-      return json_response['userGroup']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "User Group not found by id #{id}"
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_user_group_by_name(account_id, name)
-    user_groups = @user_groups_interface.list(account_id, {name: name.to_s})['userGroups']
-    if user_groups.empty?
-      print_red_alert "User Group not found by name #{name}"
-      return nil
-    elsif user_groups.size > 1
-      print_red_alert "#{user_groups.size} user groups found by name #{name}"
-      print_user_groups_table(user_groups, {color: red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return user_groups[0]
-    end
-  end
-
 end