fog 1.30.0 → 1.31.0

data/lib/fog/openstack/requests/identity_v3/remove_user_from_group.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def remove_user_from_group(group_id, user_id)
+            request(
+                :expects => [204],
+                :method => 'DELETE',
+                :path => "groups/#{group_id}/users/#{user_id}"
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/revoke_domain_group_role.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def revoke_domain_group_role(id, group_id, role_id)
+            request(
+                :expects => [204],
+                :method => 'DELETE',
+                :path => "domains/#{id}/groups/#{group_id}/roles/#{role_id}"
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/revoke_domain_user_role.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def revoke_domain_user_role(id, user_id, role_id)
+            request(
+                :expects => [204],
+                :method => 'DELETE',
+                :path => "domains/#{id}/users/#{user_id}/roles/#{role_id}"
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/revoke_project_group_role.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def revoke_project_group_role(id, group_id, role_id)
+            request(
+                :expects => [204],
+                :method => 'DELETE',
+                :path => "projects/#{id}/groups/#{group_id}/roles/#{role_id}"
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/revoke_project_user_role.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def revoke_project_user_role(id, user_id, role_id)
+            request(
+                :expects => [204],
+                :method => 'DELETE',
+                :path => "projects/#{id}/users/#{user_id}/roles/#{role_id}"
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/token_authenticate.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def token_authenticate(auth)
+            request(
+                :expects => [201],
+                :method => 'POST',
+                :path => "auth/tokens",
+                :body => Fog::JSON.encode(auth)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/token_check.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def token_check(subject_token)
+            request(
+                :expects => [200, 204],
+                :method => 'HEAD',
+                :path => "auth/tokens",
+                :headers => {"X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token, }
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/token_revoke.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def token_revoke(subject_token)
+            request(
+                :expects => [200, 204],
+                :method => 'DELETE',
+                :path => "auth/tokens",
+                :headers => {"X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token, }
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/token_validate.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def token_validate(subject_token)
+
+            request(
+                :expects => [200],
+                :method => 'GET',
+                :path => "auth/tokens",
+                :headers => {"X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token}
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_domain.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_domain(id, domain)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "domains/#{id}",
+                :body => Fog::JSON.encode(:domain => domain)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_endpoint.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_endpoint(id, endpoint)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "endpoints/#{id}",
+                :body => Fog::JSON.encode(:endpoint => endpoint)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_group.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_group(id, group)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "groups/#{id}",
+                :body => Fog::JSON.encode(:group => group)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_os_credential.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_os_credential(id, credential)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "credentials/#{id}",
+                :body => Fog::JSON.encode(:credential => credential)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_policy.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_policy(id, policy)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "policies/#{id}",
+                :body => Fog::JSON.encode(:policy => policy)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_project.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_project(id, project)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "projects/#{id}",
+                :body => Fog::JSON.encode(:project => project)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_role.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_role(id, role)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "roles/#{id}",
+                :body => Fog::JSON.encode(:role => role)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_service.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_service(id, service)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "services/#{id}",
+                :body => Fog::JSON.encode(:service => service)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/identity_v3/update_user.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Identity
+    class OpenStack
+      class V3
+        class Real
+          def update_user(id, user)
+            request(
+                :expects => [200],
+                :method => 'PATCH',
+                :path => "users/#{id}",
+                :body => Fog::JSON.encode(:user => user)
+            )
+          end
+        end
+
+        class Mock
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/image/list_public_images_detailed.rb

@@ -5,7 +5,7 @@ module Fog
         def list_public_images_detailed(attribute=nil, query=nil)
           path = 'images/detail'
           if attribute
-            query = { attribute => URI::encode(query) }
+            query = { attribute => query }
           else
             query = {}
           end

data/lib/fog/openstack/volume.rb

@@ -199,7 +199,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/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.30.0'
+  VERSION = '1.31.0'
 end

data/lib/fog/vsphere/requests/compute/cloudinit_to_customspec.rb

@@ -6,6 +6,20 @@ module Fog
           raise ArgumentError, "user_data can't be nil" if user_data.nil?
           custom_spec = { 'customization_spec' => Hash.new }
           user_data = YAML.load(user_data)
+          # https://pubs.vmware.com/vsphere-55/index.jsp#com.vmware.wssdk.apiref.doc/vim.vm.customization.Specification.html
+          # encryptionKey expects an array
+          # globalIPSettings expects a hash, REQUIRED
+          # identity expects an hash, REQUIRED
+          # nicSettingMap expects an array
+          # options expects an hash
+
+          custom_spec['encryptionKey']    = user_data['encryptionKey'] if user_data.key?('encryptionKey')
+          custom_spec['globalIPSettings'] = user_data['globalIPSettings'] if user_data.key?('globalIPSettings')
+          custom_spec['identity']         = user_data['identity'] if user_data.key?('identity')
+          custom_spec['nicSettingMap']    = user_data['nicSettingMap'] if user_data.key?('nicSettingMap')
+          custom_spec['options']          = user_data['options'] if user_data.key?('options')
+          
+          # for backwards compatability
           # hostname expects a string, REQUIRED
           # netmask expects a string
           # dns expects an array
@@ -30,14 +44,19 @@ module Fog
           raise ArgumentError, "user_data can't be nil" if user_data.nil?
           custom_spec = { 'customization_spec' => Hash.new }
           user_data = YAML.load(user_data)
-          custom_spec['hostname']                    =  user_data['hostname'] if user_data.key?('hostname')
-          custom_spec['ipsettings']                  =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
-          custom_spec['ipsettings']['subnetMask']    =  user_data['netmask'] if user_data.key?('netmask')
-          custom_spec['ipsettings']['dnsServerList'] =  user_data['dns'] if user_data.key?('dns')
-          custom_spec['ipsettings']['gateway']       =  user_data['gateway'] if user_data.key?('gateway')
-          custom_spec['domain']                      =  user_data['domain'] if user_data.key?('domain')
-          custom_spec['dnsSuffixList']               =  user_data['domainsuffixlist'] if user_data.key?('domainsuffixlist')
-          custom_spec['time_zone']                   =  user_data['timezone'] if user_data.key?('timezone')
+          custom_spec['encryptionKey']                = user_data['encryptionKey'] if user_data.key?('encryptionKey')
+          custom_spec['globalIPSettings']             = user_data['globalIPSettings'] if user_data.key?('globalIPSettings')
+          custom_spec['identity']                     = user_data['identity'] if user_data.key?('identity')
+          custom_spec['nicSettingMap']                = user_data['nicSettingMap'] if user_data.key?('nicSettingMap')
+          custom_spec['options']                      = user_data['options'] if user_data.key?('options')
+          custom_spec['hostname']                     =  user_data['hostname'] if user_data.key?('hostname')
+          custom_spec['ipsettings']                   =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
+          custom_spec['ipsettings']['subnetMask']     =  user_data['netmask'] if user_data.key?('netmask')
+          custom_spec['ipsettings']['dnsServerList']  =  user_data['dns'] if user_data.key?('dns')
+          custom_spec['ipsettings']['gateway']        =  user_data['gateway'] if user_data.key?('gateway')
+          custom_spec['domain']                       =  user_data['domain'] if user_data.key?('domain')
+          custom_spec['dnsSuffixList']                =  user_data['domainsuffixlist'] if user_data.key?('domainsuffixlist')
+          custom_spec['time_zone']                    =  user_data['timezone'] if user_data.key?('timezone')
           custom_spec  
         end
       end