kytoon 1.1.1 → 1.2.0

data/lib/kytoon/providers/xenserver/server_group.rb

@@ -61,7 +61,7 @@ class ServerGroup
     @dns_nameserver = options[:dns_nameserver]
     @gateway_ip = options[:gateway_ip]
     @gateway_ip = ENV['GATEWAY_IP'] if @gateway_ip.nil?
-    raise "Please specify a GATEWAY_IP" if @gateway_ip.nil?
+    raise ConfigException, "Please specify a GATEWAY_IP" if @gateway_ip.nil?
 
     @servers=[]
     end
@@ -195,12 +195,12 @@ fi
     id = options[:id]
     if id.nil? then
       group=ServerGroup.most_recent
-      raise "No server group files exist." if group.nil?
+      raise NoServerGroupExists, "No server group files exist." if group.nil?
       id=group.id
     end
 
     out_file=File.join(@@data_dir, "#{id}.json")
-    raise "No server group files exist." if not File.exists?(out_file)
+    raise NoServerGroupExists, "No server group files exist." if not File.exists?(out_file)
     ServerGroup.from_json(IO.read(out_file))
   end
 
@@ -287,7 +287,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
     }, gw_ip) do |ok, out|
       if not ok
         puts out
-        raise "Failed to create instance #{hostname}."
+        raise KytoonException, "Failed to create instance #{hostname}."
       end
     end
   end

data/lib/kytoon/server_group.rb

@@ -1,52 +1,68 @@
+module Kytoon
+
 class ServerGroup
 
   @@group_class = nil
 
   # called to init the configured group class we will use
-  def self.init
+  def self.init(group_type=nil)
     return if not @@group_class.nil?
     configs = Util.load_configs
-    group_type = ENV['GROUP_TYPE'] || configs['group_type']
-    if group_type == "cloud_server_vpc" then
-        require 'kytoon/providers/cloud_servers_vpc'
-        @@group_class = Kytoon::Providers::CloudServersVPC::ServerGroup
+    group_type = configs['group_type'] if group_type.nil?
+    if group_type == "openstack" then
+        require 'kytoon/providers/openstack'
+        @@group_class = Kytoon::Providers::Openstack::ServerGroup
     elsif group_type == "xenserver" then
         require 'kytoon/providers/xenserver'
         @@group_class = Kytoon::Providers::Xenserver::ServerGroup
     elsif group_type == "libvirt" then
         require 'kytoon/providers/libvirt'
         @@group_class = Kytoon::Providers::Libvirt::ServerGroup
+    elsif group_type == "cloud_server_vpc" or group_type == "cloud_servers_vpc" then
+        require 'kytoon/providers/cloud_servers_vpc'
+        @@group_class = Kytoon::Providers::CloudServersVPC::ServerGroup
     else
-        raise "Invalid 'group_type' specified in config file."
+        raise ConfigException, "Invalid 'group_type' specified."
     end
   end
 
-  def self.index(options)
+  def self.index(options={})
     self.init
-    @@group_class.index(options)
+    server_groups = @@group_class.index(options)
+    if server_groups.size > 0
+      puts "Server groups:"
+      server_groups.sort { |a,b| b.id <=> a.id }.each do |sg|
+        gw=sg.gateway_ip.nil? ? "" : " (#{sg.gateway_ip})"
+        puts "\t :id => #{sg.id}, :name => #{sg.name} #{gw}"
+      end
+    else
+      puts "No server groups."
+    end
   end
 
-  def self.create
+  def self.create(config_file)
     self.init
-    json_config_file=ENV['SERVER_GROUP_JSON']
-    if json_config_file.nil? then
-      json_config_file = @@group_class::CONFIG_FILE
+    if config_file.nil? then
+      config_file = @@group_class::CONFIG_FILE
+    end
+    if not File.exists?(config_file) then
+      raise ConfigException, "Please specify a valid GROUP_CONFIG."
     end
-    sg = @@group_class.from_json(IO.read(json_config_file))
+    sg = @@group_class.from_json(IO.read(config_file))
     @@group_class.create(sg)
   end
 
-  def self.get
+  def self.get(id=nil)
     self.init
-    id = ENV['GROUP_ID']
     @@group_class.get(:id => id)
   end
 
-  def self.delete
+  def self.delete(id=nil)
     self.init
-    id = ENV['GROUP_ID']
     sg = @@group_class.get(:id => id)
     sg.delete
   end
 
 end
+
+end

data/lib/kytoon/thor_tasks.rb

@@ -0,0 +1,92 @@
+require 'thor'
+
+module Kytoon
+
+class ThorTasks < Thor
+
+  desc "create", "Create a new server group."
+  method_options :group_type => :string
+  method_options :group_config => :string
+  def create(options=(options or {}))
+    begin
+      ServerGroup.init(options[:group_type])
+      sg = ServerGroup.create(options[:group_config])
+      puts "Server group ID #{sg.id} created."
+    rescue KytoonException => ke
+      puts ke.message
+    end
+  end
+
+  desc "list", "List existing server groups."
+  method_options :group_type => :string
+  def list(options=(options or {}))
+    begin
+      ServerGroup.init(options[:group_type])
+      ServerGroup.index()
+    rescue KytoonException => ke
+      puts ke.message
+    end
+  end
+
+  desc "show", "Print information for a server group."
+  method_options :group_id => :string
+  method_options :group_type => :string
+  def show(options=(options or {}))
+    begin
+      ServerGroup.init(options[:group_type])
+      sg = ServerGroup.get(options[:group_id])
+      sg.pretty_print
+    rescue KytoonException => ke
+      puts ke.message
+    end
+  end
+
+  desc "delete", "Delete a server group."
+  method_options :group_id => :string
+  method_options :group_type => :string
+  def delete(options=(options or {}))
+    begin
+      ServerGroup.init(options[:group_type])
+      sg = ServerGroup.get(options[:group_id])
+      sg.delete
+      SshUtil.remove_known_hosts_ip(sg.gateway_ip)
+    rescue KytoonException => ke
+      puts ke.message
+    end
+  end
+
+  desc "ip", "Print the IP address of the gateway server"
+  method_options :group_id => :string
+  method_options :group_type => :string
+  def ip(options=(options or {}))
+    begin
+      ServerGroup.init(options[:group_type])
+      sg = ServerGroup.get(options[:group_id])
+      puts sg.gateway_ip
+    rescue KytoonException => ke
+      puts ke.message
+    end
+  end
+
+  desc "ssh", "SSH into a group."
+  method_options :group_id => :string
+  method_options :group_type => :string
+  def ssh(options=(options or {}))
+    begin
+      ServerGroup.init(options[:group_type])
+      args=ARGV[1, ARGV.length].join(" ")
+      sg = ServerGroup.get(options[:group_id])
+      if (ARGV[1] and ARGV[1] =~ /^--group_id.*/) and (ARGV[2] and ARGV[2] =~ /^--group_id.*/)
+        args=ARGV[3, ARGV.length].join(" ")
+      elsif ARGV[1] and ARGV[1] =~ /^--group_id.*/
+        args=ARGV[2, ARGV.length].join(" ")
+      end
+      exec("ssh -o \"StrictHostKeyChecking no\" root@#{sg.gateway_ip} #{args}")
+    rescue KytoonException => ke
+      puts ke.message
+    end
+  end
+
+end
+
+end

data/lib/kytoon/util.rb

@@ -32,32 +32,37 @@ module Util
       configs=YAML.load_file(config_file)
       @@configs=configs
     else
-      raise "Failed to load kytoon config file. Please configure /etc/kytoon.conf or create a .kytoon.conf config file in your HOME directory."
+      raise ConfigException, "Failed to load kytoon config file. Please configure /etc/kytoon.conf or create a .kytoon.conf config file in your HOME directory."
     end
 
     @@configs
 
   end
 
-  def self.load_public_key
+  def self.public_key_path
 
-    ssh_dir=ENV['HOME']+File::SEPARATOR+".ssh"+File::SEPARATOR
-    if File.exists?(ssh_dir+"id_rsa.pub")
-      pubkey=IO.read(ssh_dir+"id_rsa.pub")
-    elsif File.exists?(ssh_dir+"id_dsa.pub")
-      pubkey=IO.read(ssh_dir+"id_dsa.pub")
+    ssh_dir=File.join(ENV['HOME'], ".ssh")
+    if File.exists?(File.join(ssh_dir, "id_rsa.pub"))
+      File.join(ssh_dir, "id_rsa.pub")
+    elsif File.exists?(File.join(ssh_dir, "id_dsa.pub"))
+      File.join(ssh_dir, "id_dsa.pub")
     else
-      raise "Failed to load SSH key. Please create a SSH public key pair in your HOME directory."
+      raise ConfigException, "Failed to load SSH key. Please create a SSH public key pair in your HOME directory."
     end
 
+  end
+
+  def self.load_public_key
+
+    pubkey=IO.read(self.public_key_path)
     pubkey.chomp
 
   end
 
   def self.check_config_param(key)
     configs = load_configs
-    if not configs or configs[key].nil? or configs[key].empty? then
-      raise "Please specify '#{key.to_s}' in your kytoon config file."
+    if not configs or configs[key].nil? or configs[key].to_s.empty? then
+      raise ConfigException, "Please specify '#{key.to_s}' in your kytoon config file."
     end
   end
 

data/rake/kytoon.rake

@@ -1,72 +1,60 @@
 include Kytoon
 
-namespace :group do
+namespace :kytoon do
   TMP_SG=File.join(KYTOON_PROJECT, 'tmp', 'server_groups')
 
   directory TMP_SG
 
   task :init => [TMP_SG] do
-      ServerGroup.init
-    end
+      ServerGroup.init(ENV['GROUP_TYPE'])
+  end
 
-  desc "Create a new group of cloud servers"
-  task :create => [ "init" ] do
-    sg = ServerGroup.create
+  desc "Create a new group of servers"
+  task :create do
+    sg = ServerGroup.create(ENV['GROUP_CONFIG'])
     puts "Server group ID #{sg.id} created."
   end
 
-  desc "List existing cloud server groups."
-  task :list => "init" do
-
-    server_groups=nil
-    server_groups=ServerGroup.index(:source => "cache")
-    if server_groups.size > 0
-      puts "Server groups:"
-      server_groups.sort { |a,b| b.id <=> a.id }.each do |sg|
-        gw=sg.gateway_ip.nil? ? "" : " (#{sg.gateway_ip})"
-        puts "\t :id => #{sg.id}, :name => #{sg.name} #{gw}"
-      end
-    else
-      puts "No server groups."
-    end
-
+  desc "List existing server groups."
+  task :list do
+    ServerGroup.index(:source => "cache")
   end
 
-  desc "Print information for a cloud server group"
-  task :show => [ "init" ] do
-    sg = ServerGroup.get
+  desc "Print information for a server group"
+  task :show do
+    sg = ServerGroup.get(ENV['GROUP_ID'])
     sg.pretty_print
   end
 
-  desc "Delete a cloud server group"
-  task :delete => ["init"] do
+  desc "Delete a server group"
+  task :delete do
 
-    sg = ServerGroup.get
-    puts "Deleting cloud server group ID: #{sg.id}."
+    sg = ServerGroup.get(ENV['GROUP_ID'])
+    puts "Deleting server group ID: #{sg.id}."
     sg.delete
     SshUtil.remove_known_hosts_ip(sg.gateway_ip)
 
   end
 
-  desc "Print the VPN gateway IP address"
-  task :gateway_ip do
-    group = ServerGroup.get
+  desc "Print the gateway IP address"
+  task :ip do
+    group = ServerGroup.get(ENV['GROUP_ID'])
     puts group.gateway_ip
   end
 
-end
-
-desc "SSH into the most recently created VPN gateway server."
-task :ssh => 'group:init' do
+  desc "SSH into the most recently created server group."
+  task :ssh => 'kytoon:init' do
 
-  sg=ServerGroup.get
-  args=ARGV[1, ARGV.length].join(" ")
-  if (ARGV[1] and ARGV[1] =~ /^GROUP_.*/) and (ARGV[2] and ARGV[2] =~ /^GROUP_.*/)
-    args=ARGV[3, ARGV.length].join(" ")
-  elsif ARGV[1] and ARGV[1] =~ /^GROUP_.*/
-    args=ARGV[2, ARGV.length].join(" ")
+    sg=ServerGroup.get(ENV['GROUP_ID'])
+    args=ARGV[1, ARGV.length].join(" ")
+    if (ARGV[1] and ARGV[1] =~ /^GROUP_.*/) and (ARGV[2] and ARGV[2] =~ /^GROUP_.*/)
+      args=ARGV[3, ARGV.length].join(" ")
+    elsif ARGV[1] and ARGV[1] =~ /^GROUP_.*/
+      args=ARGV[2, ARGV.length].join(" ")
+    end
+    exec("ssh -o \"StrictHostKeyChecking no\" root@#{sg.gateway_ip} #{args}")
   end
-  exec("ssh -o \"StrictHostKeyChecking no\" root@#{sg.gateway_ip} #{args}")
+
 end
 
 desc "Print help and usage information"
@@ -81,34 +69,30 @@ task :usage do
   puts "----"
   puts "Example commands:"
   puts ""
-  puts "\t- Create a new server group."
+  puts "\t- Create a new server group with default config file"
+  puts "\t  (config/server_group.json)."
   puts ""
-  puts "\t\t$ rake group:create"
+  puts "\t$ rake kytoon:create"
 
   puts ""
   puts "\t- List your currently running server groups."
   puts ""
-  puts "\t\t$ rake group:list"
-
-  puts ""
-  puts "\t- List all remote groups using a common Cloud Servers VPC account."
-  puts ""
-  puts "\t\t$ rake group:list"
+  puts "\t$ rake kytoon:list"
 
   puts ""
   puts "\t- SSH into the current (most recently created) server group."
   puts ""
-  puts "\t\t$ rake ssh"
+  puts "\t$ rake ssh"
 
   puts ""
   puts "\t- SSH into a server group with an ID of 3."
   puts ""
-  puts "\t\t$ rake ssh GROUP_ID=3"
+  puts "\t$ rake ssh GROUP_ID=3"
 
   puts ""
   puts "\t- Delete the server group with an ID of 3."
   puts ""
-  puts "\t\t$ rake group:delete GROUP_ID=3"
+  puts "\t$ rake kytoon:delete GROUP_ID=3"
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +171,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: openstack-compute
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -174,24 +222,28 @@ dependencies:
 description: A set of Rake tasks that provide a framework to help automate the creation
   and configuration of VPC server groups.
 email: dprince@redhat.com
-executables: []
+executables:
+- kytoon
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
+- README.md
 files:
 - .document
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
+- bin/kytoon
 - config/server_group_libvirt.json
+- config/server_group_openstack.json
 - config/server_group_vpc.json
 - config/server_group_xen.json
 - lib/kytoon.rb
+- lib/kytoon/exception.rb
 - lib/kytoon/providers/cloud_servers_vpc.rb
 - lib/kytoon/providers/cloud_servers_vpc/client.rb
 - lib/kytoon/providers/cloud_servers_vpc/connection.rb
@@ -201,10 +253,13 @@ files:
 - lib/kytoon/providers/cloud_servers_vpc/vpn_network_interface.rb
 - lib/kytoon/providers/libvirt.rb
 - lib/kytoon/providers/libvirt/server_group.rb
+- lib/kytoon/providers/openstack.rb
+- lib/kytoon/providers/openstack/server_group.rb
 - lib/kytoon/providers/xenserver.rb
 - lib/kytoon/providers/xenserver/server_group.rb
 - lib/kytoon/server_group.rb
 - lib/kytoon/ssh_util.rb
+- lib/kytoon/thor_tasks.rb
 - lib/kytoon/util.rb
 - lib/kytoon/version.rb
 - lib/kytoon/vpn/vpn_connection.rb
@@ -220,7 +275,6 @@ files:
 - test/test_helper.rb
 - test/test_kytoon.rb
 - test/util_test.rb
-- test/vpn_network_manager_test.rb
 homepage: http://github.com/dprince/kytoon
 licenses: []
 post_install_message: 
@@ -235,7 +289,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1959876688659758005
+      hash: -603401049467997741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: