morpheus-cli 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69dc73a61a5113eda7600546cc3930dfdd4f47a9a882cd0aa27bb9af12a5f97
-  data.tar.gz: 9d47bacf74b477ab1d887f110b055b5cf9d89e0f65fff187b0bf2471a92b8616
+  metadata.gz: 23cf1069887e9d9fc379bb4c5d542ffaf746fb045ba394b281f1bcbe2f6979e0
+  data.tar.gz: 544bb68d0fc395fa8d6a76391028641e564d37f9f6f82c515d763420e83230bb
 SHA512:
-  metadata.gz: 2187ecea61941471a82f73f0f2a86d555ec739d22bfe4bc30b7aa620fca16aa9b6a3372c9cc0adf21868d4283c83b5bd545cb8fc4cc1a253d1e37accb58e01af
-  data.tar.gz: b39bc39b4b012dabad7c821b55690c1976d92a671abcb660fd57140506c499042b3cf77d80394d0c6e07669e59b3113856f256a5187ac7461929c8fbb4583d19
+  metadata.gz: '09147a460130571ad8a3f30e5e7062b290425d11c9dbf30f14ae5dedf4e99cd821b5fde46b6c3f69c1bd4eb3d2c4477a9df2ae5f766164fda7e99173bb9d877f'
+  data.tar.gz: 0d0775dd6ff2b7e9e670a295d44b2fe60e68095cc74df2b6cbd75d5dca3e2ea40e9378f5129fdf86bedae1ec9a1d0d667732ea50eaf03caf45d8c31837c0dc7d

data/lib/morpheus/api/api_client.rb

@@ -61,6 +61,10 @@ class Morpheus::APIClient
     Morpheus::WhoamiInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
 
+  def user_settings
+    Morpheus::UserSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
   def options
     Morpheus::OptionsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
@@ -121,6 +125,10 @@ class Morpheus::APIClient
     Morpheus::AppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
 
+  def blueprints
+    Morpheus::BlueprintsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
   def app_templates
     Morpheus::AppTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
@@ -303,4 +311,12 @@ class Morpheus::APIClient
     Morpheus::CypherInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
   
+  def execution_request
+    Morpheus::ExecutionRequestInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def processes
+    Morpheus::ProcessesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
 end

data/lib/morpheus/api/blueprints_interface.rb

@@ -0,0 +1,84 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::BlueprintsInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id)
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/blueprints/#{id}"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def list(options={})
+    url = "#{@base_url}/api/blueprints"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def create(options)
+    url = "#{@base_url}/api/blueprints"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def update(id, options)
+    url = "#{@base_url}/api/blueprints/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def update_permissions(id, options)
+    url = "#{@base_url}/api/blueprints/#{id}/update-permissions"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  # multipart image upload
+  def save_image(id, image_file, params={})
+    url = "#{@base_url}/api/blueprints/#{id}/image"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    payload[:templateImage] = image_file
+    payload[:multipart] = true
+    execute(method: :post, url: url, headers: headers, payload: payload)
+  end
+
+  def duplicate(id, options)
+    url = "#{@base_url}/api/blueprints/#{id}/duplicate"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/blueprints/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
+  def list_tiers(options={})
+    url = "#{@base_url}/api/blueprints/tiers"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  # unused, prefer /options/instanceTypes
+  # def list_types(options={})
+  #   url = "#{@base_url}/api/blueprints/types"
+  #   headers = { params: {}, authorization: "Bearer #{@access_token}" }
+  #   headers[:params].merge!(options)
+  #   execute(method: :get, url: url, headers: headers)
+  # end
+
+end

data/lib/morpheus/api/execution_request_interface.rb

@@ -0,0 +1,33 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ExecutionRequestInterface < Morpheus::APIClient
+    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/execution-request/#{id}"
+    headers = { :params => params, authorization: "Bearer #{@access_token}"}
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(params, payload)
+    url = "#{@base_url}/api/execution-request/execute"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def execute_against_lease(id, params, payload)
+    url = "#{@base_url}/api/execution-request/#{id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/api/instances_interface.rb

@@ -262,4 +262,25 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def history(id, params={})
+    url = "#{@base_url}/api/instances/#{id}/history"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def history_details(id, process_id, params={})
+    url = "#{@base_url}/api/instances/#{id}/history/#{process_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def history_event_details(id, process_event_id, params={})
+    url = "#{@base_url}/api/instances/#{id}/history/events/#{process_event_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
 end

data/lib/morpheus/api/packages_interface.rb

@@ -32,18 +32,38 @@ class Morpheus::PackagesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def install(payload)
+  def info(params={})
+    url = "#{@base_url}/api/packages/info"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(params)
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def install(params={}, payload={})
     url = "#{@base_url}/api/packages/install"
-    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def install_file(package_file, params={})
+  # def install_file(package_file, params={})
+  #   url = "#{@base_url}/api/packages/install-file"
+  #   headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
+  #   payload = package_file
+  #   execute(method: :post, url: url, headers: headers, payload: payload, timeout: 36000)
+  # end
+
+  def install_file(local_file, params={})
     url = "#{@base_url}/api/packages/install-file"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
-    payload = package_file
-    execute(method: :post, url: url, headers: headers, payload: payload, timeout: 36000)
+    if !local_file.kind_of?(File)
+      local_file = File.new(local_file, 'rb')
+    end
+    payload = local_file
+    headers['Content-Length'] = local_file.size # File.size(local_file)
+    opts = {method: :post, url: url, headers: headers, payload: payload}
+    execute(opts)
   end
 
   def update(id, payload)

data/lib/morpheus/api/processes_interface.rb

@@ -0,0 +1,34 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ProcessesInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/processes"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/processes/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def get_event(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/processes/events/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/api/roles_interface.rb

@@ -56,6 +56,13 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_blueprint(account_id, id, options)
+    url = build_url(account_id, id) + "/update-blueprint"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
   def update_group(account_id, id, options)
     url = build_url(account_id, id) + "/update-group"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/servers_interface.rb

@@ -34,6 +34,14 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def update(serverId, options)
+    url = "#{@base_url}/api/servers/#{serverId}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def stop(serverId,payload = {})
     url = "#{@base_url}/api/servers/#{serverId}/stop"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/user_settings_interface.rb

@@ -0,0 +1,76 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::UserSettingsInterface < Morpheus::APIClient
+    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(params={})
+    url = "#{@base_url}/api/user-settings"
+    headers = { :params => params, authorization: "Bearer #{@access_token}"}
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def update(params, payload)
+    url = "#{@base_url}/api/user-settings"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  # NOT json, download file as attachment
+  def download_avatar(params, outfile)
+    url = "#{@base_url}/api/user-settings/avatar"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    opts = {method: :get, url: url, headers: headers, payload: payload}
+    execute(opts)
+  end
+
+  # NOT json, multipart file upload
+  def update_avatar(avatar_file, params={})
+    url = "#{@base_url}/api/user-settings/avatar"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    #payload['user'] ||= {}
+    #payload['user']['avatar'] = avatar_file
+    payload['user.avatar'] = avatar_file
+    payload[:multipart] = true
+    opts = {method: :post, url: url, headers: headers, payload: payload}
+    execute(opts)
+  end
+
+  def remove_avatar(params={})
+    url = "#{@base_url}/api/user-settings/avatar"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    # POST empty payload will do
+    payload = {}
+    opts = {method: :delete, url: url, headers: headers, payload: payload}
+    execute(opts)
+  end
+
+  def regenerate_access_token(params, payload={})
+    url = "#{@base_url}/api/user-settings/regenerate-access-token"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def clear_access_token(params, payload={})
+    url = "#{@base_url}/api/user-settings/clear-access-token"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def available_clients(params={})
+    url = "#{@base_url}/api/user-settings/api-clients"
+    headers = { :params => params, authorization: "Bearer #{@access_token}"}
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/cli.rb

@@ -79,6 +79,7 @@ module Morpheus
       load 'morpheus/cli/login.rb'
       load 'morpheus/cli/logout.rb'
       load 'morpheus/cli/whoami.rb'
+      load 'morpheus/cli/user_settings_command.rb'
       load 'morpheus/cli/dashboard_command.rb'
       load 'morpheus/cli/power_schedules_command.rb'
       load 'morpheus/cli/execute_schedules_command.rb'
@@ -95,7 +96,8 @@ module Morpheus
       load 'morpheus/cli/instances.rb'
       load 'morpheus/cli/containers_command.rb'
       load 'morpheus/cli/apps.rb'
-      load 'morpheus/cli/app_templates.rb'
+      load 'morpheus/cli/blueprints_command.rb'
+      load 'morpheus/cli/app_templates.rb' # deprecated
       load 'morpheus/cli/deploys.rb'
       load 'morpheus/cli/license.rb'
       load 'morpheus/cli/instance_types.rb'
@@ -145,6 +147,8 @@ module Morpheus
       load 'morpheus/cli/boot_scripts_command.rb'
       load 'morpheus/cli/archives_command.rb'
       load 'morpheus/cli/storage_providers_command.rb'
+      load 'morpheus/cli/execution_request_command.rb'
+      load 'morpheus/cli/processes_command.rb'
 
       # nice to have commands
       load 'morpheus/cli/curl_command.rb'

data/lib/morpheus/cli/alias_command.rb

@@ -255,7 +255,7 @@ class Morpheus::Cli::AliasCommand
       out <<  "\n"
       out << reset
       my_aliases.each do |it|
-        out <<  "\t#{cyan}#{it[:name]}#{reset}='#{it[:command_string]}'"
+        out <<  "    #{cyan}#{it[:name]}#{reset}='#{it[:command_string]}'"
         out << "\n"
       end
       out << reset

data/lib/morpheus/cli/app_templates.rb

@@ -5,11 +5,12 @@ require 'morpheus/cli/cli_command'
 require 'morpheus/cli/option_types'
 require 'json'
 
+# deprecated and replaced with blueprints, hidden for now
 class Morpheus::Cli::AppTemplates
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
 
-  #set_command_name :templates # instead of app-templates
+  set_command_hidden
 
   register_subcommands :list, :get, :add, :update, :remove
   register_subcommands :duplicate

data/lib/morpheus/cli/apps.rb

@@ -6,12 +6,14 @@ require 'filesize'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/provisioning_helper'
+require 'morpheus/cli/mixins/processes_helper'
 
 class Morpheus::Cli::Apps
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::ProcessesHelper
 
-  register_subcommands :list, :get, :add, :update, :remove, :add_instance, :remove_instance, :logs, :firewall_disable, :firewall_enable, :security_groups, :apply_security_groups
+  register_subcommands :list, :get, :add, :update, :remove, :add_instance, :remove_instance, :logs, :firewall_disable, :firewall_enable, :security_groups, :apply_security_groups, :history
   alias_subcommand :details, :get
   set_default_subcommand :list
   
@@ -27,6 +29,7 @@ class Morpheus::Cli::Apps
     @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
     @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
     @logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
+    @processes_interface = @api_client.processes
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
 
@@ -97,7 +100,7 @@ class Morpheus::Cli::Apps
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, add_app_option_types(false))
-      # opts.on( '-t', '--template ID', "App Template ID. The app template to use. The default value is 'existing' which means no template, for creating a blank app and adding existing instances." ) do |val|
+      # opts.on( '-b', '--blueprint ID', "Blueprint ID. The blueprint to use. The default value is 'existing' which means no blueprint, for creating a blank app and adding existing instances." ) do |val|
       #   options['template'] = val
       # end
       # opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
@@ -158,7 +161,7 @@ class Morpheus::Cli::Apps
         payload = {}
         params = Morpheus::Cli::OptionTypes.prompt(add_app_option_types, options[:options], @api_client, options[:params])
         params = params.deep_compact! # remove nulls and blank strings
-        template_id = params.delete('template')
+        template_id = params.delete('blueprint')
         if template_id.to_s.empty? || template_id == 'existing'
           # new API parameter
           payload['templateId'] = 'existing'
@@ -166,9 +169,9 @@ class Morpheus::Cli::Apps
           payload['id'] = 'existing'
           payload['templateName'] = 'Existing Instances'
         else
-          found_app_template = get_available_app_templates.find {|it| it['id'].to_s == template_id.to_s || it['name'].to_s == template_id.to_s }
+          found_app_template = get_available_blueprints.find {|it| it['id'].to_s == template_id.to_s || it['name'].to_s == template_id.to_s }
           if found_app_template.nil?
-            print_red_alert "App Template not found by id #{template_id}"
+            print_red_alert "Blueprint not found by id #{template_id}"
             return 1
           end
           payload['templateId'] = found_app_template['id']
@@ -218,9 +221,9 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app]")
-      opts.on('--refresh-until [status]', String, "Refresh until status is reached. Default status is running.") do |val|
+      opts.on('--refresh [status]', String, "Refresh until status is reached. Default status is running.") do |val|
         if val.to_s.empty?
-          options[:refresh_until_status] = "running"
+          options[:refresh_until_status] = "running,failed"
         else
           options[:refresh_until_status] = val.to_s.downcase
         end
@@ -314,10 +317,13 @@ class Morpheus::Cli::Apps
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
           options[:refresh_interval] = 5
         end
-        while app['status'].to_s.downcase != options[:refresh_until_status].to_s.downcase
+        statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
+        if !statuses.include?(app['status'])
           print cyan
-          print "Refreshing until status #{options[:refresh_until_status]} ..."
-          sleep(options[:refresh_interval])
+          print "Status is #{app['status'] || 'unknown'}. Refreshing in #{options[:refresh_interval]} seconds"
+          #sleep(options[:refresh_interval])
+          sleep_with_dots(options[:refresh_interval])
+          print "\n"
           get(args)
         end
       end
@@ -865,11 +871,158 @@ class Morpheus::Cli::Apps
     end
   end
 
+  def history(args)
+    raw_args = args.dup
+    options = {}
+    #options[:show_output] = true
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[app]")
+      # opts.on( '-n', '--node NODE_ID', "Scope history to specific Container or VM" ) do |node_id|
+      #   options[:node_id] = node_id.to_i
+      # end
+      opts.on( nil, '--events', "Display sub processes (events)." ) do
+        options[:show_events] = true
+      end
+      opts.on( nil, '--output', "Display process output." ) do
+        options[:show_output] = true
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List historical processes for a specific app.\n" + 
+                    "[app] is required. This is the name or id of an app."
+    end
+    optparse.parse!(args)
+
+    if args.count != 1
+      puts optparse
+      return 1
+    end
+    connect(options)
+    begin
+      app = find_app_by_name_or_id(args[0])
+
+      instance_ids = []
+      app['appTiers'].each do |app_tier|
+        app_tier['appInstances'].each do |app_instance|
+          instance_ids << app_instance['instance']['id']
+        end
+      end
+      
+      # container_ids = instance['containers']
+      # if options[:node_id] && container_ids.include?(options[:node_id])
+      #   container_ids = [options[:node_id]]
+      # end
+      params = {}
+      params['instanceIds'] = instance_ids
+      params.merge!(parse_list_options(options))
+      # params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      if options[:dry_run]
+        print_dry_run @processes_interface.dry.list(params)
+        return
+      end
+      json_response = @processes_interface.list(params)
+      if options[:json]
+        puts as_json(json_response, options, "processes")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "processes")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['processes'], options)
+        return 0
+      else
+
+        title = "App History: #{app['name']}"
+        subtitles = []
+        if params[:query]
+          subtitles << "Search: #{params[:query]}".strip
+        end
+        subtitles += parse_list_subtitles(options)
+        print_h1 title, subtitles
+        if json_response['processes'].empty?
+          print "#{cyan}No process history found.#{reset}\n\n"
+        else
+          history_records = []
+          json_response["processes"].each do |process|
+            row = {
+              id: process['id'],
+              eventId: nil,
+              uniqueId: process['uniqueId'],
+              name: process['displayName'],
+              description: process['description'],
+              processType: process['processType'] ? (process['processType']['name'] || process['processType']['code']) : process['processTypeName'],
+              createdBy: process['createdBy'] ? (process['createdBy']['displayName'] || process['createdBy']['username']) : '',
+              startDate: format_local_dt(process['startDate']),
+              duration: format_process_duration(process),
+              status: format_process_status(process),
+              error: format_process_error(process),
+              output: format_process_output(process)
+            }
+            history_records << row
+            process_events = process['events'] || process['processEvents']
+            if options[:show_events]
+              if process_events
+                process_events.each do |process_event|
+                  event_row = {
+                    id: process['id'],
+                    eventId: process_event['id'],
+                    uniqueId: process_event['uniqueId'],
+                    name: process_event['displayName'], # blank like the UI
+                    description: process_event['description'],
+                    processType: process_event['processType'] ? (process_event['processType']['name'] || process_event['processType']['code']) : process['processTypeName'],
+                    createdBy: process_event['createdBy'] ? (process_event['createdBy']['displayName'] || process_event['createdBy']['username']) : '',
+                    startDate: format_local_dt(process_event['startDate']),
+                    duration: format_process_duration(process_event),
+                    status: format_process_status(process_event),
+                    error: format_process_error(process_event),
+                    output: format_process_output(process_event)
+                  }
+                  history_records << event_row
+                end
+              else
+                
+              end
+            end
+          end
+          columns = [
+            {:id => {:display_name => "PROCESS ID"} },
+            :name, 
+            :description, 
+            {:processType => {:display_name => "PROCESS TYPE"} },
+            {:createdBy => {:display_name => "CREATED BY"} },
+            {:startDate => {:display_name => "START DATE"} },
+            {:duration => {:display_name => "ETA/DURATION"} },
+            :status, 
+            :error
+          ]
+          if options[:show_events]
+            columns.insert(1, {:eventId => {:display_name => "EVENT ID"} })
+          end
+          if options[:show_output]
+            columns << :output
+          end
+          # custom pretty table columns ...
+          if options[:include_fields]
+            columns = options[:include_fields]
+          end
+          print cyan
+          print as_pretty_table(history_records, columns, options)
+          #print_results_pagination(json_response)
+          print_results_pagination(json_response, {:label => "process", :n_label => "processes"})
+          print reset, "\n"
+          return 0
+        end
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
   def add_app_option_types(connected=true)
     [
-      {'fieldName' => 'template', 'fieldLabel' => 'Template', 'type' => 'select', 'selectOptions' => (connected ? get_available_app_templates() : []), 'required' => true, 'defaultValue' => 'existing', 'description' => "The app template to use. The default value is 'existing' which means no template, for creating a blank app and adding existing instances."},
+      {'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'selectOptions' => (connected ? get_available_blueprints() : []), 'required' => true, 'defaultValue' => 'existing', 'description' => "The blueprint to use. The default value is 'existing' which means no template, for creating a blank app and adding existing instances."},
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
       {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => (connected ? get_available_groups() : []), 'required' => true},
@@ -879,7 +1032,7 @@ class Morpheus::Cli::Apps
 
   def update_app_option_types(connected=true)
     list = add_app_option_types(connected)
-    list = list.reject {|it| ["template", "group"].include? it['fieldName'] }
+    list = list.reject {|it| ["blueprint", "group"].include? it['fieldName'] }
     list.each {|it| it['required'] = false }
     list
   end
@@ -999,17 +1152,18 @@ class Morpheus::Cli::Apps
     out
   end
 
-  def get_available_app_templates(refresh=false)
-    if !@available_app_templates || refresh
-      results = @options_interface.options_for_source('appTemplates',{})
-      @available_app_templates = results['data'].collect {|it|
+  def get_available_blueprints(refresh=false)
+    if !@available_blueprints || refresh
+      results = @options_interface.options_for_source('appTemplates',{}) # still exists
+      #results = @options_interface.options_for_source('blueprints',{})
+      @available_blueprints = results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
       }
       default_option = {"id" => "existing", "name" => "Existing Instances", "value" => "existing"}
-      @available_app_templates.unshift(default_option)
+      @available_blueprints.unshift(default_option)
     end
-    #puts "get_available_app_templates() rtn: #{@available_app_templates.inspect}"
-    return @available_app_templates
+    #puts "get_available_blueprints() rtn: #{@available_blueprints.inspect}"
+    return @available_blueprints
   end
 
   def get_available_environments(refresh=false)