aviator 0.0.5 → 0.0.6

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

@@ -17,11 +17,11 @@ class Aviator::Test
                    )
         @session.authenticate
       end
-      
+
       @session
     end
-    
-    
+
+
     def get_session_data
       session.send :auth_info
     end
@@ -40,98 +40,98 @@ class Aviator::Test
     validate_attr :anonymous? do
       klass.anonymous?.must_equal false
     end
-    
-    
+
+
     validate_attr :api_version do
       klass.api_version.must_equal :v2
     end
-    
-    
+
+
     validate_attr :body do
-      klass.body?.must_equal false    
-      
+      klass.body?.must_equal false
+
       request = create_request do |params|
                   params[:id] = 'doesntmatter'
                 end
-                
+
       request.body?.must_equal false
     end
-    
-    
+
+
     validate_attr :endpoint_type do
       klass.endpoint_type.must_equal :public
     end
-    
-    
+
+
     validate_attr :headers do
       headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
-    
+
       request = create_request do |params|
                   params[:id] = 'doesntmatter'
                 end
-    
+
       request.headers.must_equal headers
     end
-    
-    
+
+
     validate_attr :http_method do
       request = create_request do |params|
                   params[:id] = 'doesntmatter'
                 end
-                
+
       request.http_method.must_equal :get
     end
-    
-    
+
+
     validate_attr :optional_params do
       klass.optional_params.must_equal []
     end
-    
-    
+
+
     validate_attr :required_params do
       klass.required_params.must_equal [:id]
     end
-    
-    
+
+
     validate_attr :url do
       service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       server_id    = '52415800-8b69-11e0-9b19-734f000004d2'
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ server_id }"
-                  
+
       request = create_request do |p|
         p[:id] = server_id
       end
-          
+
       request.url.must_equal url
     end
-    
-    
+
+
     validate_response 'a valid server id is provided' do
       server_id = session.compute_service.request(:list_servers).body[:servers].first[:id]
-      
+
       response = session.compute_service.request :get_server do |params|
         params[:id] = server_id
       end
-            
+
       response.status.must_equal 200
       response.body.wont_be_nil
       response.body[:server].wont_be_nil
       response.body[:server][:id].must_equal server_id
       response.headers.wont_be_nil
-    end    
+    end
 
 
     validate_response 'an invalid server id is provided' do
       server_id = 'bogusserveridthatdoesntexist'
-      
+
       response = session.compute_service.request :get_server do |params|
         params[:id] = server_id
       end
-            
+
       response.status.must_equal 404
       response.body.wont_be_nil
       response.headers.wont_be_nil
-    end    
+    end
 
   end
 

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

@@ -108,6 +108,15 @@ class Aviator::Test
     end
     
     
+    validate_attr :param_aliases do
+      aliases = {
+        network_id: :networkID
+      }
+      
+      klass.param_aliases.must_equal aliases
+    end
+        
+    
     validate_response 'a valid server id is provided' do
       server_id = session.compute_service.request(:list_servers).body[:servers].first[:id]
       

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

@@ -17,11 +17,11 @@ class Aviator::Test
                    )
         @session.authenticate
       end
-      
+
       @session
     end
-    
-    
+
+
     def get_session_data
       session.send :auth_info
     end
@@ -40,38 +40,38 @@ class Aviator::Test
     validate_attr :anonymous? do
       klass.anonymous?.must_equal false
     end
-    
-    
+
+
     validate_attr :api_version do
       klass.api_version.must_equal :v2
     end
-    
-    
+
+
     validate_attr :body do
-      klass.body?.must_equal false    
+      klass.body?.must_equal false
       create_request.body?.must_equal false
     end
-    
-    
+
+
     validate_attr :endpoint_type do
       klass.endpoint_type.must_equal :public
     end
-    
-    
+
+
     validate_attr :headers do
       headers = { 'X-Auth-Token' => get_session_data[:access][:token][:id] }
-    
+
       request = create_request(get_session_data)
-    
+
       request.headers.must_equal headers
     end
-    
-    
+
+
     validate_attr :http_method do
       create_request.http_method.must_equal :get
     end
-    
-    
+
+
     validate_attr :optional_params do
       klass.optional_params.must_equal [
         :details,
@@ -81,17 +81,17 @@ class Aviator::Test
         :limit
       ]
     end
-    
-    
+
+
     validate_attr :required_params do
       klass.required_params.must_equal []
     end
-    
-    
+
+
     validate_attr :url do
       service_spec = get_session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/flavors"
-            
+
       params = [
         [ :details, true                              ],
         [ :minDisk, 2                                 ],
@@ -99,61 +99,71 @@ class Aviator::Test
         [ :marker,  '123456'                          ],
         [ :limit,   10                                ]
       ]
-    
+
       url += "/detail" if params.find{|pair| pair[0] == :details && pair[1] == true }
-    
+
       filters = []
-    
+
       params.select{|pair| pair[0]!=:details }.each{ |pair| filters << "#{ pair[0] }=#{ pair[1] }" }
-    
+
       url += "?#{ filters.join('&') }" unless filters.empty?
-      
+
       request = klass.new(get_session_data) do |p|
         params.each { |pair| p[pair[0]] = pair[1] }
       end
-          
+
       request.url.must_equal url
     end
-    
-    
+
+
+    validate_attr :param_aliases do
+      aliases = {
+        min_disk: :minDisk,
+        min_ram:  :minRam
+      }
+
+      klass.param_aliases.must_equal aliases
+    end
+
+
     validate_response 'no parameters are provided' do
       response = session.compute_service.request :list_flavors
-      
+
       response.status.must_equal 200
       response.body.wont_be_nil
       response.headers.wont_be_nil
     end
-    
-        
+
+
     validate_response 'the details filter is provided' do
       response = session.compute_service.request :list_flavors do |params|
         params[:details] = true
       end
-      
+
       response.status.must_equal 200
       response.body.wont_be_nil
       response.body[:flavors].length.wont_equal 0
       response.headers.wont_be_nil
-    end    
+    end
 
 
     validate_response 'the minDisk filter is provided' do
       response = session.compute_service.request :list_flavors do |params|
         params[:details] = true
       end
-      
+
       max_disk_size = response.body[:flavors].max{|a,b| a[:disk] <=> b[:disk] }[:disk]
       total_entries = response.body[:flavors].count{|flv| flv[:disk] == max_disk_size }
-      
+
       response = session.compute_service.request :list_flavors do |params|
         params[:minDisk] = max_disk_size
       end
-      
+
       response.status.must_equal 200
       response.body.wont_be_nil
       response.body[:flavors].length.must_equal total_entries
       response.headers.wont_be_nil
-    end    
+    end
 
   end
 

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

@@ -14,14 +14,14 @@ class Aviator::Test
         provider: 'openstack',
         service:  'identity'
       )
-      
+
       bootstrap = RequestHelper.admin_bootstrap_session_data
-      
+
       response = service.request :create_token, session_data: bootstrap do |params|
         auth_credentials = Environment.openstack_admin[:auth_credentials]
         auth_credentials.each { |key, value| params[key] = auth_credentials[key] }
       end
-      
+
       response.body
     end
 
@@ -39,35 +39,35 @@ class Aviator::Test
     validate_attr :anonymous? do
       klass.anonymous?.must_equal false
     end
-    
-    
+
+
     validate_attr :api_version do
       klass.api_version.must_equal :v2
     end
 
 
     validate_attr :body do
-      klass.body?.must_equal false    
+      klass.body?.must_equal false
       create_request.body?.must_equal false
     end
-    
-    
+
+
     validate_attr :endpoint_type do
       klass.endpoint_type.must_equal :public
     end
-    
+
 
     validate_attr :headers do
       session_data = new_session_data
-      
+
       headers = { 'X-Auth-Token' => session_data[:access][:token][:id] }
 
       request = create_request(session_data)
 
       request.headers.must_equal headers
     end
-    
-    
+
+
     validate_attr :http_method do
       create_request.http_method.must_equal :get
     end
@@ -96,81 +96,90 @@ class Aviator::Test
       session_data = new_session_data
       service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
       url          = "#{ service_spec[:endpoints][0][:publicURL] }/images"
-            
+
       params = [
         [ :details,  true                             ],
         [ :name,    'cirros-0.3.1-x86_64-uec-ramdisk' ],
         [ :status,  'ACTIVE'                          ],
         [ :type,    'application/vnd.openstack.image' ]
       ]
-    
+
       url += "/detail" if params.first[1]
-    
+
       filters = []
-    
+
       params[1, params.length-1].each { |pair| filters << "#{ pair[0] }=#{ pair[1] }" }
-    
+
       url += "?#{ filters.join('&') }" unless filters.empty?
-      
+
       request = klass.new(session_data) do |p|
         params.each { |pair| p[pair[0]] = pair[1] }
       end
-      
-          
+
+
       request.url.must_equal url
     end
-    
-    
+
+
+    validate_attr :param_aliases do
+      aliases = {
+        changes_since: 'changes-since'
+      }
+
+      klass.param_aliases.must_equal aliases
+    end
+
+
     validate_response 'no parameters are provided' do
       service = Aviator::Service.new(
         provider: 'openstack',
         service:  'compute',
         default_session_data: new_session_data
       )
-      
+
       response = service.request :list_images
-      
+
       response.status.must_equal 200
       response.body.wont_be_nil
       response.headers.wont_be_nil
     end
-    
-    
+
+
     validate_response 'parameters are invalid' do
       service = Aviator::Service.new(
         provider: 'openstack',
         service:  'compute',
         default_session_data: new_session_data
       )
-      
+
       response = service.request :list_images do |params|
         params[:name] = "nonexistentimagenameherpderp"
       end
-      
+
       response.status.must_equal 200
       response.body.wont_be_nil
       response.body[:images].length.must_equal 0
       response.headers.wont_be_nil
     end
-    
-    
+
+
     validate_response 'parameters are valid' do
       service = Aviator::Service.new(
         provider: 'openstack',
         service:  'compute',
         default_session_data: new_session_data
       )
-      
+
       response = service.request :list_images do |params|
         params[:details] = true
         params[:name]    = "cirros-0.3.1-x86_64-uec"
       end
-      
+
       response.status.must_equal 200
       response.body.wont_be_nil
       response.body[:images].length.must_equal 1
       response.headers.wont_be_nil
-    end    
+    end
 
   end
 

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

@@ -0,0 +1,100 @@
+require 'test_helper'
+
+class Aviator::Test
+
+  describe 'aviator/openstack/compute/v2/public/list_networks' do
+
+    def create_request(session_data = get_session_data, &block)
+      klass.new(session_data, &block)
+    end
+
+
+    def get_session_data
+      session.send :auth_info
+    end
+
+
+    def helper
+      Aviator::Test::RequestHelper
+    end
+
+
+    def klass
+      @klass ||= helper.load_request('openstack', 'compute', 'v2', 'public', 'list_networks.rb')
+    end
+
+
+    def session
+      unless @session
+        @session = Aviator::Session.new(
+          config_file: Environment.path,
+          environment: 'openstack_member'
+        )
+        @session.authenticate
+      end
+
+      @session
+    end
+
+
+    validate_attr :anonymous? do
+      klass.anonymous?.must_equal false
+    end
+
+
+    validate_attr :api_version do
+      klass.api_version.must_equal :v2
+    end
+
+
+    validate_attr :body do
+      klass.body?.must_equal false
+      create_request.body?.must_equal false
+    end
+
+
+    validate_attr :endpoint_type do
+      klass.endpoint_type.must_equal :public
+    end
+
+
+    validate_attr :headers do
+      session_data = get_session_data
+
+      headers = { 'X-Auth-Token' => session_data[:access][:token][:id] }
+
+      request = create_request(session_data)
+
+      request.headers.must_equal headers
+    end
+
+
+    validate_attr :http_method do
+      create_request.http_method.must_equal :get
+    end
+
+
+    validate_attr :url do
+      session_data = get_session_data
+      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
+      url          = "#{ service_spec[:endpoints][0][:publicURL] }/os-networks"
+      request      = klass.new(session_data)
+
+      request.url.must_equal url
+    end
+
+
+    validate_response 'no parameters are provided' do
+      service = session.compute_service
+
+      response = service.request :list_networks
+
+      response.status.must_equal 200
+      response.body.wont_be_nil
+      response.body[:networks].length.wont_equal 0
+      response.headers.wont_be_nil
+    end
+
+  end
+
+end

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

@@ -136,6 +136,15 @@ class Aviator::Test
     end
 
 
+    validate_attr :param_aliases do
+      aliases = {
+        changes_since: 'changes-since'
+      }
+
+      klass.param_aliases.must_equal aliases
+    end
+
+
     validate_response 'no parameters are provided' do
       service = Aviator::Service.new(
         provider: 'openstack',
@@ -188,7 +197,6 @@ class Aviator::Test
       response.headers.wont_be_nil
     end
 
-
     validate_response 'the all_tenants parameter is provided' do
       current_tenant = admin_session.send(:auth_info)[:access][:token][:tenant]