morpheus-cli 4.2.18 → 5.0.0

data/lib/morpheus/cli/service_plans_command.rb

@@ -409,9 +409,9 @@ class Morpheus::Cli::ServicePlanCommand
           while Morpheus::Cli::OptionTypes.confirm("Add #{price_sets.empty? ? '' : 'another '}price set?", {:default => false}) do
             price_unit = prompt_price_unit(options)
 
-            avail_price_sets ||= @price_sets_interface.list['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
+            avail_price_sets ||= @price_sets_interface.list({'priceUnit' => price_unit, 'max' => 10000})['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
 
-            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets.reject {|it| it['priceUnit'] != price_unit}, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
+            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
               price_set = avail_price_sets.find {|it| it['value'] == price_set_id}
               price_sets << {'id' => price_set['value'], 'priceUnit' => price_set['priceUnit']}
               avail_price_sets.reject! {|it| it['value'] == price_set_id}

data/lib/morpheus/cli/storage_providers_command.rb

@@ -42,71 +42,39 @@ class Morpheus::Cli::StorageProvidersCommand
   def list(args)
     options = {}
     params = {}
+    ref_ids = []
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      opts.banner = subcommand_usage("[search]")
+      build_standard_list_options(opts, options)
       opts.footer = "List storage buckets."
     end
     optparse.parse!(args)
-    if args.count != 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got #{args.count}\n#{optparse}"
-      return 1
-    end
     connect(options)
-    begin
-      params.merge!(parse_list_options(options))
-      @storage_providers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @storage_providers_interface.dry.list(params)
-        return
-      end
-      json_response = @storage_providers_interface.list(params)
-      storage_providers = json_response["storageBuckets"]
-      if options[:json]
-        puts as_json(json_response, options, "storageBuckets")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "storageBuckets")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(storage_providers, options)
-        return 0
-      end
-      title = "Morpheus Storage Buckets"
-      subtitles = []
-      subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
-      if storage_providers.empty?
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    @storage_providers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @storage_providers_interface.dry.list(params)
+      return
+    end
+    json_response = @storage_providers_interface.list(params)
+    storage_buckets = json_response['storageBuckets']
+    render_response(json_response, options, 'storageBuckets') do
+      print_h1 "Morpheus Storage Buckets", parse_list_subtitles(options), options
+      if storage_buckets.empty?
         print cyan,"No storage buckets found.",reset,"\n"
       else
-        rows = storage_providers.collect {|storage_provider| 
-          row = {
-            id: storage_provider['id'],
-            name: storage_provider['name'],
-            provider: format_storage_provider_type(storage_provider), 
-            bucket: format_bucket_name(storage_provider), 
-            backups: storage_provider['defaultBackupTarget'] ? 'Yes' : 'No', 
-            deployments: storage_provider['defaultDeploymentTarget'] ? 'Yes' : 'No', 
-            virtualImages: storage_provider['defaultVirtualImageTarget'] ? 'Yes' : 'No', 
-          }
-          row
-        }
-        columns = [:id, :name, {:provider => {:display_name => "Provider Type".upcase} }, {:bucket => {:display_name => "Bucket Name".upcase} }, :backups, :deployments]
-        if options[:include_fields]
-          columns = options[:include_fields]
-          rows = storage_providers
-        end
-        print cyan
-        print as_pretty_table(rows, columns, options)
-        print reset
-        print_results_pagination(json_response, {:label => "storage bucket", :n_label => "storage buckets"})
+        print as_pretty_table(storage_buckets, storage_bucket_column_definitions.upcase_keys!, options)
+        print_results_pagination(json_response)
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    end
+    if storage_buckets.empty?
+      return 1, "no storage buckets found"
+    else
+      return 0, nil
     end
   end
 
@@ -1232,6 +1200,22 @@ class Morpheus::Cli::StorageProvidersCommand
 
   private
 
+  def storage_bucket_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      # "Description" => 'description',
+      "Provider Type" => lambda {|it| format_storage_provider_type(it) },
+      "Bucket Name" => lambda {|it| format_bucket_name(it) },
+      # "Source" => lambda {|it| it['source'] },
+      "Backups" => lambda {|it| format_boolean(it['defaultBackupTarget']) },
+      "Deployments" => lambda {|it| format_boolean(it['defaultDeploymentTarget']) },
+      "Virtual Images" => lambda {|it| format_boolean(it['defaultVirtualImageTarget']) },
+      # "Archive Snapshots" => lambda {|it| format_boolean(it['copyToStore']) },
+      # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
 
   def get_storage_provider_types()
     [

data/lib/morpheus/cli/tasks.rb

@@ -832,6 +832,7 @@ class Morpheus::Cli::Tasks
         payload = options[:payload]
         payload.deep_merge!({'job' => passed_options})  unless passed_options.empty?
       else
+        # always parse instances and/or hosts
         if instance_ids.size > 0 && server_ids.size > 0
           raise_command_error "Pass --instance or --host, not both.\n#{optparse}"
         elsif instance_ids.size > 0
@@ -848,19 +849,30 @@ class Morpheus::Cli::Tasks
             servers << server
           end
           params['servers'] = servers.collect {|it| it['id'] }
-        elsif target_type == 'appliance'
-          # cool, run it locally.
+        end
+        # validate requires inputs based on task executeTarget
+        if task['executeTarget'] == 'resource'
+          if instance_ids.empty? && server_ids.empty?
+            # todo: prompt for Context: None,Instance,Server and then Instance(s) or Server(s)
+            raise_command_error "missing required option: --instance or --host\n#{optparse}"
+          end
+        elsif task['executeTarget'] == 'local'
+          # no targetType required for local
+        elsif task['executeTarget'] == 'remote'
+          # not sure about this one
         else
-          raise_command_error "missing required option: --instance or --host\n#{optparse}"
+          # unknown executeTarget
         end
+        
+
 
         # todo: prompt to task optionTypes for customOptions
         if task['optionTypes']
           
         end
-
-        params['targetType'] = target_type
-
+        if target_type
+          params['targetType'] = target_type
+        end
         job_payload = {}
         job_payload.deep_merge!(params)
         job_payload.deep_merge!(passed_options) unless passed_options.empty?
@@ -877,15 +889,17 @@ class Morpheus::Cli::Tasks
         puts as_json(json_response, options)
         return json_response['success'] ? 0 : 1
       else
-        target_desc = ""
+        target_desc = nil
         if instances.size() > 0
           target_desc = (instances.size() == 1) ? "instance #{instances[0]['name']}" : "#{instances.size()} instances"
         elsif servers.size() > 0
           target_desc = (servers.size() == 1) ? "host #{servers[0]['name']}" : "#{servers.size()} hosts"
-        elsif target_type == 'appliance'
-          target_desc = "appliance"
         end
-        print_green_success "Executing task #{task['name']} on #{target_desc}"
+        if target_desc
+          print_green_success "Executing task #{task['name']} on #{target_desc}"
+        else
+          print_green_success "Executing task #{task['name']}"
+        end
         # todo: refresh, use get processId and load process record isntead? err
         if json_response["jobExecution"] && json_response["jobExecution"]["id"]
           get_args = [json_response["jobExecution"]["id"], "--details"] + (options[:remote] ? ["-r",options[:remote]] : [])

data/lib/morpheus/cli/tenants_command.rb

@@ -295,7 +295,7 @@ EOT
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldContext' => 'role', 'fieldName' => 'id', 'fieldLabel' => 'Base Role', 'type' => 'select', 'optionSource' => lambda { 
+      {'fieldContext' => 'role', 'fieldName' => 'id', 'fieldLabel' => 'Base Role', 'type' => 'select', 'optionSource' => lambda {  |api_client, api_params|
         @roles_interface.list(nil, {roleType:'account'})['roles'].collect {|it|
           {"name" => (it["authority"] || it["name"]), "value" => it["id"]}
         }

data/lib/morpheus/cli/usage_command.rb

@@ -0,0 +1,150 @@
+require 'morpheus/cli/cli_command'
+
+# CLI command usages
+# UI is Costing - Usage
+# API is /billing and returns usages
+class Morpheus::Cli::UsageCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::OptionSourceHelper
+
+  set_command_name :'usage'
+
+  register_subcommands :list #, :list_tenant, :list_clouds, :list_zones, :list_zones, :list_zones, :list_zones
+  
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @billing_interface = @api_client.billing
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    params = {}
+    ref_ids = []
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[search]")
+      opts.on( '-t', '--type TYPE', "Filter by type" ) do |val|
+        params['type'] = parse_usage_type(val)
+      end
+      opts.on( '-c', '--cloud CLOUD', "Filter by cloud" ) do |val|
+        options[:cloud] = val
+      end
+      opts.on('--start DATE', String, "Start date in the format YYYY-MM-DD.") do |val|
+        params['startDate'] = val #parse_time(val).utc.iso8601
+      end
+      opts.on('--end DATE', String, "End date in the format YYYY-MM-DD. Default is now.") do |val|
+        params['endDate'] = val #parse_time(val).utc.iso8601
+      end
+      opts.on('--sigdig DIGITS', "Significant digits when rounding cost values for display as currency. Default is 5.") do |val|
+        options[:sigdig] = val.to_i
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = "List usages."
+    end
+    optparse.parse!(args)
+    connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    # --cloud
+    if options[:cloud]
+      params['cloud'] = parse_id_list(options[:cloud]).collect {|cloud_id|
+        if cloud_id.to_s =~ /\A\d{1,}\Z/
+          cloud_id
+        else
+          cloud = find_cloud_option(cloud_id)
+          return 1 if cloud.nil?
+          cloud['id']
+        end
+      }
+    end
+
+    @billing_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @billing_interface.dry.list(params)
+      return
+    end
+    json_response = @billing_interface.list(params)
+    usages = json_response[usage_list_key]
+    render_response(json_response, options, usage_list_key) do
+      print_h1 "Morpheus Usages", parse_list_subtitles(options), options
+      if usages.empty?
+        print cyan,"No usages found.",reset,"\n"
+      else
+        list_columns = {
+          "ID" => 'id',
+          "Cloud" => 'zoneName',
+          "Type" => lambda {|it| format_usage_type(it) },
+          "Name" => 'name',
+          "Plan" => 'planName',
+          "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+          "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+          "Usage Status" => lambda {|it| format_usage_status(it) },
+          "Usage Price" => lambda {|it| format_money(it['price'], it['currency'] || 'USD', {sigdig: (options[:sigdig] || 5)}) },
+        }
+        print as_pretty_table(usages, list_columns.upcase_keys!, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    if usages.empty?
+      return 1, "no usages found"
+    else
+      return 0, nil
+    end
+  end
+
+  
+  private
+
+  def usage_object_key
+    'usage'
+  end
+
+  def usage_list_key
+    'usages'
+  end
+
+  def format_usage_type(usage)
+    #return usage['costDetails']['refType']
+    ref_type = usage['costDetails'] ? usage['costDetails']['refType'].to_s : ''
+    if ref_type == 'discoveredServer'
+      'Discovered'
+    elsif ref_type == 'computeServer'
+      'Host'
+    elsif ref_type == 'container'
+      'Container'
+    else
+      ref_type.to_s
+    end
+  end
+
+  def parse_usage_type(val)
+    type_string = val.to_s.downcase
+    if type_string == 'discoveredServer'
+      'discoveredServer'
+    elsif type_string == 'host'
+      'computeServer'
+    elsif type_string == 'container'
+      'container'
+    else
+      val
+    end
+  end
+
+  def format_usage_status(usage, return_color=cyan)
+    #return usage['status'].to_s.capitalize
+    status_string = usage['status'].to_s
+    if status_string == 'stopped'
+      return "#{cyan}#{status_string.upcase}#{return_color}"
+    else
+      return "#{cyan}#{status_string.upcase}#{return_color}"
+    end
+  end
+
+end

data/lib/morpheus/cli/user_settings_command.rb

@@ -94,6 +94,7 @@ EOT
         "Linux Key Pair" => lambda {|it| it['linuxKeyPairId'] },
         "Windows Username" => lambda {|it| it['windowsUsername'] },
         "Windows Password" => lambda {|it| it['windowsPassword'] },
+        "Default Persona" => lambda {|it| it['defaultPersona'] ? it['defaultPersona']['name'] : '' },
       }
       print_description_list(description_cols, user_settings)      
 

data/lib/morpheus/cli/users.rb

@@ -161,12 +161,22 @@ class Morpheus::Cli::Users
         options[:include_app_templates_access] = true
         params['includeAccess'] = true
       end
+      opts.on(nil,'--catalog-item-type-access', "Display Catalog Item Type Access") do
+        options[:include_catalog_item_types_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--personas', "Display Persona Access") do
+        options[:include_personas_access] = true
+        params['includeAccess'] = true
+      end
       opts.on(nil,'--all', "Display All Access Lists") do
         options[:include_features_access] = true
         options[:include_sites_access] = true
         options[:include_zones_access] = true
         options[:include_instance_types_access] = true
         options[:include_app_templates_access] = true
+        options[:include_catalog_item_types_access] = true
+        options[:include_personas_access] = true
         params['includeAccess'] = true
       end
       opts.on('-i', '--include-none-access', "Include Items with 'None' Access in Access List") do
@@ -241,7 +251,8 @@ EOT
           puts yellow,"No permissions found.",reset
         end
       else
-        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
+        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type',
+         'app_templates' => 'Blueprint', 'catalog_item_types' => 'Catalog Item Types', 'personas' => 'Personas'}
         available_field_options.each do |field, label|
           if !(field == 'sites' && is_tenant_account) && options["include_#{field}_access".to_sym]
             access = user['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.18"
+    VERSION = "5.0.0"
   end
 end

data/lib/morpheus/cli/workflows.rb

@@ -619,10 +619,11 @@ class Morpheus::Cli::Workflows
         elsif target_type == 'appliance'
           # cool, run it locally.
         else
-          raise_command_error "missing required option: --instance, --host or --appliance\n#{optparse}"
+          # cool, run it locally.
+          #raise_command_error "missing required option: --instance, --host or --appliance\n#{optparse}"
         end
 
-        # todo: prompt to workflow optionTypes for customOptions
+        # prompt to workflow optionTypes for customOptions
         custom_options = nil
         if workflow['optionTypes'] && workflow['optionTypes'].size() > 0
           custom_option_types = workflow['optionTypes'].collect {|it|
@@ -631,9 +632,9 @@ class Morpheus::Cli::Workflows
           }
           custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
         end
-
-        params['targetType'] = target_type
-
+        if target_type
+          params['targetType'] = target_type
+        end
         job_payload = {}
         job_payload.deep_merge!(params)
         passed_options.delete('customOptions')
@@ -655,15 +656,17 @@ class Morpheus::Cli::Workflows
         puts as_json(json_response, options)
         return json_response['success'] ? 0 : 1
       else
-        target_desc = ""
+        target_desc = nil
         if instances.size() > 0
           target_desc = (instances.size() == 1) ? "instance #{instances[0]['name']}" : "#{instances.size()} instances"
         elsif servers.size() > 0
           target_desc = (servers.size() == 1) ? "host #{servers[0]['name']}" : "#{servers.size()} hosts"
-        elsif target_type == 'appliance'
-          target_desc = "appliance"
         end
-        print_green_success "Executing workflow #{workflow['name']} on #{target_desc}"
+        if target_desc
+          print_green_success "Executing workflow #{workflow['name']} on #{target_desc}"
+        else
+          print_green_success "Executing workflow #{workflow['name']}"
+        end
         # todo: refresh, use get processId and load process record isntead? err
         if json_response["jobExecution"] && json_response["jobExecution"]["id"]
           get_args = [json_response["jobExecution"]["id"], "--details"] + (options[:remote] ? ["-r",options[:remote]] : [])