fog 1.8.0 → 1.9.0

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

@@ -8,12 +8,16 @@ module Fog
         model Fog::Compute::OpenStack::Tenant
 
         def all
-          load(connection.list_tenants.body['tenants'])
+          load(service.list_tenants.body['tenants'])
         end
 
         def usages(start_date = nil, end_date = nil, details = false)
-          connection.list_usages(start_date, end_date, details).body['tenant_usages']
-        end 
+          service.list_usages(start_date, end_date, details).body['tenant_usages']
+        end
+
+        def find_by_id(id)
+          self.find {|tenant| tenant.id == id}
+        end
       end # class Tenants
     end # class OpenStack
   end # module Compute

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

@@ -21,33 +21,34 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def save
           requires :name, :description, :size
-          data = connection.create_volume(name, description, size, attributes)
+          data = service.create_volume(name, description, size, attributes)
           merge_attributes(data.body['volume'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 
         def attach(server_id, name)
           requires :id
-          data = connection.attach_volume(id, server_id, name)
+          data = service.attach_volume(id, server_id, name)
           merge_attributes(:attachments => attachments << data.body['volumeAttachment'])
           true
         end
 
         def detach(server_id, attachment_id)
           requires :id
-          connection.detach_volume(server_id, attachment_id)
+          service.detach_volume(server_id, attachment_id)
           true
         end
       end

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

@@ -9,11 +9,11 @@ module Fog
         model Fog::Compute::OpenStack::Volume
 
         def all(detailed=true)
-          load(connection.list_volumes(detailed).body['volumes'])
+          load(service.list_volumes(detailed).body['volumes'])
         end
 
         def get(volume_id)
-          if volume = connection.get_volume_details(volume_id).body['volume']
+          if volume = service.get_volume_details(volume_id).body['volume']
             new(volume)
           end
         rescue Fog::Compute::OpenStack::NotFound

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

@@ -0,0 +1,44 @@
+require 'fog/core/model'
+
+module Fog
+  module Identity
+    class OpenStack
+      class Ec2Credential < Fog::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
+          service.delete_ec2_credential user_id, access
+          true
+        end
+
+        def save
+          raise Fog::Errors::Error, 'Existing credentials cannot be altered' if
+            access
+
+          self.user_id   ||= user.id
+          self.tenant_id ||= user.tenant_id
+
+          requires :user_id, :tenant_id
+
+          data = service.create_ec2_credential user_id, tenant_id
+
+          merge_attributes(data.body['credential'])
+
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/identity/ec2_credential'
+
+module Fog
+  module Identity
+    class OpenStack
+      class Ec2Credentials < Fog::Collection
+        model Fog::Identity::OpenStack::Ec2Credential
+
+        attribute :user
+
+        def all
+          user_id = user ? user.id : nil
+
+          ec2_credentials = service.list_ec2_credentials(user_id)
+
+          load(ec2_credentials.body['credentials'])
+        end
+
+        def create(attributes = {})
+          if user then
+            attributes[:user_id]   ||= user.id
+            attributes[:tenant_id] ||= user.tenant_id
+          end
+
+          super attributes
+        end
+
+        def destroy(access_key)
+          ec2_credential = self.find_by_access_key(access_key)
+          ec2_credential.destroy
+        end
+
+        def find_by_access_key(access_key)
+          user_id = user ? user.id : nil
+
+          ec2_credential =
+            self.find { |ec2_credential| ec2_credential.access == access_key }
+
+          unless ec2_credential then
+            response = service.get_ec2_credential(user_id, access_key)
+            body = response.body['credential']
+            body = body.merge 'service' => service
+
+            ec2_credential = Fog::Identity::OpenStack::EC2Credential.new(body)
+          end
+
+          ec2_credential
+        end
+      end
+    end
+  end
+end

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

@@ -9,14 +9,14 @@ module Fog
 
         def save
           requires :name
-          data = connection.create_role(name)
+          data = service.create_role(name)
           merge_attributes(data.body['role'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_role(id)
+          service.delete_role(id)
           true
         end
 
@@ -35,9 +35,9 @@ module Fog
           tenant_id = get_id(tenant)
           case ops
           when :add
-            connection.create_user_role(tenant_id, user_id, id).status == 200
+            service.create_user_role(tenant_id, user_id, id).status == 200
           when :remove
-            connection.delete_user_role(tenant_id, user_id, id).status == 200
+            service.delete_user_role(tenant_id, user_id, id).status == 200
           end
         end
 

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

@@ -8,11 +8,11 @@ module Fog
         model Fog::Identity::OpenStack::Role
 
         def all
-          load(connection.list_roles.body['roles'])
+          load(service.list_roles.body['roles'])
         end
 
         def get(id)
-          connection.get_role(id)
+          service.get_role(id)
         end
 
       end

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

@@ -15,26 +15,26 @@ module Fog
         end
 
         def roles_for(user)
-          connection.roles(
+          service.roles(
             :tenant => self,
             :user   => user)
         end
 
         def users
           requires :id
-          connection.users(:tenant => self)
+          service.users(:tenant_id => self.id)
         end
 
         def destroy
           requires :id
-          connection.delete_tenant(self.id)
+          service.delete_tenant(self.id)
           true
         end
 
         def update(attr = nil)
           requires :id
           merge_attributes(
-            connection.update_tenant(self.id, attr || attributes).body['tenant'])
+            service.update_tenant(self.id, attr || attributes).body['tenant'])
           self
         end
 
@@ -45,16 +45,16 @@ module Fog
 
         def create
           merge_attributes(
-            connection.create_tenant(attributes).body['tenant'])
+            service.create_tenant(attributes).body['tenant'])
           self
         end
 
         def grant_user_role(user_id, role_id)
-          connection.add_user_to_tenant(self.id, user_id, role_id)
+          service.add_user_to_tenant(self.id, user_id, role_id)
         end
 
         def revoke_user_role(user_id, role_id)
-          connection.remove_user_from_tenant(self.id, user_id, role_id)
+          service.remove_user_from_tenant(self.id, user_id, role_id)
         end
       end # class Tenant
     end # class OpenStack

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

@@ -8,15 +8,15 @@ module Fog
         model Fog::Identity::OpenStack::Tenant
 
         def all
-          load(connection.list_tenants.body['tenants'])
+          load(service.list_tenants.body['tenants'])
         end
 
         def find_by_id(id)
           cached_tenant = self.find {|tenant| tenant.id == id}
           return cached_tenant if cached_tenant
-          tenant_hash = connection.get_tenant(id).body['tenant']
+          tenant_hash = service.get_tenant(id).body['tenant']
           Fog::Identity::OpenStack::Tenant.new(
-            tenant_hash.merge(:connection => connection))
+            tenant_hash.merge(:service => service))
         end
 
         def destroy(id)

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

@@ -15,15 +15,21 @@ module Fog
         attr_accessor :email, :name, :tenant_id, :enabled, :password
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # 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)
+        end
+
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :name, :tenant_id, :password
           enabled = true if enabled.nil?
-          data = connection.create_user(name, password, email, tenant_id, enabled)
+          data = service.create_user(name, password, email, tenant_id, enabled)
           merge_attributes(data.body['user'])
           true
         end
@@ -31,7 +37,7 @@ module Fog
         def update(options = {})
           requires :id
           options.merge('id' => id)
-          response = connection.update_user(id, options)
+          response = service.update_user(id, options)
           true
         end
 
@@ -50,12 +56,12 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_user(id)
+          service.delete_user(id)
           true
         end
 
         def roles(tenant_id = self.tenant_id)
-          connection.list_roles_for_user_on_tenant(tenant_id, self.id).body['roles']
+          service.list_roles_for_user_on_tenant(tenant_id, self.id).body['roles']
         end
       end # class User
     end # class OpenStack

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

@@ -10,14 +10,14 @@ module Fog
         attribute :tenant_id
 
         def all
-          load(connection.list_users(tenant_id).body['users'])
+          load(service.list_users(tenant_id).body['users'])
         end
 
         def find_by_id(id)
           self.find {|user| user.id == id} ||
             Fog::Identity::OpenStack::User.new(
-              connection.get_user_by_id(id).body['user'].merge(
-                'connection' => connection
+              service.get_user_by_id(id).body['user'].merge(
+                'service' => service
               )
             )
         end

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

@@ -32,7 +32,8 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
@@ -43,45 +44,45 @@ module Fog
 
         def create
           requires :name
-          merge_attributes(connection.create_image(self.attributes).body['image'])
+          merge_attributes(service.create_image(self.attributes).body['image'])
           self
         end
 
         def update
           requires :name
-          merge_attributes(connection.update_image(self.attributes).body['image'])
+          merge_attributes(service.update_image(self.attributes).body['image'])
           self
         end
 
         def destroy
           requires :id
-          connection.delete_image(self.id)
+          service.delete_image(self.id)
           true
         end
 
         def add_member(member_id)
           requires :id
-          connection.add_member_to_image(self.id, member_id)
+          service.add_member_to_image(self.id, member_id)
         end
 
         def remove_member(member_id)
           requires :id
-          connection.remove_member_from_image(self.id, member_id)
+          service.remove_member_from_image(self.id, member_id)
         end
 
         def update_members(members)
           requires :id
-          connection.update_image_members(self.id, members)
+          service.update_image_members(self.id, members)
         end
 
         def members
           requires :id
-          connection.get_image_members(self.id).body['members']
+          service.get_image_members(self.id).body['members']
         end
 
         def metadata
           requires :id
-          connection.get_image(self.id).headers
+          service.get_image(self.id).headers
         end
 
       end

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

@@ -8,11 +8,11 @@ module Fog
         model Fog::Image::OpenStack::Image
 
         def all
-          load(connection.list_public_images_detailed.body['images'])
+          load(service.list_public_images_detailed.body['images'])
         end
 
         def details
-          load(connection.list_public_images_detailed.body['images'])
+          load(service.list_public_images_detailed.body['images'])
         end
 
         def find_by_id(id)
@@ -20,12 +20,12 @@ module Fog
         end
 
         def public
-          images = load(connection.list_public_images_detailed.body['images'])
+          images = load(service.list_public_images_detailed.body['images'])
           images.delete_if{|image| image.is_public == false}
         end
 
         def private
-          images = load(connection.list_public_images_detailed.body['images'])
+          images = load(service.list_public_images_detailed.body['images'])
           images.delete_if{|image| image.is_public}
         end
 
@@ -36,7 +36,7 @@ module Fog
 
         def method_missing(method_sym, *arguments, &block)
           if method_sym.to_s =~ /^find_by_(.*)$/
-            load(connection.list_public_images_detailed($1 ,arguments.first).body['images'])
+            load(service.list_public_images_detailed($1 ,arguments.first).body['images'])
           else
             super
           end
@@ -52,7 +52,7 @@ module Fog
 
         def find_attribute(attribute,value)
           attribute = attribute.to_s.gsub("find_by_", "")
-          load(connection.list_public_images_detailed(attribute , value).body['images'])
+          load(service.list_public_images_detailed(attribute , value).body['images'])
         end
       end
     end