fog 1.0.0 → 1.5.0

data/tests/rackspace/requests/dns/records_tests.rb

@@ -2,7 +2,9 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns']
 
   pending if Fog.mocking?
 
-  domain_tests(Fog::DNS[:rackspace], {:name => 'basictestdomain.com', :email => 'hostmaster@basictestdomain.com', :records => [{:ttl => 300, :name => 'basictestdomain.com', :type => 'A', :data => '192.168.1.1'}]}) do
+  domain_name = uniq_id + '.com'
+
+  domain_tests(Fog::DNS[:rackspace], {:name => domain_name, :email => 'hostmaster@' + domain_name, :records => [{:ttl => 300, :name => domain_name, :type => 'A', :data => '192.168.1.1'}]}) do
 
     tests('success on single record') do
 
@@ -10,18 +12,18 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns']
         Fog::DNS[:rackspace].list_records(@domain_id).body
       end
 
-      tests("add_records(#{@domain_id}, [{ :name => 'test1.basictestdomain.com', :type => 'A', :data => '192.168.2.1'}])").formats(RECORD_LIST_FORMAT) do
-        response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, [{ :name => 'test1.basictestdomain.com', :type => 'A', :data => '192.168.2.1'}])
-        @record_id = response.body['records'].first['id']
-        response.body
+      tests("add_records(#{@domain_id}, [{ :name => 'test1.#{domain_name}', :type => 'A', :data => '192.168.2.1'}])").formats(RECORD_LIST_FORMAT) do
+        response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, [{ :name => 'test1.' + domain_name, :type => 'A', :data => '192.168.2.1'}])
+        @record_id = response.body['response']['records'].first['id']
+        response.body['response']
       end
 
       tests("list_record_details(#{@domain_id}, #{@record_id})").formats(RECORD_FORMAT) do
         Fog::DNS[:rackspace].list_record_details(@domain_id, @record_id).body
       end
 
-      tests("modify_record(#{@domain_id}, #{@record_id}, { :ttl => 500, :name => 'test2.basictestdomain.com', :data => '192.168.3.1' })").succeeds do
-        wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].modify_record(@domain_id, @record_id, { :ttl => 500, :name => 'test2.basictestdomain.com', :data => '192.168.3.1' })
+      tests("modify_record(#{@domain_id}, #{@record_id}, { :ttl => 500, :name => 'test2.#{domain_name}', :data => '192.168.3.1' })").succeeds do
+        wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].modify_record(@domain_id, @record_id, { :ttl => 500, :name => 'test2.' + domain_name, :data => '192.168.3.1' })
       end
 
       tests("remove_record(#{@domain_id}, #{@record_id})").succeeds do
@@ -33,14 +35,14 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns']
 
       records_attributes =
         [
-          { :name => 'test1.basictestdomain.com', :type => 'A', :data => '192.168.2.1'},
-          { :name => 'basictestdomain.com', :type => 'MX', :priority => 10, :data => 'mx.basictestdomain.com'}
+          { :name => 'test1.' + domain_name, :type => 'A', :data => '192.168.2.1'},
+          { :name => domain_name, :type => 'MX', :priority => 10, :data => 'mx.' + domain_name}
         ]
 
       tests("add_records(#{@domain_id}, #{records_attributes})").formats(RECORD_LIST_FORMAT) do
         response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, records_attributes)
-        @record_ids = response.body['records'].collect { |record| record['id'] }
-        response.body
+        @record_ids = response.body['response']['records'].collect { |record| record['id'] }
+        response.body['response']
       end
 
       tests("remove_records(#{@domain_id}, #{@record_ids})").succeeds do

data/tests/rackspace/requests/identity/tenants_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests('Fog::Rackspace::Identity | tenants', ['rackspace']) do
+
+  pending if Fog.mock?
+
+  TENANTS_FORMATS = {
+    'tenants' => [{
+      'id' => String,
+      'name' => String,
+      'description' => Fog::Nullable::String,
+      'enabled' => Fog::Nullable::Boolean
+    }]
+  }
+
+  service = Fog::Rackspace::Identity.new
+
+  tests('success') do
+    tests('#list_tenants').formats(TENANTS_FORMATS) do
+      service.list_tenants().body
+    end
+  end
+end

data/tests/rackspace/requests/identity/token_tests.rb

@@ -0,0 +1,63 @@
+Shindo.tests('Fog::Rackspace::Identity | tokens', ['rackspace']) do
+
+  pending if Fog.mock?
+
+  ROLE_FORMAT = {
+    'id' => String,
+    'name' => String,
+    'description' => String
+  }
+
+  ENDPOINT_FORMAT = {
+    'tenantId' => String,
+    'publicURL' => Fog::Nullable::String,
+    'internalURL' => Fog::Nullable::String,
+    'region' => Fog::Nullable::String,
+    'versionId' => Fog::Nullable::String,
+    'versionInfo' => Fog::Nullable::String,
+    'versionList' => Fog::Nullable::String
+  }
+
+  SERVICE_FORMAT = {
+    'name' => String,
+    'type' => String,
+    'endpoints' => [ENDPOINT_FORMAT]
+  }
+
+  ACCESS_FORMAT = {
+    'access' => {
+      'token' => {
+        'id' => String,
+        'expires' => String,
+        'tenant' => {
+          'id' => String,
+          'name' => String
+        }
+      },
+      'user' => {
+        'id' => String,
+        'name' => String,
+        'roles' => [ROLE_FORMAT]
+      },
+      'serviceCatalog' => [SERVICE_FORMAT]
+    }
+  }
+
+  service = Fog::Rackspace::Identity.new
+
+  tests('success') do
+    credentials = Fog.credentials
+    username = credentials[:rackspace_username]
+    api_key = credentials[:rackspace_api_key]
+
+    tests('#create_token').formats(ACCESS_FORMAT) do
+      service.create_token(username, api_key).body
+    end
+  end
+
+  tests('failure') do
+    tests('#create_token(invalidname, invalidkey').raises(Excon::Errors::HTTPStatusError) do
+      service.create_token('baduser', 'badkey')
+    end
+  end
+end

data/tests/rackspace/requests/identity/user_tests.rb

@@ -0,0 +1,107 @@
+Shindo.tests('Fog::Rackspace::Identity | users', ['rackspace']) do
+
+  pending if Fog.mock?
+
+  USER_INFO = {
+    'id' => String,
+    'username' => String,
+    'email' => Fog::Nullable::String,
+    'enabled' => Fog::Boolean,
+    'OS-KSADM:password' => Fog::Nullable::String,
+    'created' => Fog::Nullable::String,
+    'updated' => Fog::Nullable::String
+  }
+
+  USER_FORMAT = {
+    'user' => USER_INFO
+  }
+
+  USERS_FORMAT = {
+    'users' => [USER_INFO]
+  }
+
+  CREDENTIAL_FORMAT = {
+    'RAX-KSKEY:apiKeyCredentials' => {
+      'username' => String,
+      'apiKey' => String
+    }
+  }
+
+  CREDENTIALS_FORMAT = {
+    'credentials' => [CREDENTIAL_FORMAT]
+  }
+
+  ROLES_FORMAT = {
+    'roles' => [{
+      'id' => String,
+      'name' => String,
+      'description' => String
+    }]
+  }
+
+  service = Fog::Rackspace::Identity.new
+  id = nil
+  username = 'foguser'
+  email = 'fog_user@example.com'
+  enabled = true
+  password = 'Fog_password1'
+
+  tests('success') do
+    tests('#create_user').formats(USER_FORMAT) do
+      data = service.create_user(username, email, enabled).body
+      id = data['user']['id']
+      data
+    end
+
+    tests('#delete_user').succeeds do
+      service.delete_user(id)
+    end
+
+    tests('#create_user with password').succeeds do
+      data = service.create_user(username, email, enabled, :password => password ).body
+      id = data['user']['id']
+      data
+    end
+
+    tests('#get_user_by_name').formats(USER_FORMAT) do
+      data = service.get_user_by_name(username).body
+      id = data['user']['id']
+      data
+    end
+
+    tests('#get_user_by_id').formats(USER_FORMAT) do
+      service.get_user_by_id(id).body
+    end
+
+    tests('#list_users').formats(USERS_FORMAT) do
+      service.list_users().body
+    end
+
+    tests('#update_user').formats(USER_FORMAT) do
+      service.update_user(id, username, 'updated_user@example.com', enabled).body
+    end
+
+    tests('#update_user with password').succeeds do
+      service.update_user(id, username, email, enabled, :password => password).body
+    end
+
+    tests('#list_user_roles').formats(ROLES_FORMAT) do
+      service.list_user_roles(id).body
+    end
+
+    service.delete_user(id)
+
+    # Users are only authorized to request their own credentials,
+    # so perform credential tests with the ID of the user running tests.
+    credential_username = Fog.credentials[:rackspace_username]
+    credential_id = service.get_user_by_name(credential_username).body['user']['id']
+
+    tests('#list_credentials').formats(CREDENTIALS_FORMAT) do
+      service.list_credentials(credential_id).body
+    end
+
+    tests('#get_credentials').formats(CREDENTIAL_FORMAT) do
+      service.get_credentials(credential_id).body
+    end
+  end
+end

data/tests/rackspace/requests/load_balancers/error_page_tests.rb

@@ -0,0 +1,31 @@
+Shindo.tests('Fog::Rackspace::LoadBalancers | error_page', ['rackspace', 'loadbalancers']) do
+
+  pending if Fog.mocking?
+
+  given_a_load_balancer_service do
+    given_a_load_balancer do
+      tests('success') do
+
+        @lb.wait_for { ready? }
+        tests("#get_error_page(#{@lb.id})").formats(ERROR_PAGE_FORMAT) do
+          @service.get_error_page(@lb.id).body
+        end
+
+        @lb.wait_for { ready? }
+        tests("#set_error_page(#{@lb.id}, '<html><body>hi!</body></html>')").succeeds do
+          @service.set_error_page(@lb.id, '<html><body>hi!</body></html>')
+        end
+
+        @lb.wait_for { ready? }
+        tests("#get_error_page(#{@lb.id})").formats(ERROR_PAGE_FORMAT) do
+          @service.get_error_page(@lb.id).body
+        end
+
+        @lb.wait_for { ready? }
+        tests("#remove_error_page()").succeeds do
+          @service.remove_error_page(@lb.id)
+        end
+      end
+    end
+  end
+end

data/tests/rackspace/requests/load_balancers/helper.rb

@@ -1,9 +1,21 @@
-SINGLE_NODE_FORMAT = {'address' => String, 'id' => Integer, 'status' => String, 'weight' => Fog::Nullable::Integer, 'port' => Integer, 'condition' => String}
-NODE_FORMAT = {'node' => SINGLE_NODE_FORMAT}
+SINGLE_NODE_FORMAT = {'address' => String, 'id' => Integer, 'status' => String, 'weight' => Fog::Nullable::Integer, 'port' => Integer, 'condition' => String, 'type' => String}
+NODE_FORMAT = {'node' => SINGLE_NODE_FORMAT.merge({ 'metadata' => []})}
 NODES_FORMAT = {'nodes' => [SINGLE_NODE_FORMAT]}
 VIRTUAL_IP_FORMAT = {'type' => String, 'id' => Integer, 'type' => String, 'ipVersion' => String, 'address' => String}
 VIRTUAL_IPS_FORMAT = { 'virtualIps' => [VIRTUAL_IP_FORMAT] }
+SOURCE_ADDRESSES = {
+  'ipv4Servicenet'  => String,
+  'ipv4Public'      => String,
+  'ipv6Public'      => String,
+}
 LOAD_BALANCER_USAGE_FORMAT = {
+  'links' => [
+    {
+      'otherAttributes' => [],
+      'href' => Fog::Nullable::String,
+      'rel' => Fog::Nullable::String
+    }
+  ],
   'loadBalancerUsageRecords' => [
     {
       'id' => Fog::Nullable::Integer,
@@ -20,6 +32,17 @@ LOAD_BALANCER_USAGE_FORMAT = {
   ]
 }
 
+SSL_TERMINATION_FORMAT = {
+  'sslTermination' => {
+    'certificate' => String,
+    'privatekey' => String,
+    'enabled' => Fog::Boolean,
+    'securePort' => Integer,
+    'secureTrafficOnly' => Fog::Boolean,
+    'intermediateCertificate' => Fog::Nullable::String
+  }
+}
+
 USAGE_FORMAT = {
   'accountId' => Integer,
   'loadBalancerUsages' => [
@@ -87,11 +110,23 @@ LOAD_BALANCERS_FORMAT = {
       'port' => Integer,
       'protocol' => String,
       'algorithm' => String,
-      'sourceAddresses' => {
-        'ipv4Servicenet'  => String,
-        'ipv4Public'      => String,
-        'ipv6Public'      => String,
-      },
+      'status' => String,
+      'virtualIps' => [VIRTUAL_IP_FORMAT],
+      'created' => { 'time' => String },
+      'updated' => { 'time' => String },
+      'nodeCount' => Integer
+    }]
+}
+
+LOAD_BALANCERS_DETAIL_FORMAT = {
+  'loadBalancers' => [
+    {
+      'name' => String,
+      'id' => Integer,
+      'port' => Integer,
+      'protocol' => String,
+      'algorithm' => String,
+      'sourceAddresses' => SOURCE_ADDRESSES,
       'status' => String,
       'virtualIps' => [VIRTUAL_IP_FORMAT],
       'nodes' => [SINGLE_NODE_FORMAT],
@@ -106,18 +141,76 @@ LOAD_BALANCER_FORMAT = {
     'port' => Integer,
     'protocol' => String,
     'algorithm' => String,
-    'sourceAddresses' => {
-      'ipv4Servicenet'  => String,
-      'ipv4Public'      => String,
-      'ipv6Public'      => String,
-    },
+    'sourceAddresses' => SOURCE_ADDRESSES,
     'status' => String,
     'cluster' => { 'name' => String },
     'virtualIps' => [VIRTUAL_IP_FORMAT],
     'nodes' => [SINGLE_NODE_FORMAT],
     'created' => { 'time' => String },
     'updated' => { 'time' => String },
+    'contentCaching' => { 'enabled' => Fog::Boolean }
   }.merge(CONNECTION_LOGGING_FORMAT)
 }
 
+ERROR_PAGE_FORMAT = {
+  'errorpage' => {
+    'content' => String
+  }
+}
+
+PRIVATE_KEY = '-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqSXePu8qLmniU7jNxoWq3SLkR8txMsl1gFYftpq7NIFaGfzV
+f4ZswYdEYDVWWRepQjS0TvsB0d5+usEUy/pcdZAlQLnn+540iLkvxKPVMzojUbG6
+yOAmjC/xAZuExJHtfCrRHUQ4WQCwqyqANfP81y1inAb0zJGbtWUreV+nv8Ue77qX
+77fOuqI6zOHinGZU7l25XGLcVUphgt8UtHZBzz2ahoftZ97DhUyQiSJQCaHXJd3Q
+eIHAq9qc7hu+usiYZWz34A0lw/gAl+RYcdvVc8kIwWxpiSieqqBPOwNzN5B0+9uu
+5sDzMGMFnnSWcNKIPumX0rke3xFUl3UD6GJwvwIDAQABAoIBABQ7alT+yH3avm6j
+OUHYtTJUPRf1VqnrfPmH061E3sWN/1gCbQse6h1P77bOSnDHqsA3i6Wy0mnnAiOW
+esVXQf3x6vLOCdiH+OKtu+/6ZMMG3jikWKI0ZYf5KAu4LW5RwiVK/c5RXagPtBIV
+OFa7w299h0EAeAGMHSLaYhPXhDokyJa6yDkAQL3n+9L3V8kNWeCELfrqXnXF4X0K
+CJp622tS/fW6kzppJyLJ4GPkK9HNMpu02/n2Z7swWypfF+7set+9/aNTooDYWzCu
+dbnRgqEIG1IP8+t6HG6x9VujJVJLIW/WLITnQ/WTRXOQHBGhazgmwe1GPdxsQgXu
+/wIcsIkCgYEA8Si0q+QhmJyoAm8vTHjo6+DD06YYTvSODLJOpOqr1ncGGDJ/evBw
+x+9QsK3veXMbAK5G7Xss32IuXbBfjqQ89+/q/YT4BnS3T0OQa2WlR8tURNphCDr5
+B3yD212kJTTehC+p7BI9zhnWXD9kImh4vm4XcOsC9iqOSCZkGfvRPRsCgYEAs46t
+Y85v2Pk235r1BPbgKwqYR+jElH4VWKu+EguUeQ4BlS47KktlLhvHtwrTv/UZ+lPx
+8gSJTgyy7iEmzcGwPf1/MI5xg+DPgGhbr2G8EvrThmdHy+rPF2YSp1iBmJ4xq/1r
+6XYKvf6ST3iujxTPU5xPEDUSLsH2ejJD/ddqSS0CgYEAkIdxyDa//8ObWWIjObSY
++4zIMBcyKFeernNKeMH/3FeW+neBOT/Sh7CgblK/28ylWUIZVghlOzePTC0BB+7c
+b0eFUQ0YzF204rc+XW8coCt2xJEQaCtXxinUqGq1jmriFNyv/MBt9BA+DSkcrRZp
+js9SEyV1r+yPOyRvB7eIjhMCgYEAkd5yG+fkU1c6bfNb4/mPaUgFKD4AHUZEnzF+
+  ivhfWOy4+nGBXT285/VnjNs95O8AeK3jmyJ2TTLh1bSW6obUX7flsRO3QlTLHd0p
+xtPWT3D3kHOtDwslzDN/KfYr6klxvvB0z0e3OFxsjiVTYiecuqb8UAVdTSED1Ier
+Vre+v80CgYB86OqcAlR3diNaIwHgwK5kP2NAH1DaSwZXoobYpdkjsUQfJN5jwJbD
+4/6HVydoc5xe0z8B+O1VUzC+QA0gdXgHbmLZBIUeQU8sE4hGELoe/eWULXGwI91M
+FyEWg03jZj8FkFh2954zwU6BOcbeL+9GrTdTPu1vuHoTitmNEye4iw==
+  -----END RSA PRIVATE KEY-----'
+
+CERTIFICATE = '-----BEGIN CERTIFICATE-----
+MIIEWjCCA0KgAwIBAgIGATTTGu/tMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNVBAYT
+AlVTMQ4wDAYDVQQIEwVUZXhhczEOMAwGA1UEBxMFVGV4YXMxGjAYBgNVBAoTEVJh
+Y2tTcGFjZSBIb3N0aW5nMRQwEgYDVQQLEwtSYWNrRXhwIENBNTEYMBYGA1UEAxMP
+Y2E1LnJhY2tleHAub3JnMB4XDTEyMDExMjE4MDgwNVoXDTM5MDUzMDE4MDgwNVow
+gZcxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEUMBIGA1UEBxMLU2FuIEFu
+dG9uaW8xEDAOBgNVBAoTB1JhY2tFeHAxEDAOBgNVBAsTB1JhY2tEZXYxPjA8BgNV
+BAMMNW15c2l0ZS5jb20vZW1haWxBZGRyZXNzPXBoaWxsaXAudG9vaGlsbEByYWNr
+c3BhY2UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqSXePu8q
+LmniU7jNxoWq3SLkR8txMsl1gFYftpq7NIFaGfzVf4ZswYdEYDVWWRepQjS0TvsB
+0d5+usEUy/pcdZAlQLnn+540iLkvxKPVMzojUbG6yOAmjC/xAZuExJHtfCrRHUQ4
+WQCwqyqANfP81y1inAb0zJGbtWUreV+nv8Ue77qX77fOuqI6zOHinGZU7l25XGLc
+VUphgt8UtHZBzz2ahoftZ97DhUyQiSJQCaHXJd3QeIHAq9qc7hu+usiYZWz34A0l
+w/gAl+RYcdvVc8kIwWxpiSieqqBPOwNzN5B0+9uu5sDzMGMFnnSWcNKIPumX0rke
+3xFUl3UD6GJwvwIDAQABo4HIMIHFMIGjBgNVHSMEgZswgZiAFIkXQizRaftxVDaL
+P/Fb/F2ht017oX2kezB5MQswCQYDVQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxDjAM
+BgNVBAcTBVRleGFzMRowGAYDVQQKExFSYWNrU3BhY2UgSG9zdGluZzEUMBIGA1UE
+CxMLUmFja0V4cCBDQTQxGDAWBgNVBAMTD2NhNC5yYWNrZXhwLm9yZ4IBAjAdBgNV
+HQ4EFgQUQUXHjce1JhjJDA4nhYcbebMrIGYwDQYJKoZIhvcNAQEFBQADggEBACLe
+vxcDSx91uQoc1uancb+vfkaNpvfAxOkUtrdRSHGXxvUkf/EJpIyG/M0jt5CLmEpE
+UedeCFlRN+Qnsqt589ZemWWJwth/Jbu0wQodfSo1cP0J2GFZDyTd5cWgm0IxD8A/
+ZRGzNnTx3xskv6/lOh7so9ULppEbOsZTNqQ4ahbxbiaR2iDTQGF3XKSHha8O93RB
+YlnFahKZ2j0CpYvg0lJjfN0Lvj7Sm6GBA74n2OrGuB14H27wklD+PtIEFniyxKbq
+5TDO0l4yDgkR7PsckmZqK22GP9c3fQkmXodtpV1wRjcSAxxVWYm+S24XvMFERs3j
+yXEf+VJ0H+voAvxgbAk=
+-----END CERTIFICATE-----'
+
 

data/tests/rackspace/requests/load_balancers/load_balancer_tests.rb

@@ -8,12 +8,21 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
       @lb_id = nil
       @lb_name = 'fog' + Time.now.to_i.to_s
 
-      tests('#create_load_balancer(fog, )').formats(LOAD_BALANCER_FORMAT) do
-        data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}]).body
+      tests("#create_load_balancer(#{@lb_name}, 'HTTP', 80,...)").formats(LOAD_BALANCER_FORMAT) do
+        data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}]).body
         @lb_id = data['loadBalancer']['id']
         data
       end
 
+      tests("#create_load_balancer(#{@lb_name}, 'HTTP', 80,...with algorithm)").formats(LOAD_BALANCER_FORMAT) do
+        data = @service.create_load_balancer(@lb_name, 'HTTP', 80, [{ :type => 'PUBLIC'}], 
+                                             [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}],
+                                             { :algorithm => 'LEAST_CONNECTIONS' }).body
+        @lb_id = data['loadBalancer']['id']
+        returns('LEAST_CONNECTIONS') { data['loadBalancer']['algorithm'] }
+        data
+      end
+
       tests("#update_load_balancer(#{@lb_id}) while immutable").raises(Fog::Rackspace::LoadBalancers::ServiceError) do
         @service.update_load_balancer(@lb_id, { :port => 80 }).body
       end
@@ -30,6 +39,9 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
         sleep 10
       end
 
+      tests("#list_load_balancers({:node_address => '1.1.1.1'})").formats(LOAD_BALANCERS_FORMAT) do
+        @service.list_load_balancers({:node_address => '1.1.1.1'}).body
+      end
 
       tests("#update_load_balancer(#{@lb_id}, { :port => 80 })").succeeds do
         @service.update_load_balancer(@lb_id, { :port => 80 }).body
@@ -46,7 +58,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
 
     tests('failure') do
       tests('#create_load_balancer(invalid name)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
-        @service.create_load_balancer('', 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '10.0.0.1', :port => 80, :condition => 'ENABLED'}])
+        @service.create_load_balancer('', 'HTTP', 80, [{ :type => 'PUBLIC'}], [{ :address => '1.1.1.1', :port => 80, :condition => 'ENABLED'}])
       end
 
       tests('#get_load_balancer(0)').raises(Fog::Rackspace::LoadBalancers::NotFound) do

data/tests/rackspace/requests/load_balancers/node_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace']) do
+Shindo.tests('Fog::Rackspace::LoadBalancers | node_tests', ['rackspace']) do
 
   pending if Fog.mocking?
 
@@ -9,62 +9,62 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
       tests('success') do
 
         @lb.wait_for { ready? }
-        tests('#create_node').formats(NODES_FORMAT) do
-          data = @service.create_node(@lb.id, '10.10.10.10', 80, 'ENABLED').body
+        tests("#create_node(#{@lb.id}, '1.1.1.2', 80, 'ENABLED')").formats(NODES_FORMAT) do
+          data = @service.create_node(@lb.id, '1.1.1.2', 80, 'ENABLED').body
           @nodes_created << data['nodes'][0]['id']
           data
         end
 
         @lb.wait_for { ready? }
         tests('#create_node with weight').formats(NODES_FORMAT) do
-          data = @service.create_node(@lb.id, '10.10.10.11', 80, 'ENABLED', { :weight => 10 }).body
+          data = @service.create_node(@lb.id, '1.1.1.3', 80, 'ENABLED', { :weight => 10 }).body
           @nodes_created << data['nodes'][0]['id']
           data
         end
 
         @lb.wait_for { ready? }
-        tests("list_nodes").formats(NODES_FORMAT) do
+        tests("#list_nodes(#{@lb.id})").formats(NODES_FORMAT) do
           @service.list_nodes(@lb.id).body
         end
 
         @lb.wait_for { ready? }
-        tests("get_node(#{@lb_node_id})").formats(NODE_FORMAT) do
+        tests("#get_node(#{@lb.id})").formats(NODE_FORMAT) do
           @service.get_node(@lb.id, @nodes_created[0]).body
         end
 
-        tests("update_node(#{@lb.id}, #{@nodes_created[0]})").succeeds do
-
-          @lb.wait_for { ready? }
-          tests("condition").succeeds do
-            @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED' })
-          end
+        @lb.wait_for { ready? }
+        tests("#update_node(#{@lb.id}, #{@nodes_created[0]}, { :condition => 'DISABLED' })").succeeds do
+          @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED' })
+        end
 
-          @lb.wait_for { ready? }
-          tests("weight").succeeds do
-            @service.update_node(@lb.id, @nodes_created[0], { :weight => 20 })
-          end
+        @lb.wait_for { ready? }
+        tests("#update_node(#{@lb.id}, #{@nodes_created[0]}, { :weight => 20})").succeeds do
+          @service.update_node(@lb.id, @nodes_created[0], { :weight => 20 })
+        end
 
-          @lb.wait_for { ready? }
-          tests("condition and weight").succeeds do
-            @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED', :weight => 20 })
-          end
+        @lb.wait_for { ready? }
+        tests("#update_node(#{@lb.id}, #{@nodes_created[0]}, { :condition => 'DISABLED', :weight => 20 })").succeeds do
+          @service.update_node(@lb.id, @nodes_created[0], { :condition => 'DISABLED', :weight => 20 })
         end
       end
 
       tests('failure') do
-        tests('create_node(invalid ip)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
+        tests('#create_node(invalid ip)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
           @service.create_node(@lb.id, '', 80, 'ENABLED')
         end
-        tests('create_node(invalid condition)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
-          @service.create_node(@lb.id, '10.10.10.10', 80, 'EABLED')
+        tests('#create_node(invalid condition)').raises(Fog::Rackspace::LoadBalancers::BadRequest) do
+          @service.create_node(@lb.id, '1.1.1.2', 80, 'EABLED')
         end
-        tests('get_node(0)').raises(Fog::Rackspace::LoadBalancers::NotFound) do
+        tests("#get_node(#{@lb.id}, 0)").raises(Fog::Rackspace::LoadBalancers::NotFound) do
           @service.get_node(@lb.id, 0)
         end
-        tests('delete_nodes(0)').raises(Fog::Rackspace::LoadBalancers::ServiceError) do
-          @service.delete_nodes(@lb.id, 0)
+        tests("#delete_node(#{@lb.id}, 0)").raises(Fog::Rackspace::LoadBalancers::NotFound) do
+          @service.delete_node(@lb.id, 0)
+        end
+        tests("#delete_nodes('a', 'b')").raises(Fog::Rackspace::LoadBalancers::NotFound) do
+          @service.delete_nodes(@lb.id, 'a', 'b')
         end
-        tests('update_node(0)').raises(Fog::Rackspace::LoadBalancers::NotFound) do
+        tests("#update_node(#{@lb.id}, 0, { :weight => 20 })").raises(Fog::Rackspace::LoadBalancers::NotFound) do
           @service.update_node(@lb.id, 0, { :weight => 20 })
         end
       end
@@ -72,12 +72,11 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_tests', ['rackspace'
       tests('success') do
         @lb.wait_for { ready? }
         tests("#delete_nodes(multiple node)").succeeds do
-          pending
           @service.delete_nodes(@lb.id, *@nodes_created)
         end
         @lb.wait_for { ready? }
         tests("#delete_node()").succeeds do
-          node_id = @service.create_node(@lb.id, '10.10.10.12', 80, 'ENABLED').body['nodes'][0]['id']
+          node_id = @service.create_node(@lb.id, '1.1.1.3', 80, 'ENABLED').body['nodes'][0]['id']
           @lb.wait_for { ready? }
           @service.delete_node(@lb.id, node_id)
         end

data/tests/rackspace/requests/load_balancers/ssl_termination_tests.rb

@@ -0,0 +1,38 @@
+Shindo.tests('Fog::Rackspace::LoadBalancers | ssl_termination', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  given_a_load_balancer_service do
+    given_a_load_balancer do
+      tests('success') do
+
+        @lb.wait_for { ready? }
+        tests("#set_ssl_termination(#{@lb.id}, 443, PRIVATE_KEY, CERTIFICATE)").succeeds do
+          @service.set_ssl_termination(@lb.id, 443, PRIVATE_KEY, CERTIFICATE)
+        end
+
+        @lb.wait_for { ready? }
+        tests("#get_ssl_termination(#{@lb.id})").formats(SSL_TERMINATION_FORMAT) do
+          @service.get_ssl_termination(@lb.id).body
+        end
+
+        @lb.wait_for { ready? }
+        tests("#remove_ssl_termination(#{@lb.id})").succeeds do
+          @service.remove_ssl_termination(@lb.id).body
+        end
+
+      end
+
+      tests('failure') do
+        @lb.wait_for { ready? }
+        tests("#get_ssl_termination(#{@lb.id})").raises(Fog::Rackspace::LoadBalancers::NotFound) do
+          @service.get_ssl_termination(@lb.id).body
+        end
+
+        tests("#set_ssl_termination(#{@lb.id}, 443, '', CERTIFICATE)").raises(Fog::Rackspace::LoadBalancers::BadRequest) do
+          @service.set_ssl_termination(@lb.id, 443, '', CERTIFICATE)
+        end
+      end
+    end
+  end
+end

data/tests/storage/helper.rb

@@ -6,6 +6,9 @@ def storage_providers
     :google     => {
       :mocked => true
     },
+    :hp         => {
+      :mocked => true
+    },
     :local      => {
       :mocked => false
     },

data/tests/storage/models/file_tests.rb

@@ -21,7 +21,7 @@ for provider, config in storage_providers
         responds_to(:public_url)
 
         tests("#public=(true)").succeeds do
-          pending if Fog.mocking? && !config[:mocked]
+          pending if Fog.mocking? && !config[:mocked] || !Fog::Storage[provider].respond_to?(:public=)
           @instance.public=(true)
         end
 

data/tests/storm_on_demand/requests/compute/server_tests.rb

@@ -14,16 +14,16 @@ Shindo.tests('Fog::Compute[:stormondemand] | server requests', ['stormondemand']
       'ip'     => String,
       'ip_count'     => String,
       'subaccnt'     => String,
-      'template'     => NilClass,
+      'template'     => String,
       'template_description'     => String,
-      'manage_level'     => NilClass,
+      'manage_level'     => String,
       'zone'     => Hash,
       'active' => Integer,
       'create_date' => String
   }
   
   @servers_format = {
-    'servers' => [@server_format]
+    'items' => [@server_format]
   }
     
   tests('success') do