Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 36 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV2Api.php b/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV2Api.php
deleted file mode 100755
index 4cc66b5..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV2Api.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Fixtures;
-
-use OpenCloud\Common\Api\ApiInterface;
-
-class IdentityV2Api implements ApiInterface
-{
-    public function postToken()
-    {
-        return [
-            'method' => 'POST',
-            'path'   => 'tokens',
-            'params' => [
-                'username' => [
-                    'type' => 'string',
-                    'required' => true,
-                    'path' => 'auth.passwordCredentials'
-                ],
-                'password' => [
-                    'type' => 'string',
-                    'required' => true,
-                    'path' => 'auth.passwordCredentials'
-                ],
-                'tenantId' => [
-                    'type' => 'string',
-                    'path' => 'auth',
-                ],
-                'tenantName' => [
-                    'type' => 'string',
-                    'path' => 'auth',
-                ]
-            ],
-        ];
-    }
-}