morpheus-cli 5.4.5.1 → 5.5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ddc5a04df52338a55327598f760d41e51d93d6a03fbebac557202c3a952116
-  data.tar.gz: 3a586a705cd480573bd9da349c737a18761999096ec59bd77ce98a27a41f07d4
+  metadata.gz: a66201f045d6e88db90746058ce40000b064616975aae3d00c025069c51f20d7
+  data.tar.gz: de2b69e5a52ca31f7bde8d573428853a765668b2d08ba8eaca1cdbe6743ecf0a
 SHA512:
-  metadata.gz: 43dab7d23d4e1889dfc611445dcd2da0c61dc8c7ec1245cddebea0469cede7ebfdeb453b718e0bbbc247b620be9ae4af5698f46bf1d0c689f38940894b112e7f
-  data.tar.gz: fb08c98c2395a86b41df4fe8ce6aaa7b8d4306aa39461d849ee121a256cfcc733ab1aa58c171c6b181ca62c824a2b3e55c80a206194a5e4993d7495413472617
+  metadata.gz: ebc460c1903caf068710ac2512e73fb88329045a49ff603904e875ff2a02cb6a4ec02b34195d9ee19c98ab8eefb6388357d8c43cb69a8ad92891322a085f1dd1
+  data.tar.gz: 60a297a75a29a6bb53a3944b81fa14a9f46c846173bf98472886bb86a5a13491c55da9600fa691d861ba20812546b5d57e891a61a3b4dcef9c922ed3b43a3f9b

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.4.5.1
+RUN gem install morpheus-cli -v 5.5.1.1
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -590,6 +590,10 @@ class Morpheus::APIClient
     Morpheus::OptionTypeListsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def scale_thresholds
+    Morpheus::ScaleThresholdsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def power_schedules
     Morpheus::PowerSchedulesInterface.new(common_interface_options).setopts(@options)
   end
@@ -832,6 +836,14 @@ class Morpheus::APIClient
     Morpheus::BackupJobsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def backup_services
+    Morpheus::BackupServicesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def backup_service_types
+    Morpheus::BackupServiceTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def catalog_item_types
     Morpheus::CatalogItemTypesInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/backup_service_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::BackupServiceTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/backup-service-types"
+  end
+
+end

data/lib/morpheus/api/backup_services_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::BackupServicesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/backup-services"
+  end
+
+end

data/lib/morpheus/api/clusters_interface.rb

@@ -103,6 +103,18 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers)
   end
 
+  def get_upgrade_versions(id, params={})
+    url = "#{base_path}/#{id}/upgrade-cluster"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def do_cluster_upgrade(id, params={})
+    url = "#{base_path}/#{id}/upgrade-cluster"
+    headers = { params: params, authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json'  }
+    execute(method: :post, url: url, headers: headers)
+    end
+
   def list_services(id, params={})
     url = "#{base_path}/#{id}/services"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/network_pool_servers_interface.rb

@@ -38,4 +38,11 @@ class Morpheus::NetworkPoolServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def get_type(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/networks/pool-server-types/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
 end

data/lib/morpheus/api/prices_interface.rb

@@ -62,4 +62,10 @@ class Morpheus::PricesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
+
+  def list_currencies(params={})
+    url = "#{base_path}/currencies"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
 end

data/lib/morpheus/api/scale_thresholds_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::ScaleThresholdsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/scale-thresholds"
+  end
+
+end

data/lib/morpheus/cli/cli_command.rb

@@ -253,7 +253,7 @@ module Morpheus
 
       # list is GET that supports phrase,max,offset,sort,direction
       def build_standard_list_options(opts, options, includes=[], excludes=[])
-        build_standard_get_options(opts, options, [:list] + includes, excludes=[])
+        build_standard_get_options(opts, options, [:list] + includes, excludes)
       end
 
       def build_standard_add_options(opts, options, includes=[], excludes=[])
@@ -479,8 +479,10 @@ module Morpheus
               options[:offset] = offset
             end
 
-            opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
-              options[:phrase] = phrase
+            if excludes.include?("search") == false
+              opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
+                options[:phrase] = phrase
+              end
             end
 
             opts.on( '-S', '--sort ORDER', "Sort Order. DIRECTION may be included as \"ORDER [asc|desc]\"." ) do |v|
@@ -741,7 +743,15 @@ module Morpheus
                 options[:include_fields] = val
               end
             end
-            opts.add_hidden_option('-F,') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.on('--raw-fields [x,y,z]', String, "Raw fields filters output like --fields except the properties [x,y,z] must be specified from the root of the response instead of relative to the the list or object context for this particular resource.") do |val|
+              if val.size == 1 && val[0].downcase == 'all'
+                options[:all_fields] = true
+              else
+                options[:include_fields] = val.split(',').collect {|r| r.strip}.compact
+              end
+              options[:raw_fields] = true
+            end
+            opts.add_hidden_option('--raw-fields') if opts.is_a?(Morpheus::Cli::OptionParser)
             opts.on(nil, '--all-fields', "Show all fields present in the data.") do
               options[:all_fields] = true
             end
@@ -753,6 +763,11 @@ module Morpheus
             opts.on('--select x,y,z', String, "Filter Output to just print the value(s) of specific fields.") do |val|
               options[:select_fields] = val.split(',').collect {|r| r.strip}
             end
+            opts.on('--raw-select x,y,z', String, "Raw select works like --select except the properties [x,y,z] must be specified from the root of the response instead of relative to the the list or object context for this particular resource.") do |val|
+              options[:select_fields] = val.split(',').collect {|r| r.strip}
+              options[:raw_fields] = true
+            end
+            opts.add_hidden_option('--raw-select') if opts.is_a?(Morpheus::Cli::OptionParser)
 
           when :delim
             opts.on('--delimiter [CHAR]', String, "Delimiter for output values. Default: ',', use with --select and --csv") do |val|
@@ -1397,29 +1412,33 @@ module Morpheus
       def render_response(json_response, options, object_key=nil, &block)
         output = nil
         if options[:select_fields]
-          row = object_key ? json_response[object_key] : json_response
-          row = [row].flatten()
-          if row.is_a?(Array)
-            output = [row].flatten.collect { |record| 
-              options[:select_fields].collect { |field| 
-                value = get_object_value(record, field)
-                value.is_a?(String) ? value : JSON.fast_generate(value)
-              }.join(options[:delim] || ",")
-            }.join(options[:newline] || "\n")
-          else
-            output = records_as_csv([row], options)
+          # support foos get --raw-select foo.x,foo.y,foo.z
+          # and foos list --raw-select foos.x,foos.y,foos.z
+          row = (object_key && !options[:raw_fields]) ? json_response[object_key] : json_response
+          records = [row].flatten()
+          # look for an array in the first field only now...
+          field_parts = options[:select_fields][0].to_s.split(".")
+          field_context = field_parts[0]
+          context_data = json_response[field_context]
+          if field_parts.size > 1 && context_data.is_a?(Array)
+            # inject all the root level properties to be selectable too..
+            context_data = json_response.delete(field_context)
+            # records = context_data
+            records = context_data.collect {|it| it.is_a?(Hash) ? json_response.merge(it) : json_response }
+            options[:select_fields] = options[:select_fields].collect {|it| it.sub(field_context+'.', '')}
           end
+          output = records.collect { |record| 
+            options[:select_fields].collect { |field| 
+              value = get_object_value(record, field)
+              value.is_a?(String) ? value : JSON.fast_generate(value)
+            }.join(options[:delim] || ",")
+          }.join(options[:newline] || "\n")
         elsif options[:json]
           output = as_json(json_response, options, object_key)
         elsif options[:yaml]
           output = as_yaml(json_response, options, object_key)
         elsif options[:csv]
-          row = object_key ? json_response[object_key] : json_response
-          if row.is_a?(Array)
-            output = records_as_csv(row, options)
-          else
-            output = records_as_csv([row], options)
-          end
+          output = as_csv(json_response, nil, options, object_key)
         end
         if options[:outfile]
           full_outfile = File.expand_path(options[:outfile])
@@ -1569,7 +1588,7 @@ module Morpheus
         #Morpheus::Logging::DarkPrinter.puts "find_all(#{args.join(', ')})" if Morpheus::Logging.debug?
         type, *request_args = args
         type = type.to_s.singularize.underscore
-        list_key = respond_to?("#{type}_list_key", true) ? send("#{type}_list_key") : type.camelcase.pluralize
+        list_key = respond_to?("#{type}_list_key", true) ? send("#{type}_list_key") : get_list_key(type)
         json_response = find_all_json(*args)
         if !json_response.key?(list_key)
           # maybe just use the first key like this:
@@ -1600,7 +1619,7 @@ module Morpheus
         #Morpheus::Logging::DarkPrinter.puts "find_record(#{args.join(', ')})" if Morpheus::Logging.debug?
         type, *request_args = args
         type = type.to_s.singularize.underscore
-        object_key = respond_to?("#{type}_object_key", true) ? send("#{type}_object_key") : type.camelcase.singularize
+        object_key = respond_to?("#{type}_object_key", true) ? send("#{type}_object_key") : get_object_key(type)
         json_response = find_record_json(*args)
         if !json_response.key?(object_key)
           # maybe just use the first key like this:
@@ -1645,6 +1664,19 @@ module Morpheus
         return interface
       end
 
+      def get_list_key(type)
+        return get_object_key(type).pluralize
+      end
+
+      def get_object_key(type)
+        key = type.camelcase.singularize
+        # add aliases here as needed
+        if key == "cloud"
+          key = "zone"
+        end
+        return key
+      end
+
       module ClassMethods
 
         def prog_name

data/lib/morpheus/cli/commands/apps.rb

@@ -996,7 +996,7 @@ EOT
   end
 
   def apply(args)
-    default_refresh_interval = 15
+    default_refresh_interval = 10
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app] [options]")

data/lib/morpheus/cli/commands/backup_services_command.rb

@@ -0,0 +1,44 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::BackupServices
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_description "View and manage backup services."
+  set_command_name :'backup-services'
+  register_subcommands :list, :get, :add, :update, :remove
+  register_interfaces :backup_services, :backup_service_types
+  set_rest_has_type true
+
+  protected
+
+  def load_option_types_for_backup_service(record_type, parent_record)
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => 'on', 'displayOrder' => 2},
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Public', 'value' => 'public'}, {'name' => 'Private', 'value' => 'private'}], 'defaultValue' => 'public', 'displayOrder' => 1000}
+    ] + record_type['optionTypes']
+  end
+
+  def backup_service_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Status" => 'status',
+      "Visibility" => 'visibility'
+    }
+  end
+
+  def backup_service_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Enabled" => 'enabled',
+      "Api URL" => 'serviceUrl',
+      "Host" => 'host',
+      "Port" => 'port',
+      "Credential" => lambda {|it| it['credential']['type'] == 'local' ? 'local' : it['credential']['name']},
+      "Visibility" => 'visibility'
+    }
+  end
+end

data/lib/morpheus/cli/commands/cloud_resource_pools_command.rb

@@ -35,7 +35,10 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         cloud_id = val
       end
       opts.add_hidden_option('-c') # prefer args[0] for [cloud]
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on( '-s', '--search PHRASE', "Search by Name and/or Display Name" ) do |phrase|
+        options[:phrase] = phrase
+      end
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote], ['search'])
       opts.footer = "List resource pools for a cloud." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud."
     end
@@ -91,6 +94,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
             type: resource_pool['type'].to_s.capitalize,
             description: resource_pool['description'],
             active: format_boolean(resource_pool['active']),
+            inventory: format_boolean(resource_pool['inventory']),
             status: resource_pool['status'].to_s.upcase,
             visibility: resource_pool['visibility'].to_s.capitalize,
             default: format_boolean(resource_pool['defaultPool']),
@@ -99,7 +103,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
           }
           row
         }
-        columns = [:id, :name, :description, :active, :default, :visibility, :tenants]
+        columns = [:id, :name, :description, :active,:inventory, :default, :visibility, :tenants]
         if options[:include_fields]
           columns = options[:include_fields]
         end
@@ -179,10 +183,12 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       description_cols = {
         "ID" => 'id',
         "Name" => 'name',
+        "Display Name" => 'displayName',
         "Description" => 'description',
         #"Type" => lambda {|it| it['type'].to_s.capitalize },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
         "Active" => lambda {|it| format_boolean(it['active']) },
+        "Inventory" => lambda {|it| format_boolean(it['inventory']) },
         "Default" => lambda {|it| format_boolean(it['defaultPool']) },
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Status" => lambda {|it| it['status'].to_s.capitalize },
@@ -329,6 +335,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--inventory [on|off]', String, "Enable or disable inventory sync for resource pool during cloud refresh") do |val|
+        options['inventory'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
         options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
@@ -447,6 +456,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       else
         payload['resourcePool']['active'] = true
       end
+      
+      #inventory
+      if options['inventory'] != nil
+        payload['resourcePool']['inventory'] = options['inventory']
+      end
 
       # Default
       if options['defaultPool'] != nil
@@ -574,12 +588,18 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--inventory [on|off]', String, "Enable or disable inventory sync for resource pool during cloud refresh") do |val|
+        options['inventory'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
         options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
       opts.on("--description [TEXT]", String, "Description") do |val|
         options['description'] = val.to_s
       end
+      opts.on("--display-name [TEXT]", String, "Display Name") do |val|
+        options['displayName'] = val.to_s
+      end
       opts.on( '--role ROLE', String, "Role Name or ID (applicable to select resource pools)" ) do |val|
         options['role'] = val
       end
@@ -599,6 +619,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
     end
 
     connect(options)
+    puts "options #{options}"
 
     begin
       # load cloud
@@ -672,6 +693,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         if options['active'] != nil
           payload['resourcePool']['active'] = options['active']
         end
+        
+        #inventory
+        if options['inventory'] != nil
+          payload['resourcePool']['inventory'] = options['inventory']
+        end
 
         # Default
         if options['defaultPool'] != nil
@@ -688,6 +714,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
           payload['resourcePool']['description'] = options['description']
         end
 
+        # Display Name
+        if options['displayName'] != nil
+          payload['resourcePool']['displayName'] = options['displayName']
+        end
+
         # Role
         if options['role'] != nil
           role_options = load_option_source_data('openstackRoles', {zoneId: cloud['id']})

data/lib/morpheus/cli/commands/clouds.rb

@@ -80,8 +80,9 @@ class Morpheus::Cli::Clouds
         print_h1 title, subtitles
         if clouds.empty?
           print cyan,"No clouds found.",reset,"\n"
-        else
-          print_clouds_table(clouds, options)
+        else          
+          columns = cloud_list_column_definitions(options).upcase_keys!
+          print as_pretty_table(clouds, columns, options)
           print_results_pagination(json_response)
         end
         print reset,"\n"
@@ -164,13 +165,14 @@ class Morpheus::Cli::Clouds
       else
         server_counts = json_response['serverCounts'] # legacy
       end
-      cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
+      #cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
       print_h1 "Cloud Details"
       print cyan
       description_cols = {
         "ID" => 'id',
         "Name" => 'name',
-        "Type" => lambda {|it| cloud_type ? cloud_type['name'] : '' },
+        # "Type" => lambda {|it| cloud_type ? cloud_type['name'] : '' },
+        "Type" => lambda {|it| it['zoneType'] ? it['zoneType']['name'] : '' },
         "Code" => 'code',
         "Location" => 'location',
         "Region Code" => 'regionCode',
@@ -215,6 +217,13 @@ class Morpheus::Cli::Clouds
       opts.on( '--certificate-provider CODE', String, "Certificate Provider. Default is 'internal'" ) do |val|
         params[:certificate_provider] = val
       end
+      opts.on('--costing-mode VALUE', String, "Costing Mode can be off,costing,full, Default is off." ) do |val|
+        options[:options]['costingMode'] = val
+      end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
+
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -251,7 +260,6 @@ class Morpheus::Cli::Clouds
         # todo: pass groups as an array instead
 
         # Cloud Name
-
         if args[0]
           cloud_payload[:name] = args[0]
           options[:options]['name'] = args[0] # to skip prompt
@@ -261,7 +269,6 @@ class Morpheus::Cli::Clouds
         end
 
         # Cloud Type
-
         cloud_type = nil
         if params[:zone_type]
           cloud_type = cloud_type_for_name(params[:zone_type])
@@ -329,6 +336,12 @@ class Morpheus::Cli::Clouds
       # opts.on( '-d', '--description DESCRIPTION', "Description (optional)" ) do |desc|
       #   params[:description] = desc
       # end
+      opts.on('--costing-mode VALUE', String, "Costing Mode can be off, costing, or full. Default is off." ) do |val|
+        options[:options]['costingMode'] = val
+      end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -352,12 +365,26 @@ class Morpheus::Cli::Clouds
         cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
         cloud_payload = {}
         all_option_types = update_cloud_option_types(cloud_type)
-        #params = Morpheus::Cli::OptionTypes.prompt(all_option_types, options[:options], @api_client, {zoneTypeId: cloud_type['id']})
+        #params = Morpheus::Cli::OptionTypes.no_prompt(all_option_types, options[:options], @api_client, {zoneId: cloud['id'], zoneTypeId: cloud_type['id']})
         params = options[:options] || {}
+
+        # Credentials (ideally only if value passed in and name can be parsed)
+        if options[:options]['credential']
+          credential_code = "credential"
+          credential_option_type = {'code' => credential_code, 'fieldName' => credential_code, 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Enter an existing credential ID or choose "local"', 'defaultValue' => "local", 'required' => true}
+          # supported_credential_types = ['username-keypair', 'username-password', 'username-password-keypair'].compact.flatten.join(",").split(",").collect {|it| it.strip }
+          credential_params = {"new" => false, "zoneId" => cloud['id']}
+          credential_value = Morpheus::Cli::OptionTypes.select_prompt(credential_option_type, @api_client, credential_params, true, options[:options][credential_code])
+          if !credential_value.to_s.empty?
+            if credential_value == "local"
+              params[credential_code] = {"type" => credential_value}
+            elsif credential_value.to_s =~ /\A\d{1,}\Z/
+              params[credential_code] = {"id" => credential_value.to_i}
+            end
+          end
+        end
         if params.empty?
-          puts_error optparse.banner
-          puts_error format_available_options(all_option_types)
-          exit 1
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
         end
         # some optionTypes have fieldContext='zone', so move those to the root level of the zone payload
         if params['zone'].is_a?(Hash)
@@ -430,7 +457,16 @@ class Morpheus::Cli::Clouds
     query_params = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [options]")
+      opts.banner = subcommand_usage("[cloud] [options]")
+      opts.on( '-m', '--mode [daily|costing]', "Refresh Mode. Use this to run the daily or costing jobs instead of the default hourly refresh." ) do |val|
+        query_params[:mode] = val
+      end
+      opts.on( '--rebuild [on|off]', "Rebuild invoices for period. Only applies to mode=costing." ) do |val|
+        query_params[:rebuild] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on( '--period PERIOD', "Period in the format YYYYMM to process invoices for. Default is the current period. Only applies to mode=costing." ) do |val|
+        query_params[:period] = val.to_s
+      end
       opts.on( '-f', '--force', "Force refresh. Useful if the cloud is disabled." ) do
         query_params[:force] = 'true'
       end
@@ -919,25 +955,17 @@ class Morpheus::Cli::Clouds
 
   private
 
-  def print_clouds_table(clouds, opts={})
-    table_color = opts[:color] || cyan
-    rows = clouds.collect do |cloud|
-      cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
-      {
-        id: cloud['id'],
-        name: cloud['name'],
-        type: cloud_type ? cloud_type['name'] : '',
-        location: cloud['location'],
-        "REGION CODE": cloud['regionCode'],
-        groups: (cloud['groups'] || []).collect {|it| it.instance_of?(Hash) ? it['name'] : it.to_s }.join(', '),
-        servers: cloud['serverCount'],
-        status: format_cloud_status(cloud)
-      }
-    end
-    columns = [
-      :id, :name, :type, :location, "REGION CODE", :groups, :servers, :status
-    ]
-    print as_pretty_table(rows, columns, opts)
+  def cloud_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Type" => lambda {|it| it['zoneType'] ? it['zoneType']['name'] : '' },
+      "Location" => 'location',
+      "Region Code" => lambda {|it| it['regionCode'] },
+      "Groups" => lambda {|it| (it['groups'] || []).collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
+      "Servers" => lambda {|it| it['serverCount'] },
+      "Status" => lambda {|it| format_cloud_status(it) },
+    }
   end
 
   def add_cloud_option_types(cloud_type)
@@ -948,6 +976,8 @@ class Morpheus::Cli::Clouds
       {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
       {'fieldName' => 'location', 'fieldLabel' => 'Location', 'type' => 'text', 'required' => false, 'displayOrder' => 3},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private', 'displayOrder' => 4},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 5},
+      {'fieldName' => 'autoRecoverPowerState', 'fieldLabel' => 'Automatically Power On VMs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 6}
     ]
 
     # TODO: Account
@@ -955,9 +985,15 @@ class Morpheus::Cli::Clouds
     # Details (zoneType.optionTypes)
 
     if cloud_type && cloud_type['optionTypes']
+      if !cloud_type['optionTypes'].find {|opt| opt['type'] == 'credential'}
+        tmp_option_types << {'fieldName' => 'type', 'fieldLabel' => 'Credentials', 'type' => 'credential', 'optionSource' => 'credentials', 'required' => true, 'defaultValue' => 'local', 'config' => {'credentialTypes' => ['username-password']}, 'displayOrder' => 7}
+        cloud_type['optionTypes'].select {|opt| ['username', 'password'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}
+      end
       # adjust displayOrder to put these at the end
       #tmp_option_types = tmp_option_types + cloud_type['optionTypes']
       cloud_type['optionTypes'].each do |opt|
+        # temp fix for typo
+        opt['optionSource'] = 'credentials' if opt['optionSource'] == 'credentials,'
         tmp_option_types << opt.merge({'displayOrder' => opt['displayOrder'].to_i + 100})
       end
     end
@@ -980,7 +1016,7 @@ class Morpheus::Cli::Clouds
   end
 
   def cloud_types_for_dropdown
-    get_available_cloud_types().select {|it| it['enabled'] }.collect {|it| {'name' => it['name'], 'value' => it['code']} }
+    @clouds_interface.cloud_types({max:1000, shallow:true})['zoneTypes'].select {|it| it['enabled'] }.collect {|it| {'name' => it['name'], 'value' => it['code']} }
   end
 
   def format_cloud_status(cloud, return_color=cyan)