morpheus-cli 4.2.18 → 5.0.0

data/lib/morpheus/cli/invoices_command.rb

@@ -44,7 +44,7 @@ class Morpheus::Cli::InvoicesCommand
       opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
         options[:show_prices] = true
       end
-      opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+      opts.on('-t', '--type TYPE', "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
         params['refType'] ||= []
         values = val.split(",").collect {|it| it.strip }.select {|it| it != "" }
         values.each { |it| params['refType'] << parse_invoice_ref_type(it) }
@@ -193,9 +193,8 @@ class Morpheus::Cli::InvoicesCommand
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if invoices.empty?
-        unless options[:totals_only]
-          print cyan,"No invoices found.",reset,"\n"
-        end
+        print cyan,"No invoices found.",reset,"\n"
+        print reset,"\n"
       else
         # current_date = Time.now
         # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
@@ -300,8 +299,8 @@ class Morpheus::Cli::InvoicesCommand
             end
             if options[:show_estimates]
               cost_rows += [
-                {label: 'Estimated Cost'.upcase, compute: invoice_totals['estimatedComputeCost'], memory: invoice_totals['estimatedMemoryCost'], storage: invoice_totals['estimatedStorageCost'], network: invoice_totals['estimatedNetworkCost'], license: invoice_totals['estimatedLicenseCost'], extra: invoice_totals['estimatedExtraCost'], running: invoice_totals['estimatedRunningCost'], total: invoice_totals['estimatedTotalCost']},
-                {label: 'Estimated Price'.upcase, compute: invoice_totals['estimatedComputePrice'], memory: invoice_totals['estimatedMemoryPrice'], storage: invoice_totals['estimatedStoragePrice'], network: invoice_totals['estimatedNetworkPrice'], license: invoice_totals['estimatedLicensePrice'], extra: invoice_totals['estimatedExtraPrice'], running: invoice_totals['estimatedRunningPrice'], total: invoice_totals['estimatedTotalPrice']},
+                {label: 'Metered Cost'.upcase, compute: invoice_totals['estimatedComputeCost'], memory: invoice_totals['estimatedMemoryCost'], storage: invoice_totals['estimatedStorageCost'], network: invoice_totals['estimatedNetworkCost'], license: invoice_totals['estimatedLicenseCost'], extra: invoice_totals['estimatedExtraCost'], running: invoice_totals['estimatedRunningCost'], total: invoice_totals['estimatedTotalCost']},
+                {label: 'Metered Price'.upcase, compute: invoice_totals['estimatedComputePrice'], memory: invoice_totals['estimatedMemoryPrice'], storage: invoice_totals['estimatedStoragePrice'], network: invoice_totals['estimatedNetworkPrice'], license: invoice_totals['estimatedLicensePrice'], extra: invoice_totals['estimatedExtraPrice'], running: invoice_totals['estimatedRunningPrice'], total: invoice_totals['estimatedTotalPrice']},
               ]
             end
             cost_columns = {
@@ -534,8 +533,8 @@ EOT
       end
       if options[:show_estimates]
         cost_rows += [
-          {label: 'Estimated Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
-          {label: 'Estimated Price'.upcase, compute: invoice['estimatedComputePrice'], memory: invoice['estimatedMemoryPrice'], storage: invoice['estimatedStoragePrice'], network: invoice['estimatedNetworkPrice'], license: invoice['estimatedLicensePrice'], extra: invoice['estimatedExtraPrice'], running: invoice['estimatedRunningPrice'], total: invoice['estimatedTotalPrice']},
+          {label: 'Metered Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
+          {label: 'Metered Price'.upcase, compute: invoice['estimatedComputePrice'], memory: invoice['estimatedMemoryPrice'], storage: invoice['estimatedStoragePrice'], network: invoice['estimatedNetworkPrice'], license: invoice['estimatedLicensePrice'], extra: invoice['estimatedExtraPrice'], running: invoice['estimatedRunningPrice'], total: invoice['estimatedTotalPrice']},
         ]
       end
       cost_columns = {
@@ -683,7 +682,7 @@ EOT
         params['externalId'] ||= []
         params['externalId'] << val
       end
-      opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+      opts.on('-t', '--type TYPE', "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
         params['refType'] ||= []
         values = val.split(",").collect {|it| it.strip }.select {|it| it != "" }
         values.each { |it| params['refType'] << parse_invoice_ref_type(it) }

data/lib/morpheus/cli/jobs_command.rb

@@ -102,15 +102,15 @@ class Morpheus::Cli::JobsCommand
         if stats = json_response['stats']
           label_width = 17
 
-          print_h2 "Executions Stats - Last 7 Days"
+          print_h2 "Execution Stats - Last 7 Days"
           print cyan
 
           print "Jobs".rjust(label_width, ' ') + ": #{stats['jobCount']}\n"
           print "Executions Today".rjust(label_width, ' ') + ": #{stats['todayCount']}\n"
           print "Daily Executions".rjust(label_width, ' ') + ": " + stats['executionsPerDay'].join(' | ') + "\n"
           print "Total Executions".rjust(label_width, ' ') + ": #{stats['execCount']}\n"
-          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
-          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100, {bar_color:green}) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100, {bar_color:red}) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
         end
         print reset,"\n"
       end
@@ -304,7 +304,7 @@ class Morpheus::Cli::JobsCommand
           job_options = @jobs_interface.options(job_type_id)
 
           # prompt task / workflow
-          if job_type['code'] == 'morpheus.task'
+          if ['morpheus.task.jobType', 'morpheus.task'].include?(job_type['code'])
             params['task'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'task.id', 'fieldLabel' => 'Task', 'type' => 'select', 'required' => true, 'optionSource' => 'tasks'}], options[:options], @api_client, {})['task']
           else
             params['workflow'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'workflow.id', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => true, 'optionSource' => 'operationTaskSets'}], options[:options], @api_client, {})['workflow']
@@ -320,10 +320,11 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['task'] = {'id' => task['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.task')
+          job_type_id = load_job_type_id_by_code('morpheus.task.jobType') || load_job_type_id_by_code('morpheus.task')
         end
 
         # workflow
+        task_set = nil
         if !options[:workflow].nil?
           task_set = find_by_name_or_id('task_set', options[:workflow])
 
@@ -332,8 +333,29 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['workflow'] = {'id' => task_set['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.workflow')
+          job_type_id = load_job_type_id_by_code('morpheus.workflow.jobType') || load_job_type_id_by_code('morpheus.workflow')
         end
+        # load workflow if we havent yet
+        if (params['workflow'] && params['workflow']['id']) && task_set.nil?
+          task_set = find_by_name_or_id('task_set', params['workflow']['id'])
+          if task_set.nil?
+            print_red_alert "Workflow #{params['workflow']['id']} not found"
+            exit 1
+          end
+        end
+        # prompt for custom options for workflow
+        custom_option_types = task_set ? task_set['optionTypes'] : nil
+        if custom_option_types && custom_option_types.size() > 0
+          # they are all returned in a single array right now, so skip prompting for the jobType optionTypes
+          custom_option_types.reject! { |it| it['code'] && it['code'].include?('job.type') }
+          custom_option_types = custom_option_types.collect {|it|
+            it['fieldContext'] = 'customOptions'
+            it
+          }
+          custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
+          params['customOptions'] = custom_options['customOptions']
+        end
+
 
         # load options based upon job type + task / taskset
         job_options = @jobs_interface.options(job_type_id, {'taskId' => params['task'] ? params['task']['id'] : nil, 'workflowId' => params['workflow'] ? params['workflow']['id'] : nil})
@@ -768,7 +790,7 @@ class Morpheus::Cli::JobsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      opts.on('-D', '--details [on|off]', String, "Can be used to enable / disable execution details. Default if on") do |val|
+      opts.on('-D', '--details [on|off]', String, "Can be used to enable / disable execution details. Default is on") do |val|
         options[:details] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
@@ -970,7 +992,7 @@ class Morpheus::Cli::JobsCommand
   def format_status(status_string, return_color=cyan)
     out = ""
     if status_string
-      if ['success', 'successful', 'ok'].include?(status_string)
+      if ['complete','success', 'successful', 'ok'].include?(status_string)
         out << "#{green}#{status_string.upcase}"
       elsif ['error', 'offline', 'failed', 'failure'].include?(status_string)
         out << "#{red}#{status_string.upcase}"

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -244,15 +244,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     options = {}
     params = {}
     logo_file = nil
-    option_type_ids = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_option_type_options(opts, options, add_instance_type_option_types())
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
-          option_type_ids = []
+          params['optionTypes'] = []
         else
-          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -348,6 +347,13 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_instance_type_option_types())
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+        if list.nil?
+          params['optionTypes'] = []
+        else
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
       opts.footer = "Update an instance type." + "\n" +
                     "[name] is required. This is the name or id of a instance type."
     end
@@ -375,6 +381,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         params['hasSettings'] = ['on','true','1'].include?(params['hasSettings'].to_s) if params.key?('hasSettings')
         params['hasAutoScale'] = ['on','true','1'].include?(params['hasAutoScale'].to_s) if params.key?('hasAutoScale')
         params['hasDeployment'] = ['on','true','1'].include?(params['hasDeployment'].to_s) if params.key?('hasDeployment')
+        if params['optionTypes']
+          prompt_results = prompt_for_option_types(params, options, @api_client)
+          if prompt_results[:success]
+            params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
+        end
         if params.empty?
           puts optparse
           #option_lines = update_instance_type_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -90,6 +90,9 @@ class Morpheus::Cli::LibraryOptionListsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_standard_get_options(opts, options)
+      opts.on(nil,'--no-items', "Do not display List Items") do |val|
+        options[:no_list_items] = true
+      end
       opts.footer = "Get details about an option list.\n" + 
                     "[name] is required. This is the name or id of an option list. Supports 1-N [name] arguments."
     end
@@ -166,15 +169,20 @@ class Morpheus::Cli::LibraryOptionListsCommand
           print_h2 "Translation Script"
           print reset,"#{option_type_list['translationScript']}","\n",reset
         end
+        if !option_type_list['requestScript'].empty?
+          print_h2 "Request Script"
+          print reset,"#{option_type_list['requestScript']}","\n",reset
+        end
       end
-      print_h2 "List Items"
-      if option_type_list['listItems']
-        print as_pretty_table(option_type_list['listItems'], ['name', 'value'], options)
-      else
-        puts "No data"
+      if options[:no_list_items] != true
+        list_items = option_type_list['listItems']
+        if list_items && list_items.size > 0
+          print_h2 "List Items"
+          print as_pretty_table(list_items, [:name, :value], options)
+          print_results_pagination({size: list_items.size, total: list_items.size})
+        end
       end
       print reset,"\n"
-
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -136,6 +136,7 @@ module Morpheus::Cli::AccountsHelper
       "Multitenant" => lambda {|it| 
         format_boolean(it['multitenant']).to_s + (it['multitenantLocked'] ? " (LOCKED)" : "")
       },
+      "Default Persona" => lambda {|it| it['defaultPersona'] ? it['defaultPersona']['name'] : '(standard)' },
       "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
       #"Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
@@ -196,7 +197,7 @@ module Morpheus::Cli::AccountsHelper
 
   ## Users
 
-  def user_column_definitions()
+  def user_column_definitions(opts={})
     {
       "ID" => 'id',
       "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
@@ -206,15 +207,15 @@ module Morpheus::Cli::AccountsHelper
       "Email" => 'email',
       "Role" => lambda {|it| format_user_role_names(it) },
       "Notifications" => lambda {|it| it['receiveNotifications'].nil? ? '' : format_boolean(it['receiveNotifications']) },
-      "Status" => lambda {|it| format_user_status(it) },
+      "Status" => lambda {|it| format_user_status(it, opts[:color] || cyan) },
       "Last Login" => lambda {|it| format_duration_ago(it['lastLoginDate']) },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
     }
   end
 
-  def list_user_column_definitions()
-    columns = user_column_definitions
+  def list_user_column_definitions(opts={})
+    columns = user_column_definitions(opts)
     columns.delete("Notifications")
     return columns.upcase_keys!
   end
@@ -261,8 +262,8 @@ module Morpheus::Cli::AccountsHelper
       return nil
     elsif users.size > 1
       print_red_alert "Found #{users.size} users by username '#{username}'. Try using ID instead: #{format_list(users.collect {|it| it['id']}, 'or', 3)}"
-      print "\n"
-      print as_pretty_table(users, list_user_column_definitions, {color: red, thin: true})
+      print_error "\n"
+      print_error as_pretty_table(users, list_user_column_definitions({color: red}), {color: red, thin: true})
       print reset,"\n"
       return nil
     else

data/lib/morpheus/cli/mixins/backups_helper.rb

@@ -1,6 +1,6 @@
 require 'morpheus/cli/mixins/print_helper'
 # Mixin for Morpheus::Cli command classes
-# Provides common methods for infrastructure management
+# Provides common methods for backups management
 module Morpheus::Cli::BackupsHelper
 
   def self.included(klass)
@@ -8,13 +8,11 @@ module Morpheus::Cli::BackupsHelper
   end
 
   def backups_interface
-    # @api_client.groups
     raise "#{self.class} has not defined @backups_interface" if @backups_interface.nil?
     @backups_interface
   end
 
-  def backup_jobs_interface
-    # @api_client.groups
+  def backup_jobs_interfaces
     raise "#{self.class} has not defined @backup_jobs_interface" if @backup_jobs_interface.nil?
     @backup_jobs_interface
   end

data/lib/morpheus/cli/mixins/catalog_helper.rb

@@ -0,0 +1,66 @@
+require 'morpheus/cli/mixins/print_helper'
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for infrastructure management
+module Morpheus::Cli::CatalogHelper
+
+  def self.included(klass)
+    klass.send :include, Morpheus::Cli::PrintHelper
+  end
+
+  def catalog_item_types_interface
+    raise "#{self.class} has not defined @catalog_item_types_interface" if @catalog_item_types_interface.nil?
+    @catalog_item_types_interface
+  end
+
+  # def service_catalog_interface
+  #   raise "#{self.class} has not defined @service_catalog_interface" if @service_catalog_interface.nil?
+  #   @service_catalog_interface
+  # end
+
+  def catalog_item_type_object_key
+    'catalogItemType'
+  end
+
+  def catalog_item_type_list_key
+    'catalogItemTypes'
+  end
+
+  def find_catalog_item_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_catalog_item_type_by_id(val)
+    else
+      return find_catalog_item_type_by_name(val)
+    end
+  end
+
+  def find_catalog_item_type_by_id(id)
+    begin
+      json_response = catalog_item_types_interface.get(id.to_i)
+      return json_response[catalog_item_type_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "catalog_item_type not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_catalog_item_type_by_name(name)
+    json_response = catalog_item_types_interface.list({name: name.to_s})
+    catalog_item_types = json_response[catalog_item_type_list_key]
+    if catalog_item_types.empty?
+      print_red_alert "catalog_item_type not found by name '#{name}'"
+      return nil
+    elsif catalog_item_types.size > 1
+      print_red_alert "#{catalog_item_types.size} catalog_item_types found by name '#{name}'"
+      puts_error as_pretty_table(catalog_item_types, [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return catalog_item_types[0]
+    end
+  end
+
+end

data/lib/morpheus/cli/mixins/deployments_helper.rb

@@ -10,7 +10,6 @@ module Morpheus::Cli::DeploymentsHelper
   ## Deployments
 
   def deployments_interface
-    # @api_client.groups
     raise "#{self.class} has not defined @deployments_interface" if @deployments_interface.nil?
     @deployments_interface
   end

data/lib/morpheus/cli/mixins/option_source_helper.rb

@@ -75,7 +75,7 @@ module Morpheus::Cli::OptionSourceHelper
 
   def get_cloud_options(refresh=false, api_params={})
     if !@available_cloud_options || refresh
-      option_results = options_interface.options_for_source('clouds', api_params.mege({'default' => 'false'}))
+      option_results = options_interface.options_for_source('clouds', api_params.merge({'default' => 'false'}))
         @available_cloud_options = option_results['data'].collect {|it|
           {"name" => it["name"], "value" => it["value"], "id" => it["value"]}
         }

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -1285,4 +1285,50 @@ module Morpheus::Cli::PrintHelper
     end
   end
 
+  # convert JSON or YAML string to a map
+  def parse_json_or_yaml(config, parsers = [:json, :yaml])
+    rtn = {success: false, data: nil, err: nil}
+    err = nil
+    config = config.strip
+    if config[0..2] == "---"
+      parsers = [:yaml]
+    end
+    # ok only parse json for strings that start with {, consolidated yaml can look like json and cause issues}
+    if config[0] && config[0].chr == "{" && config[-1] && config[-1].chr == "}"
+      parsers = [:json]
+    end
+    parsers.each do |parser|
+      if parser == :yaml
+        begin
+          # todo: one method to parse and return Hash
+          # load does not raise an exception, it just returns the bad string
+          #YAML.parse(config)
+          config_map = YAML.load(config)
+          if !config_map.is_a?(Hash)
+            raise "Failed to parse config as YAML"
+          end
+          rtn[:data] = config_map
+          rtn[:success] = true
+          break
+        rescue => ex
+          rtn[:err] = ex if rtn[:err].nil?
+        end
+      elsif parser == :json
+        begin
+          config_map = JSON.parse(config)
+          rtn[:data] = config_map
+          rtn[:success] = true
+          break
+        rescue => ex
+          rtn[:err] = ex if rtn[:err].nil?
+        end
+      end
+    end
+    return rtn
+  end
+
+  def parse_yaml_or_json(config, parsers = [:yaml, :json])
+    parse_json_or_yaml(config, parsers)
+  end
+
 end

data/lib/morpheus/cli/network_pools_command.rb

@@ -596,22 +596,28 @@ class Morpheus::Cli::NetworkPoolsCommand
   def add_ip(args)
     options = {}
     params = {}
+    next_free_ip = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[network-pool] [ip]")
+      opts.banner = subcommand_usage("[network-pool] [ip] [--next]")
       opts.on('--ip-address VALUE', String, "IP Address for this network pool IP") do |val|
         options[:options]['ipAddress'] = val
       end
+      opts.on('--next-free-ip', '--next-free-ip', "Use the next available ip address. This can be used instead of specifying an ip address") do
+        next_free_ip = true
+      end
       opts.on('--hostname VALUE', String, "Hostname for this network pool IP") do |val|
         options[:options]['hostname'] = val
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Create a new network pool IP." + "\n" +
                     "[network-pool] is required. This is the name or id of a network pool.\n" +
-                    "[ip] is required and can be passed as --ip-address instead."
+                    "[ip] is required or --next-free-ip to use the next available address instead."
     end
     optparse.parse!(args)
-    if args.count < 1 || args.count > 2
-      raise_command_error "wrong number of arguments, expected 1-2 and got (#{args.count}) #{args}\n#{optparse}"
+    if next_free_ip
+      verify_args!(args:args, count:1, optparse:optparse)
+    else
+      verify_args!(args:args, min:1, max:2, optparse:optparse)
     end
     connect(options)
     begin
@@ -639,8 +645,10 @@ class Morpheus::Cli::NetworkPoolsCommand
         payload['networkPoolIp'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
         # IP Address
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipAddress', 'fieldLabel' => 'IP Address', 'type' => 'text', 'required' => true, 'description' => 'IP Address for this network pool IP.'}], options[:options])
-        payload['networkPoolIp']['ipAddress'] = v_prompt['ipAddress'] unless v_prompt['ipAddress'].to_s.empty?
+        unless next_free_ip
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipAddress', 'fieldLabel' => 'IP Address', 'type' => 'text', 'required' => true, 'description' => 'IP Address for this network pool IP.'}], options[:options])
+          payload['networkPoolIp']['ipAddress'] = v_prompt['ipAddress'] unless v_prompt['ipAddress'].to_s.empty?
+        end
 
         # Hostname
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname for this network pool IP.'}], options[:options])