Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

3 files changed, 0 insertions, 228 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Fixtures/ComputeV2Api.php b/server/vendor/php-opencloud/common/tests/unit/Fixtures/ComputeV2Api.php
deleted file mode 100755
index 8c6858d..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Fixtures/ComputeV2Api.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Fixtures;
-
-use OpenCloud\Common\Api\ApiInterface;
-
-class ComputeV2Api implements ApiInterface
-{
-    private $idParam = ['type' => 'string', 'required' => true, 'location' => 'url'];
-
-    public function getImage()
-    {
-        return [
-            'method' => 'GET',
-            'path'   => 'images/{id}',
-            'params' => [self::$idParam]
-        ];
-    }
-
-    public function postServer()
-    {
-        return [
-            'path' => 'servers',
-            'method' => 'POST',
-            'jsonKey' => 'server',
-            'params' => [
-                'removeMetadata' => [
-                    'type' => 'object',
-                    'properties' => ['type' => 'string'],
-                ],
-                'securityGroups' => [
-                    'type' => 'array',
-                    'items' => [
-                        'type' => 'object',
-                        'properties' => [
-                            'name' => ['type' => 'string']
-                        ]
-                    ],
-                    'sentAs' => 'security_groups',
-                ],
-                'userData' => ['type' => 'string', 'sentAs' => 'user_data'],
-                'availabilityZone' => ['type' => 'string', 'sentAs' => 'availability_zone'],
-                'imageId' => ['type' => 'string', 'required' => true, 'sentAs' => 'imageRef'],
-                'flavorId' => ['type' => 'string', 'required' => true, 'sentAs' => 'flavorRef'],
-                'networks' => [
-                    'type' => 'array',
-                    'items' => [
-                        'type' => 'object',
-                        'properties' => [
-                            'uuid' => ['type' => 'string'],
-                            'port' => ['type' => 'string'],
-                        ]
-                    ]
-                ],
-                'name' => ['type' => 'string', 'required' => true],
-                'metadata' => [
-                    'type'        => 'object',
-                    'location'    => 'json',
-                    'description' => 'An arbitrary key/value pairing that will be used for metadata.',
-                    'properties'  => [
-                        'type'        => 'string',
-                        'description' => <<<TYPEOTHER
-The value being set for your key. Bear in mind that "key" is just an example, you can name it anything.
-TYPEOTHER
-                    ]
-                ],
-                'personality' => ['type' => 'string'],
-                'blockDeviceMapping' => [
-                    'type' => 'array',
-                    'sentAs' => 'block_device_mapping_v2',
-                    'items' => [
-                        'type' => 'object',
-                        'properties' => [
-                            'configDrive' => ['type' => 'string', 'sentAs' => 'config_drive'],
-                            'bootIndex' => ['type' => 'string', 'sentAs' => 'boot_index'],
-                            'deleteOnTermination' => ['type' => 'boolean', 'sentAs' => 'delete_on_termination'],
-                            'guestFormat' => ['type' => 'string', 'sentAs' => 'guest_format'],
-                            'destinationType' => ['type' => 'string', 'sentAs' => 'destination_type'],
-                            'sourceType' => ['type' => 'string', 'sentAs' => 'source_type'],
-                            'deviceName' => ['type' => 'string', 'sentAs' => 'device_name'],
-                        ]
-                    ],
-                ],
-            ]
-        ];
-    }
-
-    public function test()
-    {
-        return [
-            'method' => 'GET',
-            'path'   => 'foo',
-            'params' => [
-                'id'  => ['type' => 'string', 'location' => 'json'],
-                'bar' => ['type' => 'string', 'location' => 'json'],
-            ]
-        ];
-    }
-
-    public function getServers()
-    {
-        return [
-            'method' => 'GET',
-            'path'   => 'servers',
-            'params' => [
-                'changesSince' => ['sentAs' => 'changes-since', 'type' => 'string', 'location' => 'query'],
-                'imageId'      => ['sentAs' => 'image', 'type' => 'string', 'location' => 'query'],
-                'flavorId'     => ['sentAs' => 'flavor', 'type' => 'string', 'location' => 'query'],
-                'name'         => ['type' => 'string', 'location' => 'query'],
-                'marker'       => ['type' => 'string', 'location' => 'query'],
-                'limit'        => ['type' => 'integer', 'location' => 'query'],
-                'status'       => ['type' => 'string', 'location' => 'query'],
-                'host'         => ['type' => 'string', 'location' => 'query']
-            ],
-        ];
-    }
-}
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',
-                ]
-            ],
-        ];
-    }
-}
diff --git a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php b/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php
deleted file mode 100755
index 2fc922f..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Fixtures/IdentityV3Api.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Fixtures;
-
-class IdentityV3Api
-{
-    private function domainParam()
-    {
-        return [
-            'type' => 'object',
-            'params' => [
-                'id'   => ['type' => 'string'],
-                'name' => ['type' => 'string']
-            ]
-        ];
-    }
-
-    private function projectParam()
-    {
-        return [
-            'type' => 'object',
-            'params' => [
-                'id'     => ['type' => 'string'],
-                'name'   => ['type' => 'string'],
-                'domain' => $this->domainParam(),
-            ]
-        ];
-    }
-
-    public function postTokens()
-    {
-        return [
-            'method' => 'POST',
-            'path'   => 'tokens',
-            'params' => [
-                'methods' => [
-                    'type' => 'array',
-                    'path' => 'auth.identity',
-                    'items' => [
-                        'type' => 'string'
-                    ]
-                ],
-                'user' => [
-                    'path'   => 'auth.identity.password',
-                    'type'   => 'object',
-                    'properties' => [
-                        'id'       => [
-                            'type' => 'string',
-                        ],
-                        'name'     => [
-                            'type' => 'string',
-                        ],
-                        'password' => [
-                            'type' => 'string',
-                        ],
-                        'domain'   => $this->domainParam()
-                    ]
-                ],
-                'tokenId' => [
-                    'type'   => 'string',
-                    'path'   => 'auth.identity.token',
-                    'sentAs' => 'id',
-                ],
-                'scope' => [
-                    'type' => 'object',
-                    'path' => 'auth',
-                    'properties' => [
-                        'project' => $this->projectParam(),
-                        'domain'  => $this->domainParam()
-                    ]
-                ]
-            ]
-        ];
-    }
-}