fog 1.31.0 → 1.32.0

data/lib/fog/openstack/models/identity_v2/ec2_credentials.rb

@@ -10,14 +10,17 @@ module Fog
 
           attribute :user
 
-          def all
+          def all(options = {})
             user_id = user ? user.id : nil
 
-            ec2_credentials = service.list_ec2_credentials(user_id)
+            options[:user_id] = user_id
+            ec2_credentials = service.list_ec2_credentials(options)
 
             load(ec2_credentials.body['credentials'])
           end
 
+          alias_method :summary, :all
+
           def create(attributes = {})
             if user then
               attributes[:user_id] ||= user.id
@@ -52,4 +55,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v2/roles.rb

@@ -8,10 +8,12 @@ module Fog
         class Roles < Fog::Collection
           model Fog::Identity::OpenStack::V2::Role
 
-          def all
-            load(service.list_roles.body['roles'])
+          def all(options = {})
+            load(service.list_roles(options).body['roles'])
           end
 
+          alias_method :summary, :all
+
           def get(id)
             service.get_role(id)
           end
@@ -19,4 +21,4 @@ module Fog
       end # class V2
     end # class OpenStack
   end # module Identity
-end # module Fog
+end # module Fog

data/lib/fog/openstack/models/identity_v2/tenants.rb

@@ -8,10 +8,12 @@ module Fog
         class Tenants < Fog::Collection
           model Fog::Identity::OpenStack::V2::Tenant
 
-          def all
-            load(service.list_tenants.body['tenants'])
+          def all(options = {})
+            load(service.list_tenants(options).body['tenants'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             cached_tenant = self.find { |tenant| tenant.id == id }
             return cached_tenant if cached_tenant
@@ -28,4 +30,4 @@ module Fog
       end # class V2
     end # class OpenStack
   end # module Compute
-end # module Fog
+end # module Fog

data/lib/fog/openstack/models/identity_v2/users.rb

@@ -10,10 +10,14 @@ module Fog
 
           attribute :tenant_id
 
-          def all
-            load(service.list_users(tenant_id).body['users'])
+          def all(options = {})
+            options[:tenant_id] = tenant_id
+
+            load(service.list_users(options).body['users'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             self.find { |user| user.id == id } ||
                 Fog::Identity::OpenStack::V2::User.new(
@@ -40,4 +44,4 @@ module Fog
       end # class V2
     end # class OpenStack
   end # module Identity
-end # module Fog
+end # module Fog

data/lib/fog/openstack/models/identity_v3/domains.rb

@@ -8,14 +8,15 @@ module Fog
         class Domains < Fog::Collection
           model Fog::Identity::OpenStack::V3::Domain
 
-          def all params={}
-            load(service.list_domains(params).body['domains'])
+          def all(options = {})
+            load(service.list_domains(options).body['domains'])
           end
 
-          def auth_domains params={}
-            load(service.auth_domains(params).body['domains'])
-          end
+          alias_method :summary, :all
 
+          def auth_domains(options = {})
+            load(service.auth_domains(options).body['domains'])
+          end
 
           def find_by_id(id)
             cached_domain = self.find { |domain| domain.id == id }
@@ -33,4 +34,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/endpoints.rb

@@ -8,10 +8,12 @@ module Fog
         class Endpoints < Fog::Collection
           model Fog::Identity::OpenStack::V3::Endpoint
 
-          def all params = {}
-            load(service.list_endpoints(params).body['endpoints'])
+          def all(options = {})
+            load(service.list_endpoints(options).body['endpoints'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             cached_endpoint = self.find { |endpoint| endpoint.id == id }
             return cached_endpoint if cached_endpoint
@@ -19,9 +21,8 @@ module Fog
             Fog::Identity::OpenStack::V3::Endpoint.new(
                 endpoint_hash.merge(:service => service))
           end
-
         end
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/groups.rb

@@ -8,10 +8,12 @@ module Fog
         class Groups < Fog::Collection
           model Fog::Identity::OpenStack::V3::Group
 
-          def all params={}
-            load(service.list_groups(params).body['groups'])
+          def all(options = {})
+            load(service.list_groups(options).body['groups'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             cached_group = self.find { |group| group.id == id }
             return cached_group if cached_group
@@ -28,4 +30,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/os_credentials.rb

@@ -8,10 +8,12 @@ module Fog
         class OsCredentials < Fog::Collection
           model Fog::Identity::OpenStack::V3::OsCredential
 
-          def all params={}
-            load(service.list_os_credentials(params).body['credentials'])
+          def all(options = {})
+            load(service.list_os_credentials(options).body['credentials'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             cached_credential = self.find { |credential| credential.id == id }
             return cached_credential if cached_credential
@@ -28,4 +30,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/policies.rb

@@ -8,10 +8,12 @@ module Fog
         class Policies < Fog::Collection
           model Fog::Identity::OpenStack::V3::Policy
 
-          def all params={}
-            load(service.list_policies(params).body['policies'])
+          def all(options = {})
+            load(service.list_policies(options).body['policies'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             cached_policy = self.find { |policy| policy.id == id }
             return cached_policy if cached_policy
@@ -28,4 +30,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/project.rb

@@ -12,6 +12,7 @@ module Fog
           attribute :enabled
           attribute :name
           attribute :links
+          attribute :parent_id
 
           def to_s
             self.name

data/lib/fog/openstack/models/identity_v3/projects.rb

@@ -8,12 +8,14 @@ module Fog
         class Projects < Fog::Collection
           model Fog::Identity::OpenStack::V3::Project
 
-          def all params={}
-            load(service.list_projects(params).body['projects'])
+          def all(options = {})
+            load(service.list_projects(options).body['projects'])
           end
 
-          def auth_projects params={}
-            load(service.auth_projects(params).body['projects'])
+          alias_method :summary, :all
+
+          def auth_projects(options = {})
+            load(service.auth_projects(options).body['projects'])
           end
 
           def find_by_id(id)
@@ -28,4 +30,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/role_assignments.rb

@@ -8,15 +8,20 @@ module Fog
         class RoleAssignments < Fog::Collection
           model Fog::Identity::OpenStack::V3::RoleAssignment
 
-          def all
-            filter_by {}
+          def all(options = {})
+            load(service.list_role_assignments(options).body['role_assignments'])
           end
 
-          def filter_by params={}
-            load(service.list_role_assignments(params).body['role_assignments'])
+          alias_method :summary, :all
+
+          def filter_by(options = {})
+            Fog::Logger.deprecation("Calling OpenStack[:keystone].role_assignments.filter_by(options) method which"\
+                                    " is not part of standard interface and is deprecated, call "\
+                                    " .role_assignments.all(options) or .role_assignments.summary(options) instead.")
+            all(options)
           end
         end
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/roles.rb

@@ -8,12 +8,18 @@ module Fog
         class Roles < Fog::Collection
           model Fog::Identity::OpenStack::V3::Role
 
-          def all params={}
-            load(service.list_roles(params).body['roles'])
+          def all(options = {})
+            load(service.list_roles(options).body['roles'])
           end
 
-          def assignments params={}
-            load(service.list_role_assignments(params).body['role_assignments'])
+          alias_method :summary, :all
+
+          def assignments(options = {})
+            # TODO(lsmola) this method doesn't make much sense, it should be moved to role.rb and automatically add
+            # role.id filter. Otherwise it's just duplication.
+            Fog::Logger.deprecation("Calling OpenStack[:keystone].roles.assignments(options) method which"\
+                                    " deprecated, call OpenStack[:keystone].role_assignments.all(options) instead")
+            load(service.list_role_assignments(options).body['role_assignments'])
           end
 
           def find_by_id(id)
@@ -32,4 +38,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/services.rb

@@ -8,10 +8,12 @@ module Fog
         class Services < Fog::Collection
           model Fog::Identity::OpenStack::V3::Service
 
-          def all params={}
-            load(service.list_services(params).body['services'])
+          def all(options = {})
+            load(service.list_services(options).body['services'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             cached_service = self.find { |service| service.id == id }
             return cached_service if cached_service
@@ -28,4 +30,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/users.rb

@@ -8,10 +8,12 @@ module Fog
         class Users < Fog::Collection
           model Fog::Identity::OpenStack::V3::User
 
-          def all params={}
-            load(service.list_users(params).body['users'])
+          def all(options = {})
+            load(service.list_users(options).body['users'])
           end
 
+          alias_method :summary, :all
+
           def find_by_id(id)
             cached_user = self.find { |user| user.id == id }
             return cached_user if cached_user

data/lib/fog/openstack/models/image/images.rb

@@ -7,12 +7,18 @@ module Fog
       class Images < Fog::Collection
         model Fog::Image::OpenStack::Image
 
-        def all
-          load(service.list_public_images_detailed.body['images'])
+        def all(options = {})
+          load(service.list_public_images_detailed(options).body['images'])
         end
 
-        def details(attribute=nil, query=nil)
-          load(service.list_public_images_detailed(attribute, query).body['images'])
+        def summary(options = {})
+          load(service.list_public_images(options).body['images'])
+        end
+
+        def details(options = {}, deprecated_query = nil)
+          Fog::Logger.deprecation("Calling OpenStack[:glance].images.details will be removed, "\
+                                  " call .images.all for detailed list.")
+          load(service.list_public_images_detailed(options, deprecated_query).body['images'])
         end
 
         def find_by_id(id)

data/lib/fog/openstack/models/network/floating_ips.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_floating_ips(filters).body['floatingips'])
         end
 
+        alias_method :summary, :all
+
         def get(floating_network_id)
           if floating_ip = service.get_floating_ip(floating_network_id).body['floatingip']
             new(floating_ip)

data/lib/fog/openstack/models/network/lb_health_monitors.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_lb_health_monitors(filters).body['health_monitors'])
         end
 
+        alias_method :summary, :all
+
         def get(health_monitor_id)
           if health_monitor = service.get_lb_health_monitor(health_monitor_id).body['health_monitor']
             new(health_monitor)

data/lib/fog/openstack/models/network/lb_members.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_lb_members(filters).body['members'])
         end
 
+        alias_method :summary, :all
+
         def get(member_id)
           if member = service.get_lb_member(member_id).body['member']
             new(member)

data/lib/fog/openstack/models/network/lb_pools.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_lb_pools(filters).body['pools'])
         end
 
+        alias_method :summary, :all
+
         def get(pool_id)
           if pool = service.get_lb_pool(pool_id).body['pool']
             new(pool)

data/lib/fog/openstack/models/network/lb_vips.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_lb_vips(filters).body['vips'])
         end
 
+        alias_method :summary, :all
+
         def get(vip_id)
           if vip = service.get_lb_vip(vip_id).body['vip']
             new(vip)

data/lib/fog/openstack/models/network/networks.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_networks(filters).body['networks'])
         end
 
+        alias_method :summary, :all
+
         def get(network_id)
           if network = service.get_network(network_id).body['network']
             new(network)

data/lib/fog/openstack/models/network/port.rb

@@ -15,6 +15,7 @@ module Fog
         attribute :device_owner
         attribute :device_id
         attribute :tenant_id
+        attribute :security_groups
 
         def initialize(attributes)
           # Old 'connection' is renamed as service and should be used instead

data/lib/fog/openstack/models/network/ports.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_ports(filters).body['ports'])
         end
 
+        alias_method :summary, :all
+
         def get(port_id)
           if port = service.get_port(port_id).body['port']
             new(port)

data/lib/fog/openstack/models/network/routers.rb

@@ -19,6 +19,8 @@ module Fog
           load(service.list_routers(filters).body['routers'])
         end
 
+        alias_method :summary, :all
+
         def get(router_id)
           if router = service.get_router(router_id).body['router']
             new(router)