fog 1.32.0 → 1.33.0

data/lib/fog/openstack/models/compute/volumes.rb

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/compute/volume'
 
 module Fog
   module Compute
     class OpenStack
-      class Volumes < Fog::Collection
+      class Volumes < Fog::OpenStack::Collection
         model Fog::Compute::OpenStack::Volume
 
         def all(options = true)
@@ -14,14 +14,14 @@ module Fog
             else
               Fog::Logger.deprecation('Calling OpenStack[:compute].volumes.all(false) is deprecated, use .volumes.summary')
             end
-            load(service.list_volumes(options).body['volumes'])
+            load_response(service.list_volumes(options), 'volumes')
           else
-            load(service.list_volumes_detail(options).body['volumes'])
+            load_response(service.list_volumes_detail(options), 'volumes')
           end
         end
 
         def summary(options = {})
-          load(service.list_volumes(options).body['volumes'])
+          load_response(service.list_volumes(options), 'volumes')
         end
 
         def get(volume_id)

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

@@ -1,22 +1,16 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class Ec2Credential < Fog::Model
+        class Ec2Credential < Fog::OpenStack::Model
           identity :access, :aliases => 'access_key'
 
           attribute :secret, :aliases => 'secret_key'
           attribute :tenant_id
           attribute :user_id
 
-          def initialize(attributes)
-            # Old 'connection' is renamed as service and should be used instead
-            prepare_service_value(attributes)
-            super
-          end
-
           def destroy
             requires :access
             requires :user_id
@@ -42,4 +36,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -1,11 +1,11 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v2/ec2_credential'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class Ec2Credentials < Fog::Collection
+        class Ec2Credentials < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V2::Ec2Credential
 
           attribute :user
@@ -16,11 +16,9 @@ module Fog
             options[:user_id] = user_id
             ec2_credentials = service.list_ec2_credentials(options)
 
-            load(ec2_credentials.body['credentials'])
+            load_response(ec2_credentials, 'credentials')
           end
 
-          alias_method :summary, :all
-
           def create(attributes = {})
             if user then
               attributes[:user_id] ||= user.id

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class Role < Fog::Model
+        class Role < Fog::OpenStack::Model
           identity :id
           attribute :name
 
@@ -49,4 +49,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/roles.rb

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v2/role'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class Roles < Fog::Collection
+        class Roles < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V2::Role
 
           def all(options = {})
-            load(service.list_roles(options).body['roles'])
+            load_response(service.list_roles(options), 'roles')
           end
 
-          alias_method :summary, :all
-
           def get(id)
             service.get_role(id)
           end

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class Tenant < Fog::Model
+        class Tenant < Fog::OpenStack::Model
           identity :id
 
           attribute :description
@@ -33,18 +33,14 @@ module Fog
           end
 
           def update(attr = nil)
-            requires :id
+            requires :id, :name
             merge_attributes(
                 service.update_tenant(self.id, attr || attributes).body['tenant'])
             self
           end
 
-          def save
-            requires :name
-            identity ? update : create
-          end
-
           def create
+            requires :name
             merge_attributes(
                 service.create_tenant(attributes).body['tenant'])
             self
@@ -61,4 +57,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

@@ -1,19 +1,17 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v2/tenant'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class Tenants < Fog::Collection
+        class Tenants < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V2::Tenant
 
           def all(options = {})
-            load(service.list_tenants(options).body['tenants'])
+            load_response(service.list_tenants(options), '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

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class User < Fog::Model
+        class User < Fog::OpenStack::Model
           identity :id
 
           attribute :email
@@ -15,12 +15,6 @@ module Fog
 
           attr_accessor :email, :name, :tenant_id, :enabled, :password
 
-          def initialize(attributes)
-            # Old 'connection' is renamed as service and should be used instead
-            prepare_service_value(attributes)
-            super
-          end
-
           def ec2_credentials
             requires :id
             service.ec2_credentials(:user => self)

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

@@ -1,11 +1,11 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/identity_v2/user'
 
 module Fog
   module Identity
     class OpenStack
       class V2
-        class Users < Fog::Collection
+        class Users < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V2::User
 
           attribute :tenant_id
@@ -13,11 +13,9 @@ module Fog
           def all(options = {})
             options[:tenant_id] = tenant_id
 
-            load(service.list_users(options).body['users'])
+            load_response(service.list_users(options), 'users')
           end
 
-          alias_method :summary, :all
-
           def find_by_id(id)
             self.find { |user| user.id == id } ||
                 Fog::Identity::OpenStack::V2::User.new(

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Domain < Fog::Model
+        class Domain < Fog::OpenStack::Model
           identity :id
 
           attribute :description
@@ -23,18 +23,14 @@ module Fog
           end
 
           def update(attr = nil)
-            requires :id
+            requires :id, :name
             merge_attributes(
                 service.update_domain(self.id, attr || attributes).body['domain'])
             self
           end
 
-          def save
-            requires :name
-            identity ? update : create
-          end
-
           def create
+            requires :name
             merge_attributes(
                 service.create_domain(attributes).body['domain'])
             self
@@ -44,4 +40,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/domains.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 Domains < Fog::Collection
+        class Domains < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Domain
 
           def all(options = {})
-            load(service.list_domains(options).body['domains'])
+            load_response(service.list_domains(options), 'domains')
           end
 
-          alias_method :summary, :all
-
           def auth_domains(options = {})
             load(service.auth_domains(options).body['domains'])
           end

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Endpoint < Fog::Model
+        class Endpoint < Fog::OpenStack::Model
           identity :id
 
           attribute :description
@@ -26,18 +26,14 @@ module Fog
           end
 
           def update(attr = nil)
-            requires :id
+            requires :id, :name
             merge_attributes(
                 service.update_endpoint(self.id, attr || attributes).body['endpoint'])
             self
           end
 
-          def save
-            requires :name
-            identity ? update : create
-          end
-
           def create
+            requires :name
             merge_attributes(
                 service.create_endpoint(attributes).body['endpoint'])
             self
@@ -47,4 +43,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/models/identity_v3/endpoints.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 Endpoints < Fog::Collection
+        class Endpoints < Fog::OpenStack::Collection
           model Fog::Identity::OpenStack::V3::Endpoint
 
           def all(options = {})
-            load(service.list_endpoints(options).body['endpoints'])
+            load_response(service.list_endpoints(options), '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

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

@@ -1,10 +1,10 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Identity
     class OpenStack
       class V3
-        class Group < Fog::Model
+        class Group < Fog::OpenStack::Model
           identity :id
 
           attribute :description
@@ -23,18 +23,14 @@ module Fog
           end
 
           def update(attr = nil)
-            requires :id
+            requires :id, :name
             merge_attributes(
                 service.update_group(self.id, attr || attributes).body['group'])
             self
           end
 
-          def save
-            requires :name
-            identity ? update : create
-          end
-
           def create
+            requires :name
             merge_attributes(
                 service.create_group(attributes).body['group'])
             self
@@ -93,4 +89,4 @@ module Fog
       end
     end
   end
-end
+end

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

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

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

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