aviator 0.0.5 → 0.0.6

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

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :create_image do
+  define_request :create_image, 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/Create_Image-d1e4655.html'
@@ -31,13 +28,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -47,8 +38,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/create_server.rb

@@ -1,20 +1,17 @@
 module Aviator
 
-  define_request :create_server do
+  define_request :create_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/CreateServers.html'
 
-    param :accessIPv4,  required: false
-    param :accessIPv6,  required: false
-    param :adminPass,   required: false
-    param :imageRef,    required: true
-    param :flavorRef,   required: true
+    param :accessIPv4,  required: false, alias: :access_ipv4
+    param :accessIPv6,  required: false, alias: :access_ipv6
+    param :adminPass,   required: false, alias: :admin_pass
+    param :imageRef,    required: true,  alias: :image_ref
+    param :flavorRef,   required: true,  alias: :flavor_ref
     param :metadata,    required: false
     param :name,        required: true
     param :networks,    required: false
@@ -39,13 +36,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -55,8 +46,7 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-      "#{ service_spec[:endpoints][0][:publicURL] }/servers"
+      "#{ base_url }/servers"
     end
 
   end

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

@@ -1,11 +1,8 @@
 module Aviator
   
-  define_request :delete_image do
+  define_request :delete_image, 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/Delete_Image-d1e4957.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][:publicURL] }/images/#{ params[:id]}"
+      "#{ base_url }/images/#{ params[:id]}"
     end
 
   end

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

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :delete_server do
+  define_request :delete_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/Delete_Server-d1e2883.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,8 +21,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/compute/v2/public/get_flavor_details.rb

@@ -0,0 +1,29 @@
+module Aviator
+
+  define_request :get_flavor_details, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
+
+    link 'documentation',
+         'http://docs.openstack.org/api/openstack-compute/2/content/Get_Flavor_Details-d1e4317.html'
+
+    param :id, required: true
+
+
+    def headers
+      super
+    end
+
+
+    def http_method
+      :get
+    end
+
+
+    def url
+      "#{ base_url }/flavors/#{ params[:id] }"
+    end
+
+  end
+
+end

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

@@ -1,11 +1,8 @@
 module Aviator
   
-  define_request :get_image_details do
+  define_request :get_image_details, 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/Get_Image_Details-d1e4848.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][:publicURL] }/images/#{ params[:id]}"
+      "#{ base_url }/images/#{ params[:id]}"
     end
 
   end

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

@@ -0,0 +1,30 @@
+module Aviator
+
+  define_request :get_network_details, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
+
+    link 'documentation',
+         'http://api.openstack.org/api-ref-compute.html#ext-os-networks'
+
+
+    param :id, required: true
+
+
+    def headers
+      super
+    end
+
+
+    def http_method
+      :get
+    end
+
+
+    def url
+      "#{ base_url }/os-networks/#{ params[:id] }"
+    end
+
+  end
+
+end

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

@@ -1,11 +1,8 @@
 module Aviator
-  
-  define_request :get_server do
 
-    meta :provider,      :openstack
-    meta :service,       :compute
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+  define_request :get_server, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/Get_Server_Details-d1e2623.html'
@@ -13,25 +10,17 @@ module Aviator
     param :id, required: true
 
     def headers
-      h = {}
-  
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-  
-      h
+      super
     end
-  
-  
+
+
     def http_method
       :get
     end
-  
-  
-    def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
 
-      "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ params[:id] }"
+
+    def url
+      "#{ base_url }/servers/#{ params[:id] }"
     end
 
   end

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

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :list_addresses do
+  define_request :list_addresses, 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/List_Addresses-d1e3014.html'
@@ -15,17 +12,11 @@ module Aviator
 
 
     param :id,        required: true
-    param :networkID, required: false
+    param :networkID, required: false, alias: :network_id
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -35,11 +26,8 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-
-      url = "#{ service_spec[:endpoints][0][:publicURL] }/servers/#{ params[:id] }/ips"
+      url  = "#{ base_url }/servers/#{ params[:id] }/ips"
       url += "/#{ params[:networkID] }" if params[:networkID]
-
       url
     end
 

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

@@ -1,30 +1,21 @@
 module Aviator
-  
-  define_request :list_flavors do
 
-    meta :provider,      :openstack
-    meta :service,       :compute
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+  define_request :list_flavors, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/List_Flavors-d1e4188.html'
 
     param :details, required: false
-    param :minDisk, required: false
-    param :minRam,  required: false
+    param :minDisk, required: false, alias: :min_disk
+    param :minRam,  required: false, alias: :min_ram
     param :marker,  required: false
     param :limit,   required: false
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -34,20 +25,9 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
-
-      str  = "#{ service_spec[:endpoints][0][:publicURL] }/flavors"
+      str  = "#{ base_url }/flavors"
       str += "/detail" if params[:details]
-      
-      filters = []
-      
-      (optional_params + required_params - [:details]).each do |param_name|
-        filters << "#{ param_name }=#{ params[param_name] }" if params[param_name]
-      end
-      
-      str += "?#{ filters.join('&') }" unless filters.empty?
-      
-      str
+      str += params_to_querystring(optional_params + required_params - [:details])
     end
 
   end

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

@@ -1,11 +1,8 @@
 module Aviator
   
-  define_request :list_images do
+  define_request :list_images, 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/List_Images-d1e4435.html'
@@ -14,20 +11,14 @@ module Aviator
     param :server,         required: false
     param :name,           required: false
     param :status,         required: false
-    param 'changes-since', required: false
+    param 'changes-since', required: false, alias: :changes_since
     param :marker,         required: false
     param :limit,          required: false
     param :type,           required: false
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -37,20 +28,9 @@ module Aviator
 
 
     def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == 'compute' }
-
-      str  = "#{ service_spec[:endpoints][0][:publicURL] }/images"
+      str  = "#{ base_url }/images"
       str += "/detail" if params[:details]
-
-      filters = []
-
-      (optional_params + required_params - [:details]).each do |param_name|
-        filters << "#{ param_name }=#{ params[param_name] }" if params[param_name]
-      end
-
-      str += "?#{ filters.join('&') }" unless filters.empty?
-
-      str
+      str += params_to_querystring(optional_params + required_params - [:details])
     end
 
   end

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

@@ -0,0 +1,27 @@
+module Aviator
+
+  define_request :list_networks, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
+
+    link 'documentation',
+         'http://api.openstack.org/api-ref-compute.html#ext-os-networks'
+
+
+    def headers
+      super
+    end
+
+
+    def http_method
+      :get
+    end
+
+
+    def url
+      "#{ base_url }/os-networks"
+    end
+
+  end
+
+end

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

@@ -1,11 +1,8 @@
 module Aviator
-  
-  define_request :list_servers do
 
-    meta :provider,      :openstack
-    meta :service,       :compute
-    meta :api_version,   :v2
-    meta :endpoint_type, :public
+  define_request :list_servers, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
 
     link 'documentation',
          'http://docs.openstack.org/api/openstack-compute/2/content/List_Servers-d1e2078.html'
@@ -27,40 +24,32 @@ module Aviator
     param :marker,         required: false
     param :server,         required: false
     param :status,         required: false
-    param 'changes-since', required: false
+    param 'changes-since', required: false, alias: :changes_since
 
 
     def headers
-      h = {}
-  
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-  
-      h
+      super
     end
-  
-  
+
+
     def http_method
       :get
     end
-  
-  
-    def url
-      service_spec = session_data[:access][:serviceCatalog].find{|s| s[:type] == service.to_s }
 
-      str  = "#{ service_spec[:endpoints][0][:publicURL] }/servers"
+
+    def url
+      str  = "#{ base_url }/servers"
       str += "/detail" if params[:details]
-    
+
       filters = []
-    
+
       (optional_params + required_params - [:details]).each do |param_name|
         value = param_name == :all_tenants && params[param_name] ? 1 : params[param_name] 
         filters << "#{ param_name }=#{ value }" if value
       end
-    
+
       str += "?#{ filters.join('&') }" unless filters.empty?
-    
+
       str
     end
 

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

@@ -0,0 +1,34 @@
+module Aviator
+
+  define_request :pause_server, inherit: [:openstack, :common, :v2, :public, :base] do
+
+    meta :service, :compute
+
+    link 'documentation',
+         'http://docs.openstack.org/api/openstack-compute/2/content/POST_pause_v2__tenant_id__servers__server_id__action_ext-os-admin-actions.html'
+
+    param :id,   required: true
+
+
+    def body
+      { pause: 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/reboot_server.rb

@@ -1,11 +1,8 @@
 module Aviator
 
-  define_request :reboot_server do
+  define_request :reboot_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/Reboot_Server-d1e3371.html'
@@ -26,13 +23,7 @@ module Aviator
 
 
     def headers
-      h = {}
-
-      unless self.anonymous?
-        h['X-Auth-Token'] = session_data[:access][:token][:id]
-      end
-
-      h
+      super
     end
 
 
@@ -42,8 +33,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