solusvm 0.10.1 → 1.0.0.beta

data/README.markdown

@@ -41,31 +41,81 @@ Server creation
 Command Line Usage
 ------------------
 
-    USAGE: solusvm <command> [options]
-        -I, --api-login [id]             API ID
-        -K, --api-key [key]              API KEY
-        -N, --node [node]                Node to provision on
-        -U, --api-url [URL]              URL to the API
-        -u, --username [username]        The client to put the VPS under
-        -k, --kind [kind]                Type of VPS (openvz,xen,xen hvm)
-        -t, --template [template]        VPS template to boot from
-        -p, --plan [plan]                Plan to use
-        -i, --ips [number]               Number of ips to add to the VPS
-        -h, --help                       Show help documentation
-    Commands:
-      node-available-ips <nodeid>
-      server-check-exists <vserverid>
-      server-shutdown <vserverid>
-      server-terminate <vserverid>
-      server-changeplan <vserverid> <newplan>
-      server-resume <vserverid>
-      server-reboot <vserverid>
-      server-rebuild <vserverid> -t myimage
-      server-status <vserverid>
-      server-boot <vserverid>
-      server-create <hostname> <password> -t myimage -k xen -p myplan -i 1
-      server-suspend <vserverid>
-      server-addip <vserverid>
+    Tasks:
+        solusvm client <command>    # Client commands
+        solusvm general <command>   # General commands
+        solusvm help [TASK]         # Describe available tasks or one specific task
+        solusvm node <command>      # Node commands
+        solusvm reseller <command>  # Reseller commands
+        solusvm server <command>    # Server commands
+        solusvm version             # Outputs the current program version
+
+        solusvm client authenticate USERNAME NEWPASSWORD     # Verify a clients login. Returns true when the specified login is correct
+        solusvm client change-password USERNAME NEWPASSWORD  # Changes the password of an existing client
+        solusvm client check-exists USERNAME                 # Checks if a client exists
+        solusvm client create                                # Creates a new client
+        solusvm client delete USERNAME                       # Deletes an existing client
+        solusvm client help [COMMAND]                        # Describe subcommands or one specific subcommand
+        solusvm client list                                  # Lists existing clients
+
+        solusvm general help [COMMAND]  # Describe subcommands or one specific subcommand
+        solusvm general isos TYPE       # Lists existing isos for a given type [openvz|xen|xen hvm|kvm]
+        solusvm general plans TYPE      # Lists existing plans for a given type [openvz|xen|xen hvm|kvm]
+        solusvm general templates TYPE  # Lists existing templates for a given type [openvz|xen|xen hvm|kvm]
+
+        solusvm node available-ips VSERVERID   # Lists the available ips for a given node
+        solusvm node help [COMMAND]            # Describe subcommands or one specific subcommand
+        solusvm node list TYPE                 # Lists existing nodes for a given type [openvz|xen|xen hvm|kvm]
+        solusvm node list-ids TYPE             # Lists existing nodes ids for a given type [openvz|xen|xen hvm|kvm]
+        solusvm node stats VSERVERID           # Lists statistics for a given node
+        solusvm node virtualservers VSERVERID  # Lists the virtual servers for a given node
+        solusvm node xenresources VSERVERID    # Lists xen resources for a given node
+
+        solusvm reseller change           # Changes the available resources of a reseller
+        solusvm reseller create           # Creates a new reseller
+        solusvm reseller delete USERNAME  # Deletes an existing reseller
+        solusvm reseller help [COMMAND]   # Describe subcommands or one specific subcommand
+        solusvm reseller info USERNAME    # Retrieves information from an existing reseller
+        solusvm reseller list             # Lists existing resellers
+
+        solusvm server addip VSERVERID                            # Adds an ip to the server
+        solusvm server boot VSERVERID                             # Boots up a server
+        solusvm server change-bootorder VSERVERID BOOTORDER       # Changes the boot order of a server [cd(Hard Disk CDROM)|dc(CDROM Hard Disk)|c(Hard Di...
+        solusvm server change-consolepass VSERVERID NEWPASSWORD   # Changes the console password of a server
+        solusvm server change-hostname VSERVERID HOSTNAME         # Changes the hostname of a server
+        solusvm server change-owner VSERVERID CLIENTID            # Changes the owner of a server
+        solusvm server change-plan VSERVERID NEWPLAN              # Changes the plan of a server
+        solusvm server change-rootpass VSERVERID NEWPASSWORD      # Changes the root password of a server
+        solusvm server change-vncpass VSERVERID NEWPASSWORD       # Changes the vnc password of a server
+        solusvm server check-exists VSERVERID                     # Checks if a server exists
+        solusvm server console VSERVERID                          # Retrieves console information from a server
+        solusvm server create HOSTNAME PASSWORD                   # Creates a new server
+        solusvm server help [COMMAND]                             # Describe subcommands or one specific subcommand
+        solusvm server info VSERVERID                             # Retrieves information from a server
+        solusvm server info-all VSERVERID                         # Retrieves all availavle information from a server
+        solusvm server mountiso VSERVERID ISO                     # Mounts an iso
+        solusvm server network-switcher VSERVERID SWITCH(on|off)  # Enable/Disable Network mode
+        solusvm server pae-switcher VSERVERID SWITCH(on|off)      # Enable/Disable PAE
+        solusvm server reboot VSERVERID                           # Reboots a server
+        solusvm server rebuild VSERVERID                          # Rebuilds a server
+        solusvm server resume VSERVERID                           # Resumes a server
+        solusvm server shutdown VSERVERID                         # Shuts down a server
+        solusvm server status VSERVERID                           # Checks the status of a server
+        solusvm server suspend VSERVERID                          # Suspends a server
+        solusvm server terminate VSERVERID                        # Terminates a server
+        solusvm server tun-switcher VSERVERID SWITCH(on|off)      # Enable/Disable TUN/TAP
+        solusvm server unmountiso VSERVERID                       # Unmounts an iso
+        solusvm server vnc VSERVERID                              # Retrieves vnc information from a server
+
+    Options:
+        -I, --api-login, [--api-login=API_LOGIN]  # API ID. Required.
+        -K, --api-key, [--api-key=API_KEY]        # API KEY. Required.
+        -U, --api-url, [--api-url=API_URL]        # API URL. Required.
+
+
+    To check the available options for a given action, you can execute the following command:
+
+        solusvm server help create
 
 Default Config for Command Line
 --------------------------------

data/bin/solusvm

@@ -1,158 +1,8 @@
 #!/usr/bin/env ruby
 
-require "optparse"
-require "pp"
-require "yaml"
-
 $:.unshift(File.join(File.dirname(__FILE__), "/../lib"))
-require "solusvm"
-
-opts = {}
-$shell_methods = {}
-$shell_methods['server-create'] = "<hostname> <password> -t myimage -k xen -p myplan -i 1"
-$shell_methods['server-boot'] = "<vserverid>"
-$shell_methods['server-reboot'] = "<vserverid>"
-$shell_methods['server-shutdown'] = "<vserverid>"
-$shell_methods['server-suspend'] = "<vserverid>"
-$shell_methods['server-resume'] = "<vserverid>"
-$shell_methods['server-status'] = "<vserverid>"
-$shell_methods['server-addip'] = "<vserverid>"
-$shell_methods['server-changeplan'] = "<vserverid> <newplan>"
-$shell_methods['server-check-exists'] = "<vserverid>"
-$shell_methods['server-terminate'] = "<vserverid>"
-$shell_methods['node-stats'] = "<nodeid>"
-$shell_methods['node-available-ips'] = "<nodeid>"
-$shell_methods['server-rebuild'] = "<vserverid> -t myimage"
-
-def list_commands
-  puts "Commands:"
-  puts $shell_methods.collect { |k,v| "  #{k} #{v}"}.join("\n")
-  exit
-end
-
-op = OptionParser.new do |o|
-  o.banner = "USAGE: #{File.basename($0)} <command> [options]"
-  o.on("-I", "--api-login [id]", "API ID") do |opt|
-    opts[:api_id] = opt
-  end
-
-  o.on("-K", "--api-key [key]", "API KEY") do |opt|
-    opts[:api_key] = opt
-  end
-
-  o.on("-N", "--node [node]", "Node to provision on") do |opt|
-    opts[:node] = opt
-  end
-
-  o.on("-U", "--api-url [URL]", "URL to the API") do |opt|
-    opts[:api_url] = opt
-  end
-
-  o.on("-u", "--username [username]", "The client to put the VPS under") do |opt|
-    opts[:username] = opt
-  end
-
-  o.on("-k", "--kind [kind]", "Type of VPS (#{Solusvm::Server::VALID_SERVER_TYPES.join(',')})") do |opt|
-    opts[:kind] = opt
-  end
-
-  o.on("-t", "--template [template]", "VPS template to boot from") do |opt|
-    opts[:template] = opt
-  end
-
-  o.on("-p", "--plan [plan]", "Plan to use") do |opt|
-    opts[:plan] = opt
-  end
-
-  o.on("-i", "--ips [number]", "Number of ips to add to the VPS") do |opt|
-    opts[:ips] = opt.to_i
-  end
-
-  o.on("-h", "--help", "Show help documentation") do |h|
-    puts o
-    list_commands
-  end
-end
-
-optparse = op
-op.parse!
 
-config_file = File.join(File.expand_path(ENV['HOME']), '.solusvm.yml')
-server = Solusvm::Server.new
-general = Solusvm::General.new
+require "thor"
+require "solusvm/cli"
 
-if ARGV.empty?
-  # STDERR.puts "USAGE: #{File.basename($0)} [function] [options]"
-  puts optparse.help
-  list_commands
-else
-  if File.exists?(config_file)
-    config = YAML::load(File.open(config_file))
-    Solusvm.config(config['id'], config['key'], :url => config['url'])
-    opts[:username] = config['username'] unless opts[:username]
-  elsif opts[:api_url] && opts[:api_id] && opts[:api_key]
-    Solusvm.config(opts[:api_id], opts[:api_key], :url => opts[:api_url])
-  else
-    puts "Must supply the api id/key and URL"
-    exit
-  end
-  meth = ARGV[0].chomp
-  if $shell_methods.include?(meth)
-    ARGV.shift
-    if ARGV.empty?
-      p $shell_methods[meth]
-      exit
-    else
-      begin
-        case meth
-        when 'server-create'
-          unless ARGV.size == 2
-            list_commands
-          end
-          p server.create(ARGV[0], ARGV[1], :plan => opts[:plan], :ips => opts[:ips], :type => opts[:kind], 
-                          :username => opts[:username], :template => opts[:template], :node => opts[:node])
-        when 'server-status'
-          p server.status(ARGV[0])
-        when 'server-changeplan'
-          p server.change_plan(ARGV[0], ARGV[1])
-        when 'server-addip'
-          p server.add_ip(ARGV[0])
-        when 'server-boot'
-          p server.boot(ARGV[0])
-        when 'server-reboot'
-          p server.reboot(ARGV[0])
-        when 'server-shutdown'
-          p server.shutdown(ARGV[0])
-        when 'server-suspend'
-          p server.suspend(ARGV[0])
-        when 'server-resume'
-          p server.resume(ARGV[0])
-        when 'server-check-exists'
-          p server.exists?(ARGV[0])
-        when 'server-terminate'
-          p server.terminate(ARGV[0])
-        when 'node-available-ips'
-          ips = general.node_available_ips(ARGV[0])
-          if ips.any?
-            puts ips.join("\n")
-          else
-            puts ips
-          end
-        when 'node-stats'
-          stats = general.node_statistics(ARGV[0])
-          stats.each do |k,v|
-            puts "#{k} => #{v}"
-          end
-        when 'server-rebuild'
-           p server.rebuild(ARGV[0], opts[:template])
-        end
-      rescue Exception => e
-        puts "Error:  #{e}\n\n"
-        puts "Backtrace: \n\n"
-        puts e.backtrace.join("\n")
-      end
-    end
-  else
-    puts "#{meth} is not a valid function"
-  end
-end
+Solusvm::Cli.start

data/lib/solusvm/base.rb

@@ -6,16 +6,18 @@ module Solusvm
 
     # Prepares and sends the API request to the URL specificed in Solusvm.config
     #
-    #
     #  class MyClass < Base
     #    def create_server(name)
     #      perform_request(:action => 'name', :id => 1)
     #    end
     #  end
+    #
     # Options:
     # * <tt>:action</tt> - Specifies which API method to execute
     # All other options passed in are converted to http query arguments and are passed along to the API
-    def perform_request(options = {})
+    #
+    # <tt>force_array</tt> - see parse_response
+    def perform_request(options = {}, force_array = false)
       options.merge!(api_login)
       http = Net::HTTP.new(api_endpoint.host, api_endpoint.port)
       if api_endpoint.port == 443
@@ -27,16 +29,20 @@ module Solusvm
         response = http.request(request)
 
         handle_errors(response.body)
-        @returned_parameters = parse_response(response.body)
+        @returned_parameters = parse_response(response.body, force_array)
         log_messages(options)
       end
       successful?
     end
 
     # Converts the XML response to a Hash
-    def parse_response(body)
+    #
+    # <tt>force_array</tt> - Parses the xml element as an array; can be a string with the element name
+    #     or an array with element names
+    def parse_response(body, force_array = false)
+      force_array = Array(force_array) if force_array
       body = "<solusrequest>#{body}</solusrequest>"
-      XmlSimple.xml_in(body, 'ForceArray' => false)
+      XmlSimple.xml_in(body, 'ForceArray' => force_array)
     end
 
     # Look for known error messages
@@ -69,14 +75,15 @@ module Solusvm
       {:id => Solusvm.api_id, :key => Solusvm.api_key}
     end
 
-    # TODO: clean this up
     def log_messages(options)
-      if Solusvm.api_options[:logger] && Solusvm.api_options[:logger].respond_to?(Solusvm.api_options[:logger_method])
-        Solusvm.api_options[:logger].send(Solusvm.api_options[:logger_method], "[Start] => #{options[:action]}")
+      logger, logger_method = Solusvm.api_options[:logger], Solusvm.api_options[:logger_method]
+      
+      if logger && logger.respond_to?(logger_method)
+        logger.send(logger_method, "[Start] => #{options[:action]}")
         returned_parameters.each do |k,v|
-          Solusvm.api_options[:logger].send(Solusvm.api_options[:logger_method], "   #{k} => #{v}")
+          logger.send(logger_method, "   #{k} => #{v}")
         end
-        Solusvm.api_options[:logger].send(Solusvm.api_options[:logger_method], "[End] => #{options[:action]}")
+        logger.send(logger_method, "[End] => #{options[:action]}")
       end
     end
 

data/lib/solusvm/cli/base_cli.rb

@@ -0,0 +1,47 @@
+require 'yaml'
+require 'thor'
+require 'thor/group'
+require 'solusvm/version'
+
+module Solusvm
+  class BaseCli < Thor
+    include Thor::Actions
+
+    # Retrieves default options coming from a configuration file, if any.
+    def self.default_option(key)
+      @@yaml ||= begin
+        file = File.join(File.expand_path(ENV['HOME']), '.solusvm.yml')
+        if File.exists?(file)
+          YAML::load(File.open(file))
+        else
+          {}
+        end
+      end
+
+      @@yaml[key.to_s]
+    end
+
+    # Convenience method to get the namespace from the class name. It's the
+    # same as Thor default except that the "_cli" at the end of the class
+    # is removed.
+    def self.namespace(name=nil)
+      return super if name
+      @namespace ||= super.sub(/_cli$/, '')
+    end
+    
+    class_option :api_login, :type => :string, :desc => "API ID; Required.",  :aliases => ["-I", "--api-login"], :default => default_option(:id)
+    class_option :api_key,   :type => :string, :desc => "API KEY; Required.", :aliases => ["-K", "--api-key"], :default => default_option(:key)
+    class_option :api_url,   :type => :string, :desc => "API URL; Required.", :aliases => ["-U", "--api-url"], :default => default_option(:url)
+
+    # Overrides the default banner implementation to output the whole command
+    def self.banner(task, namespace = true, subcommand = false)
+      "#{self.namespace.split(":").join(" ")} #{task.formatted_usage(self, false, false)}"
+    end
+
+    protected
+
+    def configure
+      Solusvm.config(options[:api_login], options[:api_key], :url => options[:api_url])
+    end
+  end
+end

data/lib/solusvm/cli/client_cli.rb

@@ -0,0 +1,49 @@
+module Solusvm 
+  class ClientCli < BaseCli
+
+    desc "create", "Creates a new client"
+    method_option :username, :type => :string, :desc => "Username",  :aliases => ["-u", "--username"]
+    method_option :password, :type => :string, :desc => "Password",  :aliases => ["-p", "--password"]
+    method_option :email, :type => :string, :desc => "Email",  :aliases => ["-e", "--email"]
+    method_option :firstname, :type => :string, :desc => "Firstname",  :aliases => ["-f", "--firstname"]
+    method_option :lastname, :type => :string, :desc => "Lastname",  :aliases => ["-l", "--lastname"]
+    method_option :company, :type => :string, :desc => "Company",  :aliases => ["-c", "--company"]
+    def create
+      say client.create(options)
+    end
+
+    desc "change-password USERNAME NEWPASSWORD", "Changes the password of an existing client"
+    def change_password(username, password)
+      say client.change_password(username, password)
+    end
+
+    desc "authenticate USERNAME NEWPASSWORD", "Verify a clients login. Returns true when the specified login is correct"
+    def authenticate(username, password)
+      say client.authenticate(username, password)
+    end
+
+    desc "check-exists USERNAME", "Checks if a client exists"
+    def check_exists(username)
+      say client.exists?(username)
+    end
+
+    desc "delete USERNAME", "Deletes an existing client"
+    def delete(username)
+      say client.delete(username)
+    end
+
+    desc "list", "Lists existing clients"
+    def list
+      say client.list
+    end
+
+    private
+
+    def client
+      @client ||= begin
+        configure
+        Solusvm::Client.new
+      end
+    end
+  end
+end

data/lib/solusvm/cli/general_cli.rb

@@ -0,0 +1,28 @@
+module Solusvm 
+  class GeneralCli < BaseCli
+
+    desc "templates TYPE", "Lists existing templates for a given type [openvz|xen|xen hvm|kvm]"
+    def templates(type)
+      say general.templates(type)
+    end
+
+    desc "plans TYPE", "Lists existing plans for a given type [openvz|xen|xen hvm|kvm]"
+    def plans(type)
+      say general.plans(type)
+    end
+
+    desc "isos TYPE", "Lists existing isos for a given type [openvz|xen|xen hvm|kvm]"
+    def isos(type)
+      say general.isos(type)
+    end
+
+    private
+
+    def general
+      @general ||= begin
+        configure
+        Solusvm::General.new
+      end
+    end
+  end
+end

data/lib/solusvm/cli/node_cli.rb

@@ -0,0 +1,43 @@
+module Solusvm 
+  class NodeCli < BaseCli
+
+    desc "list TYPE", "Lists existing nodes for a given type [openvz|xen|xen hvm|kvm]"
+    def list(type)
+      say node.list(type)
+    end
+
+    desc "list-ids TYPE", "Lists existing nodes ids for a given type [openvz|xen|xen hvm|kvm]"
+    def list_ids(type)
+      say node.ids(type)
+    end
+
+    desc "available-ips VSERVERID", "Lists the available ips for a given node"
+    def available_ips(vserverid)
+      say node.available_ips(vserverid).join("\n")
+    end
+
+    desc "stats VSERVERID", "Lists statistics for a given node"
+    def stats(vserverid)
+      say node.statistics(vserverid).map{|k, v| "#{k} => #{v}" }.join("\n")
+    end
+
+    desc "xenresources VSERVERID", "Lists xen resources for a given node"
+    def xenresources(vserverid)
+      say node.xenresources(vserverid).map{|k, v| "#{k} => #{v}" }.join("\n")
+    end
+
+    desc "virtualservers VSERVERID", "Lists the virtual servers for a given node"
+    def virtualservers(vserverid)
+      say node.virtualservers(vserverid)
+    end
+
+    private
+
+    def node
+      @node ||= begin
+        configure
+        Solusvm::Node.new
+      end
+    end
+  end
+end

data/lib/solusvm/cli/reseller_cli.rb

@@ -0,0 +1,73 @@
+module Solusvm 
+  class ResellerCli < BaseCli
+
+    desc "create", "Creates a new reseller"
+    method_option :username, :type => :string, :desc => "Username",  :aliases => ["-u", "--username"]
+    method_option :password, :type => :string, :desc => "Password",  :aliases => ["-p", "--password"]
+    method_option :email, :type => :string, :desc => "Email",  :aliases => ["-e", "--email"]
+    method_option :firstname, :type => :string, :desc => "Firstname",  :aliases => ["-f", "--firstname"]
+    method_option :lastname, :type => :string, :desc => "Lastname",  :aliases => ["-l", "--lastname"]
+    method_option :company, :type => :string, :desc => "Company",  :aliases => ["-c", "--company"]
+    method_option :usernameprefix, :type => :string, :desc => "Prefix for reseller client usernames (optional)",  :aliases => ["-up", "--usernameprefix"]
+    method_option :maxvps, :type => :string, :desc => "Maximum amount of virtual servers (optional)",  :aliases => ["-mvps", "--maxvps"]
+    method_option :maxusers, :type => :string, :desc => "Maximum amount of users (optional)",  :aliases => ["-mu", "--maxusers"]
+    method_option :maxmem, :type => :string, :desc => "Maximum amount of memory (optional)",  :aliases => ["-mm", "--maxmem"]
+    method_option :maxburst, :type => :string, :desc => "Maximum amount of burst memory or swapspace (optional)",  :aliases => ["-mb", "--maxburst"]
+    method_option :maxbw, :type => :string, :desc => "Maximum amount of bandwith (optional)",  :aliases => ["-mb", "--maxbw"]
+    method_option :maxdisk, :type => :string, :desc => "Maximum amount of disk (optional)",  :aliases => ["-mb", "--maxdisk"]
+    method_option :maxipv4, :type => :string, :desc => "Maximum amount of ipv4 addresses (optional)",  :aliases => ["-mipv4", "--maxipv4"]
+    method_option :maxipv6, :type => :string, :desc => "Maximum amount of ipv6 addresses (optional)",  :aliases => ["-mipv6", "--maxipv6"]
+    method_option :nodegroups, :type => :string, :desc => "Comma separated list of node groups (optional)",  :aliases => ["-ng", "--nodegroups"]
+    method_option :mediagroups, :type => :string, :desc => "Comma separated list of media groups (optional)",  :aliases => ["-mg", "--mediagroups"]
+    method_option :openvz, :type => :string, :desc => "y|n Allow building of openvz virtual servers (optional)",  :aliases => ["-ovz", "--openvz"]
+    method_option :xenpv, :type => :string, :desc => "y|n Allow building of xen pv virtual servers (optional)",  :aliases => ["-xpv", "--xenpv"]
+    method_option :xenhvm, :type => :string, :desc => "y|n Allow building of xen hvm virtual servers (optional)",  :aliases => ["-xhvm", "--xenhvm"]
+    method_option :kvm, :type => :string, :desc => "y|n Allow building of kvmvirtual servers (optional)",  :aliases => ["-kvm"]
+    def create
+      say reseller.create(options)
+    end
+
+    desc "change", "Changes the available resources of a reseller"
+    method_option :maxvps, :type => :string, :desc => "Maximum amount of virtual servers (optional)",  :aliases => ["-mvps", "--maxvps"]
+    method_option :maxusers, :type => :string, :desc => "Maximum amount of users (optional)",  :aliases => ["-mu", "--maxusers"]
+    method_option :maxmem, :type => :string, :desc => "Maximum amount of memory (optional)",  :aliases => ["-mm", "--maxmem"]
+    method_option :maxburst, :type => :string, :desc => "Maximum amount of burst memory or swapspace (optional)",  :aliases => ["-mb", "--maxburst"]
+    method_option :maxbw, :type => :string, :desc => "Maximum amount of bandwith (optional)",  :aliases => ["-mb", "--maxbw"]
+    method_option :maxdisk, :type => :string, :desc => "Maximum amount of disk (optional)",  :aliases => ["-mb", "--maxdisk"]
+    method_option :maxipv4, :type => :string, :desc => "Maximum amount of ipv4 addresses (optional)",  :aliases => ["-mipv4", "--maxipv4"]
+    method_option :maxipv6, :type => :string, :desc => "Maximum amount of ipv6 addresses (optional)",  :aliases => ["-mipv6", "--maxipv6"]
+    method_option :nodegroups, :type => :string, :desc => "Comma separated list of node groups (optional)",  :aliases => ["-ng", "--nodegroups"]
+    method_option :mediagroups, :type => :string, :desc => "Comma separated list of media groups (optional)",  :aliases => ["-mg", "--mediagroups"]
+    method_option :openvz, :type => :string, :desc => "y|n Allow building of openvz virtual servers (optional)",  :aliases => ["-ovz", "--openvz"]
+    method_option :xenpv, :type => :string, :desc => "y|n Allow building of xen pv virtual servers (optional)",  :aliases => ["-xpv", "--xenpv"]
+    method_option :xenhvm, :type => :string, :desc => "y|n Allow building of xen hvm virtual servers (optional)",  :aliases => ["-xhvm", "--xenhvm"]
+    method_option :kvm, :type => :string, :desc => "y|n Allow building of kvmvirtual servers (optional)",  :aliases => ["-kvm"]
+    def change_resources
+      say reseller.change_resources(options)
+    end
+
+    desc "info USERNAME", "Retrieves information from an existing reseller"
+    def info(username)
+      say reseller.info(username)
+    end
+
+    desc "delete USERNAME", "Deletes an existing reseller"
+    def delete(username)
+      say reseller.delete(username)
+    end
+
+    desc "list", "Lists existing resellers"
+    def list
+      say reseller.list
+    end
+
+    private
+
+    def reseller
+      @reseller ||= begin
+        configure
+        Solusvm::Reseller.new
+      end
+    end
+  end
+end