kytoon 1.4.0 → 1.4.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Tue Aug 20 2013 Dan Prince <dprince@redhat.com> - 1.4.1
+  -Add ability to list remote groups with CloudCue provider.
+  -Test fixes for CloudCue.
+
 * 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)

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

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

@@ -292,7 +292,8 @@ class ServerGroup
   # :source - valid options are 'cache' and 'remote'
   def self.get(options={})
 
-    source = options[:source] or source = "cache"
+    source = ENV['KYTOON_CLOUDCUE_SOURCE'] or options[:source]
+    source = 'cache' if source.nil? or source.empty?
     id = options[:id]
     if id.nil? then
       group = ServerGroup.most_recent
@@ -316,10 +317,20 @@ class ServerGroup
   # :source - valid options are 'remote' and 'cache'
   def self.index(options={})
 
-    source = options[:source] or source = "cache"
+    source = ENV['KYTOON_CLOUDCUE_SOURCE'] or options[:source]
+    source = 'cache' if source.nil? or source.empty?
     server_groups=[]
-    Dir[File.join(ServerGroup.data_dir, '*.xml')].each do  |file|
-      server_groups << ServerGroup.from_xml(IO.read(file))
+
+    if source == "remote" then
+      xml=Connection.get("/server_groups.xml")
+      dom = REXML::Document.new(xml)
+      REXML::XPath.each(dom, "//server-group") do |group_xml|
+        server_groups << ServerGroup.from_xml(group_xml.to_s)
+      end
+    else
+      Dir[File.join(ServerGroup.data_dir, '*.xml')].each do  |file|
+        server_groups << ServerGroup.from_xml(IO.read(file))
+      end
     end
     server_groups
 

data/test/server_group_test.rb

@@ -3,6 +3,7 @@ require 'test_helper'
 
 require 'fileutils'
 require 'tempfile'
+require 'kytoon/providers/cloud_cue'
 
 module Kytoon
 module Providers
@@ -12,7 +13,7 @@ class ServerGroupTest < Test::Unit::TestCase
 
   def setup
     @tmp_dir=TmpDir.new_tmp_dir
-    ServerGroup.data_dir=@tmp_dir
+    CloudCue::ServerGroup.data_dir=@tmp_dir
   end
 
   def teardown
@@ -129,7 +130,7 @@ class ServerGroupTest < Test::Unit::TestCase
     File.open("#{tmp_dir}/1759.xml", 'w') do |f|
         f.write(SERVER_GROUP_XML)
     end
-    ServerGroup.data_dir=tmp_dir
+    CloudCue::ServerGroup.data_dir=tmp_dir
 
     Connection.stubs(:get).returns(SERVER_GROUP_XML)
 
@@ -146,11 +147,6 @@ class ServerGroupTest < Test::Unit::TestCase
       ServerGroup.get(:id => "1234", :source => "cache")
     end
 
-    #invalid get source
-    assert_raises(RuntimeError) do
-      ServerGroup.get(:id => "1759", :source => "asdf")
-    end
-
   end
 
   def test_index_from_cache
@@ -159,7 +155,7 @@ class ServerGroupTest < Test::Unit::TestCase
     File.open("#{tmp_dir}/1759.xml", 'w') do |f|
         f.write(SERVER_GROUP_XML)
     end
-    ServerGroup.data_dir=tmp_dir
+    CloudCue::ServerGroup.data_dir=tmp_dir
 
     server_groups = ServerGroup.index
 	
@@ -174,7 +170,7 @@ class ServerGroupTest < Test::Unit::TestCase
     File.open("#{tmp_dir}/1759.xml", 'w') do |f|
         f.write(SERVER_GROUP_XML)
     end
-    ServerGroup.data_dir=tmp_dir
+    CloudCue::ServerGroup.data_dir=tmp_dir
 
     Connection.stubs(:get).returns(SERVER_GROUP_XML)
     server_groups = ServerGroup.index(:source => "remote")
@@ -192,7 +188,7 @@ class ServerGroupTest < Test::Unit::TestCase
     File.open("#{tmp_dir}/1759.xml", 'w') do |f|
         f.write(SERVER_GROUP_XML)
     end
-    ServerGroup.data_dir=tmp_dir
+    CloudCue::ServerGroup.data_dir=tmp_dir
 
     Connection.stubs(:post).returns(SERVER_GROUP_XML)
     Connection.stubs(:get).returns(SERVER_GROUP_XML)
@@ -208,7 +204,7 @@ class ServerGroupTest < Test::Unit::TestCase
 
   def test_most_recent
 
-    File.open("#{ServerGroup.data_dir}/5.xml", 'w') do |f|
+    File.open("#{CloudCue::ServerGroup.data_dir}/5.xml", 'w') do |f|
         f.write(SERVER_GROUP_XML)
     end
 
@@ -224,7 +220,7 @@ class ServerGroupTest < Test::Unit::TestCase
 
     sg=ServerGroup.from_xml(SERVER_GROUP_XML)
     assert sg.cache_to_disk
-    assert File.exists?(File.join(ServerGroup.data_dir, "#{sg.id}.xml"))
+    assert File.exists?(File.join(CloudCue::ServerGroup.data_dir, "#{sg.id}.xml"))
 
   end
 
@@ -233,7 +229,7 @@ class ServerGroupTest < Test::Unit::TestCase
     sg=ServerGroup.from_xml(SERVER_GROUP_XML)
     Connection.stubs(:delete).returns("")
     sg.delete
-    assert_equal false, File.exists?(File.join(ServerGroup.data_dir, "#{sg.id}.xml"))
+    assert_equal false, File.exists?(File.join(CloudCue::ServerGroup.data_dir, "#{sg.id}.xml"))
 
   end
 

data/test/test_helper.rb

@@ -36,8 +36,6 @@ SERVER_GROUP_XML = %{
   <owner-name>dan.prince</owner-name>
   <updated-at type="datetime">2010-10-15T15:15:58-04:00</updated-at>
   <user-id type="integer">3</user-id>
-  <vpn-network>172.19.0.0</vpn-network>
-  <vpn-subnet>255.255.128.0</vpn-subnet>
   <servers type="array">
     <server>
       <account-id type="integer">3</account-id>
@@ -52,12 +50,11 @@ SERVER_GROUP_XML = %{
       <image-id type="integer">14</image-id>
       <internal-ip-addr>10.179.107.203</internal-ip-addr>
       <name>login1</name>
-      <openvpn-server type="boolean">true</openvpn-server>
+      <gateway type="boolean">true</gateway>
       <retry-count type="integer">0</retry-count>
       <server-group-id type="integer">1759</server-group-id>
       <status>Online</status>
       <updated-at type="datetime">2010-10-15T15:18:22-04:00</updated-at>
-      <vpn-network-interfaces type="array"/>
     </server>
     <server>
       <account-id type="integer">3</account-id>
@@ -72,106 +69,16 @@ SERVER_GROUP_XML = %{
       <image-id type="integer">49</image-id>
       <internal-ip-addr>10.179.107.204</internal-ip-addr>
       <name>test1</name>
-      <openvpn-server type="boolean">false</openvpn-server>
+      <gateway type="boolean">false</gateway>
       <retry-count type="integer">0</retry-count>
       <server-group-id type="integer">1759</server-group-id>
       <status>Online</status>
       <updated-at type="datetime">2010-10-15T15:18:22-04:00</updated-at>
-      <vpn-network-interfaces type="array"/>
     </server>
   </servers>
 </server-group>
 }
 
-CLIENT_XML = %{
-<client>
-  <created-at type="datetime">2011-01-09T19:37:32-05:00</created-at>
-  <description>Toolkit Client: local</description>
-  <id type="integer">5</id>
-  <is-windows type="boolean">false</is-windows>
-  <name>local</name>
-  <server-group-id type="integer">11</server-group-id>
-  <status>Online</status>
-  <updated-at type="datetime">2011-01-09T19:37:37-05:00</updated-at>
-  <vpn-network-interfaces type="array">
-    <vpn-network-interface>
-      <ca-cert>-----BEGIN CERTIFICATE-----
-MIIDyDCCAzGgAwIBAgIJAORNZNRpPx87MA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCVkExEzARBgNVBAcTCkJsYWNrc2J1cmcxEjAQBgNV
-BAoTCVJhY2tzcGFjZTEXMBUGA1UECxMOSW5mcmFzdHJ1Y3R1cmUxDjAMBgNVBAMT
-BWxvZ2luMQ4wDAYDVQQpEwVsb2dpbjEhMB8GCSqGSIb3DQEJARYSY29icmFAc25h
-a2VvaWwuY29tMB4XDTExMDExMDAwMzI1NVoXDTIxMDEwNzAwMzI1NVowgZ8xCzAJ
-BgNVBAYTAlVTMQswCQYDVQQIEwJWQTETMBEGA1UEBxMKQmxhY2tzYnVyZzESMBAG
-A1UEChMJUmFja3NwYWNlMRcwFQYDVQQLEw5JbmZyYXN0cnVjdHVyZTEOMAwGA1UE
-AxMFbG9naW4xDjAMBgNVBCkTBWxvZ2luMSEwHwYJKoZIhvcNAQkBFhJjb2JyYUBz
-bmFrZW9pbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL0xIVIfh8rA
-OCfc4BbWG+W+53iP9J6Fqhya5HSrYw3pdUCdimRBwQ0HoEnHndz2soRYc2Wtat8L
-qqoS/qZMBbqerzEUFHumSKLADT3y8G1gkiGsb1fBZPmExPYyG/UQQUfK7CIM/L/m
-W6Ji5ZEfTF9QPwHj3kVU99VUvm/BS8wXAgMBAAGjggEIMIIBBDAdBgNVHQ4EFgQU
-dOvLRyxDa2Xso59PFLf22sZQ07wwgdQGA1UdIwSBzDCByYAUdOvLRyxDa2Xso59P
-FLf22sZQ07yhgaWkgaIwgZ8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJWQTETMBEG
-A1UEBxMKQmxhY2tzYnVyZzESMBAGA1UEChMJUmFja3NwYWNlMRcwFQYDVQQLEw5J
-bmZyYXN0cnVjdHVyZTEOMAwGA1UEAxMFbG9naW4xDjAMBgNVBCkTBWxvZ2luMSEw
-HwYJKoZIhvcNAQkBFhJjb2JyYUBzbmFrZW9pbC5jb22CCQDkTWTUaT8fOzAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAAVXIxOocwXi05004m9Znff6/cAj
-2osr72g/Xux++lVqiSHf+T/R4QywsXy9//vKeXVEIyaaP9ImnWbbzHFFI+NStP4n
-LILyv+/eOuZ6Dv7Vv6ZacjI3fexcXYr5VW52HHbb/M7G1ePAfdAixUHNH7lh58dY
-WDzmJicksUYlyvI+
------END CERTIFICATE-----
-</ca-cert>
-      <client-cert>-----BEGIN CERTIFICATE-----
-MIIEDjCCA3egAwIBAgIBAzANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAlZBMRMwEQYDVQQHEwpCbGFja3NidXJnMRIwEAYDVQQKEwlSYWNr
-c3BhY2UxFzAVBgNVBAsTDkluZnJhc3RydWN0dXJlMQ4wDAYDVQQDEwVsb2dpbjEO
-MAwGA1UEKRMFbG9naW4xITAfBgkqhkiG9w0BCQEWEmNvYnJhQHNuYWtlb2lsLmNv
-bTAeFw0xMTAxMTAwMDM3MzVaFw0yMTAxMDcwMDM3MzVaMIGfMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCVkExEzARBgNVBAcTCkJsYWNrc2J1cmcxEjAQBgNVBAoTCVJh
-Y2tzcGFjZTEXMBUGA1UECxMOSW5mcmFzdHJ1Y3R1cmUxDjAMBgNVBAMTBWxvY2Fs
-MQ4wDAYDVQQpEwVsb2dpbjEhMB8GCSqGSIb3DQEJARYSY29icmFAc25ha2VvaWwu
-Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCefsUr0T4oQUjKjW7Dpx0t
-KwwafBF2HUW7CI75apeTjSBgYC1CHC6cggfFkUTFvndzspbGaeuJeYtvcvkAa2BD
-p4jlSJgEXa+Uy1UAj1y06BePLNbKF4EfgEGf3eIWcdOtLYbOg4k33uNgto168iVO
-owWOR+B2/z73NIHWxvtF3wIDAQABo4IBVjCCAVIwCQYDVR0TBAIwADAtBglghkgB
-hvhCAQ0EIBYeRWFzeS1SU0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
-BBSRXbeuamcuma4yo5B8IYSGGT3fNjCB1AYDVR0jBIHMMIHJgBR068tHLENrZeyj
-n08Ut/baxlDTvKGBpaSBojCBnzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlZBMRMw
-EQYDVQQHEwpCbGFja3NidXJnMRIwEAYDVQQKEwlSYWNrc3BhY2UxFzAVBgNVBAsT
-DkluZnJhc3RydWN0dXJlMQ4wDAYDVQQDEwVsb2dpbjEOMAwGA1UEKRMFbG9naW4x
-ITAfBgkqhkiG9w0BCQEWEmNvYnJhQHNuYWtlb2lsLmNvbYIJAORNZNRpPx87MBMG
-A1UdJQQMMAoGCCsGAQUFBwMCMAsGA1UdDwQEAwIHgDANBgkqhkiG9w0BAQUFAAOB
-gQApPAG1suVSPugJyQGfBaL8H+7VJdAGXnc6INX5s1AxJ3mvp4o6PQ7ytP4v/QkJ
-ZVMgWV8immfa3PboFgT00qqpbC2Vbf4RR972IEQfGuJLLl4YLrJsbloV9hBamKS7
-Z1lllmEHxFWpNK2FLSZNaeQABZyvzfZYkk6zsHoY8XsCBg==
------END CERTIFICATE-----
-</client-cert>
-      <client-key>-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCefsUr0T4oQUjKjW7Dpx0tKwwafBF2HUW7CI75apeTjSBgYC1C
-HC6cggfFkUTFvndzspbGaeuJeYtvcvkAa2BDp4jlSJgEXa+Uy1UAj1y06BePLNbK
-F4EfgEGf3eIWcdOtLYbOg4k33uNgto168iVOowWOR+B2/z73NIHWxvtF3wIDAQAB
-AoGAf3tFykWl8ij4jHsP8Wz0CcWLGa5bOR64XIS4wyKaQoML3JjfLkKOtzHbYGzE
-3Syi1bt6jKLbYZsSrRTT9SNorB3M2HI/uu1NHVyJ8fqxSJs9wQWv26XcMq6iPXR6
-JQmiG44r0NoHtDOw0NCoo+9il4wjTIVSwN58x69EO1hsWokCQQDREYW73F536KzN
-GSsLy+8VsaRiHCboi7lZwITGt4xFhykP/P5R/mNMTklVpJENuZH5jhiBr8r2O/XE
-NQpIEZiFAkEAwhL4EnXax5p50g2CpkJM2B9F/p3IjjMs/sdUh4/RvAVkVAzz7uOh
-TjtrL0T6480wA7rk3324IG5x4XTgXYVkEwJBAKkg7LgJ0N5d+xS8TIdxhctd9uZr
-ccpj5iDGTmNXbwF8EurdNnvsODYtisPeqn2Y5o8ktYyMQrupy+rbIaMloOUCQAsI
-pQ33oV6jy7VDi2AEePX4oTQeqF5dTnuVvZqPdK8p51BYBC5axrr56dggJdt5uPcd
-UxHZxfQiE1tsF615ff0CQQCjeBskODATJkbN0kw+6FIF9m7QoEAYtJD1jLiY/2Sv
-QRiYX+gvycrIph1yyIGA1qeHYnjhQp4ZijhcwSFUAAyF
------END RSA PRIVATE KEY-----
-</client-key>
-      <created-at type="datetime">2011-01-09T19:37:32-05:00</created-at>
-      <id type="integer">15</id>
-      <interfacable-id type="integer">5</interfacable-id>
-      <interfacable-type>Client</interfacable-type>
-      <ptp-ip-addr>172.19.0.6</ptp-ip-addr>
-      <updated-at type="datetime">2011-01-09T19:37:36-05:00</updated-at>
-      <vpn-ip-addr>172.19.0.5</vpn-ip-addr>
-    </vpn-network-interface>
-  </vpn-network-interfaces>
-</client>
-}
-
 SERVER_XML = %{
 
 <linux-server> 
@@ -185,7 +92,7 @@ SERVER_XML = %{
   <image-id type="integer">14</image-id> 
   <internal-ip-addr>10.119.225.116</internal-ip-addr> 
   <name>db1</name> 
-  <openvpn-server type="boolean">false</openvpn-server> 
+  <gateway type="boolean">false</gateway> 
   <retry-count type="integer">0</retry-count> 
   <server-group-id type="integer">999</server-group-id> 
   <status>Online</status> 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -283,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4014569105622964663
+      hash: 3489483367199471003
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: