morpheus-cli 8.0.4.1 → 8.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c318612d24c2d587b52f2a91c23ef6079e31959319c8488f336a2bfe8acb2a1
-  data.tar.gz: a8b0ff7162a1504065e3e46479a54ef5bd77d6ad80bb5f7c4e5f1c056981c2c8
+  metadata.gz: 5bd49f7ba0c5284049c949b7eb9abab30586335cf7994071467ac2e40e5052f8
+  data.tar.gz: 8042138fa3aa60542f6a042a035172f15aac37483fd3fea25fd11ed550e1ba29
 SHA512:
-  metadata.gz: 067e3e48442d8f00f86dc8923898008b410c5882ab3049c3423a7ae46bc3031812f74f5f0f33aab793417d231e568438d5826b921ef4d1fb6764f41537cd2209
-  data.tar.gz: 1c5c68a81dd270f85f83d02602625883ad901bd304a78ba990dfa1ad05b5ecc85dfcb352b6a38fce0bd973db7f0063b9f54727aec8dfa5ce9d75adfb52533553
+  metadata.gz: 24dd7b12d6f4a3884844af6ad53736cfecf3c28102aae2f2b8a710bac97433955aae2d7771f367ae8241f721a701c5a8d375a95fe065af5162280ebbe737d342
+  data.tar.gz: 1dca804ca56f509dcf13d9a35312de4429b0163e74f4140952fa06d15b8928f8ebe3132537b77ae1939307a2fcb69aa9d9ea52e2293753a042fdf5a6cf8da2f2

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 8.0.4.1
+RUN gem install morpheus-cli -v 8.0.6
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -412,6 +412,10 @@ class Morpheus::APIClient
     Morpheus::ServersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def server_devices
+    Morpheus::ServerDevicesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def instances
     Morpheus::InstancesInterface.new(common_interface_options).setopts(@options)
   end
@@ -742,6 +746,10 @@ class Morpheus::APIClient
     Morpheus::StorageVolumeTypesInterface.new(common_interface_options).setopts(@options)
   end
 
+  def storage_datastores
+    Morpheus::StorageDatastoresInterface.new(common_interface_options).setopts(@options)
+  end
+
   def library_instance_types
     Morpheus::LibraryInstanceTypesInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/backup_results_interface.rb

@@ -25,4 +25,8 @@ class Morpheus::BackupResultsInterface < Morpheus::APIClient
     execute(method: :delete, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
+  def create_options(id, payload={}, params={}, headers={})
+    validate_id!(id)
+    execute(method: :post, url: "#{base_path}/#{CGI::escape(id.to_s)}/create-restore", params: params, payload: payload, headers: headers)
+  end
 end

data/lib/morpheus/api/clusters_interface.rb

@@ -345,4 +345,12 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
+  def load_balancer_port(params={})
+    url = "#{@base_url}/api/clusters/load-balancer-port"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(params)
+
+    execute(method: :get, url: url, headers: headers)
+  end
+
 end

data/lib/morpheus/api/network_floating_ips_interface.rb

@@ -34,4 +34,7 @@ class Morpheus::NetworkFloatingIpsInterface < Morpheus::APIClient
   	execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}/release", params: params, payload: payload, headers: headers)
   end
 
+  def allocate(payload={}, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/allocate", params: params, payload: payload, headers: headers)
+  end
 end

data/lib/morpheus/api/server_devices_interface.rb

@@ -0,0 +1,30 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ServerDevicesInterface < Morpheus::APIClient
+
+  def base_path(server_id)
+    "#{@base_url}/api/servers/#{server_id}"
+  end
+
+  # def get(server_id, id, params={})
+  #   raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+  #   execute({method: :get, url: "#{base_path(server_id)}/devices/#{id}", params: params})
+  # end
+
+  def list(server_id, params={})
+    execute({method: :get, url: "#{base_path(server_id)}/devices", params: params})
+  end
+
+  def assign(server_id, id, payload)
+    execute({method: :put, url: "#{base_path(server_id)}/devices/#{id}/assign", payload: payload.to_json})
+  end
+
+  def attach(server_id, id, payload)
+    execute({method: :put, url: "#{base_path(server_id)}/devices/#{id}/attach", payload: payload.to_json})
+  end
+
+  def detach(server_id, id, payload)
+    execute({method: :put, url: "#{base_path(server_id)}/devices/#{id}/detach", payload: payload.to_json})
+  end
+
+end

data/lib/morpheus/api/storage_datastores_interface.rb

@@ -0,0 +1,44 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::StorageDatastoresInterface < Morpheus::APIClient
+
+  def base_path
+    "#{@base_url}/api/data-stores"
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/data-stores/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = base_path
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def load_type_options(datastore_type)
+    url = "/api/data-stores/#{datastore_type}/option-types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(options)
+    url = "#{@base_url}/api/data-stores"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/data-stores/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+end

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

@@ -373,10 +373,21 @@ EOT
         # could actually fetch the instance.., only need name and id right now though.
         raise_command_error "Backup instance not found" if instance.nil?
         params['restoreInstance'] = prompt_value({'fieldName' => 'restoreInstance', 'fieldLabel' => 'Restore Instance', 'type' => 'select', 'selectOptions' => [{'name' => 'Current Instance', 'value' => 'existing'}, {'name' => 'New Instance', 'value' => 'new'}], 'defaultValue' => 'existing', 'required' => true, 'description' => 'Restore the current instance or a new instance?'}, options)
+        restore_options = @backup_results_interface.create_options(backup_result['id'])
         if params['restoreInstance'] == 'new'
           # new instance
-          config_map = prompt_restore_instance_config(options)
-          params['instanceConfig'] = config_map
+          if restore_options['vmRestore']
+            group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => get_available_groups(), 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{'serverTypeId' => restore_options['servierTypeId']})['group']
+            name = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Instance Name', 'defaultValue' => "#{backup['name']}-restore"}], options[:options], @api_client)['name']
+            params['groupId'] = group_id
+            params['name'] = name
+            v_prompt = Morpheus::Cli::OptionTypes.prompt(restore_options['restoreNewOptionTypes'], options[:options], @api_client, {'zoneId' => backup_result['zoneId'], 'siteId' => group_id})
+            v_prompt.deep_compact!.booleanize! # remove empty values and convert checkbox "on" and "off" to true and false
+            params.deep_merge!(v_prompt)
+          else
+            config_map = prompt_restore_instance_config(options)
+            params['instanceConfig'] = config_map
+          end
         else
           # existing instance
           # confirm the instance
@@ -393,6 +404,9 @@ EOT
               print_red_alert "The value '#{instance_id}' does not match the existing instance #{instance['name']} [#{instance['id'] rescue ''}]. Please try again."
             end
           end
+          v_prompt = Morpheus::Cli::OptionTypes.prompt(restore_options['restoreExistingOptionTypes'], options[:options], @api_client, {'zoneId' => backup_result['zoneId'], 'siteId' => group_id})
+          v_prompt.deep_compact!.booleanize! # remove empty values and convert checkbox "on" and "off" to true and false
+          params.deep_merge!(v_prompt)
         end
       elsif backup['locationType'] == 'server'
         # prompt for server type backup restore

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

@@ -102,9 +102,10 @@ class Morpheus::Cli::ClientsCommand
           "ID" => 'id',
           "Client ID" => 'clientId',
           "Access Token Validity Seconds" => 'accessTokenValiditySeconds',
-          "Refresh Token Validity Seconds" => 'refreshTokenValiditySeconds' 
+          "Refresh Token Validity Seconds" => 'refreshTokenValiditySeconds',
+          # "Scopes" => lambda {|client| client['scopes'].join(", ")},
+          "Redirect URI" => lambda {|client| client['redirectUris'].join(", ")}
         }
-        
         print_description_list(client_columns, client)
         print reset,"\n"
 
@@ -122,7 +123,7 @@ class Morpheus::Cli::ClientsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[clientId] [options]")
       build_option_type_options(opts, options, add_client_option_types)
-      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :remote])
+      build_standard_add_options(opts, options)
       opts.footer = "Add New Oauth Client Record."
     end
     optparse.parse!(args)
@@ -150,6 +151,9 @@ class Morpheus::Cli::ClientsCommand
         payload.deep_merge!({'client' => passed_options}) unless passed_options.empty?
         # prompt for options
         params = Morpheus::Cli::OptionTypes.prompt(add_client_option_types, options[:options], @api_client, options[:params])
+        if params['redirectUris'] && params['redirectUris'].is_a?(String)
+          params['redirectUris'] = params['redirectUris'].split(',').collect {|it| it.strip}.reject {|it| it.empty?}
+        end
         payload.deep_merge!({'client' => params}) unless params.empty?
       end
 
@@ -179,7 +183,7 @@ class Morpheus::Cli::ClientsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[clientId] [options]")
       build_option_type_options(opts, options, client_option_types)
-      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :remote])
+      build_standard_update_options(opts, options)
       opts.footer = "Update Oauth Client Record."
     end
     optparse.parse!(args)
@@ -206,11 +210,13 @@ class Morpheus::Cli::ClientsCommand
           }
         }
         # allow arbitrary -O options
-        payload.deep_merge!({'page' => passed_options}) unless passed_options.empty?
+        payload.deep_merge!({'client' => passed_options}) unless passed_options.empty?
         # prompt for options
         #params = Morpheus::Cli::OptionTypes.prompt(update_wiki_page_option_types, options[:options], @api_client, options[:params])
         params = passed_options
-
+        if params['redirectUris'] && params['redirectUris'].is_a?(String)
+          params['redirectUris'] = params['redirectUris'].split(',').collect {|it| it.strip}.reject {|it| it.empty?}
+        end
         if params.empty?
           raise_command_error "Specify at least one option to update.\n#{optparse}"
         end
@@ -332,7 +338,8 @@ class Morpheus::Cli::ClientsCommand
       {'fieldName' => 'clientId', 'fieldLabel' => 'Client Id', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
       {'fieldName' => 'clientSecret', 'fieldLabel' => 'Client Secret', 'type' => 'text', 'displayOrder' => 2},
       {'fieldName' => 'accessTokenValiditySeconds', 'fieldLabel' => 'Access Token Validity Length (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'displayOrder' => 3},
-      {'fieldName' => 'refreshTokenValiditySeconds', 'fieldLabel' => 'Refresh Token Validity Length (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'displayOrder' => 4}
+      {'fieldName' => 'refreshTokenValiditySeconds', 'fieldLabel' => 'Refresh Token Validity Length (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'displayOrder' => 4},
+      {'fieldName' => 'redirectUris', 'fieldLabel' => 'Redirect URI', 'type' => 'text', 'displayOrder' => 5}
     ]
   end
 end

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

@@ -7,7 +7,7 @@ class Morpheus::Cli::CloudDatastoresCommand
   # set_command_name :'cloud-datastores'
   set_command_name :'datastores'
 
-  register_subcommands :list, :get, :update
+  register_subcommands :list, :get, :update, :add
   
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -18,6 +18,7 @@ class Morpheus::Cli::CloudDatastoresCommand
     @cloud_datastores_interface = @api_client.cloud_datastores
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
+    @storage_datastore_interface = @api_client.storage_datastores
   end
 
   def handle(args)
@@ -379,6 +380,114 @@ class Morpheus::Cli::CloudDatastoresCommand
     end
   end
 
+  def add(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [options]")
+      build_common_options(opts, options, [:options, :payload, :json, :yaml, :dry_run, :quiet])
+      opts.on( '-n', '--name NAME', "Name" ) do |val|
+        options['name'] = val
+      end
+      opts.on( '-t', '--type DATASTORE_TYPE', "Datastore Type" ) do |val|
+        options['datastoreType'] = val
+      end
+      opts.on( '-c', '--cloud DATASTORE_CLOUD', "Datastore Cloud" ) do |val|
+        options['cloud'] = val
+      end
+      opts.footer = "Create a new Datastore.\n" +
+                    "[name] is required. This is the name of the new datastore. It may also be passed as --name or inside your config."
+    end
+    optparse.parse!(args)
+    if args.count > 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "#{command_name} add expects 0-1 arguments and received #{args.count}: #{args}\n#{optparse}"
+      return 1
+    end
+    # allow name as first argument
+    if args[0] # && !options[:name]
+      options[:name] = args[0]
+    end
+    connect(options)
+    begin
+      options[:options] ||= {}
+      passed_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
+      payload = {}
+      if options[:payload]
+        # payload is from parsed json|yaml files or arguments.
+        payload = options[:payload]
+        # merge -O options
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+        # support some options on top of --payload
+        [:name, :description, :environment].each do |k|
+          if options.key?(k)
+            payload[k.to_s] = options[k]
+          end
+        end
+      else
+        # prompt for payload
+        payload = {}
+        # merge -O options
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+
+         # Name
+        if passed_options['name']
+          payload['name'] = passed_options['name']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this archive bucket.'}], options, @api_client)
+          payload['name'] = v_prompt['name']
+        end
+
+        #Datastore Type
+        if passed_options['datastoreType']
+          payload['datastoreType'] = passed_options['datastoreType']
+        else
+          payload['datastoreType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'datastoreType', 'fieldLabel' => 'Type', 'type' => 'select', 'required' => true, 'optionSource' => 'datastoreTypes'}], options[:options], @api_client)['datastoreType']
+        end
+
+        if passed_options['cloud']
+          zone = passed_options['cloud']
+        else
+          zone = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zone', 'fieldLabel' => 'Cloud', 'type' => 'select', 'required' => true, 'optionSource' => 'cloudsForDatastores'}], options[:options], @api_client)['zone']
+        end
+
+        if zone
+          payload['refType'] = 'ComputeZone'
+          payload['refId'] = zone
+        end
+        
+        option_types = load_option_types_for_datastore_type(payload['datastoreType'])
+
+        values = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client)
+        if values['domain']
+          payload.merge!(values['domain']) if values['domain'].is_a?(Hash)
+        end
+        if values['config']
+          payload['config'] = {}
+          payload['config'].merge!(values['config']) if values['config'].is_a?(Hash)
+        end
+
+        @storage_datastore_interface.setopts(options)
+        if options[:dry_run]
+          print_dry_run @storage_datastore_interface.dry.create({'datastore' => payload})
+          return
+        end
+        json_response = @storage_datastore_interface.create({'datastore' => payload})
+        datastore = json_response['datastore']
+        if options[:json]
+          print JSON.pretty_generate(json_response),"\n"
+        elsif !options[:quiet]
+          datastore = json_response['datastore']
+          print_green_success "Datastore #{datastore['name']} created"
+          #get([datastore['id']])
+        end
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
 
@@ -428,4 +537,7 @@ class Morpheus::Cli::CloudDatastoresCommand
     end
   end
 
+  def load_option_types_for_datastore_type(datastore_type)
+    return @storage_datastore_interface.load_type_options(datastore_type)
+  end
 end

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

@@ -848,7 +848,6 @@ EOT
         "Discovery" => lambda {|it| format_boolean it['hasDiscovery'] },
         "Cloud Init" => lambda {|it| format_boolean it['hasCloudInit'] },
         "Folders" => lambda {|it| format_boolean it['hasFolders'] },
-        "Floating Ips" => lambda {|it| format_boolean it['hasFloatingIps'] },
         # "Marketplace" => lambda {|it| format_boolean it['hasMarketplace'] },
         "Public Cloud" => lambda {|it| format_boolean(it['cloud'] == 'public') },
       }

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

@@ -123,7 +123,6 @@ EOT
         "Discovery" => lambda {|it| format_boolean it['hasDiscovery'] },
         "Cloud Init" => lambda {|it| format_boolean it['hasCloudInit'] },
         "Folders" => lambda {|it| format_boolean it['hasFolders'] },
-        "Floating Ips" => lambda {|it| format_boolean it['hasFloatingIps'] },
         # "Marketplace" => lambda {|it| format_boolean it['hasMarketplace'] },
         "Public Cloud" => lambda {|it| format_boolean(it['cloud'] == 'public') },
       }

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

@@ -652,6 +652,10 @@ class Morpheus::Cli::Clusters
         metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
         option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
 
+        # remove load balancer option_type, prompt manually
+        loadbalancer_option_type = option_type_list.find{|type| type['fieldName'] == 'loadBalancerId'}
+        option_type_list = option_type_list.reject { |type| type['fieldName'] == 'loadBalancerId' }
+
         server_count = layout['serverCount']
 
         # KLUDGE: google zone required for network selection
@@ -754,6 +758,37 @@ class Morpheus::Cli::Clusters
           end
         end
 
+        if loadbalancer_option_type
+          lb_payload = { computeTypeLayoutId: cluster_payload['layout']['id']}
+          load_balancer_id = prompt_cluster_load_balancer(cluster_payload, options)
+          if load_balancer_id != false
+            lb_payload['loadBalancerId'] = load_balancer_id
+            lb_payload['loadBalancerInstanceId'] = -1
+            lb_port_result = @clusters_interface.load_balancer_port(lb_payload)
+            lb_options = lb_port_result['optionTypes']
+            lb_option_results = Morpheus::Cli::OptionTypes.prompt(lb_options, options[:options], @api_client, api_params)
+
+            load_balancer_payload = {
+              port: lb_port_result.dig('loadBalancerPort', 'externalPort'),
+              enabled: lb_port_result.dig('loadBalancer', 'enabled'),
+              loadBalancerId: load_balancer_id,
+              backendPort: lb_port_result.dig('loadBalancerPort', 'internalPort'),
+              loadBalancer: { id: load_balancer_id },
+              vipPool: (lb_option_results.dig('domain', 'vipPool') == 'none') ? nil : lb_option_results.dig('domain', 'vipPool'),
+              vipAddress: lb_option_results.dig('domain', 'vipAddress'),
+              externalAddress: (lb_port_result.dig('loadBalancer', 'externalAddress') == true ) ? 'on': 'off',
+              vipShared: (lb_port_result.dig('loadBalancer', 'vipShared') == true ) ? 'on' : 'off',
+              vipProtocol: lb_port_result.dig('loadBalancerPort', 'loadBalanceProtocol'),
+              instanceId: lb_payload['loadBalancerInstanceId'],
+              name: lb_option_results['vipName']
+            }
+            if lb_option_results['domain']
+              load_balancer_payload.merge!(lb_option_results['domain']) { |key, old_val, new_val| old_val }
+            end
+            cluster_payload['lbInstances'] = [load_balancer_payload.compact!]
+          end
+        end
+
         cluster_payload['server'] = server_payload
         payload = {'cluster' => cluster_payload}
       end
@@ -4248,7 +4283,7 @@ class Morpheus::Cli::Clusters
   end
 
   def find_layout_by_name(name)
-    @cluster_layouts_interface.list({phrase:name}).find { it['name'].downcase == name.downcase || it['code'].downcase == name.downcase }
+    @cluster_layouts_interface.list({phrase:name}).find { |it| it['name'].downcase == name.downcase || it['code'].downcase == name.downcase }
   end
 
   def layouts_for_dropdown(zone_id, group_type_id)

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

@@ -4,6 +4,7 @@ class Morpheus::Cli::ContainersCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::LogsHelper
+  include Morpheus::Cli::InfrastructureHelper
 
   set_command_name :containers
   set_command_description "View and manage containers (nodes)."
@@ -18,6 +19,7 @@ class Morpheus::Cli::ContainersCommand
     @logs_interface = @api_client.logs
     @execution_request_interface = @api_client.execution_request
     @clouds_interface = @api_client.clouds
+    @network_server_types_interface = @api_client.network_server_types
   end
   
   def handle(args)
@@ -799,14 +801,14 @@ EOT
     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."
+    network_server_type = load_container_network_server_type(container)
+    if !network_server_type['hasFloatingIps']
+      raise_command_error "Network Server Type #{network_server_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']
+      attach_floating_ip_option_types = network_server_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, '')
@@ -829,7 +831,7 @@ EOT
         # 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."
+        # raise_command_error "Network Server Type #{network_server_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)
@@ -861,9 +863,9 @@ EOT
     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."
+    network_server_type = load_container_network_server_type(container)
+    if !network_server_type['hasFloatingIps']
+      raise_command_error "Network Type #{network_server_type['name']} does support floating IPs."
     end
     payload = parse_payload(options)
     if payload.nil?
@@ -948,18 +950,18 @@ EOT
     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
+  def load_container_network_server_type(container)
+    cloud = find_cloud_by_id(container['cloud']['id'])
+    network_server_type_code = cloud['networkServer']['type'] rescue nil
+    network_server_type = nil
+    if network_server_type_code
+        network_server_type = @network_server_types_interface.list({code:network_server_type_code})['networkServerTypes'][0]
+        if network_server_type.nil?
+            raise_command_error "Network Server Type not found by code #{network_server_type_code}"
+        end
     else
-      raise_command_error "Unable to determine cloud type for container #{container['id']}"
+        raise_command_error "Unable to determine network server type for container #{container['id']}"
     end
-    return cloud_type
+    return network_server_type
   end
-
 end

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

@@ -12,7 +12,8 @@ class Morpheus::Cli::Hosts
                        {:'types' => :list_types},
                        {:exec => :execution_request},
                        :wiki, :update_wiki,
-                       :maintenance, :leave_maintenance, :placement
+                       :maintenance, :leave_maintenance, :placement,
+                       :list_devices, :assign_device, :detach_device, :attach_device
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -2281,7 +2282,7 @@ EOT
       end
       payload[:server][:deleteLocalData] = options.fetch(:deleteLocalData) do
         prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deleteLocalData', 'fieldLabel' => 'Delete Local Data', 'type' => 'checkbox', 'defaultValue' => false, 'required' => false}], options, @api_client, {})
-        prompt['force'] == 'on'
+        prompt['deleteLocalData'] == 'on'
       end
     end
     
@@ -2354,7 +2355,7 @@ EOT
     end
     json_response = @servers_interface.leave_maintenance(server['id'], payload, params)
     render_response(json_response, options) do
-      print_green_success "Maintenance mode enabled for host #{server['name']}"
+      print_green_success "Left Maintenance Mode for host #{server['name']}"
       #get([server['id']])
     end
     return 0, nil
@@ -2418,6 +2419,24 @@ EOT
     return 0, nil
   end
 
+    ## Server Devices
+
+    def list_devices(args)
+      Morpheus::Cli::ServerDevicesCommand.new.list(args)
+    end
+    
+    def assign_device(args)
+      Morpheus::Cli::ServerDevicesCommand.new.assign(args)
+    end
+
+    def attach_device(args)
+      Morpheus::Cli::ServerDevicesCommand.new.attach(args)
+    end
+  
+    def detach_device(args)
+      Morpheus::Cli::ServerDevicesCommand.new.detach(args)
+    end
+    
   private
 
   def find_host_by_id(id)
@@ -2440,7 +2459,9 @@ EOT
       print_red_alert "Server not found by name #{name}"
       exit 1
     elsif results['servers'].size > 1
-      print_red_alert "Multiple Servers exist with the name #{name}. Try using id instead"
+      print_red_alert "Multiple Servers exist with the name '#{name}'"
+      puts_error as_pretty_table(results['servers'], [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
       exit 1
     end
     return results['servers'][0]

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

@@ -316,7 +316,12 @@ class Morpheus::Cli::License
       "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
       "End Date" => lambda {|it| 
         if it['endDate']
-          format_local_dt(it['endDate']).to_s + ' (' + format_duration(Time.now, it['endDate']).to_s + ')' 
+          end_date = parse_time(it['endDate']) rescue nil
+          if end_date && Time.now > end_date
+            format_local_dt(it['endDate']).to_s + red + ' (expired)' + cyan
+          else
+            format_local_dt(it['endDate']).to_s + ' (' + format_duration(Time.now, it['endDate']).to_s + ')' 
+          end
         else
           'Never'
         end
@@ -424,7 +429,12 @@ class Morpheus::Cli::License
       "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
       "End Date" => lambda {|it| 
         if it['endDate']
-          format_local_dt(it['endDate']).to_s + ' (' + format_duration(Time.now, it['endDate']).to_s + ')' 
+          end_date = parse_time(it['endDate']) rescue nil
+          if end_date && Time.now > end_date
+            format_local_dt(it['endDate']).to_s + red + ' (expired)' + cyan
+          else
+            format_local_dt(it['endDate']).to_s + ' (' + format_duration(Time.now, it['endDate']).to_s + ')' 
+          end
         else
           'Never'
         end