morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/cli/archives_command.rb

@@ -1206,7 +1206,7 @@ class Morpheus::Cli::ArchivesCommand
         print_archive_file_links_table(archive_file_links)
         print_results_pagination(json_response, {:label => "link", :n_label => "links"})
       else
-        puts "No history found"
+        puts "No file links found"
       end
       print reset,"\n"
       return 0

data/lib/morpheus/cli/auth_command.rb

@@ -1,5 +1,6 @@
 require 'morpheus/cli/cli_command'
 
+# JD: this is not in use, we have login, logout and access-token instead
 # This provides commands for authentication 
 # This also includes credential management.
 class Morpheus::Cli::AuthCommand
@@ -14,20 +15,12 @@ class Morpheus::Cli::AuthCommand
   # register_subcommands :'use-refresh-token' => :use_refresh_token
   register_subcommands :login, :logout
   register_subcommands :test => :login_test
-  
-
-  def initialize()
-    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-  end
 
   def connect(options)
-    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true}))
+    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
     # automatically get @appliance_name, @appliance_url, @wallet
     if !@appliance_name
-      unless options[:quiet]
-        print yellow,"Please specify a Morpheus Appliance with -r or see the command `remote use`#{reset}\n"
-      end
-      return 1
+      raise_command_error "#{command_name} requires a remote to be specified, use -r [remote] or set the active remote with `remote use`"
     end
     if !@appliance_url
       unless options[:quiet]
@@ -39,7 +32,7 @@ class Morpheus::Cli::AuthCommand
     if @wallet.nil? || @wallet['access_token'].nil?
       unless options[:quiet]
         print_error yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
-        print_error yellow,"Use the 'login' command.",reset,"\n"
+        print_error yellow,"Use `login` to authenticate.",reset,"\n"
       end
       return 1
     end

data/lib/morpheus/cli/blueprints_command.rb

@@ -1,9 +1,11 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/provisioning_helper'
 
 class Morpheus::Cli::BlueprintsCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::AccountsHelper # needed? replace with OptionSourceHelper
+  include Morpheus::Cli::OptionSourceHelper
+
   set_command_name :'blueprints'
   register_subcommands :list, :get, :add, :update, :remove
   register_subcommands :'types' => :list_types
@@ -34,6 +36,7 @@ class Morpheus::Cli::BlueprintsCommand
     @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @clouds_interface = @api_client.clouds
+    @users_interface = @api_client.users
     @library_layouts_interface = @api_client.library_layouts
   end
 
@@ -42,16 +45,37 @@ class Morpheus::Cli::BlueprintsCommand
   end
 
   def list(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-t', '--type CODE', "Blueprint Type") do |val|
+        params['type'] ||= []
+        params['type'] << val
+      end
+      opts.on( '--owner USER', "Owner Username or ID" ) do |val|
+        params['ownerId'] ||= []
+        params['ownerId'] << val
+      end
+      opts.on( '--created-by USER', "Alias for --owner" ) do |val|
+        params['ownerId'] ||= []
+        params['ownerId'] << val
+      end
+      opts.add_hidden_option('--created-by')
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List blueprints."
     end
     optparse.parse!(args)
     connect(options)
     begin
-      params = {}
+      if params['ownerId']
+        params['ownerId'] = params['ownerId'].collect do |owner_id|
+          # user = find_user_by_username_or_id(nil, owner_id)
+          user = find_available_user_option(owner_id)
+          return 1 if user.nil?
+          user['id']
+        end
+      end
       params.merge!(parse_list_options(options))
       @blueprints_interface.setopts(options)
       if options[:dry_run]
@@ -97,32 +121,39 @@ class Morpheus::Cli::BlueprintsCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id]")
+      opts.banner = subcommand_usage("[blueprint]")
       opts.on( '-c', '--config', "Display raw config only. Default is YAML. Combine with -j for JSON instead." ) do
         options[:show_config] = true
       end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :outfile, :dry_run, :remote])
       opts.footer = "Get details about a blueprint.\n" +
-                    "[id] is required. This is the name or id of a blueprint."
+                    "[blueprint] is required. This is the name or id of a blueprint. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
-      puts optparse
-      exit 1
+      raise_command_error "wrong number of arguments, expected 1-N and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
     end
+    connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(arg, options)
     connect(options)
     begin
       if options[:dry_run]
         @blueprints_interface.setopts(options)
         if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @blueprints_interface.dry.get(args[0].to_i)
+          print_dry_run @blueprints_interface.dry.get(arg.to_i)
         else
-          print_dry_run @blueprints_interface.dry.list({name:args[0]})
+          print_dry_run @blueprints_interface.dry.list({name:arg})
         end
         return
       end
       @blueprints_interface.setopts(options)
-      blueprint = find_blueprint_by_name_or_id(args[0])
+      blueprint = find_blueprint_by_name_or_id(arg)
       exit 1 if blueprint.nil?
 
       json_response = {'blueprint' => blueprint}  # skip redundant request
@@ -183,7 +214,7 @@ class Morpheus::Cli::BlueprintsCommand
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, add_blueprint_option_types(false))
       opts.on('-t', '--type TYPE', String, "Blueprint Type. Default is morpheus.") do |val|
-        options[:blueprint_type] = val.to_s
+        options[:blueprint_type] = parse_blueprint_type(val.to_s)
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Create a new blueprint.\n" + 
@@ -244,7 +275,7 @@ class Morpheus::Cli::BlueprintsCommand
             end
           else
             # print details
-            get([blueprint['id']])
+            get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
           end
         end
       end
@@ -256,45 +287,57 @@ class Morpheus::Cli::BlueprintsCommand
   end
 
   def update(args)
-    options = {}
+    params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [options]")
+      opts.banner = subcommand_usage("[blueprint] [options]")
       build_option_type_options(opts, options, update_blueprint_option_types(false))
+      opts.on( '--owner USER', "Owner Username or ID" ) do |val|
+        options[:owner] = val == 'null' ? nil : val
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Update a blueprint.\n" + 
-                    "[id] is required. This is the name or id of a blueprint.\n" +
-                    "[options] Available options include --name and --description. This will update only the specified values.\n" +
-                    "[--config] or [--config-file] can be used to replace the entire blueprint."
+                    "[blueprint] is required. This is the name or id of a blueprint."
     end
     optparse.parse!(args)
-
-    if args.count < 1
-      puts optparse
-      exit 1
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
     end
-
     connect(options)
-
     begin
-
       blueprint = find_blueprint_by_name_or_id(args[0])
       return 1 if blueprint.nil?
-
       payload = {}
       passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
       if options[:payload]
         payload = options[:payload]
-        payload.deep_merge!(passed_options) unless passed_options.empty?
+        payload.deep_merge!(parse_passed_options(options))
       else
         # no prompting, just merge passed options
         payload = blueprint["config"]
-        payload.deep_merge!(passed_options) unless passed_options.empty?
-
-        if passed_options.empty?
-          print_red_alert "Specify at least one option to update"
-          puts optparse
-          return 1
+      end
+      payload.deep_merge!(parse_passed_options(options))
+      # Owner
+      if options.key?(:owner)
+        owner_id = options[:owner]
+        if owner_id.to_s.empty?
+          # allow clearing
+          owner_id = nil
+        elsif options[:owner]
+          if owner_id.to_s =~ /\A\d{1,}\Z/
+            # allow id without lookup
+          else
+            user = find_available_user_option(owner_id)
+            return 1 if user.nil?
+            owner_id = user['id']
+          end
         end
+        # payload['blueprint'] ||= {}
+        # payload['blueprint']['ownerId'] = owner_id
+        payload['ownerId'] = owner_id
+      end
+      if payload.empty?
+        # this wont happen because its sending back the current config
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
       @blueprints_interface.setopts(options)
       if options[:dry_run]
@@ -311,8 +354,7 @@ class Morpheus::Cli::BlueprintsCommand
         unless options[:quiet]
           blueprint = json_response['blueprint']
           print_green_success "Updated blueprint #{blueprint['name']}"
-          details_options = [blueprint['id']]
-          get(details_options)
+          get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
         end
       end
 
@@ -323,14 +365,14 @@ class Morpheus::Cli::BlueprintsCommand
   end
 
   def update_permissions(args)
+    params, payload, options = {}, {}, {}
     group_access_all = nil
     group_access_list = nil
     group_defaults_list = nil
-    options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [options]")
+      opts.banner = subcommand_usage("[blueprint] [options]")
       opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
-        group_access_all = val.to_s == 'on' || val.to_s == 'true' || val == '' || val.nil?
+        group_access_all = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
       opts.on('--group-access LIST', Array, "Group Access, comma separated list of group IDs.") do |list|
         if list.size == 1 && list[0] == 'null' # hacky way to clear it
@@ -342,10 +384,13 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on('--visibility [private|public]', String, "Visibility") do |val|
         options['visibility'] = val
       end
+      opts.on( '--owner USER', "Owner Username or ID" ) do |val|
+        options[:owner] = val == 'null' ? nil : val
+      end
       build_option_type_options(opts, options, update_blueprint_option_types(false))
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Update a blueprint permissions.\n" + 
-                    "[id] is required. This is the name or id of a blueprint."
+                    "[blueprint] is required. This is the name or id of a blueprint."
     end
     optparse.parse!(args)
 
@@ -357,48 +402,54 @@ class Morpheus::Cli::BlueprintsCommand
     connect(options)
 
     begin
-
       blueprint = find_blueprint_by_name_or_id(args[0])
       return 1 if blueprint.nil?
-
-      payload = nil
       if options[:payload]
         payload = options[:payload]
-      else
-        payload = {
-          'blueprint' => {
-          }
-        }
-        
-        # allow arbitrary -O options
-        payload['blueprint'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-
-        # Group Access
-        if group_access_all != nil
-          payload['resourcePermissions'] ||= {}
-          payload['resourcePermissions']['all'] = group_access_all
-        end
-        if group_access_list != nil
-          payload['resourcePermissions'] ||= {}
-          payload['resourcePermissions']['sites'] = group_access_list.collect do |site_id|
-            site = {"id" => site_id.to_i}
-            if group_defaults_list && group_defaults_list.include?(site_id)
-              site["default"] = true
-            end
-            site
+      end
+      payload['blueprint'] ||= {}
+      payload.deep_merge!(parse_passed_options(options))
+      # Group Access
+      if group_access_all != nil
+        payload['resourcePermissions'] ||= {}
+        payload['resourcePermissions']['all'] = group_access_all
+      end
+      if group_access_list != nil
+        payload['resourcePermissions'] ||= {}
+        payload['resourcePermissions']['sites'] = group_access_list.collect do |site_id|
+          site = {"id" => site_id.to_i}
+          if group_defaults_list && group_defaults_list.include?(site_id)
+            site["default"] = true
           end
+          site
         end
-
-        # Tenants
-        # if options['tenants']
-        #   payload['tenantPermissions'] = {}
-        #   payload['tenantPermissions']['accounts'] = options['tenants']
-        # end
-        
-        # Visibility
-        if options['visibility'] != nil
-          payload['blueprint']['visibility'] = options['visibility']
+      end
+      # Visibility
+      if options['visibility'] != nil
+        payload['blueprint']['visibility'] = options['visibility'].to_s.downcase
+      end
+      # Owner
+      if options.key?(:owner)
+        owner_id = options[:owner]
+        if owner_id.to_s.empty?
+          # allow clearing
+          owner_id = nil
+        elsif options[:owner]
+          if owner_id.to_s =~ /\A\d{1,}\Z/
+            # allow id without lookup
+          else
+            user = find_available_user_option(owner_id)
+            return 1 if user.nil?
+            owner_id = user['id']
+          end
         end
+        payload['blueprint']['ownerId'] = owner_id
+      end
+      if payload['blueprint'] && payload['blueprint'].empty?
+        payload.delete('blueprint')
+      end
+      if payload.empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}" if payload.empty?
       end
       @blueprints_interface.setopts(options)
       if options[:dry_run]
@@ -414,8 +465,7 @@ class Morpheus::Cli::BlueprintsCommand
         unless options[:quiet]
           blueprint = json_response['blueprint']
           print_green_success "Updated permissions for blueprint #{blueprint['name']}"
-          details_options = [blueprint['id']]
-          get(details_options)
+          get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
         end
       end
       return 0
@@ -430,10 +480,10 @@ class Morpheus::Cli::BlueprintsCommand
     image_type_name = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [file]")
+      opts.banner = subcommand_usage("[blueprint] [file]")
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "Upload an image file to be used as the icon for a blueprint.\n" + 
-                    "[id] is required. This is the name or id of a blueprint.\n" +
+                    "[blueprint] is required. This is the name or id of a blueprint.\n" +
                     "[file] is required. This is the local path of a file to upload [png|jpg|svg]."
     end
     optparse.parse!(args)
@@ -473,7 +523,7 @@ class Morpheus::Cli::BlueprintsCommand
         blueprint = json_response['blueprint']
         new_image_url = blueprint['image']
         print cyan, "Updated blueprint #{blueprint['name']} image.\nNew image url is: #{new_image_url}", reset, "\n\n"
-        get([blueprint['id']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -485,10 +535,10 @@ class Morpheus::Cli::BlueprintsCommand
   def duplicate(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [new name]")
+      opts.banner = subcommand_usage("[blueprint] [new name]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Duplicate a blueprint." + "\n" +
-                    "[id] is required. This is the name or id of a blueprint." + "\n" +
+                    "[blueprint] is required. This is the name or id of a blueprint." + "\n" +
                     "[new name] is required. This is the name for the clone."
     end
     optparse.parse!(args)
@@ -523,7 +573,7 @@ class Morpheus::Cli::BlueprintsCommand
       else
         new_blueprint = json_response["blueprint"] || {}
         print_green_success "Created duplicate blueprint '#{new_blueprint['name']}'"
-        #get([new_blueprint["id"]])
+        #get([new_blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
 
     rescue RestClient::Exception => e
@@ -535,10 +585,10 @@ class Morpheus::Cli::BlueprintsCommand
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id]")
+      opts.banner = subcommand_usage("[blueprint]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Delete a blueprint." + "\n" +
-                    "[id] is required. This is the name or id of a blueprint."
+                    "[blueprint] is required. This is the name or id of a blueprint."
     end
     optparse.parse!(args)
 
@@ -577,7 +627,7 @@ class Morpheus::Cli::BlueprintsCommand
   def add_instance(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [tier] [instance-type]")
+      opts.banner = subcommand_usage("[blueprint] [tier] [instance-type]")
       # opts.on( '-g', '--group GROUP', "Group" ) do |val|
       #   options[:group] = val
       # end
@@ -589,7 +639,7 @@ class Morpheus::Cli::BlueprintsCommand
       end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
       opts.footer = "Update a blueprint, adding an instance." + "\n" +
-                    "[id] is required. This is the name or id of a blueprint." + "\n" +
+                    "[blueprint] is required. This is the name or id of a blueprint." + "\n" +
                     "[tier] is required and will be prompted for. This is the name of the tier." + "\n" +
                     "[instance-type] is required and will be prompted for. This is the type of instance."
     end
@@ -686,7 +736,7 @@ class Morpheus::Cli::BlueprintsCommand
             end
           else
             # print details
-            get([blueprint['name']])
+            get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
           end
         end
       end
@@ -702,7 +752,7 @@ class Morpheus::Cli::BlueprintsCommand
   def add_instance_config(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [tier] [instance]")
+      opts.banner = subcommand_usage("[blueprint] [tier] [instance]")
       opts.on( '-g', '--group GROUP', "Group" ) do |val|
         options[:group] = val
       end
@@ -717,7 +767,7 @@ class Morpheus::Cli::BlueprintsCommand
       end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
       opts.footer = "Update a blueprint, adding an instance config." + "\n" +
-                    "[id] is required. This is the name or id of a blueprint." + "\n" +
+                    "[blueprint] is required. This is the name or id of a blueprint." + "\n" +
                     "[tier] is required. This is the name of the tier." + "\n" +
                     "[instance] is required. This is the type of instance."
     end
@@ -802,7 +852,7 @@ class Morpheus::Cli::BlueprintsCommand
 
       options[:name_required] = false
       options[:instance_type_code] = instance_config['instance']['type'] #instance_type["code"]
-      
+      options[:for_app] = true
       #options[:options].deep_merge!(specific_config)
       # this provisioning helper method handles all (most) of the parsing and prompting
       instance_config_payload = prompt_new_instance(options)
@@ -850,7 +900,7 @@ class Morpheus::Cli::BlueprintsCommand
         puts JSON.pretty_generate(json_response)
       else
         print_green_success "Instance added to blueprint #{blueprint['name']}"
-        get([blueprint['name']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
 
@@ -865,7 +915,7 @@ class Morpheus::Cli::BlueprintsCommand
     instance_index = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [tier] [instance] -g GROUP -c CLOUD")
+      opts.banner = subcommand_usage("[blueprint] [tier] [instance] -g GROUP -c CLOUD")
       opts.on( '-g', '--group GROUP', "Group" ) do |val|
         options[:group] = val
       end
@@ -880,7 +930,7 @@ class Morpheus::Cli::BlueprintsCommand
       # end
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Update a blueprint, removing a specified instance config." + "\n" +
-                    "[id] is required. This is the name or id of a blueprint." + "\n" +
+                    "[blueprint] is required. This is the name or id of a blueprint." + "\n" +
                     "[tier] is required. This is the name of the tier." + "\n" +
                     "[instance] is required. This is the instance identifier, which may be the type, the name, or the index starting with 0." + "\n" +
                     "The config scope is specified with the -g GROUP, -c CLOUD and -e ENV. The -g and -c options are required."
@@ -1033,7 +1083,7 @@ class Morpheus::Cli::BlueprintsCommand
         puts JSON.pretty_generate(json_response)
       else
         print_green_success "Removed instance from blueprint."
-        get([blueprint['id']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
 
@@ -1057,13 +1107,13 @@ class Morpheus::Cli::BlueprintsCommand
     instance_index = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [tier] [instance]")
+      opts.banner = subcommand_usage("[blueprint] [tier] [instance]")
       # opts.on('--index NUMBER', Number, "Identify Instance by index within tier, starting with 0." ) do |val|
       #   instance_index = val.to_i
       # end
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
       opts.footer = "Update a blueprint, removing a specified instance." + "\n" +
-                    "[id] is required. This is the name or id of a blueprint." + "\n" +
+                    "[blueprint] is required. This is the name or id of a blueprint." + "\n" +
                     "[tier] is required. This is the name of the tier." + "\n" +
                     "[instance] is required. This is the instance identifier, which may be the type, the name, or the index starting with 0."
     end
@@ -1160,7 +1210,7 @@ class Morpheus::Cli::BlueprintsCommand
         puts JSON.pretty_generate(json_response)
       else
         print_green_success "Removed instance from blueprint."
-        get([blueprint['id']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
 
@@ -1176,7 +1226,7 @@ class Morpheus::Cli::BlueprintsCommand
     linked_tiers = nil
     tier_index = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [tier]")
+      opts.banner = subcommand_usage("[blueprint] [tier]")
       opts.on('--name VALUE', String, "Tier Name") do |val|
         options[:name] = val
       end
@@ -1195,7 +1245,7 @@ class Morpheus::Cli::BlueprintsCommand
 
     if args.count < 1
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} add-tier requires argument: [id]\n#{optparse}"
+      puts_error  "#{command_name} add-tier requires argument: [blueprint]\n#{optparse}"
       # puts optparse
       return 1
     end
@@ -1299,7 +1349,7 @@ class Morpheus::Cli::BlueprintsCommand
           end
         end
         # print details
-        get([blueprint['name']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -1315,7 +1365,7 @@ class Morpheus::Cli::BlueprintsCommand
     linked_tiers = nil
     tier_index = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [tier]")
+      opts.banner = subcommand_usage("[blueprint] [tier]")
       opts.on('--name VALUE', String, "Tier Name") do |val|
         new_tier_name = val
       end
@@ -1446,7 +1496,7 @@ class Morpheus::Cli::BlueprintsCommand
         puts JSON.pretty_generate(json_response)
       elsif !options[:quiet]
         print_green_success "Updated tier #{tier_name}"
-        get([blueprint['id']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -1458,7 +1508,7 @@ class Morpheus::Cli::BlueprintsCommand
   def remove_tier(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [tier]")
+      opts.banner = subcommand_usage("[blueprint] [tier]")
       build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1513,7 +1563,7 @@ class Morpheus::Cli::BlueprintsCommand
         print "\n"
       else
         print_green_success "Removed tier #{tier_name}"
-        get([blueprint['name']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
 
     rescue RestClient::Exception => e
@@ -1525,7 +1575,7 @@ class Morpheus::Cli::BlueprintsCommand
   def connect_tiers(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [Tier1] [Tier2]")
+      opts.banner = subcommand_usage("[blueprint] [Tier1] [Tier2]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1611,7 +1661,7 @@ class Morpheus::Cli::BlueprintsCommand
         print "\n"
       else
         print_green_success "Connected 2 tiers for blueprint #{blueprint['name']}"
-        get([blueprint['name']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
 
     rescue RestClient::Exception => e
@@ -1623,7 +1673,7 @@ class Morpheus::Cli::BlueprintsCommand
   def disconnect_tiers(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id] [Tier1] [Tier2]")
+      opts.banner = subcommand_usage("[blueprint] [Tier1] [Tier2]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -1701,7 +1751,7 @@ class Morpheus::Cli::BlueprintsCommand
         print "\n"
       else
         print_green_success "Connected 2 tiers for blueprint #{blueprint['name']}"
-        get([blueprint['name']])
+        get([blueprint['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
 
     rescue RestClient::Exception => e
@@ -1915,10 +1965,13 @@ class Morpheus::Cli::BlueprintsCommand
       {
         id: blueprint['id'],
         name: blueprint['name'],
+        type: blueprint['type'].kind_of?(Hash) ? blueprint['type']['name'] : format_blueprint_type(blueprint['type']),
         description: blueprint['description'],
-        type: blueprint['type'].kind_of?(Hash) ? blueprint['type']['name'] : blueprint['type'],
         category: blueprint['category'],
-        tiers_summary: format_blueprint_tiers_summary(blueprint)
+        visibility: blueprint['visibility'].to_s.capitalize,
+        owner: blueprint['owner'] ? blueprint['owner']['username'] : '',
+        tenant: blueprint['tenant'] ? blueprint['tenant']['name'] : '',
+        tiers_summary: format_blueprint_tiers_summary(blueprint),
       }
     end
 
@@ -1930,10 +1983,13 @@ class Morpheus::Cli::BlueprintsCommand
     columns = [
       :id,
       :name,
-      :description,
       :type,
+      :description,
       :category,
-      {:tiers_summary => {:display_name => "TIERS", :max_width => tiers_col_width} }
+      :owner,
+      :tenant,
+      :visibility,
+      {:tiers_summary => {:display_name => "TIERS", :max_width => tiers_col_width} },
     ]
     if opts[:include_fields]
       columns = opts[:include_fields]
@@ -2006,17 +2062,41 @@ class Morpheus::Cli::BlueprintsCommand
     description_cols = {
       "ID" => 'id',
       "Name" => 'name',
-      "Description" => 'description',
       "Type" => lambda {|it| it['type'].kind_of?(Hash) ? it['type']['name'] : it['type'] },
+      "Description" => 'description',
       "Category" => 'category',
       "Image" => lambda {|it| it['config'] ? (it['config']['image'] == '/assets/apps/template.png' ? '(default)' : it['config']['image']) : '' },
+      "Owner" => lambda {|it| it['owner'] ? it['owner']['username'] : '' },
+      "Tenant" => lambda {|it| it['tenant'] ? it['tenant']['name'] : '' },
       "Visibility" => 'visibility',
+      "Group Access" => lambda {|it| 
+        group_access_str = ""
+        begin
+          rows = []
+          if blueprint['resourcePermission']
+            if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
+              rows.push({"name" => 'All'})
+            end
+            if blueprint['resourcePermission']['sites']
+              blueprint['resourcePermission']['sites'].each do |site|
+                rows.push(site)
+              end
+            end
+          else
+            # rows.push({"name" => 'All'})
+          end
+          group_access_str = rows.collect {|it| it['default'] ? "#{it['name']} (default)" : "#{it['name']}"}.join(',')
+        rescue => ex
+          Morpheus::Logging::DarkPrinter.puts "Error parsing group access: #{ex}" if Morpheus::Logging.debug?
+        end
+        group_access_str
+      },
       "Tiers" => lambda {|it| 
           tiers = []
           if blueprint["config"]["tiers"].is_a?(Hash)
             tiers = blueprint["config"]["tiers"].keys
           end
-          "#{tiers.collect {|it| it.is_a?(Hash) ? it['name'] : it }.join(',')}"
+          "(#{(tiers || []).size()}) #{tiers.collect {|it| it.is_a?(Hash) ? it['name'] : it }.join(', ')}"
         },
         "Instances" => lambda {|it| 
           instances = []
@@ -2035,33 +2115,11 @@ class Morpheus::Cli::BlueprintsCommand
             end
           end
           #"(#{instances.count})"
-          "(#{instances.count}) #{instances.collect {|it| it['instance'] ? it['instance']['type'] : (it['type'] || it['name']) }.join(',')}"
+          "(#{instances.count}) #{instances.collect {|it| it['instance'] ? it['instance']['type'] : (it['type'] || it['name']) }.join(', ')}"
         },
         # "Containers" => lambda {|it| 
         #     i wish
         # },
-      "Group Access" => lambda {|it| 
-        group_access_str = ""
-        begin
-          rows = []
-          if blueprint['resourcePermission']
-            if blueprint['resourcePermission']['allSites'] || blueprint['resourcePermission']['all']
-              rows.push({"name" => 'All'})
-            end
-            if blueprint['resourcePermission']['sites']
-              blueprint['resourcePermission']['sites'].each do |site|
-                rows.push(site)
-              end
-            end
-          else
-            # rows.push({"name" => 'All'})
-          end
-          group_access_str = rows.collect {|it| it['default'] ? "#{it['name']} (default)" : "#{it['name']}"}.join(',')
-        rescue => ex
-          Morpheus::Logging::DarkPrinter.puts "Error parsing group access: #{ex}" if Morpheus::Logging.debug?
-        end
-        group_access_str
-      }
     }
 
     print_description_list(description_cols, blueprint)
@@ -2145,7 +2203,7 @@ class Morpheus::Cli::BlueprintsCommand
           end  
           
         else
-          print white,"  Tier is empty, use `blueprints add-instance \"#{blueprint['name']}\" \"#{tier_name}\"`",reset,"\n"
+          #print cyan,"  Tier is empty, use `blueprints add-instance \"#{blueprint['name']}\" \"#{tier_name}\"`",reset,"\n"
         end
         # print "\n"
 
@@ -2153,8 +2211,9 @@ class Morpheus::Cli::BlueprintsCommand
       # print "\n"
 
     else
-      print white,"\nTemplate is empty, use `blueprints add-tier \"#{blueprint['name']}\"`",reset,"\n"
+      #print white,"\nTemplate is empty, use `blueprints add-tier \"#{blueprint['name']}\"`",reset,"\n"
     end
+    print reset,"\n"
   end
 
   # this parses the environments => groups => clouds tree structure