fog 1.30.0 → 1.31.0

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

@@ -0,0 +1,40 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/identity_v3/service'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Tokens < Fog::Collection
+          model Fog::Identity::OpenStack::V3::Token
+
+
+          def authenticate(auth)
+            response = service.token_authenticate(auth)
+            token_hash = response.body['token']
+            Fog::Identity::OpenStack::V3::Token.new(
+                token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']))
+          end
+
+          def validate(subject_token)
+            response = service.token_validate(subject_token)
+            token_hash = response.body['token']
+            Fog::Identity::OpenStack::V3::Token.new(
+                token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']))
+          end
+
+          def check(subject_token)
+            service.token_check(subject_token)
+            return true
+          end
+
+          def revoke(subject_token)
+            service.token_revoke(subject_token)
+            return true
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+require 'fog/core/model'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class User < Fog::Model
+          identity :id
+
+          attribute :default_project_id
+          attribute :description
+          attribute :domain_id
+          attribute :email
+          attribute :enabled
+          attribute :name
+          attribute :links
+          attribute :password
+
+          def to_s
+            self.name
+          end
+
+          def groups
+            requires :id
+            service.list_user_groups(self.id).body['groups']
+          end
+
+          def projects
+            requires :id
+            service.list_user_projects(self.id).body['projects']
+          end
+
+          def roles
+            requires :id, :domain_id
+            service.list_domain_user_roles(self.domain_id, self.id).body['roles']
+          end
+
+          def grant_role(role_id)
+            requires :id, :domain_id
+            service.grant_domain_user_role(self.domain_id, self.id, role_id)
+          end
+
+          def check_role(role_id)
+            requires :id, :domain_id
+            begin
+              service.check_domain_user_role(self.domain_id, self.id, role_id)
+            rescue Fog::Identity::OpenStack::NotFound
+              return false
+            end
+            return true
+          end
+
+          def revoke_role(role_id)
+            requires :id, :domain_id
+            service.revoke_domain_user_role(self.domain_id, self.id, role_id)
+          end
+
+          def destroy
+            requires :id
+            service.delete_user(self.id)
+            true
+          end
+
+          def update(attr = nil)
+            requires :id
+            merge_attributes(
+                service.update_user(self.id, attr || attributes).body['user'])
+            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

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

@@ -0,0 +1,35 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/identity_v3/domain'
+
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Users < Fog::Collection
+          model Fog::Identity::OpenStack::V3::User
+
+          def all params={}
+            load(service.list_users(params).body['users'])
+          end
+
+          def find_by_id(id)
+            cached_user = self.find { |user| user.id == id }
+            return cached_user if cached_user
+            user_hash = service.get_user(id).body['user']
+            Fog::Identity::OpenStack::V3::User.new(
+                user_hash.merge(:service => service))
+          end
+
+          def find_by_name(name)
+            load(service.list_users(:name => name).body['users'])
+          end
+
+          def destroy(id)
+            user = self.find_by_id(id)
+            user.destroy
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/network.rb

@@ -11,6 +11,7 @@ module Fog
                  :openstack_tenant_id,
                  :openstack_api_key, :openstack_username, :openstack_endpoint_type,
                  :current_user, :current_tenant, :openstack_region,
+                 :openstack_project_name,
                  :openstack_project_domain, :openstack_user_domain
 
       ## MODELS
@@ -337,15 +338,7 @@ module Fog
               :openstack_region        => @openstack_region
             }
 
-            case @openstack_auth_uri.path
-            when %r{/v2.0}
-              credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
-            when %r{/v3}
-              credentials = Fog::OpenStack.authenticate_v3(options, @connection_options)
-            else
-              credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
-            end
-
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]

data/lib/fog/openstack/orchestration.rb

@@ -232,12 +232,7 @@ module Fog
               :openstack_endpoint_type => @openstack_endpoint_type
             }
 
-            if @openstack_auth_uri.path =~ /\/v2.0\//
-
-              credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
-            else
-              credentials = Fog::OpenStack.authenticate_v1(options, @connection_options)
-            end
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]

data/lib/fog/openstack/planning.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/requests/baremetal/set_node_maintenance.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Baremetal
+    class OpenStack
+      class Real
+        def set_node_maintenance(node_uuid, parameters=nil)
+          if parameters
+            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
+          else
+            query = {}
+          end
+
+          request(
+            :expects => [200, 202, 204],
+            :method => 'PUT',
+            :path => "nodes/#{node_uuid}/maintenance",
+            :query   => query
+          )
+        end
+      end
+
+      class Mock
+        def set_node_maintenance(node_uuid, parameters=nil)
+          response = Excon::Response.new
+          response.status = 202
+          response.headers = {
+            "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf",
+            "Content-Type" => "application/json",
+            "Content-Length" => "356",
+            "Date" => Date.new
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # baremetal
+end # fog

data/lib/fog/openstack/requests/baremetal/set_node_power_state.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Baremetal
+    class OpenStack
+      class Real
+        def set_node_power_state(node_id, power_state)
+          data = {
+            'target' => power_state
+          }
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => 202,
+            :method => 'PUT',
+            :path => "nodes/#{node_id}/states/power"
+          )
+        end
+      end
+
+      class Mock
+        def set_node_power_state(node_id, power_state)
+          response = Excon::Response.new
+          response.status = 202
+          response.headers = {
+            "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf",
+            "Content-Type" => "application/json",
+            "Content-Length" => "356",
+            "Date" => Date.new
+          }
+          response.body =  self.data[:nodes].first
+          response
+        end
+      end # mock
+    end # openstack
+  end # baremetal
+end # fog

data/lib/fog/openstack/requests/baremetal/set_node_provision_state.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Baremetal
+    class OpenStack
+      class Real
+        def set_node_provision_state(node_id, provision_state)
+          data = {
+            'target' => provision_state
+          }
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => 202,
+            :method => 'PUT',
+            :path => "nodes/#{node_id}/states/provision",
+            :headers => {
+                    :'X-OpenStack-Ironic-API-Version' => 'latest'
+                  }
+          )
+        end
+      end
+
+      class Mock
+        def set_node_provision_state(node_id, provision_state)
+          response = Excon::Response.new
+          response.status = 202
+          response.headers = {
+            "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf",
+            "Content-Type" => "application/json",
+            "Content-Length" => "356",
+            "Date" => Date.new
+          }
+          response.body =  self.data[:nodes].first
+          response
+        end
+      end # mock
+    end # openstack
+  end # baremetal
+end # fog

data/lib/fog/openstack/requests/baremetal/unset_node_maintenance.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Baremetal
+    class OpenStack
+      class Real
+        def unset_node_maintenance(node_uuid, parameters=nil)
+          if parameters
+            query = parameters.each { |k, v| parameters[k] = URI::encode(v) }
+          else
+            query = {}
+          end
+
+          request(
+            :expects => [200, 202, 204],
+            :method => 'DELETE',
+            :path => "nodes/#{node_uuid}/maintenance",
+            :query   => query
+          )
+        end
+      end
+
+      class Mock
+        def unset_node_maintenance(node_uuid, parameters=nil)
+          response = Excon::Response.new
+          response.status = 202
+          response.headers = {
+            "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf",
+            "Content-Type" => "application/json",
+            "Content-Length" => "356",
+            "Date" => Date.new
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # baremetal
+end # fog

data/lib/fog/openstack/requests/compute/create_flavor_metadata.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def create_flavor_metadata(flavor_ref, metadata)
+          data = {
+            'extra_specs' => metadata
+          }
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => 200,
+            :method => 'POST',
+            :path     => "flavors/#{flavor_ref}/os-extra_specs"
+          )
+        end
+      end
+
+      class Mock
+        def create_flavor_metadata(flavor_ref, metadata)
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf",
+            "Content-Type" => "application/json",
+            "Content-Length" => "356",
+            "Date" => Date.new
+          }
+          response.body = { "extra_specs" => {
+              "cpu_arch" => "x86_64"
+            }
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog

data/lib/fog/openstack/requests/compute/create_security_group.rb

@@ -22,7 +22,7 @@ module Fog
       class Mock
         def create_security_group(name, description)
           Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url])
-          tenant_id = Fog::Identity::OpenStack::Mock.data[current_tenant][:tenants].keys.first
+          tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first
           security_group_id = Fog::Mock.random_numbers(2).to_i + 1
           self.data[:security_groups][security_group_id.to_s] = {
             'tenant_id' => tenant_id,

data/lib/fog/openstack/requests/compute/delete_service.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def delete_service(uuid, optional_params = nil)
+          # Encode all params
+          optional_params = optional_params.each { |k, v| optional_params[k] = URI::encode(v) } if optional_params
+
+          request(
+            :expects => [202, 204],
+            :method  => 'DELETE',
+            :path    => "os-services/#{uuid}",
+            :query   => optional_params
+          )
+        end
+      end
+
+      class Mock
+        def delete_service(host, binary, optional_params = nil)
+          response = Excon::Response.new
+          response.status = 204
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog