fog 1.32.0 → 1.33.0

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/os_credential'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class OsCredentials < Fog::Collection
+        class OsCredentials < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::OsCredential
 
           def all(options = {})
-            load(service.list_os_credentials(options).body['credentials'])
+            load_response(service.list_os_credentials(options), '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

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/policy'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Policies < Fog::Collection
+        class Policies < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Policy
 
           def all(options = {})
-            load(service.list_policies(options).body['policies'])
+            load_response(service.list_policies(options), '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

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Policy < Fog::Model
+        class Policy < Fog::OpenStack::Model
           identity :id
 
           attribute :type
@@ -22,18 +22,14 @@ module Fog
           end
 
           def update(attr = nil)
-            requires :id
+            requires :id, :blob, :type
             merge_attributes(
                 service.update_policy(self.id, attr || attributes).body['policy'])
             self
           end
 
-          def save
-            requires :blob, :type
-            identity ? update : create
-          end
-
           def create
+            requires :blob, :type
             merge_attributes(
                 service.create_policy(attributes).body['policy'])
             self
@@ -43,4 +39,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Project < Fog::Model
+        class Project < Fog::OpenStack::Model
           identity :id
 
           attribute :domain_id
@@ -13,6 +13,8 @@ module Fog
           attribute :name
           attribute :links
           attribute :parent_id
+          attribute :subtree
+          attribute :parents
 
           def to_s
             self.name
@@ -31,11 +33,6 @@ module Fog
             self
           end
 
-          def save
-            requires :name
-            identity ? update : create
-          end
-
           def create
             merge_attributes(
                 service.create_project(attributes).body['project'])
@@ -96,4 +93,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,31 +1,42 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/project'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Projects < Fog::Collection
+        class Projects < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Project
 
           def all(options = {})
-            load(service.list_projects(options).body['projects'])
+            load_response(service.list_projects(options), 'projects')
           end
 
-          alias_method :summary, :all
-
           def auth_projects(options = {})
             load(service.auth_projects(options).body['projects'])
           end
 
-          def find_by_id(id)
-            cached_project = self.find { |project| project.id == id }
+          def find_by_id(id, options=[]) # options can include :subtree_as_ids, :subtree_as_list, :parents_as_ids, :parents_as_list
+            if options.is_a? Symbol # Deal with a single option being passed on its own
+              options = [options]
+            end
+            cached_project = self.find { |project| project.id == id } if options.empty?
             return cached_project if cached_project
-            project_hash = service.get_project(id).body['project']
-            Fog::Identity::OpenStack::V3::Project.new(
-                project_hash.merge(:service => service))
+            project_hash = service.get_project(id, options).body['project']
+            top_project = project_from_hash(project_hash, service)
+            if options.include? :subtree_as_list
+              top_project.subtree.map! {|proj_hash| project_from_hash(proj_hash['project'], service)}
+            end
+            if options.include? :parents_as_list
+              top_project.parents.map! {|proj_hash| project_from_hash(proj_hash['project'], service)}
+            end
+            return top_project
           end
 
+          private
+          def project_from_hash(project_hash, service)
+            Fog::Identity::OpenStack::V3::Project.new(project_hash.merge(:service => service))
+          end
         end
       end
     end

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Role < Fog::Model
+        class Role < Fog::OpenStack::Model
           identity :id
 
           attribute :name
@@ -27,11 +27,6 @@ module Fog
             self
           end
 
-          def save
-            requires :name
-            identity ? update : create
-          end
-
           def create
             merge_attributes(
                 service.create_role(attributes).body['role'])
@@ -42,4 +37,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class RoleAssignment < Fog::Model
+        class RoleAssignment < Fog::OpenStack::Model
           attribute :scope
           attribute :role
           attribute :user
@@ -19,4 +19,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/role'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class RoleAssignments < Fog::Collection
+        class RoleAssignments < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::RoleAssignment
 
           def all(options = {})
-            load(service.list_role_assignments(options).body['role_assignments'])
+            load_response(service.list_role_assignments(options), 'role_assignments')
           end
 
-          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 "\

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/role'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Roles < Fog::Collection
+        class Roles < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Role
 
           def all(options = {})
-            load(service.list_roles(options).body['roles'])
+            load_response(service.list_roles(options), 'roles')
           end
 
-          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.

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Service < Fog::Model
+        class Service < Fog::OpenStack::Model
           identity :id
 
           attribute :description
@@ -44,4 +44,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/service'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Services < Fog::Collection
+        class Services < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Service
 
           def all(options = {})
-            load(service.list_services(options).body['services'])
+            load_response(service.list_services(options), '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

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Token < Fog::Model
+        class Token < Fog::OpenStack::Model
 
           attribute :value
           attribute :catalog
@@ -23,4 +23,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,11 +1,11 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/service'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Tokens < Fog::Collection
+        class Tokens < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Token
 
 
@@ -37,4 +37,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class User < Fog::Model
+        class User < Fog::OpenStack::Model
           identity :id
 
           attribute :default_project_id
@@ -68,20 +68,14 @@ module Fog
             self
           end
 
-          def save
-            requires :name
-            identity ? update : create
-          end
-
           def create
             merge_attributes(
                 service.create_user(attributes).body['user'])
             self
           end
 
-
         end
       end
     end
   end
-end
+end

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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v3/domain'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Users < Fog::Collection
+        class Users < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::User
 
           def all(options = {})
-            load(service.list_users(options).body['users'])
+            load_response(service.list_users(options), '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/image.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Image
     class OpenStack
-      class Image < Fog::Model
+      class Image < Fog::OpenStack::Model
         identity :id
 
         attribute :name
@@ -28,17 +28,6 @@ module Fog
         attribute :location
         attribute :copy_from
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :name
-          identity ? update : create
-        end
-
         def create
           requires :name
           merge_attributes(service.create_image(self.attributes).body['image'])