aviator 0.0.6 → 0.0.7

data/test/aviator/core/session_test.rb

@@ -9,6 +9,11 @@ class Aviator::Test
     end
 
 
+    def klass
+      Aviator::Session
+    end
+
+
     def log_file_path
       Pathname.new(__FILE__).expand_path.join('..', '..', '..', '..', 'tmp', 'aviator.log')
     end
@@ -16,33 +21,33 @@ class Aviator::Test
 
     def new_session
       Aviator::Session.new(
-        config_file: config.path,
-        environment: 'openstack_admin',
-        log_file:    log_file_path
+        :config_file => config.path,
+        :environment => 'openstack_admin',
+        :log_file    => log_file_path
       )
     end
 
 
-    describe '#authenticate' do      
+    describe '#authenticate' do
 
       it 'authenticates against the auth service indicated in the config file' do
         session = new_session
-        
+
         session.authenticate
 
         session.authenticated?.must_equal true
       end
-            
-            
+
+
       it 'authenticates against the auth service using the credentials in the given block' do
         session     = new_session
         credentials = config.openstack_admin[:auth_credentials]
-        
+
         session.authenticate do |c|
           c[:username] = credentials[:username]
           c[:password] = credentials[:password]
         end
-        
+
         session.authenticated?.must_equal true
       end
 
@@ -50,68 +55,68 @@ class Aviator::Test
       it 'raises an AuthenticationError when authentication fails' do
         session     = new_session
         credentials = config.openstack_admin[:auth_credentials]
-        
+
         the_method = lambda do
           session.authenticate do |c|
             c[:username] = 'invalidusername'
             c[:password] = 'invalidpassword'
           end
         end
-        
+
         the_method.must_raise Aviator::Session::AuthenticationError
       end
-      
-      
+
+
       it 'updates the session data of its service objects' do
         session = new_session
         session.authenticate
-        
+
         keystone = session.identity_service
-        
+
         session_data_1 = keystone.default_session_data
-        
+
         session.authenticate
-        
+
         session.identity_service.must_equal keystone
-        
+
         new_token = session.identity_service.default_session_data[:access][:token][:id]
         new_token.wont_equal session_data_1[:access][:token][:id]
         keystone.default_session_data[:access][:token][:id].must_equal new_token
       end
 
     end # describe '#authenticate'
-    
-    
+
+
     describe '#dump' do
-      
+
       it 'serializes the session data for caching' do
         session = new_session
         session.authenticate
-        
+
         str = session.dump
-        
+
         expected = JSON.generate({
-          environment: session.send(:environment),
-          auth_info: session.send(:auth_info)
+          :environment => session.send(:environment),
+          :auth_info => session.send(:auth_info)
         })
 
         str.must_equal expected
       end
-      
+
     end
 
 
     describe '#load' do
-      
+
       it 'returns itself' do
         session = new_session
         session.authenticate
-        
+
         str = session.dump
         session.load(str).must_equal session
       end
 
-      
+
       it 'updates the session data of its service objects' do
         session1 = new_session
         session1.authenticate
@@ -128,103 +133,150 @@ class Aviator::Test
       end
 
     end # describe '#load'
-    
-    
+
+
     describe '::load' do
-      
+
       it 'creates a new instance from the given session dump' do
         session = new_session
         session.authenticate
-        
+
         str      = session.dump
         session  = Aviator::Session.load(str)
-        expected = JSON.parse(str).with_indifferent_access
-        
-        session.dump.must_equal str
+        expected = Hashish.new(JSON.parse(str))
+
         session.authenticated?.must_equal true
-        
-        # This is bad testing practice (testing a private method) but 
+
+        # This is bad testing practice (testing a private method) but
         # I'll go ahead and do it anyway just to be sure.
         session.send(:environment).must_equal expected[:environment]
         session.send(:auth_info).must_equal   expected[:auth_info]
       end
-      
-      
+
+
       it 'uses the loaded auth info for its services' do
         session = new_session
         session.authenticate
-        
-        expected = JSON.parse(session.dump).with_indifferent_access
+
+        expected = Hashish.new(JSON.parse(session.dump))
         session  = Aviator::Session.load(session.dump)
         service  = session.identity_service
-        
+
         service.default_session_data.must_equal expected[:auth_info]
       end
-      
+
     end
-    
-    
+
+
     describe '::new' do
-      
+
+      it 'can accept a hash object as configuration' do
+        config = {
+          :provider => 'openstack',
+          :auth_service => {
+            :name      => 'identity',
+            :host_uri  => 'http://devstack:5000/v2.0',
+            :request   => 'create_token',
+            :validator => 'list_tenants'
+          },
+          :auth_credentials => {
+            :username    => 'myusername',
+            :password    => 'mypassword',
+            :tenant_name => 'myproject'
+          }
+        }
+
+        session = klass.new(:config => config)
+
+        session.send(:environment).must_equal Hashish.new(config)
+
+        auth_service = session.send(:auth_service)
+        auth_service.send(:service).must_equal config[:auth_service][:name]
+      end
+
+
       it 'directs log entries to the given log file' do
         log_file_path.delete if log_file_path.file?
-        
+
         session = new_session
         session.authenticate
 
         log_file_path.file?.must_equal true
       end
-      
+
+
+      it 'raises an error when constructor keys are missing' do
+        the_method = lambda { klass.new }
+        the_method.must_raise Aviator::Session::InitializationError
+
+        error = the_method.call rescue $!
+
+        error.message.wont_be_nil
+      end
+
     end
-    
-    
+
+
     describe '#validate' do
-      
+
       it 'returns true if session is still valid' do
         session = new_session
         session.authenticate
-        
+
         session.validate.must_equal true
       end
-      
-      
+
+
       it 'returns false if session is no longer valid' do
         session = new_session
         session.authenticate
-        
+
         session.send(:auth_info)[:access][:token][:id] = 'invalidtokenid'
-        
+
         session.validate.must_equal false
       end
-      
-      
+
+
       it 'raises an error if called before authenticating' do
         the_method = lambda { new_session.validate }
-        
+
         the_method.must_raise Aviator::Session::NotAuthenticatedError
       end
-      
+
+
+      it 'returns true even when a default token is used' do
+        session = new_session
+        credentials = config.openstack_admin[:auth_credentials]
+
+        session.authenticate do |c|
+          c[:username] = credentials[:username]
+          c[:password] = credentials[:password]
+        end
+
+        session.validate.must_equal true
+      end
+
     end
-    
-    
+
+
     describe '#xxx_service' do
-      
+
       it 'raises a NotAuthenticatedError if called without authenticating first' do
         the_method = lambda { new_session.identity_service }
-        
+
         the_method.must_raise Aviator::Session::NotAuthenticatedError
       end
-      
-      
+
+
       it 'returns an instance of the indicated service' do
         session = new_session
         session.authenticate
-        
+
         session.identity_service.wont_be_nil
       end
-      
+
     end
 
   end # describe 'aviator/core/service'
 
-end # class Aviator::Test
+end # class Aviator::Test

data/test/aviator/openstack/common/v2/public/base_test.rb

@@ -33,8 +33,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-          config_file: Environment.path,
-          environment: 'openstack_admin'
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
         )
         @session.authenticate
       end
@@ -70,12 +70,12 @@ class Aviator::Test
     describe '::base_url' do
 
       it 'must throw a MissingServiceEndpointError when the service\'s endpoint can\'t be found' do
-        default_session_data = JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
+        default_session_data = Hashish.new(JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
           "expires": "2013-09-26T02:21:55Z", "id": "2f6bdec6cd0f49b4a60ede0cd4bf2c0d"},
           "serviceCatalog": [], "user": {"username": "bogus",
           "roles_links": [], "id": "447527294dae4a1788d36beb0db99c00", "roles": [],
           "name": "bogus"}, "metadata": {"is_admin": 0, "roles":
-          []}}}').with_indifferent_access
+          []}}}'))
 
         request = klass.new(default_session_data)
 
@@ -85,17 +85,17 @@ class Aviator::Test
       end
 
 
-      it 'must use the base_url value if provided.' do        
-        default_session_data = JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
+      it 'must use the base_url value if provided.' do
+        default_session_data = Hashish.new(JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
           "expires": "2013-09-26T02:21:55Z", "id": "2f6bdec6cd0f49b4a60ede0cd4bf2c0d"},
           "serviceCatalog": [], "user": {"username": "bogus",
           "roles_links": [], "id": "447527294dae4a1788d36beb0db99c00", "roles": [],
           "name": "bogus"}, "metadata": {"is_admin": 0, "roles":
-          []}}}').with_indifferent_access
+          []}}}'))
 
         base_url = 'http://sample'
 
-        default_session_data.merge!({ base_url: base_url })
+        default_session_data.merge!({ :base_url => base_url })
 
         request = klass.new(default_session_data)
 

data/test/aviator/openstack/compute/v2/admin/confirm_server_resize_test.rb

@@ -29,8 +29,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
 
         @session.authenticate

data/test/aviator/openstack/compute/v2/admin/create_network_test.rb

@@ -32,8 +32,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-          config_file: Environment.path,
-          environment: 'openstack_admin'
+          :config_file => Environment.path,
+          :environment => 'openstack_admin'
         )
         @session.authenticate
       end
@@ -54,22 +54,22 @@ class Aviator::Test
 
     validate_attr :body do
       params = {
-        label:            'mynetwork',
-        bridge:           'dummy-value-for-test',
-        bridge_interface: 'dummy-value-for-test',
-        cidr:             'dummy-value-for-test',
-        cidr_v6:          'dummy-value-for-test',
-        dns1:             'dummy-value-for-test',
-        dns2:             'dummy-value-for-test',
-        gateway:          'dummy-value-for-test',
-        gateway_v6:       'dummy-value-for-test',
-        multi_host:       'dummy-value-for-test',
-        project_id:       'dummy-value-for-test',
-        vlan:             'dummy-value-for-test'
+        :label            => 'mynetwork',
+        :bridge           => 'dummy-value-for-test',
+        :bridge_interface => 'dummy-value-for-test',
+        :cidr             => 'dummy-value-for-test',
+        :cidr_v6          => 'dummy-value-for-test',
+        :dns1             => 'dummy-value-for-test',
+        :dns2             => 'dummy-value-for-test',
+        :gateway          => 'dummy-value-for-test',
+        :gateway_v6       => 'dummy-value-for-test',
+        :multi_host       => 'dummy-value-for-test',
+        :project_id       => 'dummy-value-for-test',
+        :vlan             => 'dummy-value-for-test'
       }
 
       body = {
-        network: params
+        :network => params
       }
 
       request = klass.new(helper.admin_session_data) do |p|

data/test/aviator/openstack/compute/v2/admin/get_host_details_test.rb

@@ -39,8 +39,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/compute/v2/admin/list_hosts_test.rb

@@ -27,8 +27,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/compute/v2/admin/lock_server_test.rb

@@ -28,8 +28,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/compute/v2/admin/migrate_server_test.rb

@@ -28,8 +28,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/compute/v2/admin/reset_server_test.rb

@@ -32,8 +32,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/compute/v2/admin/resize_server_test.rb

@@ -31,8 +31,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
 
         @session.authenticate
@@ -121,7 +121,7 @@ class Aviator::Test
     
     validate_attr :param_aliases do
       aliases = {
-        flavor_ref: :flavorRef
+        :flavor_ref => :flavorRef
       }
       
       klass.param_aliases.must_equal aliases

data/test/aviator/openstack/compute/v2/admin/revert_server_resize_test.rb

@@ -29,8 +29,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
 
         @session.authenticate

data/test/aviator/openstack/compute/v2/admin/unlock_server_test.rb

@@ -28,8 +28,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_admin'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_admin'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/compute/v2/public/change_admin_password_test.rb

@@ -32,8 +32,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end
@@ -95,7 +95,7 @@ class Aviator::Test
     
     validate_attr :param_aliases do
       aliases = {
-        admin_pass: :adminPass
+        :admin_pass => :adminPass
       }
       
       klass.param_aliases.must_equal aliases

data/test/aviator/openstack/compute/v2/public/create_image_test.rb

@@ -32,8 +32,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end

data/test/aviator/openstack/compute/v2/public/create_server_test.rb

@@ -34,8 +34,8 @@ class Aviator::Test
     def session
       unless @session
         @session = Aviator::Session.new(
-                     config_file: Environment.path,
-                     environment: 'openstack_member'
+                     :config_file => Environment.path,
+                     :environment => 'openstack_member'
                    )
         @session.authenticate
       end
@@ -123,11 +123,11 @@ class Aviator::Test
     
     validate_attr :param_aliases do
       aliases = {
-        access_ipv4: :accessIPv4,
-        access_ipv6: :accessIPv6,
-        admin_pass:  :adminPass,
-        image_ref:   :imageRef,
-        flavor_ref:  :flavorRef
+        :access_ipv4 => :accessIPv4,
+        :access_ipv6 => :accessIPv6,
+        :admin_pass  => :adminPass,
+        :image_ref   => :imageRef,
+        :flavor_ref  => :flavorRef
       }
       
       klass.param_aliases.must_equal aliases