fog 1.30.0 → 1.31.0

data/lib/fog/openstack/image.rb

@@ -185,7 +185,7 @@ module Fog
               :openstack_endpoint_type => @openstack_endpoint_type
             }
 
-            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]

data/lib/fog/openstack/metering.rb

@@ -178,7 +178,7 @@ module Fog
               :openstack_endpoint_type => @openstack_endpoint_type
             }
 
-            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]

data/lib/fog/openstack/models/baremetal/node.rb

@@ -75,10 +75,32 @@ module Fog
           service.list_ports_detailed({:node_uuid => self.uuid}).body['ports']
         end
 
+        def set_node_maintenance(parameters=nil)
+          requires :uuid
+          service.set_node_maintenance(uuid, parameters)
+          true
+        end
+
+        def unset_node_maintenance(parameters=nil)
+          requires :uuid
+          service.unset_node_maintenance(uuid, parameters)
+          true
+        end
+
         def metadata
           requires :uuid
           service.get_node(self.uuid).headers
         end
+
+        def set_power_state(power_state)
+          requires :uuid
+          service.set_node_power_state(self.uuid, power_state)
+        end
+
+        def set_provision_state(provision_state)
+          requires :uuid
+          service.set_node_provision_state(self.uuid, provision_state)
+        end
       end
     end
   end

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

@@ -13,6 +13,7 @@ module Fog
         attribute :links
         attribute :swap
         attribute :rxtx_factor
+        attribute :metadata
         attribute :ephemeral, :aliases => 'OS-FLV-EXT-DATA:ephemeral'
         attribute :is_public, :aliases => 'os-flavor-access:is_public'
         attribute :disabled, :aliases => 'OS-FLV-DISABLED:disabled'
@@ -39,6 +40,18 @@ module Fog
           service.delete_flavor(self.id)
           true
         end
+
+        def metadata
+          service.get_flavor_metadata(self.id).body['extra_specs']
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+        def create_metadata(metadata)
+          service.create_flavor_metadata(self.id, metadata)
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
       end
     end
   end

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

@@ -0,0 +1,48 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class OpenStack
+      class Service < Fog::Model
+        identity :id
+
+        attribute :binary
+        attribute :host
+        attribute :state
+        attribute :status
+        attribute :updated_at
+        attribute :zone
+
+        #detailed
+        attribute :disabled_reason
+
+        def initialize(attributes)
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+          super
+        end
+
+        def enable
+          requires :binary, :host
+          service.enable_service(self.host, self.binary)
+        end
+
+        def disable
+          requires :binary, :host
+          service.disable_service(self.host, self.binary)
+        end
+
+        def disable_and_log_reason
+          requires :binary, :host, :disabled_reason
+          service.disable_service_log_reason(self.host, self.binary, self.disabled_reason)
+        end
+
+        def destroy
+          requires :id
+          service.delete_service(self.id)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/compute/service'
+
+module Fog
+  module Compute
+    class OpenStack
+      class Services < Fog::Collection
+        model Fog::Compute::OpenStack::Service
+
+        def all(parameters=nil)
+          load(service.list_services(parameters).body['services'])
+        end
+
+        def details(parameters=nil)
+          load(service.list_services(parameters).body['services'])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+require 'fog/core/model'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V2
+        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
+end

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

@@ -0,0 +1,55 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/identity_v2/ec2_credential'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V2
+        class Ec2Credentials < Fog::Collection
+          model Fog::Identity::OpenStack::V2::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::V2::EC2Credential.new(body)
+            end
+
+            ec2_credential
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+require 'fog/core/model'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V2
+        class Role < Fog::Model
+          identity :id
+          attribute :name
+
+          def save
+            requires :name
+            data = service.create_role(name)
+            merge_attributes(data.body['role'])
+            true
+          end
+
+          def destroy
+            requires :id
+            service.delete_role(id)
+            true
+          end
+
+          def add_to_user(user, tenant)
+            add_remove_to_user(user, tenant, :add)
+          end
+
+          def remove_to_user(user, tenant)
+            add_remove_to_user(user, tenant, :remove)
+          end
+
+          private
+          def add_remove_to_user(user, tenant, ops)
+            requires :id
+            user_id = get_id(user)
+            tenant_id = get_id(tenant)
+            case ops
+              when :add
+                service.create_user_role(tenant_id, user_id, id).status == 200
+              when :remove
+                service.delete_user_role(tenant_id, user_id, id).status == 204
+            end
+          end
+
+          def get_id(_)
+            _.is_a?(String) ? _ : _.id
+          end
+        end # class Role
+      end # class V2
+    end # class OpenStack
+  end # module Identity
+end # module Fog

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

@@ -0,0 +1,22 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/identity_v2/role'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V2
+        class Roles < Fog::Collection
+          model Fog::Identity::OpenStack::V2::Role
+
+          def all
+            load(service.list_roles.body['roles'])
+          end
+
+          def get(id)
+            service.get_role(id)
+          end
+        end
+      end # class V2
+    end # class OpenStack
+  end # module Identity
+end # module Fog

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

@@ -0,0 +1,64 @@
+require 'fog/core/model'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V2
+        class Tenant < Fog::Model
+          identity :id
+
+          attribute :description
+          attribute :enabled
+          attribute :name
+
+          def to_s
+            self.name
+          end
+
+          def roles_for(user)
+            service.roles(
+                :tenant => self,
+                :user => user)
+          end
+
+          def users
+            requires :id
+            service.users(:tenant_id => self.id)
+          end
+
+          def destroy
+            requires :id
+            service.delete_tenant(self.id)
+            true
+          end
+
+          def update(attr = nil)
+            requires :id
+            merge_attributes(
+                service.update_tenant(self.id, attr || attributes).body['tenant'])
+            self
+          end
+
+          def save
+            requires :name
+            identity ? update : create
+          end
+
+          def create
+            merge_attributes(
+                service.create_tenant(attributes).body['tenant'])
+            self
+          end
+
+          def grant_user_role(user_id, role_id)
+            service.add_user_to_tenant(self.id, user_id, role_id)
+          end
+
+          def revoke_user_role(user_id, role_id)
+            service.remove_user_from_tenant(self.id, user_id, role_id)
+          end
+        end # class Tenant
+      end # class V2
+    end # class OpenStack
+  end # module Identity
+end # module Fog

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

@@ -0,0 +1,31 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/identity_v2/tenant'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V2
+        class Tenants < Fog::Collection
+          model Fog::Identity::OpenStack::V2::Tenant
+
+          def all
+            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 = service.get_tenant(id).body['tenant']
+            Fog::Identity::OpenStack::V2::Tenant.new(
+                tenant_hash.merge(:service => service))
+          end
+
+          def destroy(id)
+            tenant = self.find_by_id(id)
+            tenant.destroy
+          end
+        end # class Tenants
+      end # class V2
+    end # class OpenStack
+  end # module Compute
+end # module Fog

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

@@ -0,0 +1,71 @@
+require 'fog/core/model'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V2
+        class User < Fog::Model
+          identity :id
+
+          attribute :email
+          attribute :enabled
+          attribute :name
+          attribute :tenant_id, :aliases => 'tenantId'
+          attribute :password
+
+          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)
+          end
+
+          def save
+            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 = service.create_user(name, password, email, tenant_id, enabled)
+            merge_attributes(data.body['user'])
+            true
+          end
+
+          def update(options = {})
+            requires :id
+            options.merge('id' => id)
+            response = service.update_user(id, options)
+            true
+          end
+
+          def update_password(password)
+            update({'password' => password, 'url' => "/users/#{id}/OS-KSADM/password"})
+          end
+
+          def update_tenant(tenant)
+            tenant = tenant.id if tenant.class != String
+            update({:tenantId => tenant, 'url' => "/users/#{id}/OS-KSADM/tenant"})
+          end
+
+          def update_enabled(enabled)
+            update({:enabled => enabled, 'url' => "/users/#{id}/OS-KSADM/enabled"})
+          end
+
+          def destroy
+            requires :id
+            service.delete_user(id)
+            true
+          end
+
+          def roles(tenant_id = self.tenant_id)
+            service.list_roles_for_user_on_tenant(tenant_id, self.id).body['roles']
+          end
+        end # class User
+      end # class V2
+    end # class OpenStack
+  end # module Identity
+end # module Fog