aviator 0.0.5 → 0.0.6

data/lib/aviator/openstack/compute/v2/public/rebuild_server.rb

@@ -1,20 +1,17 @@
 module Aviator
 
-  define_request :rebuild_server do
+  define_request :rebuild_server, inherit: [:openstack, :common, :v2, :public, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :compute
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+    meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/Rebuild_Server-d1e3538.html'
 
-    param :accessIPv4,  required: false
-    param :accessIPv6,  required: false
-    param :adminPass,   required: true
+    param :accessIPv4,  required: false, alias: :access_ipv4
+    param :accessIPv6,  required: false, alias: :access_ipv6
+    param :adminPass,   required: true,  alias: :admin_pass
     param :id,          required: true
-    param :imageRef,    required: true
+    param :imageRef,    required: true,  alias: :image_ref
     param :metadata,    required: false
     param :name,        required: true
     param :personality, required: false
@@ -38,13 +35,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -54,8 +45,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-      "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ params[:id] }/action"
+      "#{ base_url }/servers/#{ params[:id] }/action"
     end
 
   end

data/lib/aviator/openstack/compute/v2/public/resume_server.rb

@@ -0,0 +1,34 @@
+module Aviator
+
+  define_request :resume_server, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
+
+    link 'documentation',
+         'http://docs.openstack.org/api/openstack-compute/2/content/POST_resume_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
+
+    param :id,   required: true
+
+
+    def body
+      { resume: nil }
+    end
+
+
+    def headers
+      super
+    end
+
+
+    def http_method
+      :post
+    end
+
+
+    def url
+      "#{ base_url }/servers/#{ params[:id] }/action"
+    end
+
+  end
+
+end

data/lib/aviator/openstack/compute/v2/public/root.rb

@@ -1,20 +1,11 @@
 module Aviator
 
-  define_request :root do
+  define_request :root, inherit: [:openstack, :common, :v2, :public, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :compute
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+    meta :service, :compute
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -24,8 +15,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-      uri = URI(service_spec[:endpoints][0][:publicURL])
+      uri = URI(base_url)
       "#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v2/"
     end
 

data/lib/aviator/openstack/compute/v2/public/suspend_server.rb

@@ -0,0 +1,34 @@
+module Aviator
+
+  define_request :suspend_server, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
+
+    link 'documentation',
+         'http://docs.openstack.org/api/openstack-compute/2/content/POST_suspend_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
+
+    param :id,   required: true
+
+
+    def body
+      { suspend: nil }
+    end
+
+
+    def headers
+      super
+    end
+
+
+    def http_method
+      :post
+    end
+
+
+    def url
+      "#{ base_url }/servers/#{ params[:id] }/action"
+    end
+
+  end
+
+end

data/lib/aviator/openstack/compute/v2/public/unpause_server.rb

@@ -0,0 +1,34 @@
+module Aviator
+
+  define_request :unpause_server, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
+
+    link 'documentation',
+         'http://docs.openstack.org/api/openstack-compute/2/content/POST_unpause_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
+
+    param :id,   required: true
+
+
+    def body
+      { unpause: nil }
+    end
+
+
+    def headers
+      super
+    end
+
+
+    def http_method
+      :post
+    end
+
+
+    def url
+      "#{ base_url }/servers/#{ params[:id] }/action"
+    end
+
+  end
+
+end

data/lib/aviator/openstack/compute/v2/public/update_server.rb

@@ -1,17 +1,14 @@
 module Aviator
 
-  define_request :update_server do
+  define_request :update_server, inherit: [:openstack, :common, :v2, :public, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :compute
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+    meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/ServerUpdate.html'
 
-    param :accessIPv4, required: false
-    param :accessIPv6, required: false
+    param :accessIPv4, required: false, alias: :access_ipv4
+    param :accessIPv6, required: false, alias: :access_ipv6
     param :id,         required: true
     param :name,       required: false
 
@@ -30,13 +27,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -46,8 +37,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-      "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ params[:id] }"
+      "#{ base_url }/servers/#{ params[:id] }"
     end
 
   end

data/lib/aviator/openstack/identity/v2/admin/add_role_to_user_on_tenant.rb

@@ -1,12 +1,8 @@
 module Aviator
 
-  define_request :add_role_to_user_on_tenant do
-
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :admin
+  define_request :add_role_to_user_on_tenant, inherit: [:openstack, :common, :v2, :admin, :base] do
 
+    meta :service, :identity
 
     link 'documentation',
       'http://docs.openstack.org/api/openstack-identity-service/2.0/content/PUT_addRolesToUserOnTenant_v2.0_tenants__tenantId__users__userId__roles_OS-KSADM__roleId__.html'
@@ -18,13 +14,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -34,11 +24,8 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find { |s| s[:type] == service.to_s }
-      "#{ service_spec[:endpoints][0][:adminURL] }" \
-      "/tenants/#{ params[:tenant_id] }" \
-      "/users/#{ params[:user_id] }" \
-      "/roles/OS-KSADM/#{ params[:role_id] }"
+      p = params
+      "#{ base_url }/tenants/#{ p[:tenant_id] }/users/#{ p[:user_id] }/roles/OS-KSADM/#{ p[:role_id] }"
     end
 
   end

data/lib/aviator/openstack/identity/v2/admin/create_tenant.rb

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :create_tenant do
+  define_request :create_tenant, inherit: [:openstack, :common, :v2, :admin, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :admin
+    meta :service, :identity
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-identity-service/2.0/content/'
@@ -28,13 +25,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -44,8 +35,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
-      "#{ service_spec[:endpoints][0][:adminURL] }/tenants"
+      "#{ base_url }/tenants"
     end
 
   end

data/lib/aviator/openstack/identity/v2/admin/create_user.rb

@@ -23,7 +23,7 @@ module Aviator
 
     param :email,     required: false
     param :enabled,   required: false
-    param :tenantId,  required: false
+    param :tenantId,  required: false, alias: :tenant_id
 
 
     def body

data/lib/aviator/openstack/identity/v2/admin/delete_role_from_user_on_tenant.rb

@@ -1,15 +1,12 @@
 module Aviator
 
-  define_request :delete_role_from_user_on_tenant do
+  define_request :delete_role_from_user_on_tenant, inherit: [:openstack, :common, :v2, :admin, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :admin
+    meta :service, :identity
 
 
     link 'documentation',
-      'http://docs.openstack.org/api/openstack-identity-service/2.0/content/DELETE_deleteRoleFromUserOnTenant_v2.0_tenants__tenantId__users__userId__roles_OS-KSADM__roleId__.html'
+         'http://docs.openstack.org/api/openstack-identity-service/2.0/content/DELETE_deleteRoleFromUserOnTenant_v2.0_tenants__tenantId__users__userId__roles_OS-KSADM__roleId__.html'
 
 
     param :tenant_id, required: true
@@ -18,13 +15,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -34,11 +25,8 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find { |s| s[:type] == service.to_s }
-      s  = "#{ service_spec[:endpoints][0][:adminURL] }/tenants/#{ params[:tenant_id] }"
-      s += "/users/#{ params[:user_id] }"
-      s += "/roles/OS-KSADM/#{ params[:role_id] }"
-      s
+      p = params
+      "#{ base_url }/tenants/#{ p[:tenant_id] }/users/#{ p[:user_id] }/roles/OS-KSADM/#{ p[:role_id] }"
     end
 
   end

data/lib/aviator/openstack/identity/v2/admin/delete_tenant.rb

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :delete_tenant do
+  define_request :delete_tenant, inherit: [:openstack, :common, :v2, :admin, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :admin
+    meta :service, :identity
 
     link 'documentation',
       'http://docs.openstack.org/api/openstack-identity-service/2.0/content/DELETE_deleteTenant_v2.0_tenants__tenantId__.html'
@@ -14,13 +11,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -30,9 +21,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-
-      "#{ service_spec[:endpoints][0][:adminURL] }/tenants/#{ params[:id]}"
+      "#{ base_url }/tenants/#{ params[:id]}"
     end
 
   end

data/lib/aviator/openstack/identity/v2/admin/list_tenants.rb

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :list_tenants do
+  define_request :list_tenants, inherit: [:openstack, :common, :v2, :admin, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :admin
+    meta :service, :identity
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-identity-service/2.0/content/GET_listTenants_v2.0_tenants_Tenant_Operations.html'
@@ -19,13 +16,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -35,18 +26,8 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
-      str = "#{ service_spec[:endpoints][0][:adminURL] }/tenants"
-
-      filters = []
-
-      (optional_params + required_params).each do |param_name|
-        filters << "#{ param_name }=#{ params[param_name] }" if params[param_name]
-      end
-
-      str += "?#{ filters.join('&') }" unless filters.empty?
-
-      str
+      str  = "#{ base_url }/tenants"
+      str += params_to_querystring(optional_params + required_params)
     end
 
   end

data/lib/aviator/openstack/identity/v2/admin/update_tenant.rb

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :update_tenant do
+  define_request :update_tenant, inherit: [:openstack, :common, :v2, :admin, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :admin
+    meta :service, :identity
 
 
     link 'documentation',
@@ -32,13 +29,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -48,8 +39,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find { |s| s[:type] == service.to_s }
-      "#{ service_spec[:endpoints][0][:adminURL] }/tenants/#{ params[:id] }"
+      "#{ base_url }/tenants/#{ params[:id] }"
     end
 
   end

data/lib/aviator/openstack/identity/v2/admin/update_user.rb

@@ -19,7 +19,7 @@ module Aviator
     param :password,  required: false
     param :email,     required: false
     param :enabled,   required: false
-    param :tenantId,  required: false
+    param :tenantId,  required: false, alias: :tenant_id
 
 
     def body

data/lib/aviator/openstack/identity/v2/public/create_token.rb

@@ -1,12 +1,9 @@
 module Aviator
 
-  define_request :create_token do
+  define_request :create_token, inherit: [:openstack, :common, :v2, :public, :base] do
 
-    meta :anonymous,     true
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+    meta :anonymous, true
+    meta :service,   :identity
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-identity-service/2.0/content/POST_authenticate_v2.0_tokens_.html'
@@ -17,9 +14,9 @@ module Aviator
 
     param :username,   required: false
     param :password,   required: false
-    param :tokenId,    required: false
-    param :tenantName, required: false
-    param :tenantId,   required: false
+    param :tokenId,    required: false, alias: :token_id
+    param :tenantName, required: false, alias: :tenant_name
+    param :tenantId,   required: false, alias: :tenant_id
 
 
     def body
@@ -58,8 +55,6 @@ module Aviator
       url  = session_data[:auth_service][:host_uri]
       url += '/v2.0' if (URI(url).path =~ /^\/?\w+/).nil?
       url += "/tokens"
-
-      url
     end
 
   end

data/lib/aviator/openstack/identity/v2/public/list_tenants.rb

@@ -1,11 +1,8 @@
 module Aviator
   
-  define_request :list_tenants do
+  define_request :list_tenants, inherit: [:openstack, :common, :v2, :public, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+    meta :service, :identity
   
     link 'documentation',
          'http://docs.openstack.org/api/openstack-identity-service/2.0/content/GET_listTenants_v2.0_tokens_tenants_.html'
@@ -19,29 +16,13 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'identity' }
-      str = "#{ service_spec[:endpoints][0][:publicURL] }/tenants"
-    
-      filters = []
-    
-      (optional_params + required_params).each do |param_name|
-        filters << "#{ param_name }=#{ params[param_name] }" if params[param_name]
-      end
-    
-      str += "?#{ filters.join('&') }" unless filters.empty?
-    
-      str
+      str = "#{ base_url }/tenants"
+      str += params_to_querystring(optional_params + required_params)
     end
 
   
     def headers
-      h = {}
-    
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
   
   

data/lib/aviator/openstack/identity/v2/public/root.rb

@@ -1,20 +1,12 @@
 module Aviator
 
-  define_request :root do
+  define_request :root, inherit: [:openstack, :common, :v2, :public, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :identity
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+    meta :service, :identity
 
-    def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
 
-      h
+    def headers
+      super
     end
 
 
@@ -24,8 +16,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-      uri = URI(service_spec[:endpoints][0][:publicURL])
+      uri = URI(base_url)
       "#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v2.0/"
     end
 

data/lib/aviator/openstack/image/v1/public/root.rb

@@ -1,20 +1,12 @@
 module Aviator
 
-  define_request :root do
+  define_request :root, inherit: [:openstack, :common, :v2, :public, :base] do
 
-    meta :provider,      :openstack
-    meta :service,       :image
-    meta :api_version,   :v1
-    meta :endpoint_type, :public
+    meta :service,     :image
+    meta :api_version, :v1
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -24,8 +16,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-      uri = URI(service_spec[:endpoints][0][:publicURL])
+      uri = URI(base_url)
       "#{ uri.scheme }://#{ uri.host }:#{ uri.port.to_s }/v1/"
     end