fog 1.31.0 → 1.32.0

data/lib/fog/openstack/requests/compute/list_volumes_detail.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_volumes_detail(options = {})
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'os-volumes/detail',
+            :query    => options
+          )
+        end
+      end
+
+      class Mock
+        def list_volumes_detail(options = {})
+          Excon::Response.new(
+            :body   => { 'volumes' => self.data[:volumes].values },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/compute/remove_aggregate_host.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def remove_aggregate_host(uuid, host_uuid)
+          data = {'remove_host' => {'host' => host_uuid}}
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'POST',
+            :path    => "os-aggregates/#{uuid}/action"
+          )
+        end
+      end
+
+      class Mock
+        def remove_aggregate_host(uuid, host_uuid)
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

data/lib/fog/openstack/requests/compute/update_aggregate.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def update_aggregate(uuid, options = {})
+          vanilla_options = ['name', 'availability_zone']
+
+          data = {'aggregate' => {}}
+          vanilla_options.select{|o| options[o]}.each do |key|
+            data['aggregate'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'PUT',
+            :path    => "os-aggregates/#{uuid}"
+          )
+        end
+      end
+
+      class Mock
+        def update_aggregate(uuid, options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response.body = {'aggregate' => self.data[:aggregates].first}
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

data/lib/fog/openstack/requests/compute/update_aggregate_metadata.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def update_aggregate_metadata(uuid, metadata = {})
+          data = {'set_metadata' => {'metadata' => metadata}}
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => [200],
+            :method  => 'POST',
+            :path    => "os-aggregates/#{uuid}/action"
+          )
+        end
+      end
+
+      class Mock
+        def update_aggregate_metadata(uuid, metadata = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

data/lib/fog/openstack/requests/identity_v2/list_ec2_credentials.rb

@@ -7,8 +7,8 @@ module Fog
           # List EC2 credentials for a user.  Requires administrator
           # credentials.
           #
-          # ==== Parameters
-          # * user_id<~String>: The id of the user to retrieve the credential
+          # ==== Parameters hash
+          # * :user_id<~String>: The id of the user to retrieve the credential
           #   for
           #
           # ==== Returns
@@ -20,17 +20,33 @@ module Fog
           #       * 'user_id'<~String>: The user id
           #       * 'tenant_id'<~String>: The tenant id
 
-          def list_ec2_credentials(user_id)
+          def list_ec2_credentials(options = {})
+            if options.is_a?(Hash)
+              user_id = options.delete(:user_id)
+              query = options
+            else
+              Fog::Logger.deprecation('Calling OpenStack[:identity].list_ec2_credentials(user_id) is deprecated, use .list_ec2_credentials(:user_id => value)')
+              user_id = options
+              query = {}
+            end
+
             request(
-                :expects => [200, 202],
-                :method => 'GET',
-                :path => "users/#{user_id}/credentials/OS-EC2"
+              :expects => [200, 202],
+              :method  => 'GET',
+              :path    => "users/#{user_id}/credentials/OS-EC2",
+              :query   => query
             )
           end
         end
 
         class Mock
-          def list_ec2_credentials(user_id)
+          def list_ec2_credentials(options = {})
+            if options.is_a?(Hash)
+              user_id = options.delete(:user_id)
+            else
+              user_id = options
+            end
+
             ec2_credentials = self.data[:ec2_credentials][user_id].values
 
             response = Excon::Response.new

data/lib/fog/openstack/requests/identity_v2/list_roles.rb

@@ -3,17 +3,18 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def list_roles
+          def list_roles(options = {})
             request(
                 :expects => 200,
-                :method => 'GET',
-                :path => '/OS-KSADM/roles'
+                :method  => 'GET',
+                :path    => '/OS-KSADM/roles',
+                :query   => options
             )
           end
         end
 
         class Mock
-          def list_roles
+          def list_roles(options = {})
             if self.data[:roles].empty?
               ['admin', 'Member'].each do |name|
                 id = Fog::Mock.random_hex(32)

data/lib/fog/openstack/requests/identity_v2/list_tenants.rb

@@ -3,22 +3,28 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def list_tenants(limit = nil, marker = nil)
-            params = Hash.new
-            params['limit'] = limit if limit
-            params['marker'] = marker if marker
+          def list_tenants(options = nil, marker = nil)
+            if options.is_a?(Hash)
+              params = options
+            else
+              Fog::Logger.deprecation('Calling OpenStack[:identity].list_tenants(limit, marker) is deprecated, use'\
+                                      ' .list_ec2_credentials(:limit => value, :marker => value)')
+              params = {}
+              params['limit'] = options if options
+              params['marker'] = marker if marker
+            end
 
             request(
                 :expects => [200, 204],
-                :method => 'GET',
-                :path => "tenants",
-                :query => params
+                :method  => 'GET',
+                :path    => "tenants",
+                :query   => params
             )
           end
         end # class Real
 
         class Mock
-          def list_tenants
+          def list_tenants(options = nil, marker = nil)
             Excon::Response.new(
                 :body => {
                     'tenants_links' => [],

data/lib/fog/openstack/requests/identity_v2/list_users.rb

@@ -3,18 +3,30 @@ module Fog
     class OpenStack
       class V2
         class Real
-          def list_users(tenant_id = nil)
+          def list_users(options = {})
+            if options.is_a?(Hash)
+              tenant_id = options.delete(:tenant_id)
+              query = options
+            else
+              Fog::Logger.deprecation('Calling OpenStack[:identity].list_users(tenant_id) is deprecated, use .list_users(:tenant_id => value)')
+              tenant_id = options
+              query = {}
+            end
+
             path = tenant_id ? "tenants/#{tenant_id}/users" : 'users'
             request(
                 :expects => [200, 204],
-                :method => 'GET',
-                :path => path
+                :method  => 'GET',
+                :path    => path,
+                :query   => query
             )
           end
         end # class Real
 
         class Mock
-          def list_users(tenant_id = nil)
+          def list_users(options = {})
+            tenant_id = options[:tenant_id]
+
             users = self.data[:users].values
 
             if tenant_id

data/lib/fog/openstack/requests/identity_v3/auth_domains.rb

@@ -2,18 +2,13 @@ module Fog
   module Identity
     class OpenStack
       class V3
-
         class Real
           def auth_domains(options={})
-            params = Hash.new
-            params['page'] = options.fetch(:page, 1)
-            params['per_page'] = options.fetch(:per_page, 30)
-
             request(
                 :expects => [200],
                 :method => 'GET',
                 :path => "auth/domains",
-                :query => params
+                :query => options
             )
           end
         end
@@ -26,4 +21,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/requests/identity_v3/auth_projects.rb

@@ -3,18 +3,13 @@ module Fog
     class OpenStack
       class V3
         class Real
-          def auth_projects(options={})
-            params = Hash.new
-            params['page'] = options.fetch(:page, 1)
-            params['per_page'] = options.fetch(:per_page, 30)
-
+          def auth_projects(options = {})
             request(
-                :expects => [200],
-                :method => 'GET',
-                :path => "auth/projects",
-                :query => params
+              :expects => [200],
+              :method  => 'GET',
+              :path    => "auth/projects",
+              :query   => options
             )
-
           end
         end
 
@@ -26,4 +21,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/requests/identity_v3/list_domains.rb

@@ -3,29 +3,22 @@ module Fog
     class OpenStack
       class V3
         class Real
-          def list_domains(options={})
-            params = Hash.new
-            params['name'] = options[:name] if options[:name]
-            params['enabled'] = options[:enabled] if options[:enabled]
-
-            params['page'] = options.fetch(:page, 1)
-            params['per_page'] = options.fetch(:per_page, 30)
-
+          def list_domains(options = {})
             request(
-                :expects => [200],
-                :method => 'GET',
-                :path => "domains",
-                :query => params
+              :expects => [200],
+              :method  => 'GET',
+              :path    => "domains",
+              :query   => options
             )
           end
         end
 
         class Mock
-          def list_domains
+          def list_domains(options = {})
 
           end
         end
       end
     end
   end
-end
+end

data/lib/fog/openstack/requests/identity_v3/list_endpoints.rb

@@ -3,29 +3,22 @@ module Fog
     class OpenStack
       class V3
         class Real
-          def list_endpoints(options={})
-            params = Hash.new
-            params['service_id'] = options[:service_id] if options[:service_id]
-            params['interface'] = options[:interface] if options[:interface]
-
-            params['page'] = options.fetch(:page, 1)
-            params['per_page'] = options.fetch(:per_page, 30)
-
+          def list_endpoints(options = {})
             request(
-                :expects => [200],
-                :method => 'GET',
-                :path => "endpoints",
-                :query => params
+              :expects => [200],
+              :method  => 'GET',
+              :path    => "endpoints",
+              :query   => options
             )
           end
         end
 
         class Mock
-          def list_endpoints
+          def list_endpoints(options={})
 
           end
         end
       end
     end
   end
-end
+end

data/lib/fog/openstack/requests/identity_v3/list_group_users.rb

@@ -4,19 +4,11 @@ module Fog
       class V3
         class Real
           def list_group_users(id, options={})
-            params = Hash.new
-            params['name'] = options[:name] if options[:name]
-            params['domain_id'] = options[:domain_id] if options[:domain_id]
-            params['description'] = options[:description] if options[:description]
-
-            params['page'] = options.fetch(:page, 1)
-            params['per_page'] = options.fetch(:per_page, 30)
-
             request(
-                :expects => [200],
-                :method => 'GET',
-                :path => "groups/#{id}/users",
-                :query => params
+              :expects => [200],
+              :method  => 'GET',
+              :path    => "groups/#{id}/users",
+              :query   => options
             )
           end
         end
@@ -29,4 +21,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/requests/identity_v3/list_groups.rb

@@ -3,40 +3,30 @@ module Fog
     class OpenStack
       class V3
         class Real
-          def list_groups(options={})
-            params = Hash.new
-            params['user_id'] = options[:user_id] if options[:user_id]
-            params['domain_id'] = options[:domain_id] if options[:domain_id]
-            params['name'] = options[:name] if options[:name]
-            params['enabled'] = options[:enabled] if options[:enabled]
+          def list_groups(options = {})
+            user_id = options.delete('user_id') || options.delete(:user_id)
 
-            params['page'] = options.fetch(:page, 1)
-            params['per_page'] = options.fetch(:per_page, 30)
-
-            if params['user_id'] then
-              request(
-                  :expects => [200],
-                  :method => 'GET',
-                  :path => "users/#{params['user_id']}groups",
-                  :query => params
-              )
+            if user_id
+              path = "users/#{user_id}groups"
             else
-              request(
-                  :expects => [200],
-                  :method => 'GET',
-                  :path => "groups",
-                  :query => params
-              )
+              path = "groups"
             end
+
+            request(
+              :expects => [200],
+              :method  => 'GET',
+              :path    => path,
+              :query   => options
+            )
           end
         end
 
         class Mock
-          def list_groups
+          def list_groups(options = {})
 
           end
         end
       end
     end
   end
-end
+end