kytoon 1.3.9 → 1.4.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Wed Jul 19 2013 Dan Prince <dprince@redhat.com> - 1.4.0
+  -Add support for CloudCue.
+  -Drop old CloudServers VPC stuff (no longer in use)
+
 * Wed Jun 12 2013 Dan Prince <dprince@redhat.com> - 1.3.9
   -XenServer: Extract configure_host_network (matelaket)
   -XenServer: Fix: Configure host network before configuring nodes (matelaket)

data/README.md

@@ -35,7 +35,7 @@ Quick install on Fedora:
 Create a .kytoon.conf file in your $HOME directory.
 
         # The default group type.
-        # Set to one of: openstack, libvirt, xenserver
+        # Set to one of: openstack, libvirt, xenserver, cloudcue
         group_type: openstack
 
         # Openstack Settings

data/Rakefile

@@ -21,7 +21,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "kytoon"
     gem.summary = "Create & configure ephemeral virtual private clouds."
-    gem.description = "A set of Rake tasks that provide a framework to help automate the creation and configuration of VPC server groups."
+    gem.description = "A set of Rake tasks that provide a framework to help automate the creation and configuration server groups."
     gem.email = "dprince@redhat.com"
     gem.homepage = "http://github.com/dprince/kytoon"
     gem.authors = ["Dan Prince"]

data/VERSION

@@ -1 +1 @@
-1.3.9
+1.4.0

data/config/{server_group_vpc.json → server_group_cloudcue.json}

@@ -1,14 +1,12 @@
 {
 	"name": "Fedora",
-	"domain_name": "vpc",
+	"domain_name": "foo",
 	"description": "Fedora",
-	"vpn_device": "tap",
-	"vpn_proto": "udp",
 	"servers": {
 		"login": {
 			"image_id": "24344414",
 			"flavor_id": "3",
-			"openvpn_server": "true"
+			"gateway": "true"
 		}
 	}
 }

data/lib/kytoon.rb

@@ -5,6 +5,3 @@ require 'kytoon/exception'
 require 'kytoon/version'
 require 'kytoon/xml_util'
 require 'kytoon/server_group'
-require 'kytoon/vpn/vpn_connection'
-require 'kytoon/vpn/vpn_network_manager'
-require 'kytoon/vpn/vpn_openvpn'

data/lib/kytoon/providers/cloud_cue.rb

@@ -0,0 +1,9 @@
+require 'kytoon/providers/cloud_cue/connection'
+require 'kytoon/providers/cloud_cue/server'
+require 'kytoon/providers/cloud_cue/server_group'
+require 'kytoon/providers/cloud_cue/ssh_public_key'
+require 'kytoon/util'
+
+Kytoon::Util.check_config_param('cloudcue_url')
+Kytoon::Util.check_config_param('cloudcue_username')
+Kytoon::Util.check_config_param('cloudcue_password')

data/lib/kytoon/providers/{cloud_servers_vpc → cloud_cue}/connection.rb

@@ -7,7 +7,7 @@ module Kytoon
 
 module Providers
 
-module CloudServersVPC
+module CloudCue
 
 class Connection
 
@@ -21,9 +21,9 @@ MULTI_PART_BOUNDARY="jtZ!pZ1973um"
 
     configs=Util.load_configs
 
-    base_url = configs["cloud_servers_vpc_url"]
-    @@auth_user = configs["cloud_servers_vpc_username"]
-    @@auth_password = configs["cloud_servers_vpc_password"]
+    base_url = configs["cloudcue_url"]
+    @@auth_user = configs["cloudcue_username"]
+    @@auth_password = configs["cloudcue_password"]
 
     ssl_key = configs["ssl_key"]
     ssl_cert = configs["ssl_cert"]

data/lib/kytoon/providers/{cloud_servers_vpc → cloud_cue}/server.rb

@@ -2,7 +2,7 @@ module Kytoon
 
 module Providers
 
-module CloudServersVPC
+module CloudCue
 
 class Server
 
@@ -15,7 +15,7 @@ class Server
   attr_accessor :flavor_id
   attr_accessor :image_id
   attr_accessor :server_group_id
-  attr_accessor :openvpn_server
+  attr_accessor :gateway
   attr_accessor :retry_count
   attr_accessor :error_message
   attr_accessor :status
@@ -32,14 +32,14 @@ class Server
     @image_id=options[:image_id]
     @admin_password=options[:admin_password]
     @server_group_id=options[:server_group_id].to_i
-    @openvpn_server = [true, "true"].include?(options[:openvpn_server])
+    @gateway = [true, "true"].include?(options[:gateway])
     @retry_count=options[:retry_count].to_i or 0
     @error_message=options[:error_message]
     @status=options[:status]
     end
 
-  def openvpn_server?
-    return @openvpn_server
+  def gateway?
+    return @gateway
   end
 
   def to_xml
@@ -57,7 +57,7 @@ class Server
       server.tag! "image-id", @image_id
       server.tag! "admin-password", @admin_password
       server.tag! "server-group-id", @server_group_id
-      server.tag! "openvpn-server", "true" if openvpn_server?
+      server.tag! "gateway", "true" if gateway?
       server.tag! "error-message", @error_message if @error_message
     end
     xml.target!
@@ -82,7 +82,7 @@ class Server
         :external_ip_addr => XMLUtil.element_text(sg_xml, "external-ip-addr"),
         :internal_ip_addr => XMLUtil.element_text(sg_xml, "internal-ip-addr"),
         :server_group_id => XMLUtil.element_text(sg_xml, "server-group-id"),
-        :openvpn_server => XMLUtil.element_text(sg_xml, "openvpn_server"),
+        :gateway => XMLUtil.element_text(sg_xml, "gateway"),
         :retry_count => XMLUtil.element_text(sg_xml, "retry-count"),
         :error_message => XMLUtil.element_text(sg_xml, "error-message"),
         :status => XMLUtil.element_text(sg_xml, "status")
@@ -95,8 +95,7 @@ class Server
 
   def rebuild
 
-    raise "Error: Rebuilding the OpenVPN server is not supported at this time." if openvpn_server?
-
+    raise "Error: Rebuilding the gateway server is not supported at this time." if gateway?
     Connection.post("/servers/#{@id}/rebuild", {})
 
   end

data/lib/kytoon/providers/{cloud_servers_vpc → cloud_cue}/server_group.rb

@@ -8,11 +8,11 @@ module Kytoon
 
 module Providers
 
-module CloudServersVPC
+module CloudCue
 
 class ServerGroup
 
-  @@data_dir=File.join(KYTOON_PROJECT, "tmp", "cloud_servers_vpc")
+  @@data_dir=File.join(KYTOON_PROJECT, "tmp", "cloudcue")
 
   def self.data_dir
     @@data_dir
@@ -28,10 +28,6 @@ class ServerGroup
   attr_accessor :name
   attr_accessor :description
   attr_accessor :domain_name
-  attr_accessor :vpn_device
-  attr_accessor :vpn_proto
-  attr_accessor :vpn_network
-  attr_accessor :vpn_subnet
   attr_accessor :owner_name
 
   attr_reader :ssh_public_keys
@@ -41,14 +37,9 @@ class ServerGroup
     @name=options[:name]
     @description=options[:description]
     @domain_name=options[:domain_name]
-    @vpn_device=options[:vpn_device] or @vpn_device="tun"
-    @vpn_proto=options[:vpn_proto] or @vpn_proto="tcp"
-    @vpn_network=options[:vpn_network] or @vpn_network="172.19.0.0"
-    @vpn_subnet=options[:vpn_subnet] or @vpn_subnet="255.255.128.0"
     @owner_name=options[:owner_name] or @owner_name=ENV['USER']
 
     @servers=[]
-    @clients=[]
     @ssh_public_keys=[]
     end
 
@@ -60,20 +51,8 @@ class ServerGroup
     @servers
   end
 
-  def client(name)
-    @clients.select {|s| s.name == name}[0] if @clients.size > 0
-  end
-
-    def clients
-        @clients
-    end
-
-  def vpn_gateway_name
-    @servers.select {|s| s.openvpn_server? }[0].name if @servers.size > 0
-  end
-
   def gateway_ip
-    @servers.select {|s| s.openvpn_server? }[0].external_ip_addr if @servers.size > 0
+    @servers.select {|s| s.gateway? }[0].external_ip_addr if @servers.size > 0
   end
 
   def ssh_public_keys
@@ -88,11 +67,7 @@ class ServerGroup
     sg=ServerGroup.new(
       :name => json_hash["name"],
       :description => json_hash["description"],
-      :domain_name => json_hash["domain_name"],
-      :vpn_device => json_hash["vpn_device"],
-      :vpn_proto => json_hash["vpn_proto"],
-      :vpn_network => json_hash["vpn_network"],
-      :vpn_subnet => json_hash["vpn_subnet"]
+      :domain_name => json_hash["domain_name"]
       )
     json_hash["servers"].each_pair do |server_name, server_config|
       sg.servers << Server.new(
@@ -100,7 +75,7 @@ class ServerGroup
         :description => server_config["description"],
         :flavor_id => server_config["flavor_id"],
         :image_id => server_config["image_id"],
-        :openvpn_server => server_config["openvpn_server"]
+        :gateway => server_config["gateway"]
       )
     end
 
@@ -124,29 +99,23 @@ class ServerGroup
       sg.description(@description)
       sg.tag! "owner-name", @owner_name
       sg.tag! "domain-name", @domain_name
-      sg.tag! "vpn-device", @vpn_device if @vpn_device != "tun"
-      sg.tag! "vpn-proto", @vpn_proto if @vpn_proto != "tcp"
-      sg.tag! "vpn-network", @vpn_network
-      sg.tag! "vpn-subnet", @vpn_subnet
       sg.servers("type" => "array") do |xml_servers|
         self.servers.each do |server|
           xml_servers.server do |xml_server|
-            xml_server.id(server.id)
             xml_server.name(server.name)
             xml_server.description(server.description)
             xml_server.tag! "flavor-id", server.flavor_id
             xml_server.tag! "image-id", server.image_id
-                        if server.admin_password then
-                xml_server.tag! "admin-password", server.admin_password
-                        end
+            if server.admin_password then
+              xml_server.tag! "admin-password", server.admin_password
+            end
             xml_server.tag! "cloud-server-id-number", server.cloud_server_id_number if server.cloud_server_id_number
             xml_server.tag! "status", server.status if server.status
             xml_server.tag! "external-ip-addr", server.external_ip_addr if server.external_ip_addr
             xml_server.tag! "internal-ip-addr", server.internal_ip_addr if server.internal_ip_addr
             xml_server.tag! "error-message", server.error_message if server.error_message
-            xml_server.tag! "retry-count", server.retry_count if server.retry_count
-            if server.openvpn_server?
-              xml_server.tag! "openvpn-server", "true", { "type" => "boolean"}
+            if server.gateway?
+              xml_server.tag! "gateway", "true", { "type" => "boolean"}
             end
           end
         end
@@ -159,16 +128,6 @@ class ServerGroup
           end
         end
       end
-      sg.tag! "clients", { "type" => "array"} do |xml_clients|
-        self.clients.each do |client|
-          xml_clients.tag! "client" do |xml_client|
-            xml_client.id client.id
-            xml_client.name client.name
-            xml_client.description client.description
-            xml_client.status client.status
-          end
-        end
-      end
 
     end
     xml.target!
@@ -185,11 +144,7 @@ class ServerGroup
         :id => XMLUtil.element_text(sg_xml, "id").to_i,
         :owner_name => XMLUtil.element_text(sg_xml, "owner-name"),
         :domain_name => XMLUtil.element_text(sg_xml, "domain-name"),
-        :description => XMLUtil.element_text(sg_xml, "description"),
-        :vpn_device => XMLUtil.element_text(sg_xml, "vpn-device"),
-        :vpn_proto => XMLUtil.element_text(sg_xml, "vpn-proto"),
-        :vpn_network => XMLUtil.element_text(sg_xml, "vpn-network"),
-        :vpn_subnet => XMLUtil.element_text(sg_xml, "vpn-subnet")
+        :description => XMLUtil.element_text(sg_xml, "description")
       )
       REXML::XPath.each(dom, "//server") do |server_xml|
 
@@ -205,20 +160,10 @@ class ServerGroup
           :admin_password => XMLUtil.element_text(server_xml, "admin-password"),
           :flavor_id => XMLUtil.element_text(server_xml, "flavor-id"),
           :retry_count => XMLUtil.element_text(server_xml, "retry-count"),
-          :openvpn_server => XMLUtil.element_text(server_xml, "openvpn-server")
+          :gateway => XMLUtil.element_text(server_xml, "gateway")
         )
         sg.servers << server
       end
-      REXML::XPath.each(dom, "//client") do |client_xml|
-
-        client=Client.new(
-          :id => XMLUtil.element_text(client_xml, "id").to_i,
-          :name => XMLUtil.element_text(client_xml, "name"),
-          :description => XMLUtil.element_text(client_xml, "description"),
-          :status => XMLUtil.element_text(client_xml, "status")
-        )
-        sg.clients << client
-      end
 
     end
 
@@ -232,13 +177,13 @@ class ServerGroup
     puts "name: #{@name}"
     puts "description: #{@description}"
     puts "domain name: #{@domain_name}"
-    puts "VPN gateway IP: #{self.gateway_ip}"
+    puts "Gateway IP: #{self.gateway_ip}"
     puts "Servers:"
     servers.each do |server|
       puts "\tname: #{server.name} (id: #{server.id})"
       puts "\tstatus: #{server.status}"
-      if server.openvpn_server?
-        puts "\tOpenVPN server: #{server.openvpn_server?}"
+      if server.gateway?
+        puts "\tGateway server: #{server.gateway?}"
       end
       if server.error_message then
         puts "\tlast error message: #{server.error_message}"
@@ -323,13 +268,13 @@ class ServerGroup
     sg=ServerGroup.from_xml(xml)
 
     old_group_xml=nil
-    vpn_gateway=nil
+    gateway_ip=nil
     sg.poll_until_online do |server_group|
       if old_group_xml != server_group.to_xml then
         old_group_xml = server_group.to_xml
-        vpn_gateway = server_group.gateway_ip if server_group.gateway_ip
-        if not vpn_gateway.nil? and not vpn_gateway.empty? then
-          SshUtil.remove_known_hosts_ip(vpn_gateway)
+        gateway_ip = server_group.gateway_ip if server_group.gateway_ip
+        if not gateway_ip.nil? and not gateway_ip.empty? then
+          SshUtil.remove_known_hosts_ip(gateway_ip)
         end
         server_group.pretty_print
       end

data/lib/kytoon/providers/{cloud_servers_vpc → cloud_cue}/ssh_public_key.rb

@@ -2,7 +2,7 @@ module Kytoon
 
 module Providers
 
-module CloudServersVPC
+module CloudCue
 
 class SshPublicKey
 

data/lib/kytoon/server_group.rb

@@ -18,9 +18,9 @@ class 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
+    elsif group_type == "cloudcue" or group_type == "cloudcue" then
+        require 'kytoon/providers/cloud_cue'
+        @@group_class = Kytoon::Providers::CloudCue::ServerGroup
     else
         raise ConfigException, "Invalid 'group_type' specified."
     end

data/test/server_group_test.rb

@@ -6,7 +6,7 @@ require 'tempfile'
 
 module Kytoon
 module Providers
-module CloudServersVPC
+module CloudCue
 
 class ServerGroupTest < Test::Unit::TestCase
 
@@ -21,13 +21,13 @@ class ServerGroupTest < Test::Unit::TestCase
 
   TEST_JSON_CONFIG = %{{
         "name": "test",
-        "domain_name": "vpc",
+        "domain_name": "foo",
         "description": "test description",
         "servers": {
             "login": {
                 "image_id": "51",
                 "flavor_id": "2",
-                "openvpn_server": "true"
+                "gateway": "true"
             },
             "client1": {
                 "image_id": "69",
@@ -37,12 +37,10 @@ class ServerGroupTest < Test::Unit::TestCase
     }}
 
   def test_server_new
-    sg=ServerGroup.new(:name => "test", :domain_name => "vpc", :description => "zz")
+    sg=ServerGroup.new(:name => "test", :domain_name => "foo", :description => "zz")
     assert_equal "test", sg.name
     assert_equal "zz", sg.description
-    assert_equal "vpc", sg.domain_name
-    assert_equal "172.19.0.0", sg.vpn_network
-    assert_equal "255.255.128.0", sg.vpn_subnet
+    assert_equal "foo", sg.domain_name
   end
 
   def test_gateway_ip
@@ -51,19 +49,12 @@ class ServerGroupTest < Test::Unit::TestCase
     assert_equal 1759, sg.id
     assert_equal "test description", sg.description
     assert_equal "dan.prince", sg.owner_name
-    assert_equal "172.19.0.0", sg.vpn_network
-    assert_equal "255.255.128.0", sg.vpn_subnet
     assert_equal 2, sg.servers.size
   end
 
-  #def test_vpn_gateway_name
-    #sg=ServerGroup.from_xml(SERVER_GROUP_XML)
-    #assert_equal "login1", sg.vpn_gateway_name
-  #end
-
   def test_server_group_from_json_config
     sg=ServerGroup.from_json(TEST_JSON_CONFIG)
-    assert_equal "vpc", sg.domain_name
+    assert_equal "foo", sg.domain_name
     assert_equal "test", sg.name
     assert_equal "test description", sg.description
     assert_equal 2, sg.servers.size
@@ -73,13 +64,13 @@ class ServerGroupTest < Test::Unit::TestCase
     login_server=sg.server("login") 
     assert_equal "51", login_server.image_id
     assert_equal "2", login_server.flavor_id
-    assert_equal true, login_server.openvpn_server?
+    assert_equal true, login_server.gateway?
 
     # validate the client1 server
     client1_server=sg.server("client1") 
     assert_equal "69", client1_server.image_id
     assert_equal "3", client1_server.flavor_id
-    assert_equal false, client1_server.openvpn_server?
+    assert_equal false, client1_server.gateway?
 
   end
 

data/test/server_test.rb

@@ -3,11 +3,11 @@ require 'test_helper'
 
 module Kytoon
 module Providers
-module CloudServersVPC
+module CloudCue
 
 class ServerTest < Test::Unit::TestCase
 
-  include Kytoon::Providers::CloudServersVPC
+  include Kytoon::Providers::CloudCue
 
   def setup
     @tmp_dir=TmpDir.new_tmp_dir
@@ -18,7 +18,7 @@ class ServerTest < Test::Unit::TestCase
     FileUtils.rm_rf(@tmp_dir)
   end
 
-  def test_vpn_server_rebuild_fails
+  def test_gateway_server_rebuild_fails
     group=ServerGroup.from_xml(SERVER_GROUP_XML)
     server=group.server("login1")
     assert_raises(RuntimeError) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -220,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A set of Rake tasks that provide a framework to help automate the creation
-  and configuration of VPC server groups.
+  and configuration server groups.
 email: dprince@redhat.com
 executables:
 - kytoon
@@ -238,19 +238,17 @@ files:
 - Rakefile
 - VERSION
 - bin/kytoon
+- config/server_group_cloudcue.json
 - 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
-- lib/kytoon/providers/cloud_servers_vpc/server.rb
-- lib/kytoon/providers/cloud_servers_vpc/server_group.rb
-- lib/kytoon/providers/cloud_servers_vpc/ssh_public_key.rb
-- lib/kytoon/providers/cloud_servers_vpc/vpn_network_interface.rb
+- lib/kytoon/providers/cloud_cue.rb
+- lib/kytoon/providers/cloud_cue/connection.rb
+- lib/kytoon/providers/cloud_cue/server.rb
+- lib/kytoon/providers/cloud_cue/server_group.rb
+- lib/kytoon/providers/cloud_cue/ssh_public_key.rb
 - lib/kytoon/providers/libvirt.rb
 - lib/kytoon/providers/libvirt/server_group.rb
 - lib/kytoon/providers/openstack.rb
@@ -262,12 +260,8 @@ files:
 - lib/kytoon/thor_tasks.rb
 - lib/kytoon/util.rb
 - lib/kytoon/version.rb
-- lib/kytoon/vpn/vpn_connection.rb
-- lib/kytoon/vpn/vpn_network_manager.rb
-- lib/kytoon/vpn/vpn_openvpn.rb
 - lib/kytoon/xml_util.rb
 - rake/kytoon.rake
-- test/client_test.rb
 - test/helper.rb
 - test/server_group_test.rb
 - test/server_test.rb
@@ -289,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4155049120962533494
+      hash: 4014569105622964663
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/kytoon/providers/cloud_servers_vpc.rb

@@ -1,11 +0,0 @@
-require 'kytoon/providers/cloud_servers_vpc/connection'
-require 'kytoon/providers/cloud_servers_vpc/client'
-require 'kytoon/providers/cloud_servers_vpc/server'
-require 'kytoon/providers/cloud_servers_vpc/server_group'
-require 'kytoon/providers/cloud_servers_vpc/ssh_public_key'
-require 'kytoon/providers/cloud_servers_vpc/vpn_network_interface'
-require 'kytoon/util'
-
-Kytoon::Util.check_config_param('cloud_servers_vpc_url')
-Kytoon::Util.check_config_param('cloud_servers_vpc_username')
-Kytoon::Util.check_config_param('cloud_servers_vpc_password')

data/lib/kytoon/providers/cloud_servers_vpc/client.rb

@@ -1,197 +0,0 @@
-module Kytoon
-
-module Providers
-
-module CloudServersVPC
-
-class Client
-
-  @@data_dir=File.join(KYTOON_PROJECT, "tmp", "clients")
-
-  def self.data_dir
-    @@data_dir
-  end
-
-  def self.data_dir=(dir)
-    @@data_dir=dir
-  end
-
-  attr_accessor :id
-  attr_accessor :name
-  attr_accessor :description
-  attr_accessor :status
-  attr_accessor :server_group_id
-  attr_accessor :cache_file
-
-  def initialize(options={})
-    @id=options[:id].to_i
-    @name=options[:name]
-    @description=options[:description]
-    if options[:status]
-      @status=options[:status]
-    else
-      @status = "Pending"
-    end
-    @status=options[:status] or @status = "Pending"
-    @server_group_id=options[:server_group_id]
-    if options[:cache_file] then
-      @cache_file=options[:cache_file]
-    else
-      @cache_file=options[:server_group_id]
-    end
-    @vpn_network_interfaces=[]
-  end
-
-  def vpn_network_interfaces
-    @vpn_network_interfaces
-  end
-
-    def cache_to_disk
-        FileUtils.mkdir_p(@@data_dir)
-        File.open(File.join(@@data_dir, "#{@cache_file}.xml"), 'w') do |f|
-            f.chmod(0600)
-            f.write(self.to_xml)
-        end
-    end
-
-  def delete
-    client_xml_file=File.join(@@data_dir, "#{@cache_file}.xml")
-        if File.exists?(client_xml_file) then
-            File.delete(client_xml_file)
-        end
-  end
-
-  def self.from_xml(xml)
-    client=nil
-    dom = REXML::Document.new(xml)
-    REXML::XPath.each(dom, "/client") do |cxml|
-
-      client=Client.new(
-        :id => XMLUtil.element_text(cxml,"id").to_i,
-        :name => XMLUtil.element_text(cxml, "name"),
-        :description => XMLUtil.element_text(cxml,"description"),
-        :status => XMLUtil.element_text(cxml,"status"),
-        :server_group_id => XMLUtil.element_text(cxml, "server-group-id").to_i
-      )
-      REXML::XPath.each(dom, "//vpn-network-interface") do |vni|
-        vni = VpnNetworkInterface.new(
-          :id => XMLUtil.element_text(vni, "id"),
-          :vpn_ip_addr => XMLUtil.element_text(vni, "vpn-ip-addr"),
-          :ptp_ip_addr => XMLUtil.element_text(vni, "ptp-ip-addr"),
-          :client_key => XMLUtil.element_text(vni, "client-key"),
-          :client_cert => XMLUtil.element_text(vni, "client-cert"),
-          :ca_cert => XMLUtil.element_text(vni, "ca-cert")
-        )
-        client.vpn_network_interfaces << vni
-      end
-    end
-    client
-  end 
-
-    def to_xml
-
-        xml = Builder::XmlMarkup.new
-        xml.tag! "client" do |sg|
-            sg.id(@id)
-            sg.name(@name)
-            sg.description(@description)
-            sg.status(@status)
-            sg.tag! "server-group-id", @server_group_id
-            sg.tag! "vpn-network-interfaces", {"type" => "array"} do |interfaces|
-        @vpn_network_interfaces.each do |vni|
-          interfaces.tag! "vpn-network-interface" do |xml_vni|
-            xml_vni.id(vni.id)
-            xml_vni.tag! "vpn-ip-addr", vni.vpn_ip_addr
-            xml_vni.tag! "ptp-ip-addr", vni.ptp_ip_addr
-            xml_vni.tag! "client-key", vni.client_key
-            xml_vni.tag! "client-cert", vni.client_cert
-            xml_vni.tag! "ca-cert", vni.ca_cert
-          end  
-        end
-      end
-
-    end
-        xml.target!
-
-  end
-
-
-    # Poll the server group until it is online.
-    # :timeout - max number of seconds to wait before raising an exception.
-    #            Defaults to 1500
-    def poll_until_online(options={})
-
-        timeout=options[:timeout] or timeout = ENV['VPN_CLIENT_TIMEOUT']
-        if timeout.nil? or timeout.empty? then
-            timeout=300 # defaults to 5 minutes
-        end 
-
-    online = false
-    count=0
-    until online or (count*5) >= timeout.to_i do
-      count+=1
-      begin
-        client=Client.get(:id => @id, :source => "remote")
-
-        if client.status == "Online" then
-          online = true
-        else
-          yield client if block_given?
-          sleep 5
-        end
-      rescue EOFError
-      end
-    end
-    if (count*20) >= timeout.to_i then
-      raise "Timeout waiting for client to come online."
-    end
-
-  end
-
-  def self.create(server_group, client_name, cache_to_disk=true)
-
-    xml = Builder::XmlMarkup.new
-    xml.client do |client|
-      client.name(client_name)
-      client.description("Toolkit Client: #{client_name}")
-      client.tag! "server-group-id", server_group.id
-    end
-
-    xml=Connection.post("/clients.xml", xml.target!)
-    client=Client.from_xml(xml)
-    client.cache_to_disk if cache_to_disk
-    client
-
-  end
-
-    # Get a client. The following options are available:
-    #
-    # :id - The ID of the client to get.
-    # :source - valid options are 'remote' and 'cache'
-    #
-  def self.get(options = {})
-
-        source = options[:source] or source = "remote"
-
-        if source == "remote" then
-      id=options[:id] or raise "Please specify a Client ID."
-      xml=Connection.get("/clients/#{id}.xml")
-      Client.from_xml(xml)
-    elsif source == "cache" then
-      id=options[:id] or id = ENV['GROUP_ID']
-      client_xml_file=File.join(@@data_dir, "#{id}.xml")
-      raise "No client files exist." if not File.exists?(client_xml_file)
-      Client.from_xml(IO.read(client_xml_file))
-    else
-      raise "Invalid get :source specified."
-    end
-
-  end
-
-end
-
-end
-
-end
-
-end

data/lib/kytoon/providers/cloud_servers_vpc/vpn_network_interface.rb

@@ -1,33 +0,0 @@
-module Kytoon
-
-module Providers
-
-module CloudServersVPC
-
-class VpnNetworkInterface
-
-  attr_accessor :id
-  attr_accessor :vpn_ip_addr
-  attr_accessor :ptp_ip_addr
-  attr_accessor :client_key
-  attr_accessor :client_cert
-  attr_accessor :ca_cert
-
-  def initialize(options={})
-
-    @id=options[:id].to_i
-    @vpn_ip_addr=options[:vpn_ip_addr]
-    @ptp_ip_addr=options[:ptp_ip_addr]
-    @client_key=options[:client_key]
-    @client_cert=options[:client_cert]
-    @ca_cert=options[:ca_cert]
-
-  end
-
-end
-
-end
-
-end
-
-end

data/lib/kytoon/vpn/vpn_connection.rb

@@ -1,46 +0,0 @@
-
-module Kytoon
-module Vpn
-class VpnConnection
-
-  CERT_DIR=File.join(ENV['HOME'], '.pki', 'openvpn')
-
-  def initialize(group, client = nil)
-    @group = group
-    @client = client
-  end
-
-  def create_certs
-    @ca_cert=get_cfile('ca.crt')
-    @client_cert=get_cfile('client.crt')
-    @client_key=get_cfile('client.key')
-
-    vpn_interface = @client.vpn_network_interfaces[0]
-
-    FileUtils.mkdir_p(get_cfile)
-    File::chmod(0700, File.join(ENV['HOME'], '.pki'))
-    File::chmod(0700, CERT_DIR)
-
-    File.open(@ca_cert, 'w') { |f| f.write(vpn_interface.ca_cert) }
-    File.open(@client_cert, 'w') { |f| f.write(vpn_interface.client_cert) }
-    File.open(@client_key, 'w') do |f|
-      f.write(vpn_interface.client_key)
-      f.chmod(0600)
-    end
-      end
-
-  def delete_certs
-    FileUtils.rm_rf(get_cfile)
-  end
-
-  def get_cfile(file = nil)
-    if file
-      File.join(CERT_DIR, @group.id.to_s, file)
-    else
-      File.join(CERT_DIR, @group.id.to_s)
-    end
-  end
-
-end
-end
-end

data/lib/kytoon/vpn/vpn_network_manager.rb

@@ -1,237 +0,0 @@
-require 'json'
-require 'builder'
-require 'rexml/document'
-require 'rexml/xpath'
-require 'uuidtools'
-require 'ipaddr'
-require 'fileutils'
-require 'tempfile'
-
-module Kytoon
-module Vpn
-
-class VpnNetworkManager < VpnConnection
-
-  def initialize(group, client = nil)
-    super(group, client)
-  end
-
-  def connect
-    create_certs
-    configure_gconf
-    puts %x{#{sudo_display} nmcli con up id "VPC Group: #{@group.id}"}
-  end
-
-  def disconnect
-    puts %x{#{sudo_display} nmcli con down id "VPC Group: #{@group.id}"}
-  end
-
-  def connected?
-    return system("#{sudo_display} nmcli con status | grep -c 'VPC Group: #{@group.id}' &> /dev/null")
-  end
-
-  def clean
-    unset_gconf_config
-    delete_certs
-  end
-
-  def configure_gconf
-
-    xml = Builder::XmlMarkup.new
-    xml.gconfentryfile do |file|
-      file.entrylist({ "base" => "/system/networking/connections/vpc_#{@group.id}"}) do |entrylist|
-
-        entrylist.entry do |entry|
-          entry.key("connection/autoconnect")
-          entry.value do |value|
-            value.bool("false")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("connection/id")
-          entry.value do |value|
-            value.string("VPC Group: #{@group.id}")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("connection/name")
-          entry.value do |value|
-            value.string("connection")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("connection/timestamp")
-          entry.value do |value|
-            value.string(Time.now.to_i.to_s)
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("connection/type")
-          entry.value do |value|
-            value.string("vpn")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("connection/uuid")
-          entry.value do |value|
-            value.string(UUIDTools::UUID.random_create)
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/addresses")
-          entry.value do |value|
-            value.list("type" => "int") do |list|
-            end
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/dns")
-          entry.value do |value|
-            value.list("type" => "int") do |list|
-              ip=IPAddr.new(@group.vpn_network.chomp("0")+"1")
-              list.value do |lv|
-                lv.int(ip_to_integer(ip.to_s))
-              end
-            end
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/dns-search")
-          entry.value do |value|
-            value.list("type" => "string") do |list|
-              list.value do |lv|
-                lv.string(@group.domain_name)
-              end
-            end
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/ignore-auto-dns")
-          entry.value do |value|
-            value.bool("true")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/method")
-          entry.value do |value|
-            value.string("auto")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/name")
-          entry.value do |value|
-            value.string("ipv4")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/never-default")
-          entry.value do |value|
-            value.bool("true")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("ipv4/routes")
-          entry.value do |value|
-            value.list("type" => "int") do |list|
-            end
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("vpn/ca")
-          entry.value do |value|
-            value.string(@ca_cert)
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("vpn/cert")
-          entry.value do |value|
-            value.string(@client_cert)
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("vpn/comp-lzo")
-          entry.value do |value|
-            value.string("yes")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("vpn/connection-type")
-          entry.value do |value|
-            value.string("tls")
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("vpn/key")
-          entry.value do |value|
-            value.string(@client_key)
-          end
-        end
-        if @group.vpn_proto == "tcp"
-          entrylist.entry do |entry|
-            entry.key("vpn/proto-tcp")
-            entry.value do |value|
-              value.string("yes")
-            end
-          end
-        else
-          entrylist.entry do |entry|
-            entry.key("vpn/proto-udp")
-            entry.value do |value|
-              value.string("yes")
-            end
-          end
-        end
-        if @group.vpn_device == "tap"
-          entrylist.entry do |entry|
-            entry.key("vpn/tap-dev")
-            entry.value do |value|
-              value.string("yes")
-            end
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("vpn/remote")
-          entry.value do |value|
-            value.string(@group.gateway_ip)
-          end
-        end
-        entrylist.entry do |entry|
-          entry.key("vpn/service-type")
-          entry.value do |value|
-            value.string("org.freedesktop.NetworkManager.openvpn")
-          end
-        end
-      end
-
-    end
-
-    Tempfile.open('w') do |f|
-      f.write(xml.target!)
-      f.flush
-      puts %x{gconftool-2 --load #{f.path}}
-    end
-
-    return true
-
-  end
-
-  def unset_gconf_config
-    puts %x{gconftool-2 --recursive-unset /system/networking/connections/vpc_#{@group.id}}
-  end
-
-  def ip_to_integer(ip_string)
-    return 0 if ip_string.nil?
-    ip_arr=ip_string.split(".").collect{ |s| s.to_i }
-    return ip_arr[0] + ip_arr[1]*2**8 + ip_arr[2]*2**16 + ip_arr[3]*2**24
-  end
-
-  def sudo_display
-    if ENV['DISPLAY'].nil? or ENV['DISPLAY'] != ":0.0" then
-      "sudo"
-    else
-      ""
-    end
-  end
-end
-end
-end

data/lib/kytoon/vpn/vpn_openvpn.rb

@@ -1,112 +0,0 @@
-module Kytoon
-module Vpn
-class VpnOpenVpn < VpnConnection
-
-  def initialize(group, client = nil)
-    super(group, client)
-  end
-
-  def connect
-    create_certs
-
-    @up_script=get_cfile('up.bash')
-    File.open(@up_script, 'w') do |f|
-        f << <<EOF_UP
-#!/bin/bash
-
-# setup routes
-/sbin/route add #{@group.vpn_network.chomp("0")+"1"} dev \$dev
-/sbin/route add -net #{@group.vpn_network} netmask 255.255.128.0 gw #{@group.vpn_network.chomp("0")+"1"}
-
-mv /etc/resolv.conf /etc/resolv.conf.bak
-egrep ^search /etc/resolv.conf.bak | sed -e 's/search /search #{@group.domain_name} /' > /etc/resolv.conf
-echo 'nameserver #{@group.vpn_network.chomp("0")+"1"}' >> /etc/resolv.conf
-grep ^nameserver /etc/resolv.conf.bak >> /etc/resolv.conf
-EOF_UP
-      f.chmod(0700)
-    end
-    @down_script=get_cfile('down.bash')
-    File.open(@down_script, 'w') do |f|
-        f << <<EOF_DOWN
-#!/bin/bash
-mv /etc/resolv.conf.bak /etc/resolv.conf
-EOF_DOWN
-      f.chmod(0700)
-    end
-
-    @config_file=get_cfile('config')
-    File.open(@config_file, 'w') do |f|
-      f << <<EOF_CONFIG
-client
-dev #{@group.vpn_device}
-proto #{@group.vpn_proto}
-
-#Change my.publicdomain.com to your public domain or IP address
-remote #{@group.gateway_ip} 1194
-
-resolv-retry infinite
-nobind
-persist-key
-persist-tun
-
-script-security 2
-
-ca #{@ca_cert}
-cert #{@client_cert}
-key #{@client_key}
-
-ns-cert-type server
-
-route-nopull
-
-comp-lzo
-
-verb 3
-up #{@up_script}
-down #{@down_script}
-EOF_CONFIG
-      f.chmod(0600)
-    end
-
-    disconnect if File.exist?(get_cfile('openvpn.pid'))
-    out=%x{sudo openvpn --config #{@config_file} --writepid #{get_cfile('openvpn.pid')} --daemon}
-    retval=$?
-    if retval.success? then
-      poll_vpn_interface
-      puts "OK."
-    else
-      raise "Failed to create VPN connection: #{out}"
-    end
-  end
-
-  def disconnect
-    raise "Not running? No pid file found!" unless File.exist?(get_cfile('openvpn.pid'))
-    pid = File.read(get_cfile('openvpn.pid')).chomp
-    system("sudo kill -TERM #{pid}")
-    File.delete(get_cfile('openvpn.pid'))
-  end
-
-  def connected?
-    system("/sbin/route -n | grep #{@group.vpn_network.chomp("0")+"1"} &> /dev/null")
-  end
-
-  def clean
-    delete_certs
-  end
-
-  private
-  def poll_vpn_interface
-    interface_name=@group.vpn_device+"0"
-    1.upto(30) do |i|
-      break if system("/sbin/ifconfig #{interface_name} > /dev/null 2>&1")
-      if i == 30 then
-        disconnect
-        raise "Failed to connect to VPN."
-      end
-      sleep 0.5
-    end
-  end
-
-end
-end
-end

data/test/client_test.rb

@@ -1,112 +0,0 @@
-$:.unshift File.dirname(__FILE__)
-require 'test_helper'
-require 'kytoon/providers/cloud_servers_vpc'
-
-module Kytoon
-module Providers
-module CloudServersVPC
-
-class ClientTest < Test::Unit::TestCase
-
-  include Kytoon::Providers::CloudServersVPC
-
-  def setup
-    @tmp_dir=TmpDir.new_tmp_dir
-    Client.data_dir=@tmp_dir
-  end
-
-  def teardown
-    FileUtils.rm_rf(@tmp_dir)
-  end
-
-  def test_new
-    client=Client.new(:name => "test", :description => "zz", :status => "Pending")
-    assert_equal "test", client.name
-    assert_equal "zz", client.description
-    assert_equal 0, client.vpn_network_interfaces.size
-  end
-
-  def test_from_xml
-    client=Client.from_xml(CLIENT_XML)
-    assert_equal "local", client.name
-    assert_equal "Toolkit Client: local", client.description
-    assert_equal 5, client.id
-    assert_equal 11, client.server_group_id
-    vni=client.vpn_network_interfaces[0] 
-    assert_not_nil vni.client_key
-    assert_not_nil vni.client_cert
-    assert_not_nil vni.ca_cert
-  end
-
-  def test_client_to_and_from_xml
-    client=Client.from_xml(CLIENT_XML)
-    xml=client.to_xml
-    assert_not_nil xml
-    client=Client.from_xml(xml) 
-    assert_equal "local", client.name
-    assert_equal "Toolkit Client: local", client.description
-    assert_equal 5, client.id
-    assert_equal 11, client.server_group_id
-    vni=client.vpn_network_interfaces[0] 
-    assert_not_nil vni.client_key
-    assert_not_nil vni.client_cert
-    assert_not_nil vni.ca_cert
-  end
-
-  def test_get
-
-    tmp_dir=TmpDir.new_tmp_dir
-    File.open("#{tmp_dir}/5.xml", 'w') do |f|
-        f.write(CLIENT_XML)
-    end
-    Client.data_dir=tmp_dir
-
-    Connection.stubs(:get).returns(CLIENT_XML)
-
-    # should raise exception if no ID is set and doing a remote lookup
-    assert_raises(RuntimeError) do
-      Client.get
-    end
-
-    client=Client.get(:id => "1234")
-    assert_not_nil client
-    assert_equal "Toolkit Client: local", client.description
-
-    client=Client.get(:id => "5", :source => "cache")
-    assert_not_nil client
-    assert_equal "Toolkit Client: local", client.description
-
-    #nonexistent group from cache
-    ENV['GROUP_ID']="1234"
-    assert_raises(RuntimeError) do
-      Client.get(:source => "cache")
-    end
-
-    #invalid get source
-    assert_raises(RuntimeError) do
-      Client.get(:id => "5", :source => "asdf")
-    end
-
-  end
-
-  def test_delete
-
-    client=Client.from_xml(CLIENT_XML)
-    client.delete
-    assert_equal false, File.exists?(File.join(Client.data_dir, "#{client.id}.xml"))
-
-  end
-
-  def test_create
-
-    Connection.stubs(:post).returns(CLIENT_XML)
-    client=Client.create(ServerGroup.from_xml(SERVER_GROUP_XML), "local")
-    assert_equal "local", client.name
-
-  end
-
-end
-
-end
-end
-end