morpheus-cli 5.3.2.2 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727a18a73b2f9c5a7dbec90521cf690eccc5a36de5c90631b17ddc6e658befbf
-  data.tar.gz: 98faaa24be96fd839c85a9e3463881bb3f59ab10740244867a2290b880c83988
+  metadata.gz: '09fb64a860681d1b04e678410b8f69cd981e950c476a52377c0d9630cdc9af92'
+  data.tar.gz: c9d15338a5e8e801608b0098345656d6bd9a19ade174005aba2948596ef289b5
 SHA512:
-  metadata.gz: 654136bc313f445739d1665861e67831f95d5cddd138a9cf619f824cd78d2ce665f1332a0a09c73039850146adb30347830e935536331ab8941bd203b56d01c2
-  data.tar.gz: b63702230910bffae83a7784ad3385c92df5ef7df13b3cfb83d3cb59bb42e593f1a6dc6a2b65628aea928ced34772a8b7f45c7d6a33d2ae93eda22640e3695a3
+  metadata.gz: ae7e456cf6c52ef57ee80d1ae77601a5297ae48612bd5088cffb8a74ec8f170da14850de931e7a34bc16a4aecedd69b0c2191ad4b981200c82cf53a24ed7b662
+  data.tar.gz: 25d57f2dbc6350fd59209a1422a1820203cb51060bd57ab538b12b8f47daf5fe0a781672eb733d3b5ebdc973fc82a3dc6d01d5724eb3ece09414b7fc6138704d

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -1,7 +1,8 @@
 require 'json'
 require 'uri'
 require 'cgi'
-require 'rest-client'
+require 'morpheus/rest_client'
+# require 'rest-client'
 
 class Morpheus::APIClient
 
@@ -486,6 +487,10 @@ class Morpheus::APIClient
     Morpheus::LoadBalancerPoolsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def virtual_servers
+    Morpheus::VirtualServersInterface.new(common_interface_options).setopts(@options)
+  end
+
   def tasks
     Morpheus::TasksInterface.new(common_interface_options).setopts(@options)
   end
@@ -836,6 +841,26 @@ class Morpheus::APIClient
     Morpheus::VdiGatewaysInterface.new(common_interface_options).setopts(@options)
   end
 
+  def network_servers
+    Morpheus::NetworkServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_edge_clusters
+    Morpheus::NetworkEdgeClustersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_dhcp_servers
+    Morpheus::NetworkDhcpServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_dhcp_relays
+    Morpheus::NetworkDhcpRelaysInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def rest(endpoint)
+    Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
+  end
+
   # add new interfaces here
 
   protected

data/lib/morpheus/api/clouds_interface.rb

@@ -24,17 +24,10 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def get(params=nil)
-    url = "#{@base_url}/api/zones"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-    if params.is_a?(Hash)
-      headers[:params].merge!(params)
-    elsif params.is_a?(Numeric)
-      url = "#{@base_url}/api/zones/#{params}"
-    elsif params.is_a?(String)
-      headers[:params]['name'] = params
-    end
+  def get(id, params={})
+    validate_id!(id)
+    url = "#{@base_url}/api/zones/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end

data/lib/morpheus/api/health_interface.rb

@@ -49,6 +49,13 @@ class Morpheus::HealthInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def notifications(params={})
+    url = "#{@base_url}/api/health/notifications"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def logs(params={})
     url = "#{@base_url}/api/health/logs"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
@@ -56,11 +63,38 @@ class Morpheus::HealthInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def notifications(params={})
-    url = "#{@base_url}/api/health/notifications"
+  def export_logs(outfile, params={})
+    url = "#{@base_url}/api/health/logs/export"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    # execute(opts, {parse_json: false})
+    if Dir.exists?(outfile)
+      raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
+    end
+    # if @verify_ssl == false
+    #   opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
+    # end
+    if @dry_run
+      return opts
+    end
+    http_response = nil
+    bad_body = nil
+    File.open(outfile, 'w') {|f|
+      block = proc { |response|
+        if response.code.to_i == 200
+          response.read_body do |chunk|
+              #puts "writing to #{outfile} ..."
+              f.write chunk
+          end
+        else
+          # puts_error (#{response.inspect}) #{chunk} ..."
+          bad_body = response.body.to_s
+        end
+      }
+      opts[:block_response] = block
+      http_response = Morpheus::RestClient.execute(opts)
+    }
+    return http_response, bad_body
   end
 
 end

data/lib/morpheus/api/instances_interface.rb

@@ -57,11 +57,24 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def cancel_removal(id, params = {})
-    url = "#{@base_url}/api/instances/#{id}/cancel-removal"
-    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers}
-    execute(opts)
+  def extend_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def extend_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_removal(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-removal", params: params, payload: payload, headers: headers)
   end
 
   def stop(id, params={})

data/lib/morpheus/api/load_balancer_pools_interface.rb

@@ -1,9 +1,9 @@
-require 'morpheus/api/secondary_rest_interface'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::LoadBalancerPoolsInterface < Morpheus::SecondaryRestInterface
+class Morpheus::LoadBalancerPoolsInterface < Morpheus::RestInterface
 
-  def base_path(load_balancer_id)
-    "/api/load-balancers/#{load_balancer_id}/pools"
+  def base_path
+    "/api/load-balancer-pools"
   end
 
 end

data/lib/morpheus/api/load_balancer_profiles_interface.rb

@@ -0,0 +1,10 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::LoadBalancerProfilesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/load-balancer-profiles"
+  end
+
+end
+

data/lib/morpheus/api/load_balancer_virtual_servers_interface.rb

@@ -1,9 +1,9 @@
-require 'morpheus/api/secondary_rest_interface'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::LoadBalancerVirtualServersInterface < Morpheus::SecondaryRestInterface
+class Morpheus::LoadBalancerVirtualServersInterface < Morpheus::RestInterface
 
-  def base_path(load_balancer_id)
-    "/api/load-balancers/#{load_balancer_id}/virtual-servers"
+  def base_path
+    "/api/load-balancer-virtual-servers"
   end
 
 end

data/lib/morpheus/api/network_dhcp_relays_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkDhcpRelaysInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def get_dhcp_relay(server_id, dhcp_relay_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, headers: headers)
+  end
+
+  def list_dhcp_relays(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-relays", params: params, headers: headers)
+  end
+
+  def create_dhcp_relay(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/dhcp-relays", params: params, payload: payload, headers: headers)
+  end
+
+  def update_dhcp_relay(server_id, dhcp_relay_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def delete_dhcp_relay(server_id, dhcp_relay_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/network_dhcp_servers_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkDhcpServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def get_dhcp_server(server_id, dhcp_server_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, headers: headers)
+  end
+
+  def list_dhcp_servers(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-servers", params: params, headers: headers)
+  end
+
+  def create_dhcp_server(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/dhcp-servers", params: params, payload: payload, headers: headers)
+  end
+
+  def update_dhcp_server(server_id, dhcp_server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def delete_dhcp_server(server_id, dhcp_server_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/network_edge_clusters_interface.rb

@@ -0,0 +1,26 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkEdgeClustersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def list_edge_clusters(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/edge-clusters", params: params, headers: headers)
+  end
+
+  def get_edge_cluster(server_id, edge_cluster_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(edge_cluster_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/edge-clusters/#{edge_cluster_id}", params: params, headers: headers)
+  end
+
+  def update_edge_cluster(server_id, edge_cluster_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(edge_cluster_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/edge-clusters/#{edge_cluster_id}", params: params, payload: payload, headers: headers)
+  end
+
+end

data/lib/morpheus/api/network_routers_interface.rb

@@ -143,6 +143,27 @@ class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def create_bgp_neighbor(router_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update_bgp_neighbor(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors/#{nat_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy_bgp_neighbor(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors/#{nat_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def update_permissions(router_id, payload)
     url = "#{@base_url}/api/networks/routers/#{router_id}/permissions"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/network_servers_interface.rb

@@ -0,0 +1,98 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def list_scopes(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/scopes", params: params, headers: headers)
+  end
+
+  def get_scope(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, headers: headers)
+  end
+
+  def create_scope(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/scopes", params: params, payload: payload, headers: headers)
+  end
+
+  def update_scope(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_scope(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, headers: headers)
+  end
+
+  def update_scope_permissions(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{id}", payload: payload.to_json, params: params, headers: headers)
+  end
+
+  def list_firewall_rules(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rules", params: params, headers: headers)
+  end
+
+  def get_firewall_rule(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, headers: headers)
+  end
+
+  def create_firewall_rule(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/firewall-rules", params: params, payload: payload, headers: headers)
+  end
+
+  def update_firewall_rule(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_firewall_rule(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, headers: headers)
+  end
+
+  def list_firewall_rule_groups(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rule-groups", params: params, headers: headers)
+  end
+
+  def get_firewall_rule_group(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, headers: headers)
+  end
+
+  def create_firewall_rule_group(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/firewall-rule-groups", params: params, payload: payload, headers: headers)
+  end
+
+  def update_firewall_rule_group(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_firewall_rule_group(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/rest_interface.rb

@@ -7,7 +7,8 @@ class Morpheus::RestInterface < Morpheus::APIClient
   # subclasses should override in your interface
   # Example: "/api/things"
   def base_path
-    raise "#{self.class} has not defined base_path!"
+    raise "#{self.class} has not defined base_path!" if @options[:base_path].nil?
+    @options[:base_path]
   end
 
   def list(params={}, headers={})

data/lib/morpheus/api/roles_interface.rb

@@ -92,6 +92,13 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_report_type(account_id, id, options)
+    url = build_url(account_id, id) + "/update-report-type"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
   private
 
   def build_url(account_id=nil, role_id=nil)

data/lib/morpheus/api/virtual_images_interface.rb

@@ -45,10 +45,10 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def destroy(id)
+  def destroy(id, params={})
     url = "#{@base_url}/api/virtual-images/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
+    execute(method: :delete, url: url, params: params, headers: headers)
   end
 
   # multipart file upload
@@ -165,4 +165,25 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
+  def location_base_path(resource_id)
+    "/api/virtual-images/#{resource_id}/locations"
+  end
+
+  def list_locations(resource_id, params={}, headers={})
+    validate_id!(resource_id)
+    execute(method: :get, url: "#{location_base_path(resource_id)}", params: params, headers: headers)
+  end
+
+  def get_location(resource_id, id, params={}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{location_base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
+  def destroy_location(resource_id, id, params = {}, headers={})
+    validate_id!(resource_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{location_base_path(resource_id)}/#{id}", params: params, headers: headers)
+  end
+
 end

data/lib/morpheus/api/virtual_servers_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::VirtualServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/load-balancer-virtual-servers"
+  end
+
+end

data/lib/morpheus/cli/cli_command.rb

@@ -1,15 +1,14 @@
-require 'yaml'
-require 'json'
-require 'fileutils'
 require 'morpheus/logging'
 require 'morpheus/benchmarking'
-require 'morpheus/cli/option_parser'
+require 'morpheus/terminal'
 require 'morpheus/cli/cli_registry'
+require 'morpheus/cli/option_parser'
+require 'morpheus/cli/option_types'
 require 'morpheus/cli/mixins/print_helper'
 require 'morpheus/cli/credentials'
+#require 'morpheus/cli/commands/shell'
+#require 'morpheus/cli/commands/remote'
 require 'morpheus/api/api_client'
-require 'morpheus/cli/remote'
-require 'morpheus/terminal'
 
 module Morpheus
   module Cli
@@ -215,7 +214,8 @@ module Morpheus
           opts.on(arg1, arg2, description) do |val|
             if option_type['type'] == 'checkbox'
               val = (val.to_s != 'false' && val.to_s != 'off')
-            else
+            elsif option_type['dataType'] != 'string'
+              # 'dataType': 'string' added to cli to avoid auto conversion to JSON
               # attempt to parse JSON, this allows blank arrays for multiSelect like --tenants []
               if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
                 begin
@@ -1202,11 +1202,18 @@ module Morpheus
       # this could go be done in optparse.parse instead perhaps
       def verify_args!(opts={})
         args = opts[:args] || []
-        if opts[:count]
-          if args.count < opts[:count]
-            raise_args_error("not enough arguments, expected #{opts[:count]} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
-          elsif args.count > opts[:count]
-            raise_args_error("too many arguments, expected #{opts[:count]} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
+        count = opts[:count]
+        # simplify output for verify_args!(min:2, max:2) or verify_args!(max:0)
+        if opts[:min] && opts[:max] && opts[:min] == opts[:max]
+          count = opts[:min]
+        elsif opts[:max] == 0
+          count = 0
+        end
+        if count
+          if args.count < count
+            raise_args_error("not enough arguments, expected #{count} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
+          elsif args.count > count
+            raise_args_error("too many arguments, expected #{count} and got #{args.count == 0 ? '0' : args.count.to_s + ': '}#{args.join(', ')}", args, opts[:optparse])
           end
         else
           if opts[:min]
@@ -1404,14 +1411,14 @@ module Morpheus
         end
 
         def set_command_name(cmd_name)
-          @command_name = cmd_name
+          @command_name = cmd_name.to_sym
           Morpheus::Cli::CliRegistry.add(self, self.command_name)
         end
 
         def default_command_name
           class_name = self.name.split('::')[-1]
           #class_name.sub!(/Command$/, '')
-          Morpheus::Cli::CliRegistry.cli_ize(class_name)
+          Morpheus::Cli::CliRegistry.cli_ize(class_name).to_sym
         end
         
         def command_name