morpheus-cli 5.5.3.2 → 6.0.1

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

@@ -8,7 +8,7 @@ class Morpheus::Cli::ContainersCommand
   set_command_name :containers
   set_command_description "View and manage containers (nodes)."
   register_subcommands :get, :stop, :start, :restart, :suspend, :eject, :action, :actions, :logs,
-    {:exec => :execution_request}, :clone_image, :import
+    {:exec => :execution_request}, :clone_image, :import, :attach_floating_ip, :detach_floating_ip
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -17,6 +17,7 @@ class Morpheus::Cli::ContainersCommand
     @provision_types_interface = @api_client.provision_types
     @logs_interface = @api_client.logs
     @execution_request_interface = @api_client.execution_request
+    @clouds_interface = @api_client.clouds
   end
   
   def handle(args)
@@ -696,7 +697,7 @@ EOT
     end
     json_response = @containers_interface.import(container['id'], payload)
     render_response(json_response, options) do
-      print_green_success "Import initiated for container [#{container['id']}] #{container['name']}"
+      print_green_success "Import initiated for container #{container['id']}"
     end
     return 0, nil
   end
@@ -768,12 +769,121 @@ EOT
     end
     json_response = @containers_interface.clone_image(container['id'], payload)
     render_response(json_response, options) do
-      print_green_success "Clone Image initiated for container [#{container['id']}] #{container['name']}"
+      print_green_success "Clone Image initiated for container #{container['id']}"
     end
     return 0, nil
   end
 
-private
+  def attach_floating_ip(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.on('--ip ID', String, "Floating IP Address, in the format 'ip-ID'.") do |val|
+        options[:ip] = val
+      end
+      opts.on('--pool ID', String, "Floating IP Pool Identifier, in the format 'pool-ID'.") do |val|
+        options[:pool] = val
+      end
+      opts.on('--bandwidth VALUE', String, "Floating IP Bandidth (Mbit/s). Only cloud types Huawei and OpenTelekom support this option.") do |val|
+        options[:bandwidth] = val
+      end
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Attach a floating IP to a container.
+[id] is required. This is the id of a container.
+Only the following cloud types support this command: OpenStack, Huawei and OpenTelekom
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    container = find_container_by_id(args[0])
+    return 1 if container.nil?
+    cloud_type = load_container_cloud_type(container)
+    if !cloud_type['hasFloatingIps']
+      raise_command_error "Cloud Type #{cloud_type['name']} does support floating IPs."
+    end
+    payload = parse_payload(options)
+    if payload.nil?
+      payload = parse_passed_options(options)
+      attach_floating_ip_option_types = cloud_type['floatingIpTypes']
+      if attach_floating_ip_option_types && !attach_floating_ip_option_types.empty?
+        if options[:ip]
+          floating_ip = options[:ip].to_s.sub(/\Aip\-/i, '')
+          floating_ip = (floating_ip =~ /\A\d{1,}\Z/) ? "ip-#{floating_ip.to_s}" : floating_ip
+          options[:options]['config'] ||= {}
+          options[:options]['config']['osExternalNetworkId'] = floating_ip
+        elsif options[:pool]
+          floating_ip = options[:pool].to_s.sub(/\Apool\-/i, '')
+          floating_ip = (floating_ip =~ /\A\d{1,}\Z/) ? "pool-#{floating_ip.to_s}" : floating_ip
+          options[:options]['config'] ||= {}
+          options[:options]['config']['osExternalNetworkId'] = floating_ip
+        end
+        if options[:bandwidth]
+          options[:options]['config'] ||= {}
+          options[:options]['config']['floatingIpBandwidth'] = options[:bandwidth].to_i
+        end
+        #api_params = {zoneId: container['cloud'] ? container['cloud']['id'] : nil, resourcePoolId: container['resourcePool'] ? container['resourcePool']['id'] : nil}
+        api_params = {containerId: container['id']}
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(attach_floating_ip_option_types, options[:options], @api_client, api_params)
+        # payload.deep_merge!({'container' => v_prompt})
+        payload.deep_merge!(v_prompt)
+      else
+        # raise_command_error "Cloud Type #{cloud_type['name']} does not defined any floating IP inputs."
+      end
+    end
+    confirm!("Are you sure you would like to attach this floating IP to container #{container['id']}?", options)
+    @containers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @containers_interface.dry.attach_floating_ip(container['id'], payload)
+      return
+    end
+    json_response = @containers_interface.attach_floating_ip(container['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Attaching floating IP to container #{container['id']}"
+    end
+    return 0, nil
+  end
+
+  def detach_floating_ip(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Detach a floating IP from a container.
+[id] is required. This is the id of a container.
+Only the following cloud types support this command: OpenStack, Huawei and OpenTelekom
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    container = find_container_by_id(args[0])
+    return 1 if container.nil?
+    cloud_type = load_container_cloud_type(container)
+    if !cloud_type['hasFloatingIps']
+      raise_command_error "Cloud Type #{cloud_type['name']} does support floating IPs."
+    end
+    payload = parse_payload(options)
+    if payload.nil?
+      payload = parse_passed_options(options)
+      # prompt
+    end
+    confirm!("Are you sure you would like to detach the floating IP from container #{container['id']}?", options)
+    @containers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @containers_interface.dry.detach_floating_ip(container['id'], payload)
+      return
+    end
+    json_response = @containers_interface.detach_floating_ip(container['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Detaching floating IP from container #{container['id']}"
+    end
+    return 0, nil
+  end
+
+  private
 
   def find_container_by_id(id)
     begin
@@ -837,4 +947,19 @@ private
     end
     return provision_type
   end
+
+  def load_container_cloud_type(container)
+    cloud_type_code = container['cloud']['type'] rescue nil
+    cloud_type = nil
+    if cloud_type_code
+      cloud_type = @clouds_interface.cloud_types({code:cloud_type_code})['zoneTypes'][0]
+      if cloud_type.nil?
+        raise_command_error "Cloud Type not found by code #{cloud_type_code}"
+      end
+    else
+      raise_command_error "Unable to determine cloud type for container #{container['id']}"
+    end
+    return cloud_type
+  end
+
 end

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

@@ -22,7 +22,8 @@ class Morpheus::Cli::Doc
   end
 
   def connect(options)
-    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
+    # @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
+    @api_client = establish_remote_appliance_connection(options)
     @doc_interface = @api_client.doc
   end
 
@@ -72,12 +73,12 @@ EOT
     params, options = {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on(nil, "--refresh", "Refresh the document. By default the openapi.yml and openapi.json are cached by the server.") do
-        params['refresh'] = true
-      end
-      opts.on('-g', '--generate', "Alias for --refresh") do
-        params['refresh'] = true
-      end
+      # opts.on(nil, "--refresh", "Refresh the document. By default the openapi.yml and openapi.json are cached by the server.") do
+      #   params['refresh'] = true
+      # end
+      # opts.on('-g', '--generate', "Alias for --refresh") do
+      #   params['refresh'] = true
+      # end
       build_standard_get_options(opts, options, [], [:csv])
       opts.footer = <<-EOT
 Print the Morpheus API OpenAPI Documentation (swagger).
@@ -121,12 +122,12 @@ EOT
         options[:yaml] = true
         options[:format] = :yaml
       end
-      opts.on(nil, "--refresh", "Refresh the document. By default the openapi.yml and openapi.json are cached by the server.") do
-        params['refresh'] = true
-      end
-      opts.on('-g', '--generate', "Alias for --refresh") do
-        params['refresh'] = true
-      end
+      # opts.on(nil, "--refresh", "Refresh the document. By default the openapi.yml and openapi.json are cached by the server.") do
+      #   params['refresh'] = true
+      # end
+      # opts.on('-g', '--generate', "Alias for --refresh") do
+      #   params['refresh'] = true
+      # end
       opts.on( '-f', '--force', "Overwrite existing [local-file] if it exists." ) do
         options[:overwrite] = true
       end

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

@@ -943,6 +943,8 @@ class Morpheus::Cli::Hosts
             end
           end
         end
+
+        metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
         
         # Metadata Tags
         if metadata_option_type

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

@@ -2936,9 +2936,15 @@ EOT
       opts.on('--preserve-volumes [on|off]', ['on','off'], "Preserve Volumes. Default is off. Applies to certain types only.") do |val|
         query_params[:preserveVolumes] = val.nil? ? 'on' : val
       end
-      opts.on('--releaseEIPs [on|off]', ['on','off'], "Release EIPs. Default is on. Applies to Amazon only.") do |val|
-        query_params[:releaseEIPs] = val.nil? ? 'on' : val
+      opts.on('--release-ips [on|off]', ['on','off'], "Release Floating IPs. Default is on. Applies to certain types only.") do |val|
+        query_params[:releaseFloatingIps] = val.nil? ? 'on' : val
+        query_params[:releaseEIPs] = query_params[:releaseFloatingIps] # old parameter before 6.0
       end
+      opts.on('--releaseEIPs [on|off]', ['on','off'], "Alias for Release Floating IPs") do |val|
+        query_params[:releaseFloatingIps] = val.nil? ? 'on' : val
+        query_params[:releaseEIPs] = query_params[:releaseFloatingIps] # old parameter before 6.0
+      end
+      opts.add_hidden_option('--releaseEIPs')
       opts.on( '-f', '--force', "Force Delete" ) do
         query_params[:force] = 'on'
       end
@@ -4940,7 +4946,7 @@ EOT
   end
 
   def apply(args)
-    default_refresh_interval = 10
+    default_refresh_interval = 5
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance] [options]")

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

@@ -280,17 +280,37 @@ class Morpheus::Cli::JobsCommand
         end
         options[:type] = 'morpheus.securityScan'
       end
-      opts.on('--context-type [TYPE]', String, "Context type (instance|server|none). Default is none") do |val|
+      opts.on('--context-type [TYPE]', String, "Context type (instance|instance-label|server|server-label|none). Default is none") do |val|
+        val = val.to_s.downcase
         params['targetType'] = (val == 'none' ? 'appliance' : val)
       end
+      opts.on('--target-type [TYPE]', String, "alias for --context-type") do |val|
+        val = val.to_s.downcase
+        params['targetType'] = (val == 'none' ? 'appliance' : val)
+      end
+      opts.add_hidden_option('--target-type')
       opts.on('--instances [LIST]', Array, "Context instances(s), comma separated list of instance IDs. Incompatible with --servers") do |list|
         params['targetType'] = 'instance'
         params['targets'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--instance-label LABEL', String, "Instance Label") do |val|
+        if params['targetType'] && params['targetType'] != 'instance-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'instance-label'
+        params['instanceLabel'] = val
+      end
       opts.on('--servers [LIST]', Array, "Context server(s), comma separated list of server IDs. Incompatible with --instances") do |list|
         params['targetType'] = 'server'
         params['targets'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--server-label LABEL', String, "Server Label") do |val|
+        if params['targetType'] && params['targetType'] != 'server-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'server-label'
+        params['serverLabel'] = val
+      end
       opts.on('-S', '--schedule [SCHEDULE]', String, "Job execution schedule type name or ID") do |val|
         options[:schedule] = val
       end
@@ -465,8 +485,15 @@ class Morpheus::Cli::JobsCommand
           end
         end
         params['targets'] = targets.collect {|it| {'refId' => it}}
+      elsif params['targetType'] == 'instance-label'
+        if params['instanceLabel'].nil?
+          params['instanceLabel'] = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'instance-label', 'fieldName' => 'instanceLabel', 'fieldLabel' => 'Instance Label', 'type' => 'text', 'required' => true, 'description' => 'Instance Label'}], options[:options], @api_client)['instanceLabel']
+        end
+      elsif params['targetType'] == 'server-label'
+        if params['serverLabel'].nil?
+          params['serverLabel'] = Morpheus::Cli::OptionTypes.prompt([{'switch' => 'server-label', 'fieldName' => 'serverLabel', 'fieldLabel' => 'Server Label', 'type' => 'text', 'required' => true, 'description' => 'Server Label'}], options[:options], @api_client)['serverLabel']
+        end
       end
-
       # schedule
       if options[:schedule].nil?
         options[:schedule] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'scheduleMode', 'fieldLabel' => "Schedule", 'type' => 'select', 'required' => true, 'selectOptions' => job_options['schedules'], 'defaultValue' => job_options['schedules'].first['name']}], options[:options], @api_client, {})['scheduleMode']
@@ -554,17 +581,37 @@ class Morpheus::Cli::JobsCommand
           options[:security_package] = val
         end
       end
-      opts.on('--context-type [TYPE]', String, "Context type (instance|server|none). Default is none") do |val|
+      opts.on('--context-type [TYPE]', String, "Context type (instance|instance-label|server|server-label|none). Default is none") do |val|
+        val = val.to_s.downcase
+        params['targetType'] = (val == 'none' ? 'appliance' : val)
+      end
+      opts.on('--target-type [TYPE]', String, "alias for --context-type") do |val|
+        val = val.to_s.downcase
         params['targetType'] = (val == 'none' ? 'appliance' : val)
       end
+      opts.add_hidden_option('--target-type')
       opts.on('--instances [LIST]', Array, "Context instances(s), comma separated list of instance IDs. Incompatible with --servers") do |list|
         params['targetType'] = 'instance'
         options[:targets] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip.to_i }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--instance-label LABEL', String, "Instance Label") do |val|
+        if params['targetType'] && params['targetType'] != 'instance-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'instance-label'
+        params['instanceLabel'] = val
+      end
       opts.on('--servers [LIST]', Array, "Context server(s), comma separated list of server IDs. Incompatible with --instances") do |list|
         params['targetType'] = 'server'
         options[:targets] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip.to_i }.compact.uniq.collect {|it| {'refId' => it.to_i}}
       end
+      opts.on('--server-label LABEL', String, "Server Label") do |val|
+        if params['targetType'] && params['targetType'] != 'server-label'
+          raise ::OptionParser::InvalidOption.new("cannot be combined with another context (#{params['targetType']})")
+        end
+        params['targetType'] = 'server-label'
+        params['serverLabel'] = val
+      end
       opts.on('--schedule [SCHEDULE]', String, "Job execution schedule type name or ID") do |val|
         options[:schedule] = val
       end

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

@@ -3,7 +3,7 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::KeyPairs
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
-  register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :list, :get, :add, :update, :remove, :generate
   alias_subcommand :details, :get
 
   def initialize()
@@ -102,38 +102,7 @@ class Morpheus::Cli::KeyPairs
       return 0 if render_result
       
       unless options[:quiet]
-        print_h1 "Key Pair Details"
-        print cyan
-        if account
-          # print_description_list({"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' } }, key_pair)
-          print_description_list({"Account" => lambda {|it| account['name'] } }, key_pair)
-        end
-        print_description_list({
-          "ID" => 'id',
-          "Name" => 'name',
-          "Fingerprint" => 'fingerprint',
-          #"MD5" => 'md5',
-          # "Has Private Key" => lambda {|it| format_boolean(it['hasPrivateKey']) },
-          # "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
-          "Created" => lambda {|it| format_local_dt(it['dateCreated']) }
-          #"Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-        }, key_pair)
-
-        print_h2 "Public Key"
-        print cyan
-        puts "#{key_pair['publicKey']}"
-        
-        if key_pair['hasPrivateKey']
-          # print_h2 "Private Key"
-          # print cyan
-          # puts "(hidden)"
-        else
-          # print_h2 "Private Key"
-          print cyan, "\n"
-          puts "This is only a public key.  It does not include a private key."
-        end
-
-        print reset,"\n"
+        print_key_pair_details(account, key_pair)
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -180,6 +149,9 @@ class Morpheus::Cli::KeyPairs
       end
 
       build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
+      opts.footer = <<-EOT
+Add a key pair.
+      EOT
     end
     optparse.parse!(args)
     # if args.count < 1
@@ -237,6 +209,10 @@ class Morpheus::Cli::KeyPairs
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_key_pair_option_types)
       build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
+      opts.footer = <<-EOT
+Update a key pair.
+[name] is required. This is the name or id of a key pair.
+      EOT
     end
     optparse.parse!(args)
 
@@ -290,6 +266,10 @@ class Morpheus::Cli::KeyPairs
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
+      opts.footer = <<-EOT
+Delete a key pair.
+[name] is required. This is the name or id of a key pair.
+      EOT
     end
     optparse.parse!(args)
 
@@ -329,6 +309,50 @@ class Morpheus::Cli::KeyPairs
     end
   end
 
+  def generate(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
+      opts.footer = <<-EOT
+Generate a key pair.
+      EOT
+    end
+    optparse.parse!(args)
+    # if args.count < 1
+    #   puts optparse
+    #   exit 1
+    # end
+    if args[0]
+      options[:options] ||= {}
+      options[:options]['name'] ||= args[0]
+    end
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      params = Morpheus::Cli::OptionTypes.prompt(add_key_pair_option_types.select {|it| ['name'].include?(it['fieldName'])}, options[:options], @api_client, options[:params])
+      key_pair_payload = params.select {|k,v| ['name'].include?(k) }
+      payload = {keyPair: key_pair_payload}
+      @key_pairs_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @key_pairs_interface.dry.generate(account_id, payload)
+        return
+      end
+      json_response = @key_pairs_interface.generate(account_id, payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Key Pair #{key_pair_payload['name']} added"
+        print_key_pair_details(account, json_response['keyPair'])
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
   def find_key_pair_by_name_or_id(account_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
@@ -390,6 +414,43 @@ class Morpheus::Cli::KeyPairs
     print reset
   end
 
+  def print_key_pair_details(account, key_pair)
+    print_h1 "Key Pair Details"
+    print cyan
+    if account
+      # print_description_list({"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' } }, key_pair)
+      print_description_list({"Account" => lambda {|it| account['name'] } }, key_pair)
+    end
+    print_description_list({
+                             "ID" => 'id',
+                             "Name" => 'name',
+                             "Fingerprint" => 'fingerprint',
+                             #"MD5" => 'md5',
+                             # "Has Private Key" => lambda {|it| format_boolean(it['hasPrivateKey']) },
+                             # "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+                             "Created" => lambda {|it| format_local_dt(it['dateCreated']) }
+                             #"Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+                           }, key_pair)
+
+    print_h2 "Public Key"
+    print cyan
+    puts "#{key_pair['publicKey']}"
+
+    # only happens after generate
+    if key_pair['hasPrivateKey']
+      if key_pair['privateKey']
+        print_h2 "Private Key"
+        print cyan
+        puts "#{key_pair['privateKey']}"
+      end
+    else
+      # print_h2 "Private Key"
+      print cyan, "\n"
+      puts "This is only a public key.  It does not include a private key."
+    end
+
+    print reset,"\n"
+  end
 
   def add_key_pair_option_types
     [

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

@@ -0,0 +1,109 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::NetworkFloatingIps
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_name :'network-floating-ips'
+  set_command_description "View and manage network floating IPs."
+  register_subcommands :list, :get, :release
+
+  # RestCommand settings
+  register_interfaces :network_floating_ips
+  set_rest_has_name false
+  set_rest_arg "id"
+
+  def release(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[#{rest_arg}]")
+      build_standard_remove_options(opts, options)
+      opts.footer = <<-EOT
+Release an existing #{rest_label.downcase}.
+[#{rest_arg}] is required. This is the #{rest_has_name ? 'name or id' : 'id'} of #{a_or_an(rest_label)} #{rest_label.downcase}.
+Only the following cloud types support this command: OpenStack, Huawei and OpenTelekom
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    params.merge!(parse_query_options(options))
+    id = args[0]
+    record = rest_find_by_name_or_id(id)
+    if record.nil?
+      return 1, "#{rest_name} not found for '#{id}'"
+    end
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to release the #{rest_label.downcase} #{record['name'] || record['id']}?")
+      return 9, "aborted"
+    end
+    rest_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run rest_interface.dry.release(record['id'], params)
+      return 0, nil
+    end
+    json_response = rest_interface.release(record['id'], params)
+    render_response(json_response, options) do
+      print_green_success "Releasing #{rest_label.downcase} #{record['ipAddress'] || record['id']}"
+    end
+    return 0, nil
+  end
+
+  protected
+
+  def build_list_options(opts, options, params)
+    opts.on('--cloud CLOUD', String, "Cloud Name or ID") do |val|
+      options[:cloud] = val
+    end
+    opts.on('--server SERVER', String, "Server Name or ID") do |val|
+      options[:server] = val
+    end
+    opts.on('--vm VM', String, "Alias for --server") do |val|
+      options[:server] = val
+    end
+    opts.add_hidden_option('--vm')
+    opts.on('--ip-address VALUE', String, "Filter by IP Address") do |val|
+      add_query_parameter(params, 'ipAddress', val)
+    end
+    opts.on('--status VALUE', String, "Filter by Status (free, assigned, pending)") do |val|
+      add_query_parameter(params, 'ipStatus', val)
+    end
+    # build_standard_list_options(opts, options)
+    super
+  end
+
+  def parse_list_options!(args, options, params)
+    parse_parameter_as_resource_id!(:cloud, options, params, 'zoneId')
+    parse_parameter_as_resource_id!(:server, options, params)
+    super
+  end
+
+  def network_floating_ip_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "IP Address" => 'ipAddress',
+      "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
+      "Status" => lambda {|it| it['ipStatus'].to_s.capitalize },
+      "VM" => lambda {|it| it['server'] ? it['server']['name'] : '' },
+    }
+  end
+
+  def network_floating_ip_column_definitions(options)
+    {
+      "ID" => 'id',
+      "IP Address" => 'ipAddress',
+      "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
+      "Status" => lambda {|it| it['ipStatus'].to_s.capitalize },
+      "VM" => lambda {|it| it['server'] ? it['server']['name'] : '' },
+    }
+  end
+
+  def add_network_floating_ip_option_types()
+    []
+  end
+
+  def update_network_floating_ip_option_types()
+    []
+  end
+
+end

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

@@ -303,7 +303,8 @@ class Morpheus::Cli::ReportsCommand
 
       end
 
-      if payload['report']['startMonth'].size > 7 || payload['report']['endMonth'].size > 7
+
+      if check_payload_dates(payload)
          print_green_success "The CLI generates a query that will use only month and year. However, the API does support yyyy-mm-dd from a previous version of Morpheus.\nReplace startMonth/endMonth keys with startDate,endDate ie:"
          payload['report'].delete('startMonth')
          payload['report'].delete('endMonth')
@@ -713,5 +714,11 @@ EOT
     return metadata_filter
   end
 
+  def check_payload_dates(payload)
+    if payload['report']['startMonth'] && payload['report']['endMonth']
+     return payload['report']['startMonth'].size > 7 || payload['report']['endMonth'].size > 7
+    end
+    return false
+  end
 end