From db039060859e926bd545f63eda46e3844eddb74a Mon Sep 17 00:00:00 2001
From: Patrick Oberdorf <p.oberdorf@mobilistics.de>
Date: Fri, 28 Jun 2019 00:53:47 +0200
Subject: [PATCH 001/102] Support volume_type in server create

---
 src/Compute/v2/Params.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Compute/v2/Params.php b/src/Compute/v2/Params.php
index e61ae3ad..70e7fec6 100644
--- a/src/Compute/v2/Params.php
+++ b/src/Compute/v2/Params.php
@@ -356,6 +356,11 @@ public function blockDeviceMapping(): array
                         'sentAs'      => 'volume_size',
                         'description' => 'Size of the volume created if we are doing vol creation',
                     ],
+                    'volumeType' => [
+                        'type'        => self::STRING_TYPE,
+                        'sentAs'      => 'volume_type',
+                        'description' => 'This can be used to specify the type of volume which the compute service will create and attach to the server.',
+                    ],
                 ],
             ],
         ];

From 84919d94d734a05bde16041ea743b90b36eb41cf Mon Sep 17 00:00:00 2001
From: The Digital Orchard <webmaster@thedigitalorchard.ca>
Date: Sat, 27 Jul 2019 16:21:41 -0700
Subject: [PATCH 002/102] allow wildcard region; syntax fix with == instead of
 =

---
 src/Identity/v3/Models/Endpoint.php | 2 +-
 src/Identity/v3/Models/Service.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Identity/v3/Models/Endpoint.php b/src/Identity/v3/Models/Endpoint.php
index 775768a4..2d85a9a7 100644
--- a/src/Identity/v3/Models/Endpoint.php
+++ b/src/Identity/v3/Models/Endpoint.php
@@ -80,7 +80,7 @@ public function delete()
 
     public function regionMatches(string $value): bool
     {
-        return $this->region && $this->region == $value;
+        return in_array($this->region, ['*', $value]);
     }
 
     public function interfaceMatches(string $value): bool
diff --git a/src/Identity/v3/Models/Service.php b/src/Identity/v3/Models/Service.php
index 6b58c088..61428436 100644
--- a/src/Identity/v3/Models/Service.php
+++ b/src/Identity/v3/Models/Service.php
@@ -93,7 +93,7 @@ private function nameMatches(string $value): bool
 
     private function typeMatches(string $value): bool
     {
-        return $this->type && $this->type = $value;
+        return $this->type && $this->type == $value;
     }
 
     /**

From c209a196aa8de89fe4338c947c95591ab54d908c Mon Sep 17 00:00:00 2001
From: haphan <thanhha.phan@myrepublic.net>
Date: Tue, 7 Jan 2020 16:23:50 +0800
Subject: [PATCH 003/102] Build for php 7.3 and 7.4

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 419f76bc..38dd04a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: php
 
 sudo: false
 
+dist: bionic
+
 cache:
   directories:
     - $HOME/.composer/cache
@@ -11,6 +13,8 @@ matrix:
     - php: 7.0
     - php: 7.1
     - php: 7.2
+    - php: 7.3
+    - php: 7.4
     - php: nightly
   allow_failures:
     - php: nightly

From 88037a520646a93dfab64ca35bfc1e1419aca0de Mon Sep 17 00:00:00 2001
From: haphan <thanhha.phan@myrepublic.net>
Date: Tue, 7 Jan 2020 16:24:31 +0800
Subject: [PATCH 004/102] Applied php-cs-fixer

Mostly removed no_superfluous_phpdoc_tags, phpdoc_trim and no_empty_phpdoc
---
 src/BlockStorage/v2/Models/Snapshot.php       |  4 +-
 src/BlockStorage/v2/Models/Volume.php         |  8 +-
 src/BlockStorage/v2/Models/VolumeType.php     |  4 +-
 src/BlockStorage/v2/Service.php               | 30 -------
 src/Common/Api/Operation.php                  | 13 ---
 src/Common/Api/OperatorInterface.php          |  8 --
 src/Common/Api/OperatorTrait.php              |  8 +-
 src/Common/Api/Parameter.php                  | 33 +-------
 src/Common/ArrayAccessTrait.php               |  8 --
 src/Common/Auth/AuthHandler.php               | 11 ---
 src/Common/Error/Builder.php                  | 12 ---
 src/Common/Resource/AbstractResource.php      |  6 --
 src/Common/Resource/Alias.php                 |  3 +-
 src/Common/Resource/Creatable.php             |  2 -
 src/Common/Resource/HasMetadata.php           |  6 --
 src/Common/Resource/HasWaiterTrait.php        |  1 -
 src/Common/Resource/OperatorResource.php      |  4 -
 src/Common/Resource/ResourceInterface.php     |  4 -
 src/Common/Service/Builder.php                |  7 +-
 src/Common/Transport/JsonSerializer.php       | 10 +--
 src/Common/Transport/Middleware.php           |  8 +-
 src/Common/Transport/Utils.php                | 11 +--
 src/Compute/v2/Models/AvailabilityZone.php    |  2 +-
 src/Compute/v2/Models/Flavor.php              |  2 +-
 src/Compute/v2/Models/Host.php                |  2 +-
 src/Compute/v2/Models/Hypervisor.php          |  2 +-
 src/Compute/v2/Models/Image.php               |  4 +-
 src/Compute/v2/Models/Keypair.php             |  2 +-
 src/Compute/v2/Models/Server.php              | 38 +--------
 src/Compute/v2/Service.php                    | 55 +------------
 src/Identity/v2/Models/Catalog.php            |  8 +-
 src/Identity/v2/Models/Endpoint.php           |  8 --
 src/Identity/v2/Models/Entry.php              |  8 --
 src/Identity/v2/Models/Token.php              |  2 +-
 src/Identity/v3/Models/Assignment.php         |  2 +-
 src/Identity/v3/Models/Catalog.php            |  8 +-
 src/Identity/v3/Models/Credential.php         |  2 +-
 src/Identity/v3/Models/Domain.php             | 10 +--
 src/Identity/v3/Models/Endpoint.php           |  4 +-
 src/Identity/v3/Models/Group.php              |  6 +-
 src/Identity/v3/Models/Policy.php             |  2 +-
 src/Identity/v3/Models/Project.php            | 10 +--
 src/Identity/v3/Models/Role.php               |  2 +-
 src/Identity/v3/Models/Service.php            |  2 +-
 src/Identity/v3/Models/Token.php              | 17 +---
 src/Identity/v3/Models/User.php               |  8 +-
 src/Identity/v3/Service.php                   | 70 +---------------
 src/Images/v2/Models/Image.php                |  2 +-
 src/Images/v2/Models/Member.php               |  2 +-
 src/Images/v2/Service.php                     |  2 -
 src/Metric/v1/Gnocchi/Models/Resource.php     |  9 ---
 src/Metric/v1/Gnocchi/Service.php             | 18 -----
 .../Extensions/Layer3/Models/FloatingIp.php   |  2 +-
 .../v2/Extensions/Layer3/Models/Router.php    |  4 +-
 .../v2/Extensions/Layer3/Service.php          | 24 ------
 .../SecurityGroups/Models/SecurityGroup.php   |  2 +-
 .../Models/SecurityGroupRule.php              |  2 +-
 .../v2/Extensions/SecurityGroups/Service.php  | 28 -------
 src/Networking/v2/Models/LoadBalancer.php     |  8 --
 src/Networking/v2/Models/LoadBalancerPool.php | 12 ---
 src/Networking/v2/Models/LoadBalancerStat.php |  2 +-
 .../v2/Models/LoadBalancerStatus.php          |  2 +-
 src/Networking/v2/Models/Network.php          |  6 +-
 src/Networking/v2/Models/Port.php             |  2 +-
 src/Networking/v2/Models/Subnet.php           |  6 +-
 src/Networking/v2/Params.php                  |  4 -
 src/Networking/v2/Service.php                 | 79 -------------------
 src/ObjectStore/v1/Models/Account.php         |  2 +-
 src/ObjectStore/v1/Models/Container.php       | 10 +--
 src/ObjectStore/v1/Models/StorageObject.php   | 14 +---
 src/ObjectStore/v1/Service.php                |  8 --
 src/OpenStack.php                             | 27 -------
 72 files changed, 70 insertions(+), 684 deletions(-)

diff --git a/src/BlockStorage/v2/Models/Snapshot.php b/src/BlockStorage/v2/Models/Snapshot.php
index f87c93d4..f36dbeba 100644
--- a/src/BlockStorage/v2/Models/Snapshot.php
+++ b/src/BlockStorage/v2/Models/Snapshot.php
@@ -5,12 +5,12 @@
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
 use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 use OpenStack\Common\Transport\Utils;
@@ -85,8 +85,6 @@ public function retrieve()
 
     /**
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postSnapshots}
-     *
-     * @return Creatable
      */
     public function create(array $userOptions): Creatable
     {
diff --git a/src/BlockStorage/v2/Models/Volume.php b/src/BlockStorage/v2/Models/Volume.php
index 01e8a1df..55e886b6 100644
--- a/src/BlockStorage/v2/Models/Volume.php
+++ b/src/BlockStorage/v2/Models/Volume.php
@@ -5,12 +5,12 @@
 namespace OpenStack\BlockStorage\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
 use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 use OpenStack\Common\Transport\Utils;
@@ -111,8 +111,6 @@ public function retrieve()
 
     /**
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postVolumes}
-     *
-     * @return Creatable
      */
     public function create(array $userOptions): Creatable
     {
@@ -162,8 +160,6 @@ public function parseMetadata(ResponseInterface $response): array
 
     /**
      * Update the bootable status for a volume, mark it as a bootable volume.
-     *
-     * @param bool $bootable
      */
     public function setBootable(bool $bootable = true)
     {
@@ -172,8 +168,6 @@ public function setBootable(bool $bootable = true)
 
     /**
      * Sets the image metadata for a volume.
-     *
-     * @param array $metadata
      */
     public function setImageMetadata(array $metadata)
     {
diff --git a/src/BlockStorage/v2/Models/VolumeType.php b/src/BlockStorage/v2/Models/VolumeType.php
index ba6fffd1..c54425e2 100644
--- a/src/BlockStorage/v2/Models/VolumeType.php
+++ b/src/BlockStorage/v2/Models/VolumeType.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\BlockStorage\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Updateable;
 
 /**
@@ -26,8 +26,6 @@ class VolumeType extends OperatorResource implements Listable, Creatable, Update
 
     /**
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postTypes}
-     *
-     * @return Creatable
      */
     public function create(array $userOptions): Creatable
     {
diff --git a/src/BlockStorage/v2/Service.php b/src/BlockStorage/v2/Service.php
index 084594dc..5df79b55 100644
--- a/src/BlockStorage/v2/Service.php
+++ b/src/BlockStorage/v2/Service.php
@@ -20,8 +20,6 @@ class Service extends AbstractService
      * You must have enough volume storage quota remaining to create a volume of size requested.
      *
      * @param array $userOptions {@see Api::postVolumes}
-     *
-     * @return Volume
      */
     public function createVolume(array $userOptions): Volume
     {
@@ -33,8 +31,6 @@ public function createVolume(array $userOptions): Volume
      *
      * @param bool  $detail      if set to TRUE, more information will be returned
      * @param array $userOptions {@see Api::getVolumes}
-     *
-     * @return \Generator
      */
     public function listVolumes(bool $detail = false, array $userOptions = []): \Generator
     {
@@ -45,8 +41,6 @@ public function listVolumes(bool $detail = false, array $userOptions = []): \Gen
 
     /**
      * @param string $volumeId the UUID of the volume being retrieved
-     *
-     * @return Volume
      */
     public function getVolume(string $volumeId): Volume
     {
@@ -58,27 +52,17 @@ public function getVolume(string $volumeId): Volume
 
     /**
      * @param array $userOptions {@see Api::postTypes}
-     *
-     * @return VolumeType
      */
     public function createVolumeType(array $userOptions): VolumeType
     {
         return $this->model(VolumeType::class)->create($userOptions);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listVolumeTypes(): \Generator
     {
         return $this->model(VolumeType::class)->enumerate($this->api->getTypes(), []);
     }
 
-    /**
-     * @param string $typeId
-     *
-     * @return VolumeType
-     */
     public function getVolumeType(string $typeId): VolumeType
     {
         $type = $this->model(VolumeType::class);
@@ -89,17 +73,12 @@ public function getVolumeType(string $typeId): VolumeType
 
     /**
      * @param array $userOptions {@see Api::postSnapshots}
-     *
-     * @return Snapshot
      */
     public function createSnapshot(array $userOptions): Snapshot
     {
         return $this->model(Snapshot::class)->create($userOptions);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listSnapshots(bool $detail = false, array $userOptions = []): \Generator
     {
         $def = (true === $detail) ? $this->api->getSnapshotsDetail() : $this->api->getSnapshots();
@@ -107,11 +86,6 @@ public function listSnapshots(bool $detail = false, array $userOptions = []): \G
         return $this->model(Snapshot::class)->enumerate($def, $userOptions);
     }
 
-    /**
-     * @param string $snapshotId
-     *
-     * @return Snapshot
-     */
     public function getSnapshot(string $snapshotId): Snapshot
     {
         $snapshot = $this->model(Snapshot::class);
@@ -122,10 +96,6 @@ public function getSnapshot(string $snapshotId): Snapshot
 
     /**
      * Shows A Quota for a tenant.
-     *
-     * @param string $tenantId
-     *
-     * @return QuotaSet
      */
     public function getQuotaSet(string $tenantId): QuotaSet
     {
diff --git a/src/Common/Api/Operation.php b/src/Common/Api/Operation.php
index e200b259..26278927 100644
--- a/src/Common/Api/Operation.php
+++ b/src/Common/Api/Operation.php
@@ -44,17 +44,11 @@ public function __construct(array $definition)
         $this->params = self::toParamArray($definition['params']);
     }
 
-    /**
-     * @return string
-     */
     public function getPath(): string
     {
         return $this->path;
     }
 
-    /**
-     * @return string
-     */
     public function getMethod(): string
     {
         return $this->method;
@@ -64,8 +58,6 @@ public function getMethod(): string
      * Indicates whether this operation supports a parameter.
      *
      * @param $key The name of a parameter
-     *
-     * @return bool
      */
     public function hasParam(string $key): bool
     {
@@ -82,9 +74,6 @@ public function getParam(string $name)
         return isset($this->params[$name]) ? $this->params[$name] : null;
     }
 
-    /**
-     * @return string
-     */
     public function getJsonKey(): string
     {
         return $this->jsonKey ?: '';
@@ -95,8 +84,6 @@ public function getJsonKey(): string
      * {@see Parameter} objects.
      *
      * @param array $data A generic data array
-     *
-     * @return array
      */
     public static function toParamArray(array $data): array
     {
diff --git a/src/Common/Api/OperatorInterface.php b/src/Common/Api/OperatorInterface.php
index 7bb10059..56219f49 100644
--- a/src/Common/Api/OperatorInterface.php
+++ b/src/Common/Api/OperatorInterface.php
@@ -28,8 +28,6 @@ public function __construct(ClientInterface $client, ApiInterface $api);
      *
      * @param array $definition The data that dictates how the operation works
      * @param array $userValues The user-defined values that populate the request
-     *
-     * @return \Psr\Http\Message\ResponseInterface
      */
     public function execute(array $definition, array $userValues = []): ResponseInterface;
 
@@ -38,8 +36,6 @@ public function execute(array $definition, array $userValues = []): ResponseInte
      *
      * @param array $definition The data that dictates how the operation works
      * @param array $userValues The user-defined values that populate the request
-     *
-     * @return \GuzzleHttp\Promise\PromiseInterface
      */
     public function executeAsync(array $definition, array $userValues = []): PromiseInterface;
 
@@ -48,8 +44,6 @@ public function executeAsync(array $definition, array $userValues = []): Promise
      * HTTP client is also injected into the object to allow it to communicate with the remote API.
      *
      * @param array $definition The data that dictates how the operation works
-     *
-     * @return Operation
      */
     public function getOperation(array $definition): Operation;
 
@@ -57,8 +51,6 @@ public function getOperation(array $definition): Operation;
      * @param string $class the name of the model class
      * @param mixed  $data  either a {@see ResponseInterface} or data array that will populate the newly
      *                      created model class
-     *
-     * @return \OpenStack\Common\Resource\ResourceInterface
      */
     public function model(string $class, $data = null): ResourceInterface;
 }
diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index 909acdf9..ccbe34ab 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\Common\Api;
 
-use GuzzleHttp\Promise\PromiseInterface;
-use function GuzzleHttp\uri_template;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Promise\Promise;
+use GuzzleHttp\Promise\PromiseInterface;
+use function GuzzleHttp\uri_template;
 use OpenStack\Common\Resource\ResourceInterface;
 use OpenStack\Common\Transport\RequestSerializer;
 use Psr\Http\Message\ResponseInterface;
@@ -99,10 +99,6 @@ public function getOperation(array $definition): Operation
     }
 
     /**
-     * @param Operation $operation
-     * @param array     $userValues
-     * @param bool      $async
-     *
      * @return mixed
      *
      * @throws \Exception
diff --git a/src/Common/Api/Parameter.php b/src/Common/Api/Parameter.php
index 389c626f..5d46d7e3 100644
--- a/src/Common/Api/Parameter.php
+++ b/src/Common/Api/Parameter.php
@@ -118,9 +118,6 @@ class Parameter
      */
     private $enum;
 
-    /**
-     * @param array $data
-     */
     public function __construct(array $data)
     {
         $this->hydrate($data);
@@ -163,8 +160,6 @@ private function stockProperties(array $data)
 
     /**
      * Retrieve the name that will be used over the wire.
-     *
-     * @return string
      */
     public function getName(): string
     {
@@ -173,8 +168,6 @@ public function getName(): string
 
     /**
      * Indicates whether the user must provide a value for this parameter.
-     *
-     * @return bool
      */
     public function isRequired(): bool
     {
@@ -207,24 +200,14 @@ public function validate($userValues): bool
     private function validateEnums($userValues)
     {
         if (!empty($this->enum) && 'string' == $this->type && !in_array($userValues, $this->enum)) {
-            throw new \Exception(sprintf(
-                'The only permitted values are %s. You provided %s',
-                implode(', ', $this->enum),
-                print_r($userValues, true)
-            ));
+            throw new \Exception(sprintf('The only permitted values are %s. You provided %s', implode(', ', $this->enum), print_r($userValues, true)));
         }
     }
 
     private function validateType($userValues)
     {
         if (!$this->hasCorrectType($userValues)) {
-            throw new \Exception(sprintf(
-                'The key provided "%s" has the wrong value type. You provided %s (%s) but was expecting %s',
-                $this->name,
-                print_r($userValues, true),
-                gettype($userValues),
-                $this->type
-            ));
+            throw new \Exception(sprintf('The key provided "%s" has the wrong value type. You provided %s (%s) but was expecting %s', $this->name, print_r($userValues, true), gettype($userValues), $this->type));
         }
     }
 
@@ -268,8 +251,6 @@ private function getNestedProperty($key): Parameter
      * by this parameter.
      *
      * @param $userValue The value being checked
-     *
-     * @return bool
      */
     private function hasCorrectType($userValue): bool
     {
@@ -302,8 +283,6 @@ private function hasCorrectType($userValue): bool
 
     /**
      * Indicates whether this parameter represents an array type.
-     *
-     * @return bool
      */
     public function isArray(): bool
     {
@@ -312,8 +291,6 @@ public function isArray(): bool
 
     /**
      * Indicates whether this parameter represents an object type.
-     *
-     * @return bool
      */
     public function isObject(): bool
     {
@@ -329,8 +306,6 @@ public function getLocation(): string
      * Verifies whether the given location matches the parameter's location.
      *
      * @param $value
-     *
-     * @return bool
      */
     public function hasLocation($value): bool
     {
@@ -359,8 +334,6 @@ public function getItemSchema()
 
     /**
      * Sets the name of the parameter to a new value.
-     *
-     * @param string $name
      */
     public function setName(string $name)
     {
@@ -372,7 +345,7 @@ public function setName(string $name)
      *
      * @param string $name The name of the child property
      *
-     * @return null|Parameter
+     * @return Parameter|null
      */
     public function getProperty(string $name)
     {
diff --git a/src/Common/ArrayAccessTrait.php b/src/Common/ArrayAccessTrait.php
index beecc1d0..cbd709df 100644
--- a/src/Common/ArrayAccessTrait.php
+++ b/src/Common/ArrayAccessTrait.php
@@ -33,10 +33,6 @@ public function offsetSet($offset, $value)
 
     /**
      * Checks whether an internal key exists.
-     *
-     * @param string $offset
-     *
-     * @return bool
      */
     public function offsetExists(string $offset): bool
     {
@@ -45,8 +41,6 @@ public function offsetExists(string $offset): bool
 
     /**
      * Unsets an internal key.
-     *
-     * @param string $offset
      */
     public function offsetUnset(string $offset)
     {
@@ -56,8 +50,6 @@ public function offsetUnset(string $offset)
     /**
      * Retrieves an internal key.
      *
-     * @param string $offset
-     *
      * @return mixed|null
      */
     public function offsetGet(string $offset)
diff --git a/src/Common/Auth/AuthHandler.php b/src/Common/Auth/AuthHandler.php
index 19c9beda..e5a4e286 100644
--- a/src/Common/Auth/AuthHandler.php
+++ b/src/Common/Auth/AuthHandler.php
@@ -25,10 +25,6 @@ class AuthHandler
     /** @var Token */
     private $token;
 
-    /**
-     * @param callable $nextHandler
-     * @param callable $tokenGenerator
-     */
     public function __construct(callable $nextHandler, callable $tokenGenerator, Token $token = null)
     {
         $this->nextHandler    = $nextHandler;
@@ -41,9 +37,6 @@ public function __construct(callable $nextHandler, callable $tokenGenerator, Tok
      * checks to see whether a token is set and valid, and then sets the ``X-Auth-Token`` header
      * for the HTTP request before letting it continue on its merry way.
      *
-     * @param RequestInterface $request
-     * @param array            $options
-     *
      * @return mixed|void
      */
     public function __invoke(RequestInterface $request, array $options)
@@ -66,10 +59,6 @@ public function __invoke(RequestInterface $request, array $options)
     /**
      * Internal method which prevents infinite recursion. For certain requests, like the initial
      * auth call itself, we do NOT want to send a token.
-     *
-     * @param RequestInterface $request
-     *
-     * @return bool
      */
     private function shouldIgnore(RequestInterface $request): bool
     {
diff --git a/src/Common/Error/Builder.php b/src/Common/Error/Builder.php
index 0a262e4a..f7ba9615 100644
--- a/src/Common/Error/Builder.php
+++ b/src/Common/Error/Builder.php
@@ -45,8 +45,6 @@ public function __construct(ClientInterface $client = null)
      * Internal method used when outputting headers in the error description.
      *
      * @param $name
-     *
-     * @return string
      */
     private function header(string $name): string
     {
@@ -58,8 +56,6 @@ private function header(string $name): string
      * directed off to a broken link. If a 404 is detected, it is hidden.
      *
      * @param $link The proposed link
-     *
-     * @return bool
      */
     private function linkIsValid(string $link): bool
     {
@@ -73,11 +69,7 @@ private function linkIsValid(string $link): bool
     }
 
     /**
-     * @param MessageInterface $message
-     *
      * @codeCoverageIgnore
-     *
-     * @return string
      */
     public function str(MessageInterface $message): string
     {
@@ -110,8 +102,6 @@ public function str(MessageInterface $message): string
      *
      * @param RequestInterface  $request  The faulty request
      * @param ResponseInterface $response The error-filled response
-     *
-     * @return BadResponseError
      */
     public function httpError(RequestInterface $request, ResponseInterface $response): BadResponseError
     {
@@ -160,8 +150,6 @@ private function getStatusCodeMessage(int $statusCode): string
      * @param string      $expectedType The type that was expected from the user
      * @param mixed       $userValue    The incorrect value the user actually provided
      * @param string|null $furtherLink  a link to further information if necessary (optional)
-     *
-     * @return UserInputError
      */
     public function userInputError(string $expectedType, $userValue, string $furtherLink = null): UserInputError
     {
diff --git a/src/Common/Resource/AbstractResource.php b/src/Common/Resource/AbstractResource.php
index bfa1ef89..2dcf5632 100644
--- a/src/Common/Resource/AbstractResource.php
+++ b/src/Common/Resource/AbstractResource.php
@@ -38,8 +38,6 @@ abstract class AbstractResource implements ResourceInterface, Serializable
     /**
      * Populates the current resource from a response object.
      *
-     * @param ResponseInterface $response
-     *
      * @return AbstractResource
      */
     public function populateFromResponse(ResponseInterface $response)
@@ -57,8 +55,6 @@ public function populateFromResponse(ResponseInterface $response)
     /**
      * Populates the current resource from a data array.
      *
-     * @param array $array
-     *
      * @return mixed|void
      */
     public function populateFromArray(array $array)
@@ -100,8 +96,6 @@ protected function getAliases(): array
     /**
      * Internal method which retrieves the values of provided keys.
      *
-     * @param array $keys
-     *
      * @return array
      */
     protected function getAttrs(array $keys)
diff --git a/src/Common/Resource/Alias.php b/src/Common/Resource/Alias.php
index 400339aa..69746f22 100644
--- a/src/Common/Resource/Alias.php
+++ b/src/Common/Resource/Alias.php
@@ -34,8 +34,7 @@ public function __construct(string $propertyName, string $className = null, bool
     }
 
     /**
-     * @param ResourceInterface $resource
-     * @param mixed             $value
+     * @param mixed $value
      *
      * @return mixed
      */
diff --git a/src/Common/Resource/Creatable.php b/src/Common/Resource/Creatable.php
index 797f3cd4..80ac7570 100644
--- a/src/Common/Resource/Creatable.php
+++ b/src/Common/Resource/Creatable.php
@@ -12,8 +12,6 @@ interface Creatable
     /**
      * Create a new resource according to the configuration set in the options.
      *
-     * @param array $userOptions
-     *
      * @return self
      */
     public function create(array $userOptions): Creatable;
diff --git a/src/Common/Resource/HasMetadata.php b/src/Common/Resource/HasMetadata.php
index 5bb3a265..8587fc17 100644
--- a/src/Common/Resource/HasMetadata.php
+++ b/src/Common/Resource/HasMetadata.php
@@ -11,8 +11,6 @@ interface HasMetadata
     /**
      * Retrieves the metadata for the resource in the form of an associative array or hash. Each key represents the
      * metadata item's name, and each value represents the metadata item's remote value.
-     *
-     * @return array
      */
     public function getMetadata(): array;
 
@@ -56,10 +54,6 @@ public function resetMetadata(array $metadata);
 
     /**
      * Extracts metadata from a response object and returns it in the form of an associative array.
-     *
-     * @param ResponseInterface $response
-     *
-     * @return array
      */
     public function parseMetadata(ResponseInterface $response): array;
 }
diff --git a/src/Common/Resource/HasWaiterTrait.php b/src/Common/Resource/HasWaiterTrait.php
index 44fe3075..7747fdbf 100644
--- a/src/Common/Resource/HasWaiterTrait.php
+++ b/src/Common/Resource/HasWaiterTrait.php
@@ -74,7 +74,6 @@ public function waitWithCallback(callable $fn, $timeout = 60, int $sleepPeriod =
      * Internal method used to identify whether a timeout has been exceeded.
      *
      * @param bool|int $timeout
-     * @param int      $startTime
      *
      * @return bool
      */
diff --git a/src/Common/Resource/OperatorResource.php b/src/Common/Resource/OperatorResource.php
index ebd15074..35cf3186 100644
--- a/src/Common/Resource/OperatorResource.php
+++ b/src/Common/Resource/OperatorResource.php
@@ -33,8 +33,6 @@ abstract class OperatorResource extends AbstractResource implements OperatorInte
      * Will create a new instance of this class with the current HTTP client and API injected in. This
      * is useful when enumerating over a collection since multiple copies of the same resource class
      * are needed.
-     *
-     * @return OperatorResource
      */
     public function newInstance(): OperatorResource
     {
@@ -50,8 +48,6 @@ protected function getHttpBaseUrl()
     }
 
     /**
-     * @param array $definition
-     *
      * @return mixed
      */
     public function executeWithState(array $definition)
diff --git a/src/Common/Resource/ResourceInterface.php b/src/Common/Resource/ResourceInterface.php
index 60420593..ae3249dd 100644
--- a/src/Common/Resource/ResourceInterface.php
+++ b/src/Common/Resource/ResourceInterface.php
@@ -15,15 +15,11 @@ interface ResourceInterface
      * All models which represent an API resource should be able to be populated
      * from a {@see ResponseInterface} object.
      *
-     * @param ResponseInterface $response
-     *
      * @return self
      */
     public function populateFromResponse(ResponseInterface $response);
 
     /**
-     * @param array $data
-     *
      * @return mixed
      */
     public function populateFromArray(array $data);
diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index c687e064..8103aca7 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -119,8 +119,6 @@ private function addDebugMiddleware(array $options, HandlerStack &$stack)
     }
 
     /**
-     * @param array $options
-     *
      * @codeCoverageIgnore
      */
     private function stockAuthHandler(array &$options)
@@ -167,10 +165,7 @@ private function mergeOptions(array $serviceOptions): array
         }
 
         if (!isset($options['identityService']) || !($options['identityService'] instanceof IdentityService)) {
-            throw new \InvalidArgumentException(sprintf(
-                '"identityService" must be specified and implement %s',
-                IdentityService::class
-            ));
+            throw new \InvalidArgumentException(sprintf('"identityService" must be specified and implement %s', IdentityService::class));
         }
 
         return $options;
diff --git a/src/Common/Transport/JsonSerializer.php b/src/Common/Transport/JsonSerializer.php
index db8255c9..5cd2e25b 100644
--- a/src/Common/Transport/JsonSerializer.php
+++ b/src/Common/Transport/JsonSerializer.php
@@ -61,8 +61,6 @@ private function stockArrayJson(Parameter $param, array $userValue): array
      *
      * @param Parameter $param     The schema that defines how the JSON field is being populated
      * @param mixed     $userValue The user value that is populating a JSON field
-     *
-     * @return array
      */
     private function stockObjectJson(Parameter $param, \stdClass $userValue): array
     {
@@ -81,8 +79,6 @@ private function stockObjectJson(Parameter $param, \stdClass $userValue): array
      * @param Parameter $param     The schema that defines how the JSON field is being populated
      * @param mixed     $userValue The user value that is populating a JSON field
      * @param array     $json      The existing JSON structure that will be populated
-     *
-     * @return array
      */
     public function stockJson(Parameter $param, $userValue, array $json): array
     {
@@ -101,11 +97,7 @@ private function serializeObjectValue($value)
             if ($value instanceof Serializable) {
                 $value = $value->serialize();
             } elseif (!($value instanceof \stdClass)) {
-                throw new \InvalidArgumentException(sprintf(
-                    'When an object value is provided, it must either be \stdClass or implement the Serializable '
-                    .'interface, you provided %s',
-                    print_r($value, true)
-                ));
+                throw new \InvalidArgumentException(sprintf('When an object value is provided, it must either be \stdClass or implement the Serializable '.'interface, you provided %s', print_r($value, true)));
             }
         }
 
diff --git a/src/Common/Transport/Middleware.php b/src/Common/Transport/Middleware.php
index e344b4fb..a601741f 100644
--- a/src/Common/Transport/Middleware.php
+++ b/src/Common/Transport/Middleware.php
@@ -15,9 +15,6 @@
 
 final class Middleware
 {
-    /**
-     * @return callable
-     */
     public static function httpErrors(): callable
     {
         return function (callable $handler) {
@@ -35,10 +32,7 @@ function (ResponseInterface $response) use ($request, $handler) {
     }
 
     /**
-     * @param callable $tokenGenerator
-     * @param Token    $token
-     *
-     * @return callable
+     * @param Token $token
      */
     public static function authHandler(callable $tokenGenerator, Token $token = null): callable
     {
diff --git a/src/Common/Transport/Utils.php b/src/Common/Transport/Utils.php
index 88155f39..3b5a2681 100644
--- a/src/Common/Transport/Utils.php
+++ b/src/Common/Transport/Utils.php
@@ -30,9 +30,7 @@ public static function jsonDecode(ResponseInterface $response, bool $assoc = tru
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             $last = json_last_error();
-            throw new \InvalidArgumentException(
-                'Unable to parse JSON data: '.(isset($jsonErrors[$last]) ? $jsonErrors[$last] : 'Unknown error')
-            );
+            throw new \InvalidArgumentException('Unable to parse JSON data: '.(isset($jsonErrors[$last]) ? $jsonErrors[$last] : 'Unknown error'));
         }
 
         return $data;
@@ -58,8 +56,6 @@ public static function flattenJson($data, string $key = null)
      * closing url separator when missing.
      *
      * @param string $url the url representation
-     *
-     * @return string
      */
     public static function normalizeUrl(string $url): string
     {
@@ -73,10 +69,7 @@ public static function normalizeUrl(string $url): string
     /**
      * Add an unlimited list of paths to a given URI.
      *
-     * @param UriInterface $uri
-     * @param              ...$paths
-     *
-     * @return UriInterface
+     * @param ...$paths
      */
     public static function addPaths(UriInterface $uri, ...$paths): UriInterface
     {
diff --git a/src/Compute/v2/Models/AvailabilityZone.php b/src/Compute/v2/Models/AvailabilityZone.php
index 095d7bbf..0d763099 100644
--- a/src/Compute/v2/Models/AvailabilityZone.php
+++ b/src/Compute/v2/Models/AvailabilityZone.php
@@ -4,8 +4,8 @@
 
 namespace OpenStack\Compute\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 
 /**
  * Represents a Compute v2 AvailabilityZone.
diff --git a/src/Compute/v2/Models/Flavor.php b/src/Compute/v2/Models/Flavor.php
index 2ba03fcf..1000aad4 100644
--- a/src/Compute/v2/Models/Flavor.php
+++ b/src/Compute/v2/Models/Flavor.php
@@ -6,8 +6,8 @@
 
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 
 /**
diff --git a/src/Compute/v2/Models/Host.php b/src/Compute/v2/Models/Host.php
index e9092116..ad6bbc0f 100644
--- a/src/Compute/v2/Models/Host.php
+++ b/src/Compute/v2/Models/Host.php
@@ -4,8 +4,8 @@
 
 namespace OpenStack\Compute\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 
 /**
diff --git a/src/Compute/v2/Models/Hypervisor.php b/src/Compute/v2/Models/Hypervisor.php
index e18cd5df..6710f949 100644
--- a/src/Compute/v2/Models/Hypervisor.php
+++ b/src/Compute/v2/Models/Hypervisor.php
@@ -5,8 +5,8 @@
 namespace OpenStack\Compute\v2\Models;
 
 use OpenStack\Common\Resource\Listable;
-use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\OperatorResource;
+use OpenStack\Common\Resource\Retrievable;
 
 /**
  * @property \OpenStack\Compute\v2\Api $api
diff --git a/src/Compute/v2/Models/Image.php b/src/Compute/v2/Models/Image.php
index 4631460d..5bd88134 100644
--- a/src/Compute/v2/Models/Image.php
+++ b/src/Compute/v2/Models/Image.php
@@ -5,10 +5,10 @@
 namespace OpenStack\Compute\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Transport\Utils;
 use Psr\Http\Message\ResponseInterface;
@@ -83,8 +83,6 @@ public function delete()
 
     /**
      * Retrieves metadata from the API.
-     *
-     * @return array
      */
     public function getMetadata(): array
     {
diff --git a/src/Compute/v2/Models/Keypair.php b/src/Compute/v2/Models/Keypair.php
index 7efd6b21..065052e2 100644
--- a/src/Compute/v2/Models/Keypair.php
+++ b/src/Compute/v2/Models/Keypair.php
@@ -6,9 +6,9 @@
 
 use OpenStack\Common\Resource\Alias;
 use OpenStack\Common\Resource\Creatable;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Transport\Utils;
 
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index 9e9b4b0d..e2390fd4 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -4,19 +4,19 @@
 
 namespace OpenStack\Compute\v2\Models;
 
+use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
+use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Transport\Utils;
-use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
-use OpenStack\Networking\v2\Models\InterfaceAttachment;
 use OpenStack\Compute\v2\Enum;
 use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
+use OpenStack\Networking\v2\Models\InterfaceAttachment;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -248,8 +248,6 @@ public function rebuild(array $options)
      * Rescues the server.
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::rescueServer}
-     *
-     * @return string
      */
     public function rescue(array $options): string
     {
@@ -303,8 +301,6 @@ public function revertResize()
      * Gets the console output of the server.
      *
      * @param int $length the number of lines, by default all lines will be returned
-     *
-     * @return string
      */
     public function getConsoleOutput(int $length = -1): string
     {
@@ -324,8 +320,6 @@ public function getConsoleOutput(int $length = -1): string
      *
      * @param string $type the type of VNC console: novnc|xvpvnc.
      *                     Defaults to novnc
-     *
-     * @return array
      */
     public function getVncConsole($type = Enum::CONSOLE_NOVNC): array
     {
@@ -338,8 +332,6 @@ public function getVncConsole($type = Enum::CONSOLE_NOVNC): array
      * Gets a RDP console for a server.
      *
      * @param string $type the type of VNC console: rdp-html5 (default)
-     *
-     * @return array
      */
     public function getRDPConsole($type = Enum::CONSOLE_RDP_HTML5): array
     {
@@ -352,8 +344,6 @@ public function getRDPConsole($type = Enum::CONSOLE_RDP_HTML5): array
      * Gets a Spice console for a server.
      *
      * @param string $type the type of VNC console: spice-html5
-     *
-     * @return array
      */
     public function getSpiceConsole($type = Enum::CONSOLE_SPICE_HTML5): array
     {
@@ -366,8 +356,6 @@ public function getSpiceConsole($type = Enum::CONSOLE_SPICE_HTML5): array
      * Gets a serial console for a server.
      *
      * @param string $type the type of VNC console: serial
-     *
-     * @return array
      */
     public function getSerialConsole($type = Enum::CONSOLE_SERIAL): array
     {
@@ -406,8 +394,6 @@ public function listAddresses(array $options = []): array
 
     /**
      * Returns Generator for InterfaceAttachment.
-     *
-     * @return \Generator
      */
     public function listInterfaceAttachments(array $options = []): \Generator
     {
@@ -418,8 +404,6 @@ public function listInterfaceAttachments(array $options = []): \Generator
      * Gets an interface attachment.
      *
      * @param string $portId the unique ID of the port
-     *
-     * @return InterfaceAttachment
      */
     public function getInterfaceAttachment(string $portId): InterfaceAttachment
     {
@@ -435,8 +419,6 @@ public function getInterfaceAttachment(string $portId): InterfaceAttachment
      * Creates an interface attachment.
      *
      * @param array $userOptions {@see \OpenStack\Compute\v2\Api::postInterfaceAttachment}
-     *
-     * @return InterfaceAttachment
      */
     public function createInterfaceAttachment(array $userOptions): InterfaceAttachment
     {
@@ -451,8 +433,6 @@ public function createInterfaceAttachment(array $userOptions): InterfaceAttachme
 
     /**
      * Detaches an interface attachment.
-     *
-     * @param string $portId
      */
     public function detachInterface(string $portId)
     {
@@ -464,8 +444,6 @@ public function detachInterface(string $portId)
 
     /**
      * Retrieves metadata from the API.
-     *
-     * @return array
      */
     public function getMetadata(): array
     {
@@ -535,8 +513,6 @@ public function deleteMetadataItem(string $key)
      * Add security group to a server (addSecurityGroup action).
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::postSecurityGroup}
-     *
-     * @return SecurityGroup
      */
     public function addSecurityGroup(array $options): SecurityGroup
     {
@@ -565,8 +541,6 @@ public function parseMetadata(ResponseInterface $response): array
 
     /**
      * Returns Generator for SecurityGroups.
-     *
-     * @return \Generator
      */
     public function listSecurityGroups(): \Generator
     {
@@ -575,8 +549,6 @@ public function listSecurityGroups(): \Generator
 
     /**
      * Returns Generator for VolumeAttachment.
-     *
-     * @return \Generator
      */
     public function listVolumeAttachments(): \Generator
     {
@@ -587,8 +559,6 @@ public function listVolumeAttachments(): \Generator
      * Attach a volume and returns volume that was attached.
      *
      * @param $volumeId
-     *
-     * @return VolumeAttachment
      */
     public function attachVolume(string $volumeId): VolumeAttachment
     {
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index b2c8c9b5..a67e33eb 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -5,16 +5,16 @@
 namespace OpenStack\Compute\v2;
 
 use OpenStack\Common\Service\AbstractService;
+use OpenStack\Compute\v2\Models\AvailabilityZone;
 use OpenStack\Compute\v2\Models\Flavor;
+use OpenStack\Compute\v2\Models\Host;
+use OpenStack\Compute\v2\Models\Hypervisor;
 use OpenStack\Compute\v2\Models\HypervisorStatistic;
 use OpenStack\Compute\v2\Models\Image;
 use OpenStack\Compute\v2\Models\Keypair;
 use OpenStack\Compute\v2\Models\Limit;
-use OpenStack\Compute\v2\Models\Server;
-use OpenStack\Compute\v2\Models\Host;
-use OpenStack\Compute\v2\Models\Hypervisor;
-use OpenStack\Compute\v2\Models\AvailabilityZone;
 use OpenStack\Compute\v2\Models\QuotaSet;
+use OpenStack\Compute\v2\Models\Server;
 
 /**
  * Compute v2 service for OpenStack.
@@ -28,8 +28,6 @@ class Service extends AbstractService
      * service API.
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::postServer}
-     *
-     * @return \OpenStack\Compute\v2\Models\Server
      */
     public function createServer(array $options): Server
     {
@@ -43,8 +41,6 @@ public function createServer(array $options): Server
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getServers}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listServers(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
     {
@@ -62,8 +58,6 @@ public function listServers(bool $detailed = false, array $options = [], callabl
      *
      * @param array $options An array of attributes that will be set on the {@see Server} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Server
      */
     public function getServer(array $options = []): Server
     {
@@ -79,8 +73,6 @@ public function getServer(array $options = []): Server
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getFlavors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
      * @param bool     $detailed set to true to fetch flavors' details
-     *
-     * @return \Generator
      */
     public function listFlavors(array $options = [], callable $mapFn = null, bool $detailed = false): \Generator
     {
@@ -96,8 +88,6 @@ public function listFlavors(array $options = [], callable $mapFn = null, bool $d
      *
      * @param array $options An array of attributes that will be set on the {@see Flavor} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Flavor
      */
     public function getFlavor(array $options = []): Flavor
     {
@@ -111,8 +101,6 @@ public function getFlavor(array $options = []): Flavor
      * Create a new flavor resource.
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::postFlavors}
-     *
-     * @return Flavor
      */
     public function createFlavor(array $options = []): Flavor
     {
@@ -124,8 +112,6 @@ public function createFlavor(array $options = []): Flavor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getImages}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listImages(array $options = [], callable $mapFn = null): \Generator
     {
@@ -139,8 +125,6 @@ public function listImages(array $options = [], callable $mapFn = null): \Genera
      *
      * @param array $options An array of attributes that will be set on the {@see Image} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Image
      */
     public function getImage(array $options = []): Image
     {
@@ -155,8 +139,6 @@ public function getImage(array $options = []): Image
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getKeyPairs}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listKeypairs(array $options = [], callable $mapFn = null): \Generator
     {
@@ -165,10 +147,6 @@ public function listKeypairs(array $options = [], callable $mapFn = null): \Gene
 
     /**
      * Create or import keypair.
-     *
-     * @param array $options
-     *
-     * @return Keypair
      */
     public function createKeypair(array $options): Keypair
     {
@@ -177,10 +155,6 @@ public function createKeypair(array $options): Keypair
 
     /**
      * Get keypair.
-     *
-     * @param array $options
-     *
-     * @return Keypair
      */
     public function getKeypair(array $options = []): Keypair
     {
@@ -192,8 +166,6 @@ public function getKeypair(array $options = []): Keypair
 
     /**
      * Shows rate and absolute limits for the tenant.
-     *
-     * @return Limit
      */
     public function getLimits(): Limit
     {
@@ -205,8 +177,6 @@ public function getLimits(): Limit
 
     /**
      * Shows summary statistics for all hypervisors over all compute nodes.
-     *
-     * @return HypervisorStatistic
      */
     public function getHypervisorStatistics(): HypervisorStatistic
     {
@@ -223,8 +193,6 @@ public function getHypervisorStatistics(): HypervisorStatistic
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getHypervisors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listHypervisors(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
     {
@@ -235,10 +203,6 @@ public function listHypervisors(bool $detailed = false, array $options = [], cal
 
     /**
      * Shows details for a given hypervisor.
-     *
-     * @param array $options
-     *
-     * @return Hypervisor
      */
     public function getHypervisor(array $options = []): Hypervisor
     {
@@ -252,8 +216,6 @@ public function getHypervisor(array $options = []): Hypervisor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getHosts}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listHosts(array $options = [], callable $mapFn = null): \Generator
     {
@@ -269,8 +231,6 @@ public function listHosts(array $options = [], callable $mapFn = null): \Generat
      *
      * @param array $options An array of attributes that will be set on the {@see Host} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Host
      */
     public function getHost(array $options = []): Host
     {
@@ -285,8 +245,6 @@ public function getHost(array $options = []): Host
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getAvailabilityZones}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listAvailabilityZones(array $options = [], callable $mapFn = null): \Generator
     {
@@ -295,11 +253,6 @@ public function listAvailabilityZones(array $options = [], callable $mapFn = nul
 
     /**
      * Shows A Quota for a tenant.
-     *
-     * @param string $tenantId
-     * @param bool   $detailed
-     *
-     * @return QuotaSet
      */
     public function getQuotaSet(string $tenantId, bool $detailed = false): QuotaSet
     {
diff --git a/src/Identity/v2/Models/Catalog.php b/src/Identity/v2/Models/Catalog.php
index 161396a9..247c9faf 100644
--- a/src/Identity/v2/Models/Catalog.php
+++ b/src/Identity/v2/Models/Catalog.php
@@ -59,12 +59,6 @@ public function getServiceUrl(
             }
         }
 
-        throw new \RuntimeException(sprintf(
-            "Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s",
-            $serviceName,
-            $serviceType,
-            $region,
-            $urlType
-        ));
+        throw new \RuntimeException(sprintf("Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s", $serviceName, $serviceType, $region, $urlType));
     }
 }
diff --git a/src/Identity/v2/Models/Endpoint.php b/src/Identity/v2/Models/Endpoint.php
index e58f9f18..b318a58b 100644
--- a/src/Identity/v2/Models/Endpoint.php
+++ b/src/Identity/v2/Models/Endpoint.php
@@ -34,10 +34,6 @@ class Endpoint extends OperatorResource
 
     /**
      * Indicates whether a given region is supported.
-     *
-     * @param string $region
-     *
-     * @return bool
      */
     public function supportsRegion(string $region): bool
     {
@@ -46,10 +42,6 @@ public function supportsRegion(string $region): bool
 
     /**
      * Indicates whether a given URL type is supported.
-     *
-     * @param string $urlType
-     *
-     * @return bool
      */
     public function supportsUrlType(string $urlType): bool
     {
diff --git a/src/Identity/v2/Models/Entry.php b/src/Identity/v2/Models/Entry.php
index 5899aaae..65042877 100644
--- a/src/Identity/v2/Models/Entry.php
+++ b/src/Identity/v2/Models/Entry.php
@@ -34,9 +34,6 @@ protected function getAliases(): array
     /**
      * Indicates whether this catalog entry matches a certain name and type.
      *
-     * @param string $name
-     * @param string $type
-     *
      * @return bool TRUE if it's a match, FALSE if not
      */
     public function matches(string $name, string $type): bool
@@ -46,11 +43,6 @@ public function matches(string $name, string $type): bool
 
     /**
      * Retrieves the catalog entry's URL according to a specific region and URL type.
-     *
-     * @param string $region
-     * @param string $urlType
-     *
-     * @return string
      */
     public function getEndpointUrl(string $region, string $urlType): string
     {
diff --git a/src/Identity/v2/Models/Token.php b/src/Identity/v2/Models/Token.php
index a8544ae0..4599caf6 100644
--- a/src/Identity/v2/Models/Token.php
+++ b/src/Identity/v2/Models/Token.php
@@ -5,9 +5,9 @@
 namespace OpenStack\Identity\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Transport\Utils;
 use Psr\Http\Message\ResponseInterface;
-use OpenStack\Common\Resource\OperatorResource;
 
 /**
  * Represents an Identity v2 Token.
diff --git a/src/Identity/v3/Models/Assignment.php b/src/Identity/v3/Models/Assignment.php
index 32b91c18..e4bb157c 100644
--- a/src/Identity/v3/Models/Assignment.php
+++ b/src/Identity/v3/Models/Assignment.php
@@ -5,8 +5,8 @@
 namespace OpenStack\Identity\v3\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 
 class Assignment extends OperatorResource implements Listable
 {
diff --git a/src/Identity/v3/Models/Catalog.php b/src/Identity/v3/Models/Catalog.php
index cc6a1b5c..3dc78453 100644
--- a/src/Identity/v3/Models/Catalog.php
+++ b/src/Identity/v3/Models/Catalog.php
@@ -56,12 +56,6 @@ public function getServiceUrl(string $name, string $type, string $region, string
             }
         }
 
-        throw new \RuntimeException(sprintf(
-            "Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s",
-            $name,
-            $type,
-            $region,
-            $urlType
-        ));
+        throw new \RuntimeException(sprintf("Endpoint URL could not be found in the catalog for this service.\nName: %s\nType: %s\nRegion: %s\nURL type: %s", $name, $type, $region, $urlType));
     }
 }
diff --git a/src/Identity/v3/Models/Credential.php b/src/Identity/v3/Models/Credential.php
index 0c7bcdb5..ab844b3e 100644
--- a/src/Identity/v3/Models/Credential.php
+++ b/src/Identity/v3/Models/Credential.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\Identity\v3\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
diff --git a/src/Identity/v3/Models/Domain.php b/src/Identity/v3/Models/Domain.php
index 516ead1f..9118d38f 100644
--- a/src/Identity/v3/Models/Domain.php
+++ b/src/Identity/v3/Models/Domain.php
@@ -5,10 +5,10 @@
 namespace OpenStack\Identity\v3\Models;
 
 use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
@@ -75,8 +75,6 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getUserRoles}
-     *
-     * @return \Generator
      */
     public function listUserRoles(array $options = []): \Generator
     {
@@ -95,8 +93,6 @@ public function grantUserRole(array $options = [])
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::headUserRole}
-     *
-     * @return bool
      */
     public function checkUserRole(array $options = []): bool
     {
@@ -119,8 +115,6 @@ public function revokeUserRole(array $options = [])
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupRoles}
-     *
-     * @return \Generator
      */
     public function listGroupRoles(array $options = []): \Generator
     {
@@ -139,8 +133,6 @@ public function grantGroupRole(array $options = [])
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::headGroupRole}
-     *
-     * @return bool
      */
     public function checkGroupRole(array $options = []): bool
     {
diff --git a/src/Identity/v3/Models/Endpoint.php b/src/Identity/v3/Models/Endpoint.php
index 2d85a9a7..5fe0a5bc 100644
--- a/src/Identity/v3/Models/Endpoint.php
+++ b/src/Identity/v3/Models/Endpoint.php
@@ -4,11 +4,11 @@
 
 namespace OpenStack\Identity\v3\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
-use OpenStack\Common\Resource\Updateable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
+use OpenStack\Common\Resource\Updateable;
 
 /**
  * @property \OpenStack\Identity\v3\Api $api
diff --git a/src/Identity/v3/Models/Group.php b/src/Identity/v3/Models/Group.php
index 65f4658f..8bfee36b 100644
--- a/src/Identity/v3/Models/Group.php
+++ b/src/Identity/v3/Models/Group.php
@@ -5,10 +5,10 @@
 namespace OpenStack\Identity\v3\Models;
 
 use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
@@ -77,8 +77,6 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupUsers}
-     *
-     * @return \Generator
      */
     public function listUsers(array $options = []): \Generator
     {
@@ -105,8 +103,6 @@ public function removeUser(array $options)
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::headGroupUser}
-     *
-     * @return bool
      */
     public function checkMembership(array $options): bool
     {
diff --git a/src/Identity/v3/Models/Policy.php b/src/Identity/v3/Models/Policy.php
index 9d100a5e..12168829 100644
--- a/src/Identity/v3/Models/Policy.php
+++ b/src/Identity/v3/Models/Policy.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\Identity\v3\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
diff --git a/src/Identity/v3/Models/Project.php b/src/Identity/v3/Models/Project.php
index 8f323618..62041c69 100644
--- a/src/Identity/v3/Models/Project.php
+++ b/src/Identity/v3/Models/Project.php
@@ -5,10 +5,10 @@
 namespace OpenStack\Identity\v3\Models;
 
 use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
@@ -87,8 +87,6 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectUserRoles}
-     *
-     * @return \Generator
      */
     public function listUserRoles(array $options = []): \Generator
     {
@@ -107,8 +105,6 @@ public function grantUserRole(array $options)
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::headProjectUserRole}
-     *
-     * @return bool
      */
     public function checkUserRole(array $options): bool
     {
@@ -131,8 +127,6 @@ public function revokeUserRole(array $options)
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectGroupRoles}
-     *
-     * @return \Generator
      */
     public function listGroupRoles(array $options = []): \Generator
     {
@@ -151,8 +145,6 @@ public function grantGroupRole(array $options)
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::headProjectGroupRole}
-     *
-     * @return bool
      */
     public function checkGroupRole(array $options): bool
     {
diff --git a/src/Identity/v3/Models/Role.php b/src/Identity/v3/Models/Role.php
index d694dccf..907b1005 100644
--- a/src/Identity/v3/Models/Role.php
+++ b/src/Identity/v3/Models/Role.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\Identity\v3\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 
 /**
  * @property \OpenStack\Identity\v3\Api $api
diff --git a/src/Identity/v3/Models/Service.php b/src/Identity/v3/Models/Service.php
index 61428436..67d0b5f7 100644
--- a/src/Identity/v3/Models/Service.php
+++ b/src/Identity/v3/Models/Service.php
@@ -5,10 +5,10 @@
 namespace OpenStack\Identity\v3\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
diff --git a/src/Identity/v3/Models/Token.php b/src/Identity/v3/Models/Token.php
index 935f409f..b3808a54 100644
--- a/src/Identity/v3/Models/Token.php
+++ b/src/Identity/v3/Models/Token.php
@@ -5,11 +5,11 @@
 namespace OpenStack\Identity\v3\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Transport\Utils;
-use Psr\Http\Message\ResponseInterface;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
+use OpenStack\Common\Transport\Utils;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * @property \OpenStack\Identity\v3\Api $api
@@ -74,9 +74,6 @@ public function populateFromResponse(ResponseInterface $response)
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getId(): string
     {
         return $this->id;
@@ -109,11 +106,7 @@ public function create(array $data): Creatable
         if (isset($data['user'])) {
             $data['methods'] = ['password'];
             if (!isset($data['user']['id']) && empty($data['user']['domain'])) {
-                throw new \InvalidArgumentException(
-                    'When authenticating with a username, you must also provide either the domain name or domain ID to '
-                    .'which the user belongs to. Alternatively, if you provide a user ID instead, you do not need to '
-                    .'provide domain information.'
-                );
+                throw new \InvalidArgumentException('When authenticating with a username, you must also provide either the domain name or domain ID to '.'which the user belongs to. Alternatively, if you provide a user ID instead, you do not need to '.'provide domain information.');
             }
         } elseif (isset($data['tokenId'])) {
             $data['methods'] = ['token'];
@@ -138,8 +131,6 @@ public function create(array $data): Creatable
      * Initialize OpenStack object using $params['cachedToken'] to reduce the amount of HTTP calls.
      *
      * This array is a modified version of response from `/auth/tokens`. Do not manually modify this array.
-     *
-     * @return array
      */
     public function export(): array
     {
diff --git a/src/Identity/v3/Models/User.php b/src/Identity/v3/Models/User.php
index 3645e87d..81aa561e 100644
--- a/src/Identity/v3/Models/User.php
+++ b/src/Identity/v3/Models/User.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\Identity\v3\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
@@ -86,9 +86,6 @@ public function delete()
         $this->execute($this->api->deleteUser(), ['id' => $this->id]);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listGroups(): \Generator
     {
         $options['id'] = $this->id;
@@ -96,9 +93,6 @@ public function listGroups(): \Generator
         return $this->model(Group::class)->enumerate($this->api->getUserGroups(), $options);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listProjects(): \Generator
     {
         return $this->model(Project::class)->enumerate($this->api->getUserProjects(), ['id' => $this->id]);
diff --git a/src/Identity/v3/Service.php b/src/Identity/v3/Service.php
index 6b11a0bd..ca16aac5 100644
--- a/src/Identity/v3/Service.php
+++ b/src/Identity/v3/Service.php
@@ -51,21 +51,13 @@ public function authenticate(array $options): array
             return [$token, $baseUrl];
         }
 
-        throw new \RuntimeException(sprintf(
-            'No service found with type [%s] name [%s] region [%s] interface [%s]',
-            $type,
-            $name,
-            $region,
-            $interface
-        ));
+        throw new \RuntimeException(sprintf('No service found with type [%s] name [%s] region [%s] interface [%s]', $type, $name, $region, $interface));
     }
 
     /**
      * Generates authentication token from cached token using `$token->export()`.
      *
      * @param array $cachedToken {@see \OpenStack\Identity\v3\Models\Token::export}
-     *
-     * @return Models\Token
      */
     public function generateTokenFromCache(array $cachedToken): Models\Token
     {
@@ -76,8 +68,6 @@ public function generateTokenFromCache(array $cachedToken): Models\Token
      * Generates a new authentication token.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postTokens}
-     *
-     * @return Models\Token
      */
     public function generateToken(array $options): Models\Token
     {
@@ -89,8 +79,6 @@ public function generateToken(array $options): Models\Token
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the token to retrieve
-     *
-     * @return Models\Token
      */
     public function getToken(string $id): Models\Token
     {
@@ -101,8 +89,6 @@ public function getToken(string $id): Models\Token
      * Validates a token, identified by its ID, and returns TRUE if its valid, FALSE if not.
      *
      * @param string $id The unique ID of the token
-     *
-     * @return bool
      */
     public function validateToken(string $id): bool
     {
@@ -130,8 +116,6 @@ public function revokeToken(string $id)
      * Creates a new service according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postServices}
-     *
-     * @return Models\Service
      */
     public function createService(array $options): Models\Service
     {
@@ -144,8 +128,6 @@ public function createService(array $options): Models\Service
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getServices}
-     *
-     * @return \Generator
      */
     public function listServices(array $options = []): \Generator
     {
@@ -157,8 +139,6 @@ public function listServices(array $options = []): \Generator
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the service
-     *
-     * @return Models\Service
      */
     public function getService(string $id): Models\Service
     {
@@ -169,8 +149,6 @@ public function getService(string $id): Models\Service
      * Creates a new endpoint according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postEndpoints}
-     *
-     * @return Models\Endpoint
      */
     public function createEndpoint(array $options): Models\Endpoint
     {
@@ -182,8 +160,6 @@ public function createEndpoint(array $options): Models\Endpoint
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the service
-     *
-     * @return Models\Endpoint
      */
     public function getEndpoint(string $id): Models\Endpoint
     {
@@ -196,8 +172,6 @@ public function getEndpoint(string $id): Models\Endpoint
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getEndpoints}
-     *
-     * @return \Generator
      */
     public function listEndpoints(array $options = []): \Generator
     {
@@ -208,8 +182,6 @@ public function listEndpoints(array $options = []): \Generator
      * Creates a new domain according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postDomains}
-     *
-     * @return Models\Domain
      */
     public function createDomain(array $options): Models\Domain
     {
@@ -222,8 +194,6 @@ public function createDomain(array $options): Models\Domain
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getDomains}
-     *
-     * @return \Generator
      */
     public function listDomains(array $options = []): \Generator
     {
@@ -235,8 +205,6 @@ public function listDomains(array $options = []): \Generator
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the domain
-     *
-     * @return Models\Domain
      */
     public function getDomain(string $id): Models\Domain
     {
@@ -247,8 +215,6 @@ public function getDomain(string $id): Models\Domain
      * Creates a new project according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postProjects}
-     *
-     * @return Models\Project
      */
     public function createProject(array $options): Models\Project
     {
@@ -261,8 +227,6 @@ public function createProject(array $options): Models\Project
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjects}
-     *
-     * @return \Generator
      */
     public function listProjects(array $options = []): \Generator
     {
@@ -274,8 +238,6 @@ public function listProjects(array $options = []): \Generator
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the project
-     *
-     * @return Models\Project
      */
     public function getProject(string $id): Models\Project
     {
@@ -286,8 +248,6 @@ public function getProject(string $id): Models\Project
      * Creates a new user according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postUsers}
-     *
-     * @return Models\User
      */
     public function createUser(array $options): Models\User
     {
@@ -300,8 +260,6 @@ public function createUser(array $options): Models\User
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getUsers}
-     *
-     * @return \Generator
      */
     public function listUsers(array $options = []): \Generator
     {
@@ -313,8 +271,6 @@ public function listUsers(array $options = []): \Generator
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the user
-     *
-     * @return Models\User
      */
     public function getUser(string $id): Models\User
     {
@@ -325,8 +281,6 @@ public function getUser(string $id): Models\User
      * Creates a new group according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postGroups}
-     *
-     * @return Models\Group
      */
     public function createGroup(array $options): Models\Group
     {
@@ -339,8 +293,6 @@ public function createGroup(array $options): Models\Group
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroups}
-     *
-     * @return \Generator
      */
     public function listGroups(array $options = []): \Generator
     {
@@ -352,8 +304,6 @@ public function listGroups(array $options = []): \Generator
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the group
-     *
-     * @return Models\Group
      */
     public function getGroup($id): Models\Group
     {
@@ -364,8 +314,6 @@ public function getGroup($id): Models\Group
      * Creates a new credential according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postCredentials}
-     *
-     * @return Models\Credential
      */
     public function createCredential(array $options): Models\Credential
     {
@@ -376,8 +324,6 @@ public function createCredential(array $options): Models\Credential
      * Returns a generator which will yield a collection of credential objects. The elements which generators yield can
      * be accessed using a foreach loop. Often the API will not return the full state of the resource in collections;
      * you will need to use retrieve() to pull in the full state of the remote resource from the API.
-     *
-     * @return \Generator
      */
     public function listCredentials(): \Generator
     {
@@ -389,8 +335,6 @@ public function listCredentials(): \Generator
      * or HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the credential
-     *
-     * @return Models\Credential
      */
     public function getCredential(string $id): Models\Credential
     {
@@ -401,8 +345,6 @@ public function getCredential(string $id): Models\Credential
      * Creates a new role according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postRoles}
-     *
-     * @return Models\Role
      */
     public function createRole(array $options): Models\Role
     {
@@ -415,8 +357,6 @@ public function createRole(array $options): Models\Role
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getRoles}
-     *
-     * @return \Generator
      */
     public function listRoles(array $options = []): \Generator
     {
@@ -429,8 +369,6 @@ public function listRoles(array $options = []): \Generator
      * collections; you will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getRoleAssignments}
-     *
-     * @return \Generator
      */
     public function listRoleAssignments(array $options = []): \Generator
     {
@@ -441,8 +379,6 @@ public function listRoleAssignments(array $options = []): \Generator
      * Creates a new policy according to the provided options.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::postPolicies}
-     *
-     * @return Models\Policy
      */
     public function createPolicy(array $options): Models\Policy
     {
@@ -455,8 +391,6 @@ public function createPolicy(array $options): Models\Policy
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getPolicies}
-     *
-     * @return \Generator
      */
     public function listPolicies(array $options = []): \Generator
     {
@@ -468,8 +402,6 @@ public function listPolicies(array $options = []): \Generator
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
      *
      * @param string $id The unique ID of the policy
-     *
-     * @return Models\Policy
      */
     public function getPolicy(string $id): Models\Policy
     {
diff --git a/src/Images/v2/Models/Image.php b/src/Images/v2/Models/Image.php
index 033eaa87..8c0e8862 100644
--- a/src/Images/v2/Models/Image.php
+++ b/src/Images/v2/Models/Image.php
@@ -6,10 +6,10 @@
 
 use OpenStack\Common\JsonSchema\Schema;
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Transport\Utils;
 use OpenStack\Images\v2\JsonPatch;
diff --git a/src/Images/v2/Models/Member.php b/src/Images/v2/Models/Member.php
index c9138b0e..c3cb00b7 100644
--- a/src/Images/v2/Models/Member.php
+++ b/src/Images/v2/Models/Member.php
@@ -5,10 +5,10 @@
 namespace OpenStack\Images\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 
 /**
diff --git a/src/Images/v2/Service.php b/src/Images/v2/Service.php
index 5e6c91bb..9c977cf2 100644
--- a/src/Images/v2/Service.php
+++ b/src/Images/v2/Service.php
@@ -24,8 +24,6 @@ public function listImages(array $data = []): \Generator
 
     /**
      * @param null $id
-     *
-     * @return Image
      */
     public function getImage($id = null): Image
     {
diff --git a/src/Metric/v1/Gnocchi/Models/Resource.php b/src/Metric/v1/Gnocchi/Models/Resource.php
index fa2c93cf..e106ec10 100644
--- a/src/Metric/v1/Gnocchi/Models/Resource.php
+++ b/src/Metric/v1/Gnocchi/Models/Resource.php
@@ -102,11 +102,6 @@ public function retrieve()
         $this->populateFromResponse($response);
     }
 
-    /**
-     * @param string $metric
-     *
-     * @return Metric
-     */
     public function getMetric(string $metric): Metric
     {
         $response = $this->execute(
@@ -124,8 +119,6 @@ public function getMetric(string $metric): Metric
 
     /**
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResourceMetricMeasures}
-     *
-     * @return array
      */
     public function getMetricMeasures(array $options = []): array
     {
@@ -144,8 +137,6 @@ public function getMetricMeasures(array $options = []): array
 
     /**
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResourceMetrics}
-     *
-     * @return \Generator
      */
     public function listResourceMetrics(array $options = []): \Generator
     {
diff --git a/src/Metric/v1/Gnocchi/Service.php b/src/Metric/v1/Gnocchi/Service.php
index f70bcfba..c44dfafb 100644
--- a/src/Metric/v1/Gnocchi/Service.php
+++ b/src/Metric/v1/Gnocchi/Service.php
@@ -18,8 +18,6 @@ class Service extends AbstractService
 {
     /**
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\ResourceType type in a generator format.
-     *
-     * @return \Generator
      */
     public function listResourceTypes(): \Generator
     {
@@ -30,8 +28,6 @@ public function listResourceTypes(): \Generator
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResources}
-     *
-     * @return \Generator
      */
     public function listResources(array $options = []): \Generator
     {
@@ -43,10 +39,6 @@ public function listResources(array $options = []): \Generator
     /**
      * Retrieves a Resource object and populates its unique identifier object. This operation will not perform a GET or
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
-     *
-     * @param array $options
-     *
-     * @return resource
      */
     public function getResource(array $options = []): Resource
     {
@@ -63,8 +55,6 @@ public function getResource(array $options = []): Resource
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::searchResources}
-     *
-     * @return \Generator
      */
     public function searchResources(array $options = []): \Generator
     {
@@ -90,10 +80,6 @@ public function searchResources(array $options = []): \Generator
     /**
      * Retrieves a Metric object and populates its unique identifier object. This operation will not perform a GET or
      * HEAD request by default; you will need to call retrieve() if you want to pull in remote state from the API.
-     *
-     * @param string $id
-     *
-     * @return Metric
      */
     public function getMetric(string $id): Metric
     {
@@ -108,8 +94,6 @@ public function getMetric(string $id): Metric
      * Retrieves a collection of Metric type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getMetrics}
-     *
-     * @return \Generator
      */
     public function listMetrics(array $options = []): \Generator
     {
@@ -120,8 +104,6 @@ public function listMetrics(array $options = []): \Generator
      * If options does not have type, this will inject $options['type'] = 'generic'.
      *
      * @internal
-     *
-     * @param array $options
      */
     private function injectGenericType(array &$options)
     {
diff --git a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
index b2959e4e..07dc0ddb 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
@@ -2,10 +2,10 @@
 
 namespace OpenStack\Networking\v2\Extensions\Layer3\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 use OpenStack\Networking\v2\Extensions\Layer3\Api;
diff --git a/src/Networking/v2/Extensions/Layer3/Models/Router.php b/src/Networking/v2/Extensions/Layer3/Models/Router.php
index abd53e7f..f3e70175 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/Router.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/Router.php
@@ -3,11 +3,11 @@
 namespace OpenStack\Networking\v2\Extensions\Layer3\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\HasWaiterTrait;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
+use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 use OpenStack\Networking\v2\Extensions\Layer3\Api;
diff --git a/src/Networking/v2/Extensions/Layer3/Service.php b/src/Networking/v2/Extensions/Layer3/Service.php
index 0aa9827e..9f9b04de 100644
--- a/src/Networking/v2/Extensions/Layer3/Service.php
+++ b/src/Networking/v2/Extensions/Layer3/Service.php
@@ -21,55 +21,31 @@ private function router(array $info = []): Router
         return $this->model(Router::class, $info);
     }
 
-    /**
-     * @param array $options
-     *
-     * @return FloatingIp
-     */
     public function createFloatingIp(array $options): FloatingIp
     {
         return $this->floatingIp()->create($options);
     }
 
-    /**
-     * @return FloatingIp
-     */
     public function getFloatingIp($id): FloatingIp
     {
         return $this->floatingIp(['id' => $id]);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listFloatingIps(array $options = []): \Generator
     {
         return $this->floatingIp()->enumerate($this->api->getFloatingIps(), $options);
     }
 
-    /**
-     * @param array $options
-     *
-     * @return Router
-     */
     public function createRouter(array $options): Router
     {
         return $this->router()->create($options);
     }
 
-    /**
-     * @return Router
-     */
     public function getRouter($id): Router
     {
         return $this->router(['id' => $id]);
     }
 
-    /**
-     * @param array $options
-     *
-     * @return \Generator
-     */
     public function listRouters(array $options = []): \Generator
     {
         return $this->router()->enumerate($this->api->getRouters(), $options);
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
index 5812c6b5..20516227 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
@@ -5,10 +5,10 @@
 namespace OpenStack\Networking\v2\Extensions\SecurityGroups\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
index 54064cd0..a7da99bd 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
@@ -4,10 +4,10 @@
 
 namespace OpenStack\Networking\v2\Extensions\SecurityGroups\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 
 /**
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Service.php b/src/Networking/v2/Extensions/SecurityGroups/Service.php
index aeda22ab..cf10b733 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Service.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Service.php
@@ -21,59 +21,31 @@ private function securityGroupRule(array $info = []): SecurityGroupRule
         return $this->model(SecurityGroupRule::class, $info);
     }
 
-    /**
-     * @param array $options
-     *
-     * @return \Generator
-     */
     public function listSecurityGroups(array $options = []): \Generator
     {
         return $this->securityGroup()->enumerate($this->api->getSecurityGroups(), $options);
     }
 
-    /**
-     * @param array $options
-     *
-     * @return SecurityGroup
-     */
     public function createSecurityGroup(array $options): SecurityGroup
     {
         return $this->securityGroup()->create($options);
     }
 
-    /**
-     * @param string $id
-     *
-     * @return SecurityGroup
-     */
     public function getSecurityGroup(string $id): SecurityGroup
     {
         return $this->securityGroup(['id' => $id]);
     }
 
-    /**
-     * @return \Generator
-     */
     public function listSecurityGroupRules(): \Generator
     {
         return $this->securityGroupRule()->enumerate($this->api->getSecurityRules());
     }
 
-    /**
-     * @param array $options
-     *
-     * @return SecurityGroupRule
-     */
     public function createSecurityGroupRule(array $options): SecurityGroupRule
     {
         return $this->securityGroupRule()->create($options);
     }
 
-    /**
-     * @param string $id
-     *
-     * @return SecurityGroupRule
-     */
     public function getSecurityGroupRule(string $id): SecurityGroupRule
     {
         return $this->securityGroupRule(['id' => $id]);
diff --git a/src/Networking/v2/Models/LoadBalancer.php b/src/Networking/v2/Models/LoadBalancer.php
index bb4a4ae4..42671b3d 100644
--- a/src/Networking/v2/Models/LoadBalancer.php
+++ b/src/Networking/v2/Models/LoadBalancer.php
@@ -129,10 +129,6 @@ public function delete()
 
     /**
      * Add a listener to this load balancer.
-     *
-     * @param array $userOptions
-     *
-     * @return LoadBalancerListener
      */
     public function addListener(array $userOptions = []): LoadBalancerListener
     {
@@ -143,8 +139,6 @@ public function addListener(array $userOptions = []): LoadBalancerListener
 
     /**
      * Get stats for this loadbalancer.
-     *
-     * @return LoadBalancerStat
      */
     public function getStats(): LoadBalancerStat
     {
@@ -156,8 +150,6 @@ public function getStats(): LoadBalancerStat
 
     /**
      * Get the status tree for this loadbalancer.
-     *
-     * @return LoadBalancerStatus
      */
     public function getStatuses(): LoadBalancerStatus
     {
diff --git a/src/Networking/v2/Models/LoadBalancerPool.php b/src/Networking/v2/Models/LoadBalancerPool.php
index 4da0be95..b1881652 100644
--- a/src/Networking/v2/Models/LoadBalancerPool.php
+++ b/src/Networking/v2/Models/LoadBalancerPool.php
@@ -153,8 +153,6 @@ public function delete()
 
     /**
      * Add a member to this pool.
-     *
-     * @param array $userOptions
      */
     public function addMember(array $userOptions = []): LoadBalancerMember
     {
@@ -165,10 +163,6 @@ public function addMember(array $userOptions = []): LoadBalancerMember
 
     /**
      * Get an instance of a member.
-     *
-     * @param string $memberId
-     *
-     * @return LoadBalancerMember
      */
     public function getMember(string $memberId): LoadBalancerMember
     {
@@ -177,8 +171,6 @@ public function getMember(string $memberId): LoadBalancerMember
 
     /**
      * Delete a member.
-     *
-     * @param string $memberId
      */
     public function deleteMember(string $memberId)
     {
@@ -187,10 +179,6 @@ public function deleteMember(string $memberId)
 
     /**
      * Add a healthmonitor to this load balancer pool.
-     *
-     * @param array $userOptions
-     *
-     * @return LoadBalancerHealthMonitor
      */
     public function addHealthMonitor(array $userOptions = []): LoadBalancerHealthMonitor
     {
diff --git a/src/Networking/v2/Models/LoadBalancerStat.php b/src/Networking/v2/Models/LoadBalancerStat.php
index eccf3f25..4b34a91f 100644
--- a/src/Networking/v2/Models/LoadBalancerStat.php
+++ b/src/Networking/v2/Models/LoadBalancerStat.php
@@ -4,8 +4,8 @@
 
 namespace OpenStack\Networking\v2\Models;
 
-use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\OperatorResource;
+use OpenStack\Common\Resource\Retrievable;
 
 /**
  * Represents Neutron v2 LoadBalancer Stats.
diff --git a/src/Networking/v2/Models/LoadBalancerStatus.php b/src/Networking/v2/Models/LoadBalancerStatus.php
index dbcf1de4..367952aa 100644
--- a/src/Networking/v2/Models/LoadBalancerStatus.php
+++ b/src/Networking/v2/Models/LoadBalancerStatus.php
@@ -5,8 +5,8 @@
 namespace OpenStack\Networking\v2\Models;
 
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\OperatorResource;
+use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Transport\Utils;
 
 /**
diff --git a/src/Networking/v2/Models/Network.php b/src/Networking/v2/Models/Network.php
index 7af74b2a..8bff5bc3 100644
--- a/src/Networking/v2/Models/Network.php
+++ b/src/Networking/v2/Models/Network.php
@@ -4,11 +4,11 @@
 
 namespace OpenStack\Networking\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
-use OpenStack\Common\Resource\HasWaiterTrait;
-use OpenStack\Common\Resource\Listable;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
+use OpenStack\Common\Resource\HasWaiterTrait;
+use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 
 /**
diff --git a/src/Networking/v2/Models/Port.php b/src/Networking/v2/Models/Port.php
index d3144870..8f1cf03f 100644
--- a/src/Networking/v2/Models/Port.php
+++ b/src/Networking/v2/Models/Port.php
@@ -4,11 +4,11 @@
 
 namespace OpenStack\Networking\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
diff --git a/src/Networking/v2/Models/Subnet.php b/src/Networking/v2/Models/Subnet.php
index 142a9ddf..bf77c5c7 100644
--- a/src/Networking/v2/Models/Subnet.php
+++ b/src/Networking/v2/Models/Subnet.php
@@ -4,12 +4,12 @@
 
 namespace OpenStack\Networking\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
-use OpenStack\Common\Resource\Listable;
 use OpenStack\Common\Resource\Creatable;
-use OpenStack\Common\Resource\Updateable;
 use OpenStack\Common\Resource\Deletable;
+use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
+use OpenStack\Common\Resource\Updateable;
 
 /**
  * Represents a Networking v2 Network.
diff --git a/src/Networking/v2/Params.php b/src/Networking/v2/Params.php
index 50bc8828..ea093823 100644
--- a/src/Networking/v2/Params.php
+++ b/src/Networking/v2/Params.php
@@ -10,8 +10,6 @@ class Params extends AbstractParams
 {
     /**
      * Returns information about description parameter.
-     *
-     * @return array
      */
     public function descriptionJson(): array
     {
@@ -23,8 +21,6 @@ public function descriptionJson(): array
 
     /**
      * Returns information about name parameter.
-     *
-     * @return array
      */
     public function nameJson(): array
     {
diff --git a/src/Networking/v2/Service.php b/src/Networking/v2/Service.php
index 6a1e0f93..2e1f7169 100644
--- a/src/Networking/v2/Service.php
+++ b/src/Networking/v2/Service.php
@@ -27,8 +27,6 @@ class Service extends AbstractService
      * Create a new network resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postNetwork}
-     *
-     * @return Network
      */
     public function createNetwork(array $options): Network
     {
@@ -39,8 +37,6 @@ public function createNetwork(array $options): Network
      * Create a new network resources.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postNetworks}
-     *
-     * @return array
      */
     public function createNetworks(array $options): array
     {
@@ -51,10 +47,6 @@ public function createNetworks(array $options): array
      * Retrieve a network object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Network::retrieve}.
-     *
-     * @param string $id
-     *
-     * @return Network
      */
     public function getNetwork(string $id): Network
     {
@@ -65,8 +57,6 @@ public function getNetwork(string $id): Network
      * List networks.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getNetworks}
-     *
-     * @return \Generator
      */
     public function listNetworks(array $options = []): \Generator
     {
@@ -77,8 +67,6 @@ public function listNetworks(array $options = []): \Generator
      * Create a new subnet resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postSubnet}
-     *
-     * @return Subnet
      */
     public function createSubnet(array $options): Subnet
     {
@@ -101,10 +89,6 @@ public function createSubnets(array $options): array
      * Retrieve a subnet object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Subnet::retrieve}.
-     *
-     * @param string $id
-     *
-     * @return Subnet
      */
     public function getSubnet(string $id): Subnet
     {
@@ -115,8 +99,6 @@ public function getSubnet(string $id): Subnet
      * List subnets.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getSubnets}
-     *
-     * @return \Generator
      */
     public function listSubnets(array $options = []): \Generator
     {
@@ -127,8 +109,6 @@ public function listSubnets(array $options = []): \Generator
      * Create a new port resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postSinglePort}
-     *
-     * @return Port
      */
     public function createPort(array $options): Port
     {
@@ -151,10 +131,6 @@ public function createPorts(array $options): array
      * Retrieve a subnet object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Port::retrieve}.
-     *
-     * @param string $id
-     *
-     * @return Port
      */
     public function getPort(string $id): Port
     {
@@ -165,8 +141,6 @@ public function getPort(string $id): Port
      * List ports.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getPorts}
-     *
-     * @return \Generator
      */
     public function listPorts(array $options = []): \Generator
     {
@@ -175,8 +149,6 @@ public function listPorts(array $options = []): \Generator
 
     /**
      * Lists quotas for projects with non-default quota values.
-     *
-     * @return \Generator
      */
     public function listQuotas(): \Generator
     {
@@ -189,10 +161,6 @@ public function listQuotas(): \Generator
      * Retrieve a quota object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Quota::retrieve}.
-     *
-     * @param string $tenantId
-     *
-     * @return Quota
      */
     public function getQuota(string $tenantId): Quota
     {
@@ -201,10 +169,6 @@ public function getQuota(string $tenantId): Quota
 
     /**
      * Lists default quotas for a project.
-     *
-     * @param string $tenantId
-     *
-     * @return Quota
      */
     public function getDefaultQuota(string $tenantId): Quota
     {
@@ -216,8 +180,6 @@ public function getDefaultQuota(string $tenantId): Quota
 
     /**
      * Lists loadbalancers for projects.
-     *
-     * @return \Generator
      */
     public function listLoadBalancers(): \Generator
     {
@@ -226,10 +188,6 @@ public function listLoadBalancers(): \Generator
 
     /**
      * Retrieve an instance of a LoadBalancer object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancer
      */
     public function getLoadBalancer(string $id): LoadBalancer
     {
@@ -240,8 +198,6 @@ public function getLoadBalancer(string $id): LoadBalancer
      * Create a new loadbalancer resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancer}
-     *
-     * @return LoadBalancer
      */
     public function createLoadBalancer(array $options): LoadBalancer
     {
@@ -250,8 +206,6 @@ public function createLoadBalancer(array $options): LoadBalancer
 
     /**
      * Lists loadbalancer listeners.
-     *
-     * @return \Generator
      */
     public function listLoadBalancerListeners(): \Generator
     {
@@ -260,10 +214,6 @@ public function listLoadBalancerListeners(): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer listener object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancerListener
      */
     public function getLoadBalancerListener(string $id): LoadBalancerListener
     {
@@ -274,8 +224,6 @@ public function getLoadBalancerListener(string $id): LoadBalancerListener
      * Create a new loadbalancer Listener resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerListener}
-     *
-     * @return LoadBalancerListener
      */
     public function createLoadBalancerListener(array $options): LoadBalancerListener
     {
@@ -284,8 +232,6 @@ public function createLoadBalancerListener(array $options): LoadBalancerListener
 
     /**
      * Lists loadbalancer pools.
-     *
-     * @return \Generator
      */
     public function listLoadBalancerPools(): \Generator
     {
@@ -294,10 +240,6 @@ public function listLoadBalancerPools(): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer Pool object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancerPool
      */
     public function getLoadBalancerPool(string $id): LoadBalancerPool
     {
@@ -308,8 +250,6 @@ public function getLoadBalancerPool(string $id): LoadBalancerPool
      * Create a new loadbalancer Pool resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerPool}
-     *
-     * @return LoadBalancerPool
      */
     public function createLoadBalancerPool(array $options): LoadBalancerPool
     {
@@ -318,10 +258,6 @@ public function createLoadBalancerPool(array $options): LoadBalancerPool
 
     /**
      * Lists loadbalancer members.
-     *
-     * @param string $poolId
-     *
-     * @return \Generator
      */
     public function listLoadBalancerMembers(string $poolId): \Generator
     {
@@ -330,11 +266,6 @@ public function listLoadBalancerMembers(string $poolId): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer Member object.
-     *
-     * @param string $poolId
-     * @param string $memberId
-     *
-     * @return LoadBalancerMember
      */
     public function getLoadBalancerMember(string $poolId, string $memberId): LoadBalancerMember
     {
@@ -345,8 +276,6 @@ public function getLoadBalancerMember(string $poolId, string $memberId): LoadBal
      * Create a new loadbalancer member resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerMember}
-     *
-     * @return LoadBalancerMember
      */
     public function createLoadBalancerMember(array $options): LoadBalancerMember
     {
@@ -355,8 +284,6 @@ public function createLoadBalancerMember(array $options): LoadBalancerMember
 
     /**
      * Lists loadbalancer healthmonitors.
-     *
-     * @return \Generator
      */
     public function listLoadBalancerHealthMonitors(): \Generator
     {
@@ -365,10 +292,6 @@ public function listLoadBalancerHealthMonitors(): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer healthmonitor object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancerHealthMonitor
      */
     public function getLoadBalancerHealthMonitor(string $id): LoadBalancerHealthMonitor
     {
@@ -379,8 +302,6 @@ public function getLoadBalancerHealthMonitor(string $id): LoadBalancerHealthMoni
      * Create a new loadbalancer healthmonitor resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerHealthMonitor}
-     *
-     * @return LoadBalancerHealthMonitor
      */
     public function createLoadBalancerHealthMonitor(array $options): LoadBalancerHealthMonitor
     {
diff --git a/src/ObjectStore/v1/Models/Account.php b/src/ObjectStore/v1/Models/Account.php
index 3ef03e2a..84ef1fd4 100644
--- a/src/ObjectStore/v1/Models/Account.php
+++ b/src/ObjectStore/v1/Models/Account.php
@@ -4,8 +4,8 @@
 
 namespace OpenStack\ObjectStore\v1\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\HasMetadata;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use Psr\Http\Message\ResponseInterface;
 
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index 4643d6e9..b0ca8890 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -6,14 +6,14 @@
 
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Psr7\LimitStream;
-use Psr\Http\Message\ResponseInterface;
 use OpenStack\Common\Error\BadResponseError;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * @property \OpenStack\ObjectStore\v1\Api $api
@@ -57,8 +57,6 @@ public function populateFromResponse(ResponseInterface $response): self
      *
      * @param array         $options {@see \OpenStack\ObjectStore\v1\Api::getContainer}
      * @param callable|null $mapFn   allows a function to be mapped over each element
-     *
-     * @return \Generator
      */
     public function listObjects(array $options = [], callable $mapFn = null): \Generator
     {
@@ -152,8 +150,6 @@ public function getMetadata(): array
      * {@see StorageObject::retrieve} or {@see StorageObject::download} on the returned StorageObject object to do that.
      *
      * @param string $name The name of the object
-     *
-     * @return StorageObject
      */
     public function getObject($name): StorageObject
     {
@@ -206,8 +202,6 @@ public function createObject(array $data): StorageObject
      * @param string $data['segmentContainer'] The container to which each segment will be uploaded
      * @param string $data['segmentPrefix']    The prefix that will come before each segment. If omitted, a default
      *                                         is used: name/timestamp/filesize
-     *
-     * @return StorageObject
      */
     public function createLargeObject(array $data): StorageObject
     {
diff --git a/src/ObjectStore/v1/Models/StorageObject.php b/src/ObjectStore/v1/Models/StorageObject.php
index a4016d2d..03df5974 100644
--- a/src/ObjectStore/v1/Models/StorageObject.php
+++ b/src/ObjectStore/v1/Models/StorageObject.php
@@ -6,13 +6,13 @@
 
 use GuzzleHttp\Psr7\Uri;
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Transport\Utils;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
+use OpenStack\Common\Resource\OperatorResource;
+use OpenStack\Common\Transport\Utils;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * @property \OpenStack\ObjectStore\v1\Api $api
@@ -75,8 +75,6 @@ public function populateFromResponse(ResponseInterface $response): self
     }
 
     /**
-     * @param ResponseInterface $response
-     *
      * @return $this
      */
     private function populateHeaders(ResponseInterface $response): self
@@ -92,8 +90,6 @@ private function populateHeaders(ResponseInterface $response): self
 
     /**
      * Retrieves the public URI for this resource.
-     *
-     * @return \GuzzleHttp\Psr7\Uri
      */
     public function getPublicUri(): Uri
     {
@@ -141,8 +137,6 @@ public function retrieve()
      * improve performance when handling large objects.
      *
      * @param array $data {@see \OpenStack\ObjectStore\v1\Api::getObject}
-     *
-     * @return StreamInterface
      */
     public function download(array $data = []): StreamInterface
     {
diff --git a/src/ObjectStore/v1/Service.php b/src/ObjectStore/v1/Service.php
index 27ba97c3..0f41da3b 100644
--- a/src/ObjectStore/v1/Service.php
+++ b/src/ObjectStore/v1/Service.php
@@ -16,8 +16,6 @@ class Service extends AbstractService
 {
     /**
      * Retrieves an Account object.
-     *
-     * @return Account
      */
     public function getAccount(): Account
     {
@@ -29,8 +27,6 @@ public function getAccount(): Account
      *
      * @param array         $options {@see \OpenStack\ObjectStore\v1\Api::getAccount}
      * @param callable|null $mapFn   allows a function to be mapped over each element in the collection
-     *
-     * @return \Generator
      */
     public function listContainers(array $options = [], callable $mapFn = null): \Generator
     {
@@ -44,8 +40,6 @@ public function listContainers(array $options = [], callable $mapFn = null): \Ge
      * remote API is not contacted.
      *
      * @param string $name The unique name of the container
-     *
-     * @return Container
      */
     public function getContainer(string $name = null): Container
     {
@@ -56,8 +50,6 @@ public function getContainer(string $name = null): Container
      * Creates a new container according to the values provided.
      *
      * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putContainer}
-     *
-     * @return Container
      */
     public function createContainer(array $data): Container
     {
diff --git a/src/OpenStack.php b/src/OpenStack.php
index b88a7b77..ac494484 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -44,11 +44,6 @@ public function __construct(array $options = [], Builder $builder = null)
         $this->builder = $builder ?: new Builder($options, 'OpenStack');
     }
 
-    /**
-     * @param array $options
-     *
-     * @return Service
-     */
     private function getDefaultIdentityService(array $options): Service
     {
         if (!isset($options['authUrl'])) {
@@ -80,8 +75,6 @@ private function getDefaultIdentityService(array $options): Service
      * Creates a new Compute v2 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\Compute\v2\Service
      */
     public function computeV2(array $options = []): \OpenStack\Compute\v2\Service
     {
@@ -94,8 +87,6 @@ public function computeV2(array $options = []): \OpenStack\Compute\v2\Service
      * Creates a new Networking v2 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\Networking\v2\Service
      */
     public function networkingV2(array $options = []): \OpenStack\Networking\v2\Service
     {
@@ -108,8 +99,6 @@ public function networkingV2(array $options = []): \OpenStack\Networking\v2\Serv
      * Creates a new Networking v2 Layer 3 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\Networking\v2\Extensions\Layer3\Service
      */
     public function networkingV2ExtLayer3(array $options = []): \OpenStack\Networking\v2\Extensions\Layer3\Service
     {
@@ -122,8 +111,6 @@ public function networkingV2ExtLayer3(array $options = []): \OpenStack\Networkin
      * Creates a new Networking v2 Layer 3 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\Networking\v2\Extensions\SecurityGroups\Service
      */
     public function networkingV2ExtSecGroups(array $options = []): \OpenStack\Networking\v2\Extensions\SecurityGroups\Service
     {
@@ -136,8 +123,6 @@ public function networkingV2ExtSecGroups(array $options = []): \OpenStack\Networ
      * Creates a new Identity v2 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\Identity\v2\Service
      */
     public function identityV2(array $options = []): \OpenStack\Identity\v2\Service
     {
@@ -150,8 +135,6 @@ public function identityV2(array $options = []): \OpenStack\Identity\v2\Service
      * Creates a new Identity v3 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\Identity\v3\Service
      */
     public function identityV3(array $options = []): \OpenStack\Identity\v3\Service
     {
@@ -164,8 +147,6 @@ public function identityV3(array $options = []): \OpenStack\Identity\v3\Service
      * Creates a new Object Store v1 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\ObjectStore\v1\Service
      */
     public function objectStoreV1(array $options = []): \OpenStack\ObjectStore\v1\Service
     {
@@ -178,8 +159,6 @@ public function objectStoreV1(array $options = []): \OpenStack\ObjectStore\v1\Se
      * Creates a new Block Storage v2 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\BlockStorage\v2\Service
      */
     public function blockStorageV2(array $options = []): \OpenStack\BlockStorage\v2\Service
     {
@@ -192,8 +171,6 @@ public function blockStorageV2(array $options = []): \OpenStack\BlockStorage\v2\
      * Creates a new Images v2 service.
      *
      * @param array $options options that will be used in configuring the service
-     *
-     * @return \OpenStack\Images\v2\Service
      */
     public function imagesV2(array $options = []): \OpenStack\Images\v2\Service
     {
@@ -204,10 +181,6 @@ public function imagesV2(array $options = []): \OpenStack\Images\v2\Service
 
     /**
      * Creates a new Gnocchi Metric service v1.
-     *
-     * @param array $options
-     *
-     * @return \OpenStack\Metric\v1\Gnocchi\Service
      */
     public function metricGnocchiV1(array $options = []): \OpenStack\Metric\v1\Gnocchi\Service
     {

From 43e2c1c2bec622a5e34469fe67299f989e0c3e02 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.phan@myrepublic.net>
Date: Tue, 7 Jan 2020 16:39:51 +0800
Subject: [PATCH 005/102] Removed php7.0

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 38dd04a1..4d66ac70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ cache:
 
 matrix:
   include:
-    - php: 7.0
     - php: 7.1
     - php: 7.2
     - php: 7.3

From 68f1c35fc021c2634fac1673e3818123e43b2ed4 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.phan@myrepublic.net>
Date: Tue, 7 Jan 2020 16:40:20 +0800
Subject: [PATCH 006/102] Fixed Guzzle Missing header delimiter unit tests

---
 tests/unit/Compute/v2/Fixtures/server-unrescue.resp    | 1 +
 tests/unit/ObjectStore/v1/Fixtures/Created.resp        | 3 ++-
 tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp   | 3 ++-
 tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp | 3 ++-
 tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp    | 2 ++
 tests/unit/ObjectStore/v1/Fixtures/NoContent.resp      | 3 ++-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/unit/Compute/v2/Fixtures/server-unrescue.resp b/tests/unit/Compute/v2/Fixtures/server-unrescue.resp
index 7796f372..da49dda3 100644
--- a/tests/unit/Compute/v2/Fixtures/server-unrescue.resp
+++ b/tests/unit/Compute/v2/Fixtures/server-unrescue.resp
@@ -1,2 +1,3 @@
 HTTP/1.1 202 Accepted
 Content-Type: application/json
+
diff --git a/tests/unit/ObjectStore/v1/Fixtures/Created.resp b/tests/unit/ObjectStore/v1/Fixtures/Created.resp
index 243a13d1..41fd2b0a 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/Created.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/Created.resp
@@ -4,4 +4,5 @@ Content-Length: 116
 Etag: d41d8cd98f00b204e9800998ecf8427e
 Content-Type: text/html; charset=UTF-8
 X-Trans-Id: tx4d5e4f06d357462bb732f-0052d96843
-Date: Fri, 17 Jan 2014 17:28:35 GMT
\ No newline at end of file
+Date: Fri, 17 Jan 2014 17:28:35 GMT
+
diff --git a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp
index 9acec7cc..a622678f 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp
@@ -9,4 +9,5 @@ X-Account-Container-Count: 2
 Content-Type: text/plain; charset=utf-8
 Accept-Ranges: bytes
 X-Trans-Id: txafb3504870144b8ca40f7-0052d955d4
-Date: Fri, 17 Jan 2014 16:09:56 GMT
\ No newline at end of file
+Date: Fri, 17 Jan 2014 16:09:56 GMT
+
diff --git a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp
index 5a4f4a06..54dc363d 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp
@@ -8,4 +8,5 @@ X-Timestamp: 1389727543.65372
 X-Container-Bytes-Used: 14
 Content-Type: text/plain; charset=utf-8
 X-Trans-Id: tx0287b982a268461b9ec14-0052d826e2
-Date: Thu, 16 Jan 2014 18:37:22 GMT
\ No newline at end of file
+Date: Thu, 16 Jan 2014 18:37:22 GMT
+
diff --git a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp
index 8351ff70..9f8e3c39 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp
@@ -9,3 +9,5 @@ X-Object-Meta-Manufacturer: Acme
 Content-Type: application/octet-stream
 X-Trans-Id: tx37ea34dcd1ed48ca9bc7d-0052d84b6f
 Date: Thu, 16 Jan 2014 21:13:19 GMT
+
+
diff --git a/tests/unit/ObjectStore/v1/Fixtures/NoContent.resp b/tests/unit/ObjectStore/v1/Fixtures/NoContent.resp
index bec37c58..5d6cb2a1 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/NoContent.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/NoContent.resp
@@ -2,4 +2,5 @@ HTTP/1.1 204 No Content
 Content-Length: 0
 Content-Type: text/html; charset=UTF-8
 X-Trans-Id: tx1439b96137364ab581156-0052d95532
-Date: Fri, 17 Jan 2014 16:07:14 GMT
\ No newline at end of file
+Date: Fri, 17 Jan 2014 16:07:14 GMT
+

From 155511170bd1c81e2bcbb8b49ded2a8a7cebdc53 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Wed, 7 Oct 2020 18:21:17 -0400
Subject: [PATCH 007/102] Update Guzzle in composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b38a5f79..ea296bfa 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
     },
     "require": {
         "php": "~7.0",
-        "guzzlehttp/guzzle": "^6.1",
+        "guzzlehttp/guzzle": "^7.0",
         "justinrainbow/json-schema": "^5.2"
     },
     "require-dev": {

From f754c137913122fa3b8e38e1dcb76d793d4da2ed Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Wed, 7 Oct 2020 18:31:22 -0400
Subject: [PATCH 008/102] Make HandlerStack::create signature match Guzzle's
 HandlerStack::create signature.

---
 src/Common/Transport/HandlerStack.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStack.php
index fee59d01..2d23c289 100644
--- a/src/Common/Transport/HandlerStack.php
+++ b/src/Common/Transport/HandlerStack.php
@@ -4,17 +4,18 @@
 
 namespace OpenStack\Common\Transport;
 
-use function GuzzleHttp\choose_handler;
 use GuzzleHttp\HandlerStack as GuzzleStack;
+use GuzzleHttp\Utils;
 
 class HandlerStack extends GuzzleStack
 {
-    public static function create(callable $handler = null): self
-    {
-        $stack = new self($handler ?: choose_handler());
 
-        $stack->push(Middleware::httpErrors());
-        $stack->push(Middleware::prepareBody());
+    public static function create(?callable $handler = null): GuzzleStack
+    {
+        
+        $stack = new self($handler ?: Utils::chooseHandler());
+        $stack->push(Middleware::httpErrors(), 'http_errors');
+        $stack->push(Middleware::prepareBody(), 'prepare_body');
 
         return $stack;
     }

From 67012e336075df8ece13ee82b301960faa586dc6 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Wed, 7 Oct 2020 19:00:02 -0400
Subject: [PATCH 009/102] Use the separate guzzlehttp/uri-template for
 templating URLs.

---
 composer.json                    |  1 +
 src/Common/Api/OperatorTrait.php |  4 ++--
 src/Common/Transport/Utils.php   | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index ea296bfa..606e52b6 100644
--- a/composer.json
+++ b/composer.json
@@ -35,6 +35,7 @@
     "require": {
         "php": "~7.0",
         "guzzlehttp/guzzle": "^7.0",
+        "guzzlehttp/uri-template": "0.2",
         "justinrainbow/json-schema": "^5.2"
     },
     "require-dev": {
diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index ccbe34ab..ef244db9 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -11,6 +11,7 @@
 use OpenStack\Common\Resource\ResourceInterface;
 use OpenStack\Common\Transport\RequestSerializer;
 use Psr\Http\Message\ResponseInterface;
+use OpenStack\Common\Transport\Utils;
 
 trait OperatorTrait
 {
@@ -109,8 +110,7 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
 
         $options = (new RequestSerializer())->serializeOptions($operation, $userValues);
         $method  = $async ? 'requestAsync' : 'request';
-        $uri     = uri_template($operation->getPath(), $userValues);
-
+        $uri     = Utils::uri_template($operation->getPath(), $userValues);
         return $this->client->$method($operation->getMethod(), $uri, $options);
     }
 
diff --git a/src/Common/Transport/Utils.php b/src/Common/Transport/Utils.php
index 3b5a2681..ffa3b1d1 100644
--- a/src/Common/Transport/Utils.php
+++ b/src/Common/Transport/Utils.php
@@ -7,6 +7,7 @@
 use function GuzzleHttp\Psr7\uri_for;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
+use GuzzleHttp\UriTemplate\UriTemplate;
 
 class Utils
 {
@@ -80,4 +81,22 @@ public static function appendPath(UriInterface $uri, $path): UriInterface
     {
         return uri_for(rtrim((string) $uri, '/').'/'.$path);
     }
+
+     /**
+     * Expands a URI template
+     *
+     * @param string $template  URI template
+     * @param array  $variables Template variables
+     *
+     * @return string
+     */
+    public static function uri_template($template, array $variables): string
+    {
+        if (extension_loaded('uri_template')) {
+            // @codeCoverageIgnoreStart
+            return \uri_template($template, $variables);
+            // @codeCoverageIgnoreEnd
+        }
+        return UriTemplate::expand($template, $variables);
+    }
 }

From c7fc82d8abe3512d5b73b0bf88e54b7c7736cf45 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Wed, 7 Oct 2020 20:46:37 -0400
Subject: [PATCH 010/102] Move the samples/object_store directory to
 samples/objectstore so integration tests run.

Tests were expecting the directory to be samples/objectstore - I *think* because they take the service name, ("ObjectStore"), and lower-case it.
---
 doc/services/object-store/v1/account.rst      |  8 +++----
 doc/services/object-store/v1/containers.rst   | 12 +++++-----
 doc/services/object-store/v1/objects.rst      | 22 +++++++++----------
 .../v1/account/get.php                        |  0
 .../v1/account/get_metadata.php               |  0
 .../v1/account/merge_metadata.php             |  0
 .../v1/account/reset_metadata.php             |  0
 .../v1/containers/create.php                  |  0
 .../v1/containers/delete.php                  |  0
 .../v1/containers/get.php                     |  0
 .../v1/containers/get_metadata.php            |  0
 .../v1/containers/list.php                    |  0
 .../v1/containers/merge_metadata.php          |  0
 .../v1/containers/reset_metadata.php          |  0
 .../v1/objects/check_exists.php               |  0
 .../v1/objects/copy.php                       |  0
 .../v1/objects/create.php                     |  0
 .../v1/objects/create_from_stream.php         |  0
 .../v1/objects/create_large_object.php        |  0
 .../v1/objects/delete.php                     |  0
 .../v1/objects/download.php                   |  0
 .../v1/objects/get.php                        |  0
 .../v1/objects/get_metadata.php               |  0
 .../v1/objects/list.php                       |  0
 .../v1/objects/merge_metadata.php             |  0
 .../v1/objects/reset_metadata.php             |  0
 26 files changed, 21 insertions(+), 21 deletions(-)
 rename samples/{object_store => objectstore}/v1/account/get.php (100%)
 rename samples/{object_store => objectstore}/v1/account/get_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/account/merge_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/account/reset_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/containers/create.php (100%)
 rename samples/{object_store => objectstore}/v1/containers/delete.php (100%)
 rename samples/{object_store => objectstore}/v1/containers/get.php (100%)
 rename samples/{object_store => objectstore}/v1/containers/get_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/containers/list.php (100%)
 rename samples/{object_store => objectstore}/v1/containers/merge_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/containers/reset_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/check_exists.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/copy.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/create.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/create_from_stream.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/create_large_object.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/delete.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/download.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/get.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/get_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/list.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/merge_metadata.php (100%)
 rename samples/{object_store => objectstore}/v1/objects/reset_metadata.php (100%)

diff --git a/doc/services/object-store/v1/account.rst b/doc/services/object-store/v1/account.rst
index fe59788e..adc06e09 100644
--- a/doc/services/object-store/v1/account.rst
+++ b/doc/services/object-store/v1/account.rst
@@ -6,13 +6,13 @@ Show account details
 
 To work with an Object Store account, you must first retrieve an account object like so:
 
-.. sample:: object_store/v1/account/get.php
+.. sample:: objectstore/v1/account/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getAccount
 
 Get account metadata
 --------------------
 
-.. sample:: object_store/v1/account/get_metadata.php
+.. sample:: objectstore/v1/account/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_getMetadata
 
 Replace all metadata with new values
@@ -43,7 +43,7 @@ the metadata of the account will now be:
 
 To merge metadata, you must run:
 
-.. sample:: object_store/v1/account/reset_metadata.php
+.. sample:: objectstore/v1/account/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_resetMetadata
 
 Merge new metadata values with existing
@@ -75,5 +75,5 @@ the metadata of the account will now be:
 
 To reset metadata, you must run:
 
-.. sample:: object_store/v1/account/merge_metadata.php
+.. sample:: objectstore/v1/account/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_mergeMetadata
\ No newline at end of file
diff --git a/doc/services/object-store/v1/containers.rst b/doc/services/object-store/v1/containers.rst
index bff67c77..8c40d060 100644
--- a/doc/services/object-store/v1/containers.rst
+++ b/doc/services/object-store/v1/containers.rst
@@ -4,7 +4,7 @@ Containers
 Show details for a container
 ----------------------------
 
-.. sample:: object_store/v1/containers/get.php
+.. sample:: objectstore/v1/containers/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getContainer
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -25,7 +25,7 @@ and all of the local properties will match those of the remote resource.
 List containers
 ---------------
 
-.. sample:: object_store/v1/containers/list.php
+.. sample:: objectstore/v1/containers/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_listContainers
 
 When listing containers, you must be aware that not *all* information about a container is returned in a collection.
@@ -46,7 +46,7 @@ container.
 Delete container
 ----------------
 
-.. sample:: object_store/v1/containers/delete.php
+.. sample:: objectstore/v1/containers/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_delete
 
 The API will only accept DELETE requests on containers when they are empty. If you have a container with any objects
@@ -55,7 +55,7 @@ inside, the operation will fail.
 Get metadata
 ------------
 
-.. sample:: object_store/v1/containers/get_metadata.php
+.. sample:: objectstore/v1/containers/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -65,7 +65,7 @@ correspond to the values set either when the container was created, or when a pr
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: object_store/v1/containers/reset_metadata.php
+.. sample:: objectstore/v1/containers/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -95,7 +95,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: object_store/v1/containers/merge_metadata.php
+.. sample:: objectstore/v1/containers/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing
diff --git a/doc/services/object-store/v1/objects.rst b/doc/services/object-store/v1/objects.rst
index b958a03c..fa537429 100644
--- a/doc/services/object-store/v1/objects.rst
+++ b/doc/services/object-store/v1/objects.rst
@@ -4,7 +4,7 @@ Objects
 Show details for an object
 --------------------------
 
-.. sample:: object_store/v1/objects/get.php
+.. sample:: objectstore/v1/objects/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getObject
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -26,7 +26,7 @@ of the object's metadata, will not download the object's content. To do this, se
 Download an object
 ------------------
 
-.. sample:: object_store/v1/objects/download.php
+.. sample:: objectstore/v1/objects/download.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_download
 
 As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
@@ -38,7 +38,7 @@ consult `Guzzle's docs`_.
 List objects
 ------------
 
-.. sample:: object_store/v1/objects/list.php
+.. sample:: objectstore/v1/objects/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_listObjects
 
 When listing objects, you must be aware that not *all* information about a container is returned in a collection.
@@ -61,13 +61,13 @@ Create an object
 
 When creating an object, you can upload its content according to a string representation:
 
-.. sample:: object_store/v1/objects/create.php
+.. sample:: objectstore/v1/objects/create.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createObject
 
 If that is not optimal or convenient, you can use a stream instead. Any instance of ``\Psr\Http\Message\StreamInterface``
 is acceptable. For example, to use a normal Guzzle stream:
 
-.. sample:: object_store/v1/objects/create_from_stream.php
+.. sample:: objectstore/v1/objects/create_from_stream.php
 
 Create a large object (over 5GB)
 --------------------------------
@@ -81,25 +81,25 @@ uploading, this is what happens under the hood:
 
 To upload a DLO, you need to call:
 
-.. sample:: object_store/v1/objects/create_large_object.php
+.. sample:: objectstore/v1/objects/create_large_object.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createLargeObject
 
 Copy object
 -----------
 
-.. sample:: object_store/v1/objects/copy.php
+.. sample:: objectstore/v1/objects/copy.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_copy
 
 Delete object
 -------------
 
-.. sample:: object_store/v1/objects/delete.php
+.. sample:: objectstore/v1/objects/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_delete
 
 Get metadata
 ------------
 
-.. sample:: object_store/v1/objects/get_metadata.php
+.. sample:: objectstore/v1/objects/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -109,7 +109,7 @@ correspond to the values set either when the object was created, or when a previ
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: object_store/v1/objects/reset_metadata.php
+.. sample:: objectstore/v1/objects/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -139,7 +139,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: object_store/v1/objects/merge_metadata.php
+.. sample:: objectstore/v1/objects/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing
diff --git a/samples/object_store/v1/account/get.php b/samples/objectstore/v1/account/get.php
similarity index 100%
rename from samples/object_store/v1/account/get.php
rename to samples/objectstore/v1/account/get.php
diff --git a/samples/object_store/v1/account/get_metadata.php b/samples/objectstore/v1/account/get_metadata.php
similarity index 100%
rename from samples/object_store/v1/account/get_metadata.php
rename to samples/objectstore/v1/account/get_metadata.php
diff --git a/samples/object_store/v1/account/merge_metadata.php b/samples/objectstore/v1/account/merge_metadata.php
similarity index 100%
rename from samples/object_store/v1/account/merge_metadata.php
rename to samples/objectstore/v1/account/merge_metadata.php
diff --git a/samples/object_store/v1/account/reset_metadata.php b/samples/objectstore/v1/account/reset_metadata.php
similarity index 100%
rename from samples/object_store/v1/account/reset_metadata.php
rename to samples/objectstore/v1/account/reset_metadata.php
diff --git a/samples/object_store/v1/containers/create.php b/samples/objectstore/v1/containers/create.php
similarity index 100%
rename from samples/object_store/v1/containers/create.php
rename to samples/objectstore/v1/containers/create.php
diff --git a/samples/object_store/v1/containers/delete.php b/samples/objectstore/v1/containers/delete.php
similarity index 100%
rename from samples/object_store/v1/containers/delete.php
rename to samples/objectstore/v1/containers/delete.php
diff --git a/samples/object_store/v1/containers/get.php b/samples/objectstore/v1/containers/get.php
similarity index 100%
rename from samples/object_store/v1/containers/get.php
rename to samples/objectstore/v1/containers/get.php
diff --git a/samples/object_store/v1/containers/get_metadata.php b/samples/objectstore/v1/containers/get_metadata.php
similarity index 100%
rename from samples/object_store/v1/containers/get_metadata.php
rename to samples/objectstore/v1/containers/get_metadata.php
diff --git a/samples/object_store/v1/containers/list.php b/samples/objectstore/v1/containers/list.php
similarity index 100%
rename from samples/object_store/v1/containers/list.php
rename to samples/objectstore/v1/containers/list.php
diff --git a/samples/object_store/v1/containers/merge_metadata.php b/samples/objectstore/v1/containers/merge_metadata.php
similarity index 100%
rename from samples/object_store/v1/containers/merge_metadata.php
rename to samples/objectstore/v1/containers/merge_metadata.php
diff --git a/samples/object_store/v1/containers/reset_metadata.php b/samples/objectstore/v1/containers/reset_metadata.php
similarity index 100%
rename from samples/object_store/v1/containers/reset_metadata.php
rename to samples/objectstore/v1/containers/reset_metadata.php
diff --git a/samples/object_store/v1/objects/check_exists.php b/samples/objectstore/v1/objects/check_exists.php
similarity index 100%
rename from samples/object_store/v1/objects/check_exists.php
rename to samples/objectstore/v1/objects/check_exists.php
diff --git a/samples/object_store/v1/objects/copy.php b/samples/objectstore/v1/objects/copy.php
similarity index 100%
rename from samples/object_store/v1/objects/copy.php
rename to samples/objectstore/v1/objects/copy.php
diff --git a/samples/object_store/v1/objects/create.php b/samples/objectstore/v1/objects/create.php
similarity index 100%
rename from samples/object_store/v1/objects/create.php
rename to samples/objectstore/v1/objects/create.php
diff --git a/samples/object_store/v1/objects/create_from_stream.php b/samples/objectstore/v1/objects/create_from_stream.php
similarity index 100%
rename from samples/object_store/v1/objects/create_from_stream.php
rename to samples/objectstore/v1/objects/create_from_stream.php
diff --git a/samples/object_store/v1/objects/create_large_object.php b/samples/objectstore/v1/objects/create_large_object.php
similarity index 100%
rename from samples/object_store/v1/objects/create_large_object.php
rename to samples/objectstore/v1/objects/create_large_object.php
diff --git a/samples/object_store/v1/objects/delete.php b/samples/objectstore/v1/objects/delete.php
similarity index 100%
rename from samples/object_store/v1/objects/delete.php
rename to samples/objectstore/v1/objects/delete.php
diff --git a/samples/object_store/v1/objects/download.php b/samples/objectstore/v1/objects/download.php
similarity index 100%
rename from samples/object_store/v1/objects/download.php
rename to samples/objectstore/v1/objects/download.php
diff --git a/samples/object_store/v1/objects/get.php b/samples/objectstore/v1/objects/get.php
similarity index 100%
rename from samples/object_store/v1/objects/get.php
rename to samples/objectstore/v1/objects/get.php
diff --git a/samples/object_store/v1/objects/get_metadata.php b/samples/objectstore/v1/objects/get_metadata.php
similarity index 100%
rename from samples/object_store/v1/objects/get_metadata.php
rename to samples/objectstore/v1/objects/get_metadata.php
diff --git a/samples/object_store/v1/objects/list.php b/samples/objectstore/v1/objects/list.php
similarity index 100%
rename from samples/object_store/v1/objects/list.php
rename to samples/objectstore/v1/objects/list.php
diff --git a/samples/object_store/v1/objects/merge_metadata.php b/samples/objectstore/v1/objects/merge_metadata.php
similarity index 100%
rename from samples/object_store/v1/objects/merge_metadata.php
rename to samples/objectstore/v1/objects/merge_metadata.php
diff --git a/samples/object_store/v1/objects/reset_metadata.php b/samples/objectstore/v1/objects/reset_metadata.php
similarity index 100%
rename from samples/object_store/v1/objects/reset_metadata.php
rename to samples/objectstore/v1/objects/reset_metadata.php

From 4e4454f84ce021571d90b5c55732af6aa9a1f4c9 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Wed, 7 Oct 2020 20:48:18 -0400
Subject: [PATCH 011/102] Throw more granular exceptions from SampleManager.php

This eased debugging a lot.
---
 tests/integration/SampleManager.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/integration/SampleManager.php b/tests/integration/SampleManager.php
index edc3e07a..42ee22c9 100644
--- a/tests/integration/SampleManager.php
+++ b/tests/integration/SampleManager.php
@@ -90,8 +90,12 @@ public function write($path, array $replacements)
 
         $sampleFile = rtrim($this->basePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $path;
 
-        if (!file_exists($sampleFile) || !is_readable($sampleFile)) {
-            throw new \RuntimeException(sprintf("%s either does not exist or is not readable", $sampleFile));
+        if (!file_exists($sampleFile)) {
+            throw new \RuntimeException(sprintf("%s does not exist", $sampleFile));
+        }
+
+        if(!is_readable($sampleFile)) {
+            throw new \RuntimeException(sprintf("%s is not readable", $sampleFile));
         }
 
         $content = strtr(file_get_contents($sampleFile), $replacements);

From ebafd9aa80808cfb2d1a4d867542ef255b877b01 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Thu, 8 Oct 2020 15:22:25 -0400
Subject: [PATCH 012/102] Remove unused use statement from file header.

---
 src/Common/Api/OperatorTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index ef244db9..c8fe5b99 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -7,7 +7,6 @@
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Promise\PromiseInterface;
-use function GuzzleHttp\uri_template;
 use OpenStack\Common\Resource\ResourceInterface;
 use OpenStack\Common\Transport\RequestSerializer;
 use Psr\Http\Message\ResponseInterface;
@@ -110,6 +109,7 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
 
         $options = (new RequestSerializer())->serializeOptions($operation, $userValues);
         $method  = $async ? 'requestAsync' : 'request';
+
         $uri     = Utils::uri_template($operation->getPath(), $userValues);
         return $this->client->$method($operation->getMethod(), $uri, $options);
     }

From 517b860bf14340b8ac6a0b6b85ff0e9ca3f515af Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Fri, 9 Oct 2020 12:54:25 -0400
Subject: [PATCH 013/102] Cast Guzzle Response Body as String so that
 GuzzleHttp\json_decode() will accept it.

---
 src/Metric/v1/Gnocchi/Models/Resource.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Metric/v1/Gnocchi/Models/Resource.php b/src/Metric/v1/Gnocchi/Models/Resource.php
index e106ec10..a926ddb0 100644
--- a/src/Metric/v1/Gnocchi/Models/Resource.php
+++ b/src/Metric/v1/Gnocchi/Models/Resource.php
@@ -131,8 +131,7 @@ public function getMetricMeasures(array $options = []): array
         );
 
         $response = $this->execute($this->api->getResourceMetricMeasures(), $options);
-
-        return \GuzzleHttp\json_decode($response->getBody());
+        return \GuzzleHttp\json_decode((string) $response->getBody());
     }
 
     /**

From 4959f984ebf22eaade0021fc9455061e00266f55 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Fri, 9 Oct 2020 13:00:12 -0400
Subject: [PATCH 014/102] PSR2 Fixes

---
 src/Common/Api/OperatorTrait.php          | 3 ++-
 src/Common/Transport/HandlerStack.php     | 2 --
 src/Common/Transport/Utils.php            | 9 ++++-----
 src/Metric/v1/Gnocchi/Models/Resource.php | 1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index c8fe5b99..4e796d0a 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -9,8 +9,8 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use OpenStack\Common\Resource\ResourceInterface;
 use OpenStack\Common\Transport\RequestSerializer;
-use Psr\Http\Message\ResponseInterface;
 use OpenStack\Common\Transport\Utils;
+use Psr\Http\Message\ResponseInterface;
 
 trait OperatorTrait
 {
@@ -111,6 +111,7 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
         $method  = $async ? 'requestAsync' : 'request';
 
         $uri     = Utils::uri_template($operation->getPath(), $userValues);
+
         return $this->client->$method($operation->getMethod(), $uri, $options);
     }
 
diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStack.php
index 2d23c289..d0205d58 100644
--- a/src/Common/Transport/HandlerStack.php
+++ b/src/Common/Transport/HandlerStack.php
@@ -9,10 +9,8 @@
 
 class HandlerStack extends GuzzleStack
 {
-
     public static function create(?callable $handler = null): GuzzleStack
     {
-        
         $stack = new self($handler ?: Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
         $stack->push(Middleware::prepareBody(), 'prepare_body');
diff --git a/src/Common/Transport/Utils.php b/src/Common/Transport/Utils.php
index ffa3b1d1..48aa1e86 100644
--- a/src/Common/Transport/Utils.php
+++ b/src/Common/Transport/Utils.php
@@ -5,9 +5,9 @@
 namespace OpenStack\Common\Transport;
 
 use function GuzzleHttp\Psr7\uri_for;
+use GuzzleHttp\UriTemplate\UriTemplate;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
-use GuzzleHttp\UriTemplate\UriTemplate;
 
 class Utils
 {
@@ -82,13 +82,11 @@ public static function appendPath(UriInterface $uri, $path): UriInterface
         return uri_for(rtrim((string) $uri, '/').'/'.$path);
     }
 
-     /**
-     * Expands a URI template
+    /**
+     * Expands a URI template.
      *
      * @param string $template  URI template
      * @param array  $variables Template variables
-     *
-     * @return string
      */
     public static function uri_template($template, array $variables): string
     {
@@ -97,6 +95,7 @@ public static function uri_template($template, array $variables): string
             return \uri_template($template, $variables);
             // @codeCoverageIgnoreEnd
         }
+
         return UriTemplate::expand($template, $variables);
     }
 }
diff --git a/src/Metric/v1/Gnocchi/Models/Resource.php b/src/Metric/v1/Gnocchi/Models/Resource.php
index a926ddb0..1ae3cfe8 100644
--- a/src/Metric/v1/Gnocchi/Models/Resource.php
+++ b/src/Metric/v1/Gnocchi/Models/Resource.php
@@ -131,6 +131,7 @@ public function getMetricMeasures(array $options = []): array
         );
 
         $response = $this->execute($this->api->getResourceMetricMeasures(), $options);
+
         return \GuzzleHttp\json_decode((string) $response->getBody());
     }
 

From 2a03cd0ca71cbc7040260839edbf8a4ac8a0b103 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Fri, 9 Oct 2020 13:19:47 -0400
Subject: [PATCH 015/102] Switch to using our own
 \OpenStack\Common\Transport\Utils::jsonDecode() in the one place we were
 using Guzzle's.

---
 src/Metric/v1/Gnocchi/Models/Resource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Metric/v1/Gnocchi/Models/Resource.php b/src/Metric/v1/Gnocchi/Models/Resource.php
index 1ae3cfe8..33c39d89 100644
--- a/src/Metric/v1/Gnocchi/Models/Resource.php
+++ b/src/Metric/v1/Gnocchi/Models/Resource.php
@@ -6,6 +6,7 @@
 
 use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
+use OpenStack\Common\Transport\Utils;
 use OpenStack\Metric\v1\Gnocchi\Api;
 
 /**
@@ -132,7 +133,7 @@ public function getMetricMeasures(array $options = []): array
 
         $response = $this->execute($this->api->getResourceMetricMeasures(), $options);
 
-        return \GuzzleHttp\json_decode((string) $response->getBody());
+        return Utils::jsonDecode($response);
     }
 
     /**

From ed5286f7fad7a3bbe6af41762cde38dc07a17217 Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Fri, 9 Oct 2020 13:21:12 -0400
Subject: [PATCH 016/102] Bump PHP version requirement to match Guzzle 7

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 606e52b6..f2a8d9c3 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "php": "~7.0",
+        "php": "^7.2.5",
         "guzzlehttp/guzzle": "^7.0",
         "guzzlehttp/uri-template": "0.2",
         "justinrainbow/json-schema": "^5.2"

From 4eb841f4bbd4789b4f960313930807de82214fff Mon Sep 17 00:00:00 2001
From: John Beales <john@johnbeales.com>
Date: Fri, 9 Oct 2020 14:15:02 -0400
Subject: [PATCH 017/102] Remove PHP 7.1 from travis.yml

Guzzle 7 requires PHP 7.2.5, so we are doing the same here.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4d66ac70..3dc03a03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ cache:
 
 matrix:
   include:
-    - php: 7.1
     - php: 7.2
     - php: 7.3
     - php: 7.4

From e2f728a6a4629b9b357988e383d36f59d95ee60d Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 20:14:43 +0800
Subject: [PATCH 018/102] Rename samples/block_strorage to samples/blockstorage

---
 doc/services/block-storage/v2/volume-types.rst | 10 +++++-----
 doc/services/block-storage/v2/volumes.rst      | 18 +++++++++---------
 .../v2/snapshots/create.php                    |  0
 .../v2/snapshots/delete.php                    |  0
 .../v2/snapshots/get.php                       |  0
 .../v2/snapshots/get_metadata.php              |  0
 .../v2/snapshots/list.php                      |  0
 .../v2/snapshots/list_detail.php               |  0
 .../v2/snapshots/merge_metadata.php            |  0
 .../v2/snapshots/reset_metadata.php            |  0
 .../v2/snapshots/update.php                    |  0
 .../v2/volume_types/create.php                 |  0
 .../v2/volume_types/delete.php                 |  0
 .../v2/volume_types/get.php                    |  0
 .../v2/volume_types/list.php                   |  0
 .../v2/volume_types/update.php                 |  0
 .../v2/volumes/create.php                      |  0
 .../v2/volumes/create_from_image.php           |  0
 .../v2/volumes/create_from_snapshot.php        |  0
 .../v2/volumes/create_from_source_volume.php   |  0
 .../v2/volumes/delete.php                      |  0
 .../v2/volumes/get.php                         |  0
 .../v2/volumes/list.php                        |  0
 .../v2/volumes/list_detail.php                 |  0
 .../v2/volumes/update.php                      |  0
 25 files changed, 14 insertions(+), 14 deletions(-)
 rename samples/{block_storage => blockstorage}/v2/snapshots/create.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/delete.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/get.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/get_metadata.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/list.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/list_detail.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/merge_metadata.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/reset_metadata.php (100%)
 rename samples/{block_storage => blockstorage}/v2/snapshots/update.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volume_types/create.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volume_types/delete.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volume_types/get.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volume_types/list.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volume_types/update.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/create.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/create_from_image.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/create_from_snapshot.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/create_from_source_volume.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/delete.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/get.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/list.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/list_detail.php (100%)
 rename samples/{block_storage => blockstorage}/v2/volumes/update.php (100%)

diff --git a/doc/services/block-storage/v2/volume-types.rst b/doc/services/block-storage/v2/volume-types.rst
index 60d125a7..7c038544 100644
--- a/doc/services/block-storage/v2/volume-types.rst
+++ b/doc/services/block-storage/v2/volume-types.rst
@@ -3,7 +3,7 @@ Volume Types
 
 Listing volume types
 --------------------
-.. sample:: block_storage/v2/volume_types/list.php
+.. sample:: blockstoragev2/volume_types/list.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumeTypes
 
 Each iteration will return a :php:class:`VolumeType` instance <OpenStack/BlockStorage/v2/Models/VolumeType.html>.
@@ -17,7 +17,7 @@ Create volume type
 The only attributes that are required when creating a volume are a name. The simplest example
 would therefore be this:
 
-.. sample:: block_storage/v2/volume_types/create.php
+.. sample:: blockstoragev2/volume_types/create.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_createVolumeType
 
 
@@ -27,7 +27,7 @@ Retrieve details of a volume type
 When retrieving a volume type, sometimes you only want to operate on it - say to update or delete it. If this is the
 case, then there is no need to perform an initial GET request to the API:
 
-.. sample:: block_storage/v2/volume_types/get.php
+.. sample:: blockstoragev2/volume_types/get.php
 
 If, however, you *do* want to retrieve all the details of a remote volume type from the API, you just call:
 
@@ -46,7 +46,7 @@ Update a volume type
 The first step when updating a volume type is modifying the attributes you want updated. By default, only a volume
 type's name can be edited.
 
-.. sample:: block_storage/v2/volume_types/update.php
+.. sample:: blockstoragev2/volume_types/update.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_update
 
 
@@ -55,5 +55,5 @@ Delete volume type
 
 To permanently delete a volume type:
 
-.. sample:: block_storage/v2/volume_types/delete.php
+.. sample:: blockstoragev2/volume_types/delete.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_delete
\ No newline at end of file
diff --git a/doc/services/block-storage/v2/volumes.rst b/doc/services/block-storage/v2/volumes.rst
index d59a5ffd..e171e670 100644
--- a/doc/services/block-storage/v2/volumes.rst
+++ b/doc/services/block-storage/v2/volumes.rst
@@ -4,7 +4,7 @@ Volumes
 List volumes
 ------------
 
-.. sample:: block_storage/v2/volumes/list.php
+.. sample:: blockstoragev2/volumes/list.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumes
 
 Each iteration will return a php:class:`Volume` instance <OpenStack/BlockStorage/v2/Models/Volume.html>.
@@ -17,7 +17,7 @@ Detailed information
 By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information
 for a flavor, you must enable detailed information, like so:
 
-.. sample:: block_storage/v2/volumes/list_detail.php
+.. sample:: blockstoragev2/volumes/list_detail.php
 
 Create volume
 -------------
@@ -25,7 +25,7 @@ Create volume
 The only attributes that are required when creating a volume are a size in GiB. The simplest example
 would therefore be this:
 
-.. sample:: block_storage/v2/volumes/create.php
+.. sample:: blockstoragev2/volumes/create.php
 
 You can further configure your new volume, however, by following the below sections, which instruct you how to add
 specific functionality.
@@ -35,17 +35,17 @@ specific functionality.
 Create from image
 ~~~~~~~~~~~~~~~~~
 
-.. sample:: block_storage/v2/volumes/create_from_image.php
+.. sample:: blockstoragev2/volumes/create_from_image.php
 
 Create from snapshot
 ~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: block_storage/v2/volumes/create_from_snapshot.php
+.. sample:: blockstoragev2/volumes/create_from_snapshot.php
 
 Create from source volume
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: block_storage/v2/volumes/create_from_source_volume.php
+.. sample:: blockstoragev2/volumes/create_from_source_volume.php
 
 
 Retrieve volume details
@@ -54,7 +54,7 @@ Retrieve volume details
 When retrieving a volume, sometimes you only want to operate on it - say to update or delete it. If this is the case,
 then there is no need to perform an initial GET request to the API:
 
-.. sample:: block_storage/v2/volumes/get.php
+.. sample:: blockstoragev2/volumes/get.php
 
 If, however, you *do* want to retrieve all the details of a remote volume from the API, you just call:
 
@@ -73,7 +73,7 @@ Update volume
 The first step when updating a volume is modifying the attributes you want updated. By default, only a volume's name
 and description can be edited.
 
-.. sample:: block_storage/v2/volumes/update.php
+.. sample:: blockstoragev2/volumes/update.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_update
 
 Delete volume
@@ -81,5 +81,5 @@ Delete volume
 
 To permanently delete a volume:
 
-.. sample:: block_storage/v2/volumes/delete.php
+.. sample:: blockstoragev2/volumes/delete.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_delete
\ No newline at end of file
diff --git a/samples/block_storage/v2/snapshots/create.php b/samples/blockstorage/v2/snapshots/create.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/create.php
rename to samples/blockstorage/v2/snapshots/create.php
diff --git a/samples/block_storage/v2/snapshots/delete.php b/samples/blockstorage/v2/snapshots/delete.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/delete.php
rename to samples/blockstorage/v2/snapshots/delete.php
diff --git a/samples/block_storage/v2/snapshots/get.php b/samples/blockstorage/v2/snapshots/get.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/get.php
rename to samples/blockstorage/v2/snapshots/get.php
diff --git a/samples/block_storage/v2/snapshots/get_metadata.php b/samples/blockstorage/v2/snapshots/get_metadata.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/get_metadata.php
rename to samples/blockstorage/v2/snapshots/get_metadata.php
diff --git a/samples/block_storage/v2/snapshots/list.php b/samples/blockstorage/v2/snapshots/list.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/list.php
rename to samples/blockstorage/v2/snapshots/list.php
diff --git a/samples/block_storage/v2/snapshots/list_detail.php b/samples/blockstorage/v2/snapshots/list_detail.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/list_detail.php
rename to samples/blockstorage/v2/snapshots/list_detail.php
diff --git a/samples/block_storage/v2/snapshots/merge_metadata.php b/samples/blockstorage/v2/snapshots/merge_metadata.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/merge_metadata.php
rename to samples/blockstorage/v2/snapshots/merge_metadata.php
diff --git a/samples/block_storage/v2/snapshots/reset_metadata.php b/samples/blockstorage/v2/snapshots/reset_metadata.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/reset_metadata.php
rename to samples/blockstorage/v2/snapshots/reset_metadata.php
diff --git a/samples/block_storage/v2/snapshots/update.php b/samples/blockstorage/v2/snapshots/update.php
similarity index 100%
rename from samples/block_storage/v2/snapshots/update.php
rename to samples/blockstorage/v2/snapshots/update.php
diff --git a/samples/block_storage/v2/volume_types/create.php b/samples/blockstorage/v2/volume_types/create.php
similarity index 100%
rename from samples/block_storage/v2/volume_types/create.php
rename to samples/blockstorage/v2/volume_types/create.php
diff --git a/samples/block_storage/v2/volume_types/delete.php b/samples/blockstorage/v2/volume_types/delete.php
similarity index 100%
rename from samples/block_storage/v2/volume_types/delete.php
rename to samples/blockstorage/v2/volume_types/delete.php
diff --git a/samples/block_storage/v2/volume_types/get.php b/samples/blockstorage/v2/volume_types/get.php
similarity index 100%
rename from samples/block_storage/v2/volume_types/get.php
rename to samples/blockstorage/v2/volume_types/get.php
diff --git a/samples/block_storage/v2/volume_types/list.php b/samples/blockstorage/v2/volume_types/list.php
similarity index 100%
rename from samples/block_storage/v2/volume_types/list.php
rename to samples/blockstorage/v2/volume_types/list.php
diff --git a/samples/block_storage/v2/volume_types/update.php b/samples/blockstorage/v2/volume_types/update.php
similarity index 100%
rename from samples/block_storage/v2/volume_types/update.php
rename to samples/blockstorage/v2/volume_types/update.php
diff --git a/samples/block_storage/v2/volumes/create.php b/samples/blockstorage/v2/volumes/create.php
similarity index 100%
rename from samples/block_storage/v2/volumes/create.php
rename to samples/blockstorage/v2/volumes/create.php
diff --git a/samples/block_storage/v2/volumes/create_from_image.php b/samples/blockstorage/v2/volumes/create_from_image.php
similarity index 100%
rename from samples/block_storage/v2/volumes/create_from_image.php
rename to samples/blockstorage/v2/volumes/create_from_image.php
diff --git a/samples/block_storage/v2/volumes/create_from_snapshot.php b/samples/blockstorage/v2/volumes/create_from_snapshot.php
similarity index 100%
rename from samples/block_storage/v2/volumes/create_from_snapshot.php
rename to samples/blockstorage/v2/volumes/create_from_snapshot.php
diff --git a/samples/block_storage/v2/volumes/create_from_source_volume.php b/samples/blockstorage/v2/volumes/create_from_source_volume.php
similarity index 100%
rename from samples/block_storage/v2/volumes/create_from_source_volume.php
rename to samples/blockstorage/v2/volumes/create_from_source_volume.php
diff --git a/samples/block_storage/v2/volumes/delete.php b/samples/blockstorage/v2/volumes/delete.php
similarity index 100%
rename from samples/block_storage/v2/volumes/delete.php
rename to samples/blockstorage/v2/volumes/delete.php
diff --git a/samples/block_storage/v2/volumes/get.php b/samples/blockstorage/v2/volumes/get.php
similarity index 100%
rename from samples/block_storage/v2/volumes/get.php
rename to samples/blockstorage/v2/volumes/get.php
diff --git a/samples/block_storage/v2/volumes/list.php b/samples/blockstorage/v2/volumes/list.php
similarity index 100%
rename from samples/block_storage/v2/volumes/list.php
rename to samples/blockstorage/v2/volumes/list.php
diff --git a/samples/block_storage/v2/volumes/list_detail.php b/samples/blockstorage/v2/volumes/list_detail.php
similarity index 100%
rename from samples/block_storage/v2/volumes/list_detail.php
rename to samples/blockstorage/v2/volumes/list_detail.php
diff --git a/samples/block_storage/v2/volumes/update.php b/samples/blockstorage/v2/volumes/update.php
similarity index 100%
rename from samples/block_storage/v2/volumes/update.php
rename to samples/blockstorage/v2/volumes/update.php

From a37b032892afc8c7237f6a279ffc0b1ba5c3fd3c Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 20:15:22 +0800
Subject: [PATCH 019/102] Display errors during in phpunit tests

---
 phpunit.xml.dist | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 032b639b..05ba70a1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,7 +8,11 @@
             <directory>tests/unit</directory>
         </testsuite>
     </testsuites>
-
+    <php>
+        <ini name="error_reporting" value=""/>
+        <ini name="display_errors" value="On"/>
+        <ini name="display_startup_errors" value="On"/>
+    </php>
     <filter>
         <whitelist>
             <directory suffix=".php">./src</directory>
@@ -19,5 +23,4 @@
             </exclude>
         </whitelist>
     </filter>
-
 </phpunit>
\ No newline at end of file

From 7d1409ba30a9372a19c8190be01bd3c0215a3ad0 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 21:29:06 +0800
Subject: [PATCH 020/102] Added more unit tests

---
 .../Common/Resource/AbstractResourceTest.php  | 67 +++++++++++++++----
 .../Common/Resource/OperatorResourceTest.php  | 33 +++++----
 .../unit/Images/v2/Fixtures/POST_members.resp | 11 +++
 tests/unit/Images/v2/Models/ImageTest.php     |  2 +-
 4 files changed, 87 insertions(+), 26 deletions(-)
 create mode 100644 tests/unit/Images/v2/Fixtures/POST_members.resp

diff --git a/tests/unit/Common/Resource/AbstractResourceTest.php b/tests/unit/Common/Resource/AbstractResourceTest.php
index 3075f3df..36de7b27 100644
--- a/tests/unit/Common/Resource/AbstractResourceTest.php
+++ b/tests/unit/Common/Resource/AbstractResourceTest.php
@@ -2,13 +2,12 @@
 
 namespace OpenStack\Test\Common\Resource;
 
-use function GuzzleHttp\Psr7\stream_for;
 use GuzzleHttp\Psr7\Response;
+use function GuzzleHttp\Psr7\stream_for;
 use OpenStack\Common\Resource\AbstractResource;
 use OpenStack\Common\Resource\Alias;
 use OpenStack\Common\Resource\ResourceInterface;
 use OpenStack\Test\TestCase;
-use Prophecy\Argument;
 
 class AbstractResourceTest extends TestCase
 {
@@ -37,11 +36,14 @@ public function test_it_populates_from_response()
 
     public function test_it_populates_datetimes_from_arrays()
     {
-        $dt = new \DateTimeImmutable('2015');
+        $ca = new \DateTimeImmutable('2015');
+        $ua = new \DateTimeImmutable('2016');
 
-        $this->resource->populateFromArray(['created' => '2015']);
+        $this->resource->populateFromArray(['created_at' => '2015']);
+        $this->resource->populateFromArray(['updated_at' => '2016']);
 
-        $this->assertEquals($this->resource->created, $dt);
+        $this->assertEquals($this->resource->createdAt, $ca);
+        $this->assertEquals($this->resource->updatedAt, $ua);
     }
 
     public function test_it_populates_model_objects_from_arrays()
@@ -78,8 +80,36 @@ public function test_it_populates_models_from_response()
 
     public function test_it_populates_models_from_arrays()
     {
-        $data = ['flavor' => [], 'image' => []];
-        $this->assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class, $data));
+        $data = [
+            'bar'        => 'this-is-bar',
+            'camel_attr' => 'this-is-camel-attr',
+            'child'      => ['bar' => 'child-bar', 'camel_attr' => 'child-camel'],
+            'children'   => [
+                ['bar' => 'child1-bar', 'camel_attr' => 'child1-camel'],
+                ['bar' => 'child2-bar', 'camel_attr' => 'child2-camel'],
+            ],
+        ];
+
+        /** @var TestResource $model */
+        $model = $this->resource->model(TestResource::class, $data);
+
+        $this->assertInstanceOf(ResourceInterface::class, $model);
+
+        $this->assertEquals('this-is-bar', $model->bar);
+        $this->assertEquals('this-is-camel-attr', $model->camelAttr);
+
+        $child = $model->child;
+        $this->assertInstanceOf(TestResource::class, $child);
+        $this->assertEquals('child-bar', $child->bar);
+        $this->assertEquals('child-camel', $child->camelAttr);
+
+        $this->assertContainsOnlyInstancesOf(TestResource::class, $model->children);
+        $this->assertCount(2, $model->children);
+        $this->assertEquals('child1-bar', $model->children[0]->bar);
+        $this->assertEquals('child1-camel', $model->children[0]->camelAttr);
+        $this->assertEquals('child2-bar', $model->children[1]->bar);
+        $this->assertEquals('child2-camel', $model->children[1]->camelAttr);
+
     }
 }
 
@@ -90,10 +120,16 @@ class TestResource extends AbstractResource
     /** @var string */
     public $bar;
 
+    /** @var string */
+    public $camelAttr;
+
     public $id;
 
     /** @var \DateTimeImmutable */
-    public $created;
+    public $createdAt;
+
+    /** @var \DateTimeImmutable */
+    public $updatedAt;
 
     /** @var []TestResource */
     public $children;
@@ -101,13 +137,18 @@ class TestResource extends AbstractResource
     /** @var TestResource */
     public $child;
 
+    protected $aliases = [
+        'camel_attr'  => 'camelAttr',
+    ];
+
     protected function getAliases(): array
     {
-        $aliases = parent::getAliases();
-        $aliases['created'] = new Alias('created', \DateTimeImmutable::class);
-        $aliases['child'] = new Alias('child', TestResource::class);
-        $aliases['children'] = new Alias('children', TestResource::class, true);
-        return $aliases;
+        return parent::getAliases() + [
+                'created_at' => new Alias('createdAt', \DateTimeImmutable::class),
+                'updated_at' => new Alias('updatedAt', \DateTimeImmutable::class),
+                'child'      => new Alias('child', TestResource::class),
+                'children'   => new Alias('children', TestResource::class, true),
+            ];
     }
 
     public function getAttrs(array $keys)
diff --git a/tests/unit/Common/Resource/OperatorResourceTest.php b/tests/unit/Common/Resource/OperatorResourceTest.php
index e0bdb485..5db120c5 100644
--- a/tests/unit/Common/Resource/OperatorResourceTest.php
+++ b/tests/unit/Common/Resource/OperatorResourceTest.php
@@ -9,8 +9,8 @@
 use OpenStack\Test\Common\Service\Fixtures\Api;
 use OpenStack\Test\Common\Service\Fixtures\Models\Foo;
 use OpenStack\Test\Common\Service\Fixtures\Service;
-use OpenStack\Test\TestCase;
 use OpenStack\Test\Fixtures\ComputeV2Api;
+use OpenStack\Test\TestCase;
 
 class OperatorResourceTest extends TestCase
 {
@@ -39,7 +39,7 @@ public function test_it_retrieves_base_http_url()
 
     public function test_it_executes_with_state()
     {
-        $this->resource->id = 'foo';
+        $this->resource->id  = 'foo';
         $this->resource->bar = 'bar';
 
         $expectedJson = ['id' => 'foo', 'bar' => 'bar'];
@@ -66,7 +66,7 @@ public function test_it_executes_operations_until_a_204_is_received()
         $api = new ComputeV2Api();
 
         foreach ($this->resource->enumerate($api->getServers()) as $item) {
-            $count++;
+            ++$count;
             $this->assertInstanceOf(TestOperatorResource::class, $item);
         }
 
@@ -90,7 +90,7 @@ public function test_it_invokes_function_if_provided()
         $count = 0;
 
         $fn = function () use (&$count) {
-            $count++;
+            ++$count;
         };
 
         foreach ($this->resource->enumerate($api->getServers(), [], $fn) as $item) {
@@ -111,7 +111,7 @@ public function test_it_halts_when_user_provided_limit_is_reached()
         $api = new ComputeV2Api();
 
         foreach ($this->resource->enumerate($api->getServers(), ['limit' => 2]) as $item) {
-            $count++;
+            ++$count;
         }
 
         $this->assertEquals(2, $count);
@@ -126,11 +126,11 @@ public function test_it_predicts_resources_key_without_explicit_property()
 
         $count = 0;
 
-        $api = new ComputeV2Api();
-        $resource = new Server($this->client->reveal(), new $api);
+        $api      = new ComputeV2Api();
+        $resource = new Server($this->client->reveal(), new $api());
 
         foreach ($resource->enumerate($api->getServers(), ['limit' => 2]) as $item) {
-            $count++;
+            ++$count;
         }
 
         $this->assertEquals(2, $count);
@@ -166,16 +166,25 @@ public function test_it_populates_models_from_response()
 
     public function test_it_populates_models_from_arrays()
     {
-        $data = ['flavor' => [], 'image' => []];
-        $this->assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class, $data));
+        $data = [
+            'id'  => 123,
+            'bar' => 'this-is-bar',
+        ];
+
+        /** @var TestOperatorResource $model */
+        $model = $this->resource->model(TestOperatorResource::class, $data);
+
+        $this->assertInstanceOf(ResourceInterface::class, $model);
+        $this->assertEquals(123, $model->id);
+        $this->assertEquals('this-is-bar', $model->bar);
     }
 }
 
 class TestOperatorResource extends OperatorResource
 {
-    protected $resourceKey = 'foo';
+    protected $resourceKey  = 'foo';
     protected $resourcesKey = 'servers';
-    protected $markerKey = 'id';
+    protected $markerKey    = 'id';
 
     /** @var string */
     public $bar;
diff --git a/tests/unit/Images/v2/Fixtures/POST_members.resp b/tests/unit/Images/v2/Fixtures/POST_members.resp
new file mode 100644
index 00000000..4a6072c4
--- /dev/null
+++ b/tests/unit/Images/v2/Fixtures/POST_members.resp
@@ -0,0 +1,11 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+    "created_at": "2013-09-20T19:22:19Z",
+    "image_id": "a96be11e-8536-4910-92cb-de50aa19dfe6",
+    "member_id": "8989447062e04a818baf9e073fd04fa7",
+    "schema": "/v2/schemas/member",
+    "status": "pending",
+    "updated_at": "2013-09-20T19:25:31Z"
+}
\ No newline at end of file
diff --git a/tests/unit/Images/v2/Models/ImageTest.php b/tests/unit/Images/v2/Models/ImageTest.php
index 2462a7c8..33a24e74 100644
--- a/tests/unit/Images/v2/Models/ImageTest.php
+++ b/tests/unit/Images/v2/Models/ImageTest.php
@@ -149,7 +149,7 @@ public function test_it_creates_member()
         $memberId = '8989447062e04a818baf9e073fd04fa7';
         $expectedJson = ['member' => $memberId];
 
-        $this->setupMock('POST', $this->path . '/members', $expectedJson, [], 'GET_member');
+        $this->setupMock('POST', $this->path . '/members', $expectedJson, [], 'POST_members');
 
         $member = $this->image->addMember('8989447062e04a818baf9e073fd04fa7');
         $this->assertInstanceOf(Member::class, $member);

From 64f4ac7a3bb3cacad051b5f0161b2ee90f74a253 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 21:30:20 +0800
Subject: [PATCH 021/102] Fixed integration tests

---
 samples/images/v2/images/create.php            |  4 +++-
 samples/images/v2/members/add.php              |  2 +-
 samples/images/v2/members/delete.php           |  2 +-
 samples/images/v2/members/update_status.php    |  2 +-
 tests/integration/BlockStorage/v2/CoreTest.php | 12 ++++++++++--
 tests/integration/Images/v2/CoreTest.php       |  9 ++++++---
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/samples/images/v2/images/create.php b/samples/images/v2/images/create.php
index 73ebf40f..e2fec9bd 100644
--- a/samples/images/v2/images/create.php
+++ b/samples/images/v2/images/create.php
@@ -18,6 +18,8 @@
     'diskFormat'      => '{diskFormat}',
     'visibility'      => '{visibility}',
     'minDisk'         => 10,
-    'protected'       => true,
+    'protected'       => false,
     'minRam'          => 10,
 ]);
+
+$image->uploadData(\GuzzleHttp\Psr7\Utils::streamFor('fake-image.img'));
\ No newline at end of file
diff --git a/samples/images/v2/members/add.php b/samples/images/v2/members/add.php
index f8226ffa..e62f1239 100644
--- a/samples/images/v2/members/add.php
+++ b/samples/images/v2/members/add.php
@@ -11,4 +11,4 @@
 
 $member = $openstack->imagesV2()
                     ->getImage('{imageId}')
-                    ->addMember('{tenantId}');
+                    ->addMember('{projectId}');
diff --git a/samples/images/v2/members/delete.php b/samples/images/v2/members/delete.php
index 19723b08..6040895a 100644
--- a/samples/images/v2/members/delete.php
+++ b/samples/images/v2/members/delete.php
@@ -11,5 +11,5 @@
 
 $openstack->imagesV2()
           ->getImage('{imageId}')
-          ->getMember('{tenantId}')
+          ->getMember('{projectId}')
           ->delete();
diff --git a/samples/images/v2/members/update_status.php b/samples/images/v2/members/update_status.php
index 01ea9091..30f33e93 100644
--- a/samples/images/v2/members/update_status.php
+++ b/samples/images/v2/members/update_status.php
@@ -13,5 +13,5 @@
 
 $openstack->imagesV2()
     ->getImage('{imageId}')
-    ->getMember('{tenantId}')
+    ->getMember('{projectId}')
     ->updateStatus(Member::STATUS_ACCEPTED);
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
index 1615cbc9..375562d6 100644
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -28,8 +28,11 @@ public function runTests()
     {
         $this->startTimer();
 
+        $this->logger->info('-> Volumes');
         $this->volumes();
+        $this->logger->info('-> Volume Types');
         $this->volumeTypes();
+        $this->logger->info('-> Snapshots');
         $this->snapshots();
 
         $this->outputTimeTaken();
@@ -37,6 +40,7 @@ public function runTests()
 
     public function volumes()
     {
+        $this->logStep('-> Volumes tests');
         $this->logStep('Creating volume type');
         $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
 
@@ -88,6 +92,8 @@ public function volumes()
 
     public function volumeTypes()
     {
+        $this->logStep('-> Volumes Types tests');
+
         $replacements = [
             '{name}' => $this->randomStr(),
         ];
@@ -122,9 +128,11 @@ public function volumeTypes()
 
     public function snapshots()
     {
+        $this->logStep('-> Snapshot tests');
+
         $this->logStep('Creating volume');
         $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
-        $volume->waitUntilActive();
+        $volume->waitUntil('available', 60);
 
         $replacements = [
             '{volumeId}'    => $volume->id,
@@ -137,7 +145,7 @@ public function snapshots()
         require_once $this->sampleFile($replacements, 'snapshots/create.php');
         $this->assertInstanceOf(Snapshot::class, $snapshot);
         $this->assertEquals($replacements['{name}'], $snapshot->name);
-        $snapshot->waitUntilActive();
+        $volume->waitUntil('available', 60);
 
         $snapshotId = $snapshot->id;
         $replacements = ['{snapshotId}' => $snapshotId];
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
index f459e5ee..fc97828a 100644
--- a/tests/integration/Images/v2/CoreTest.php
+++ b/tests/integration/Images/v2/CoreTest.php
@@ -67,7 +67,7 @@ public function members()
             '{tag2}'            => 'quantal',
             '{containerFormat}' => 'bare',
             '{diskFormat}'      => 'qcow2',
-            '{visibility}'      => 'private',
+            '{visibility}'      => 'shared',
             'true'              => 'false',
         ];
 
@@ -75,11 +75,14 @@ public function members()
         /** @var Image $image */
         require_once $this->sampleFile($replacements, 'images/create.php');
 
-        $replacements = ['{imageId}' => $image->id];
+
+
+        $this->logStep(sprintf('Image created with id=%s', $image->id));
 
         $this->logStep('Adding member');
+        $replacements += ['{imageId}' => $image->id];
         /** @var Member $member */
-        require_once $this->sampleFile($replacements, 'members/add.php');
+        require_once $this->sampleFile(['{imageId}' => $image->id, ], 'members/add.php');
         $this->assertInstanceOf(Member::class, $member);
 
         $replacements += ['status' => Member::STATUS_REJECTED];

From cafac36aca9d2a9b470c2ae5ab6da829be1494a7 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 21:30:48 +0800
Subject: [PATCH 022/102] Allow type community and shared for image

---
 src/Images/v2/Params.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Images/v2/Params.php b/src/Images/v2/Params.php
index 94a7c9c6..4b8c31fd 100644
--- a/src/Images/v2/Params.php
+++ b/src/Images/v2/Params.php
@@ -24,7 +24,7 @@ public function visibility(): array
             'location'    => self::JSON,
             'type'        => self::STRING_TYPE,
             'description' => 'Image visibility. Public or private. Default is public.',
-            'enum'        => ['private', 'public'],
+            'enum'        => ['private', 'public', 'community', 'shared'],
         ];
     }
 
@@ -196,10 +196,10 @@ public function data(): array
     public function memberId(): array
     {
         return [
-            'location'  => self::JSON,
-            'sentAs'    => 'member',
-            'type'      => self::STRING_TYPE,
-            'documeted' => false,
+            'location'   => self::JSON,
+            'sentAs'     => 'member',
+            'type'       => self::STRING_TYPE,
+            'documented' => false,
         ];
     }
 

From b0a83f1fb06c842f3af80d7625042e885aad404c Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 21:31:03 +0800
Subject: [PATCH 023/102] Added name for logging middleware

---
 src/OpenStack.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/OpenStack.php b/src/OpenStack.php
index ac494484..3da8700f 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -5,9 +5,9 @@
 namespace OpenStack;
 
 use GuzzleHttp\Client;
-use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware as GuzzleMiddleware;
 use OpenStack\Common\Service\Builder;
+use OpenStack\Common\Transport\HandlerStack;
 use OpenStack\Common\Transport\Utils;
 use OpenStack\Identity\v3\Service;
 
@@ -56,7 +56,8 @@ private function getDefaultIdentityService(array $options): Service
             && !empty($options['logger'])
             && !empty($options['messageFormatter'])
         ) {
-            $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
+            $logMiddleware = GuzzleMiddleware::log($options['logger'], $options['messageFormatter']);
+            $stack->push($logMiddleware, 'logger');
         }
 
         $clientOptions = [

From 376450e6eb6359a8dd500af76a63513e9f0db343 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 21:41:10 +0800
Subject: [PATCH 024/102] Replaced uri_for with GuzzleUtils::uriFor

---
 src/Common/Transport/Utils.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Common/Transport/Utils.php b/src/Common/Transport/Utils.php
index 48aa1e86..35ae5842 100644
--- a/src/Common/Transport/Utils.php
+++ b/src/Common/Transport/Utils.php
@@ -4,7 +4,7 @@
 
 namespace OpenStack\Common\Transport;
 
-use function GuzzleHttp\Psr7\uri_for;
+use GuzzleHttp\Psr7\Utils as GuzzleUtils;
 use GuzzleHttp\UriTemplate\UriTemplate;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
@@ -74,12 +74,12 @@ public static function normalizeUrl(string $url): string
      */
     public static function addPaths(UriInterface $uri, ...$paths): UriInterface
     {
-        return uri_for(rtrim((string) $uri, '/').'/'.implode('/', $paths));
+        return GuzzleUtils::uriFor(rtrim((string) $uri, '/').'/'.implode('/', $paths));
     }
 
     public static function appendPath(UriInterface $uri, $path): UriInterface
     {
-        return uri_for(rtrim((string) $uri, '/').'/'.$path);
+        return GuzzleUtils::uriFor(rtrim((string) $uri, '/').'/'.$path);
     }
 
     /**

From 4e8e2a52539b7dad263bb3604227bc2e82b3b663 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 23:36:48 +0800
Subject: [PATCH 025/102] Adding available params for integration test command

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c45b631..8661ec7e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -239,7 +239,7 @@ Additionally, integration tests require image called `cirros` exists.
 You interact with integration tests through a runner script:
 
 ```bash
-php ./tests/integration/run.php
+php ./tests/integration/run.php [-s=BlockStorage|Compute|Identity|Images|Networking|ObjectStore] [--debug=1|2]
 ```
 
 It supports these command-line flags:

From 7bb271641c80430fc820e081fe8254c7dad1607a Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 23:37:12 +0800
Subject: [PATCH 026/102] Updated project version support

---
 README.md | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 199b6e16..6b608408 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 `php-opencloud/openstack` is an SDK which allows PHP developers to easily connect to OpenStack APIs in a simple and 
 idiomatic way. This binding is specifically designed for OpenStack APIs, but other provider SDKs are available. Multiple 
 OpenStack services, and versions of services, are supported.
-
+ 
 ## Links
 
 * [Official documentation](https://php-openstack-sdk.readthedocs.io/en/latest/)
@@ -15,18 +15,37 @@ OpenStack services, and versions of services, are supported.
 * [Contributing guide](/CONTRIBUTING.md)
 * [Code of Conduct](/CODE_OF_CONDUCT.md)
 
-## Getting help
+
+## We need your help :smiley: 
+
+We invest a large amount of work to ensure this SDK works with many OpenStack distributions via running end-to-end 
+integration tests with a real cluster.
+
+If you or your organization are in a position that can help us access popular distributions as listed below, do reach 
+out by open an issue in github.
+
+| Distribution        |                         |
+|---------------------|-------------------------|
+|OpenStack RDO        | :white_check_mark:      |
+|Red Hat OpenStack    | Need sponsor!    |
+|OVH OpenStack        | Need sponsor!    |
+|SUSE OpenStack       | Need sponsor!    |
+|Canonical OpenStack  | Need sponsor!    |
+|RackSpace OpenStack  | Need sponsor!    |
+
+## Join the community
    
 - Meet us on Slack: https://phpopencloud.slack.com ([Get your invitation](https://launchpass.com/phpopencloud))
 - Report an issue: https://github.com/php-opencloud/openstack/issues
 
-
 ## Version Guidance
 
-| Version   | Status                      | PHP Version   | End of life             |
+| Version   | Status                      | PHP Version   | Support until           |
 | --------- | --------------------------- | ------------- | ----------------------- |
-| `^3.0`    | Latest                      | `>=7.0`       | March 2020              |
-| `^2.0`    | Maintained (Bug fixes only) | `>=7.0,<7.2`  | March 2018              |
+| `^3.1`    | Latest                      | `>=7.2.5`     | Oct 2023                |
+| `^3.0`    | Bug fixed only              | `>=7.0`       | Oct 2020                |
+| `^2.0`    | EOL (Bug fixes only)        | `>=7.0,<7.2`  | March 2018              |
+
 
 ## Upgrade from 2.x to 3.x
 

From 4c4a10a97c3070e11c19fa4ddfb4495f86a8aa1e Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 23:52:03 +0800
Subject: [PATCH 027/102] Added waiting for status

---
 samples/compute/v2/servers/confirm_server_resize.php | 1 +
 samples/compute/v2/servers/unrescue_server.php       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/samples/compute/v2/servers/confirm_server_resize.php b/samples/compute/v2/servers/confirm_server_resize.php
index 085a900c..46e50469 100644
--- a/samples/compute/v2/servers/confirm_server_resize.php
+++ b/samples/compute/v2/servers/confirm_server_resize.php
@@ -18,4 +18,5 @@
     'id' => '{serverId}',
 ]);
 
+$server->waitUntil('VERIFY_RESIZE');
 $server->confirmResize();
diff --git a/samples/compute/v2/servers/unrescue_server.php b/samples/compute/v2/servers/unrescue_server.php
index b5f59a17..4148ac9f 100644
--- a/samples/compute/v2/servers/unrescue_server.php
+++ b/samples/compute/v2/servers/unrescue_server.php
@@ -18,4 +18,5 @@
     'id' => '{serverId}',
 ]);
 
+$server->waitUntil('RESCUE');
 $server->unrescue();

From 2cbfc51d672f2b40c97a24bfd10370544103cefd Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Sun, 11 Oct 2020 23:55:22 +0800
Subject: [PATCH 028/102] Improved integration tests for Compute

---
 .../integration/BlockStorage/v2/CoreTest.php  |  5 ---
 tests/integration/Compute/v2/CoreTest.php     | 37 +++++++++++++++----
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
index 375562d6..3e43438c 100644
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -41,7 +41,6 @@ public function runTests()
     public function volumes()
     {
         $this->logStep('-> Volumes tests');
-        $this->logStep('Creating volume type');
         $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
 
         $replacements = [
@@ -92,8 +91,6 @@ public function volumes()
 
     public function volumeTypes()
     {
-        $this->logStep('-> Volumes Types tests');
-
         $replacements = [
             '{name}' => $this->randomStr(),
         ];
@@ -128,8 +125,6 @@ public function volumeTypes()
 
     public function snapshots()
     {
-        $this->logStep('-> Snapshot tests');
-
         $this->logStep('Creating volume');
         $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
         $volume->waitUntil('available', 60);
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
index eb829b73..457d230b 100644
--- a/tests/integration/Compute/v2/CoreTest.php
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -12,10 +12,12 @@
 use OpenStack\Compute\v2\Models\Server;
 use OpenStack\Integration\TestCase;
 use OpenStack\Integration\Utils;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
 use OpenStack\Networking\v2\Models\Network;
 use OpenStack\Networking\v2\Models\Subnet;
 use OpenStack\Networking\v2\Service as NetworkService;
 use OpenStack\BlockStorage\v2\Service as BlockStorageService;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Service as SecurityGroupService;
 
 class CoreTest extends TestCase
 {
@@ -24,6 +26,8 @@ class CoreTest extends TestCase
     const SUBNET = 'phptest_subnet';
     const VOLUME = 'phptest_volume';
 
+    const SECGROUP = 'phptest_secgroup';
+
     const IMAGE = 'cirros';
 
     /** @var NetworkService */
@@ -32,6 +36,9 @@ class CoreTest extends TestCase
     /** @var BlockStorageService */
     private $blockStorageService;
 
+    /** @var SecurityGroupService */
+    private $secgroupService;
+
     /** @var  Network */
     private $network;
 
@@ -41,6 +48,9 @@ class CoreTest extends TestCase
     /** @var  Volume */
     private $volume;
 
+    /** @var SecurityGroup */
+    private $secgroup;
+
     // Core test
     private $service;
     private $serverId;
@@ -68,6 +78,12 @@ private function getNetworkService()
         return $this->networkService;
     }
 
+    private function getSecurityGroupService(): SecurityGroupService
+    {
+        $this->secgroupService = $this->secgroupService ?? Utils::getOpenStack()->networkingV2ExtSecGroups();
+        return $this->secgroupService;
+    }
+
     private function getBlockStorageService()
     {
         if (!$this->blockStorageService) {
@@ -100,7 +116,7 @@ protected function setUp()
             ]
         );
 
-        $this->logStep('Created network {name} with id {id}', ['name' => $this->network->name, 'id' => $this->network->id]);
+        $this->logStep('Created network {name} with {id}', ['name' => $this->network->name, 'id' => $this->network->id]);
 
         $this->subnet = $this->getNetworkService()->createSubnet(
             [
@@ -111,7 +127,7 @@ protected function setUp()
             ]
         );
 
-        $this->logStep('Created subnet {name} with id {id}', ['name' => $this->subnet->name, 'id' => $this->subnet->id]);
+        $this->logStep('Created subnet {name} with {id}', ['name' => $this->subnet->name, 'id' => $this->subnet->id]);
 
         $this->volume = $this->getBlockStorageService()->createVolume(
             [
@@ -121,7 +137,11 @@ protected function setUp()
             ]
         );
 
-        $this->logStep('Created volume {name} with id {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]);
+        $this->logStep('Created volume {name} with {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]);
+
+        $this->getSecurityGroupService()->createSecurityGroup(['name' => self::SECGROUP]);
+
+        $this->logStep('Created security group {secgroup}', ['secgroup' => self::SECGROUP]);
     }
 
     public function runTests()
@@ -193,12 +213,14 @@ public function runTests()
             // Interface attachments
             $this->createInterfaceAttachment();
         } finally {
+            $this->logger->info('Tearing down');
             // Teardown
             $this->deleteServer();
             $this->deleteFlavor();
             $this->subnet->delete();
             $this->network->delete();
             $this->volume->delete();
+            $this->secgroup->delete();
         }
 
         $this->outputTimeTaken();
@@ -341,6 +363,7 @@ private function resizeServer()
 
     private function confirmServerResize()
     {
+        $this->logger->info('Waiting for status VERIFY_RESIZE');
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
@@ -623,8 +646,8 @@ private function getLimits()
     private function addSecurityGroupToServer()
     {
         $replacements = [
-            '{serverId}' => $this->serverId,
-            '{secGroupName}' => 'default'
+            '{serverId}'     => $this->serverId,
+            '{secGroupName}' => self::SECGROUP,
         ];
 
         require_once  $this->sampleFile($replacements, 'servers/add_security_group.php');
@@ -650,8 +673,8 @@ private function listServerSecurityGroups()
     private function removeServerSecurityGroup()
     {
         $replacements = [
-            '{serverId}' => $this->serverId,
-            '{secGroupName}' => 'default'
+            '{serverId}'     => $this->serverId,
+            '{secGroupName}' => self::SECGROUP,
         ];
 
         require_once $this->sampleFile($replacements, 'servers/remove_security_group.php');

From 904401e4aa8e4f3a039ce8caa41377f59eeee0ad Mon Sep 17 00:00:00 2001
From: Ha Phan <thanhha.work@gmail.com>
Date: Mon, 12 Oct 2020 00:08:43 +0800
Subject: [PATCH 029/102] Update Params.php

---
 src/Compute/v2/Params.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compute/v2/Params.php b/src/Compute/v2/Params.php
index 70e7fec6..b8a8b73e 100644
--- a/src/Compute/v2/Params.php
+++ b/src/Compute/v2/Params.php
@@ -359,7 +359,7 @@ public function blockDeviceMapping(): array
                     'volumeType' => [
                         'type'        => self::STRING_TYPE,
                         'sentAs'      => 'volume_type',
-                        'description' => 'This can be used to specify the type of volume which the compute service will create and attach to the server.',
+                        'description' => 'The type of volume which the compute service will create and attach to the server.',
                     ],
                 ],
             ],

From 6407651731d1eb261e2e763714c4c7513ad18f7b Mon Sep 17 00:00:00 2001
From: Ha Phan <thanhha.work@gmail.com>
Date: Mon, 12 Oct 2020 08:13:58 +0800
Subject: [PATCH 030/102] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6b608408..b1b89c13 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ out by open an issue in github.
 | --------- | --------------------------- | ------------- | ----------------------- |
 | `^3.1`    | Latest                      | `>=7.2.5`     | Oct 2023                |
 | `^3.0`    | Bug fixed only              | `>=7.0`       | Oct 2020                |
-| `^2.0`    | EOL (Bug fixes only)        | `>=7.0,<7.2`  | March 2018              |
+| `^2.0`    | End of life                 | `>=7.0,<7.2`  | March 2018              |
 
 
 ## Upgrade from 2.x to 3.x
@@ -73,4 +73,4 @@ taken the time to write a [contributing guide](CONTRIBUTING.md) for folks intere
 If you're not sure how you can get involved, feel free to 
 [submit an issue](https://github.com/php-opencloud/openstack/issues/new) or 
 [contact us](https://developer.rackspace.com/support/). You don't need to be a PHP expert - all members of the 
-community are welcome!
\ No newline at end of file
+community are welcome!

From 2bbe99952856108f0288e1e9a2964a7a57ac59b5 Mon Sep 17 00:00:00 2001
From: Ha Phan <thanhha.work@gmail.com>
Date: Mon, 12 Oct 2020 08:15:32 +0800
Subject: [PATCH 031/102] Update README.md

---
 README.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index b1b89c13..0cb5a2c7 100644
--- a/README.md
+++ b/README.md
@@ -24,14 +24,15 @@ integration tests with a real cluster.
 If you or your organization are in a position that can help us access popular distributions as listed below, do reach 
 out by open an issue in github.
 
-| Distribution        |                         |
-|---------------------|-------------------------|
-|OpenStack RDO        | :white_check_mark:      |
-|Red Hat OpenStack    | Need sponsor!    |
-|OVH OpenStack        | Need sponsor!    |
-|SUSE OpenStack       | Need sponsor!    |
-|Canonical OpenStack  | Need sponsor!    |
-|RackSpace OpenStack  | Need sponsor!    |
+| Distribution                       |                         |
+|------------------------------------|-------------------------|
+|OpenStack RDO                       | :white_check_mark:      |
+|Red Hat OpenStack                   | Need sponsor!           |
+|OVH OpenStack                       | Need sponsor!           |
+|SUSE OpenStack                      | Need sponsor!           |
+|Canonical OpenStack                 | Need sponsor!           |
+|RackSpace OpenStack                 | Need sponsor!           |
+|Dedicated server or VPS (8GB+ RAM)  | Need sponsor!           |
 
 ## Join the community
    

From 52528bbb796c0a39c60fc6c9a1703e362906aeb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Bourgier?= <mickael.bourgier@gmail.com>
Date: Sat, 22 Feb 2020 16:21:02 +0100
Subject: [PATCH 032/102] Allow user to provide Guzzle options in requests

---
 src/Common/Api/OperatorTrait.php            |  4 ++++
 tests/unit/Common/Api/OperatorTraitTest.php | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index 4e796d0a..9438dca6 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -112,6 +112,10 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
 
         $uri     = Utils::uri_template($operation->getPath(), $userValues);
 
+        if (array_key_exists('guzzle', $userValues)) {
+            $options += $userValues['guzzle'];
+        }
+
         return $this->client->$method($operation->getMethod(), $uri, $options);
     }
 
diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
index 813eddcd..4bd9edf4 100644
--- a/tests/unit/Common/Api/OperatorTraitTest.php
+++ b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -105,6 +105,17 @@ public function test_it_populates_models_from_arrays()
         $data = ['flavor' => [], 'image' => []];
         $this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class, $data));
     }
+
+    public function test_guzzle_options_are_forwarded()
+    {
+        $this->client->request('GET', 'test', ['headers' => [], 'stream' => true])->willReturn(new Response());
+
+        $this->operator->execute($this->def, [
+            'guzzle' => ['stream' => true]
+        ]);
+
+        $this->addToAssertionCount(1);
+    }
 }
 
 class TestResource extends AbstractResource

From 0af98cd0b2babb16fb32f86e02e3c521792d0f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Bourgier?= <mickael.bourgier@gmail.com>
Date: Sat, 22 Feb 2020 16:32:52 +0100
Subject: [PATCH 033/102] Fix documentation about StorageObject::download()

---
 doc/services/object-store/v1/objects.rst    | 3 +++
 src/ObjectStore/v1/Models/StorageObject.php | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/services/object-store/v1/objects.rst b/doc/services/object-store/v1/objects.rst
index fa537429..9b7e947c 100644
--- a/doc/services/object-store/v1/objects.rst
+++ b/doc/services/object-store/v1/objects.rst
@@ -32,6 +32,9 @@ Download an object
 As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
 consult `Guzzle's docs`_.
 
+By default, the whole body of the object is fetched before the function returns, set the ``'guzzle'`` key of parameter
+``$data`` to ``['stream' => true]`` to get the stream before the end of download.
+
 .. _Stream: https://github.com/guzzle/streams/blob/master/src/Stream.php
 .. _Guzzle's docs: https://guzzle.readthedocs.org/en/5.3/streams.html
 
diff --git a/src/ObjectStore/v1/Models/StorageObject.php b/src/ObjectStore/v1/Models/StorageObject.php
index 03df5974..7d23beee 100644
--- a/src/ObjectStore/v1/Models/StorageObject.php
+++ b/src/ObjectStore/v1/Models/StorageObject.php
@@ -133,8 +133,9 @@ public function retrieve()
     /**
      * This call will perform a `GET` HTTP request for the given object and return back its content in the form of a
      * Guzzle Stream object. Downloading an object will transfer all of the content for an object, and is therefore
-     * distinct from fetching its metadata (a `HEAD` request). The body of an object is not fetched by default to
-     * improve performance when handling large objects.
+     * distinct from fetching its metadata (a `HEAD` request). The whole body of the object is fetched before the
+     * function returns, set the `'guzzle'` key of {@param $data} to `['stream' => true]` to get the stream before the
+     * end of download.
      *
      * @param array $data {@see \OpenStack\ObjectStore\v1\Api::getObject}
      */

From b6c670ab37a8a13e276fe7470e4d0b4fa043c53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Bourgier?= <mickael.bourgier@gmail.com>
Date: Mon, 26 Oct 2020 09:41:09 +0100
Subject: [PATCH 034/102] Rename `guzzle` option to `requestOptions`

---
 doc/services/object-store/v1/objects.rst    | 4 ++--
 src/Common/Api/OperatorTrait.php            | 4 ++--
 src/ObjectStore/v1/Models/StorageObject.php | 4 ++--
 tests/unit/Common/Api/OperatorTraitTest.php | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/services/object-store/v1/objects.rst b/doc/services/object-store/v1/objects.rst
index 9b7e947c..97fff919 100644
--- a/doc/services/object-store/v1/objects.rst
+++ b/doc/services/object-store/v1/objects.rst
@@ -32,8 +32,8 @@ Download an object
 As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
 consult `Guzzle's docs`_.
 
-By default, the whole body of the object is fetched before the function returns, set the ``'guzzle'`` key of parameter
-``$data`` to ``['stream' => true]`` to get the stream before the end of download.
+By default, the whole body of the object is fetched before the function returns, set the ``'requestOptions'`` key of
+parameter ``$data`` to ``['stream' => true]`` to get the stream before the end of download.
 
 .. _Stream: https://github.com/guzzle/streams/blob/master/src/Stream.php
 .. _Guzzle's docs: https://guzzle.readthedocs.org/en/5.3/streams.html
diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index 9438dca6..1555c21d 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -112,8 +112,8 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
 
         $uri     = Utils::uri_template($operation->getPath(), $userValues);
 
-        if (array_key_exists('guzzle', $userValues)) {
-            $options += $userValues['guzzle'];
+        if (array_key_exists('requestOptions', $userValues)) {
+            $options += $userValues['requestOptions'];
         }
 
         return $this->client->$method($operation->getMethod(), $uri, $options);
diff --git a/src/ObjectStore/v1/Models/StorageObject.php b/src/ObjectStore/v1/Models/StorageObject.php
index 7d23beee..be4f2c8c 100644
--- a/src/ObjectStore/v1/Models/StorageObject.php
+++ b/src/ObjectStore/v1/Models/StorageObject.php
@@ -134,8 +134,8 @@ public function retrieve()
      * This call will perform a `GET` HTTP request for the given object and return back its content in the form of a
      * Guzzle Stream object. Downloading an object will transfer all of the content for an object, and is therefore
      * distinct from fetching its metadata (a `HEAD` request). The whole body of the object is fetched before the
-     * function returns, set the `'guzzle'` key of {@param $data} to `['stream' => true]` to get the stream before the
-     * end of download.
+     * function returns, set the `'requestOptions'` key of {@param $data} to `['stream' => true]` to get the stream
+     * before the end of download.
      *
      * @param array $data {@see \OpenStack\ObjectStore\v1\Api::getObject}
      */
diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
index 4bd9edf4..f36649aa 100644
--- a/tests/unit/Common/Api/OperatorTraitTest.php
+++ b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -111,7 +111,7 @@ public function test_guzzle_options_are_forwarded()
         $this->client->request('GET', 'test', ['headers' => [], 'stream' => true])->willReturn(new Response());
 
         $this->operator->execute($this->def, [
-            'guzzle' => ['stream' => true]
+            'requestOptions' => ['stream' => true]
         ]);
 
         $this->addToAssertionCount(1);

From 862c51d77b61c9209381c8e3f24cddeefb797f50 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Tue, 27 Oct 2020 22:16:57 +0800
Subject: [PATCH 035/102] Added integration test for download object using
 stream

---
 .../v1/objects/download_stream.php            | 19 +++++++++++++++++++
 tests/integration/ObjectStore/v1/CoreTest.php | 11 +++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 samples/objectstore/v1/objects/download_stream.php

diff --git a/samples/objectstore/v1/objects/download_stream.php b/samples/objectstore/v1/objects/download_stream.php
new file mode 100644
index 00000000..8280b16c
--- /dev/null
+++ b/samples/objectstore/v1/objects/download_stream.php
@@ -0,0 +1,19 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+/** @var \GuzzleHttp\Stream\Stream $stream */
+$stream = $openstack->objectStoreV1()
+                    ->getContainer('{containerName}')
+                    ->getObject('{objectName}')
+                    ->download(['requestOptions' => ['stream' => true]]);
diff --git a/tests/integration/ObjectStore/v1/CoreTest.php b/tests/integration/ObjectStore/v1/CoreTest.php
index d3657216..d967a276 100644
--- a/tests/integration/ObjectStore/v1/CoreTest.php
+++ b/tests/integration/ObjectStore/v1/CoreTest.php
@@ -153,6 +153,17 @@ public function objects()
         $this->assertInstanceOf(StreamInterface::class, $stream);
         $this->assertEquals(1000, $stream->getSize());
 
+        $this->logStep('Downloading object using streaming');
+        /** @var StreamInterface $stream */
+        require_once $this->sampleFile($replacements, 'objects/download_stream.php');
+        $this->assertInstanceOf(StreamInterface::class, $stream);
+
+        $body = '';
+        while (!$stream->eof()) {
+            $body .= $stream->read(64);
+        }
+        $this->assertEquals(1000, strlen($body));
+
         $this->logStep('Get object');
         require_once $this->sampleFile($replacements, 'objects/get.php');
 

From 1c695df57af11727dbcd77fa124d1469206a03f7 Mon Sep 17 00:00:00 2001
From: Ha Phan <thanhha.work@gmail.com>
Date: Tue, 15 Dec 2020 22:31:07 +0800
Subject: [PATCH 036/102] Added Ai.net sponsorship logo and link

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0cb5a2c7..956d7799 100644
--- a/README.md
+++ b/README.md
@@ -26,13 +26,11 @@ out by open an issue in github.
 
 | Distribution                       |                         |
 |------------------------------------|-------------------------|
-|OpenStack RDO                       | :white_check_mark:      |
+|OpenStack RDO<br>MicroStack Openstack | Sponsored by [![Ai.net](https://i.imgur.com/wsFRFuX.png)](https://www.ai.net/) |
 |Red Hat OpenStack                   | Need sponsor!           |
 |OVH OpenStack                       | Need sponsor!           |
 |SUSE OpenStack                      | Need sponsor!           |
-|Canonical OpenStack                 | Need sponsor!           |
 |RackSpace OpenStack                 | Need sponsor!           |
-|Dedicated server or VPS (8GB+ RAM)  | Need sponsor!           |
 
 ## Join the community
    

From caf17ca7ee6f0f7dc52d55b5963d38bdb881403c Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Tue, 5 Jan 2021 18:05:35 +0100
Subject: [PATCH 037/102] Replace the deprecated linter package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… with the recommended replacement. This will hopefully easy the
adoption of php8.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index f2a8d9c3..0233268b 100644
--- a/composer.json
+++ b/composer.json
@@ -42,8 +42,8 @@
         "phpunit/phpunit": "^6.5",
         "psr/log": "^1.0",
         "php-coveralls/php-coveralls": "^2.0",
-        "jakub-onderka/php-parallel-lint": "^1.0",
-        "friendsofphp/php-cs-fixer": "^2.13"
+        "friendsofphp/php-cs-fixer": "^2.13",
+        "php-parallel-lint/php-parallel-lint": "^1.2"
     },
     "extra": {
         "branch-alias": {

From a80067f1fccd9ed7aeddc806d9ebfd2e4b457e68 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Tue, 5 Jan 2021 18:28:23 +0100
Subject: [PATCH 038/102] Update phpunit and allow php8

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 .travis.yml                                   |  1 +
 composer.json                                 |  4 +--
 .../BlockStorage/v2/Models/QuotaSetTest.php   |  2 +-
 .../BlockStorage/v2/Models/SnapshotTest.php   |  2 +-
 .../BlockStorage/v2/Models/VolumeTest.php     |  4 +--
 .../BlockStorage/v2/Models/VolumeTypeTest.php |  2 +-
 tests/unit/BlockStorage/v2/ServiceTest.php    |  2 +-
 tests/unit/Common/Api/OperationTest.php       | 14 +++-----
 tests/unit/Common/Api/OperatorTraitTest.php   | 10 ++----
 tests/unit/Common/Api/ParameterTest.php       | 28 +++++-----------
 tests/unit/Common/ArrayAccessTraitTest.php    |  2 +-
 tests/unit/Common/Auth/AuthHandlerTest.php    |  2 +-
 .../Common/Error/BadResponseErrorTest.php     |  2 +-
 tests/unit/Common/Error/BuilderTest.php       |  2 +-
 .../unit/Common/HydratorStrategyTraitTest.php |  2 +-
 tests/unit/Common/JsonPathTest.php            |  2 +-
 tests/unit/Common/JsonSchema/SchemaTest.php   |  2 +-
 .../Common/Resource/AbstractResourceTest.php  |  2 +-
 .../Common/Resource/OperatorResourceTest.php  |  2 +-
 tests/unit/Common/Service/BuilderTest.php     | 33 +++++++------------
 .../Common/Transport/JsonSerializerTest.php   |  6 ++--
 .../unit/Common/Transport/MiddlewareTest.php  |  8 ++---
 .../Transport/RequestSerializerTest.php       |  2 +-
 tests/unit/Common/Transport/UtilsTest.php     |  4 +--
 tests/unit/Compute/v2/Models/FlavorTest.php   |  2 +-
 tests/unit/Compute/v2/Models/HostTest.php     |  2 +-
 .../unit/Compute/v2/Models/HypervisorTest.php |  2 +-
 tests/unit/Compute/v2/Models/ImageTest.php    |  2 +-
 tests/unit/Compute/v2/Models/KeypairTest.php  |  2 +-
 tests/unit/Compute/v2/Models/QuotaSetTest.php |  2 +-
 tests/unit/Compute/v2/Models/ServerTest.php   | 16 ++++-----
 tests/unit/Compute/v2/ServiceTest.php         |  2 +-
 tests/unit/Identity/v2/Models/CatalogTest.php |  6 ++--
 .../unit/Identity/v2/Models/EndpointTest.php  |  2 +-
 tests/unit/Identity/v2/Models/EntryTest.php   |  2 +-
 tests/unit/Identity/v2/Models/TokenTest.php   |  6 ++--
 tests/unit/Identity/v2/ServiceTest.php        |  6 ++--
 tests/unit/Identity/v3/Models/CatalogTest.php | 10 ++----
 .../Identity/v3/Models/CredentialTest.php     |  2 +-
 tests/unit/Identity/v3/Models/DomainTest.php  |  2 +-
 .../unit/Identity/v3/Models/EndpointTest.php  |  2 +-
 tests/unit/Identity/v3/Models/GroupTest.php   |  2 +-
 tests/unit/Identity/v3/Models/PolicyTest.php  |  2 +-
 tests/unit/Identity/v3/Models/ProjectTest.php |  2 +-
 tests/unit/Identity/v3/Models/RoleTest.php    |  2 +-
 tests/unit/Identity/v3/Models/ServiceTest.php |  2 +-
 tests/unit/Identity/v3/Models/TokenTest.php   | 10 ++----
 tests/unit/Identity/v3/Models/UserTest.php    |  2 +-
 tests/unit/Identity/v3/ServiceTest.php        | 15 +++------
 tests/unit/Images/v2/JsonPatchTest.php        |  2 +-
 tests/unit/Images/v2/Models/ImageTest.php     |  6 ++--
 tests/unit/Images/v2/Models/MemberTest.php    |  2 +-
 tests/unit/Images/v2/ServiceTest.php          |  2 +-
 .../Metric/v1/Gnocchi/Models/MetricTest.php   |  2 +-
 .../Metric/v1/Gnocchi/Models/ResourceTest.php |  6 ++--
 tests/unit/Metric/v1/Gnocchi/ServiceTest.php  |  2 +-
 .../Layer3/Models/FloatingIpTest.php          |  2 +-
 .../Extensions/Layer3/Models/RouterTest.php   |  2 +-
 .../v2/Extensions/Layer3/ServiceTest.php      |  2 +-
 .../Models/SecurityGroupRuleTest.php          |  2 +-
 .../Models/SecurityGroupTest.php              |  4 +--
 .../Extensions/SecurityGroups/ServiceTest.php |  2 +-
 .../Models/LoadBalancerHealthMonitorTest.php  |  2 +-
 .../v2/Models/LoadBalancerListenerTest.php    |  2 +-
 .../v2/Models/LoadBalancerMemberTest.php      |  2 +-
 .../v2/Models/LoadBalancerPoolTest.php        |  2 +-
 .../v2/Models/LoadBalancerStatTest.php        |  2 +-
 .../v2/Models/LoadBalancerStatusTest.php      |  4 +--
 .../Networking/v2/Models/LoadBalancerTest.php |  4 +--
 .../unit/Networking/v2/Models/NetworkTest.php |  4 +--
 tests/unit/Networking/v2/Models/PortTest.php  |  2 +-
 tests/unit/Networking/v2/Models/QuotaTest.php |  2 +-
 .../unit/Networking/v2/Models/SubnetTest.php  |  4 +--
 tests/unit/Networking/v2/ServiceTest.php      |  8 ++---
 .../ObjectStore/v1/Models/AccountTest.php     |  2 +-
 .../ObjectStore/v1/Models/ContainerTest.php   |  6 ++--
 .../unit/ObjectStore/v1/Models/ObjectTest.php |  2 +-
 tests/unit/ObjectStore/v1/ServiceTest.php     |  8 ++---
 tests/unit/OpenStackTest.php                  |  4 +--
 tests/unit/TestCase.php                       |  4 +--
 80 files changed, 142 insertions(+), 203 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3dc03a03..38eb1c36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ matrix:
     - php: 7.2
     - php: 7.3
     - php: 7.4
+    - php: 8.0
     - php: nightly
   allow_failures:
     - php: nightly
diff --git a/composer.json b/composer.json
index 0233268b..9f4d4562 100644
--- a/composer.json
+++ b/composer.json
@@ -33,13 +33,13 @@
         }
     },
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.2.5|^8.0",
         "guzzlehttp/guzzle": "^7.0",
         "guzzlehttp/uri-template": "0.2",
         "justinrainbow/json-schema": "^5.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^8.0",
         "psr/log": "^1.0",
         "php-coveralls/php-coveralls": "^2.0",
         "friendsofphp/php-cs-fixer": "^2.13",
diff --git a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
index c4e3df4f..b8bcee41 100644
--- a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
+++ b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
@@ -12,7 +12,7 @@ class QuotaSetTest extends TestCase
     /** @var QuotaSet */
     private $quotaSet;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
index d450e2ff..84b5b733 100644
--- a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
+++ b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
@@ -12,7 +12,7 @@ class SnapshotTest extends TestCase
     /** @var Snapshot */
     private $snapshot;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/BlockStorage/v2/Models/VolumeTest.php b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
index 17c0bdbb..a8976551 100644
--- a/tests/unit/BlockStorage/v2/Models/VolumeTest.php
+++ b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
@@ -12,7 +12,7 @@ class VolumeTest extends TestCase
     /** @var Volume */
     private $volume;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -48,7 +48,7 @@ public function test_it_retrieves()
 
         $volumeImageMetadata = $this->volume->volumeImageMetadata;
 
-        $this->assertInternalType('array', $volumeImageMetadata);
+        self::assertIsArray($volumeImageMetadata);
         $this->assertEquals($volumeImageMetadata['os_distro'], 'ubuntu');
         $this->assertEquals($volumeImageMetadata['os_version'], 'xenial');
         $this->assertEquals($volumeImageMetadata['hypervisor_type'], 'qemu');
diff --git a/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php b/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
index 7699bcae..ddbb685a 100644
--- a/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
+++ b/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
@@ -12,7 +12,7 @@ class VolumeTypeTest extends TestCase
     /** @var VolumeType */
     private $volumeType;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/BlockStorage/v2/ServiceTest.php b/tests/unit/BlockStorage/v2/ServiceTest.php
index c3dd364f..d6a0fbce 100644
--- a/tests/unit/BlockStorage/v2/ServiceTest.php
+++ b/tests/unit/BlockStorage/v2/ServiceTest.php
@@ -16,7 +16,7 @@ class ServiceTest extends TestCase
     /** @var Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Common/Api/OperationTest.php b/tests/unit/Common/Api/OperationTest.php
index 68e0eaa9..d5382d89 100644
--- a/tests/unit/Common/Api/OperationTest.php
+++ b/tests/unit/Common/Api/OperationTest.php
@@ -10,7 +10,7 @@ class OperationTest extends \PHPUnit\Framework\TestCase
 {
     private $operation;
 
-    public function setUp()
+    public function setUp(): void
     {
         $def = (new ComputeV2Api())->postServer();
 
@@ -37,11 +37,9 @@ public function test_it_validates_params()
         ]));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_exceptions_are_propagated()
     {
+		$this->expectException(\Exception::class);
         $this->assertFalse($this->operation->validate([
             'name'     => true,
             'imageId'  => 'bar',
@@ -49,20 +47,16 @@ public function test_exceptions_are_propagated()
         ]));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_an_exception_is_thrown_when_user_does_not_provide_required_options()
     {
+		$this->expectException(\Exception::class);
         $this->operation->validate([]);
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_when_user_provides_undefined_options()
     {
         $userData = ['name' => 'new_server', 'undefined_opt' => 'bah'];
+		$this->expectException(\Exception::class);
 
         $this->operation->validate($userData);
     }
diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
index f36649aa..8a905382 100644
--- a/tests/unit/Common/Api/OperatorTraitTest.php
+++ b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -20,7 +20,7 @@ class OperatorTraitTest extends TestCase
 
     private $def;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -74,19 +74,15 @@ public function test_it_wraps_sequential_ops_in_promise_when_async_is_appended_t
         $promise->wait();
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_it_throws_exception_when_async_is_called_on_a_non_existent_method()
     {
+		$this->expectException(\RuntimeException::class);
         $this->operator->fooAsync();
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_undefined_methods_result_in_error()
     {
+		$this->expectException(\Exception::class);
         $this->operator->foo();
     }
 
diff --git a/tests/unit/Common/Api/ParameterTest.php b/tests/unit/Common/Api/ParameterTest.php
index 320d25be..858f4ee7 100644
--- a/tests/unit/Common/Api/ParameterTest.php
+++ b/tests/unit/Common/Api/ParameterTest.php
@@ -11,7 +11,7 @@ class ParameterTest extends \PHPUnit\Framework\TestCase
     private $data;
     private $api;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->api = new ComputeV2Api();
 
@@ -19,13 +19,11 @@ public function setUp()
         $this->param = new Parameter($this->data);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_exception_is_thrown_for_invalid_locations()
     {
         $data = $this->data;
         $data['location'] = 'foo';
+		$this->expectException(\RuntimeException::class);
         new Parameter($data);
     }
 
@@ -82,25 +80,21 @@ public function test_it_should_return_true_when_required_attributes_are_provided
         $this->assertTrue($this->param->validate('TestName'));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_when_values_do_not_match_their_definition_types()
     {
         $data = $this->api->postServer()['params']['networks'] + ['name' => 'networks'];
         $param = new Parameter($data);
+		$this->expectException(\Exception::class);
 
         $param->validate('a_network!'); // should be an array
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_when_deeply_nested_values_have_wrong_types()
     {
         $data = $this->api->postServer()['params']['networks'] + ['name' => 'networks'];
-
         $param = new Parameter($data);
+		$this->expectException(\Exception::class);
+
         $param->validate(['name' => false]); // value should be a string, not bool
     }
 
@@ -134,15 +128,13 @@ public function test_it_passes_validation_when_array_values_pass()
         $this->assertTrue($param->validate($userVals));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_an_exception_is_thrown_when_an_undefined_property_is_provided()
     {
         $params = ['type' => 'object', 'properties' => ['foo' => ['type' => 'string']]];
         $userVals = ['bar' => 'baz'];
-
         $param = new Parameter($params);
+		$this->expectException(\Exception::class);
+
         $param->validate($userVals);
     }
 
@@ -187,15 +179,13 @@ public function test_it_gets_prefixed_name()
         $this->assertEquals('foo-metadata', $property->getPrefixedName());
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_exception_is_thrown_when_value_is_not_in_enum_list()
     {
         $data = $this->data;
         $data['enum'] = ['foo'];
-
         $param = new Parameter($data);
+		$this->expectException(\Exception::class);
+
         $param->validate('blah');
     }
 }
diff --git a/tests/unit/Common/ArrayAccessTraitTest.php b/tests/unit/Common/ArrayAccessTraitTest.php
index 7434f98f..c13e2be7 100644
--- a/tests/unit/Common/ArrayAccessTraitTest.php
+++ b/tests/unit/Common/ArrayAccessTraitTest.php
@@ -9,7 +9,7 @@ class ArrayAccessTraitTest extends TestCase
 {
     private $aa;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->aa = new ArrayAccess();
     }
diff --git a/tests/unit/Common/Auth/AuthHandlerTest.php b/tests/unit/Common/Auth/AuthHandlerTest.php
index 979a4a59..c54f7548 100644
--- a/tests/unit/Common/Auth/AuthHandlerTest.php
+++ b/tests/unit/Common/Auth/AuthHandlerTest.php
@@ -15,7 +15,7 @@ class AuthHandlerTest extends TestCase
     private $generator;
     private $handler;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->generator = function () {
             $token = $this->prophesize(FakeToken::class);
diff --git a/tests/unit/Common/Error/BadResponseErrorTest.php b/tests/unit/Common/Error/BadResponseErrorTest.php
index 7947c591..b051f875 100644
--- a/tests/unit/Common/Error/BadResponseErrorTest.php
+++ b/tests/unit/Common/Error/BadResponseErrorTest.php
@@ -11,7 +11,7 @@ class BadResponseErrorTest extends TestCase
 {
     private $e;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->e = new BadResponseError();
     }
diff --git a/tests/unit/Common/Error/BuilderTest.php b/tests/unit/Common/Error/BuilderTest.php
index f5710a1b..45443038 100644
--- a/tests/unit/Common/Error/BuilderTest.php
+++ b/tests/unit/Common/Error/BuilderTest.php
@@ -18,7 +18,7 @@ class BuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
     private $client;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = $this->prophesize(ClientInterface::class);
         $this->builder = new Builder($this->client->reveal());
diff --git a/tests/unit/Common/HydratorStrategyTraitTest.php b/tests/unit/Common/HydratorStrategyTraitTest.php
index d8bc6b90..606ec318 100644
--- a/tests/unit/Common/HydratorStrategyTraitTest.php
+++ b/tests/unit/Common/HydratorStrategyTraitTest.php
@@ -10,7 +10,7 @@ class HydratorStrategyTraitTest extends TestCase
     /** @var Fixture */
     private $fixture;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->fixture = new Fixture();
     }
diff --git a/tests/unit/Common/JsonPathTest.php b/tests/unit/Common/JsonPathTest.php
index 42edb91c..ed68d084 100644
--- a/tests/unit/Common/JsonPathTest.php
+++ b/tests/unit/Common/JsonPathTest.php
@@ -8,7 +8,7 @@ class JsonPathTest extends \PHPUnit\Framework\TestCase
 {
     private $jsonPath;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->jsonPath = new JsonPath([]);
     }
diff --git a/tests/unit/Common/JsonSchema/SchemaTest.php b/tests/unit/Common/JsonSchema/SchemaTest.php
index f7addd29..6d7ca42a 100644
--- a/tests/unit/Common/JsonSchema/SchemaTest.php
+++ b/tests/unit/Common/JsonSchema/SchemaTest.php
@@ -15,7 +15,7 @@ class SchemaTest extends TestCase
     private $validator;
     private $body;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->body = [
             'properties' => [
diff --git a/tests/unit/Common/Resource/AbstractResourceTest.php b/tests/unit/Common/Resource/AbstractResourceTest.php
index 36de7b27..238899d1 100644
--- a/tests/unit/Common/Resource/AbstractResourceTest.php
+++ b/tests/unit/Common/Resource/AbstractResourceTest.php
@@ -14,7 +14,7 @@ class AbstractResourceTest extends TestCase
     /** @var TestResource */
     private $resource;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Common/Resource/OperatorResourceTest.php b/tests/unit/Common/Resource/OperatorResourceTest.php
index 5db120c5..72367af7 100644
--- a/tests/unit/Common/Resource/OperatorResourceTest.php
+++ b/tests/unit/Common/Resource/OperatorResourceTest.php
@@ -17,7 +17,7 @@ class OperatorResourceTest extends TestCase
     /** @var TestOperatorResource */
     private $resource;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Common/Service/BuilderTest.php b/tests/unit/Common/Service/BuilderTest.php
index e97d6e10..0899de94 100644
--- a/tests/unit/Common/Service/BuilderTest.php
+++ b/tests/unit/Common/Service/BuilderTest.php
@@ -15,7 +15,7 @@ class BuilderTest extends TestCase
     private $builder;
     private $opts;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->builder = new Builder([]);
 
@@ -30,65 +30,54 @@ public function setUp()
         ];
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_if_username_is_missing()
     {
+		$this->expectException(\Exception::class);
         $this->builder->createService('Compute\\v2', []);
     }
 
-    /**
-     * @expectedException \Throwable
-     */
     public function test_it_throws_exception_if_password_is_missing()
     {
+		$this->expectException(\Exception::class);
         $this->builder->createService('Compute\\v2', ['username' => 1]);
     }
 
-    /**
-     * @expectedException \Throwable
-     */
     public function test_it_throws_exception_if_both_tenantId_and_tenantName_is_missing()
     {
+		$this->expectException(\Throwable::class);
         $this->builder->createService('Compute\\v2', [
             'username' => 1, 'password' => 2, 'authUrl' => 4, 'region' => 5, 'catalogName' => 6, 'catalogType' => 7,
         ]);
     }
 
-    /**
-     * @expectedException \Throwable
-     */
     public function test_it_throws_exception_if_authUrl_is_missing()
     {
+		$this->expectException(\Throwable::class);
         $this->builder->createService('Compute\\v2', ['username' => 1, 'password' => 2, 'tenantId' => 3]);
     }
 
-    /**
-     * @expectedException \Throwable
-     */
     public function test_it_throws_exception_if_region_is_missing()
     {
+		$this->expectException(\Throwable::class);
+
         $this->builder->createService('Compute\\v2', [
             'username' => 1, 'password' => 2, 'tenantId' => 3, 'authUrl' => 4,
         ]);
     }
 
-    /**
-     * @expectedException \Throwable
-     */
     public function test_it_throws_exception_if_catalogName_is_missing()
     {
+		$this->expectException(\Throwable::class);
+
         $this->builder->createService('Compute\\v2', [
             'username' => 1, 'password' => 2, 'tenantId' => 3, 'authUrl' => 4,
         ]);
     }
 
-    /**
-     * @expectedException \Throwable
-     */
     public function test_it_throws_exception_if_catalogType_is_missing()
     {
+		$this->expectException(\Throwable::class);
+
         $this->builder->createService('Compute\\v2', [
             'username' => 1, 'password' => 2, 'tenantId' => 3, 'authUrl' => 4, 'region' => 5, 'catalogName' => 6,
         ]);
diff --git a/tests/unit/Common/Transport/JsonSerializerTest.php b/tests/unit/Common/Transport/JsonSerializerTest.php
index 50a54e5a..8f835a73 100644
--- a/tests/unit/Common/Transport/JsonSerializerTest.php
+++ b/tests/unit/Common/Transport/JsonSerializerTest.php
@@ -13,7 +13,7 @@ class JsonSerializerTest extends \PHPUnit\Framework\TestCase
     /** @var JsonSerializer */
     private $serializer;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->serializer = new JsonSerializer();
     }
@@ -145,9 +145,6 @@ public function test_it_serializes_non_stdClass_objects()
         $this->assertEquals($expected, $json);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function test_exception_is_thrown_when_non_stdClass_or_serializable_object_provided()
     {
         $subParam = $this->prophesize(Parameter::class);
@@ -160,6 +157,7 @@ public function test_exception_is_thrown_when_non_stdClass_or_serializable_objec
         $param->getProperty('subResource')->shouldBeCalled()->willReturn($subParam);
 
         $userValues = ['subResource' => new NonSerializableResource()];
+		$this->expectException(\InvalidArgumentException::class);
 
         $this->serializer->stockJson($param->reveal(), $userValues, []);
     }
diff --git a/tests/unit/Common/Transport/MiddlewareTest.php b/tests/unit/Common/Transport/MiddlewareTest.php
index ac2af2f7..96ab98dc 100644
--- a/tests/unit/Common/Transport/MiddlewareTest.php
+++ b/tests/unit/Common/Transport/MiddlewareTest.php
@@ -5,15 +5,13 @@
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
+use OpenStack\Common\Error\BadResponseError;
 use OpenStack\Common\Transport\Middleware;
 use OpenStack\Test\TestCase;
 use OpenStack\Common\Auth\AuthHandler;
 
 class MiddlewareTest extends TestCase
 {
-    /**
-     * @expectedException \OpenStack\Common\Error\BadResponseError
-     */
     public function test_exception_is_thrown_for_4xx_statuses()
     {
         $middleware = Middleware::httpErrors();
@@ -24,8 +22,8 @@ public function test_exception_is_thrown_for_4xx_statuses()
         $promise = $fn(new Request('GET', 'http://foo.com'), []);
         $this->assertEquals('pending', $promise->getState());
 
-        $promise->wait();
-        $this->assertEquals('rejected', $promise->getState());
+		$this->expectException(BadResponseError::class);
+		$promise->wait();
     }
 
     public function test_responses_are_left_alone_when_status_under_400()
diff --git a/tests/unit/Common/Transport/RequestSerializerTest.php b/tests/unit/Common/Transport/RequestSerializerTest.php
index 114f5185..d9d31b00 100644
--- a/tests/unit/Common/Transport/RequestSerializerTest.php
+++ b/tests/unit/Common/Transport/RequestSerializerTest.php
@@ -13,7 +13,7 @@ class RequestSerializerTest extends TestCase
     private $rs;
     private $js;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->js = $this->prophesize(JsonSerializer::class);
 
diff --git a/tests/unit/Common/Transport/UtilsTest.php b/tests/unit/Common/Transport/UtilsTest.php
index 84805da8..2d797b9c 100644
--- a/tests/unit/Common/Transport/UtilsTest.php
+++ b/tests/unit/Common/Transport/UtilsTest.php
@@ -10,12 +10,10 @@
 
 class UtilsTest extends TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function test_decoding_malformed_json_throws_error()
     {
         $response = new Response(200, [], \GuzzleHttp\Psr7\stream_for('{'));
+		$this->expectException(\InvalidArgumentException::class);
 
         Utils::jsonDecode($response);
     }
diff --git a/tests/unit/Compute/v2/Models/FlavorTest.php b/tests/unit/Compute/v2/Models/FlavorTest.php
index 4d3983f8..63b26f4c 100644
--- a/tests/unit/Compute/v2/Models/FlavorTest.php
+++ b/tests/unit/Compute/v2/Models/FlavorTest.php
@@ -11,7 +11,7 @@ class FlavorTest extends TestCase
 {
     private $flavor;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Compute/v2/Models/HostTest.php b/tests/unit/Compute/v2/Models/HostTest.php
index 5ca9dd05..c5ba3fcc 100644
--- a/tests/unit/Compute/v2/Models/HostTest.php
+++ b/tests/unit/Compute/v2/Models/HostTest.php
@@ -12,7 +12,7 @@ class HostTest extends TestCase
     /** @var Host */
     private $host;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Compute/v2/Models/HypervisorTest.php b/tests/unit/Compute/v2/Models/HypervisorTest.php
index 36f954c7..38876ddd 100644
--- a/tests/unit/Compute/v2/Models/HypervisorTest.php
+++ b/tests/unit/Compute/v2/Models/HypervisorTest.php
@@ -13,7 +13,7 @@ class HypervisorTest extends TestCase
 
     const ID = 1;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Compute/v2/Models/ImageTest.php b/tests/unit/Compute/v2/Models/ImageTest.php
index 3a02a57d..418bd03c 100644
--- a/tests/unit/Compute/v2/Models/ImageTest.php
+++ b/tests/unit/Compute/v2/Models/ImageTest.php
@@ -11,7 +11,7 @@ class ImageTest extends TestCase
 {
     private $image;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Compute/v2/Models/KeypairTest.php b/tests/unit/Compute/v2/Models/KeypairTest.php
index d76af2b3..b88d58ad 100644
--- a/tests/unit/Compute/v2/Models/KeypairTest.php
+++ b/tests/unit/Compute/v2/Models/KeypairTest.php
@@ -14,7 +14,7 @@ class KeypairTest extends TestCase
 
     const KEYPAIR_NAME = 'keypair-test';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Compute/v2/Models/QuotaSetTest.php b/tests/unit/Compute/v2/Models/QuotaSetTest.php
index e99b7159..c167b3cf 100644
--- a/tests/unit/Compute/v2/Models/QuotaSetTest.php
+++ b/tests/unit/Compute/v2/Models/QuotaSetTest.php
@@ -14,7 +14,7 @@ class QuotaSetTest extends TestCase
 
     const TENANT_ID = 'fake-tenant-id';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Compute/v2/Models/ServerTest.php b/tests/unit/Compute/v2/Models/ServerTest.php
index 44b6b605..864cec61 100644
--- a/tests/unit/Compute/v2/Models/ServerTest.php
+++ b/tests/unit/Compute/v2/Models/ServerTest.php
@@ -16,7 +16,7 @@ class ServerTest extends TestCase
     /** @var Server */
     private $server;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -62,12 +62,10 @@ public function test_it_creates_with_boot_from_volume()
         $this->assertInstanceOf(Server::class, $this->server->create($opts));
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage imageId or blockDeviceMapping.uuid must be set.
-     */
     public function test_it_requires_image_id_or_volume_id_to_create_servers()
     {
+		$this->expectException(\RuntimeException::class);
+		$this->expectExceptionMessage('imageId or blockDeviceMapping.uuid must be set.');
         $this->server->create([
             'name' => 'some-server-name',
             'flavorId' => 'apple'
@@ -125,11 +123,9 @@ public function test_it_reboots()
         $this->assertNull($this->server->reboot());
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_an_exception_is_thrown_when_rebooting_with_an_invalid_type()
     {
+		$this->expectException(\Exception::class);
         $this->server->reboot('foo');
     }
 
@@ -327,7 +323,7 @@ public function test_it_gets_ip_addresses()
 
         $ips = $this->server->listAddresses();
 
-        $this->assertInternalType('array', $ips);
+        self::assertIsArray($ips);
         $this->assertCount(4, $ips['public']);
         $this->assertCount(2, $ips['private']);
     }
@@ -338,7 +334,7 @@ public function test_it_gets_ip_addresses_by_network_label()
 
         $ips = $this->server->listAddresses(['networkLabel' => 'foo']);
 
-        $this->assertInternalType('array', $ips);
+        self::assertIsArray($ips);
         $this->assertCount(4, $ips['public']);
         $this->assertCount(2, $ips['private']);
     }
diff --git a/tests/unit/Compute/v2/ServiceTest.php b/tests/unit/Compute/v2/ServiceTest.php
index 5f9cf04b..ba0c831c 100644
--- a/tests/unit/Compute/v2/ServiceTest.php
+++ b/tests/unit/Compute/v2/ServiceTest.php
@@ -21,7 +21,7 @@ class ServiceTest extends TestCase
     /** @var Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Identity/v2/Models/CatalogTest.php b/tests/unit/Identity/v2/Models/CatalogTest.php
index 057e0e0c..165daae7 100644
--- a/tests/unit/Identity/v2/Models/CatalogTest.php
+++ b/tests/unit/Identity/v2/Models/CatalogTest.php
@@ -10,18 +10,16 @@ class CatalogTest extends TestCase
 {
     private $catalog;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->catalog = new Catalog($this->client->reveal(), new Api());
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_it_throws_exception_when_no_endpoint_url_is_found()
     {
+		$this->expectException(\RuntimeException::class);
         $this->catalog->getServiceUrl('foo', 'bar', 'baz');
     }
 }
diff --git a/tests/unit/Identity/v2/Models/EndpointTest.php b/tests/unit/Identity/v2/Models/EndpointTest.php
index 3ad48fa4..f2e7ce4a 100644
--- a/tests/unit/Identity/v2/Models/EndpointTest.php
+++ b/tests/unit/Identity/v2/Models/EndpointTest.php
@@ -10,7 +10,7 @@ class EndpointTest extends TestCase
 {
     private $endpoint;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Identity/v2/Models/EntryTest.php b/tests/unit/Identity/v2/Models/EntryTest.php
index 2f1c2f5f..f169984c 100644
--- a/tests/unit/Identity/v2/Models/EntryTest.php
+++ b/tests/unit/Identity/v2/Models/EntryTest.php
@@ -10,7 +10,7 @@ class EntryTest extends TestCase
 {
     private $entry;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Identity/v2/Models/TokenTest.php b/tests/unit/Identity/v2/Models/TokenTest.php
index 0bbb06cf..192bd66b 100644
--- a/tests/unit/Identity/v2/Models/TokenTest.php
+++ b/tests/unit/Identity/v2/Models/TokenTest.php
@@ -9,11 +9,11 @@
 class TokenTest extends TestCase
 {
     private $token;
-    
-    public function setUp()
+
+    public function setUp(): void
     {
         parent::setUp();
-        
+
         $this->token = new Token($this->client->reveal(), new Api());
     }
 
diff --git a/tests/unit/Identity/v2/ServiceTest.php b/tests/unit/Identity/v2/ServiceTest.php
index 82b8893d..b3e15d23 100644
--- a/tests/unit/Identity/v2/ServiceTest.php
+++ b/tests/unit/Identity/v2/ServiceTest.php
@@ -11,7 +11,7 @@ class ServiceTest extends TestCase
 {
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -45,9 +45,9 @@ public function test_it_authenticates()
         list($token, $baseUrl) = $this->service->authenticate($options);
 
         $this->assertInstanceOf(Token::class, $token);
-        $this->assertInternalType('string', $baseUrl);
+        self::assertIsString($baseUrl);
     }
-    
+
     public function test_it_generates_tokens()
     {
         $options = [
diff --git a/tests/unit/Identity/v3/Models/CatalogTest.php b/tests/unit/Identity/v3/Models/CatalogTest.php
index ab758667..f6378a8d 100644
--- a/tests/unit/Identity/v3/Models/CatalogTest.php
+++ b/tests/unit/Identity/v3/Models/CatalogTest.php
@@ -12,7 +12,7 @@ class CatalogTest extends TestCase
 {
     private $catalog;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
@@ -21,11 +21,9 @@ public function setUp()
         $this->catalog = new Catalog($this->client->reveal(), new Api());
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_it_throws_if_no_services_set()
     {
+		$this->expectException(\RuntimeException::class);
         $this->assertFalse($this->catalog->getServiceUrl('', '', '', ''));
     }
 
@@ -41,13 +39,11 @@ public function test_it_returns_service_url()
         $this->assertEquals($url, $this->catalog->getServiceUrl('foo', 'bar', 'baz', ''));
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_it_throws_if_no_url_found()
     {
         $service = $this->prophesize(Service::class);
         $service->getUrl(Argument::any(), Argument::cetera())->shouldBeCalled()->willReturn(false);
+		$this->expectException(\RuntimeException::class);
 
         $this->catalog->services = [$service->reveal()];
 
diff --git a/tests/unit/Identity/v3/Models/CredentialTest.php b/tests/unit/Identity/v3/Models/CredentialTest.php
index fac0e041..89ec88af 100644
--- a/tests/unit/Identity/v3/Models/CredentialTest.php
+++ b/tests/unit/Identity/v3/Models/CredentialTest.php
@@ -11,7 +11,7 @@ class CredentialTest extends TestCase
 {
     private $credential;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/Models/DomainTest.php b/tests/unit/Identity/v3/Models/DomainTest.php
index 798d0683..c2d3155e 100644
--- a/tests/unit/Identity/v3/Models/DomainTest.php
+++ b/tests/unit/Identity/v3/Models/DomainTest.php
@@ -13,7 +13,7 @@ class DomainTest extends TestCase
 {
     private $domain;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/Models/EndpointTest.php b/tests/unit/Identity/v3/Models/EndpointTest.php
index 55f75f53..d9f972ef 100644
--- a/tests/unit/Identity/v3/Models/EndpointTest.php
+++ b/tests/unit/Identity/v3/Models/EndpointTest.php
@@ -13,7 +13,7 @@ class EndpointTest extends TestCase
     private $endpoint;
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/Models/GroupTest.php b/tests/unit/Identity/v3/Models/GroupTest.php
index afe154da..44ac229d 100644
--- a/tests/unit/Identity/v3/Models/GroupTest.php
+++ b/tests/unit/Identity/v3/Models/GroupTest.php
@@ -13,7 +13,7 @@ class GroupTest extends TestCase
 {
     private $group;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
         parent::setUp();
diff --git a/tests/unit/Identity/v3/Models/PolicyTest.php b/tests/unit/Identity/v3/Models/PolicyTest.php
index 586a626a..4285e78c 100644
--- a/tests/unit/Identity/v3/Models/PolicyTest.php
+++ b/tests/unit/Identity/v3/Models/PolicyTest.php
@@ -11,7 +11,7 @@ class PolicyTest extends TestCase
 {
     private $policy;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/Models/ProjectTest.php b/tests/unit/Identity/v3/Models/ProjectTest.php
index 03d24bd8..bbba36d3 100644
--- a/tests/unit/Identity/v3/Models/ProjectTest.php
+++ b/tests/unit/Identity/v3/Models/ProjectTest.php
@@ -13,7 +13,7 @@ class ProjectTest extends TestCase
 {
     private $project;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/Models/RoleTest.php b/tests/unit/Identity/v3/Models/RoleTest.php
index 7b89fbd6..0eb989fe 100644
--- a/tests/unit/Identity/v3/Models/RoleTest.php
+++ b/tests/unit/Identity/v3/Models/RoleTest.php
@@ -11,7 +11,7 @@ class RoleTest extends TestCase
 {
     private $role;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/Models/ServiceTest.php b/tests/unit/Identity/v3/Models/ServiceTest.php
index 62987ba6..835b1d1b 100644
--- a/tests/unit/Identity/v3/Models/ServiceTest.php
+++ b/tests/unit/Identity/v3/Models/ServiceTest.php
@@ -12,7 +12,7 @@ class ServiceTest extends TestCase
 {
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/Models/TokenTest.php b/tests/unit/Identity/v3/Models/TokenTest.php
index aea2c804..711eec8f 100644
--- a/tests/unit/Identity/v3/Models/TokenTest.php
+++ b/tests/unit/Identity/v3/Models/TokenTest.php
@@ -10,7 +10,7 @@ class TokenTest extends TestCase
 {
     private $token;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
@@ -34,19 +34,15 @@ public function test_it_returns_false_if_expired()
         $this->assertFalse($this->token->hasExpired());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function test_it_throws_error_when_username_is_not_qualified_by_domain_id()
     {
+		$this->expectException(\InvalidArgumentException::class);
         $this->token->create(['user' => ['name' => 'foo']]);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function test_it_throws_error_when_neither_user_creds_or_token_id_is_provided()
     {
+		$this->expectException(\InvalidArgumentException::class);
         $this->token->create([]);
     }
 }
diff --git a/tests/unit/Identity/v3/Models/UserTest.php b/tests/unit/Identity/v3/Models/UserTest.php
index 7c5e02fc..b5dce6a5 100644
--- a/tests/unit/Identity/v3/Models/UserTest.php
+++ b/tests/unit/Identity/v3/Models/UserTest.php
@@ -11,7 +11,7 @@ class UserTest extends TestCase
 {
     private $user;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->rootFixturesDir = dirname(__DIR__);
 
diff --git a/tests/unit/Identity/v3/ServiceTest.php b/tests/unit/Identity/v3/ServiceTest.php
index 5f9c2f4b..658a77b4 100644
--- a/tests/unit/Identity/v3/ServiceTest.php
+++ b/tests/unit/Identity/v3/ServiceTest.php
@@ -17,7 +17,7 @@ class ServiceTest extends TestCase
     /** @var Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -140,11 +140,6 @@ public function test_it_authenticates_using_cache_token()
         $this->assertEquals('http://example.org:8080/v1/AUTH_e00abf65afca49609eedd163c515cf10', $url);
     }
 
-
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Cached token has expired
-     */
     public function test_it_authenticates_and_throws_exception_when_authenticate_with_expired_cached_token()
     {
         $cachedToken = [
@@ -212,14 +207,13 @@ public function test_it_authenticates_and_throws_exception_when_authenticate_wit
             'region'      => 'RegionOne',
             'cachedToken' => $cachedToken
         ];
+		$this->expectException(\RuntimeException::class);
+		$this->expectExceptionMessage('Cached token has expired');
 
         $this->service->authenticate($userOptions);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function test_it_throws_exception_if_no_endpoint_found()
+   public function test_it_throws_exception_if_no_endpoint_found()
     {
         $expectedJson = [
             "identity" => [
@@ -238,6 +232,7 @@ public function test_it_throws_exception_if_no_endpoint_found()
         ];
 
         $this->setupMock('POST', 'auth/tokens', ['auth' => $expectedJson], [], 'token');
+		$this->expectException(\RuntimeException::class);
 
         $this->service->authenticate([
             'catalogName' => 'foo',
diff --git a/tests/unit/Images/v2/JsonPatchTest.php b/tests/unit/Images/v2/JsonPatchTest.php
index 1b881c2f..e01cc588 100644
--- a/tests/unit/Images/v2/JsonPatchTest.php
+++ b/tests/unit/Images/v2/JsonPatchTest.php
@@ -9,7 +9,7 @@ class JsonPatchTest extends TestCase
 {
     private $jsonPatch;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->jsonPatch = new JsonPatch();
     }
diff --git a/tests/unit/Images/v2/Models/ImageTest.php b/tests/unit/Images/v2/Models/ImageTest.php
index 33a24e74..f1d553d0 100644
--- a/tests/unit/Images/v2/Models/ImageTest.php
+++ b/tests/unit/Images/v2/Models/ImageTest.php
@@ -17,7 +17,7 @@ class ImageTest extends TestCase
 
     private $path;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -87,15 +87,13 @@ public function test_it_updates()
         $this->image->update($opts);
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_if_user_input_does_not_match_schema()
     {
         $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn(new Uri);
 
         $this->setupMock('GET', $this->path, null, [], 'GET_image');
         $this->setupMock('GET', 'v2/schemas/image', null, [], 'GET_image_schema');
+        $this->expectException(\Exception::class);
 
         $this->image->update([
             'minDisk' => 'foo',
diff --git a/tests/unit/Images/v2/Models/MemberTest.php b/tests/unit/Images/v2/Models/MemberTest.php
index 680dff02..69880675 100644
--- a/tests/unit/Images/v2/Models/MemberTest.php
+++ b/tests/unit/Images/v2/Models/MemberTest.php
@@ -11,7 +11,7 @@ class MemberTest extends TestCase
 {
     private $member;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Images/v2/ServiceTest.php b/tests/unit/Images/v2/ServiceTest.php
index 5abae7cc..a38cdf09 100644
--- a/tests/unit/Images/v2/ServiceTest.php
+++ b/tests/unit/Images/v2/ServiceTest.php
@@ -12,7 +12,7 @@ class ServiceTest extends TestCase
 {
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php b/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
index 93df0535..ccb6a9bf 100644
--- a/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
@@ -11,7 +11,7 @@ class MetricTest extends TestCase
     /** @var Metric */
     private $metric;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php b/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
index e5256061..a94021fa 100644
--- a/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
@@ -12,7 +12,7 @@ class ResourceTest extends TestCase
     /** @var Resource */
     private $resource;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -30,7 +30,7 @@ public function test_it_retrieves()
         $this->assertEquals('fake-project-id', $this->resource->projectId);
         $this->assertEquals('fake-created-by-user-id', $this->resource->createdByUserId);
         $this->assertEquals('fake-type', $this->resource->type);
-        $this->assertInternalType('array', $this->resource->metrics);
+        self::assertIsArray($this->resource->metrics);
         $this->assertEquals(8, count($this->resource->metrics));
     }
 
@@ -52,7 +52,7 @@ public function test_it_gets_metric_measures()
         $this->setupMock('GET', sprintf('v1/resource/generic/1111/metric/storage.objects.outgoing.bytes/measures'), [], [], 'resource-metric-measures-get');
         $measures = $this->resource->getMetricMeasures(['metric' => 'storage.objects.outgoing.bytes']);
 
-        $this->assertInternalType('array', $measures);
+        self::assertIsArray($measures);
         $this->assertEquals(7, count($measures));
         $this->assertEquals('2017-05-16T00:00:00+00:00', $measures[0][0]);
     }
diff --git a/tests/unit/Metric/v1/Gnocchi/ServiceTest.php b/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
index 03c916bc..bfd135d7 100644
--- a/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
@@ -14,7 +14,7 @@ class ServiceTest extends TestCase
     /** @var Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->rootFixturesDir = __DIR__;
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
index 01d778d2..1575c21c 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
@@ -12,7 +12,7 @@ class FloatingIpTest extends TestCase
     /** @var FloatingIp */
     private $floatingIp;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
index 6b2d3ce2..2d4a1771 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
@@ -14,7 +14,7 @@ class RouterTest extends TestCase
     /** @var Router */
     private $router;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php b/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
index 7dffc010..9ad73011 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
@@ -14,7 +14,7 @@ class ServiceTest extends TestCase
     /** @var Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
index 696a8a27..adcdbfbe 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
@@ -12,7 +12,7 @@ class SecurityGroupRuleTest extends TestCase
     /** @var SecurityGroupRule */
     private $securityGroupRule;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
index c2d2ff7e..c860d8f7 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
@@ -14,7 +14,7 @@ class SecurityGroupTest extends TestCase
 
     const SECURITY_GROUP_ID = '85cc3048-abc3-43cc-89b3-377341426ac5';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -42,7 +42,7 @@ public function test_it_retrieves()
         $this->assertEquals(self::SECURITY_GROUP_ID, $this->securityGroup->id);
         $this->assertEquals(2, count($this->securityGroup->securityGroupRules));
     }
-    
+
     public function test_it_updates()
     {
         $this->setupMock('PUT', 'v2.0/security-groups/' . self::SECURITY_GROUP_ID, null, [], 'SecurityGroup');
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
index 410e3287..d065b938 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
@@ -14,7 +14,7 @@ class ServiceTest extends TestCase
     /** @var Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php b/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
index 76b45be5..6ace866e 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
@@ -11,7 +11,7 @@ class LoadBalancerHealthMonitorTest extends TestCase
 {
     private $healthmonitor;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php b/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
index 9d8ea7f5..11822948 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
@@ -11,7 +11,7 @@ class LoadBalancerListenerTest extends TestCase
 {
     private $listener;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php b/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
index 71a888f4..1e86d7b8 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
@@ -11,7 +11,7 @@ class LoadBalancerMemberTest extends TestCase
 {
     private $member;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php b/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
index 4a321a13..209f8464 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
@@ -13,7 +13,7 @@ class LoadBalancerPoolTest extends TestCase
 {
     private $pool;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php b/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
index 4ff95a57..942a24f8 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
@@ -11,7 +11,7 @@ class LoadBalancerStatTest extends TestCase
 {
     private $stat;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php b/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
index 5dc40f3b..468e1cfc 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
@@ -12,7 +12,7 @@ class LoadBalancerStatusTest extends TestCase
 {
     private $status;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -32,7 +32,7 @@ public function test_it_retrieves()
         $this->assertEquals('loadbalancerId', $this->status->id);
         $this->assertEquals('ONLINE', $this->status->operatingStatus);
         $this->assertEquals('ACTIVE', $this->status->provisioningStatus);
-        $this->assertInternalType('array', $this->status->listeners);
+        self::assertIsArray($this->status->listeners);
         $this->assertArrayHasKey(0, $this->status->listeners);
         $this->assertInstanceOf(LoadBalancerListener::class, $this->status->listeners[0]);
     }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerTest.php b/tests/unit/Networking/v2/Models/LoadBalancerTest.php
index 9a1d7db8..eeb7db17 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerTest.php
@@ -14,7 +14,7 @@ class LoadBalancerTest extends TestCase
 {
     private $loadbalancer;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -134,7 +134,7 @@ public function test_get_statuses()
         $this->assertEquals('loadbalancerId', $status->id);
         $this->assertEquals('ONLINE', $status->operatingStatus);
         $this->assertEquals('ACTIVE', $status->provisioningStatus);
-        $this->assertInternalType('array', $status->listeners);
+        self::assertIsArray($status->listeners);
         $this->assertArrayHasKey(0, $status->listeners);
         $this->assertInstanceOf(LoadBalancerListener::class, $status->listeners[0]);
         $this->assertInstanceOf(LoadBalancerStatus::class, $status);
diff --git a/tests/unit/Networking/v2/Models/NetworkTest.php b/tests/unit/Networking/v2/Models/NetworkTest.php
index 6f876d21..7452981f 100644
--- a/tests/unit/Networking/v2/Models/NetworkTest.php
+++ b/tests/unit/Networking/v2/Models/NetworkTest.php
@@ -11,7 +11,7 @@ class NetworkTest extends TestCase
 {
     private $network;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -74,7 +74,7 @@ public function test_it_bulk_creates()
 
         $networks = $this->network->bulkCreate($opts);
 
-        $this->assertInternalType('array', $networks);
+        self::assertIsArray($networks);
         $this->assertCount(2, $networks);
     }
 
diff --git a/tests/unit/Networking/v2/Models/PortTest.php b/tests/unit/Networking/v2/Models/PortTest.php
index 8450de3c..2517bb76 100644
--- a/tests/unit/Networking/v2/Models/PortTest.php
+++ b/tests/unit/Networking/v2/Models/PortTest.php
@@ -15,7 +15,7 @@ class PortTest extends TestCase
     /** @var Port */
     private $port;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/QuotaTest.php b/tests/unit/Networking/v2/Models/QuotaTest.php
index de7313d2..325f9eb3 100644
--- a/tests/unit/Networking/v2/Models/QuotaTest.php
+++ b/tests/unit/Networking/v2/Models/QuotaTest.php
@@ -15,7 +15,7 @@ class QuotaTest extends TestCase
     /** @var Port */
     private $quota;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/Networking/v2/Models/SubnetTest.php b/tests/unit/Networking/v2/Models/SubnetTest.php
index 99286b27..b23e7b12 100644
--- a/tests/unit/Networking/v2/Models/SubnetTest.php
+++ b/tests/unit/Networking/v2/Models/SubnetTest.php
@@ -11,7 +11,7 @@ class SubnetTest extends TestCase
 {
     private $subnet;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -88,7 +88,7 @@ public function test_it_bulk_creates()
 
         $subnets = $this->subnet->bulkCreate($opts);
 
-        $this->assertInternalType('array', $subnets);
+        self::assertIsArray($subnets);
         $this->assertCount(2, $subnets);
     }
 
diff --git a/tests/unit/Networking/v2/ServiceTest.php b/tests/unit/Networking/v2/ServiceTest.php
index 9410fe44..551ee2a6 100644
--- a/tests/unit/Networking/v2/ServiceTest.php
+++ b/tests/unit/Networking/v2/ServiceTest.php
@@ -16,7 +16,7 @@ class ServiceTest extends TestCase
     /** @var  Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -78,7 +78,7 @@ public function test_it_bulk_creates_networks()
 
         $networks = $this->service->createNetworks($opts);
 
-        $this->assertInternalType('array', $networks);
+        self::assertIsArray($networks);
         $this->assertCount(2, $networks);
     }
 
@@ -167,7 +167,7 @@ public function test_it_bulk_creates_subnets()
 
         $subnets = $this->service->createSubnets($opts);
 
-        $this->assertInternalType('array', $subnets);
+        self::assertIsArray($subnets);
         $this->assertCount(2, $subnets);
     }
 
@@ -244,7 +244,7 @@ public function test_it_bulk_creates_ports()
 
         $ports = $this->service->createPorts($opts);
 
-        $this->assertInternalType('array', $ports);
+        self::assertIsArray($ports);
         $this->assertCount(2, $ports);
     }
 
diff --git a/tests/unit/ObjectStore/v1/Models/AccountTest.php b/tests/unit/ObjectStore/v1/Models/AccountTest.php
index b15d3bd1..fced36f1 100644
--- a/tests/unit/ObjectStore/v1/Models/AccountTest.php
+++ b/tests/unit/ObjectStore/v1/Models/AccountTest.php
@@ -10,7 +10,7 @@ class AccountTest extends TestCase
 {
     private $account;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/ObjectStore/v1/Models/ContainerTest.php b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
index dc75a440..a3caaf2e 100644
--- a/tests/unit/ObjectStore/v1/Models/ContainerTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
@@ -18,7 +18,7 @@ class ContainerTest extends TestCase
 
     private $container;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -193,9 +193,6 @@ public function test_false_is_returned_for_non_existing_object()
         $this->assertFalse($this->container->objectExists('bar'));
     }
 
-    /**
-     * @expectedException \OpenStack\Common\Error\BadResponseError
-     */
     public function test_other_exceptions_are_thrown()
     {
         $e = new BadResponseError();
@@ -206,6 +203,7 @@ public function test_other_exceptions_are_thrown()
             ->request('HEAD', 'test/bar', ['headers' => []])
             ->shouldBeCalled()
             ->willThrow($e);
+		$this->expectException(BadResponseError::class);
 
         $this->container->objectExists('bar');
     }
diff --git a/tests/unit/ObjectStore/v1/Models/ObjectTest.php b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
index 85202b82..084ff7d2 100644
--- a/tests/unit/ObjectStore/v1/Models/ObjectTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
@@ -15,7 +15,7 @@ class ObjectTest extends TestCase
 
     private $object;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/unit/ObjectStore/v1/ServiceTest.php b/tests/unit/ObjectStore/v1/ServiceTest.php
index c4f4717d..2c4f8492 100644
--- a/tests/unit/ObjectStore/v1/ServiceTest.php
+++ b/tests/unit/ObjectStore/v1/ServiceTest.php
@@ -15,7 +15,7 @@ class ServiceTest extends TestCase
 {
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -68,9 +68,6 @@ public function test_it_returns_false_if_container_does_not_exist()
         $this->assertFalse($this->service->containerExists('foo'));
     }
 
-    /**
-     * @expectedException \OpenStack\Common\Error\BadResponseError
-     */
     public function test_it_throws_exception_when_error()
     {
         $e = new BadResponseError();
@@ -81,7 +78,8 @@ public function test_it_throws_exception_when_error()
             ->request('HEAD', 'foo', ['headers' => []])
             ->shouldBeCalled()
             ->willThrow($e);
+		$this->expectException(BadResponseError::class);
 
-        $this->assertFalse($this->service->containerExists('foo'));
+        $this->service->containerExists('foo');
     }
 }
diff --git a/tests/unit/OpenStackTest.php b/tests/unit/OpenStackTest.php
index 43cc7785..4ffe3f46 100644
--- a/tests/unit/OpenStackTest.php
+++ b/tests/unit/OpenStackTest.php
@@ -23,7 +23,7 @@ class OpenStackTest extends TestCase
     /** @var OpenStack */
     private $openstack;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->builder = $this->prophesize(Builder::class);
         $this->openstack = new OpenStack(['authUrl' => ''], $this->builder->reveal());
@@ -58,7 +58,7 @@ public function test_it_supports_identity_v3()
 
         $this->openstack->identityV3();
     }
-    
+
     public function test_it_supports_networking_v2()
     {
         $this->builder
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
index 30f14879..84040f5a 100644
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
@@ -18,7 +18,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
 
     protected $api;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->client = $this->prophesize(ClientInterface::class);
     }
@@ -43,7 +43,7 @@ protected function getFixture($file)
         return parse_response(file_get_contents($path));
     }
 
-    protected function setupMock($method, $path, $body = null, array $headers = [], $response)
+    protected function setupMock($method, $path, $body = null, array $headers = [], $response = null)
     {
         $options = ['headers' => $headers];
 

From 6b5853dc503f6e266fe39a4e9d25e677a3fabbe6 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Tue, 5 Jan 2021 18:30:27 +0100
Subject: [PATCH 039/102] Remove deprecated Travis container infra

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 .travis.yml                                   |   2 -
 .../integration/BlockStorage/v2/CoreTest.php  |  30 ++--
 tests/integration/Compute/v2/CoreTest.php     |  52 +++----
 tests/integration/Identity/v3/CoreTest.php    |  56 ++++----
 tests/integration/Images/v2/CoreTest.php      |   8 +-
 tests/integration/Networking/v2/CoreTest.php  |  42 +++---
 .../integration/Networking/v2/Layer3Test.php  |   8 +-
 tests/integration/ObjectStore/v1/CoreTest.php |  22 +--
 .../BlockStorage/v2/Models/QuotaSetTest.php   |   6 +-
 .../BlockStorage/v2/Models/SnapshotTest.php   |   2 +-
 .../BlockStorage/v2/Models/VolumeTest.php     |  28 ++--
 tests/unit/BlockStorage/v2/ServiceTest.php    |  38 ++---
 tests/unit/Common/Api/OperationTest.php       |  12 +-
 tests/unit/Common/Api/OperatorTraitTest.php   |  12 +-
 tests/unit/Common/Api/ParameterTest.php       |  32 ++---
 tests/unit/Common/ArrayAccessTraitTest.php    |  14 +-
 tests/unit/Common/Auth/AuthHandlerTest.php    |   2 +-
 .../Common/Error/BadResponseErrorTest.php     |   4 +-
 tests/unit/Common/Error/BuilderTest.php       |   8 +-
 .../unit/Common/HydratorStrategyTraitTest.php |  10 +-
 tests/unit/Common/JsonPathTest.php            |  10 +-
 .../unit/Common/JsonSchema/JsonPatchTest.php  |   2 +-
 tests/unit/Common/JsonSchema/SchemaTest.php   |  10 +-
 .../Common/Resource/AbstractResourceTest.php  |  42 +++---
 .../Common/Resource/OperatorResourceTest.php  |  28 ++--
 tests/unit/Common/Service/BuilderTest.php     |  10 +-
 .../Common/Transport/HandlerStackTest.php     |   2 +-
 .../Common/Transport/JsonSerializerTest.php   |   8 +-
 .../unit/Common/Transport/MiddlewareTest.php  |   6 +-
 .../Transport/RequestSerializerTest.php       |  16 +--
 tests/unit/Common/Transport/UtilsTest.php     |   4 +-
 tests/unit/Compute/v2/Models/FlavorTest.php   |  12 +-
 tests/unit/Compute/v2/Models/HostTest.php     |   2 +-
 .../unit/Compute/v2/Models/HypervisorTest.php |  32 ++---
 tests/unit/Compute/v2/Models/ImageTest.php    |  34 ++---
 tests/unit/Compute/v2/Models/KeypairTest.php  |  26 ++--
 tests/unit/Compute/v2/Models/QuotaSetTest.php |  30 ++--
 tests/unit/Compute/v2/Models/ServerTest.php   | 132 +++++++++---------
 tests/unit/Compute/v2/ServiceTest.php         |  36 ++---
 .../unit/Identity/v2/Models/EndpointTest.php  |   4 +-
 tests/unit/Identity/v2/Models/EntryTest.php   |   2 +-
 tests/unit/Identity/v2/Models/TokenTest.php   |   6 +-
 tests/unit/Identity/v2/ServiceTest.php        |   4 +-
 tests/unit/Identity/v3/Models/CatalogTest.php |   6 +-
 tests/unit/Identity/v3/Models/DomainTest.php  |  12 +-
 .../unit/Identity/v3/Models/EndpointTest.php  |   2 +-
 tests/unit/Identity/v3/Models/GroupTest.php   |   4 +-
 tests/unit/Identity/v3/Models/PolicyTest.php  |   4 +-
 tests/unit/Identity/v3/Models/ProjectTest.php |   8 +-
 tests/unit/Identity/v3/Models/ServiceTest.php |   6 +-
 tests/unit/Identity/v3/Models/TokenTest.php   |   6 +-
 tests/unit/Identity/v3/ServiceTest.php        | 118 ++++++++--------
 tests/unit/Images/v2/JsonPatchTest.php        |   4 +-
 tests/unit/Images/v2/Models/ImageTest.php     |  42 +++---
 tests/unit/Images/v2/ServiceTest.php          |   4 +-
 .../Metric/v1/Gnocchi/Models/MetricTest.php   |   4 +-
 .../Metric/v1/Gnocchi/Models/ResourceTest.php |  22 +--
 tests/unit/Metric/v1/Gnocchi/ServiceTest.php  |  20 +--
 .../Layer3/Models/FloatingIpTest.php          |  16 +--
 .../Extensions/Layer3/Models/RouterTest.php   |   4 +-
 .../v2/Extensions/Layer3/ServiceTest.php      |  32 ++---
 .../Models/SecurityGroupTest.php              |  10 +-
 .../Extensions/SecurityGroups/ServiceTest.php |  30 ++--
 .../Models/LoadBalancerHealthMonitorTest.php  |  14 +-
 .../v2/Models/LoadBalancerListenerTest.php    |   8 +-
 .../v2/Models/LoadBalancerMemberTest.php      |   8 +-
 .../v2/Models/LoadBalancerPoolTest.php        |  14 +-
 .../v2/Models/LoadBalancerStatTest.php        |   8 +-
 .../v2/Models/LoadBalancerStatusTest.php      |  12 +-
 .../Networking/v2/Models/LoadBalancerTest.php |  36 ++---
 .../unit/Networking/v2/Models/NetworkTest.php |  10 +-
 tests/unit/Networking/v2/Models/PortTest.php  |  18 +--
 .../unit/Networking/v2/Models/SubnetTest.php  |  12 +-
 tests/unit/Networking/v2/ServiceTest.php      |  34 ++---
 .../ObjectStore/v1/Models/AccountTest.php     |  12 +-
 .../ObjectStore/v1/Models/ContainerTest.php   |  26 ++--
 .../unit/ObjectStore/v1/Models/ObjectTest.php |  10 +-
 tests/unit/ObjectStore/v1/ServiceTest.php     |   8 +-
 tests/unit/TestCase.php                       |  10 +-
 79 files changed, 719 insertions(+), 721 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38eb1c36..91f83d70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: php
 
-sudo: false
-
 dist: bionic
 
 cache:
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
index 3e43438c..a94ca077 100644
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -55,10 +55,10 @@ public function volumes()
         $this->logStep('Creating volume');
         /** @var Volume $volume */
         require_once $this->sampleFile($replacements, 'volumes/create.php');
-        $this->assertInstanceOf(Volume::class, $volume);
-        $this->assertEquals($replacements['{name}'], $volume->name);
-        $this->assertEquals(1, $volume->size);
-        $this->assertEquals($volumeType->name, $volume->volumeTypeName);
+        self::assertInstanceOf(Volume::class, $volume);
+        self::assertEquals($replacements['{name}'], $volume->name);
+        self::assertEquals(1, $volume->size);
+        self::assertEquals($volumeType->name, $volume->volumeTypeName);
 
         $volumeId = $volume->id;
         $replacements = ['{volumeId}' => $volumeId];
@@ -66,14 +66,14 @@ public function volumes()
         $this->logStep('Getting volume');
         /** @var Volume $volume */
         require_once $this->sampleFile($replacements, 'volumes/get.php');
-        $this->assertInstanceOf(Volume::class, $volume);
+        self::assertInstanceOf(Volume::class, $volume);
 
         $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
 
         $this->logStep('Updating volume');
         /** @var Volume $volume */
         require_once $this->sampleFile($replacements, 'volumes/update.php');
-        $this->assertInstanceOf(Volume::class, $volume);
+        self::assertInstanceOf(Volume::class, $volume);
 
         $this->logStep('Listing volumes');
         /** @var \Generator $volumes */
@@ -98,22 +98,22 @@ public function volumeTypes()
         $this->logStep('Creating volume type');
         /** @var VolumeType $volumeType */
         require_once $this->sampleFile($replacements, 'volume_types/create.php');
-        $this->assertInstanceOf(VolumeType::class, $volumeType);
-        $this->assertEquals($replacements['{name}'], $volumeType->name);
+        self::assertInstanceOf(VolumeType::class, $volumeType);
+        self::assertEquals($replacements['{name}'], $volumeType->name);
 
         $replacements = ['{volumeTypeId}' => $volumeType->id];
 
         $this->logStep('Getting volume type');
         /** @var VolumeType $volumeType */
         require_once $this->sampleFile($replacements, 'volume_types/get.php');
-        $this->assertInstanceOf(VolumeType::class, $volumeType);
+        self::assertInstanceOf(VolumeType::class, $volumeType);
 
         $replacements += ['{newName}' => $this->randomStr()];
 
         $this->logStep('Updating volume type');
         /** @var VolumeType $volumeType */
         require_once $this->sampleFile($replacements, 'volume_types/update.php');
-        $this->assertInstanceOf(VolumeType::class, $volumeType);
+        self::assertInstanceOf(VolumeType::class, $volumeType);
 
         $this->logStep('Listing volume types');
         /** @var \Generator $volumeTypes */
@@ -138,8 +138,8 @@ public function snapshots()
         $this->logStep('Creating snapshot');
         /** @var Snapshot $snapshot */
         require_once $this->sampleFile($replacements, 'snapshots/create.php');
-        $this->assertInstanceOf(Snapshot::class, $snapshot);
-        $this->assertEquals($replacements['{name}'], $snapshot->name);
+        self::assertInstanceOf(Snapshot::class, $snapshot);
+        self::assertEquals($replacements['{name}'], $snapshot->name);
         $volume->waitUntil('available', 60);
 
         $snapshotId = $snapshot->id;
@@ -148,7 +148,7 @@ public function snapshots()
         $this->logStep('Getting snapshot');
         /** @var Snapshot $snapshot */
         require_once $this->sampleFile($replacements, 'snapshots/get.php');
-        $this->assertInstanceOf(Snapshot::class, $snapshot);
+        self::assertInstanceOf(Snapshot::class, $snapshot);
 
         $this->getService()
             ->getSnapshot($snapshot->id)
@@ -161,7 +161,7 @@ public function snapshots()
         $this->logStep('Retrieving metadata');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
-        $this->assertEquals(['key1' => 'val1', 'key2' => 'val2'], $metadata);
+        self::assertEquals(['key1' => 'val1', 'key2' => 'val2'], $metadata);
 
         $replacements = ['{snapshotId}' => $snapshot->id, '{key}' => 'key3', '{val}' => 'val3'];
         $this->logStep('Resetting metadata');
@@ -170,7 +170,7 @@ public function snapshots()
         $this->logStep('Retrieving metadata');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
-        $this->assertEquals(['key3' => 'val3'], $metadata);
+        self::assertEquals(['key3' => 'val3'], $metadata);
 
         $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
         $this->logStep('Updating snapshot');
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
index 457d230b..8a00f0f0 100644
--- a/tests/integration/Compute/v2/CoreTest.php
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -247,9 +247,9 @@ private function createServer()
 
         $server->waitUntilActive(false);
 
-        $this->assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
-        $this->assertNotEmpty($server->id);
-        $this->assertNotEmpty($server->adminPass);
+        self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
+        self::assertNotEmpty($server->id);
+        self::assertNotEmpty($server->adminPass);
 
         $this->serverId = $server->id;
         $this->adminPass = $server->adminPass;
@@ -270,8 +270,8 @@ private function updateServer()
         $path = $this->sampleFile($replacements, 'servers/update_server.php');
         require_once $path;
 
-        $this->assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
-        $this->assertEquals($name, $server->name);
+        self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
+        self::assertEquals($name, $server->name);
 
         $server->waitUntilActive(false);
 
@@ -299,15 +299,15 @@ private function retrieveServer()
         $path = $this->sampleFile($replacements, 'servers/get_server.php');
         require_once $path;
 
-        $this->assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
-        $this->assertEquals($this->serverId, $server->id);
-        $this->assertNotNull($server->created);
-        $this->assertNotNull($server->updated);
-        $this->assertNotNull($server->name);
-        $this->assertNotNull($server->ipv4);
-        $this->assertNotNull($server->status);
-        $this->assertInstanceOf(Image::class, $server->image);
-        $this->assertInstanceOf(Flavor::class, $server->flavor);
+        self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
+        self::assertEquals($this->serverId, $server->id);
+        self::assertNotNull($server->created);
+        self::assertNotNull($server->updated);
+        self::assertNotNull($server->name);
+        self::assertNotNull($server->ipv4);
+        self::assertNotNull($server->status);
+        self::assertInstanceOf(Image::class, $server->image);
+        self::assertInstanceOf(Flavor::class, $server->flavor);
 
         $this->logStep('Retrieved the details of server ID', ['ID' => $this->serverId]);
     }
@@ -456,7 +456,7 @@ private function createFlavor()
         $path = $this->sampleFile($replacements, 'flavors/create_flavor.php');
         require_once $path;
 
-        $this->assertInstanceOf('\OpenStack\Compute\v2\Models\Flavor', $flavor);
+        self::assertInstanceOf('\OpenStack\Compute\v2\Models\Flavor', $flavor);
 
         $this->flavorId = $flavor->id;
         $this->logStep('Created flavor {id}', ['{id}' => $flavor->id]);
@@ -552,7 +552,7 @@ private function listKeypairs()
         /** @var $keypairs \Generator */
         require_once $this->sampleFile([], 'keypairs/list_keypairs.php');
 
-        $this->assertInstanceOf(\Generator::class, $keypairs);
+        self::assertInstanceOf(\Generator::class, $keypairs);
 
         $this->logStep('Listed all keypairs');
     }
@@ -567,9 +567,9 @@ private function createKeypair()
         require_once $this->sampleFile($replacements, 'keypairs/create_keypair.php');
         /**@var Keypair $keypair */
 
-        $this->assertInstanceOf(Keypair::class, $keypair);
-        $this->assertEquals($replacements['{name}'], $keypair->name);
-        $this->assertEquals($replacements['{publicKey}'], $keypair->publicKey);
+        self::assertInstanceOf(Keypair::class, $keypair);
+        self::assertEquals($replacements['{name}'], $keypair->name);
+        self::assertEquals($replacements['{publicKey}'], $keypair->publicKey);
 
         $this->keypairName = $keypair->name;
         $this->logStep('Created keypair name {name}', ['{name}' => $keypair->name]);
@@ -584,9 +584,9 @@ private function getKeypair()
         require_once $this->sampleFile($replacements, 'keypairs/get_keypair.php');
 
         /**@var Keypair $keypair */
-        $this->assertInstanceOf(Keypair::class, $keypair);
+        self::assertInstanceOf(Keypair::class, $keypair);
 
-        $this->assertEquals($replacements['{name}'], $keypair->name);
+        self::assertEquals($replacements['{name}'], $keypair->name);
 
         $this->logStep('Retrieved details for keypair {name}', $replacements);
     }
@@ -617,8 +617,8 @@ private function getHypervisor()
         require_once $this->sampleFile($replacements, 'hypervisors/get_hypervisor.php');
 
         /**@var Hypervisor $hypervisor */
-        $this->assertInstanceOf(Hypervisor::class, $hypervisor);
-        $this->assertEquals($replacements['{hypervisorId}'], $hypervisor->id);
+        self::assertInstanceOf(Hypervisor::class, $hypervisor);
+        self::assertEquals($replacements['{hypervisorId}'], $hypervisor->id);
 
         $this->logStep('Retrieved details for hypervisor id {hypervisorId}', $replacements);
     }
@@ -628,7 +628,7 @@ private function getHypervisorsStatistics()
         require_once  $this->sampleFile([], 'hypervisors/get_hypervisors_statistics.php');
 
         /**@var HypervisorStatistic $hypervisorStatistics */
-        $this->assertInstanceOf(HypervisorStatistic::class, $hypervisorStatistics);
+        self::assertInstanceOf(HypervisorStatistic::class, $hypervisorStatistics);
 
         $this->logStep('Retrieved hypervisors statistics');
     }
@@ -638,7 +638,7 @@ private function getLimits()
         require_once $this->sampleFile([], 'limits/get_limits.php');
 
         /**@var Limit $limit */
-        $this->assertInstanceOf(Limit::class, $limit);
+        self::assertInstanceOf(Limit::class, $limit);
 
         $this->logStep('Retrieved tenant limit');
     }
@@ -665,7 +665,7 @@ private function listServerSecurityGroups()
         require_once  $this->sampleFile($replacements, 'servers/list_security_groups.php');
 
         /**@var \Generator $securityGroups */
-        $this->assertInstanceOf(\Generator::class, $securityGroups);
+        self::assertInstanceOf(\Generator::class, $securityGroups);
 
         $this->logStep('Listed all security groups attached to server {serverId}', $replacements);
     }
diff --git a/tests/integration/Identity/v3/CoreTest.php b/tests/integration/Identity/v3/CoreTest.php
index 2533a395..57175e7c 100644
--- a/tests/integration/Identity/v3/CoreTest.php
+++ b/tests/integration/Identity/v3/CoreTest.php
@@ -38,34 +38,34 @@ public function tokens()
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         $path = $this->sampleFile([], 'tokens/generate_token_with_username.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Token::class, $token);
+        self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         $path = $this->sampleFile([], 'tokens/generate_token_with_user_id.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Token::class, $token);
+        self::assertInstanceOf(Models\Token::class, $token);
 
         $replacements = ['{tokenId}' => $token->id];
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         $path = $this->sampleFile($replacements, 'tokens/generate_token_scoped_to_project_id.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Token::class, $token);
+        self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         $path = $this->sampleFile($replacements, 'tokens/generate_token_scoped_to_project_name.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Token::class, $token);
+        self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         $path = $this->sampleFile($replacements, 'tokens/generate_token_from_id.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Token::class, $token);
+        self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
         $path = $this->sampleFile($replacements, 'tokens/validate_token.php');
         require_once $path;
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         $path = $this->sampleFile($replacements, 'tokens/revoke_token.php');
         require_once $path;
@@ -73,7 +73,7 @@ public function tokens()
         /** @var $result bool */
         $path = $this->sampleFile($replacements, 'tokens/validate_token.php');
         require_once $path;
-        $this->assertFalse($result);
+        self::assertFalse($result);
     }
 
     public function domains()
@@ -86,7 +86,7 @@ public function domains()
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
         $path = $this->sampleFile($replacements, 'domains/add_domain.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Domain::class, $domain);
+        self::assertInstanceOf(Models\Domain::class, $domain);
 
         $replacements['{domainId}'] = $domain->id;
 
@@ -96,7 +96,7 @@ public function domains()
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
         $path = $this->sampleFile($replacements, 'domains/show_domain.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Domain::class, $domain);
+        self::assertInstanceOf(Models\Domain::class, $domain);
 
         $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
         $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
@@ -107,7 +107,7 @@ public function domains()
         /** @var $result bool */
         $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'domains/check_group_role.php');
         require_once $path;
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         $path = $this->sampleFile($replacements + ['{groupId}' => $group->id], 'domains/list_group_roles.php');
         require_once $path;
@@ -125,7 +125,7 @@ public function domains()
         /** @var $result bool */
         $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/check_user_role.php');
         require_once $path;
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id], 'domains/list_user_roles.php');
         require_once $path;
@@ -139,7 +139,7 @@ public function domains()
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
         $path = $this->sampleFile($replacements, 'domains/update_domain.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Domain::class, $domain);
+        self::assertInstanceOf(Models\Domain::class, $domain);
 
         $path = $this->sampleFile($replacements, 'domains/delete_domain.php');
         require_once $path;
@@ -159,7 +159,7 @@ public function endpoints()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
         $path = $this->sampleFile($replacements, 'endpoints/add_endpoint.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Endpoint::class, $endpoint);
+        self::assertInstanceOf(Models\Endpoint::class, $endpoint);
 
         $replacements['{endpointId}'] = $endpoint->id;
 
@@ -186,7 +186,7 @@ public function services()
         /** @var $service \OpenStack\Identity\v3\Models\Service */
         $path = $this->sampleFile($replacements, 'services/add_service.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Service::class, $service);
+        self::assertInstanceOf(Models\Service::class, $service);
 
         $replacements['{serviceId}'] = $service->id;
 
@@ -196,12 +196,12 @@ public function services()
         /** @var $service \OpenStack\Identity\v3\Models\Service */
         $path = $this->sampleFile($replacements, 'services/update_service.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Service::class, $service);
+        self::assertInstanceOf(Models\Service::class, $service);
 
         /** @var $service \OpenStack\Identity\v3\Models\Service */
         $path = $this->sampleFile($replacements, 'services/get_service.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Service::class, $service);
+        self::assertInstanceOf(Models\Service::class, $service);
 
         $path = $this->sampleFile($replacements, 'services/delete_service.php');
         require_once $path;
@@ -214,7 +214,7 @@ public function groups()
         /** @var $group \OpenStack\Identity\v3\Models\Group */
         $path = $this->sampleFile(['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'groups/add_group.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Group::class, $group);
+        self::assertInstanceOf(Models\Group::class, $group);
 
         $replacements = ['{groupId}' => $group->id];
 
@@ -224,12 +224,12 @@ public function groups()
         /** @var $group \OpenStack\Identity\v3\Models\Group */
         $path = $this->sampleFile($replacements, 'groups/get_group.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Group::class, $group);
+        self::assertInstanceOf(Models\Group::class, $group);
 
         /** @var $result bool */
         $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/check_user_membership.php');
         require_once $path;
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         $path = $this->sampleFile($replacements, 'groups/list_users.php');
         require_once $path;
@@ -240,7 +240,7 @@ public function groups()
         /** @var $result bool */
         $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/check_user_membership.php');
         require_once $path;
-        $this->assertFalse($result);
+        self::assertFalse($result);
 
         $path = $this->sampleFile($replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'groups/update_group.php');
         require_once $path;
@@ -259,14 +259,14 @@ public function projects()
         /** @var $project \OpenStack\Identity\v3\Models\Project */
         $path = $this->sampleFile(['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'projects/add_project.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Project::class, $project);
+        self::assertInstanceOf(Models\Project::class, $project);
 
         $replacements = ['{id}' => $project->id];
 
         /** @var $project \OpenStack\Identity\v3\Models\Project */
         $path = $this->sampleFile($replacements, 'projects/get_project.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Project::class, $project);
+        self::assertInstanceOf(Models\Project::class, $project);
 
         $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
         $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
@@ -278,7 +278,7 @@ public function projects()
         /** @var $result bool */
         $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'projects/check_group_role.php');
         require_once $path;
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         $path = $this->sampleFile($replacements + ['{groupId}' => $group->id], 'projects/list_group_roles.php');
         require_once $path;
@@ -296,7 +296,7 @@ public function projects()
         /** @var $result bool */
         $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id], 'projects/check_user_role.php');
         require_once $path;
-        $this->assertTrue($result);
+        self::assertTrue($result);
 
         $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id], 'projects/list_user_roles.php');
         require_once $path;
@@ -323,7 +323,7 @@ public function roles()
         /** @var $role \OpenStack\Identity\v3\Models\Role */
         $path = $this->sampleFile(['{name}' => $this->randomStr()], 'roles/add_role.php');
         require_once $path;
-        $this->assertInstanceOf(Models\Role::class, $role);
+        self::assertInstanceOf(Models\Role::class, $role);
 
         $path = $this->sampleFile([], 'roles/list_roles.php');
         require_once $path;
@@ -350,14 +350,14 @@ public function users()
         /** @var $user \OpenStack\Identity\v3\Models\User */
         $path = $this->sampleFile($replacements, 'users/add_user.php');
         require_once $path;
-        $this->assertInstanceOf(Models\User::class, $user);
+        self::assertInstanceOf(Models\User::class, $user);
 
         $replacements = ['{id}' => $user->id];
 
         /** @var $user \OpenStack\Identity\v3\Models\User */
         $path = $this->sampleFile($replacements, 'users/get_user.php');
         require_once $path;
-        $this->assertInstanceOf(Models\User::class, $user);
+        self::assertInstanceOf(Models\User::class, $user);
 
         $path = $this->sampleFile([], 'users/list_users.php');
         require_once $path;
@@ -371,7 +371,7 @@ public function users()
         /** @var $user \OpenStack\Identity\v3\Models\User */
         $path = $this->sampleFile($replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'users/update_user.php');
         require_once $path;
-        $this->assertInstanceOf(Models\User::class, $user);
+        self::assertInstanceOf(Models\User::class, $user);
 
         $path = $this->sampleFile($replacements, 'users/delete_user.php');
         require_once $path;
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
index fc97828a..8a459481 100644
--- a/tests/integration/Images/v2/CoreTest.php
+++ b/tests/integration/Images/v2/CoreTest.php
@@ -32,7 +32,7 @@ public function images()
         $this->logStep('Creating image');
         /** @var Image $image */
         require_once $this->sampleFile($replacements, 'images/create.php');
-        $this->assertInstanceOf(Image::class, $image);
+        self::assertInstanceOf(Image::class, $image);
 
         $replacements = ['{imageId}' => $image->id];
 
@@ -43,7 +43,7 @@ public function images()
         $this->logStep('Getting image');
         /** @var Image $image */
         require_once $this->sampleFile($replacements, 'images/get.php');
-        $this->assertInstanceOf(Image::class, $image);
+        self::assertInstanceOf(Image::class, $image);
 
         $replacements += [
             '{name}'       => 'newName',
@@ -83,13 +83,13 @@ public function members()
         $replacements += ['{imageId}' => $image->id];
         /** @var Member $member */
         require_once $this->sampleFile(['{imageId}' => $image->id, ], 'members/add.php');
-        $this->assertInstanceOf(Member::class, $member);
+        self::assertInstanceOf(Member::class, $member);
 
         $replacements += ['status' => Member::STATUS_REJECTED];
         $this->logStep('Updating member status');
         /** @var Member $member */
         require_once $this->sampleFile($replacements, 'members/update_status.php');
-        $this->assertInstanceOf(Member::class, $member);
+        self::assertInstanceOf(Member::class, $member);
 
         $this->logStep('Deleting member');
         /** @var Member $member */
diff --git a/tests/integration/Networking/v2/CoreTest.php b/tests/integration/Networking/v2/CoreTest.php
index 6f1521bd..56b9da19 100644
--- a/tests/integration/Networking/v2/CoreTest.php
+++ b/tests/integration/Networking/v2/CoreTest.php
@@ -55,8 +55,8 @@ private function createNetworksAndDelete()
         require_once $path;
 
         foreach ($networks as $network) {
-            $this->assertInstanceOf(Network::class, $network);
-            $this->assertNotEmpty($network->id);
+            self::assertInstanceOf(Network::class, $network);
+            self::assertNotEmpty($network->id);
 
             $this->networkId = $network->id;
             $this->logStep('Created network {id}', ['{id}' => $this->networkId]);
@@ -75,8 +75,8 @@ private function createNetwork()
         $path = $this->sampleFile($replacements, 'networks/create.php');
         require_once $path;
 
-        $this->assertInstanceOf(Network::class, $network);
-        $this->assertNotEmpty($network->id);
+        self::assertInstanceOf(Network::class, $network);
+        self::assertNotEmpty($network->id);
 
         $this->logStep('Created network {id}', ['{id}' => $this->networkId]);
 
@@ -96,8 +96,8 @@ private function updateNetwork($networkId)
         $path = $this->sampleFile($replacements, 'networks/update.php');
         require_once $path;
 
-        $this->assertInstanceOf(Network::class, $network);
-        $this->assertEquals($name, $network->name);
+        self::assertInstanceOf(Network::class, $network);
+        self::assertEquals($name, $network->name);
 
         $this->logStep('Updated network ID to use this name: NAME', ['ID' => $networkId, 'NAME' => $name]);
     }
@@ -110,7 +110,7 @@ private function retrieveNetwork($networkId)
         $path = $this->sampleFile($replacements, 'networks/get.php');
         require_once $path;
 
-        $this->assertInstanceOf(Network::class, $network);
+        self::assertInstanceOf(Network::class, $network);
 
         $this->logStep('Retrieved the details of network ID', ['ID' => $networkId]);
     }
@@ -144,8 +144,8 @@ private function createSubnetsAndDelete()
         require_once $path;
 
         foreach ($subnets as $subnet) {
-            $this->assertInstanceOf(Subnet::class, $subnet);
-            $this->assertNotEmpty($subnet->id);
+            self::assertInstanceOf(Subnet::class, $subnet);
+            self::assertNotEmpty($subnet->id);
 
             $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
 
@@ -171,8 +171,8 @@ private function createSubnet()
         $path = $this->sampleFile($replacements, 'subnets/create.php');
         require_once $path;
 
-        $this->assertInstanceOf(Subnet::class, $subnet);
-        $this->assertNotEmpty($subnet->id);
+        self::assertInstanceOf(Subnet::class, $subnet);
+        self::assertNotEmpty($subnet->id);
 
         $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
 
@@ -193,8 +193,8 @@ private function createSubnetWithGatewayIp()
         $path = $this->sampleFile($replacements, 'subnets/create_with_gateway_ip.php');
         require_once $path;
 
-        $this->assertInstanceOf(Subnet::class, $subnet);
-        $this->assertNotEmpty($subnet->id);
+        self::assertInstanceOf(Subnet::class, $subnet);
+        self::assertNotEmpty($subnet->id);
 
         $this->subnetId = $subnet->id;
 
@@ -218,8 +218,8 @@ private function createSubnetWithHostRoutes()
         $path = $this->sampleFile($replacements, 'subnets/create_with_host_routes.php');
         require_once $path;
 
-        $this->assertInstanceOf(Subnet::class, $subnet);
-        $this->assertNotEmpty($subnet->id);
+        self::assertInstanceOf(Subnet::class, $subnet);
+        self::assertNotEmpty($subnet->id);
 
         $this->logStep('Created subnet {id} with host routes', ['{id}' => $subnet->id]);
 
@@ -240,8 +240,8 @@ private function updateSubnet($subnetId)
         $path = $this->sampleFile($replacements, 'subnets/update.php');
         require_once $path;
 
-        $this->assertInstanceOf(Subnet::class, $subnet);
-        $this->assertEquals($name, $subnet->name);
+        self::assertInstanceOf(Subnet::class, $subnet);
+        self::assertEquals($name, $subnet->name);
 
         $this->logStep('Updated subnet ID to use this name: NAME', ['ID' => $subnetId, 'NAME' => $name]);
     }
@@ -255,7 +255,7 @@ private function retrieveSubnet($subnetId)
         $path = $this->sampleFile($replacements, 'subnets/get.php');
         require_once $path;
 
-        $this->assertInstanceOf(Subnet::class, $subnet);
+        self::assertInstanceOf(Subnet::class, $subnet);
 
         $this->logStep('Retrieved the details of subnet ID', ['ID' => $subnetId]);
     }
@@ -294,7 +294,7 @@ public function ports()
         $path = $this->sampleFile($replacements, 'ports/create_batch.php');
         require_once $path;
         foreach ($ports as $port) {
-            $this->assertInstanceOf(Port::class, $port);
+            self::assertInstanceOf(Port::class, $port);
             $port->delete();
         }
 
@@ -305,12 +305,12 @@ public function ports()
         /** @var $port \OpenStack\Networking\v2\Models\Port */
         $path = $this->sampleFile($replacements, 'ports/get.php');
         require_once $path;
-        $this->assertInstanceOf(Port::class, $port);
+        self::assertInstanceOf(Port::class, $port);
 
         /** @var $port \OpenStack\Networking\v2\Models\Port */
         $path = $this->sampleFile($replacements, 'ports/update.php');
         require_once $path;
-        $this->assertInstanceOf(Port::class, $port);
+        self::assertInstanceOf(Port::class, $port);
 
         $path = $this->sampleFile($replacements, 'ports/delete.php');
         require_once $path;
diff --git a/tests/integration/Networking/v2/Layer3Test.php b/tests/integration/Networking/v2/Layer3Test.php
index 0f2c9913..2efad65f 100644
--- a/tests/integration/Networking/v2/Layer3Test.php
+++ b/tests/integration/Networking/v2/Layer3Test.php
@@ -118,9 +118,9 @@ public function floatingIps()
         /** @var FloatingIp $ip */
         $path = $this->sampleFile($replacements, 'floatingIPs/create.php');
         require_once $path;
-        $this->assertInstanceOf(FloatingIp::class, $ip);
-        $this->assertEquals($externalNetwork->id, $ip->floatingNetworkId);
-        $this->assertEquals($port1->id, $ip->portId);
+        self::assertInstanceOf(FloatingIp::class, $ip);
+        self::assertEquals($externalNetwork->id, $ip->floatingNetworkId);
+        self::assertEquals($port1->id, $ip->portId);
 
         $this->logStep('List floating IPs');
         $path = $this->sampleFile($replacements, 'floatingIPs/list.php');
@@ -130,7 +130,7 @@ public function floatingIps()
         $replacements['{id}'] = $ip->id;
         $path = $this->sampleFile($replacements, 'floatingIPs/get.php');
         require_once $path;
-        $this->assertInstanceOf(FloatingIp::class, $ip);
+        self::assertInstanceOf(FloatingIp::class, $ip);
 
         $this->logStep('Update floating IP');
         $port2 = $this->createPort($internalNetwork);
diff --git a/tests/integration/ObjectStore/v1/CoreTest.php b/tests/integration/ObjectStore/v1/CoreTest.php
index d967a276..dd62a6de 100644
--- a/tests/integration/ObjectStore/v1/CoreTest.php
+++ b/tests/integration/ObjectStore/v1/CoreTest.php
@@ -51,7 +51,7 @@ public function accountMetadata()
         $this->logStep('Getting account metadata');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'account/get_metadata.php');
-        $this->assertArraySubset([
+        self::assertArraySubset([
             'Foo' => $replacements['{val_1}'],
             'Bar' => $replacements['{val_2}'],
         ], $metadata);
@@ -68,7 +68,7 @@ public function accountMetadata()
         $this->logStep('Checking account metadata was reset properly');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'account/get_metadata.php');
-        $this->assertEquals([
+        self::assertEquals([
             'Foo1' => $replacements['{val_1}'],
             'Bar1' => $replacements['{val_2}'],
         ], $metadata);
@@ -100,7 +100,7 @@ public function containers()
         $this->logStep('Getting metadata');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'containers/get_metadata.php');
-        $this->assertEquals([
+        self::assertEquals([
             'Foo' => $replacements['{val_1}'],
             'Bar' => $replacements['{val_2}'],
         ], $metadata);
@@ -113,7 +113,7 @@ public function containers()
         require_once $this->sampleFile($replacements, 'containers/reset_metadata.php');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'containers/get_metadata.php');
-        $this->assertEquals([
+        self::assertEquals([
             'Foo1' => $replacements['{val_1}'],
             'Bar1' => $replacements['{val_2}'],
         ], $metadata);
@@ -145,24 +145,24 @@ public function objects()
         $this->logStep('Check that new object exists');
         /** @var bool $exists */
         require_once $this->sampleFile(['{containerName}' => $containerName, '{objectName}' => $newName], 'objects/check_exists.php');
-        $this->assertTrue($exists);
+        self::assertTrue($exists);
 
         $this->logStep('Downloading object');
         /** @var StreamInterface $stream */
         require_once $this->sampleFile($replacements, 'objects/download.php');
-        $this->assertInstanceOf(StreamInterface::class, $stream);
-        $this->assertEquals(1000, $stream->getSize());
+        self::assertInstanceOf(StreamInterface::class, $stream);
+        self::assertEquals(1000, $stream->getSize());
 
         $this->logStep('Downloading object using streaming');
         /** @var StreamInterface $stream */
         require_once $this->sampleFile($replacements, 'objects/download_stream.php');
-        $this->assertInstanceOf(StreamInterface::class, $stream);
+        self::assertInstanceOf(StreamInterface::class, $stream);
 
         $body = '';
         while (!$stream->eof()) {
             $body .= $stream->read(64);
         }
-        $this->assertEquals(1000, strlen($body));
+        self::assertEquals(1000, strlen($body));
 
         $this->logStep('Get object');
         require_once $this->sampleFile($replacements, 'objects/get.php');
@@ -182,7 +182,7 @@ public function objects()
         $this->logStep('Getting metadata');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'objects/get_metadata.php');
-        $this->assertEquals([
+        self::assertEquals([
             'Foo' => $replacements['{val_1}'],
             'Bar' => $replacements['{val_2}'],
         ], $metadata);
@@ -195,7 +195,7 @@ public function objects()
         require_once $this->sampleFile($replacements, 'objects/reset_metadata.php');
         /** @var array $metadata */
         require_once $this->sampleFile($replacements, 'objects/get_metadata.php');
-        $this->assertEquals([
+        self::assertEquals([
             'Foo1' => $replacements['{val_1}'],
             'Bar1' => $replacements['{val_2}'],
         ], $metadata);
diff --git a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
index b8bcee41..fa799587 100644
--- a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
+++ b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
@@ -27,9 +27,9 @@ public function test_it_retrieves()
         $this->setupMock('GET', 'os-quota-sets/tenant-foo', [], [], 'GET_quota_set');
 
         $this->quotaSet->retrieve();
-        $this->assertEquals(1, $this->quotaSet->gigabytes);
-        $this->assertEquals(2, $this->quotaSet->snapshots);
-        $this->assertEquals(3, $this->quotaSet->volumes);
+        self::assertEquals(1, $this->quotaSet->gigabytes);
+        self::assertEquals(2, $this->quotaSet->snapshots);
+        self::assertEquals(3, $this->quotaSet->volumes);
     }
 
     public function test_it_updates()
diff --git a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
index 84b5b733..d435259a 100644
--- a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
+++ b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
@@ -49,7 +49,7 @@ public function test_it_gets_metadata()
             'bar' => '2',
         ];
 
-        $this->assertEquals($expected, $this->snapshot->getMetadata());
+        self::assertEquals($expected, $this->snapshot->getMetadata());
     }
 
     public function test_it_retrieves()
diff --git a/tests/unit/BlockStorage/v2/Models/VolumeTest.php b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
index a8976551..dadeddae 100644
--- a/tests/unit/BlockStorage/v2/Models/VolumeTest.php
+++ b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
@@ -49,20 +49,20 @@ public function test_it_retrieves()
         $volumeImageMetadata = $this->volume->volumeImageMetadata;
 
         self::assertIsArray($volumeImageMetadata);
-        $this->assertEquals($volumeImageMetadata['os_distro'], 'ubuntu');
-        $this->assertEquals($volumeImageMetadata['os_version'], 'xenial');
-        $this->assertEquals($volumeImageMetadata['hypervisor_type'], 'qemu');
-        $this->assertEquals($volumeImageMetadata['os_variant'], 'ubuntu');
-        $this->assertEquals($volumeImageMetadata['disk_format'], 'qcow2');
-        $this->assertEquals($volumeImageMetadata['image_name'], 'Some Image Name x86_64');
-        $this->assertEquals($volumeImageMetadata['image_id'], '54986297-8364-4baa-8435-812add437507');
-        $this->assertEquals($volumeImageMetadata['architecture'], 'x86_64');
-        $this->assertEquals($volumeImageMetadata['container_format'], 'bare');
-        $this->assertEquals($volumeImageMetadata['min_disk'], '40');
-        $this->assertEquals($volumeImageMetadata['os_type'], 'linux');
-        $this->assertEquals($volumeImageMetadata['checksum'], 'bb3055b274fe72bc3406ffe9febe9fff');
-        $this->assertEquals($volumeImageMetadata['min_ram'], '0');
-        $this->assertEquals($volumeImageMetadata['size'], '6508557824');
+        self::assertEquals($volumeImageMetadata['os_distro'], 'ubuntu');
+        self::assertEquals($volumeImageMetadata['os_version'], 'xenial');
+        self::assertEquals($volumeImageMetadata['hypervisor_type'], 'qemu');
+        self::assertEquals($volumeImageMetadata['os_variant'], 'ubuntu');
+        self::assertEquals($volumeImageMetadata['disk_format'], 'qcow2');
+        self::assertEquals($volumeImageMetadata['image_name'], 'Some Image Name x86_64');
+        self::assertEquals($volumeImageMetadata['image_id'], '54986297-8364-4baa-8435-812add437507');
+        self::assertEquals($volumeImageMetadata['architecture'], 'x86_64');
+        self::assertEquals($volumeImageMetadata['container_format'], 'bare');
+        self::assertEquals($volumeImageMetadata['min_disk'], '40');
+        self::assertEquals($volumeImageMetadata['os_type'], 'linux');
+        self::assertEquals($volumeImageMetadata['checksum'], 'bb3055b274fe72bc3406ffe9febe9fff');
+        self::assertEquals($volumeImageMetadata['min_ram'], '0');
+        self::assertEquals($volumeImageMetadata['size'], '6508557824');
     }
 
     public function test_it_merges_metadata()
diff --git a/tests/unit/BlockStorage/v2/ServiceTest.php b/tests/unit/BlockStorage/v2/ServiceTest.php
index d6a0fbce..ce1dbe46 100644
--- a/tests/unit/BlockStorage/v2/ServiceTest.php
+++ b/tests/unit/BlockStorage/v2/ServiceTest.php
@@ -61,7 +61,7 @@ public function test_it_creates_volumes()
 
         $this->setupMock('POST', 'volumes', $expectedJson, [], 'GET_volume');
 
-        $this->assertInstanceOf(Volume::class, $this->service->createVolume($opts));
+        self::assertInstanceOf(Volume::class, $this->service->createVolume($opts));
     }
 
     public function test_it_lists_volumes()
@@ -80,18 +80,18 @@ public function test_it_lists_volumes()
 
         foreach ($this->service->listVolumes(false) as $volume) {
             $count++;
-            $this->assertInstanceOf(Volume::class, $volume);
+            self::assertInstanceOf(Volume::class, $volume);
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     public function test_it_gets_a_volume()
     {
         $volume = $this->service->getVolume('volumeId');
 
-        $this->assertInstanceOf(Volume::class, $volume);
-        $this->assertEquals('volumeId', $volume->id);
+        self::assertInstanceOf(Volume::class, $volume);
+        self::assertEquals('volumeId', $volume->id);
     }
 
     public function test_it_creates_volume_types()
@@ -102,7 +102,7 @@ public function test_it_creates_volume_types()
 
         $this->setupMock('POST', 'types', $expectedJson, [], 'GET_type');
 
-        $this->assertInstanceOf(VolumeType::class, $this->service->createVolumeType($opts));
+        self::assertInstanceOf(VolumeType::class, $this->service->createVolumeType($opts));
     }
 
     public function test_it_lists_volume_types()
@@ -116,18 +116,18 @@ public function test_it_lists_volume_types()
 
         foreach ($this->service->listVolumeTypes() as $type) {
             $count++;
-            $this->assertInstanceOf(VolumeType::class, $type);
+            self::assertInstanceOf(VolumeType::class, $type);
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     public function test_it_gets_a_volume_type()
     {
         $type = $this->service->getVolumeType('id');
 
-        $this->assertInstanceOf(VolumeType::class, $type);
-        $this->assertEquals('id', $type->id);
+        self::assertInstanceOf(VolumeType::class, $type);
+        self::assertEquals('id', $type->id);
     }
 
     public function test_it_creates_snapshots()
@@ -148,7 +148,7 @@ public function test_it_creates_snapshots()
 
         $this->setupMock('POST', 'snapshots', $expectedJson, [], 'GET_snapshot');
 
-        $this->assertInstanceOf(Snapshot::class, $this->service->createSnapshot($opts));
+        self::assertInstanceOf(Snapshot::class, $this->service->createSnapshot($opts));
     }
 
     public function test_it_lists_snapshots()
@@ -167,18 +167,18 @@ public function test_it_lists_snapshots()
 
         foreach ($this->service->listSnapshots(false) as $snapshot) {
             $count++;
-            $this->assertInstanceOf(Snapshot::class, $snapshot);
+            self::assertInstanceOf(Snapshot::class, $snapshot);
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     public function test_it_gets_a_snapshot()
     {
         $snapshot = $this->service->getSnapshot('snapshotId');
 
-        $this->assertInstanceOf(Snapshot::class, $snapshot);
-        $this->assertEquals('snapshotId', $snapshot->id);
+        self::assertInstanceOf(Snapshot::class, $snapshot);
+        self::assertEquals('snapshotId', $snapshot->id);
     }
 
     public function test_it_gets_quota_set()
@@ -190,9 +190,9 @@ public function test_it_gets_quota_set()
 
         $quotaSet = $this->service->getQuotaSet('tenant-id-1234');
 
-        $this->assertInstanceOf(QuotaSet::class, $quotaSet);
-        $this->assertEquals(1, $quotaSet->gigabytes);
-        $this->assertEquals(2, $quotaSet->snapshots);
-        $this->assertEquals(3, $quotaSet->volumes);
+        self::assertInstanceOf(QuotaSet::class, $quotaSet);
+        self::assertEquals(1, $quotaSet->gigabytes);
+        self::assertEquals(2, $quotaSet->snapshots);
+        self::assertEquals(3, $quotaSet->volumes);
     }
 }
diff --git a/tests/unit/Common/Api/OperationTest.php b/tests/unit/Common/Api/OperationTest.php
index d5382d89..41fcb8d4 100644
--- a/tests/unit/Common/Api/OperationTest.php
+++ b/tests/unit/Common/Api/OperationTest.php
@@ -19,18 +19,18 @@ public function setUp(): void
 
     public function test_it_reveals_whether_params_are_set_or_not()
     {
-        $this->assertFalse($this->operation->hasParam('foo'));
-        $this->assertTrue($this->operation->hasParam('name'));
+        self::assertFalse($this->operation->hasParam('foo'));
+        self::assertTrue($this->operation->hasParam('name'));
     }
 
     public function test_it_gets_params()
     {
-        $this->assertInstanceOf(Parameter::class, $this->operation->getParam('name'));
+        self::assertInstanceOf(Parameter::class, $this->operation->getParam('name'));
     }
 
     public function test_it_validates_params()
     {
-        $this->assertTrue($this->operation->validate([
+        self::assertTrue($this->operation->validate([
             'name'     => 'foo',
             'imageId'  => 'bar',
             'flavorId' => 'baz',
@@ -40,7 +40,7 @@ public function test_it_validates_params()
     public function test_exceptions_are_propagated()
     {
 		$this->expectException(\Exception::class);
-        $this->assertFalse($this->operation->validate([
+        self::assertFalse($this->operation->validate([
             'name'     => true,
             'imageId'  => 'bar',
             'flavorId' => 'baz',
@@ -63,6 +63,6 @@ public function test_it_throws_exception_when_user_provides_undefined_options()
 
     public function test_it_gets_json_key()
     {
-        $this->assertEquals('server', $this->operation->getJsonKey());
+        self::assertEquals('server', $this->operation->getJsonKey());
     }
 }
diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
index 8a905382..6bad6b18 100644
--- a/tests/unit/Common/Api/OperatorTraitTest.php
+++ b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -37,7 +37,7 @@ public function setUp(): void
 
     public function test_it_returns_operations()
     {
-        $this->assertInstanceOf(
+        self::assertInstanceOf(
             Operation::class,
             $this->operator->getOperation($this->def, [])
         );
@@ -65,10 +65,10 @@ public function test_it_wraps_sequential_ops_in_promise_when_async_is_appended_t
     {
         $promise = $this->operator->createAsync('something');
 
-        $this->assertInstanceOf(Promise::class, $promise);
+        self::assertInstanceOf(Promise::class, $promise);
 
         $promise->then(function ($val) {
-            $this->assertEquals('Created something', $val);
+            self::assertEquals('Created something', $val);
         });
 
         $promise->wait();
@@ -88,18 +88,18 @@ public function test_undefined_methods_result_in_error()
 
     public function test_it_returns_a_model_instance()
     {
-        $this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class));
+        self::assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class));
     }
 
     public function test_it_populates_models_from_response()
     {
-        $this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class, new Response(200)));
+        self::assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class, new Response(200)));
     }
 
     public function test_it_populates_models_from_arrays()
     {
         $data = ['flavor' => [], 'image' => []];
-        $this->assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class, $data));
+        self::assertInstanceOf(ResourceInterface::class, $this->operator->model(TestResource::class, $data));
     }
 
     public function test_guzzle_options_are_forwarded()
diff --git a/tests/unit/Common/Api/ParameterTest.php b/tests/unit/Common/Api/ParameterTest.php
index 858f4ee7..1f0d89c1 100644
--- a/tests/unit/Common/Api/ParameterTest.php
+++ b/tests/unit/Common/Api/ParameterTest.php
@@ -29,7 +29,7 @@ public function test_exception_is_thrown_for_invalid_locations()
 
     public function test_it_should_provide_access_to_a_name()
     {
-        $this->assertEquals($this->data['name'], $this->param->getName());
+        self::assertEquals($this->data['name'], $this->param->getName());
     }
 
     public function test_it_should_use_sentAs_alias_for_name_if_one_is_set()
@@ -37,12 +37,12 @@ public function test_it_should_use_sentAs_alias_for_name_if_one_is_set()
         $data = $this->data + ['sentAs' => 'foo'];
         $param = new Parameter($data);
 
-        $this->assertEquals($data['sentAs'], $param->getName());
+        self::assertEquals($data['sentAs'], $param->getName());
     }
 
     public function test_it_indicates_whether_it_is_required_or_not()
     {
-        $this->assertTrue($this->param->isRequired());
+        self::assertTrue($this->param->isRequired());
     }
 
     public function test_it_indicates_its_item_schema()
@@ -50,7 +50,7 @@ public function test_it_indicates_its_item_schema()
         $data = $this->api->postServer()['params']['networks'] + ['name' => 'networks'];
         $param = new Parameter($data);
 
-        $this->assertInstanceOf(Parameter::class, $param->getItemSchema());
+        self::assertInstanceOf(Parameter::class, $param->getItemSchema());
     }
 
     public function test_it_allows_property_retrieval()
@@ -58,7 +58,7 @@ public function test_it_allows_property_retrieval()
         $definition = $this->api->postServer()['params']['networks']['items'] + ['name' => 'network'];
         $param = new Parameter($definition);
 
-        $this->assertInstanceOf(Parameter::class, $param->getProperty('uuid'));
+        self::assertInstanceOf(Parameter::class, $param->getProperty('uuid'));
     }
 
     public function test_it_indicates_its_path()
@@ -66,18 +66,18 @@ public function test_it_indicates_its_path()
         $path = 'foo.bar.baz';
         $param = new Parameter($this->data + ['path' => $path]);
 
-        $this->assertEquals($path, $param->getPath());
+        self::assertEquals($path, $param->getPath());
     }
 
     public function test_it_verifies_a_given_location_with_a_boolean()
     {
-        $this->assertFalse($this->param->hasLocation('foo'));
-        $this->assertTrue($this->param->hasLocation('json'));
+        self::assertFalse($this->param->hasLocation('foo'));
+        self::assertTrue($this->param->hasLocation('json'));
     }
 
     public function test_it_should_return_true_when_required_attributes_are_provided_and_match_their_definitions()
     {
-        $this->assertTrue($this->param->validate('TestName'));
+        self::assertTrue($this->param->validate('TestName'));
     }
 
     public function test_it_throws_exception_when_values_do_not_match_their_definition_types()
@@ -111,7 +111,7 @@ public function test_metadata_properties_are_handled_differently()
         $userValues = ['some' => 'value'];
 
         $param = new Parameter($params);
-        $this->assertTrue($param->validate($userValues));
+        self::assertTrue($param->validate($userValues));
     }
 
     public function test_it_passes_validation_when_array_values_pass()
@@ -125,7 +125,7 @@ public function test_it_passes_validation_when_array_values_pass()
         $userVals = ['1', '2', '3'];
 
         $param = new Parameter($params);
-        $this->assertTrue($param->validate($userVals));
+        self::assertTrue($param->validate($userVals));
     }
 
     public function test_an_exception_is_thrown_when_an_undefined_property_is_provided()
@@ -144,13 +144,13 @@ public function test_it_passes_validation_when_all_subproperties_pass()
         $userVals = ['foo' => 'baz'];
 
         $param = new Parameter($params);
-        $this->assertTrue($param->validate($userVals));
+        self::assertTrue($param->validate($userVals));
     }
 
     public function test_it_sets_name()
     {
         $this->param->setName('foo');
-        $this->assertEquals($this->param->getName(), 'foo');
+        self::assertEquals($this->param->getName(), 'foo');
     }
 
     public function test_it_gets_property()
@@ -165,8 +165,8 @@ public function test_it_gets_property()
 
         $prop = $property->getProperty('metadata');
 
-        $this->assertInstanceOf(Parameter::class, $prop);
-        $this->assertEquals('foo', $prop->getPrefix());
+        self::assertInstanceOf(Parameter::class, $prop);
+        self::assertEquals('foo', $prop->getPrefix());
     }
 
     public function test_it_gets_prefixed_name()
@@ -176,7 +176,7 @@ public function test_it_gets_prefixed_name()
             'prefix' => 'foo-',
         ]);
 
-        $this->assertEquals('foo-metadata', $property->getPrefixedName());
+        self::assertEquals('foo-metadata', $property->getPrefixedName());
     }
 
     public function test_exception_is_thrown_when_value_is_not_in_enum_list()
diff --git a/tests/unit/Common/ArrayAccessTraitTest.php b/tests/unit/Common/ArrayAccessTraitTest.php
index c13e2be7..c908e396 100644
--- a/tests/unit/Common/ArrayAccessTraitTest.php
+++ b/tests/unit/Common/ArrayAccessTraitTest.php
@@ -17,34 +17,34 @@ public function setUp(): void
     public function test_offset_is_set()
     {
         $this->aa->offsetSet('foo', 'bar');
-        $this->assertEquals(['foo' => 'bar'], $this->aa->getElements());
+        self::assertEquals(['foo' => 'bar'], $this->aa->getElements());
     }
 
     public function test_it_appends_if_no_key_is_set()
     {
         $this->aa->offsetSet(null, 'bar');
-        $this->assertEquals(['bar'], $this->aa->getElements());
+        self::assertEquals(['bar'], $this->aa->getElements());
     }
 
     public function test_if_checks_if_offset_exists()
     {
         $this->aa->offsetSet('bar', 'foo');
-        $this->assertTrue($this->aa->offsetExists('bar'));
-        $this->assertFalse($this->aa->offsetExists('baz'));
+        self::assertTrue($this->aa->offsetExists('bar'));
+        self::assertFalse($this->aa->offsetExists('baz'));
     }
 
     public function test_if_gets_offset()
     {
         $this->aa->offsetSet('bar', 'foo');
-        $this->assertEquals('foo', $this->aa->offsetGet('bar'));
-        $this->assertNull($this->aa->offsetGet('baz'));
+        self::assertEquals('foo', $this->aa->offsetGet('bar'));
+        self::assertNull($this->aa->offsetGet('baz'));
     }
 
     public function test_it_unsets_offset()
     {
         $this->aa->offsetSet('bar', 'foo');
         $this->aa->offsetUnset('bar');
-        $this->assertNull($this->aa->offsetGet('bar'));
+        self::assertNull($this->aa->offsetGet('bar'));
     }
 }
 
diff --git a/tests/unit/Common/Auth/AuthHandlerTest.php b/tests/unit/Common/Auth/AuthHandlerTest.php
index c54f7548..6a535489 100644
--- a/tests/unit/Common/Auth/AuthHandlerTest.php
+++ b/tests/unit/Common/Auth/AuthHandlerTest.php
@@ -35,7 +35,7 @@ public function test_it_should_bypass_auth_http_requests()
         // Fake a Keystone request
         $request = new Request('POST', 'https://my-openstack.org:5000/v2.0/tokens');
 
-        $this->assertEquals($request, call_user_func_array($this->handler, [$request, []]));
+        self::assertEquals($request, call_user_func_array($this->handler, [$request, []]));
     }
 
     public function test_it_should_generate_a_new_token_if_the_current_token_is_either_expired_or_not_set()
diff --git a/tests/unit/Common/Error/BadResponseErrorTest.php b/tests/unit/Common/Error/BadResponseErrorTest.php
index b051f875..ae33ab9b 100644
--- a/tests/unit/Common/Error/BadResponseErrorTest.php
+++ b/tests/unit/Common/Error/BadResponseErrorTest.php
@@ -21,7 +21,7 @@ public function test_it_gets_request()
         $r = new Request('GET', '');
 
         $this->e->setRequest($r);
-        $this->assertEquals($this->e->getRequest(), $r);
+        self::assertEquals($this->e->getRequest(), $r);
     }
 
     public function test_it_gets_response()
@@ -29,6 +29,6 @@ public function test_it_gets_response()
         $r = new Response(500);
 
         $this->e->setResponse($r);
-        $this->assertEquals($this->e->getResponse(), $r);
+        self::assertEquals($this->e->getResponse(), $r);
     }
 }
diff --git a/tests/unit/Common/Error/BuilderTest.php b/tests/unit/Common/Error/BuilderTest.php
index 45443038..6d84d60e 100644
--- a/tests/unit/Common/Error/BuilderTest.php
+++ b/tests/unit/Common/Error/BuilderTest.php
@@ -26,7 +26,7 @@ public function setUp(): void
 
     public function test_it_injects_client()
     {
-        $this->assertInstanceOf(Builder::class, new Builder($this->client->reveal()));
+        self::assertInstanceOf(Builder::class, new Builder($this->client->reveal()));
     }
 
     public function test_it_builds_http_errors()
@@ -59,7 +59,7 @@ public function test_it_builds_http_errors()
         $e->setRequest($request);
         $e->setResponse($response);
 
-        $this->assertEquals($e, $this->builder->httpError($request, $response));
+        self::assertEquals($e, $this->builder->httpError($request, $response));
     }
 
     public function test_it_builds_user_input_errors()
@@ -88,7 +88,7 @@ public function test_it_builds_user_input_errors()
 
         $e = new UserInputError($errorMessage);
 
-        $this->assertEquals($e, $this->builder->userInputError($expected, $value, 'index.html'));
+        self::assertEquals($e, $this->builder->userInputError($expected, $value, 'index.html'));
     }
 
     public function test_dead_links_are_ignored()
@@ -116,6 +116,6 @@ public function test_dead_links_are_ignored()
 
         $e = new UserInputError($errorMessage);
 
-        $this->assertEquals($e, $this->builder->userInputError($expected, $value, 'sdffsda'));
+        self::assertEquals($e, $this->builder->userInputError($expected, $value, 'sdffsda'));
     }
 }
diff --git a/tests/unit/Common/HydratorStrategyTraitTest.php b/tests/unit/Common/HydratorStrategyTraitTest.php
index 606ec318..0bdca85e 100644
--- a/tests/unit/Common/HydratorStrategyTraitTest.php
+++ b/tests/unit/Common/HydratorStrategyTraitTest.php
@@ -21,16 +21,16 @@ public function test_it_hydrates()
 
         $this->fixture->hydrate($data);
 
-        $this->assertEquals(1, $this->fixture->foo);
-        $this->assertEquals(2, $this->fixture->getBar());
-        $this->assertEquals(3, $this->fixture->getBaz());
+        self::assertEquals(1, $this->fixture->foo);
+        self::assertEquals(2, $this->fixture->getBar());
+        self::assertEquals(3, $this->fixture->getBaz());
     }
 
     public function test_it_hydrates_aliases()
     {
         $this->fixture->hydrate(['FOO!' => 1], ['FOO!' => 'foo']);
 
-        $this->assertEquals(1, $this->fixture->foo);
+        self::assertEquals(1, $this->fixture->foo);
     }
 
     public function test_it_sets()
@@ -38,7 +38,7 @@ public function test_it_sets()
         $data = ['foo1' => 1];
 
         $this->fixture->set('foo1', 'foo', $data);
-        $this->assertEquals(1, $this->fixture->foo);
+        self::assertEquals(1, $this->fixture->foo);
     }
 }
 
diff --git a/tests/unit/Common/JsonPathTest.php b/tests/unit/Common/JsonPathTest.php
index ed68d084..2c8a5e81 100644
--- a/tests/unit/Common/JsonPathTest.php
+++ b/tests/unit/Common/JsonPathTest.php
@@ -25,7 +25,7 @@ public function test_it_sets_values_according_to_paths()
             ]
         ];
 
-        $this->assertEquals($expected, $this->jsonPath->getStructure());
+        self::assertEquals($expected, $this->jsonPath->getStructure());
     }
 
     public function test_it_sets_arrays_according_to_paths()
@@ -49,7 +49,7 @@ public function test_it_sets_arrays_according_to_paths()
             ]
         ];
 
-        $this->assertEquals($expected, $jsonPath->getStructure());
+        self::assertEquals($expected, $jsonPath->getStructure());
     }
 
     public function test_it_gets_values_according_to_paths()
@@ -63,8 +63,8 @@ public function test_it_gets_values_according_to_paths()
             ]
         ]);
 
-        $this->assertEquals('VALUE_1', $jsonPath->get('foo.bar.baz'));
-        $this->assertEquals('VALUE_2', $jsonPath->get('foo.bar.lol'));
-        $this->assertNull($jsonPath->get('foo.bar.boo'));
+        self::assertEquals('VALUE_1', $jsonPath->get('foo.bar.baz'));
+        self::assertEquals('VALUE_2', $jsonPath->get('foo.bar.lol'));
+        self::assertNull($jsonPath->get('foo.bar.boo'));
     }
 }
diff --git a/tests/unit/Common/JsonSchema/JsonPatchTest.php b/tests/unit/Common/JsonSchema/JsonPatchTest.php
index 13bbcffc..77ab25c9 100644
--- a/tests/unit/Common/JsonSchema/JsonPatchTest.php
+++ b/tests/unit/Common/JsonSchema/JsonPatchTest.php
@@ -18,7 +18,7 @@ public function testAll()
 
             $actual = JsonPatch::diff($fixture->doc, $fixture->expected);
 
-            $this->assertEquals(
+            self::assertEquals(
                 json_encode($fixture->patch, JSON_UNESCAPED_SLASHES),
                 json_encode($actual, JSON_UNESCAPED_SLASHES),
                 isset($fixture->comment) ? sprintf("Failed asserting test: %s\n", $fixture->comment) : ''
diff --git a/tests/unit/Common/JsonSchema/SchemaTest.php b/tests/unit/Common/JsonSchema/SchemaTest.php
index 6d7ca42a..9f7e4e44 100644
--- a/tests/unit/Common/JsonSchema/SchemaTest.php
+++ b/tests/unit/Common/JsonSchema/SchemaTest.php
@@ -35,7 +35,7 @@ public function test_it_gets_errors()
             ->shouldBeCalled()
             ->willReturn([]);
 
-        $this->assertEquals([], $this->schema->getErrors());
+        self::assertEquals([], $this->schema->getErrors());
     }
 
     public function test_it_gets_error_string()
@@ -46,12 +46,12 @@ public function test_it_gets_error_string()
 
         $errorMsg = sprintf("Provided values do not validate. Errors:\n[foo] bar\n");
 
-        $this->assertEquals($errorMsg, $this->schema->getErrorString());
+        self::assertEquals($errorMsg, $this->schema->getErrorString());
     }
 
     public function test_it_gets_property_paths()
     {
-        $this->assertEquals(['/foo', '/bar', '/baz'], $this->schema->getPropertyPaths());
+        self::assertEquals(['/foo', '/bar', '/baz'], $this->schema->getPropertyPaths());
     }
 
     public function test_it_ignores_readOnly_attrs()
@@ -67,7 +67,7 @@ public function test_it_ignores_readOnly_attrs()
             'baz' => true,
         ];
 
-        $this->assertEquals((object)$expected, $this->schema->normalizeObject((object)$subject, []));
+        self::assertEquals((object)$expected, $this->schema->normalizeObject((object)$subject, []));
     }
 
     public function test_it_stocks_aliases()
@@ -83,7 +83,7 @@ public function test_it_stocks_aliases()
             'bar' => false,
         ];
 
-        $this->assertEquals($expected, $this->schema->normalizeObject($subject, ['foo' => 'fooAlias', 'bar' => 'lol']));
+        self::assertEquals($expected, $this->schema->normalizeObject($subject, ['foo' => 'fooAlias', 'bar' => 'lol']));
     }
 
     public function test_it_validates()
diff --git a/tests/unit/Common/Resource/AbstractResourceTest.php b/tests/unit/Common/Resource/AbstractResourceTest.php
index 238899d1..e48a6d7e 100644
--- a/tests/unit/Common/Resource/AbstractResourceTest.php
+++ b/tests/unit/Common/Resource/AbstractResourceTest.php
@@ -31,7 +31,7 @@ public function test_it_populates_from_response()
 
         $this->resource->populateFromResponse($response);
 
-        $this->assertEquals('1', $this->resource->bar);
+        self::assertEquals('1', $this->resource->bar);
     }
 
     public function test_it_populates_datetimes_from_arrays()
@@ -42,8 +42,8 @@ public function test_it_populates_datetimes_from_arrays()
         $this->resource->populateFromArray(['created_at' => '2015']);
         $this->resource->populateFromArray(['updated_at' => '2016']);
 
-        $this->assertEquals($this->resource->createdAt, $ca);
-        $this->assertEquals($this->resource->updatedAt, $ua);
+        self::assertEquals($this->resource->createdAt, $ca);
+        self::assertEquals($this->resource->updatedAt, $ua);
     }
 
     public function test_it_populates_model_objects_from_arrays()
@@ -51,31 +51,31 @@ public function test_it_populates_model_objects_from_arrays()
         $tr = new TestResource();
         $this->resource->populateFromArray(['child' => $tr]);
 
-        $this->assertEquals($this->resource->child, $tr);
+        self::assertEquals($this->resource->child, $tr);
     }
 
     public function test_it_populates_arrays_from_arrays()
     {
         $this->resource->populateFromArray(['children' => [$this->resource, $this->resource]]);
 
-        $this->assertInstanceOf(TestResource::class, $this->resource->children[0]);
+        self::assertInstanceOf(TestResource::class, $this->resource->children[0]);
     }
 
     public function test_it_gets_attrs()
     {
         $this->resource->bar = 'foo';
 
-        $this->assertEquals(['bar' => 'foo'], $this->resource->getAttrs(['bar']));
+        self::assertEquals(['bar' => 'foo'], $this->resource->getAttrs(['bar']));
     }
 
     public function test_it_returns_a_model_instance()
     {
-        $this->assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class));
+        self::assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class));
     }
 
     public function test_it_populates_models_from_response()
     {
-        $this->assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class, new Response(200)));
+        self::assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class, new Response(200)));
     }
 
     public function test_it_populates_models_from_arrays()
@@ -93,22 +93,22 @@ public function test_it_populates_models_from_arrays()
         /** @var TestResource $model */
         $model = $this->resource->model(TestResource::class, $data);
 
-        $this->assertInstanceOf(ResourceInterface::class, $model);
+        self::assertInstanceOf(ResourceInterface::class, $model);
 
-        $this->assertEquals('this-is-bar', $model->bar);
-        $this->assertEquals('this-is-camel-attr', $model->camelAttr);
+        self::assertEquals('this-is-bar', $model->bar);
+        self::assertEquals('this-is-camel-attr', $model->camelAttr);
 
         $child = $model->child;
-        $this->assertInstanceOf(TestResource::class, $child);
-        $this->assertEquals('child-bar', $child->bar);
-        $this->assertEquals('child-camel', $child->camelAttr);
-
-        $this->assertContainsOnlyInstancesOf(TestResource::class, $model->children);
-        $this->assertCount(2, $model->children);
-        $this->assertEquals('child1-bar', $model->children[0]->bar);
-        $this->assertEquals('child1-camel', $model->children[0]->camelAttr);
-        $this->assertEquals('child2-bar', $model->children[1]->bar);
-        $this->assertEquals('child2-camel', $model->children[1]->camelAttr);
+        self::assertInstanceOf(TestResource::class, $child);
+        self::assertEquals('child-bar', $child->bar);
+        self::assertEquals('child-camel', $child->camelAttr);
+
+        self::assertContainsOnlyInstancesOf(TestResource::class, $model->children);
+        self::assertCount(2, $model->children);
+        self::assertEquals('child1-bar', $model->children[0]->bar);
+        self::assertEquals('child1-camel', $model->children[0]->camelAttr);
+        self::assertEquals('child2-bar', $model->children[1]->bar);
+        self::assertEquals('child2-camel', $model->children[1]->camelAttr);
 
     }
 }
diff --git a/tests/unit/Common/Resource/OperatorResourceTest.php b/tests/unit/Common/Resource/OperatorResourceTest.php
index 72367af7..3ebcb076 100644
--- a/tests/unit/Common/Resource/OperatorResourceTest.php
+++ b/tests/unit/Common/Resource/OperatorResourceTest.php
@@ -33,8 +33,8 @@ public function test_it_retrieves_base_http_url()
 
         $uri = $this->resource->testBaseUri();
 
-        $this->assertInstanceOf(Uri::class, $uri);
-        $this->assertEquals($returnedUri, $uri);
+        self::assertInstanceOf(Uri::class, $uri);
+        self::assertEquals($returnedUri, $uri);
     }
 
     public function test_it_executes_with_state()
@@ -67,10 +67,10 @@ public function test_it_executes_operations_until_a_204_is_received()
 
         foreach ($this->resource->enumerate($api->getServers()) as $item) {
             ++$count;
-            $this->assertInstanceOf(TestOperatorResource::class, $item);
+            self::assertInstanceOf(TestOperatorResource::class, $item);
         }
 
-        $this->assertEquals(5, $count);
+        self::assertEquals(5, $count);
     }
 
     public function test_it_invokes_function_if_provided()
@@ -96,7 +96,7 @@ public function test_it_invokes_function_if_provided()
         foreach ($this->resource->enumerate($api->getServers(), [], $fn) as $item) {
         }
 
-        $this->assertEquals(5, $count);
+        self::assertEquals(5, $count);
     }
 
     public function test_it_halts_when_user_provided_limit_is_reached()
@@ -114,7 +114,7 @@ public function test_it_halts_when_user_provided_limit_is_reached()
             ++$count;
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     public function test_it_predicts_resources_key_without_explicit_property()
@@ -133,7 +133,7 @@ public function test_it_predicts_resources_key_without_explicit_property()
             ++$count;
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     public function test_it_extracts_multiple_instances()
@@ -144,24 +144,24 @@ public function test_it_extracts_multiple_instances()
         $resources = $resource->extractMultipleInstances($response);
 
         foreach ($resources as $resource) {
-            $this->assertInstanceOf(Server::class, $resource);
+            self::assertInstanceOf(Server::class, $resource);
         }
     }
 
     public function test_it_finds_parent_service()
     {
         $r = new Foo($this->client->reveal(), new Api());
-        $this->assertInstanceOf(Service::class, $r->testGetService());
+        self::assertInstanceOf(Service::class, $r->testGetService());
     }
 
     public function test_it_returns_a_model_instance()
     {
-        $this->assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class));
+        self::assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class));
     }
 
     public function test_it_populates_models_from_response()
     {
-        $this->assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class, new Response(200)));
+        self::assertInstanceOf(ResourceInterface::class, $this->resource->model(TestResource::class, new Response(200)));
     }
 
     public function test_it_populates_models_from_arrays()
@@ -174,9 +174,9 @@ public function test_it_populates_models_from_arrays()
         /** @var TestOperatorResource $model */
         $model = $this->resource->model(TestOperatorResource::class, $data);
 
-        $this->assertInstanceOf(ResourceInterface::class, $model);
-        $this->assertEquals(123, $model->id);
-        $this->assertEquals('this-is-bar', $model->bar);
+        self::assertInstanceOf(ResourceInterface::class, $model);
+        self::assertEquals(123, $model->id);
+        self::assertEquals('this-is-bar', $model->bar);
     }
 }
 
diff --git a/tests/unit/Common/Service/BuilderTest.php b/tests/unit/Common/Service/BuilderTest.php
index 0899de94..2a92c3fd 100644
--- a/tests/unit/Common/Service/BuilderTest.php
+++ b/tests/unit/Common/Service/BuilderTest.php
@@ -92,7 +92,7 @@ public function test_it_creates_service()
             'identityService' => $is->reveal(),
         ]);
 
-        $this->assertInstanceOf(Fixtures\Service::class, $s);
+        self::assertInstanceOf(Fixtures\Service::class, $s);
     }
 
     public function test_it_does_not_authenticate_for_identity_services()
@@ -104,7 +104,7 @@ public function test_it_does_not_authenticate_for_identity_services()
             'identityService' => $is->reveal(),
         ]);
 
-        $this->assertInstanceOf(Fixtures\Identity\Service::class, $s);
+        self::assertInstanceOf(Fixtures\Identity\Service::class, $s);
     }
 
     public function test_it_create_service_with_micro_version()
@@ -117,7 +117,7 @@ public function test_it_create_service_with_micro_version()
                 'microVersion' => '1.2.3'
             ]);
 
-        $this->assertInstanceOf(Fixtures\Service::class, $s);
+        self::assertInstanceOf(Fixtures\Service::class, $s);
 
         $refClass = new \ReflectionClass($s);
         $refProperty = $refClass->getProperty('client');
@@ -127,8 +127,8 @@ public function test_it_create_service_with_micro_version()
         $client = $refProperty->getValue($s);
 
         $headers = $client->getConfig()['headers'];
-        $this->assertArrayHasKey('OpenStack-API-Version', $headers);
-        $this->assertEquals('7 1.2.3', $headers['OpenStack-API-Version']);
+        self::assertArrayHasKey('OpenStack-API-Version', $headers);
+        self::assertEquals('7 1.2.3', $headers['OpenStack-API-Version']);
     }
 }
 
diff --git a/tests/unit/Common/Transport/HandlerStackTest.php b/tests/unit/Common/Transport/HandlerStackTest.php
index 0cc03c48..12696bdf 100644
--- a/tests/unit/Common/Transport/HandlerStackTest.php
+++ b/tests/unit/Common/Transport/HandlerStackTest.php
@@ -10,6 +10,6 @@ class HandlerStackTest extends TestCase
 {
     public function test_it_is_created()
     {
-        $this->assertInstanceOf(HandlerStack::class, HandlerStack::create(new MockHandler()));
+        self::assertInstanceOf(HandlerStack::class, HandlerStack::create(new MockHandler()));
     }
 }
diff --git a/tests/unit/Common/Transport/JsonSerializerTest.php b/tests/unit/Common/Transport/JsonSerializerTest.php
index 8f835a73..cdf93d48 100644
--- a/tests/unit/Common/Transport/JsonSerializerTest.php
+++ b/tests/unit/Common/Transport/JsonSerializerTest.php
@@ -38,7 +38,7 @@ public function test_it_embeds_params_according_to_path()
 
         $actual = $this->serializer->stockJson($param->reveal(), $userValue, []);
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_serializes_arrays()
@@ -62,7 +62,7 @@ public function test_it_serializes_arrays()
 
         $actual = $this->serializer->stockJson($param->reveal(), $userValues, []);
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_serializes_objects()
@@ -84,7 +84,7 @@ public function test_it_serializes_objects()
 
         $json = $this->serializer->stockJson($param->reveal(), (object)['foo' => true], []);
 
-        $this->assertEquals($expected, $json);
+        self::assertEquals($expected, $json);
     }
 
     public function test_it_serializes_non_stdClass_objects()
@@ -142,7 +142,7 @@ public function test_it_serializes_non_stdClass_objects()
             ],
         ];
 
-        $this->assertEquals($expected, $json);
+        self::assertEquals($expected, $json);
     }
 
     public function test_exception_is_thrown_when_non_stdClass_or_serializable_object_provided()
diff --git a/tests/unit/Common/Transport/MiddlewareTest.php b/tests/unit/Common/Transport/MiddlewareTest.php
index 96ab98dc..06e8da9e 100644
--- a/tests/unit/Common/Transport/MiddlewareTest.php
+++ b/tests/unit/Common/Transport/MiddlewareTest.php
@@ -20,7 +20,7 @@ public function test_exception_is_thrown_for_4xx_statuses()
         $fn = $middleware($handler);
 
         $promise = $fn(new Request('GET', 'http://foo.com'), []);
-        $this->assertEquals('pending', $promise->getState());
+        self::assertEquals('pending', $promise->getState());
 
 		$this->expectException(BadResponseError::class);
 		$promise->wait();
@@ -37,7 +37,7 @@ public function test_responses_are_left_alone_when_status_under_400()
         $promise = $fn(new Request('GET', 'http://foo.com'), []);
 
         $promise->then(function ($val) use ($response) {
-            $this->assertEquals($val, $response);
+            self::assertEquals($val, $response);
         });
 
         $promise->wait();
@@ -53,6 +53,6 @@ public function test_auth_handler_is_returned()
         $handler  = new MockHandler([new Response(204)]);
         $fn = $middleware($handler);
 
-        $this->assertInstanceOf(AuthHandler::class, $fn);
+        self::assertInstanceOf(AuthHandler::class, $fn);
     }
 }
diff --git a/tests/unit/Common/Transport/RequestSerializerTest.php b/tests/unit/Common/Transport/RequestSerializerTest.php
index d9d31b00..2c5181ef 100644
--- a/tests/unit/Common/Transport/RequestSerializerTest.php
+++ b/tests/unit/Common/Transport/RequestSerializerTest.php
@@ -25,7 +25,7 @@ public function test_it_ignores_undefined_params()
         $op = $this->prophesize(Operation::class);
         $op->getParam('foo')->shouldBeCalled()->willReturn(null);
 
-        $this->assertEquals(['headers' => []], $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar']));
+        self::assertEquals(['headers' => []], $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar']));
     }
 
     public function test_it_serializes_queries()
@@ -40,7 +40,7 @@ public function test_it_serializes_queries()
         $actual = $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar']);
         $expected = ['query' => ['fooAlias' => 'bar'], 'headers' => []];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_serializes_headers()
@@ -56,7 +56,7 @@ public function test_it_serializes_headers()
         $actual = $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar']);
         $expected = ['headers' => ['prefix-fooAlias' => 'bar']];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_serializes_metadata_headers()
@@ -76,7 +76,7 @@ public function test_it_serializes_metadata_headers()
         $actual = $this->rs->serializeOptions($op->reveal(), ['metadata' => ['foo' => 'bar']]);
         $expected = ['headers' => ['prefix-foo' => 'bar']];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_serializes_json()
@@ -93,7 +93,7 @@ public function test_it_serializes_json()
         $actual = $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar']);
         $expected = ['json' => ['jsonKey' => ['foo' => 'bar']], 'headers' => []];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_serializes_unescaped_json()
@@ -110,7 +110,7 @@ public function test_it_serializes_unescaped_json()
         $actual = $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar/baz']);
         $expected = ['body' => '{"foo":"bar/baz"}', 'headers' => ['Content-Type' => 'application/json']];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_serializes_raw_vals()
@@ -124,7 +124,7 @@ public function test_it_serializes_raw_vals()
         $actual = $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar']);
         $expected = ['body' => 'bar', 'headers' => []];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_does_serialize_unknown_locations()
@@ -138,6 +138,6 @@ public function test_it_does_serialize_unknown_locations()
         $actual = $this->rs->serializeOptions($op->reveal(), ['foo' => 'bar']);
         $expected = ['headers' => []];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 }
diff --git a/tests/unit/Common/Transport/UtilsTest.php b/tests/unit/Common/Transport/UtilsTest.php
index 2d797b9c..6d6c37c5 100644
--- a/tests/unit/Common/Transport/UtilsTest.php
+++ b/tests/unit/Common/Transport/UtilsTest.php
@@ -22,7 +22,7 @@ public function test_it_adds_paths()
     {
         $uri = Utils::addPaths(uri_for('http://openstack.org/foo'), 'bar', 'baz', '1', '2');
 
-        $this->assertInstanceOf(Uri::class, $uri);
-        $this->assertEquals(uri_for('http://openstack.org/foo/bar/baz/1/2'), $uri);
+        self::assertInstanceOf(Uri::class, $uri);
+        self::assertEquals(uri_for('http://openstack.org/foo/bar/baz/1/2'), $uri);
     }
 }
diff --git a/tests/unit/Compute/v2/Models/FlavorTest.php b/tests/unit/Compute/v2/Models/FlavorTest.php
index 63b26f4c..296c9b3a 100644
--- a/tests/unit/Compute/v2/Models/FlavorTest.php
+++ b/tests/unit/Compute/v2/Models/FlavorTest.php
@@ -27,11 +27,11 @@ public function test_it_retrieves_details()
 
         $this->flavor->retrieve();
 
-        $this->assertEquals('m1.tiny', $this->flavor->name);
-        $this->assertEquals('1', $this->flavor->id);
-        $this->assertEquals(512, $this->flavor->ram);
-        $this->assertEquals(1, $this->flavor->vcpus);
-        $this->assertEquals(1, $this->flavor->disk);
+        self::assertEquals('m1.tiny', $this->flavor->name);
+        self::assertEquals('1', $this->flavor->id);
+        self::assertEquals(512, $this->flavor->ram);
+        self::assertEquals(1, $this->flavor->vcpus);
+        self::assertEquals(1, $this->flavor->disk);
     }
 
     public function test_it_creates()
@@ -52,7 +52,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'flavors', $expectedJson, [], 'flavor-post');
 
-        $this->assertInstanceOf(Flavor::class, $this->flavor->create($opts));
+        self::assertInstanceOf(Flavor::class, $this->flavor->create($opts));
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Compute/v2/Models/HostTest.php b/tests/unit/Compute/v2/Models/HostTest.php
index c5ba3fcc..b8bfb7b6 100644
--- a/tests/unit/Compute/v2/Models/HostTest.php
+++ b/tests/unit/Compute/v2/Models/HostTest.php
@@ -28,6 +28,6 @@ public function test_it_retrieves()
 
         $this->host->retrieve();
 
-        $this->assertEquals("b6e4adbc193d428ea923899d07fb001e", $this->host->name);
+        self::assertEquals("b6e4adbc193d428ea923899d07fb001e", $this->host->name);
     }
 }
diff --git a/tests/unit/Compute/v2/Models/HypervisorTest.php b/tests/unit/Compute/v2/Models/HypervisorTest.php
index 38876ddd..454a0fc6 100644
--- a/tests/unit/Compute/v2/Models/HypervisorTest.php
+++ b/tests/unit/Compute/v2/Models/HypervisorTest.php
@@ -29,21 +29,21 @@ public function test_it_retrieves()
 
         $this->hypervisor->retrieve();
 
-        $this->assertEquals('1', $this->hypervisor->id);
-        $this->assertEquals('enabled', $this->hypervisor->status);
-        $this->assertEquals('up', $this->hypervisor->state);
-        $this->assertEquals('146', $this->hypervisor->freeDiskGb);
-        $this->assertEquals('76917', $this->hypervisor->freeRamMb);
-        $this->assertEquals('localhost.localdomain', $this->hypervisor->hypervisorHostname);
-        $this->assertEquals('QEMU', $this->hypervisor->hypervisorType);
-        $this->assertEquals('2006000', $this->hypervisor->hypervisorVersion);
-        $this->assertEquals('266', $this->hypervisor->localGb);
-        $this->assertEquals('120', $this->hypervisor->localGbUsed);
-        $this->assertEquals('97909', $this->hypervisor->memoryMb);
-        $this->assertEquals('20992', $this->hypervisor->memoryMbUsed);
-        $this->assertEquals('4', $this->hypervisor->runningVms);
-        $this->assertEquals('56', $this->hypervisor->vcpus);
-        $this->assertEquals('10', $this->hypervisor->vcpusUsed);
-        $this->assertEquals(['host' => 'localhost.localdomain', 'id' => '8', 'disabled_reason' => null], $this->hypervisor->service);
+        self::assertEquals('1', $this->hypervisor->id);
+        self::assertEquals('enabled', $this->hypervisor->status);
+        self::assertEquals('up', $this->hypervisor->state);
+        self::assertEquals('146', $this->hypervisor->freeDiskGb);
+        self::assertEquals('76917', $this->hypervisor->freeRamMb);
+        self::assertEquals('localhost.localdomain', $this->hypervisor->hypervisorHostname);
+        self::assertEquals('QEMU', $this->hypervisor->hypervisorType);
+        self::assertEquals('2006000', $this->hypervisor->hypervisorVersion);
+        self::assertEquals('266', $this->hypervisor->localGb);
+        self::assertEquals('120', $this->hypervisor->localGbUsed);
+        self::assertEquals('97909', $this->hypervisor->memoryMb);
+        self::assertEquals('20992', $this->hypervisor->memoryMbUsed);
+        self::assertEquals('4', $this->hypervisor->runningVms);
+        self::assertEquals('56', $this->hypervisor->vcpus);
+        self::assertEquals('10', $this->hypervisor->vcpusUsed);
+        self::assertEquals(['host' => 'localhost.localdomain', 'id' => '8', 'disabled_reason' => null], $this->hypervisor->service);
     }
 }
diff --git a/tests/unit/Compute/v2/Models/ImageTest.php b/tests/unit/Compute/v2/Models/ImageTest.php
index 418bd03c..6a069e3f 100644
--- a/tests/unit/Compute/v2/Models/ImageTest.php
+++ b/tests/unit/Compute/v2/Models/ImageTest.php
@@ -34,14 +34,14 @@ public function test_it_retrieves()
             "ramdisk_id" => "nokernel"
         ];
 
-        $this->assertEquals(new \DateTimeImmutable('2011-01-01T01:02:03Z'), $this->image->created);
-        $this->assertEquals($metadata, $this->image->metadata);
-        $this->assertEquals(0, $this->image->minDisk);
-        $this->assertEquals(0, $this->image->minRam);
-        $this->assertEquals('fakeimage7', $this->image->name);
-        $this->assertEquals(100, $this->image->progress);
-        $this->assertEquals('ACTIVE', $this->image->status);
-        $this->assertEquals(new \DateTimeImmutable('2011-01-01T01:02:03Z'), $this->image->updated);
+        self::assertEquals(new \DateTimeImmutable('2011-01-01T01:02:03Z'), $this->image->created);
+        self::assertEquals($metadata, $this->image->metadata);
+        self::assertEquals(0, $this->image->minDisk);
+        self::assertEquals(0, $this->image->minRam);
+        self::assertEquals('fakeimage7', $this->image->name);
+        self::assertEquals(100, $this->image->progress);
+        self::assertEquals('ACTIVE', $this->image->status);
+        self::assertEquals(new \DateTimeImmutable('2011-01-01T01:02:03Z'), $this->image->updated);
     }
 
     public function test_it_deletes()
@@ -57,10 +57,10 @@ public function test_it_retrieves_metadata()
 
         $metadata = $this->image->getMetadata();
 
-        $this->assertEquals('x86_64', $metadata['architecture']);
-        $this->assertEquals('True', $metadata['auto_disk_config']);
-        $this->assertEquals('nokernel', $metadata['kernel_id']);
-        $this->assertEquals('nokernel', $metadata['ramdisk_id']);
+        self::assertEquals('x86_64', $metadata['architecture']);
+        self::assertEquals('True', $metadata['auto_disk_config']);
+        self::assertEquals('nokernel', $metadata['kernel_id']);
+        self::assertEquals('nokernel', $metadata['ramdisk_id']);
     }
 
     public function test_it_sets_metadata()
@@ -74,7 +74,7 @@ public function test_it_sets_metadata()
 
         $this->image->resetMetadata($metadata);
 
-        $this->assertEquals('1', $this->image->metadata['foo']);
+        self::assertEquals('1', $this->image->metadata['foo']);
     }
 
     public function test_it_updates_metadata()
@@ -88,8 +88,8 @@ public function test_it_updates_metadata()
 
         $this->image->mergeMetadata($metadata);
 
-        $this->assertEquals('1', $this->image->metadata['foo']);
-        $this->assertEquals('2', $this->image->metadata['bar']);
+        self::assertEquals('1', $this->image->metadata['foo']);
+        self::assertEquals('2', $this->image->metadata['bar']);
     }
 
     public function test_it_retrieves_a_metadata_item()
@@ -99,13 +99,13 @@ public function test_it_retrieves_a_metadata_item()
 
         $value = $this->image->getMetadataItem('fooKey');
 
-        $this->assertEquals('bar', $value);
+        self::assertEquals('bar', $value);
     }
 
     public function test_it_deletes_a_metadata_item()
     {
         $this->setupMock('DELETE', 'images/imageId/metadata/fooKey', null, [], new Response(204));
 
-        $this->assertNull($this->image->deleteMetadataItem('fooKey'));
+        self::assertNull($this->image->deleteMetadataItem('fooKey'));
     }
 }
diff --git a/tests/unit/Compute/v2/Models/KeypairTest.php b/tests/unit/Compute/v2/Models/KeypairTest.php
index b88d58ad..eb3ad871 100644
--- a/tests/unit/Compute/v2/Models/KeypairTest.php
+++ b/tests/unit/Compute/v2/Models/KeypairTest.php
@@ -39,7 +39,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'os-keypairs', $expectedJson, ['Content-Type' => 'application/json'], 'keypair-post');
 
-        $this->assertInstanceOf(Keypair::class, $this->keypair->create($opts));
+        self::assertInstanceOf(Keypair::class, $this->keypair->create($opts));
     }
 
     public function test_it_retrieves()
@@ -48,15 +48,15 @@ public function test_it_retrieves()
 
         $this->keypair->retrieve();
 
-        $this->assertEquals('1', $this->keypair->id);
-        $this->assertEquals('fake', $this->keypair->userId);
-        $this->assertEquals('44:fe:29:6e:23:14:b9:53:5b:65:82:58:1c:fe:5a:c3', $this->keypair->fingerprint);
-        $this->assertEquals(self::KEYPAIR_NAME, $this->keypair->name);
-        $this->assertEquals(
+        self::assertEquals('1', $this->keypair->id);
+        self::assertEquals('fake', $this->keypair->userId);
+        self::assertEquals('44:fe:29:6e:23:14:b9:53:5b:65:82:58:1c:fe:5a:c3', $this->keypair->fingerprint);
+        self::assertEquals(self::KEYPAIR_NAME, $this->keypair->name);
+        self::assertEquals(
             'ssh-rsa AAAAAAABBBBBBBBBCCCCCCCCCCC foo@bar.com',
             $this->keypair->publicKey
         );
-        $this->assertFalse($this->keypair->deleted);
+        self::assertFalse($this->keypair->deleted);
     }
 
     public function test_it_retrieves_by_user_id()
@@ -70,15 +70,15 @@ public function test_it_retrieves_by_user_id()
         $this->keypair->userId = 'fake';
         $this->keypair->retrieve();
 
-        $this->assertEquals('1', $this->keypair->id);
-        $this->assertEquals('fake', $this->keypair->userId);
-        $this->assertEquals('44:fe:29:6e:23:14:b9:53:5b:65:82:58:1c:fe:5a:c3', $this->keypair->fingerprint);
-        $this->assertEquals(self::KEYPAIR_NAME, $this->keypair->name);
-        $this->assertEquals(
+        self::assertEquals('1', $this->keypair->id);
+        self::assertEquals('fake', $this->keypair->userId);
+        self::assertEquals('44:fe:29:6e:23:14:b9:53:5b:65:82:58:1c:fe:5a:c3', $this->keypair->fingerprint);
+        self::assertEquals(self::KEYPAIR_NAME, $this->keypair->name);
+        self::assertEquals(
             'ssh-rsa AAAAAAABBBBBBBBBCCCCCCCCCCC foo@bar.com',
             $this->keypair->publicKey
         );
-        $this->assertFalse($this->keypair->deleted);
+        self::assertFalse($this->keypair->deleted);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Compute/v2/Models/QuotaSetTest.php b/tests/unit/Compute/v2/Models/QuotaSetTest.php
index c167b3cf..e6193773 100644
--- a/tests/unit/Compute/v2/Models/QuotaSetTest.php
+++ b/tests/unit/Compute/v2/Models/QuotaSetTest.php
@@ -30,22 +30,22 @@ public function test_it_retrieves()
 
         $this->quotaSet->retrieve();
 
-        $this->assertEquals(10240, $this->quotaSet->injectedFileContentBytes);
-        $this->assertEquals(128, $this->quotaSet->metadataItems);
-        $this->assertEquals(22, $this->quotaSet->serverGroupMembers);
-        $this->assertEquals(10, $this->quotaSet->serverGroups);
-        $this->assertEquals(51200, $this->quotaSet->ram);
-        $this->assertEquals(33, $this->quotaSet->floatingIps);
-        $this->assertEquals(100, $this->quotaSet->keyPairs);
-        $this->assertEquals(999, $this->quotaSet->instances);
-        $this->assertEquals(20, $this->quotaSet->securityGroupRules);
-        $this->assertEquals(5, $this->quotaSet->injectedFiles);
-        $this->assertEquals(500, $this->quotaSet->cores);
-        $this->assertEquals(-1, $this->quotaSet->fixedIps);
-        $this->assertEquals(255, $this->quotaSet->injectedFilePathBytes);
-        $this->assertEquals(10, $this->quotaSet->securityGroups);
+        self::assertEquals(10240, $this->quotaSet->injectedFileContentBytes);
+        self::assertEquals(128, $this->quotaSet->metadataItems);
+        self::assertEquals(22, $this->quotaSet->serverGroupMembers);
+        self::assertEquals(10, $this->quotaSet->serverGroups);
+        self::assertEquals(51200, $this->quotaSet->ram);
+        self::assertEquals(33, $this->quotaSet->floatingIps);
+        self::assertEquals(100, $this->quotaSet->keyPairs);
+        self::assertEquals(999, $this->quotaSet->instances);
+        self::assertEquals(20, $this->quotaSet->securityGroupRules);
+        self::assertEquals(5, $this->quotaSet->injectedFiles);
+        self::assertEquals(500, $this->quotaSet->cores);
+        self::assertEquals(-1, $this->quotaSet->fixedIps);
+        self::assertEquals(255, $this->quotaSet->injectedFilePathBytes);
+        self::assertEquals(10, $this->quotaSet->securityGroups);
 
-        $this->assertEquals(self::TENANT_ID, $this->quotaSet->tenantId);
+        self::assertEquals(self::TENANT_ID, $this->quotaSet->tenantId);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Compute/v2/Models/ServerTest.php b/tests/unit/Compute/v2/Models/ServerTest.php
index 864cec61..5b637e12 100644
--- a/tests/unit/Compute/v2/Models/ServerTest.php
+++ b/tests/unit/Compute/v2/Models/ServerTest.php
@@ -41,7 +41,7 @@ public function test_it_creates()
         ]];
 
         $this->setupMock('POST', 'servers', $expectedJson, [], 'server-post');
-        $this->assertInstanceOf(Server::class, $this->server->create($opts));
+        self::assertInstanceOf(Server::class, $this->server->create($opts));
     }
 
     public function test_it_creates_with_boot_from_volume()
@@ -59,7 +59,7 @@ public function test_it_creates_with_boot_from_volume()
         ]];
 
         $this->setupMock('POST', 'servers', $expectedJson, [], 'server-post');
-        $this->assertInstanceOf(Server::class, $this->server->create($opts));
+        self::assertInstanceOf(Server::class, $this->server->create($opts));
     }
 
     public function test_it_requires_image_id_or_volume_id_to_create_servers()
@@ -94,7 +94,7 @@ public function test_it_deletes()
     {
         $this->setupMock('DELETE', 'servers/serverId', null, [], new Response(204));
 
-        $this->assertNull($this->server->delete());
+        self::assertNull($this->server->delete());
     }
 
     public function test_it_retrieves()
@@ -103,8 +103,8 @@ public function test_it_retrieves()
 
         $this->server->retrieve();
 
-        $this->assertInstanceOf(Flavor::class, $this->server->flavor);
-        $this->assertEquals("1", $this->server->flavor->id);
+        self::assertInstanceOf(Flavor::class, $this->server->flavor);
+        self::assertEquals("1", $this->server->flavor->id);
     }
 
     public function test_it_changes_password()
@@ -112,7 +112,7 @@ public function test_it_changes_password()
         $expectedJson = ['changePassword' => ['adminPass' => 'foo']];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->changePassword('foo'));
+        self::assertNull($this->server->changePassword('foo'));
     }
 
     public function test_it_reboots()
@@ -120,7 +120,7 @@ public function test_it_reboots()
         $expectedJson = ["reboot" => ["type" => "SOFT"]];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->reboot());
+        self::assertNull($this->server->reboot());
     }
 
     public function test_an_exception_is_thrown_when_rebooting_with_an_invalid_type()
@@ -159,8 +159,8 @@ public function test_it_rebuilds()
 
         $this->server->rebuild($userOptions);
 
-        $this->assertEquals($userOptions['imageId'], $this->server->image->id);
-        $this->assertEquals($userOptions['name'], $this->server->name);
+        self::assertEquals($userOptions['imageId'], $this->server->image->id);
+        self::assertEquals($userOptions['name'], $this->server->name);
     }
 
     public function test_it_rescues()
@@ -181,7 +181,7 @@ public function test_it_rescues()
 
         $adminPass = $this->server->rescue($userOptions);
 
-        $this->assertEquals('foo', $adminPass);
+        self::assertEquals('foo', $adminPass);
     }
 
     public function test_it_unrescues()
@@ -190,7 +190,7 @@ public function test_it_unrescues()
 
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-unrescue');
 
-        $this->assertNull($this->server->unrescue());
+        self::assertNull($this->server->unrescue());
     }
 
     public function test_it_starts()
@@ -199,7 +199,7 @@ public function test_it_starts()
 
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->start());
+        self::assertNull($this->server->start());
     }
 
     public function test_it_stops()
@@ -208,7 +208,7 @@ public function test_it_stops()
 
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->stop());
+        self::assertNull($this->server->stop());
     }
 
     public function test_it_resizes()
@@ -216,7 +216,7 @@ public function test_it_resizes()
         $expectedJson = ['resize' => ['flavorRef' => 'flavorId']];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->resize('flavorId'));
+        self::assertNull($this->server->resize('flavorId'));
     }
 
     public function test_it_confirms_resizes()
@@ -224,7 +224,7 @@ public function test_it_confirms_resizes()
         $expectedJson = ['confirmResize' => null];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->confirmResize());
+        self::assertNull($this->server->confirmResize());
     }
 
     public function test_it_reverts_resizes()
@@ -232,7 +232,7 @@ public function test_it_reverts_resizes()
         $expectedJson = ['revertResize' => null];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->revertResize());
+        self::assertNull($this->server->revertResize());
     }
 
     public function test_it_gets_console_output()
@@ -240,7 +240,7 @@ public function test_it_gets_console_output()
         $expectedJson = ["os-getConsoleOutput" => ["length" => 3]];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-output');
 
-        $this->assertEquals("FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE", $this->server->getConsoleOutput(3));
+        self::assertEquals("FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE", $this->server->getConsoleOutput(3));
     }
 
     public function test_it_gets_all_console_output()
@@ -248,7 +248,7 @@ public function test_it_gets_all_console_output()
         $expectedJson = ["os-getConsoleOutput" => new \stdClass()];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-output');
 
-        $this->assertEquals("FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE", $this->server->getConsoleOutput());
+        self::assertEquals("FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE", $this->server->getConsoleOutput());
     }
 
     public function test_it_gets_vnc_console()
@@ -260,9 +260,9 @@ public function test_it_gets_vnc_console()
 
         $response = $this->server->getVncConsole();
 
-        $this->assertArrayHasKey('url', $response);
-        $this->assertArrayHasKey('type', $response);
-        $this->assertEquals($type, $response['type']);
+        self::assertArrayHasKey('url', $response);
+        self::assertArrayHasKey('type', $response);
+        self::assertEquals($type, $response['type']);
     }
 
     public function test_it_gets_rdp_console()
@@ -274,9 +274,9 @@ public function test_it_gets_rdp_console()
 
         $response = $this->server->getRDPConsole();
 
-        $this->assertArrayHasKey('url', $response);
-        $this->assertArrayHasKey('type', $response);
-        $this->assertEquals($type, $response['type']);
+        self::assertArrayHasKey('url', $response);
+        self::assertArrayHasKey('type', $response);
+        self::assertEquals($type, $response['type']);
     }
 
     public function test_it_gets_spice_console()
@@ -288,9 +288,9 @@ public function test_it_gets_spice_console()
 
         $response = $this->server->getSpiceConsole();
 
-        $this->assertArrayHasKey('url', $response);
-        $this->assertArrayHasKey('type', $response);
-        $this->assertEquals($type, $response['type']);
+        self::assertArrayHasKey('url', $response);
+        self::assertArrayHasKey('type', $response);
+        self::assertEquals($type, $response['type']);
     }
 
     public function test_it_gets_serial_console()
@@ -302,9 +302,9 @@ public function test_it_gets_serial_console()
 
         $response = $this->server->getSerialConsole();
 
-        $this->assertArrayHasKey('url', $response);
-        $this->assertArrayHasKey('type', $response);
-        $this->assertEquals($type, $response['type']);
+        self::assertArrayHasKey('url', $response);
+        self::assertArrayHasKey('type', $response);
+        self::assertEquals($type, $response['type']);
     }
 
     public function test_it_creates_images()
@@ -314,7 +314,7 @@ public function test_it_creates_images()
         $expectedJson = ['createImage' => $userData];
         $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
 
-        $this->assertNull($this->server->createImage($userData));
+        self::assertNull($this->server->createImage($userData));
     }
 
     public function test_it_gets_ip_addresses()
@@ -324,8 +324,8 @@ public function test_it_gets_ip_addresses()
         $ips = $this->server->listAddresses();
 
         self::assertIsArray($ips);
-        $this->assertCount(4, $ips['public']);
-        $this->assertCount(2, $ips['private']);
+        self::assertCount(4, $ips['public']);
+        self::assertCount(2, $ips['private']);
     }
 
     public function test_it_gets_ip_addresses_by_network_label()
@@ -335,8 +335,8 @@ public function test_it_gets_ip_addresses_by_network_label()
         $ips = $this->server->listAddresses(['networkLabel' => 'foo']);
 
         self::assertIsArray($ips);
-        $this->assertCount(4, $ips['public']);
-        $this->assertCount(2, $ips['private']);
+        self::assertCount(4, $ips['public']);
+        self::assertCount(2, $ips['private']);
     }
 
     public function test_it_retrieves_metadata()
@@ -345,10 +345,10 @@ public function test_it_retrieves_metadata()
 
         $metadata = $this->server->getMetadata();
 
-        $this->assertEquals('x86_64', $metadata['architecture']);
-        $this->assertEquals('True', $metadata['auto_disk_config']);
-        $this->assertEquals('nokernel', $metadata['kernel_id']);
-        $this->assertEquals('nokernel', $metadata['ramdisk_id']);
+        self::assertEquals('x86_64', $metadata['architecture']);
+        self::assertEquals('True', $metadata['auto_disk_config']);
+        self::assertEquals('nokernel', $metadata['kernel_id']);
+        self::assertEquals('nokernel', $metadata['ramdisk_id']);
     }
 
     public function test_it_sets_metadata()
@@ -361,7 +361,7 @@ public function test_it_sets_metadata()
 
         $this->server->resetMetadata($metadata);
 
-        $this->assertEquals('1', $this->server->metadata['foo']);
+        self::assertEquals('1', $this->server->metadata['foo']);
     }
 
     public function test_it_updates_metadata()
@@ -374,8 +374,8 @@ public function test_it_updates_metadata()
 
         $this->server->mergeMetadata($metadata);
 
-        $this->assertEquals('1', $this->server->metadata['foo']);
-        $this->assertEquals('2', $this->server->metadata['bar']);
+        self::assertEquals('1', $this->server->metadata['foo']);
+        self::assertEquals('2', $this->server->metadata['bar']);
     }
 
     public function test_it_retrieves_a_metadata_item()
@@ -385,14 +385,14 @@ public function test_it_retrieves_a_metadata_item()
 
         $value = $this->server->getMetadataItem('fooKey');
 
-        $this->assertEquals('bar', $value);
+        self::assertEquals('bar', $value);
     }
 
     public function test_it_deletes_a_metadata_item()
     {
         $this->setupMock('DELETE', 'servers/serverId/metadata/fooKey', null, [], new Response(204));
 
-        $this->assertNull($this->server->deleteMetadataItem('fooKey'));
+        self::assertNull($this->server->deleteMetadataItem('fooKey'));
     }
 
     public function test_it_lists_security_groups()
@@ -401,7 +401,7 @@ public function test_it_lists_security_groups()
 
         $securityGroups = iterator_to_array($this->server->listSecurityGroups());
 
-        $this->assertInstanceOf(SecurityGroup::class, $securityGroups[0]);
+        self::assertInstanceOf(SecurityGroup::class, $securityGroups[0]);
     }
 
     public function test_it_lists_volume_attachments()
@@ -410,7 +410,7 @@ public function test_it_lists_volume_attachments()
 
         $volumeAttachments = iterator_to_array($this->server->listVolumeAttachments());
 
-        $this->assertInstanceOf(VolumeAttachment::class, $volumeAttachments[0]);
+        self::assertInstanceOf(VolumeAttachment::class, $volumeAttachments[0]);
     }
 
     public function test_it_remove_security_group()
@@ -454,11 +454,11 @@ public function test_it_attaches_volume()
         $this->setupMock('POST', 'servers/serverId/os-volume_attachments', $expectedJson, [], 'server-volume-attach-post');
 
         $volumeAttachment = $this->server->attachVolume($volumeId);
-        $this->assertInstanceOf(VolumeAttachment::class, $volumeAttachment);
-        $this->assertEquals('serverId', $volumeAttachment->serverId);
-        $this->assertEquals('a26887c6-c47b-4654-abb5-dfadf7d3f803', $volumeAttachment->id);
-        $this->assertEquals($volumeId, $volumeAttachment->volumeId);
-        $this->assertEquals('/dev/vdd', $volumeAttachment->device);
+        self::assertInstanceOf(VolumeAttachment::class, $volumeAttachment);
+        self::assertEquals('serverId', $volumeAttachment->serverId);
+        self::assertEquals('a26887c6-c47b-4654-abb5-dfadf7d3f803', $volumeAttachment->id);
+        self::assertEquals($volumeId, $volumeAttachment->volumeId);
+        self::assertEquals('/dev/vdd', $volumeAttachment->device);
     }
 
     public function test_it_detaches_volume()
@@ -476,14 +476,14 @@ public function test_it_lists_interface_attachments()
 
         $interfaceAttachments = iterator_to_array($this->server->listInterfaceAttachments());
 
-        $this->assertEquals('ce531f90-199f-48c0-816c-13e38010b442', $interfaceAttachments[0]->portId);
-        $this->assertEquals('ACTIVE', $interfaceAttachments[0]->portState);
-        $this->assertEquals('3cb9bc59-5699-4588-a4b1-b87f96708bc6', $interfaceAttachments[0]->netId);
-        $this->assertEquals('fa:16:3e:4c:2c:30', $interfaceAttachments[0]->macAddr);
-        $this->assertEquals('192.168.1.3', $interfaceAttachments[0]->fixedIps[0]['ip_address']);
-        $this->assertEquals('f8a6e8f8-c2ec-497c-9f23-da9616de54ef', $interfaceAttachments[0]->fixedIps[0]['subnet_id']);
+        self::assertEquals('ce531f90-199f-48c0-816c-13e38010b442', $interfaceAttachments[0]->portId);
+        self::assertEquals('ACTIVE', $interfaceAttachments[0]->portState);
+        self::assertEquals('3cb9bc59-5699-4588-a4b1-b87f96708bc6', $interfaceAttachments[0]->netId);
+        self::assertEquals('fa:16:3e:4c:2c:30', $interfaceAttachments[0]->macAddr);
+        self::assertEquals('192.168.1.3', $interfaceAttachments[0]->fixedIps[0]['ip_address']);
+        self::assertEquals('f8a6e8f8-c2ec-497c-9f23-da9616de54ef', $interfaceAttachments[0]->fixedIps[0]['subnet_id']);
 
-        $this->assertInstanceOf(InterfaceAttachment::class, $interfaceAttachments[0]);
+        self::assertInstanceOf(InterfaceAttachment::class, $interfaceAttachments[0]);
     }
 
     /** @test */
@@ -495,12 +495,12 @@ public function it_gets_interface_attachments()
 
         $interfaceAttachment = $this->server->getInterfaceAttachment($portId);
 
-        $this->assertEquals('ce531f90-199f-48c0-816c-13e38010b442', $interfaceAttachment->portId);
-        $this->assertEquals('ACTIVE', $interfaceAttachment->portState);
-        $this->assertEquals('3cb9bc59-5699-4588-a4b1-b87f96708bc6', $interfaceAttachment->netId);
-        $this->assertEquals('fa:16:3e:4c:2c:30', $interfaceAttachment->macAddr);
-        $this->assertEquals('192.168.1.3', $interfaceAttachment->fixedIps[0]['ip_address']);
-        $this->assertEquals('f8a6e8f8-c2ec-497c-9f23-da9616de54ef', $interfaceAttachment->fixedIps[0]['subnet_id']);
+        self::assertEquals('ce531f90-199f-48c0-816c-13e38010b442', $interfaceAttachment->portId);
+        self::assertEquals('ACTIVE', $interfaceAttachment->portState);
+        self::assertEquals('3cb9bc59-5699-4588-a4b1-b87f96708bc6', $interfaceAttachment->netId);
+        self::assertEquals('fa:16:3e:4c:2c:30', $interfaceAttachment->macAddr);
+        self::assertEquals('192.168.1.3', $interfaceAttachment->fixedIps[0]['ip_address']);
+        self::assertEquals('f8a6e8f8-c2ec-497c-9f23-da9616de54ef', $interfaceAttachment->fixedIps[0]['subnet_id']);
     }
 
     /** @test */
@@ -516,8 +516,8 @@ public function test_it_creates_interface_attachments()
 
         $interfaceAttachment = $this->server->createInterfaceAttachment(['networkId' => $networkId]);
 
-        $this->assertEquals('ACTIVE', $interfaceAttachment->portState);
-        $this->assertEquals('10.0.0.1', $interfaceAttachment->fixedIps[0]['ip_address']);
+        self::assertEquals('ACTIVE', $interfaceAttachment->portState);
+        self::assertEquals('10.0.0.1', $interfaceAttachment->fixedIps[0]['ip_address']);
     }
 
     public function test_it_detaches_interfaces()
diff --git a/tests/unit/Compute/v2/ServiceTest.php b/tests/unit/Compute/v2/ServiceTest.php
index ba0c831c..6609bcee 100644
--- a/tests/unit/Compute/v2/ServiceTest.php
+++ b/tests/unit/Compute/v2/ServiceTest.php
@@ -46,7 +46,7 @@ public function test_it_creates_servers()
 
         $this->setupMock('POST', 'servers', $expectedJson, [], 'server-post');
 
-        $this->assertInstanceOf(Server::class, $this->service->createServer($opts));
+        self::assertInstanceOf(Server::class, $this->service->createServer($opts));
     }
 
     public function test_it_lists_servers()
@@ -57,7 +57,7 @@ public function test_it_lists_servers()
             ->willReturn($this->getFixture('servers-get'));
 
         foreach ($this->service->listServers(false, ['limit' => 5]) as $server) {
-            $this->assertInstanceOf(Server::class, $server);
+            self::assertInstanceOf(Server::class, $server);
         }
     }
 
@@ -67,8 +67,8 @@ public function test_it_gets_a_server()
             'id' => 'serverId'
         ]);
 
-        $this->assertInstanceOf(Server::class, $server);
-        $this->assertEquals('serverId', $server->id);
+        self::assertInstanceOf(Server::class, $server);
+        self::assertEquals('serverId', $server->id);
     }
 
     public function test_it_lists_flavors()
@@ -82,10 +82,10 @@ public function test_it_lists_flavors()
 
         foreach ($this->service->listFlavors(['limit' => 5]) as $flavor) {
             ++$count;
-            $this->assertInstanceOf(Flavor::class, $flavor);
+            self::assertInstanceOf(Flavor::class, $flavor);
         }
 
-        $this->assertEquals(5, $count);
+        self::assertEquals(5, $count);
     }
 
     public function test_it_gets_a_flavor()
@@ -94,8 +94,8 @@ public function test_it_gets_a_flavor()
             'id' => 'flavorId'
         ]);
 
-        $this->assertInstanceOf(Flavor::class, $flavor);
-        $this->assertEquals('flavorId', $flavor->id);
+        self::assertInstanceOf(Flavor::class, $flavor);
+        self::assertEquals('flavorId', $flavor->id);
     }
 
     public function test_it_lists_images()
@@ -106,7 +106,7 @@ public function test_it_lists_images()
             ->willReturn($this->getFixture('images-get'));
 
         foreach ($this->service->listImages(['limit' => 5]) as $image) {
-            $this->assertInstanceOf(Image::class, $image);
+            self::assertInstanceOf(Image::class, $image);
         }
     }
 
@@ -116,8 +116,8 @@ public function test_it_gets_an_image()
             'id' => 'imageId'
         ]);
 
-        $this->assertInstanceOf(Image::class, $image);
-        $this->assertEquals('imageId', $image->id);
+        self::assertInstanceOf(Image::class, $image);
+        self::assertEquals('imageId', $image->id);
     }
 
     public function test_it_lists_keypairs()
@@ -128,7 +128,7 @@ public function test_it_lists_keypairs()
             ->willReturn($this->getFixture('keypairs-get'));
 
         foreach ($this->service->listKeypairs() as $keypair) {
-            $this->assertInstanceOf(Keypair::class, $keypair);
+            self::assertInstanceOf(Keypair::class, $keypair);
         }
     }
 
@@ -141,7 +141,7 @@ public function test_it_gets_hypervisor_statistics()
 
         $hypervisorStats = $this->service->getHypervisorStatistics();
 
-        $this->assertInstanceOf(HypervisorStatistic::class, $hypervisorStats);
+        self::assertInstanceOf(HypervisorStatistic::class, $hypervisorStats);
     }
 
     public function test_it_lists_hypervisors()
@@ -152,7 +152,7 @@ public function test_it_lists_hypervisors()
             ->willReturn($this->getFixture('hypervisors-get'));
 
         foreach ($this->service->listHypervisors(false) as $hypervisor) {
-            $this->assertInstanceOf(Hypervisor::class, $hypervisor);
+            self::assertInstanceOf(Hypervisor::class, $hypervisor);
         }
     }
 
@@ -166,7 +166,7 @@ public function test_it_gets_hypervisor()
         $hypervisor = $this->service->getHypervisor(['id' => 1234]);
         $hypervisor->retrieve();
 
-        $this->assertInstanceOf(Hypervisor::class, $hypervisor);
+        self::assertInstanceOf(Hypervisor::class, $hypervisor);
     }
 
     public function test_it_lists_hosts()
@@ -177,7 +177,7 @@ public function test_it_lists_hosts()
             ->willReturn($this->getFixture('hosts-get'));
 
         foreach ($this->service->listHosts(['limit' => 5]) as $host) {
-            $this->assertInstanceOf(Host::class, $host);
+            self::assertInstanceOf(Host::class, $host);
         }
     }
 
@@ -191,7 +191,7 @@ public function test_it_gets_host()
         $host = $this->service->getHost(['name' => 'b6e4adbc193d428ea923899d07fb001e']);
         $host->retrieve();
 
-        $this->assertInstanceOf(Host::class, $host);
+        self::assertInstanceOf(Host::class, $host);
     }
 
     public function test_it_lists_availability_zones()
@@ -202,7 +202,7 @@ public function test_it_lists_availability_zones()
             ->willReturn($this->getFixture('availability-zones-get'));
 
         foreach ($this->service->listAvailabilityZones(['limit' => 5]) as $zone) {
-            $this->assertInstanceOf(AvailabilityZone::class, $zone);
+            self::assertInstanceOf(AvailabilityZone::class, $zone);
         }
     }
 }
diff --git a/tests/unit/Identity/v2/Models/EndpointTest.php b/tests/unit/Identity/v2/Models/EndpointTest.php
index f2e7ce4a..3c857698 100644
--- a/tests/unit/Identity/v2/Models/EndpointTest.php
+++ b/tests/unit/Identity/v2/Models/EndpointTest.php
@@ -23,7 +23,7 @@ public function test_it_supports_internal_urls()
 
         $this->endpoint->populateFromArray(['internalURL' => $url]);
 
-        $this->assertEquals($url, $this->endpoint->getUrl('internalURL'));
+        self::assertEquals($url, $this->endpoint->getUrl('internalURL'));
     }
 
     public function test_it_supports_admin_urls()
@@ -32,6 +32,6 @@ public function test_it_supports_admin_urls()
 
         $this->endpoint->populateFromArray(['adminURL' => $url]);
 
-        $this->assertEquals($url, $this->endpoint->getUrl('adminURL'));
+        self::assertEquals($url, $this->endpoint->getUrl('adminURL'));
     }
 }
diff --git a/tests/unit/Identity/v2/Models/EntryTest.php b/tests/unit/Identity/v2/Models/EntryTest.php
index f169984c..6acc8b3f 100644
--- a/tests/unit/Identity/v2/Models/EntryTest.php
+++ b/tests/unit/Identity/v2/Models/EntryTest.php
@@ -19,6 +19,6 @@ public function setUp(): void
 
     public function test_null_is_returned_when_no_endpoints_are_found()
     {
-        $this->assertEmpty($this->entry->getEndpointUrl('foo', 'bar'));
+        self::assertEmpty($this->entry->getEndpointUrl('foo', 'bar'));
     }
 }
diff --git a/tests/unit/Identity/v2/Models/TokenTest.php b/tests/unit/Identity/v2/Models/TokenTest.php
index 192bd66b..8843fca6 100644
--- a/tests/unit/Identity/v2/Models/TokenTest.php
+++ b/tests/unit/Identity/v2/Models/TokenTest.php
@@ -20,7 +20,7 @@ public function setUp(): void
     public function test_getting_id()
     {
         $this->token->id = 'foo';
-        $this->assertEquals('foo', $this->token->getId());
+        self::assertEquals('foo', $this->token->getId());
     }
 
     public function test_expiration_is_false_for_active_tokens()
@@ -30,7 +30,7 @@ public function test_expiration_is_false_for_active_tokens()
             'expires'   => date('c', strtotime('tomorrow'))
         ]);
 
-        $this->assertFalse($this->token->hasExpired());
+        self::assertFalse($this->token->hasExpired());
     }
 
     public function test_expiration_is_true_for_old_tokens()
@@ -40,6 +40,6 @@ public function test_expiration_is_true_for_old_tokens()
             'expires'   => date('c', strtotime('last thursday'))
         ]);
 
-        $this->assertTrue($this->token->hasExpired());
+        self::assertTrue($this->token->hasExpired());
     }
 }
diff --git a/tests/unit/Identity/v2/ServiceTest.php b/tests/unit/Identity/v2/ServiceTest.php
index b3e15d23..766cc7b9 100644
--- a/tests/unit/Identity/v2/ServiceTest.php
+++ b/tests/unit/Identity/v2/ServiceTest.php
@@ -44,7 +44,7 @@ public function test_it_authenticates()
 
         list($token, $baseUrl) = $this->service->authenticate($options);
 
-        $this->assertInstanceOf(Token::class, $token);
+        self::assertInstanceOf(Token::class, $token);
         self::assertIsString($baseUrl);
     }
 
@@ -66,6 +66,6 @@ public function test_it_generates_tokens()
 
         $this->setupMock('POST', 'tokens', $expectedJson, [], 'token-post');
 
-        $this->assertInstanceOf(Token::class, $this->service->generateToken($options));
+        self::assertInstanceOf(Token::class, $this->service->generateToken($options));
     }
 }
diff --git a/tests/unit/Identity/v3/Models/CatalogTest.php b/tests/unit/Identity/v3/Models/CatalogTest.php
index f6378a8d..e499c0bf 100644
--- a/tests/unit/Identity/v3/Models/CatalogTest.php
+++ b/tests/unit/Identity/v3/Models/CatalogTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
     public function test_it_throws_if_no_services_set()
     {
 		$this->expectException(\RuntimeException::class);
-        $this->assertFalse($this->catalog->getServiceUrl('', '', '', ''));
+        self::assertFalse($this->catalog->getServiceUrl('', '', '', ''));
     }
 
     public function test_it_returns_service_url()
@@ -36,7 +36,7 @@ public function test_it_returns_service_url()
 
         $this->catalog->services = [$service->reveal()];
 
-        $this->assertEquals($url, $this->catalog->getServiceUrl('foo', 'bar', 'baz', ''));
+        self::assertEquals($url, $this->catalog->getServiceUrl('foo', 'bar', 'baz', ''));
     }
 
     public function test_it_throws_if_no_url_found()
@@ -47,6 +47,6 @@ public function test_it_throws_if_no_url_found()
 
         $this->catalog->services = [$service->reveal()];
 
-        $this->assertFalse($this->catalog->getServiceUrl('', '', '', ''));
+        self::assertFalse($this->catalog->getServiceUrl('', '', '', ''));
     }
 }
diff --git a/tests/unit/Identity/v3/Models/DomainTest.php b/tests/unit/Identity/v3/Models/DomainTest.php
index c2d3155e..35af96fd 100644
--- a/tests/unit/Identity/v3/Models/DomainTest.php
+++ b/tests/unit/Identity/v3/Models/DomainTest.php
@@ -63,13 +63,13 @@ public function test_it_lists_user_roles()
     public function test_it_grants_user_role()
     {
         $this->setupMock('PUT', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(204));
-        $this->assertNull($this->domain->grantUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
+        self::assertNull($this->domain->grantUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_user_role()
     {
         $this->setupMock('HEAD', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(200));
-        $this->assertTrue($this->domain->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
+        self::assertTrue($this->domain->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_user_role()
@@ -79,7 +79,7 @@ public function test_it_checks_nonexistent_user_role()
             ->shouldBeCalled()
             ->willThrow(new BadResponseError());
 
-        $this->assertFalse($this->domain->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
+        self::assertFalse($this->domain->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_user_role()
@@ -97,13 +97,13 @@ public function test_it_lists_group_roles()
     public function test_it_grants_group_role()
     {
         $this->setupMock('PUT', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(204));
-        $this->assertNull($this->domain->grantGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
+        self::assertNull($this->domain->grantGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_group_role()
     {
         $this->setupMock('HEAD', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(200));
-        $this->assertTrue($this->domain->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
+        self::assertTrue($this->domain->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_group_role()
@@ -113,7 +113,7 @@ public function test_it_checks_nonexistent_group_role()
             ->shouldBeCalled()
             ->willThrow(new BadResponseError());
 
-        $this->assertFalse($this->domain->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
+        self::assertFalse($this->domain->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_group_role()
diff --git a/tests/unit/Identity/v3/Models/EndpointTest.php b/tests/unit/Identity/v3/Models/EndpointTest.php
index d9f972ef..99923fe1 100644
--- a/tests/unit/Identity/v3/Models/EndpointTest.php
+++ b/tests/unit/Identity/v3/Models/EndpointTest.php
@@ -44,7 +44,7 @@ public function test_it_creates_endpoint()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
         $endpoint = $this->service->createEndpoint($userOptions);
 
-        $this->assertInstanceOf(Endpoint::class, $endpoint);
+        self::assertInstanceOf(Endpoint::class, $endpoint);
     }
 
     public function test_it_updates_endpoint()
diff --git a/tests/unit/Identity/v3/Models/GroupTest.php b/tests/unit/Identity/v3/Models/GroupTest.php
index 44ac229d..4107f861 100644
--- a/tests/unit/Identity/v3/Models/GroupTest.php
+++ b/tests/unit/Identity/v3/Models/GroupTest.php
@@ -48,7 +48,7 @@ public function test_it_creates_group()
         /** @var $group \OpenStack\Identity\v3\Models\Group */
         $group = $this->group->create($userOptions);
 
-        $this->assertInstanceOf(Group::class, $group);
+        self::assertInstanceOf(Group::class, $group);
     }
 
     public function test_it_updates_group()
@@ -104,6 +104,6 @@ public function test_it_checks_nonexistent_memberships()
             ->shouldBeCalled()
             ->willThrow(new BadResponseError());
 
-        $this->assertFalse($this->group->checkMembership(['userId' => 'USER_ID']));
+        self::assertFalse($this->group->checkMembership(['userId' => 'USER_ID']));
     }
 }
diff --git a/tests/unit/Identity/v3/Models/PolicyTest.php b/tests/unit/Identity/v3/Models/PolicyTest.php
index 4285e78c..80048a93 100644
--- a/tests/unit/Identity/v3/Models/PolicyTest.php
+++ b/tests/unit/Identity/v3/Models/PolicyTest.php
@@ -42,8 +42,8 @@ public function test_it_creates()
         /** @var $policy \OpenStack\Identity\v3\Models\Policy */
         $policy = $this->policy->create($userOptions);
 
-        $this->assertInstanceOf(Policy::class, $policy);
-        $this->assertEquals('--policy-id--', $policy->id);
+        self::assertInstanceOf(Policy::class, $policy);
+        self::assertEquals('--policy-id--', $policy->id);
     }
 
     public function test_it_retrieves()
diff --git a/tests/unit/Identity/v3/Models/ProjectTest.php b/tests/unit/Identity/v3/Models/ProjectTest.php
index bbba36d3..dae65624 100644
--- a/tests/unit/Identity/v3/Models/ProjectTest.php
+++ b/tests/unit/Identity/v3/Models/ProjectTest.php
@@ -75,7 +75,7 @@ public function test_it_checks_user_role()
     {
         $this->setupMock('HEAD', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(200));
 
-        $this->assertTrue($this->project->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
+        self::assertTrue($this->project->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_user_role()
@@ -85,7 +85,7 @@ public function test_it_checks_nonexistent_user_role()
             ->shouldBeCalled()
             ->willThrow(new BadResponseError());
 
-        $this->assertFalse($this->project->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
+        self::assertFalse($this->project->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_user_role()
@@ -112,7 +112,7 @@ public function test_it_checks_group_role()
     {
         $this->setupMock('HEAD', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(200));
 
-        $this->assertTrue($this->project->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
+        self::assertTrue($this->project->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_group_role()
@@ -122,7 +122,7 @@ public function test_it_checks_nonexistent_group_role()
             ->shouldBeCalled()
             ->willThrow(new BadResponseError());
 
-        $this->assertFalse($this->project->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
+        self::assertFalse($this->project->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_group_role()
diff --git a/tests/unit/Identity/v3/Models/ServiceTest.php b/tests/unit/Identity/v3/Models/ServiceTest.php
index 835b1d1b..5b8c8e9d 100644
--- a/tests/unit/Identity/v3/Models/ServiceTest.php
+++ b/tests/unit/Identity/v3/Models/ServiceTest.php
@@ -47,7 +47,7 @@ public function test_it_deletes()
 
     public function test_it_returns_false_if_name_and_type_does_not_match()
     {
-        $this->assertFalse($this->service->getUrl('foo', 'bar', '', ''));
+        self::assertFalse($this->service->getUrl('foo', 'bar', '', ''));
     }
 
     public function test_it_retrieves_url_if_name_type_and_region_match()
@@ -61,7 +61,7 @@ public function test_it_retrieves_url_if_name_type_and_region_match()
         $this->service->type = 'bar';
         $this->service->endpoints = [$endpoint];
 
-        $this->assertNotNull($this->service->getUrl('foo', 'bar', 'baz', 'internal'));
-        $this->assertFalse($this->service->getUrl('foo', 'bar', 'bat', ''));
+        self::assertNotNull($this->service->getUrl('foo', 'bar', 'baz', 'internal'));
+        self::assertFalse($this->service->getUrl('foo', 'bar', 'bat', ''));
     }
 }
diff --git a/tests/unit/Identity/v3/Models/TokenTest.php b/tests/unit/Identity/v3/Models/TokenTest.php
index 711eec8f..66ecc777 100644
--- a/tests/unit/Identity/v3/Models/TokenTest.php
+++ b/tests/unit/Identity/v3/Models/TokenTest.php
@@ -22,16 +22,16 @@ public function setUp(): void
 
     public function test_getting_id()
     {
-        $this->assertEquals('TOKEN_ID', $this->token->getId());
+        self::assertEquals('TOKEN_ID', $this->token->getId());
     }
 
     public function test_it_returns_false_if_expired()
     {
         $this->token->expires = new \DateTimeImmutable('yesterday');
-        $this->assertTrue($this->token->hasExpired());
+        self::assertTrue($this->token->hasExpired());
 
         $this->token->expires = new \DateTimeImmutable('tomorrow');
-        $this->assertFalse($this->token->hasExpired());
+        self::assertFalse($this->token->hasExpired());
     }
 
     public function test_it_throws_error_when_username_is_not_qualified_by_domain_id()
diff --git a/tests/unit/Identity/v3/ServiceTest.php b/tests/unit/Identity/v3/ServiceTest.php
index 658a77b4..da39e671 100644
--- a/tests/unit/Identity/v3/ServiceTest.php
+++ b/tests/unit/Identity/v3/ServiceTest.php
@@ -62,8 +62,8 @@ public function test_it_authenticates()
 
         list($token, $url) = $this->service->authenticate($userOptions);
 
-        $this->assertInstanceOf(Models\Token::class, $token);
-        $this->assertEquals('http://example.org:8080/v1/AUTH_e00abf65afca49609eedd163c515cf10', $url);
+        self::assertInstanceOf(Models\Token::class, $token);
+        self::assertEquals('http://example.org:8080/v1/AUTH_e00abf65afca49609eedd163c515cf10', $url);
     }
 
     public function test_it_authenticates_using_cache_token()
@@ -136,8 +136,8 @@ public function test_it_authenticates_using_cache_token()
 
         list($token, $url) = $this->service->authenticate($userOptions);
 
-        $this->assertInstanceOf(Models\Token::class, $token);
-        $this->assertEquals('http://example.org:8080/v1/AUTH_e00abf65afca49609eedd163c515cf10', $url);
+        self::assertInstanceOf(Models\Token::class, $token);
+        self::assertEquals('http://example.org:8080/v1/AUTH_e00abf65afca49609eedd163c515cf10', $url);
     }
 
     public function test_it_authenticates_and_throws_exception_when_authenticate_with_expired_cached_token()
@@ -256,10 +256,10 @@ public function test_it_gets_token()
         $token = $this->service->getToken('tokenId');
         $token->retrieve();
 
-        $this->assertInstanceOf(Models\Token::class, $token);
-        $this->assertEquals(new \DateTimeImmutable('2013-02-27T18:30:59.999999Z'), $token->expires);
-        $this->assertEquals(new \DateTimeImmutable('2013-02-27T16:30:59.999999Z'), $token->issued);
-        $this->assertEquals(['password'], $token->methods);
+        self::assertInstanceOf(Models\Token::class, $token);
+        self::assertEquals(new \DateTimeImmutable('2013-02-27T18:30:59.999999Z'), $token->expires);
+        self::assertEquals(new \DateTimeImmutable('2013-02-27T16:30:59.999999Z'), $token->issued);
+        self::assertEquals(['password'], $token->methods);
 
         $user = $this->service->model(Models\User::class, [
             "domain" => [
@@ -275,14 +275,14 @@ public function test_it_gets_token()
             ],
             "name"   => "Joe"
         ]);
-        $this->assertEquals($user, $token->user);
+        self::assertEquals($user, $token->user);
     }
 
     public function test_false_is_returned_when_token_validation_returns_204()
     {
         $this->setupMock('HEAD', 'auth/tokens', [], ['X-Subject-Token' => 'tokenId'], new Response(204));
 
-        $this->assertTrue($this->service->validateToken('tokenId'));
+        self::assertTrue($this->service->validateToken('tokenId'));
     }
 
     public function test_true_is_returned_when_token_validation_returns_error()
@@ -292,14 +292,14 @@ public function test_true_is_returned_when_token_validation_returns_error()
             ->shouldBeCalled()
             ->willThrow(new BadResponseError());
 
-        $this->assertFalse($this->service->validateToken('tokenId'));
+        self::assertFalse($this->service->validateToken('tokenId'));
     }
 
     public function test_it_revokes_token()
     {
         $this->setupMock('DELETE', 'auth/tokens', [], ['X-Subject-Token' => 'tokenId'], new Response(204));
 
-        $this->assertNull($this->service->revokeToken('tokenId'));
+        self::assertNull($this->service->revokeToken('tokenId'));
     }
 
     public function test_it_creates_service()
@@ -310,10 +310,10 @@ public function test_it_creates_service()
 
         $service = $this->service->createService($userOptions);
 
-        $this->assertInstanceOf(Models\Service::class, $service);
-        $this->assertEquals('serviceId', $service->id);
-        $this->assertEquals('foo', $service->name);
-        $this->assertEquals('bar', $service->type);
+        self::assertInstanceOf(Models\Service::class, $service);
+        self::assertEquals('serviceId', $service->id);
+        self::assertEquals('foo', $service->name);
+        self::assertEquals('bar', $service->type);
     }
 
     public function test_it_lists_services()
@@ -346,13 +346,13 @@ public function test_it_creates_endpoint()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
         $endpoint = $this->service->createEndpoint($userOptions);
 
-        $this->assertInstanceOf(Models\Endpoint::class, $endpoint);
+        self::assertInstanceOf(Models\Endpoint::class, $endpoint);
 
-        $this->assertEquals($userOptions['interface'], $endpoint->interface);
-        $this->assertEquals($userOptions['name'], $endpoint->name);
-        $this->assertEquals($userOptions['region'], $endpoint->region);
-        $this->assertEquals($userOptions['url'], $endpoint->url);
-        $this->assertEquals($userOptions['serviceId'], $endpoint->serviceId);
+        self::assertEquals($userOptions['interface'], $endpoint->interface);
+        self::assertEquals($userOptions['name'], $endpoint->name);
+        self::assertEquals($userOptions['region'], $endpoint->region);
+        self::assertEquals($userOptions['url'], $endpoint->url);
+        self::assertEquals($userOptions['serviceId'], $endpoint->serviceId);
     }
 
     public function test_it_creates_domain()
@@ -368,12 +368,12 @@ public function test_it_creates_domain()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Domain */
         $domain = $this->service->createDomain($userOptions);
 
-        $this->assertInstanceOf(Models\Domain::class, $domain);
+        self::assertInstanceOf(Models\Domain::class, $domain);
 
-        $this->assertEquals('12345', $domain->id);
-        $this->assertTrue($domain->enabled);
-        $this->assertEquals('foo', $domain->name);
-        $this->assertEquals('bar', $domain->description);
+        self::assertEquals('12345', $domain->id);
+        self::assertTrue($domain->enabled);
+        self::assertEquals('foo', $domain->name);
+        self::assertEquals('bar', $domain->description);
     }
 
     public function test_it_lists_domains()
@@ -399,11 +399,11 @@ public function test_it_creates_project()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Project */
         $project = $this->service->createProject($userOptions);
 
-        $this->assertInstanceOf(Models\Project::class, $project);
+        self::assertInstanceOf(Models\Project::class, $project);
 
-        $this->assertEquals('456789', $project->id);
-        $this->assertTrue($project->enabled);
-        $this->assertEquals('myNewProject', $project->name);
+        self::assertEquals('456789', $project->id);
+        self::assertTrue($project->enabled);
+        self::assertEquals('myNewProject', $project->name);
     }
 
     public function test_it_lists_projects()
@@ -412,16 +412,16 @@ public function test_it_lists_projects()
 
         $projects = $this->service->listProjects();
 
-        $this->assertInstanceOf('\Generator', $projects);
+        self::assertInstanceOf('\Generator', $projects);
 
         $count = 0;
 
         foreach ($projects as $project) {
-            $this->assertInstanceOf(Models\Project::class, $project);
+            self::assertInstanceOf(Models\Project::class, $project);
             ++$count;
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     public function test_it_gets_project()
@@ -451,15 +451,15 @@ public function test_it_creates_user()
         /** @var $endpoint \OpenStack\Identity\v3\Models\User */
         $user = $this->service->createUser($userOptions);
 
-        $this->assertInstanceOf(Models\User::class, $user);
+        self::assertInstanceOf(Models\User::class, $user);
 
-        $this->assertEquals('263fd9', $user->defaultProjectId);
-        $this->assertEquals("Jim Doe's user", $user->description);
-        $this->assertEquals("1789d1", $user->domainId);
-        $this->assertEquals("jdoe@example.com", $user->email);
-        $this->assertTrue($user->enabled);
-        $this->assertEquals('ff4e51', $user->id);
-        $this->assertEquals('jdoe', $user->name);
+        self::assertEquals('263fd9', $user->defaultProjectId);
+        self::assertEquals("Jim Doe's user", $user->description);
+        self::assertEquals("1789d1", $user->domainId);
+        self::assertEquals("jdoe@example.com", $user->email);
+        self::assertTrue($user->enabled);
+        self::assertEquals('ff4e51', $user->id);
+        self::assertEquals('jdoe', $user->name);
     }
 
     public function test_it_lists_users()
@@ -484,12 +484,12 @@ public function test_it_creates_group()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Group */
         $group = $this->service->createGroup($userOptions);
 
-        $this->assertInstanceOf(Models\Group::class, $group);
+        self::assertInstanceOf(Models\Group::class, $group);
 
-        $this->assertEquals($userOptions['description'], $group->description);
-        $this->assertEquals($userOptions['name'], $group->name);
-        $this->assertEquals('id', $group->id);
-        $this->assertEquals('domain_id', $group->domainId);
+        self::assertEquals($userOptions['description'], $group->description);
+        self::assertEquals($userOptions['name'], $group->name);
+        self::assertEquals('id', $group->id);
+        self::assertEquals('domain_id', $group->domainId);
     }
 
     public function test_it_lists_groups()
@@ -523,12 +523,12 @@ public function test_it_creates_credential()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Credential */
         $cred = $this->service->createCredential($userOptions);
 
-        $this->assertInstanceOf(Models\Credential::class, $cred);
+        self::assertInstanceOf(Models\Credential::class, $cred);
 
-        $this->assertEquals($userOptions['blob'], $cred->blob);
-        $this->assertEquals($userOptions['projectId'], $cred->projectId);
-        $this->assertEquals('id', $cred->id);
-        $this->assertEquals($userOptions['type'], $cred->type);
+        self::assertEquals($userOptions['blob'], $cred->blob);
+        self::assertEquals($userOptions['projectId'], $cred->projectId);
+        self::assertEquals('id', $cred->id);
+        self::assertEquals($userOptions['type'], $cred->type);
     }
 
     public function test_it_lists_credentials()
@@ -550,9 +550,9 @@ public function test_it_creates_role()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Role */
         $role = $this->service->createRole($userOptions);
 
-        $this->assertInstanceOf(Models\Role::class, $role);
+        self::assertInstanceOf(Models\Role::class, $role);
 
-        $this->assertEquals($userOptions['name'], $role->name);
+        self::assertEquals($userOptions['name'], $role->name);
     }
 
     public function test_it_lists_roles()
@@ -587,7 +587,7 @@ public function test_it_creates_policy()
         /** @var $endpoint \OpenStack\Identity\v3\Models\Policy */
         $policy = $this->service->createPolicy($userOptions);
 
-        $this->assertInstanceOf(Models\Policy::class, $policy);
+        self::assertInstanceOf(Models\Policy::class, $policy);
     }
 
     public function test_it_lists_policies()
@@ -632,7 +632,7 @@ public function test_it_generates_tokens_with_user_creds()
         $this->setupMock('POST', 'auth/tokens', ['auth' => $expectedJson], [], 'token');
 
         $token = $this->service->generateToken($userOptions);
-        $this->assertInstanceOf(Models\Token::class, $token);
+        self::assertInstanceOf(Models\Token::class, $token);
     }
 
     public function test_it_generates_token_with_token_id()
@@ -657,7 +657,7 @@ public function test_it_generates_token_with_token_id()
         $this->setupMock('POST', 'auth/tokens', ['auth' => $expectedJson], [], 'token');
 
         $token = $this->service->generateToken($userOptions);
-        $this->assertInstanceOf(Models\Token::class, $token);
+        self::assertInstanceOf(Models\Token::class, $token);
     }
 
     public function test_it_generates_token_from_cache()
@@ -673,8 +673,8 @@ public function test_it_generates_token_from_cache()
 
         $token = $this->service->generateTokenFromCache($cache);
 
-        $this->assertInstanceOf(Models\Token::class, $token);
-        $this->assertEquals('some-token-id', $token->id);
+        self::assertInstanceOf(Models\Token::class, $token);
+        self::assertEquals('some-token-id', $token->id);
     }
 
     public function test_it_lists_endpoints()
diff --git a/tests/unit/Images/v2/JsonPatchTest.php b/tests/unit/Images/v2/JsonPatchTest.php
index e01cc588..d4c93f9f 100644
--- a/tests/unit/Images/v2/JsonPatchTest.php
+++ b/tests/unit/Images/v2/JsonPatchTest.php
@@ -24,7 +24,7 @@ public function test_it_adds_object_properties_if_none_previously_exists()
             ['op' => 'add', 'path' => '/foo', 'value' => 'val'],
         ];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 
     public function test_it_removes_elements_from_arrays()
@@ -37,6 +37,6 @@ public function test_it_removes_elements_from_arrays()
             ['op' => 'remove', 'path' => '/foo/2'],
         ];
 
-        $this->assertEquals($expected, $actual);
+        self::assertEquals($expected, $actual);
     }
 }
diff --git a/tests/unit/Images/v2/Models/ImageTest.php b/tests/unit/Images/v2/Models/ImageTest.php
index f1d553d0..0ef1a910 100644
--- a/tests/unit/Images/v2/Models/ImageTest.php
+++ b/tests/unit/Images/v2/Models/ImageTest.php
@@ -36,22 +36,22 @@ public function test_it_retrieves()
 
         $this->image->retrieve();
 
-        $this->assertEquals("active", $this->image->status);
-        $this->assertEquals("foo", $this->image->name);
-        $this->assertEquals([], $this->image->tags);
-        $this->assertEquals("ami", $this->image->containerFormat);
-        $this->assertEquals(new \DateTimeImmutable("2015-11-12T14:26:08+0000"), $this->image->createdAt);
-        $this->assertEquals("ami", $this->image->diskFormat);
-        $this->assertEquals(new \DateTimeImmutable("2015-12-01T12:25:42+0000"), $this->image->updatedAt);
-        $this->assertEquals("public", $this->image->visibility);
-        $this->assertEquals(20, $this->image->minDisk);
-        $this->assertFalse($this->image->protected);
-        $this->assertEquals("386f0425-3ee8-4688-b73f-272328fe4c71", $this->image->id);
-        $this->assertEquals("061d01418b94d4743a98ee26d941e87c", $this->image->checksum);
-        $this->assertEquals("057aad9fa85b4e29b23e7888000446ef", $this->image->ownerId);
-        $this->assertEquals(983040, $this->image->size);
-        $this->assertEquals(0, $this->image->minRam);
-        $this->assertNull($this->image->virtualSize);
+        self::assertEquals("active", $this->image->status);
+        self::assertEquals("foo", $this->image->name);
+        self::assertEquals([], $this->image->tags);
+        self::assertEquals("ami", $this->image->containerFormat);
+        self::assertEquals(new \DateTimeImmutable("2015-11-12T14:26:08+0000"), $this->image->createdAt);
+        self::assertEquals("ami", $this->image->diskFormat);
+        self::assertEquals(new \DateTimeImmutable("2015-12-01T12:25:42+0000"), $this->image->updatedAt);
+        self::assertEquals("public", $this->image->visibility);
+        self::assertEquals(20, $this->image->minDisk);
+        self::assertFalse($this->image->protected);
+        self::assertEquals("386f0425-3ee8-4688-b73f-272328fe4c71", $this->image->id);
+        self::assertEquals("061d01418b94d4743a98ee26d941e87c", $this->image->checksum);
+        self::assertEquals("057aad9fa85b4e29b23e7888000446ef", $this->image->ownerId);
+        self::assertEquals(983040, $this->image->size);
+        self::assertEquals(0, $this->image->minRam);
+        self::assertNull($this->image->virtualSize);
     }
 
     public function test_it_updates()
@@ -139,7 +139,7 @@ public function test_it_downloads_data()
 
         $this->setupMock('GET', $this->path . '/file', null, [], $response);
 
-        $this->assertInstanceOf(Stream::class, $this->image->downloadData());
+        self::assertInstanceOf(Stream::class, $this->image->downloadData());
     }
 
     public function test_it_creates_member()
@@ -150,7 +150,7 @@ public function test_it_creates_member()
         $this->setupMock('POST', $this->path . '/members', $expectedJson, [], 'POST_members');
 
         $member = $this->image->addMember('8989447062e04a818baf9e073fd04fa7');
-        $this->assertInstanceOf(Member::class, $member);
+        self::assertInstanceOf(Member::class, $member);
     }
 
     public function test_it_lists_members()
@@ -164,14 +164,14 @@ public function test_it_lists_members()
 
         foreach ($this->image->listMembers() as $member) {
             ++$count;
-            $this->assertInstanceOf(Member::class, $member);
+            self::assertInstanceOf(Member::class, $member);
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     public function test_it_gets_members()
     {
-        $this->assertInstanceOf(Member::class, $this->image->getMember('id'));
+        self::assertInstanceOf(Member::class, $this->image->getMember('id'));
     }
 }
diff --git a/tests/unit/Images/v2/ServiceTest.php b/tests/unit/Images/v2/ServiceTest.php
index a38cdf09..6a72cb2b 100644
--- a/tests/unit/Images/v2/ServiceTest.php
+++ b/tests/unit/Images/v2/ServiceTest.php
@@ -69,12 +69,12 @@ public function test_it_lists_images()
             ->willReturn($this->getFixture('GET_images'));
 
         foreach ($this->service->listImages(['limit' => 5]) as $image) {
-            $this->assertInstanceOf(Image::class, $image);
+            self::assertInstanceOf(Image::class, $image);
         }
     }
 
     public function test_it_gets_image()
     {
-        $this->assertInstanceOf(Image::class, $this->service->getImage('id'));
+        self::assertInstanceOf(Image::class, $this->service->getImage('id'));
     }
 }
diff --git a/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php b/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
index ccb6a9bf..ef29cb3a 100644
--- a/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
@@ -26,7 +26,7 @@ public function test_it_retrieves()
         $this->setupMock('GET', 'v1/metric/000b7bf8-0271-46dd-90aa-cfe89026a55a', null, [], 'metric-get');
         $this->metric->retrieve();
 
-        $this->assertEquals('000b7bf8-0271-46dd-90aa-cfe89026a55a', $this->metric->id);
-        $this->assertEquals('storage.objects.outgoing.bytes', $this->metric->name);
+        self::assertEquals('000b7bf8-0271-46dd-90aa-cfe89026a55a', $this->metric->id);
+        self::assertEquals('storage.objects.outgoing.bytes', $this->metric->name);
     }
 }
diff --git a/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php b/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
index a94021fa..3c2e92cb 100644
--- a/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
@@ -27,11 +27,11 @@ public function test_it_retrieves()
     {
         $this->setupMock('GET', 'v1/resource/generic/1111', null, [], 'resource-get');
         $this->resource->retrieve();
-        $this->assertEquals('fake-project-id', $this->resource->projectId);
-        $this->assertEquals('fake-created-by-user-id', $this->resource->createdByUserId);
-        $this->assertEquals('fake-type', $this->resource->type);
+        self::assertEquals('fake-project-id', $this->resource->projectId);
+        self::assertEquals('fake-created-by-user-id', $this->resource->createdByUserId);
+        self::assertEquals('fake-type', $this->resource->type);
         self::assertIsArray($this->resource->metrics);
-        $this->assertEquals(8, count($this->resource->metrics));
+        self::assertEquals(8, count($this->resource->metrics));
     }
 
 
@@ -42,9 +42,9 @@ public function test_it_gets_metric()
         /** @var Metric $metric */
         $metric = $this->resource->getMetric('storage.objects.outgoing.bytes');
 
-        $this->assertInstanceOf(Metric::class, $metric);
-        $this->assertEquals($metric->name, 'storage.objects.outgoing.bytes');
-        $this->assertEquals($metric->id, '000b7bf8-0271-46dd-90aa-cfe89026a55a');
+        self::assertInstanceOf(Metric::class, $metric);
+        self::assertEquals($metric->name, 'storage.objects.outgoing.bytes');
+        self::assertEquals($metric->id, '000b7bf8-0271-46dd-90aa-cfe89026a55a');
     }
 
     public function test_it_gets_metric_measures()
@@ -53,8 +53,8 @@ public function test_it_gets_metric_measures()
         $measures = $this->resource->getMetricMeasures(['metric' => 'storage.objects.outgoing.bytes']);
 
         self::assertIsArray($measures);
-        $this->assertEquals(7, count($measures));
-        $this->assertEquals('2017-05-16T00:00:00+00:00', $measures[0][0]);
+        self::assertEquals(7, count($measures));
+        self::assertEquals('2017-05-16T00:00:00+00:00', $measures[0][0]);
     }
 
     public function test_it_lists_resource_metrics()
@@ -63,7 +63,7 @@ public function test_it_lists_resource_metrics()
 
         $result = iterator_to_array($this->resource->listResourceMetrics());
 
-        $this->assertEquals(23, count($result));
-        $this->assertContainsOnlyInstancesOf(Metric::class, $result);
+        self::assertEquals(23, count($result));
+        self::assertContainsOnlyInstancesOf(Metric::class, $result);
     }
 }
diff --git a/tests/unit/Metric/v1/Gnocchi/ServiceTest.php b/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
index bfd135d7..8c2617f3 100644
--- a/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
@@ -30,8 +30,8 @@ public function test_it_lists_resource_types()
 
         $result = iterator_to_array($this->service->listResourceTypes());
 
-        $this->assertEquals(15, count($result));
-        $this->assertContainsOnlyInstancesOf(ResourceType::class, $result);
+        self::assertEquals(15, count($result));
+        self::assertContainsOnlyInstancesOf(ResourceType::class, $result);
     }
 
     public function test_it_lists_resources()
@@ -43,16 +43,16 @@ public function test_it_lists_resources()
 
         $result = iterator_to_array($this->service->listResources(['limit' => 3]));
 
-        $this->assertEquals(3, count($result));
-        $this->assertContainsOnlyInstancesOf(Resource::class, $result);
+        self::assertEquals(3, count($result));
+        self::assertContainsOnlyInstancesOf(Resource::class, $result);
     }
 
     public function test_it_get_resource()
     {
         $resource = $this->service->getResource(['id' => '1']);
 
-        $this->assertEquals('1', $resource->id);
-        $this->assertInstanceOf(Resource::class, $resource);
+        self::assertEquals('1', $resource->id);
+        self::assertInstanceOf(Resource::class, $resource);
     }
 
     public function test_it_search_resources()
@@ -62,7 +62,7 @@ public function test_it_search_resources()
             ->shouldBeCalled()
             ->willReturn($this->getFixture('resources-get'));
         $result = $this->service->searchResources(['type' => 'generic']);
-        $this->assertContainsOnlyInstancesOf(Resource::class, $result);
+        self::assertContainsOnlyInstancesOf(Resource::class, $result);
     }
 
     public function test_it_search_resources_with_custom_type()
@@ -74,7 +74,7 @@ public function test_it_search_resources_with_custom_type()
 
         $result = $this->service->searchResources(['type' => 'instance']);
 
-        $this->assertContainsOnlyInstancesOf(Resource::class, $result);
+        self::assertContainsOnlyInstancesOf(Resource::class, $result);
     }
 
     public function test_it_lists_metrics()
@@ -86,11 +86,11 @@ public function test_it_lists_metrics()
 
         $result = $this->service->listMetrics(['limit' => 5]);
 
-        $this->assertContainsOnlyInstancesOf(Metric::class, $result);
+        self::assertContainsOnlyInstancesOf(Metric::class, $result);
     }
 
     public function test_it_get_metric()
     {
-        $this->assertInstanceOf(Metric::class, $this->service->getMetric('metric-id'));
+        self::assertInstanceOf(Metric::class, $this->service->getMetric('metric-id'));
     }
 }
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
index 1575c21c..b13a4e5d 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
@@ -49,32 +49,32 @@ public function test_it_retrieves()
 
         $this->floatingIp->retrieve();
 
-        $this->assertEquals(
+        self::assertEquals(
             '376da547-b977-4cfe-9cba-275c80debf57',
                             $this->floatingIp->floatingNetworkId
         );
-        $this->assertEquals(
+        self::assertEquals(
             'd23abc8d-2991-4a55-ba98-2aaea84cc72f',
                             $this->floatingIp->routerId
         );
-        $this->assertEquals(
+        self::assertEquals(
             '10.0.0.3',
                             $this->floatingIp->fixedIpAddress
         );
-        $this->assertEquals(
+        self::assertEquals(
             '172.24.4.228',
                             $this->floatingIp->floatingIpAddress
         );
-        $this->assertEquals(
+        self::assertEquals(
             '4969c491a3c74ee4af974e6d800c62de',
                             $this->floatingIp->tenantId
         );
-        $this->assertEquals('ACTIVE', $this->floatingIp->status);
-        $this->assertEquals(
+        self::assertEquals('ACTIVE', $this->floatingIp->status);
+        self::assertEquals(
             'ce705c24-c1ef-408a-bda3-7bbd946164ab',
                             $this->floatingIp->portId
         );
-        $this->assertEquals(
+        self::assertEquals(
             '2f245a7b-796b-4f26-9cf9-9e82d248fda7',
                             $this->floatingIp->id
         );
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
index 2d4a1771..b6973b2a 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
@@ -70,8 +70,8 @@ public function test_it_retrieves()
 
         $this->router->retrieve();
 
-        $this->assertEquals('f8a44de0-fc8e-45df-93c7-f79bf3b01c95', $this->router->id);
-        $this->assertCount(2, $this->router->externalGatewayInfo->fixedIps);
+        self::assertEquals('f8a44de0-fc8e-45df-93c7-f79bf3b01c95', $this->router->id);
+        self::assertCount(2, $this->router->externalGatewayInfo->fixedIps);
     }
 
     public function test_it_adds_interface()
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php b/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
index 9ad73011..5c223e19 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
@@ -32,19 +32,19 @@ public function test_it_lists_floating_ips()
 
         foreach ($this->service->listFloatingIps() as $ip) {
             /** @var $ip FloatingIp */
-            $this->assertInstanceOf(FloatingIp::class, $ip);
+            self::assertInstanceOf(FloatingIp::class, $ip);
 
-            $this->assertNotNull($ip->tenantId);
-            $this->assertNotNull($ip->floatingNetworkId);
-            $this->assertNotNull($ip->floatingIpAddress);
-            $this->assertNotNull($ip->id);
-            $this->assertNotNull($ip->status);
+            self::assertNotNull($ip->tenantId);
+            self::assertNotNull($ip->floatingNetworkId);
+            self::assertNotNull($ip->floatingIpAddress);
+            self::assertNotNull($ip->id);
+            self::assertNotNull($ip->status);
         }
     }
 
     public function test_it_gets_floating_ip()
     {
-        $this->assertInstanceOf(FloatingIp::class, $this->service->getFloatingIp('id'));
+        self::assertInstanceOf(FloatingIp::class, $this->service->getFloatingIp('id'));
     }
 
     public function test_it_creates_floatingIp()
@@ -61,7 +61,7 @@ public function test_it_creates_floatingIp()
             "portId"            => "ce705c24-c1ef-408a-bda3-7bbd946164ab",
         ]);
 
-        $this->assertInstanceOf(FloatingIp::class, $ip);
+        self::assertInstanceOf(FloatingIp::class, $ip);
     }
 
     public function test_it_lists_routers()
@@ -73,19 +73,19 @@ public function test_it_lists_routers()
 
         foreach ($this->service->listRouters() as $r) {
             /** @var $r Router */
-            $this->assertInstanceOf(Router::class, $r);
+            self::assertInstanceOf(Router::class, $r);
 
-            $this->assertNotNull($r->status);
-            $this->assertNotNull($r->name);
-            $this->assertNotNull($r->adminStateUp);
-            $this->assertNotNull($r->tenantId);
-            $this->assertNotNull($r->id);
+            self::assertNotNull($r->status);
+            self::assertNotNull($r->name);
+            self::assertNotNull($r->adminStateUp);
+            self::assertNotNull($r->tenantId);
+            self::assertNotNull($r->id);
         }
     }
 
     public function test_it_gets_router()
     {
-        $this->assertInstanceOf(Router::class, $this->service->getRouter('id'));
+        self::assertInstanceOf(Router::class, $this->service->getRouter('id'));
     }
 
     public function test_it_creates_router()
@@ -122,6 +122,6 @@ public function test_it_creates_router()
             ],
         ]);
 
-        $this->assertInstanceOf(Router::class, $r);
+        self::assertInstanceOf(Router::class, $r);
     }
 }
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
index c860d8f7..6607ee21 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
@@ -37,10 +37,10 @@ public function test_it_retrieves()
 
         $this->securityGroup->retrieve();
 
-        $this->assertEquals('test_security_group', $this->securityGroup->name);
-        $this->assertEquals('test_security_group_description', $this->securityGroup->description);
-        $this->assertEquals(self::SECURITY_GROUP_ID, $this->securityGroup->id);
-        $this->assertEquals(2, count($this->securityGroup->securityGroupRules));
+        self::assertEquals('test_security_group', $this->securityGroup->name);
+        self::assertEquals('test_security_group_description', $this->securityGroup->description);
+        self::assertEquals(self::SECURITY_GROUP_ID, $this->securityGroup->id);
+        self::assertEquals(2, count($this->securityGroup->securityGroupRules));
     }
 
     public function test_it_updates()
@@ -66,6 +66,6 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/security-groups', $expectedJson, [], 'SecurityGroup');
 
-        $this->assertInstanceOf(SecurityGroup::class, $this->securityGroup->create($opts));
+        self::assertInstanceOf(SecurityGroup::class, $this->securityGroup->create($opts));
     }
 }
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
index d065b938..d899d907 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
@@ -32,12 +32,12 @@ public function test_it_lists_secgroups()
 
         foreach ($this->service->listSecurityGroups() as $sg) {
             /** @var $sg SecurityGroup */
-            $this->assertInstanceOf(SecurityGroup::class, $sg);
+            self::assertInstanceOf(SecurityGroup::class, $sg);
 
-            $this->assertEquals('default', $sg->name);
-            $this->assertEquals('default', $sg->description);
-            $this->assertEquals('85cc3048-abc3-43cc-89b3-377341426ac5', $sg->id);
-            $this->assertCount(2, $sg->securityGroupRules);
+            self::assertEquals('default', $sg->name);
+            self::assertEquals('default', $sg->description);
+            self::assertEquals('85cc3048-abc3-43cc-89b3-377341426ac5', $sg->id);
+            self::assertCount(2, $sg->securityGroupRules);
         }
     }
 
@@ -53,12 +53,12 @@ public function test_it_creates_secgroup()
         $this->setupMock('POST', 'v2.0/security-groups', $expectedJson, [], new Response(201));
 
         $n = $this->service->createSecurityGroup($options);
-        $this->assertInstanceOf(SecurityGroup::class, $n);
+        self::assertInstanceOf(SecurityGroup::class, $n);
     }
 
     public function test_it_gets_secgroup()
     {
-        $this->assertInstanceOf(SecurityGroup::class, $this->service->getSecurityGroup('id'));
+        self::assertInstanceOf(SecurityGroup::class, $this->service->getSecurityGroup('id'));
     }
 
     public function test_it_lists_secgrouprules()
@@ -70,13 +70,13 @@ public function test_it_lists_secgrouprules()
 
         foreach ($this->service->listSecurityGroupRules() as $sgr) {
             /** @var $sgr SecurityGroupRule */
-            $this->assertInstanceOf(SecurityGroupRule::class, $sgr);
+            self::assertInstanceOf(SecurityGroupRule::class, $sgr);
 
-            $this->assertNotNull($sgr->direction);
-            $this->assertNotNull($sgr->ethertype);
-            $this->assertNotNull($sgr->id);
-            $this->assertNotNull($sgr->securityGroupId);
-            $this->assertNotNull($sgr->tenantId);
+            self::assertNotNull($sgr->direction);
+            self::assertNotNull($sgr->ethertype);
+            self::assertNotNull($sgr->id);
+            self::assertNotNull($sgr->securityGroupId);
+            self::assertNotNull($sgr->tenantId);
         }
     }
 
@@ -105,11 +105,11 @@ public function test_it_creates_secgrouprule()
         $this->setupMock('POST', 'v2.0/security-group-rules', $expectedJson, [], new Response(201));
 
         $n = $this->service->createSecurityGroupRule($options);
-        $this->assertInstanceOf(SecurityGroupRule::class, $n);
+        self::assertInstanceOf(SecurityGroupRule::class, $n);
     }
 
     public function test_it_gets_secgrouprule()
     {
-        $this->assertInstanceOf(SecurityGroupRule::class, $this->service->getSecurityGroupRule('id'));
+        self::assertInstanceOf(SecurityGroupRule::class, $this->service->getSecurityGroupRule('id'));
     }
 }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php b/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
index 6ace866e..4250a9e3 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
@@ -49,7 +49,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/lbaas/healthmonitors', $expectedJson, [], 'loadbalancer-healthmonitor-post');
 
-        $this->assertInstanceOf(LoadBalancerHealthMonitor::class, $this->healthmonitor->create($opts));
+        self::assertInstanceOf(LoadBalancerHealthMonitor::class, $this->healthmonitor->create($opts));
     }
 
     public function test_it_updates()
@@ -84,12 +84,12 @@ public function test_it_retrieves()
 
         $this->healthmonitor->retrieve();
 
-        $this->assertEquals(1, $this->healthmonitor->delay);
-        $this->assertEquals(1, $this->healthmonitor->timeout);
-        $this->assertEquals('200', $this->healthmonitor->expectedCodes);
-        $this->assertEquals(5, $this->healthmonitor->maxRetries);
-        $this->assertEquals('GET', $this->healthmonitor->httpMethod);
-        $this->assertEquals('HTTP', $this->healthmonitor->type);
+        self::assertEquals(1, $this->healthmonitor->delay);
+        self::assertEquals(1, $this->healthmonitor->timeout);
+        self::assertEquals('200', $this->healthmonitor->expectedCodes);
+        self::assertEquals(5, $this->healthmonitor->maxRetries);
+        self::assertEquals('GET', $this->healthmonitor->httpMethod);
+        self::assertEquals('HTTP', $this->healthmonitor->type);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php b/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
index 11822948..7cba4947 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
@@ -45,7 +45,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/lbaas/listeners', $expectedJson, [], 'loadbalancer-listener-post');
 
-        $this->assertInstanceOf(LoadBalancerListener::class, $this->listener->create($opts));
+        self::assertInstanceOf(LoadBalancerListener::class, $this->listener->create($opts));
     }
 
     public function test_it_updates()
@@ -74,9 +74,9 @@ public function test_it_retrieves()
 
         $this->listener->retrieve();
 
-        $this->assertEquals('listenerId', $this->listener->id);
-        $this->assertEquals('listener1', $this->listener->name);
-        $this->assertEquals('simple listener', $this->listener->description);
+        self::assertEquals('listenerId', $this->listener->id);
+        self::assertEquals('listener1', $this->listener->name);
+        self::assertEquals('simple listener', $this->listener->description);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php b/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
index 1e86d7b8..a49d2101 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
@@ -42,7 +42,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/lbaas/pools/poolId/members', $expectedJson, [], 'loadbalancer-member-post');
 
-        $this->assertInstanceOf(LoadBalancerMember::class, $this->member->create($opts));
+        self::assertInstanceOf(LoadBalancerMember::class, $this->member->create($opts));
     }
 
     public function test_it_updates()
@@ -67,9 +67,9 @@ public function test_it_retrieves()
 
         $this->member->retrieve();
 
-        $this->assertEquals('memberId', $this->member->id);
-        $this->assertEquals(1, $this->member->weight);
-        $this->assertEquals(true, $this->member->adminStateUp);
+        self::assertEquals('memberId', $this->member->id);
+        self::assertEquals(1, $this->member->weight);
+        self::assertEquals(true, $this->member->adminStateUp);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php b/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
index 209f8464..2f0dc785 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
@@ -50,7 +50,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/lbaas/pools', $expectedJson, [], 'loadbalancer-pool-post');
 
-        $this->assertInstanceOf(LoadBalancerPool::class, $this->pool->create($opts));
+        self::assertInstanceOf(LoadBalancerPool::class, $this->pool->create($opts));
     }
 
     public function test_it_updates()
@@ -87,9 +87,9 @@ public function test_it_retrieves()
 
         $this->pool->retrieve();
 
-        $this->assertEquals('poolId', $this->pool->id);
-        $this->assertEquals('pool1', $this->pool->name);
-        $this->assertEquals('simple pool', $this->pool->description);
+        self::assertEquals('poolId', $this->pool->id);
+        self::assertEquals('pool1', $this->pool->name);
+        self::assertEquals('simple pool', $this->pool->description);
     }
 
     public function test_it_deletes()
@@ -119,14 +119,14 @@ public function test_add_member()
 
         $this->setupMock('POST', 'v2.0/lbaas/pools/poolId/members', $expectedJson, [], 'loadbalancer-member-post');
 
-        $this->assertInstanceOf(LoadBalancerMember::class, $this->pool->addMember($opts));
+        self::assertInstanceOf(LoadBalancerMember::class, $this->pool->addMember($opts));
     }
 
     public function test_get_member()
     {
         $memberId = 'memberId';
 
-        $this->assertInstanceOf(LoadBalancerMember::class, $this->pool->getMember($memberId));
+        self::assertInstanceOf(LoadBalancerMember::class, $this->pool->getMember($memberId));
     }
 
     public function test_delete_member()
@@ -165,6 +165,6 @@ public function test_add_health_monitor()
 
         $this->setupMock('POST', 'v2.0/lbaas/healthmonitors', $expectedJson, [], 'loadbalancer-healthmonitor-post');
 
-        $this->assertInstanceOf(LoadBalancerHealthMonitor::class, $this->pool->addHealthMonitor($opts));
+        self::assertInstanceOf(LoadBalancerHealthMonitor::class, $this->pool->addHealthMonitor($opts));
     }
 }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php b/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
index 942a24f8..c0eba3ec 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
@@ -26,9 +26,9 @@ public function test_it_retrieves()
         $this->setupMock('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/stats', null, [], 'loadbalancer-stats-get');
 
         $this->stat->retrieve();
-        $this->assertEquals('1234', $this->stat->bytesOut);
-        $this->assertEquals('4321', $this->stat->bytesIn);
-        $this->assertEquals(25, $this->stat->totalConnections);
-        $this->assertEquals(10, $this->stat->activeConnections);
+        self::assertEquals('1234', $this->stat->bytesOut);
+        self::assertEquals('4321', $this->stat->bytesIn);
+        self::assertEquals(25, $this->stat->totalConnections);
+        self::assertEquals(10, $this->stat->activeConnections);
     }
 }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php b/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
index 468e1cfc..800cb82a 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
@@ -28,12 +28,12 @@ public function test_it_retrieves()
 
         $this->status->retrieve();
 
-        $this->assertEquals('loadbalancer1', $this->status->name);
-        $this->assertEquals('loadbalancerId', $this->status->id);
-        $this->assertEquals('ONLINE', $this->status->operatingStatus);
-        $this->assertEquals('ACTIVE', $this->status->provisioningStatus);
+        self::assertEquals('loadbalancer1', $this->status->name);
+        self::assertEquals('loadbalancerId', $this->status->id);
+        self::assertEquals('ONLINE', $this->status->operatingStatus);
+        self::assertEquals('ACTIVE', $this->status->provisioningStatus);
         self::assertIsArray($this->status->listeners);
-        $this->assertArrayHasKey(0, $this->status->listeners);
-        $this->assertInstanceOf(LoadBalancerListener::class, $this->status->listeners[0]);
+        self::assertArrayHasKey(0, $this->status->listeners);
+        self::assertInstanceOf(LoadBalancerListener::class, $this->status->listeners[0]);
     }
 }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerTest.php b/tests/unit/Networking/v2/Models/LoadBalancerTest.php
index eeb7db17..cebe4d23 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerTest.php
@@ -46,7 +46,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/lbaas/loadbalancers', $expectedJson, [], 'loadbalancer-post');
 
-        $this->assertInstanceOf(LoadBalancer::class, $this->loadbalancer->create($opts));
+        self::assertInstanceOf(LoadBalancer::class, $this->loadbalancer->create($opts));
     }
 
     public function test_it_updates()
@@ -71,9 +71,9 @@ public function test_it_retrieves()
 
         $this->loadbalancer->retrieve();
 
-        $this->assertEquals('loadbalancerId', $this->loadbalancer->id);
-        $this->assertEquals('loadbalancer1', $this->loadbalancer->name);
-        $this->assertEquals('simple lb', $this->loadbalancer->description);
+        self::assertEquals('loadbalancerId', $this->loadbalancer->id);
+        self::assertEquals('loadbalancer1', $this->loadbalancer->name);
+        self::assertEquals('simple lb', $this->loadbalancer->description);
     }
 
     public function test_it_deletes()
@@ -108,7 +108,7 @@ public function test_add_listener()
 
         $this->setupMock('POST', 'v2.0/lbaas/listeners', $expectedJson, [], 'loadbalancer-listener-post');
 
-        $this->assertInstanceOf(LoadBalancerListener::class, $this->loadbalancer->addListener($opts));
+        self::assertInstanceOf(LoadBalancerListener::class, $this->loadbalancer->addListener($opts));
     }
 
     public function test_get_stats()
@@ -117,12 +117,12 @@ public function test_get_stats()
 
         $stats = $this->loadbalancer->getStats();
 
-        $this->assertEquals('4321', $stats->bytesIn);
-        $this->assertEquals('1234', $stats->bytesOut);
-        $this->assertEquals(25, $stats->totalConnections);
-        $this->assertEquals(10, $stats->activeConnections);
-        $this->assertEquals($this->loadbalancer->id, $stats->loadbalancerId);
-        $this->assertInstanceOf(LoadBalancerStat::class, $stats);
+        self::assertEquals('4321', $stats->bytesIn);
+        self::assertEquals('1234', $stats->bytesOut);
+        self::assertEquals(25, $stats->totalConnections);
+        self::assertEquals(10, $stats->activeConnections);
+        self::assertEquals($this->loadbalancer->id, $stats->loadbalancerId);
+        self::assertInstanceOf(LoadBalancerStat::class, $stats);
     }
 
     public function test_get_statuses()
@@ -130,13 +130,13 @@ public function test_get_statuses()
         $this->setupMock('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/statuses', null, [], 'loadbalancer-statuses-get');
 
         $status = $this->loadbalancer->getStatuses();
-        $this->assertEquals('loadbalancer1', $status->name);
-        $this->assertEquals('loadbalancerId', $status->id);
-        $this->assertEquals('ONLINE', $status->operatingStatus);
-        $this->assertEquals('ACTIVE', $status->provisioningStatus);
+        self::assertEquals('loadbalancer1', $status->name);
+        self::assertEquals('loadbalancerId', $status->id);
+        self::assertEquals('ONLINE', $status->operatingStatus);
+        self::assertEquals('ACTIVE', $status->provisioningStatus);
         self::assertIsArray($status->listeners);
-        $this->assertArrayHasKey(0, $status->listeners);
-        $this->assertInstanceOf(LoadBalancerListener::class, $status->listeners[0]);
-        $this->assertInstanceOf(LoadBalancerStatus::class, $status);
+        self::assertArrayHasKey(0, $status->listeners);
+        self::assertInstanceOf(LoadBalancerListener::class, $status->listeners[0]);
+        self::assertInstanceOf(LoadBalancerStatus::class, $status);
     }
 }
diff --git a/tests/unit/Networking/v2/Models/NetworkTest.php b/tests/unit/Networking/v2/Models/NetworkTest.php
index 7452981f..1c9d9799 100644
--- a/tests/unit/Networking/v2/Models/NetworkTest.php
+++ b/tests/unit/Networking/v2/Models/NetworkTest.php
@@ -37,7 +37,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/networks', $expectedJson, [], 'network-post');
 
-        $this->assertInstanceOf(Network::class, $this->network->create($opts));
+        self::assertInstanceOf(Network::class, $this->network->create($opts));
     }
 
     public function test_it_bulk_creates()
@@ -75,7 +75,7 @@ public function test_it_bulk_creates()
         $networks = $this->network->bulkCreate($opts);
 
         self::assertIsArray($networks);
-        $this->assertCount(2, $networks);
+        self::assertCount(2, $networks);
     }
 
     public function test_it_updates()
@@ -102,9 +102,9 @@ public function test_it_retrieves()
 
         $this->network->retrieve();
 
-        $this->assertEquals('networkId', $this->network->id);
-        $this->assertEquals('fakenetwork', $this->network->name);
-        $this->assertEquals('ACTIVE', $this->network->status);
+        self::assertEquals('networkId', $this->network->id);
+        self::assertEquals('fakenetwork', $this->network->name);
+        self::assertEquals('ACTIVE', $this->network->status);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Networking/v2/Models/PortTest.php b/tests/unit/Networking/v2/Models/PortTest.php
index 2517bb76..b991ce60 100644
--- a/tests/unit/Networking/v2/Models/PortTest.php
+++ b/tests/unit/Networking/v2/Models/PortTest.php
@@ -52,15 +52,15 @@ public function test_it_retrieves()
         $this->setupMock('GET', 'v2.0/ports/' . self::PORT_ID, null, [], 'port_get');
 
         $this->port->retrieve();
-        $this->assertEquals('46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2', $this->port->id);
-        $this->assertEquals('ACTIVE', $this->port->status);
-        $this->assertEquals('port-name', $this->port->name);
-        $this->assertEquals(true, $this->port->adminStateUp);
-        $this->assertEquals(true,$this->port->portSecurityEnabled);
-        $this->assertEquals('network:router_interface', $this->port->deviceOwner);
-        $this->assertEquals('fake-device-id', $this->port->deviceId);
-        $this->assertEquals('00:11:22:33:44:55', $this->port->macAddress);
-        $this->assertCount(1, $this->port->fixedIps);
+        self::assertEquals('46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2', $this->port->id);
+        self::assertEquals('ACTIVE', $this->port->status);
+        self::assertEquals('port-name', $this->port->name);
+        self::assertEquals(true, $this->port->adminStateUp);
+        self::assertEquals(true,$this->port->portSecurityEnabled);
+        self::assertEquals('network:router_interface', $this->port->deviceOwner);
+        self::assertEquals('fake-device-id', $this->port->deviceId);
+        self::assertEquals('00:11:22:33:44:55', $this->port->macAddress);
+        self::assertCount(1, $this->port->fixedIps);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Networking/v2/Models/SubnetTest.php b/tests/unit/Networking/v2/Models/SubnetTest.php
index b23e7b12..a586eb10 100644
--- a/tests/unit/Networking/v2/Models/SubnetTest.php
+++ b/tests/unit/Networking/v2/Models/SubnetTest.php
@@ -43,7 +43,7 @@ public function test_it_creates()
 
         $this->setupMock('POST', 'v2.0/subnets', $expectedJson, ['Content-Type' => 'application/json'], 'subnet-post');
 
-        $this->assertInstanceOf(Subnet::class, $this->subnet->create($opts));
+        self::assertInstanceOf(Subnet::class, $this->subnet->create($opts));
     }
 
     public function test_it_bulk_creates()
@@ -89,7 +89,7 @@ public function test_it_bulk_creates()
         $subnets = $this->subnet->bulkCreate($opts);
 
         self::assertIsArray($subnets);
-        $this->assertCount(2, $subnets);
+        self::assertCount(2, $subnets);
     }
 
     public function test_it_updates()
@@ -114,10 +114,10 @@ public function test_it_retrieves()
 
         $this->subnet->retrieve();
 
-        $this->assertEquals('subnetId', $this->subnet->id);
-        $this->assertEquals('192.0.0.0/8', $this->subnet->cidr);
-        $this->assertEquals('192.0.0.1', $this->subnet->gatewayIp);
-        $this->assertTrue($this->subnet->enableDhcp);
+        self::assertEquals('subnetId', $this->subnet->id);
+        self::assertEquals('192.0.0.0/8', $this->subnet->cidr);
+        self::assertEquals('192.0.0.1', $this->subnet->gatewayIp);
+        self::assertTrue($this->subnet->enableDhcp);
     }
 
     public function test_it_deletes()
diff --git a/tests/unit/Networking/v2/ServiceTest.php b/tests/unit/Networking/v2/ServiceTest.php
index 551ee2a6..8d533213 100644
--- a/tests/unit/Networking/v2/ServiceTest.php
+++ b/tests/unit/Networking/v2/ServiceTest.php
@@ -41,7 +41,7 @@ public function test_it_creates_an_network()
 
         $this->setupMock('POST', 'v2.0/networks', $expectedJson, [], 'network-post');
 
-        $this->assertInstanceOf(Network::class, $this->service->createNetwork($opts));
+        self::assertInstanceOf(Network::class, $this->service->createNetwork($opts));
     }
 
     public function test_it_bulk_creates_networks()
@@ -79,15 +79,15 @@ public function test_it_bulk_creates_networks()
         $networks = $this->service->createNetworks($opts);
 
         self::assertIsArray($networks);
-        $this->assertCount(2, $networks);
+        self::assertCount(2, $networks);
     }
 
     public function test_it_gets_an_network()
     {
         $network = $this->service->getNetwork('networkId');
 
-        $this->assertInstanceOf(Network::class, $network);
-        $this->assertEquals('networkId', $network->id);
+        self::assertInstanceOf(Network::class, $network);
+        self::assertEquals('networkId', $network->id);
     }
 
     public function test_it_lists_networks()
@@ -98,7 +98,7 @@ public function test_it_lists_networks()
             ->willReturn($this->getFixture('networks-post'));
 
         foreach ($this->service->listNetworks() as $network) {
-            $this->assertInstanceOf(Network::class, $network);
+            self::assertInstanceOf(Network::class, $network);
         }
     }
 
@@ -122,7 +122,7 @@ public function test_it_creates_a_subnet()
 
         $this->setupMock('POST', 'v2.0/subnets', $expectedJson, ['Content-Type' => 'application/json'], 'subnet-post');
 
-        $this->assertInstanceOf(Subnet::class, $this->service->createSubnet($opts));
+        self::assertInstanceOf(Subnet::class, $this->service->createSubnet($opts));
     }
 
     public function test_it_bulk_creates_subnets()
@@ -168,15 +168,15 @@ public function test_it_bulk_creates_subnets()
         $subnets = $this->service->createSubnets($opts);
 
         self::assertIsArray($subnets);
-        $this->assertCount(2, $subnets);
+        self::assertCount(2, $subnets);
     }
 
     public function test_it_gets_an_subnet()
     {
         $subnet = $this->service->getSubnet('subnetId');
 
-        $this->assertInstanceOf(Subnet::class, $subnet);
-        $this->assertEquals('subnetId', $subnet->id);
+        self::assertInstanceOf(Subnet::class, $subnet);
+        self::assertEquals('subnetId', $subnet->id);
     }
 
     public function test_it_lists_subnets()
@@ -187,7 +187,7 @@ public function test_it_lists_subnets()
             ->willReturn($this->getFixture('subnets-post'));
 
         foreach ($this->service->listSubnets() as $subnet) {
-            $this->assertInstanceOf(Subnet::class, $subnet);
+            self::assertInstanceOf(Subnet::class, $subnet);
         }
     }
 
@@ -207,7 +207,7 @@ public function test_it_creates_a_port()
 
         $this->setupMock('POST', 'v2.0/ports', $expectedJson, [], 'ports_post');
 
-        $this->assertInstanceOf(Port::class, $this->service->createPort($opts));
+        self::assertInstanceOf(Port::class, $this->service->createPort($opts));
     }
 
     public function test_it_bulk_creates_ports()
@@ -245,15 +245,15 @@ public function test_it_bulk_creates_ports()
         $ports = $this->service->createPorts($opts);
 
         self::assertIsArray($ports);
-        $this->assertCount(2, $ports);
+        self::assertCount(2, $ports);
     }
 
     public function test_it_gets_an_port()
     {
         $port = $this->service->getPort('portId');
 
-        $this->assertInstanceOf(Port::class, $port);
-        $this->assertEquals('portId', $port->id);
+        self::assertInstanceOf(Port::class, $port);
+        self::assertEquals('portId', $port->id);
     }
 
     public function test_it_lists_ports()
@@ -264,7 +264,7 @@ public function test_it_lists_ports()
             ->willReturn($this->getFixture('ports_get'));
 
         foreach ($this->service->listPorts() as $port) {
-            $this->assertInstanceOf(Port::class, $port);
+            self::assertInstanceOf(Port::class, $port);
         }
     }
 
@@ -276,7 +276,7 @@ public function test_it_list_quotas()
             ->willReturn($this->getFixture('quotas-get'));
 
         foreach ($this->service->listQuotas() as $quota) {
-            $this->assertInstanceOf(Quota::class, $quota);
+            self::assertInstanceOf(Quota::class, $quota);
         }
     }
 
@@ -290,7 +290,7 @@ public function test_it_gets_quotas()
         $quota = $this->service->getQuota('fake_tenant_id');
         $quota->retrieve();
 
-        $this->assertInstanceOf(Quota::class, $quota);
+        self::assertInstanceOf(Quota::class, $quota);
     }
 
     public function test_it_gets_default_quotas()
diff --git a/tests/unit/ObjectStore/v1/Models/AccountTest.php b/tests/unit/ObjectStore/v1/Models/AccountTest.php
index fced36f1..18d7d295 100644
--- a/tests/unit/ObjectStore/v1/Models/AccountTest.php
+++ b/tests/unit/ObjectStore/v1/Models/AccountTest.php
@@ -25,10 +25,10 @@ public function test_Response_Populates_Model()
 
         $this->account->populateFromResponse($response);
 
-        $this->assertEquals(1, $this->account->objectCount);
-        $this->assertEquals(['Book' => 'MobyDick', 'Genre' => 'Fiction'], $this->account->metadata);
-        $this->assertEquals(14, $this->account->bytesUsed);
-        $this->assertEquals(2, $this->account->containerCount);
+        self::assertEquals(1, $this->account->objectCount);
+        self::assertEquals(['Book' => 'MobyDick', 'Genre' => 'Fiction'], $this->account->metadata);
+        self::assertEquals(14, $this->account->bytesUsed);
+        self::assertEquals(2, $this->account->containerCount);
     }
 
     public function test_Retrieve()
@@ -37,13 +37,13 @@ public function test_Retrieve()
 
         $this->account->retrieve();
 
-        $this->assertNotEmpty($this->account->metadata);
+        self::assertNotEmpty($this->account->metadata);
     }
 
     public function test_Get_Metadata()
     {
         $this->setupMock('HEAD', '', null, [], 'HEAD_Account');
-        $this->assertEquals(['Book' => 'MobyDick', 'Genre' => 'Fiction'], $this->account->getMetadata());
+        self::assertEquals(['Book' => 'MobyDick', 'Genre' => 'Fiction'], $this->account->getMetadata());
     }
 
     public function test_Merge_Metadata()
diff --git a/tests/unit/ObjectStore/v1/Models/ContainerTest.php b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
index a3caaf2e..0e1484b6 100644
--- a/tests/unit/ObjectStore/v1/Models/ContainerTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
@@ -34,9 +34,9 @@ public function test_Populate_From_Response()
 
         $this->container->populateFromResponse($response);
 
-        $this->assertEquals(1, $this->container->objectCount);
-        $this->assertEquals(['Book' => 'TomSawyer', 'Author' => 'SamuelClemens'], $this->container->metadata);
-        $this->assertEquals(14, $this->container->bytesUsed);
+        self::assertEquals(1, $this->container->objectCount);
+        self::assertEquals(['Book' => 'TomSawyer', 'Author' => 'SamuelClemens'], $this->container->metadata);
+        self::assertEquals(14, $this->container->bytesUsed);
     }
 
     public function test_Retrieve()
@@ -44,14 +44,14 @@ public function test_Retrieve()
         $this->setupMock('HEAD', self::NAME, null, [], 'HEAD_Container');
 
         $this->container->retrieve();
-        $this->assertNotEmpty($this->container->metadata);
+        self::assertNotEmpty($this->container->metadata);
     }
 
     public function test_Get_Metadata()
     {
         $this->setupMock('HEAD', self::NAME, null, [], 'HEAD_Container');
 
-        $this->assertEquals(['Book' => 'TomSawyer', 'Author' => 'SamuelClemens'], $this->container->getMetadata());
+        self::assertEquals(['Book' => 'TomSawyer', 'Author' => 'SamuelClemens'], $this->container->getMetadata());
     }
 
     public function test_Merge_Metadata()
@@ -95,8 +95,8 @@ public function test_It_Gets_Object()
     {
         $object = $this->container->getObject('foo.txt');
 
-        $this->assertInstanceOf(StorageObject::class, $object);
-        $this->assertEquals('foo.txt', $object->name);
+        self::assertInstanceOf(StorageObject::class, $object);
+        self::assertEquals('foo.txt', $object->name);
     }
 
     public function test_It_Create_Objects()
@@ -127,8 +127,8 @@ public function test_It_Create_Objects()
             'metadata'           => ['Author' => 'foo', 'genre' => 'bar'],
         ]);
 
-        $this->assertEquals('foo.txt', $storageObject->name);
-        $this->assertEquals(self::NAME, $storageObject->containerName);
+        self::assertEquals('foo.txt', $storageObject->name);
+        self::assertEquals(self::NAME, $storageObject->containerName);
     }
 
     public function test_it_lists_objects()
@@ -140,7 +140,7 @@ public function test_it_lists_objects()
 
         $objects = iterator_to_array($this->container->listObjects(['limit' => 2]));
 
-        $this->assertEquals(2, count($objects));
+        self::assertEquals(2, count($objects));
 
         $expected = [
             [
@@ -167,7 +167,7 @@ public function test_it_lists_objects()
 
             foreach ($exp as $attr => $attrVal)
             {
-                $this->assertEquals($attrVal, $obj->{$attr});
+                self::assertEquals($attrVal, $obj->{$attr});
             }
         }
     }
@@ -176,7 +176,7 @@ public function test_true_is_returned_for_existing_object()
     {
         $this->setupMock('HEAD', 'test/bar', null, [], new Response(200));
 
-        $this->assertTrue($this->container->objectExists('bar'));
+        self::assertTrue($this->container->objectExists('bar'));
     }
 
     public function test_false_is_returned_for_non_existing_object()
@@ -190,7 +190,7 @@ public function test_false_is_returned_for_non_existing_object()
             ->shouldBeCalled()
             ->willThrow($e);
 
-        $this->assertFalse($this->container->objectExists('bar'));
+        self::assertFalse($this->container->objectExists('bar'));
     }
 
     public function test_other_exceptions_are_thrown()
diff --git a/tests/unit/ObjectStore/v1/Models/ObjectTest.php b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
index 084ff7d2..e64366fa 100644
--- a/tests/unit/ObjectStore/v1/Models/ObjectTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
@@ -59,14 +59,14 @@ public function test_Retrieve()
         $this->setupMock('HEAD', self::CONTAINER . '/' . self::NAME, null, [], 'HEAD_Object');
 
         $this->object->retrieve();
-        $this->assertNotEmpty($this->object->metadata);
+        self::assertNotEmpty($this->object->metadata);
     }
 
     public function test_Get_Metadata()
     {
         $this->setupMock('HEAD', self::CONTAINER . '/' . self::NAME, null, [], 'HEAD_Object');
 
-        $this->assertEquals([
+        self::assertEquals([
             'Book'         => 'GoodbyeColumbus',
             'Manufacturer' => 'Acme',
         ], $this->object->getMetadata());
@@ -108,8 +108,8 @@ public function test_It_Downloads()
 
         $stream = $this->object->download();
 
-        $this->assertInstanceOf(Stream::class, $stream);
-        $this->assertEquals(14, $stream->getSize());
+        self::assertInstanceOf(Stream::class, $stream);
+        self::assertEquals(14, $stream->getSize());
     }
 
     public function test_It_Copies()
@@ -133,6 +133,6 @@ public function test_It_Gets_Public_Uri()
         $this->object->containerName = 'foo';
         $this->object->name = 'bar';
 
-        $this->assertEquals(uri_for('myopenstack.org:9000/tenantId/foo/bar'), $this->object->getPublicUri());
+        self::assertEquals(uri_for('myopenstack.org:9000/tenantId/foo/bar'), $this->object->getPublicUri());
     }
 }
diff --git a/tests/unit/ObjectStore/v1/ServiceTest.php b/tests/unit/ObjectStore/v1/ServiceTest.php
index 2c4f8492..901e10d2 100644
--- a/tests/unit/ObjectStore/v1/ServiceTest.php
+++ b/tests/unit/ObjectStore/v1/ServiceTest.php
@@ -26,7 +26,7 @@ public function setUp(): void
 
     public function test_Account()
     {
-        $this->assertInstanceOf(Account::class, $this->service->getAccount());
+        self::assertInstanceOf(Account::class, $this->service->getAccount());
     }
 
     public function test_it_lists_containers()
@@ -37,7 +37,7 @@ public function test_it_lists_containers()
             ->willReturn($this->getFixture('GET_Container'));
 
         foreach ($this->service->listContainers(['limit' => 2]) as $container) {
-            $this->assertInstanceOf(Container::class, $container);
+            self::assertInstanceOf(Container::class, $container);
         }
     }
 
@@ -51,7 +51,7 @@ public function test_it_returns_true_for_existing_containers()
     {
         $this->setupMock('HEAD', 'foo', null, [], new Response(200));
 
-        $this->assertTrue($this->service->containerExists('foo'));
+        self::assertTrue($this->service->containerExists('foo'));
     }
 
     public function test_it_returns_false_if_container_does_not_exist()
@@ -65,7 +65,7 @@ public function test_it_returns_false_if_container_does_not_exist()
             ->shouldBeCalled()
             ->willThrow($e);
 
-        $this->assertFalse($this->service->containerExists('foo'));
+        self::assertFalse($this->service->containerExists('foo'));
     }
 
     public function test_it_throws_exception_when_error()
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
index 84040f5a..01c2131c 100644
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
@@ -77,23 +77,23 @@ protected function listTest(callable $call, $urlPath, $modelName = null, $respon
 
         $resources = call_user_func($call);
 
-        $this->assertInstanceOf('\Generator', $resources);
+        self::assertInstanceOf('\Generator', $resources);
 
         $count = 0;
 
         foreach ($resources as $resource) {
-            $this->assertInstanceOf('OpenStack\Identity\v3\Models\\' . ucfirst($modelName), $resource);
+            self::assertInstanceOf('OpenStack\Identity\v3\Models\\' . ucfirst($modelName), $resource);
             ++$count;
         }
 
-        $this->assertEquals(2, $count);
+        self::assertEquals(2, $count);
     }
 
     protected function getTest(callable $call, $modelName)
     {
         $resource = call_user_func($call);
 
-        $this->assertInstanceOf('OpenStack\Identity\v3\Models\\' . ucfirst($modelName), $resource);
-        $this->assertEquals('id', $resource->id);
+        self::assertInstanceOf('OpenStack\Identity\v3\Models\\' . ucfirst($modelName), $resource);
+        self::assertEquals('id', $resource->id);
     }
 }

From af576781374279a28020b62bfacb7ce6773a3a2c Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Wed, 6 Jan 2021 13:37:10 +0100
Subject: [PATCH 040/102] Re-format the code

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 src/Common/Transport/Middleware.php |  2 +-
 src/OpenStack.php                   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Common/Transport/Middleware.php b/src/Common/Transport/Middleware.php
index a601741f..5f3077ca 100644
--- a/src/Common/Transport/Middleware.php
+++ b/src/Common/Transport/Middleware.php
@@ -20,7 +20,7 @@ public static function httpErrors(): callable
         return function (callable $handler) {
             return function ($request, array $options) use ($handler) {
                 return $handler($request, $options)->then(
-                    function (ResponseInterface $response) use ($request, $handler) {
+                    function (ResponseInterface $response) use ($request) {
                         if ($response->getStatusCode() < 400) {
                             return $response;
                         }
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 3da8700f..822de303 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -77,7 +77,7 @@ private function getDefaultIdentityService(array $options): Service
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function computeV2(array $options = []): \OpenStack\Compute\v2\Service
+    public function computeV2(array $options = []): Compute\v2\Service
     {
         $defaults = ['catalogName' => 'nova', 'catalogType' => 'compute'];
 
@@ -89,7 +89,7 @@ public function computeV2(array $options = []): \OpenStack\Compute\v2\Service
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function networkingV2(array $options = []): \OpenStack\Networking\v2\Service
+    public function networkingV2(array $options = []): Networking\v2\Service
     {
         $defaults = ['catalogName' => 'neutron', 'catalogType' => 'network'];
 
@@ -101,7 +101,7 @@ public function networkingV2(array $options = []): \OpenStack\Networking\v2\Serv
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function networkingV2ExtLayer3(array $options = []): \OpenStack\Networking\v2\Extensions\Layer3\Service
+    public function networkingV2ExtLayer3(array $options = []): Networking\v2\Extensions\Layer3\Service
     {
         $defaults = ['catalogName' => 'neutron', 'catalogType' => 'network'];
 
@@ -113,7 +113,7 @@ public function networkingV2ExtLayer3(array $options = []): \OpenStack\Networkin
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function networkingV2ExtSecGroups(array $options = []): \OpenStack\Networking\v2\Extensions\SecurityGroups\Service
+    public function networkingV2ExtSecGroups(array $options = []): Networking\v2\Extensions\SecurityGroups\Service
     {
         $defaults = ['catalogName' => 'neutron', 'catalogType' => 'network'];
 
@@ -125,7 +125,7 @@ public function networkingV2ExtSecGroups(array $options = []): \OpenStack\Networ
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function identityV2(array $options = []): \OpenStack\Identity\v2\Service
+    public function identityV2(array $options = []): Identity\v2\Service
     {
         $defaults = ['catalogName' => 'keystone', 'catalogType' => 'identity'];
 
@@ -137,7 +137,7 @@ public function identityV2(array $options = []): \OpenStack\Identity\v2\Service
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function identityV3(array $options = []): \OpenStack\Identity\v3\Service
+    public function identityV3(array $options = []): Service
     {
         $defaults = ['catalogName' => 'keystone', 'catalogType' => 'identity'];
 
@@ -149,7 +149,7 @@ public function identityV3(array $options = []): \OpenStack\Identity\v3\Service
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function objectStoreV1(array $options = []): \OpenStack\ObjectStore\v1\Service
+    public function objectStoreV1(array $options = []): ObjectStore\v1\Service
     {
         $defaults = ['catalogName' => 'swift', 'catalogType' => 'object-store'];
 
@@ -161,7 +161,7 @@ public function objectStoreV1(array $options = []): \OpenStack\ObjectStore\v1\Se
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function blockStorageV2(array $options = []): \OpenStack\BlockStorage\v2\Service
+    public function blockStorageV2(array $options = []): BlockStorage\v2\Service
     {
         $defaults = ['catalogName' => 'cinderv2', 'catalogType' => 'volumev2'];
 
@@ -173,7 +173,7 @@ public function blockStorageV2(array $options = []): \OpenStack\BlockStorage\v2\
      *
      * @param array $options options that will be used in configuring the service
      */
-    public function imagesV2(array $options = []): \OpenStack\Images\v2\Service
+    public function imagesV2(array $options = []): Images\v2\Service
     {
         $defaults = ['catalogName' => 'glance', 'catalogType' => 'image'];
 
@@ -183,7 +183,7 @@ public function imagesV2(array $options = []): \OpenStack\Images\v2\Service
     /**
      * Creates a new Gnocchi Metric service v1.
      */
-    public function metricGnocchiV1(array $options = []): \OpenStack\Metric\v1\Gnocchi\Service
+    public function metricGnocchiV1(array $options = []): Metric\v1\Gnocchi\Service
     {
         $defaults = ['catalogName' => 'gnocchi', 'catalogType' => 'metric'];
 

From e4cb7e2151887f0076380970696a7c4bffd01ecd Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Wed, 6 Jan 2021 13:43:43 +0100
Subject: [PATCH 041/102] Update friendsofphp/php-cs-fixer to a version
 compatible with php8

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9f4d4562..f8042232 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "phpunit/phpunit": "^8.0",
         "psr/log": "^1.0",
         "php-coveralls/php-coveralls": "^2.0",
-        "friendsofphp/php-cs-fixer": "^2.13",
+        "friendsofphp/php-cs-fixer": "^2.17",
         "php-parallel-lint/php-parallel-lint": "^1.2"
     },
     "extra": {

From 0fc440cb49f5f5a38e416bd2e273d6d70a641d38 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Wed, 6 Jan 2021 13:50:55 +0100
Subject: [PATCH 042/102] Make the cs-fixer pass on php8

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 91f83d70..730bf04e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,10 @@ before_install:
 before_script:
   - composer install --prefer-source
   - vendor/bin/parallel-lint --exclude vendor .
-  - vendor/bin/php-cs-fixer fix --dry-run --diff
+
+  # Once php8 is officially supported by the cs-fixer, the env variable should be dropped
+  # Ref https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4702
+  - PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --diff
   - phpenv config-add ./xdebug.ini
 
 after_script:

From 43864e9a1e6fd8bf1af680e74219f4e943d3972f Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 18 Jan 2021 13:46:23 +0100
Subject: [PATCH 043/102] Update friendsofphp/php-cs-fixer for php8

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 .travis.yml   | 5 +----
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 730bf04e..91f83d70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,7 @@ before_install:
 before_script:
   - composer install --prefer-source
   - vendor/bin/parallel-lint --exclude vendor .
-
-  # Once php8 is officially supported by the cs-fixer, the env variable should be dropped
-  # Ref https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4702
-  - PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --diff
+  - vendor/bin/php-cs-fixer fix --dry-run --diff
   - phpenv config-add ./xdebug.ini
 
 after_script:
diff --git a/composer.json b/composer.json
index f8042232..82ba7987 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "phpunit/phpunit": "^8.0",
         "psr/log": "^1.0",
         "php-coveralls/php-coveralls": "^2.0",
-        "friendsofphp/php-cs-fixer": "^2.17",
+        "friendsofphp/php-cs-fixer": "^2.18",
         "php-parallel-lint/php-parallel-lint": "^1.2"
     },
     "extra": {

From 1296815eacb5a989da02d110954fda19448c1191 Mon Sep 17 00:00:00 2001
From: haphan <thanhha.work@gmail.com>
Date: Fri, 2 Apr 2021 23:01:50 +0800
Subject: [PATCH 044/102] v3.2 to support PHP 8.0

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 956d7799..85ca6e09 100644
--- a/README.md
+++ b/README.md
@@ -39,11 +39,12 @@ out by open an issue in github.
 
 ## Version Guidance
 
-| Version   | Status                      | PHP Version   | Support until           |
-| --------- | --------------------------- | ------------- | ----------------------- |
-| `^3.1`    | Latest                      | `>=7.2.5`     | Oct 2023                |
-| `^3.0`    | Bug fixed only              | `>=7.0`       | Oct 2020                |
-| `^2.0`    | End of life                 | `>=7.0,<7.2`  | March 2018              |
+| Version   | Status                      | PHP Version      | Support until           |
+| --------- | --------------------------- | ---------------- | ----------------------- |
+| `^3.2`    | Latest                      | `>=7.2.5, >=8.0`  | Current                 |
+| `^3.1`    | Latest                      | `>=7.2.5`        | Current                 |
+| `^3.0`    | Bug fixed only              | `>=7.0`          | Oct 2020                |
+| `^2.0`    | End of life                 | `>=7.0,<7.2`     | March 2018              |
 
 
 ## Upgrade from 2.x to 3.x

From 8a6a6a788ee0a662274eef994b0f2701562038ec Mon Sep 17 00:00:00 2001
From: Julien Maulny <julien.maulny@protonmail.com>
Date: Fri, 23 Apr 2021 15:00:45 +0200
Subject: [PATCH 045/102] Fix Call to undefined function
 GuzzleHttp\Psr7\modify_request()

---
 src/Common/Auth/AuthHandler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Common/Auth/AuthHandler.php b/src/Common/Auth/AuthHandler.php
index e5a4e286..de396cc0 100644
--- a/src/Common/Auth/AuthHandler.php
+++ b/src/Common/Auth/AuthHandler.php
@@ -4,7 +4,7 @@
 
 namespace OpenStack\Common\Auth;
 
-use function GuzzleHttp\Psr7\modify_request;
+use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\RequestInterface;
 
 /**
@@ -53,7 +53,7 @@ public function __invoke(RequestInterface $request, array $options)
 
         $modify = ['set_headers' => ['X-Auth-Token' => $this->token->getId()]];
 
-        return $fn(modify_request($request, $modify), $options);
+        return $fn(Utils::modifyRequest($request, $modify), $options);
     }
 
     /**

From 8723ea4a1399303f44c983559bd07fa59582c28c Mon Sep 17 00:00:00 2001
From: Julien Maulny <julien.maulny@protonmail.com>
Date: Fri, 23 Apr 2021 17:41:12 +0200
Subject: [PATCH 046/102] Remove deprecated calls to Guzzle/Psr7 functions in
 unit tests

---
 tests/unit/Common/Api/OperatorTraitTest.php         | 1 -
 tests/unit/Common/Error/BuilderTest.php             | 6 ++----
 tests/unit/Common/Resource/AbstractResourceTest.php | 4 ++--
 tests/unit/Common/Transport/UtilsTest.php           | 8 ++++----
 tests/unit/ObjectStore/v1/Models/ObjectTest.php     | 6 +++---
 tests/unit/TestCase.php                             | 8 ++++----
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
index 6bad6b18..3af97ac0 100644
--- a/tests/unit/Common/Api/OperatorTraitTest.php
+++ b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -2,7 +2,6 @@
 
 namespace OpenStack\Test\Common\Api;
 
-use function GuzzleHttp\Psr7\uri_for;
 use GuzzleHttp\Promise\Promise;
 use GuzzleHttp\Psr7\Response;
 use OpenStack\Common\Api\Operation;
diff --git a/tests/unit/Common/Error/BuilderTest.php b/tests/unit/Common/Error/BuilderTest.php
index 6d84d60e..7d44eb82 100644
--- a/tests/unit/Common/Error/BuilderTest.php
+++ b/tests/unit/Common/Error/BuilderTest.php
@@ -2,13 +2,11 @@
 
 namespace OpenStack\Test\Common\Error;
 
-use function GuzzleHttp\Psr7\stream_for;
-use function GuzzleHttp\Psr7\str;
-
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 use OpenStack\Common\Error\BadResponseError;
 use OpenStack\Common\Error\Builder;
 use OpenStack\Common\Error\UserInputError;
@@ -32,7 +30,7 @@ public function test_it_injects_client()
     public function test_it_builds_http_errors()
     {
         $request = new Request('POST', '/servers');
-        $response = new Response(400, [], stream_for('Invalid parameters'));
+        $response = new Response(400, [], Utils::streamFor('Invalid parameters'));
 
         $requestStr = trim($this->builder->str($request));
         $responseStr = trim($this->builder->str($response));
diff --git a/tests/unit/Common/Resource/AbstractResourceTest.php b/tests/unit/Common/Resource/AbstractResourceTest.php
index e48a6d7e..d9645fb9 100644
--- a/tests/unit/Common/Resource/AbstractResourceTest.php
+++ b/tests/unit/Common/Resource/AbstractResourceTest.php
@@ -3,7 +3,7 @@
 namespace OpenStack\Test\Common\Resource;
 
 use GuzzleHttp\Psr7\Response;
-use function GuzzleHttp\Psr7\stream_for;
+use GuzzleHttp\Psr7\Utils;
 use OpenStack\Common\Resource\AbstractResource;
 use OpenStack\Common\Resource\Alias;
 use OpenStack\Common\Resource\ResourceInterface;
@@ -25,7 +25,7 @@ public function setUp(): void
 
     public function test_it_populates_from_response()
     {
-        $response = new Response(200, ['Content-Type' => 'application/json'], stream_for(
+        $response = new Response(200, ['Content-Type' => 'application/json'], Utils::streamFor(
             json_encode(['foo' => ['bar' => '1']])
         ));
 
diff --git a/tests/unit/Common/Transport/UtilsTest.php b/tests/unit/Common/Transport/UtilsTest.php
index 6d6c37c5..ff4f828f 100644
--- a/tests/unit/Common/Transport/UtilsTest.php
+++ b/tests/unit/Common/Transport/UtilsTest.php
@@ -3,8 +3,8 @@
 namespace OpenStack\Test\Common\Transport;
 
 use GuzzleHttp\Psr7\Response;
-use function GuzzleHttp\Psr7\uri_for;
 use GuzzleHttp\Psr7\Uri;
+use GuzzleHttp\Psr7\Utils as Psr7Utils;
 use OpenStack\Common\Transport\Utils;
 use OpenStack\Test\TestCase;
 
@@ -12,7 +12,7 @@ class UtilsTest extends TestCase
 {
     public function test_decoding_malformed_json_throws_error()
     {
-        $response = new Response(200, [], \GuzzleHttp\Psr7\stream_for('{'));
+        $response = new Response(200, [], Psr7Utils::streamFor('{'));
 		$this->expectException(\InvalidArgumentException::class);
 
         Utils::jsonDecode($response);
@@ -20,9 +20,9 @@ public function test_decoding_malformed_json_throws_error()
 
     public function test_it_adds_paths()
     {
-        $uri = Utils::addPaths(uri_for('http://openstack.org/foo'), 'bar', 'baz', '1', '2');
+        $uri = Utils::addPaths(Psr7Utils::uriFor('http://openstack.org/foo'), 'bar', 'baz', '1', '2');
 
         self::assertInstanceOf(Uri::class, $uri);
-        self::assertEquals(uri_for('http://openstack.org/foo/bar/baz/1/2'), $uri);
+        self::assertEquals(Psr7Utils::uriFor('http://openstack.org/foo/bar/baz/1/2'), $uri);
     }
 }
diff --git a/tests/unit/ObjectStore/v1/Models/ObjectTest.php b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
index e64366fa..56eca319 100644
--- a/tests/unit/ObjectStore/v1/Models/ObjectTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
@@ -2,8 +2,8 @@
 
 namespace OpenStack\Test\ObjectStore\v1\Models;
 
-use function GuzzleHttp\Psr7\uri_for;
 use GuzzleHttp\Psr7\Stream;
+use GuzzleHttp\Psr7\Utils;
 use OpenStack\ObjectStore\v1\Api;
 use OpenStack\ObjectStore\v1\Models\StorageObject;
 use OpenStack\Test\TestCase;
@@ -128,11 +128,11 @@ public function test_It_Gets_Public_Uri()
     {
         $this->client->getConfig('base_uri')
             ->shouldBeCalled()
-            ->willReturn(uri_for('myopenstack.org:9000/tenantId'));
+            ->willReturn(Utils::uriFor('myopenstack.org:9000/tenantId'));
 
         $this->object->containerName = 'foo';
         $this->object->name = 'bar';
 
-        self::assertEquals(uri_for('myopenstack.org:9000/tenantId/foo/bar'), $this->object->getPublicUri());
+        self::assertEquals(Utils::uriFor('myopenstack.org:9000/tenantId/foo/bar'), $this->object->getPublicUri());
     }
 }
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
index 01c2131c..d29b38b7 100644
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
@@ -2,10 +2,10 @@
 
 namespace OpenStack\Test;
 
-use function GuzzleHttp\Psr7\stream_for;
-use function GuzzleHttp\Psr7\parse_response;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Psr7\Message;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
 use Prophecy\Argument;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
@@ -25,7 +25,7 @@ protected function setUp(): void
 
     protected function createResponse($status, array $headers, array $json)
     {
-        return new Response($status, $headers, stream_for(json_encode($json)));
+        return new Response($status, $headers, Utils::streamFor(json_encode($json)));
     }
 
     protected function getFixture($file)
@@ -40,7 +40,7 @@ protected function getFixture($file)
             throw new \RuntimeException(sprintf("%s does not exist", $path));
         }
 
-        return parse_response(file_get_contents($path));
+        return Message::parseResponse(file_get_contents($path));
     }
 
     protected function setupMock($method, $path, $body = null, array $headers = [], $response = null)

From de8da53d64c959b8ecf32d83b183b97b213d947e Mon Sep 17 00:00:00 2001
From: k0ka <koka@idwrx.com>
Date: Sat, 8 Apr 2023 10:36:20 +0200
Subject: [PATCH 047/102] allow uri-templae 1.0 to be compatible with the
 latest Laravel

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 82ba7987..3029f725 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
     "require": {
         "php": "^7.2.5|^8.0",
         "guzzlehttp/guzzle": "^7.0",
-        "guzzlehttp/uri-template": "0.2",
+        "guzzlehttp/uri-template": "^0.2|^1.0",
         "justinrainbow/json-schema": "^5.2"
     },
     "require-dev": {

From 3f846928da93a84187d4bca655804fe03f4ab3cf Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sat, 24 Jun 2023 19:55:49 +0200
Subject: [PATCH 048/102] Unit test (#360)

* fix tests for new Guzzle

* unit tests workflow
---
 .github/workflows/unit_tests.yml              | 36 +++++++++++++++++++
 .gitignore                                    |  1 +
 composer.json                                 |  3 +-
 .../images/v2/images/upload_binary_data.php   |  6 +++-
 .../Common/Resource/OperatorResourceTest.php  |  4 ++-
 tests/unit/Images/v2/Models/ImageTest.php     | 16 +++++++--
 tests/unit/Images/v2/ServiceTest.php          | 12 +++++--
 .../ObjectStore/v1/Models/ContainerTest.php   |  5 +--
 8 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/unit_tests.yml

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
new file mode 100644
index 00000000..b104e2be
--- /dev/null
+++ b/.github/workflows/unit_tests.yml
@@ -0,0 +1,36 @@
+name: Run Unit Tests
+on:
+  push:
+  pull_request:
+jobs:
+  tests:
+    runs-on: ubuntu-22.04
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+         php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
+    name: "php-${{ matrix.php }}"
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }}
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl
+          tools: composer:v2
+          coverage: none
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - run: vendor/bin/parallel-lint --exclude vendor .
+      - name: execute unit tests
+        run: vendor/bin/phpunit --configuration phpunit.xml.dist
+
diff --git a/.gitignore b/.gitignore
index 5bf48fc4..009ad83a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ coverage/
 vendor/
 *.pyc
 phpunit.xml
+.phpunit.result.cache
 coverage.xml
 composer.lock
 env_test.sh
diff --git a/composer.json b/composer.json
index 3029f725..ec065b98 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,8 @@
         "psr/log": "^1.0",
         "php-coveralls/php-coveralls": "^2.0",
         "friendsofphp/php-cs-fixer": "^2.18",
-        "php-parallel-lint/php-parallel-lint": "^1.2"
+        "php-parallel-lint/php-parallel-lint": "^1.2",
+        "phpspec/prophecy": "^1.17"
     },
     "extra": {
         "branch-alias": {
diff --git a/samples/images/v2/images/upload_binary_data.php b/samples/images/v2/images/upload_binary_data.php
index fc42e6ff..152f55a0 100644
--- a/samples/images/v2/images/upload_binary_data.php
+++ b/samples/images/v2/images/upload_binary_data.php
@@ -12,5 +12,9 @@
 $service = $openstack->imagesV2();
 
 $image  = $service->getImage('{imageId}');
-$stream = \GuzzleHttp\Psr7\stream_for(fopen('{fileName}', 'r'));
+
+$stream = function_exists('\GuzzleHttp\Psr7\stream_for')
+    ? \GuzzleHttp\Psr7\stream_for(fopen('{fileName}', 'r'))
+    : \GuzzleHttp\Psr7\Utils::streamFor(fopen('{fileName}', 'r'));
+
 $image->uploadData($stream);
diff --git a/tests/unit/Common/Resource/OperatorResourceTest.php b/tests/unit/Common/Resource/OperatorResourceTest.php
index 3ebcb076..51f55e51 100644
--- a/tests/unit/Common/Resource/OperatorResourceTest.php
+++ b/tests/unit/Common/Resource/OperatorResourceTest.php
@@ -28,7 +28,9 @@ public function setUp(): void
 
     public function test_it_retrieves_base_http_url()
     {
-        $returnedUri = \GuzzleHttp\Psr7\uri_for('http://foo.com');
+        $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for')
+            ? \GuzzleHttp\Psr7\uri_for('http://foo.com')
+            : \GuzzleHttp\Psr7\Utils::uriFor('http://foo.com');
         $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn($returnedUri);
 
         $uri = $this->resource->testBaseUri();
diff --git a/tests/unit/Images/v2/Models/ImageTest.php b/tests/unit/Images/v2/Models/ImageTest.php
index 0ef1a910..b1ea1674 100644
--- a/tests/unit/Images/v2/Models/ImageTest.php
+++ b/tests/unit/Images/v2/Models/ImageTest.php
@@ -30,7 +30,11 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn(\GuzzleHttp\Psr7\uri_for(''));
+        $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for')
+            ? \GuzzleHttp\Psr7\uri_for('')
+            : \GuzzleHttp\Psr7\Utils::uriFor('');
+
+        $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn($returnedUri);
 
         $this->setupMock('GET', $this->path, null, [], 'GET_image');
 
@@ -123,7 +127,10 @@ public function test_it_deactivates()
 
     public function test_it_uploads_data_stream()
     {
-        $stream  = \GuzzleHttp\Psr7\stream_for('data');
+        $stream = function_exists('\GuzzleHttp\Psr7\stream_for')
+            ? \GuzzleHttp\Psr7\stream_for('data')
+            : \GuzzleHttp\Psr7\Utils::streamFor('data');
+
         $headers = ['Content-Type' => 'application/octet-stream'];
 
         $this->setupMock('PUT', $this->path . '/file', $stream, $headers, new Response(204));
@@ -133,7 +140,10 @@ public function test_it_uploads_data_stream()
 
     public function test_it_downloads_data()
     {
-        $stream  = \GuzzleHttp\Psr7\stream_for('data');
+        $stream = function_exists('\GuzzleHttp\Psr7\stream_for')
+            ? \GuzzleHttp\Psr7\stream_for('data')
+            : \GuzzleHttp\Psr7\Utils::streamFor('data');
+
         $headers = ['Content-Type' => 'application/octet-stream'];
         $response = new Response(200, $headers, $stream);
 
diff --git a/tests/unit/Images/v2/ServiceTest.php b/tests/unit/Images/v2/ServiceTest.php
index 6a72cb2b..f26b7814 100644
--- a/tests/unit/Images/v2/ServiceTest.php
+++ b/tests/unit/Images/v2/ServiceTest.php
@@ -23,10 +23,14 @@ public function setUp(): void
 
     public function test_it_creates_image()
     {
+        $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for')
+            ? \GuzzleHttp\Psr7\uri_for('')
+            : \GuzzleHttp\Psr7\Utils::uriFor('');
+
         $this->client
             ->getConfig('base_uri')
             ->shouldBeCalled()
-            ->willReturn(\GuzzleHttp\Psr7\uri_for(''));
+            ->willReturn($returnedUri);
 
         $expectedJson = [
             "name" => "Ubuntu 12.10",
@@ -58,10 +62,14 @@ public function test_it_creates_image()
 
     public function test_it_lists_images()
     {
+        $returnedUri = function_exists('\GuzzleHttp\Psr7\uri_for')
+            ? \GuzzleHttp\Psr7\uri_for('')
+            : \GuzzleHttp\Psr7\Utils::uriFor('');
+
         $this->client
             ->getConfig('base_uri')
             ->shouldBeCalled()
-            ->willReturn(\GuzzleHttp\Psr7\uri_for(''));
+            ->willReturn($returnedUri);
 
         $this->client
             ->request('GET', 'v2/images', ['query' => ['limit' => 5], 'headers' => []])
diff --git a/tests/unit/ObjectStore/v1/Models/ContainerTest.php b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
index 0e1484b6..c34cd924 100644
--- a/tests/unit/ObjectStore/v1/Models/ContainerTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
@@ -210,8 +210,9 @@ public function test_other_exceptions_are_thrown()
 
     public function test_it_chunks_according_to_provided_segment_size()
     {
-        /** @var \GuzzleHttp\Psr7\Stream $stream */
-        $stream = \GuzzleHttp\Psr7\stream_for(implode('', range('A', 'X')));
+        $stream = function_exists('\GuzzleHttp\Psr7\stream_for')
+            ? \GuzzleHttp\Psr7\stream_for(implode('', range('A', 'X')))
+            : \GuzzleHttp\Psr7\Utils::streamFor(implode('', range('A', 'X')));
 
         $data = [
             'name' => 'object',

From aef36abf773bd1992cc416a4c8da951743c1d8e4 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sat, 24 Jun 2023 20:13:37 +0200
Subject: [PATCH 049/102] change \GuzzleHttp\Promise\all to
 \GuzzleHttp\Promise\Utils::all (#361)

* change \GuzzleHttp\Promise\all to \GuzzleHttp\Promise\Utils::all

* support old promises as well

* run unit tests only on pull_request
---
 .github/workflows/unit_tests.yml        | 1 -
 src/ObjectStore/v1/Models/Container.php | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index b104e2be..2e22005c 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -1,6 +1,5 @@
 name: Run Unit Tests
 on:
-  push:
   pull_request:
 jobs:
   tests:
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index b0ca8890..55068184 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -233,7 +233,9 @@ public function createLargeObject(array $data): StorageObject
         }
 
         /** @var Promise $p */
-        $p = \GuzzleHttp\Promise\all($promises);
+        $p = function_exists('\GuzzleHttp\Promise\all')
+            ? \GuzzleHttp\Promise\all($promises)
+            : \GuzzleHttp\Promise\Utils::all($promises);
         $p->wait();
 
         return $this->createObject([

From ac606a439de6e37004356c1680b97bae6cacc32c Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lantoine37@hotmail.fr>
Date: Sun, 24 Sep 2023 17:10:27 +0200
Subject: [PATCH 050/102] Add .gitattributes file (#367)

---
 .gitattributes | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..5041178c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,10 @@
+/.github export-ignore
+/doc export-ignore
+/samples export-ignore
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.php_cs.dist export-ignore
+/.scrutinizer.yml export-ignore
+/.travis.yml export-ignore
+/phpunit.xml.dist export-ignore
\ No newline at end of file

From cba8dc516b3a608b94d8438bc1a865996c5cd6ef Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sun, 24 Sep 2023 22:36:53 +0200
Subject: [PATCH 051/102] GitHub workflows (#368)

* fix tests for new Guzzle

* run object store and identity integration tests

* use CamelCase directories in samples for docs
---
 .github/workflows/integration_identity.yml    | 67 +++++++++++++++++
 .../workflows/integration_object_storage.yml  | 74 +++++++++++++++++++
 .../block-storage/v2/volume-types.rst         | 10 +--
 doc/services/block-storage/v2/volumes.rst     | 18 ++---
 doc/services/compute/v2/flavors.rst           |  4 +-
 doc/services/compute/v2/images.rst            | 10 +--
 doc/services/compute/v2/servers.rst           | 36 ++++-----
 doc/services/identity/v2/authentication.rst   |  2 +-
 doc/services/identity/v3/credentials.rst      | 10 +--
 doc/services/identity/v3/domains.rst          | 26 +++----
 doc/services/identity/v3/endpoints.rst        | 10 +--
 doc/services/identity/v3/groups.rst           | 18 ++---
 doc/services/identity/v3/projects.rst         | 26 +++----
 doc/services/identity/v3/roles.rst            |  6 +-
 doc/services/identity/v3/services.rst         |  8 +-
 doc/services/identity/v3/tokens.rst           | 18 ++---
 doc/services/identity/v3/users.rst            | 14 ++--
 doc/services/images/v2/images.rst             | 18 ++---
 doc/services/images/v2/members.rst            | 10 +--
 .../v2/loadbalancer-healthmonitors.rst        | 10 +--
 .../networking/v2/loadbalancer-listeners.rst  | 10 +--
 .../networking/v2/loadbalancer-pools.rst      | 18 ++---
 doc/services/networking/v2/loadbalancers.rst  | 16 ++--
 doc/services/networking/v2/networks.rst       | 10 +--
 doc/services/networking/v2/ports.rst          | 10 +--
 doc/services/networking/v2/subnets.rst        | 12 +--
 doc/services/object-store/v1/account.rst      |  8 +-
 doc/services/object-store/v1/containers.rst   | 12 +--
 doc/services/object-store/v1/objects.rst      | 22 +++---
 .../v2/snapshots/create.php                   |  0
 .../v2/snapshots/delete.php                   |  0
 .../v2/snapshots/get.php                      |  0
 .../v2/snapshots/get_metadata.php             |  0
 .../v2/snapshots/list.php                     |  0
 .../v2/snapshots/list_detail.php              |  0
 .../v2/snapshots/merge_metadata.php           |  0
 .../v2/snapshots/reset_metadata.php           |  0
 .../v2/snapshots/update.php                   |  0
 .../v2/volume_types/create.php                |  0
 .../v2/volume_types/delete.php                |  0
 .../v2/volume_types/get.php                   |  0
 .../v2/volume_types/list.php                  |  0
 .../v2/volume_types/update.php                |  0
 .../v2/volumes/create.php                     |  0
 .../v2/volumes/create_from_image.php          |  0
 .../v2/volumes/create_from_snapshot.php       |  0
 .../v2/volumes/create_from_source_volume.php  |  0
 .../v2/volumes/delete.php                     |  0
 .../v2/volumes/get.php                        |  0
 .../v2/volumes/list.php                       |  0
 .../v2/volumes/list_detail.php                |  0
 .../v2/volumes/update.php                     |  0
 .../v2/flavors/create_flavor.php              |  0
 .../v2/flavors/delete_flavor.php              |  0
 .../v2/flavors/get_flavor.php                 |  0
 .../v2/flavors/list_flavors.php               |  0
 .../v2/hypervisors/get_hypervisor.php         |  0
 .../get_hypervisors_statistics.php            |  0
 .../v2/hypervisors/list_hypervisors.php       |  0
 .../v2/images/create_server_image.php         |  0
 .../v2/images/delete_image.php                |  0
 .../v2/images/delete_image_metadata_item.php  |  0
 .../v2/images/get_image.php                   |  0
 .../v2/images/list_images.php                 |  0
 .../v2/images/reset_image_metadata.php        |  0
 .../v2/images/retrieve_image_metadata.php     |  0
 .../v2/keypairs/create_keypair.php            |  0
 .../v2/keypairs/delete_keypair.php            |  0
 .../v2/keypairs/get_keypair.php               |  0
 .../v2/keypairs/list_keypairs.php             |  0
 .../v2/limits/get_limits.php                  |  0
 .../v2/servers/add_security_group.php         |  0
 .../v2/servers/attach_volume_attachment.php   |  0
 .../v2/servers/change_server_password.php     |  0
 .../v2/servers/confirm_server_resize.php      |  0
 .../servers/create_interface_attachment.php   |  0
 .../v2/servers/create_server.php              |  0
 .../servers/delete_interface_attachment.php   |  0
 .../v2/servers/delete_server.php              |  0
 .../servers/delete_server_metadata_item.php   |  0
 .../v2/servers/detach_volume_attachment.php   |  0
 .../v2/servers/get_interface_attachment.php   |  0
 .../v2/servers/get_server.php                 |  0
 .../v2/servers/get_server_console_output.php  |  0
 .../v2/servers/get_server_metadata.php        |  0
 .../v2/servers/get_server_metadata_item.php   |  0
 .../v2/servers/get_server_rdp_console.php     |  0
 .../v2/servers/get_server_serial_console.php  |  0
 .../v2/servers/get_server_spice_console.php   |  0
 .../v2/servers/get_server_vnc_console.php     |  0
 .../v2/servers/list_security_groups.php       |  0
 .../v2/servers/list_server_addresses.php      |  0
 .../v2/servers/list_servers.php               |  0
 .../v2/servers/list_volume_attachments.php    |  0
 .../v2/servers/merge_server_metadata.php      |  0
 .../v2/servers/reboot_server.php              |  0
 .../v2/servers/rebuild_server.php             |  0
 .../v2/servers/remove_security_group.php      |  0
 .../v2/servers/rescue_server.php              |  0
 .../v2/servers/reset_server_metadata.php      |  0
 .../v2/servers/reset_server_state.php         |  0
 .../v2/servers/resize_server.php              |  0
 .../v2/servers/revert_server_resize.php       |  0
 .../v2/servers/start_server.php               |  0
 .../v2/servers/stop_server.php                |  0
 .../v2/servers/unrescue_server.php            |  0
 .../v2/servers/update_server.php              |  0
 .../v2/authentication.php                     |  0
 .../v2/generate_token.php                     |  0
 .../v3/credentials/add_cred.php               |  0
 .../v3/credentials/delete_cred.php            |  0
 .../v3/credentials/get_cred.php               |  0
 .../v3/credentials/list_creds.php             |  0
 .../v3/credentials/update_cred.php            |  0
 .../v3/domains/add_domain.php                 |  0
 .../v3/domains/check_group_role.php           |  0
 .../v3/domains/check_user_role.php            |  0
 .../v3/domains/delete_domain.php              |  0
 .../v3/domains/grant_group_role.php           |  0
 .../v3/domains/grant_user_role.php            |  0
 .../v3/domains/list_domains.php               |  0
 .../v3/domains/list_group_roles.php           |  0
 .../v3/domains/list_user_roles.php            |  0
 .../v3/domains/revoke_group_role.php          |  0
 .../v3/domains/revoke_user_role.php           |  0
 .../v3/domains/show_domain.php                |  0
 .../v3/domains/update_domain.php              |  0
 .../v3/endpoints/add_endpoint.php             |  0
 .../v3/endpoints/delete_endpoint.php          |  0
 .../v3/endpoints/get_endpoint.php             |  0
 .../v3/endpoints/list_endpoints.php           |  0
 .../v3/endpoints/update_endpoint.php          |  0
 .../v3/groups/add_group.php                   |  0
 .../v3/groups/add_user.php                    |  0
 .../v3/groups/check_user_membership.php       |  0
 .../v3/groups/delete_group.php                |  0
 .../v3/groups/get_group.php                   |  0
 .../v3/groups/list_groups.php                 |  0
 .../v3/groups/list_users.php                  |  0
 .../v3/groups/remove_user.php                 |  0
 .../v3/groups/update_group.php                |  0
 .../v3/projects/add_project.php               |  0
 .../v3/projects/check_group_role.php          |  0
 .../v3/projects/check_user_role.php           |  0
 .../v3/projects/delete_project.php            |  0
 .../v3/projects/get_project.php               |  0
 .../v3/projects/grant_group_role.php          |  0
 .../v3/projects/grant_user_role.php           |  0
 .../v3/projects/list_group_roles.php          |  0
 .../v3/projects/list_projects.php             |  0
 .../v3/projects/list_user_roles.php           |  0
 .../v3/projects/revoke_group_role.php         |  0
 .../v3/projects/revoke_user_role.php          |  0
 .../v3/projects/update_project.php            |  0
 .../v3/roles/add_role.php                     |  0
 .../v3/roles/list_assignments.php             |  0
 .../v3/roles/list_roles.php                   |  0
 .../v3/services/add_service.php               |  0
 .../v3/services/delete_service.php            |  0
 .../v3/services/get_service.php               |  0
 .../v3/services/list_services.php             |  0
 .../v3/services/update_service.php            |  0
 .../v3/tokens/export_authentication_token.php |  0
 .../v3/tokens/generate_token_from_id.php      |  0
 .../generate_token_scoped_to_project_id.php   |  0
 .../generate_token_scoped_to_project_name.php |  0
 .../v3/tokens/generate_token_with_user_id.php |  0
 .../tokens/generate_token_with_username.php   |  0
 .../v3/tokens/revoke_token.php                |  0
 .../use_cached_authentication_token.php       |  0
 .../v3/tokens/validate_token.php              |  0
 .../v3/users/add_user.php                     |  0
 .../v3/users/delete_user.php                  |  0
 .../v3/users/get_user.php                     |  0
 .../v3/users/list_groups.php                  |  0
 .../v3/users/list_projects.php                |  0
 .../v3/users/list_users.php                   |  0
 .../v3/users/update_user.php                  |  0
 .../{images => Images}/v2/images/create.php   |  0
 .../v2/images/deactivate.php                  |  0
 .../{images => Images}/v2/images/delete.php   |  0
 .../v2/images/download_binary_data.php        |  0
 samples/{images => Images}/v2/images/get.php  |  0
 samples/{images => Images}/v2/images/list.php |  0
 .../v2/images/reactivate.php                  |  0
 .../{images => Images}/v2/images/update.php   |  0
 .../v2/images/upload_binary_data.php          |  0
 samples/{images => Images}/v2/members/add.php |  0
 .../{images => Images}/v2/members/delete.php  |  0
 samples/{images => Images}/v2/members/get.php |  0
 .../{images => Images}/v2/members/list.php    |  0
 .../v2/members/update_status.php              |  0
 .../v2/floatingIPs/create.php                 |  0
 .../v2/floatingIPs/delete.php                 |  0
 .../v2/floatingIPs/get.php                    |  0
 .../v2/floatingIPs/list.php                   |  0
 .../v2/floatingIPs/update.php                 |  0
 .../v2/lbaas/healthmonitors/create.php        |  0
 .../v2/lbaas/healthmonitors/delete.php        |  0
 .../v2/lbaas/healthmonitors/get.php           |  0
 .../v2/lbaas/healthmonitors/list.php          |  0
 .../v2/lbaas/healthmonitors/update.php        |  0
 .../v2/lbaas/listeners/create.php             |  0
 .../v2/lbaas/listeners/delete.php             |  0
 .../v2/lbaas/listeners/get.php                |  0
 .../v2/lbaas/listeners/list.php               |  0
 .../v2/lbaas/listeners/update.php             |  0
 .../v2/lbaas/loadbalancers/add_listener.php   |  0
 .../v2/lbaas/loadbalancers/create.php         |  0
 .../v2/lbaas/loadbalancers/delete.php         |  0
 .../v2/lbaas/loadbalancers/get.php            |  0
 .../v2/lbaas/loadbalancers/get_stats.php      |  0
 .../v2/lbaas/loadbalancers/get_statuses.php   |  0
 .../v2/lbaas/loadbalancers/list.php           |  0
 .../v2/lbaas/loadbalancers/update.php         |  0
 .../v2/lbaas/pools/add-healthmonitor.php      |  0
 .../v2/lbaas/pools/add-member.php             |  0
 .../v2/lbaas/pools/create.php                 |  0
 .../v2/lbaas/pools/delete-member.php          |  0
 .../v2/lbaas/pools/delete.php                 |  0
 .../v2/lbaas/pools/get-member.php             |  0
 .../v2/lbaas/pools/get.php                    |  0
 .../v2/lbaas/pools/list.php                   |  0
 .../v2/lbaas/pools/update.php                 |  0
 .../v2/networks/create.php                    |  0
 .../v2/networks/create_batch.php              |  0
 .../v2/networks/delete.php                    |  0
 .../v2/networks/get.php                       |  0
 .../v2/networks/update.php                    |  0
 .../v2/ports/create.php                       |  0
 .../v2/ports/create_batch.php                 |  0
 .../v2/ports/create_with_fixed_ips.php        |  0
 .../v2/ports/delete.php                       |  0
 .../v2/ports/get.php                          |  0
 .../v2/ports/list.php                         |  0
 .../v2/ports/update.php                       |  0
 .../v2/securityGroupRules/create.php          |  0
 .../v2/securityGroupRules/delete.php          |  0
 .../v2/securityGroupRules/get.php             |  0
 .../v2/securityGroupRules/list.php            |  0
 .../v2/securityGroups/create.php              |  0
 .../v2/securityGroups/delete.php              |  0
 .../v2/securityGroups/get.php                 |  0
 .../v2/securityGroups/list.php                |  0
 .../v2/subnets/create.php                     |  0
 .../v2/subnets/create_batch.php               |  0
 .../v2/subnets/create_with_gateway_ip.php     |  0
 .../v2/subnets/create_with_host_routes.php    |  0
 .../v2/subnets/delete.php                     |  0
 .../v2/subnets/get.php                        |  0
 .../v2/subnets/update.php                     |  0
 .../v1/account/get.php                        |  0
 .../v1/account/get_metadata.php               |  0
 .../v1/account/merge_metadata.php             |  0
 .../v1/account/reset_metadata.php             |  0
 .../v1/containers/create.php                  |  0
 .../v1/containers/delete.php                  |  0
 .../v1/containers/get.php                     |  0
 .../v1/containers/get_metadata.php            |  0
 .../v1/containers/list.php                    |  0
 .../v1/containers/merge_metadata.php          |  0
 .../v1/containers/reset_metadata.php          |  0
 .../v1/objects/check_exists.php               |  0
 .../v1/objects/copy.php                       |  0
 .../v1/objects/create.php                     |  0
 .../v1/objects/create_from_stream.php         |  0
 .../v1/objects/create_large_object.php        |  0
 .../v1/objects/delete.php                     |  0
 .../v1/objects/download.php                   |  0
 .../v1/objects/download_stream.php            |  0
 .../v1/objects/get.php                        |  0
 .../v1/objects/get_metadata.php               |  0
 .../v1/objects/list.php                       |  0
 .../v1/objects/merge_metadata.php             |  0
 .../v1/objects/reset_metadata.php             |  0
 tests/integration/Compute/v2/CoreTest.php     | 16 ++--
 tests/integration/Runner.php                  |  4 +-
 tests/integration/TestCase.php                |  2 +-
 278 files changed, 338 insertions(+), 197 deletions(-)
 create mode 100644 .github/workflows/integration_identity.yml
 create mode 100644 .github/workflows/integration_object_storage.yml
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/create.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/delete.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/get.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/get_metadata.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/list.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/list_detail.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/merge_metadata.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/reset_metadata.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/snapshots/update.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volume_types/create.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volume_types/delete.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volume_types/get.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volume_types/list.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volume_types/update.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/create.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/create_from_image.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/create_from_snapshot.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/create_from_source_volume.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/delete.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/get.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/list.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/list_detail.php (100%)
 rename samples/{blockstorage => BlockStorage}/v2/volumes/update.php (100%)
 rename samples/{compute => Compute}/v2/flavors/create_flavor.php (100%)
 rename samples/{compute => Compute}/v2/flavors/delete_flavor.php (100%)
 rename samples/{compute => Compute}/v2/flavors/get_flavor.php (100%)
 rename samples/{compute => Compute}/v2/flavors/list_flavors.php (100%)
 rename samples/{compute => Compute}/v2/hypervisors/get_hypervisor.php (100%)
 rename samples/{compute => Compute}/v2/hypervisors/get_hypervisors_statistics.php (100%)
 rename samples/{compute => Compute}/v2/hypervisors/list_hypervisors.php (100%)
 rename samples/{compute => Compute}/v2/images/create_server_image.php (100%)
 rename samples/{compute => Compute}/v2/images/delete_image.php (100%)
 rename samples/{compute => Compute}/v2/images/delete_image_metadata_item.php (100%)
 rename samples/{compute => Compute}/v2/images/get_image.php (100%)
 rename samples/{compute => Compute}/v2/images/list_images.php (100%)
 rename samples/{compute => Compute}/v2/images/reset_image_metadata.php (100%)
 rename samples/{compute => Compute}/v2/images/retrieve_image_metadata.php (100%)
 rename samples/{compute => Compute}/v2/keypairs/create_keypair.php (100%)
 rename samples/{compute => Compute}/v2/keypairs/delete_keypair.php (100%)
 rename samples/{compute => Compute}/v2/keypairs/get_keypair.php (100%)
 rename samples/{compute => Compute}/v2/keypairs/list_keypairs.php (100%)
 rename samples/{compute => Compute}/v2/limits/get_limits.php (100%)
 rename samples/{compute => Compute}/v2/servers/add_security_group.php (100%)
 rename samples/{compute => Compute}/v2/servers/attach_volume_attachment.php (100%)
 rename samples/{compute => Compute}/v2/servers/change_server_password.php (100%)
 rename samples/{compute => Compute}/v2/servers/confirm_server_resize.php (100%)
 rename samples/{compute => Compute}/v2/servers/create_interface_attachment.php (100%)
 rename samples/{compute => Compute}/v2/servers/create_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/delete_interface_attachment.php (100%)
 rename samples/{compute => Compute}/v2/servers/delete_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/delete_server_metadata_item.php (100%)
 rename samples/{compute => Compute}/v2/servers/detach_volume_attachment.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_interface_attachment.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server_console_output.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server_metadata.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server_metadata_item.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server_rdp_console.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server_serial_console.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server_spice_console.php (100%)
 rename samples/{compute => Compute}/v2/servers/get_server_vnc_console.php (100%)
 rename samples/{compute => Compute}/v2/servers/list_security_groups.php (100%)
 rename samples/{compute => Compute}/v2/servers/list_server_addresses.php (100%)
 rename samples/{compute => Compute}/v2/servers/list_servers.php (100%)
 rename samples/{compute => Compute}/v2/servers/list_volume_attachments.php (100%)
 rename samples/{compute => Compute}/v2/servers/merge_server_metadata.php (100%)
 rename samples/{compute => Compute}/v2/servers/reboot_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/rebuild_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/remove_security_group.php (100%)
 rename samples/{compute => Compute}/v2/servers/rescue_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/reset_server_metadata.php (100%)
 rename samples/{compute => Compute}/v2/servers/reset_server_state.php (100%)
 rename samples/{compute => Compute}/v2/servers/resize_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/revert_server_resize.php (100%)
 rename samples/{compute => Compute}/v2/servers/start_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/stop_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/unrescue_server.php (100%)
 rename samples/{compute => Compute}/v2/servers/update_server.php (100%)
 rename samples/{identity => Identity}/v2/authentication.php (100%)
 rename samples/{identity => Identity}/v2/generate_token.php (100%)
 rename samples/{identity => Identity}/v3/credentials/add_cred.php (100%)
 rename samples/{identity => Identity}/v3/credentials/delete_cred.php (100%)
 rename samples/{identity => Identity}/v3/credentials/get_cred.php (100%)
 rename samples/{identity => Identity}/v3/credentials/list_creds.php (100%)
 rename samples/{identity => Identity}/v3/credentials/update_cred.php (100%)
 rename samples/{identity => Identity}/v3/domains/add_domain.php (100%)
 rename samples/{identity => Identity}/v3/domains/check_group_role.php (100%)
 rename samples/{identity => Identity}/v3/domains/check_user_role.php (100%)
 rename samples/{identity => Identity}/v3/domains/delete_domain.php (100%)
 rename samples/{identity => Identity}/v3/domains/grant_group_role.php (100%)
 rename samples/{identity => Identity}/v3/domains/grant_user_role.php (100%)
 rename samples/{identity => Identity}/v3/domains/list_domains.php (100%)
 rename samples/{identity => Identity}/v3/domains/list_group_roles.php (100%)
 rename samples/{identity => Identity}/v3/domains/list_user_roles.php (100%)
 rename samples/{identity => Identity}/v3/domains/revoke_group_role.php (100%)
 rename samples/{identity => Identity}/v3/domains/revoke_user_role.php (100%)
 rename samples/{identity => Identity}/v3/domains/show_domain.php (100%)
 rename samples/{identity => Identity}/v3/domains/update_domain.php (100%)
 rename samples/{identity => Identity}/v3/endpoints/add_endpoint.php (100%)
 rename samples/{identity => Identity}/v3/endpoints/delete_endpoint.php (100%)
 rename samples/{identity => Identity}/v3/endpoints/get_endpoint.php (100%)
 rename samples/{identity => Identity}/v3/endpoints/list_endpoints.php (100%)
 rename samples/{identity => Identity}/v3/endpoints/update_endpoint.php (100%)
 rename samples/{identity => Identity}/v3/groups/add_group.php (100%)
 rename samples/{identity => Identity}/v3/groups/add_user.php (100%)
 rename samples/{identity => Identity}/v3/groups/check_user_membership.php (100%)
 rename samples/{identity => Identity}/v3/groups/delete_group.php (100%)
 rename samples/{identity => Identity}/v3/groups/get_group.php (100%)
 rename samples/{identity => Identity}/v3/groups/list_groups.php (100%)
 rename samples/{identity => Identity}/v3/groups/list_users.php (100%)
 rename samples/{identity => Identity}/v3/groups/remove_user.php (100%)
 rename samples/{identity => Identity}/v3/groups/update_group.php (100%)
 rename samples/{identity => Identity}/v3/projects/add_project.php (100%)
 rename samples/{identity => Identity}/v3/projects/check_group_role.php (100%)
 rename samples/{identity => Identity}/v3/projects/check_user_role.php (100%)
 rename samples/{identity => Identity}/v3/projects/delete_project.php (100%)
 rename samples/{identity => Identity}/v3/projects/get_project.php (100%)
 rename samples/{identity => Identity}/v3/projects/grant_group_role.php (100%)
 rename samples/{identity => Identity}/v3/projects/grant_user_role.php (100%)
 rename samples/{identity => Identity}/v3/projects/list_group_roles.php (100%)
 rename samples/{identity => Identity}/v3/projects/list_projects.php (100%)
 rename samples/{identity => Identity}/v3/projects/list_user_roles.php (100%)
 rename samples/{identity => Identity}/v3/projects/revoke_group_role.php (100%)
 rename samples/{identity => Identity}/v3/projects/revoke_user_role.php (100%)
 rename samples/{identity => Identity}/v3/projects/update_project.php (100%)
 rename samples/{identity => Identity}/v3/roles/add_role.php (100%)
 rename samples/{identity => Identity}/v3/roles/list_assignments.php (100%)
 rename samples/{identity => Identity}/v3/roles/list_roles.php (100%)
 rename samples/{identity => Identity}/v3/services/add_service.php (100%)
 rename samples/{identity => Identity}/v3/services/delete_service.php (100%)
 rename samples/{identity => Identity}/v3/services/get_service.php (100%)
 rename samples/{identity => Identity}/v3/services/list_services.php (100%)
 rename samples/{identity => Identity}/v3/services/update_service.php (100%)
 rename samples/{identity => Identity}/v3/tokens/export_authentication_token.php (100%)
 rename samples/{identity => Identity}/v3/tokens/generate_token_from_id.php (100%)
 rename samples/{identity => Identity}/v3/tokens/generate_token_scoped_to_project_id.php (100%)
 rename samples/{identity => Identity}/v3/tokens/generate_token_scoped_to_project_name.php (100%)
 rename samples/{identity => Identity}/v3/tokens/generate_token_with_user_id.php (100%)
 rename samples/{identity => Identity}/v3/tokens/generate_token_with_username.php (100%)
 rename samples/{identity => Identity}/v3/tokens/revoke_token.php (100%)
 rename samples/{identity => Identity}/v3/tokens/use_cached_authentication_token.php (100%)
 rename samples/{identity => Identity}/v3/tokens/validate_token.php (100%)
 rename samples/{identity => Identity}/v3/users/add_user.php (100%)
 rename samples/{identity => Identity}/v3/users/delete_user.php (100%)
 rename samples/{identity => Identity}/v3/users/get_user.php (100%)
 rename samples/{identity => Identity}/v3/users/list_groups.php (100%)
 rename samples/{identity => Identity}/v3/users/list_projects.php (100%)
 rename samples/{identity => Identity}/v3/users/list_users.php (100%)
 rename samples/{identity => Identity}/v3/users/update_user.php (100%)
 rename samples/{images => Images}/v2/images/create.php (100%)
 rename samples/{images => Images}/v2/images/deactivate.php (100%)
 rename samples/{images => Images}/v2/images/delete.php (100%)
 rename samples/{images => Images}/v2/images/download_binary_data.php (100%)
 rename samples/{images => Images}/v2/images/get.php (100%)
 rename samples/{images => Images}/v2/images/list.php (100%)
 rename samples/{images => Images}/v2/images/reactivate.php (100%)
 rename samples/{images => Images}/v2/images/update.php (100%)
 rename samples/{images => Images}/v2/images/upload_binary_data.php (100%)
 rename samples/{images => Images}/v2/members/add.php (100%)
 rename samples/{images => Images}/v2/members/delete.php (100%)
 rename samples/{images => Images}/v2/members/get.php (100%)
 rename samples/{images => Images}/v2/members/list.php (100%)
 rename samples/{images => Images}/v2/members/update_status.php (100%)
 rename samples/{networking => Networking}/v2/floatingIPs/create.php (100%)
 rename samples/{networking => Networking}/v2/floatingIPs/delete.php (100%)
 rename samples/{networking => Networking}/v2/floatingIPs/get.php (100%)
 rename samples/{networking => Networking}/v2/floatingIPs/list.php (100%)
 rename samples/{networking => Networking}/v2/floatingIPs/update.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/healthmonitors/create.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/healthmonitors/delete.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/healthmonitors/get.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/healthmonitors/list.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/healthmonitors/update.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/listeners/create.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/listeners/delete.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/listeners/get.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/listeners/list.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/listeners/update.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/add_listener.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/create.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/delete.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/get.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/get_stats.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/get_statuses.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/list.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/loadbalancers/update.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/add-healthmonitor.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/add-member.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/create.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/delete-member.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/delete.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/get-member.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/get.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/list.php (100%)
 rename samples/{networking => Networking}/v2/lbaas/pools/update.php (100%)
 rename samples/{networking => Networking}/v2/networks/create.php (100%)
 rename samples/{networking => Networking}/v2/networks/create_batch.php (100%)
 rename samples/{networking => Networking}/v2/networks/delete.php (100%)
 rename samples/{networking => Networking}/v2/networks/get.php (100%)
 rename samples/{networking => Networking}/v2/networks/update.php (100%)
 rename samples/{networking => Networking}/v2/ports/create.php (100%)
 rename samples/{networking => Networking}/v2/ports/create_batch.php (100%)
 rename samples/{networking => Networking}/v2/ports/create_with_fixed_ips.php (100%)
 rename samples/{networking => Networking}/v2/ports/delete.php (100%)
 rename samples/{networking => Networking}/v2/ports/get.php (100%)
 rename samples/{networking => Networking}/v2/ports/list.php (100%)
 rename samples/{networking => Networking}/v2/ports/update.php (100%)
 rename samples/{networking => Networking}/v2/securityGroupRules/create.php (100%)
 rename samples/{networking => Networking}/v2/securityGroupRules/delete.php (100%)
 rename samples/{networking => Networking}/v2/securityGroupRules/get.php (100%)
 rename samples/{networking => Networking}/v2/securityGroupRules/list.php (100%)
 rename samples/{networking => Networking}/v2/securityGroups/create.php (100%)
 rename samples/{networking => Networking}/v2/securityGroups/delete.php (100%)
 rename samples/{networking => Networking}/v2/securityGroups/get.php (100%)
 rename samples/{networking => Networking}/v2/securityGroups/list.php (100%)
 rename samples/{networking => Networking}/v2/subnets/create.php (100%)
 rename samples/{networking => Networking}/v2/subnets/create_batch.php (100%)
 rename samples/{networking => Networking}/v2/subnets/create_with_gateway_ip.php (100%)
 rename samples/{networking => Networking}/v2/subnets/create_with_host_routes.php (100%)
 rename samples/{networking => Networking}/v2/subnets/delete.php (100%)
 rename samples/{networking => Networking}/v2/subnets/get.php (100%)
 rename samples/{networking => Networking}/v2/subnets/update.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/account/get.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/account/get_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/account/merge_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/account/reset_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/containers/create.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/containers/delete.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/containers/get.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/containers/get_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/containers/list.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/containers/merge_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/containers/reset_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/check_exists.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/copy.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/create.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/create_from_stream.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/create_large_object.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/delete.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/download.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/download_stream.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/get.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/get_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/list.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/merge_metadata.php (100%)
 rename samples/{objectstore => ObjectStore}/v1/objects/reset_metadata.php (100%)

diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml
new file mode 100644
index 00000000..0c52d3a3
--- /dev/null
+++ b/.github/workflows/integration_identity.yml
@@ -0,0 +1,67 @@
+name: Run Identity Integration Tests
+on:
+  pull_request:
+    paths:
+      - '**Identity**'
+jobs:
+  tests:
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        openstack_version: [ "stable/zed" ]
+        php_version: [ 8.1 ]
+        ubuntu_version: [ 20.04 ]
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
+    name: Deploy OpenStack ${{ matrix.name }} and run Identity integration tests with php ${{matrix.php_version}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: curl
+          tools: composer:v2
+          coverage: none
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - name: Restore devstack cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            /opt/stack/*
+            !/opt/stack/data
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
+      - name: Deploy devstack
+        uses: EmilienM/devstack-action@v0.11
+        with:
+          branch: ${{ matrix.openstack_version }}
+      - name: Set env variables
+        run: |
+          {
+            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
+            echo OS_REGION=RegionOne
+            echo OS_REGION_NAME=RegionOne
+            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
+            echo OS_USERNAME=admin
+            echo OS_PASSWORD=secret
+            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
+            echo OS_PROJECT_NAME=admin
+            echo OS_RESIZE_FLAVOR=2
+            echo OS_FLAVOR=1
+            echo OS_DOMAIN_ID=default
+          } >> "$GITHUB_ENV"
+      - name: Execute integration tests
+        run: php ./tests/integration/run.php -s=Identity
+
diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml
new file mode 100644
index 00000000..9e94f73e
--- /dev/null
+++ b/.github/workflows/integration_object_storage.yml
@@ -0,0 +1,74 @@
+name: Run Object Storage Integration Tests
+on:
+  pull_request:
+    paths:
+      - '**ObjectStore**'
+jobs:
+  tests:
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        openstack_version: [ "stable/zed" ]
+        php_version: [ 8.1 ]
+        ubuntu_version: [ 20.04 ]
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
+    name: Deploy OpenStack ${{ matrix.name }} and run ObjectStore integration tests with php ${{matrix.php_version}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: curl
+          tools: composer:v2
+          coverage: none
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - name: Restore devstack cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            /opt/stack/*
+            !/opt/stack/data
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
+      - name: Deploy devstack
+        uses: EmilienM/devstack-action@v0.11
+        with:
+          branch: ${{ matrix.openstack_version }}
+          conf_overrides: |
+            SWIFT_ENABLE_TEMPURLS=True
+            SWIFT_TEMPURL_KEY=secretkey
+            [[post-config|\$SWIFT_CONFIG_PROXY_SERVER]]
+            [filter:versioned_writes]
+            allow_object_versioning = true
+          enabled_services: 's-account,s-container,s-object,s-proxy'
+      - name: Set env variables
+        run: |
+          {
+            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
+            echo OS_REGION=RegionOne
+            echo OS_REGION_NAME=RegionOne
+            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
+            echo OS_USERNAME=admin
+            echo OS_PASSWORD=secret
+            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
+            echo OS_PROJECT_NAME=admin
+            echo OS_RESIZE_FLAVOR=2
+            echo OS_FLAVOR=1
+            echo OS_DOMAIN_ID=default
+          } >> "$GITHUB_ENV"
+      - name: Execute integration tests
+        run: php ./tests/integration/run.php -s=ObjectStore
+
diff --git a/doc/services/block-storage/v2/volume-types.rst b/doc/services/block-storage/v2/volume-types.rst
index 7c038544..cb515a0d 100644
--- a/doc/services/block-storage/v2/volume-types.rst
+++ b/doc/services/block-storage/v2/volume-types.rst
@@ -3,7 +3,7 @@ Volume Types
 
 Listing volume types
 --------------------
-.. sample:: blockstoragev2/volume_types/list.php
+.. sample:: BlockStorage/v2/volume_types/list.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumeTypes
 
 Each iteration will return a :php:class:`VolumeType` instance <OpenStack/BlockStorage/v2/Models/VolumeType.html>.
@@ -17,7 +17,7 @@ Create volume type
 The only attributes that are required when creating a volume are a name. The simplest example
 would therefore be this:
 
-.. sample:: blockstoragev2/volume_types/create.php
+.. sample:: BlockStorage/v2/volume_types/create.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_createVolumeType
 
 
@@ -27,7 +27,7 @@ Retrieve details of a volume type
 When retrieving a volume type, sometimes you only want to operate on it - say to update or delete it. If this is the
 case, then there is no need to perform an initial GET request to the API:
 
-.. sample:: blockstoragev2/volume_types/get.php
+.. sample:: BlockStorage/v2/volume_types/get.php
 
 If, however, you *do* want to retrieve all the details of a remote volume type from the API, you just call:
 
@@ -46,7 +46,7 @@ Update a volume type
 The first step when updating a volume type is modifying the attributes you want updated. By default, only a volume
 type's name can be edited.
 
-.. sample:: blockstoragev2/volume_types/update.php
+.. sample:: BlockStorage/v2/volume_types/update.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_update
 
 
@@ -55,5 +55,5 @@ Delete volume type
 
 To permanently delete a volume type:
 
-.. sample:: blockstoragev2/volume_types/delete.php
+.. sample:: BlockStorage/v2/volume_types/delete.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_delete
\ No newline at end of file
diff --git a/doc/services/block-storage/v2/volumes.rst b/doc/services/block-storage/v2/volumes.rst
index e171e670..e0d0691f 100644
--- a/doc/services/block-storage/v2/volumes.rst
+++ b/doc/services/block-storage/v2/volumes.rst
@@ -4,7 +4,7 @@ Volumes
 List volumes
 ------------
 
-.. sample:: blockstoragev2/volumes/list.php
+.. sample:: BlockStorage/v2/volumes/list.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumes
 
 Each iteration will return a php:class:`Volume` instance <OpenStack/BlockStorage/v2/Models/Volume.html>.
@@ -17,7 +17,7 @@ Detailed information
 By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information
 for a flavor, you must enable detailed information, like so:
 
-.. sample:: blockstoragev2/volumes/list_detail.php
+.. sample:: BlockStorage/v2/volumes/list_detail.php
 
 Create volume
 -------------
@@ -25,7 +25,7 @@ Create volume
 The only attributes that are required when creating a volume are a size in GiB. The simplest example
 would therefore be this:
 
-.. sample:: blockstoragev2/volumes/create.php
+.. sample:: BlockStorage/v2/volumes/create.php
 
 You can further configure your new volume, however, by following the below sections, which instruct you how to add
 specific functionality.
@@ -35,17 +35,17 @@ specific functionality.
 Create from image
 ~~~~~~~~~~~~~~~~~
 
-.. sample:: blockstoragev2/volumes/create_from_image.php
+.. sample:: BlockStorage/v2/volumes/create_from_image.php
 
 Create from snapshot
 ~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: blockstoragev2/volumes/create_from_snapshot.php
+.. sample:: BlockStorage/v2/volumes/create_from_snapshot.php
 
 Create from source volume
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: blockstoragev2/volumes/create_from_source_volume.php
+.. sample:: BlockStorage/v2/volumes/create_from_source_volume.php
 
 
 Retrieve volume details
@@ -54,7 +54,7 @@ Retrieve volume details
 When retrieving a volume, sometimes you only want to operate on it - say to update or delete it. If this is the case,
 then there is no need to perform an initial GET request to the API:
 
-.. sample:: blockstoragev2/volumes/get.php
+.. sample:: BlockStorage/v2/volumes/get.php
 
 If, however, you *do* want to retrieve all the details of a remote volume from the API, you just call:
 
@@ -73,7 +73,7 @@ Update volume
 The first step when updating a volume is modifying the attributes you want updated. By default, only a volume's name
 and description can be edited.
 
-.. sample:: blockstoragev2/volumes/update.php
+.. sample:: BlockStorage/v2/volumes/update.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_update
 
 Delete volume
@@ -81,5 +81,5 @@ Delete volume
 
 To permanently delete a volume:
 
-.. sample:: blockstoragev2/volumes/delete.php
+.. sample:: BlockStorage/v2/volumes/delete.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_delete
\ No newline at end of file
diff --git a/doc/services/compute/v2/flavors.rst b/doc/services/compute/v2/flavors.rst
index dc6859ef..6d71b734 100644
--- a/doc/services/compute/v2/flavors.rst
+++ b/doc/services/compute/v2/flavors.rst
@@ -4,7 +4,7 @@ Flavors
 List flavors
 ------------
 
-.. sample:: compute/v2/flavors/list_flavors.php
+.. sample:: Compute/v2/flavors/list_flavors.php
 .. refdoc:: OpenStack/Compute/v2/Service.html#method_listFlavors
 
 Each iteration will return a :php:class:`Flavor` instance <OpenStack/Compute/v2/Models/Flavor.html>.
@@ -26,7 +26,7 @@ for a flavor, you must pass ``true`` as the last parameter, like so:
 Retrieve a flavor
 -----------------
 
-.. sample:: compute/v2/flavors/get_flavor.php
+.. sample:: Compute/v2/flavors/get_flavor.php
 .. refdoc:: OpenStack/Compute/v2/Service.html#method_getFlavor
 
 When retrieving a flavor, sometimes you only want to operate on it. If this is the case,
diff --git a/doc/services/compute/v2/images.rst b/doc/services/compute/v2/images.rst
index 8b04aaa0..6a2ce6e7 100644
--- a/doc/services/compute/v2/images.rst
+++ b/doc/services/compute/v2/images.rst
@@ -4,7 +4,7 @@ Images
 List images
 -----------
 
-.. sample:: compute/v2/images/list_images.php
+.. sample:: Compute/v2/images/list_images.php
 
 Each iteration will return an :apiref:Image instance <OpenStack/Compute/v2/Models/Image.html>_.
 
@@ -27,7 +27,7 @@ Retrieve an image
 When retrieving an image, sometimes you only want to operate on it - say to update or delete it. If this is the case,
 then there is no need to perform an initial GET request to the server:
 
-.. sample:: compute/v2/images/get_image.php
+.. sample:: Compute/v2/images/get_image.php
 .. refdoc:: OpenStack/Compute/v2/Service.html#method_getImage
 
 If, however, you *do* want to retrieve all the details of a remote image from the API, you just call:
@@ -41,7 +41,7 @@ which will update the state of the local object. This gives you an element of co
 Delete an image
 ---------------
 
-.. sample:: compute/v2/images/delete_image.php
+.. sample:: Compute/v2/images/delete_image.php
 .. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_delete
 
 Retrieve metadata
@@ -58,7 +58,7 @@ This operation will retrieve the existing metadata for an image:
 Reset metadata
 --------------
 
-.. sample:: compute/v2/images/reset_image_metadata.php
+.. sample:: Compute/v2/images/reset_image_metadata.php
 
 This operation will _replace_ all existing metadata with whatever is provided in the request. Any existing metadata
 not specified in the request will be deleted.
@@ -95,5 +95,5 @@ Delete image metadata item
 
 This operation allows you to remove a specific metadata item:
 
-.. sample:: compute/v2/images/delete_image_metadata_item.php
+.. sample:: Compute/v2/images/delete_image_metadata_item.php
 .. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_deleteMetadataItem
\ No newline at end of file
diff --git a/doc/services/compute/v2/servers.rst b/doc/services/compute/v2/servers.rst
index 63a10235..a80fc4b9 100644
--- a/doc/services/compute/v2/servers.rst
+++ b/doc/services/compute/v2/servers.rst
@@ -6,7 +6,7 @@ Listing servers
 
 To list a collection of servers, you run:
 
-.. sample:: compute/v2/servers/list_servers.php
+.. sample:: Compute/v2/servers/list_servers.php
 
 Each iteration will return a :apiref:Server instance <OpenStack/Compute/v2/Models/Server.html>.
 
@@ -44,7 +44,7 @@ Create a server
 The only attributes that are required when creating a server are a name, flavor ID and image ID. The simplest example
 would therefore be this:
 
-.. sample:: compute/v2/servers/create_server.php
+.. sample:: Compute/v2/servers/create_server.php
 
 You can further configure your new server, however, by following the below sections, which instruct you how to add
 specific functionality. They are interoperable and can work together.
@@ -139,7 +139,7 @@ Retrieve a server
 When retrieving a server, sometimes you only want to operate on it - say to update or delete it. If this is the case,
 then there is no need to perform an initial GET request to the server:
 
-.. sample:: compute/v2/servers/get_server.php
+.. sample:: Compute/v2/servers/get_server.php
 
 If, however, you *do* want to retrieve all the details of a remote server from the API, you just call:
 
@@ -157,7 +157,7 @@ Update a server
 The first step when updating a server is modifying the attributes you want updated. By default, only a server's name,
 IPv4 and IPv6 IPs, and its auto disk config attributes can be edited.
 
-.. sample:: compute/v2/servers/update_server.php
+.. sample:: Compute/v2/servers/update_server.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_update
 
 Delete a server
@@ -165,7 +165,7 @@ Delete a server
 
 To permanently delete a server:
 
-.. sample:: compute/v2/servers/delete_server.php
+.. sample:: Compute/v2/servers/delete_server.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_delete
 
 Retrieve metadata
@@ -173,7 +173,7 @@ Retrieve metadata
 
 This operation will retrieve the existing metadata for a server:
 
-.. sample:: compute/v2/servers/get_server_metadata.php
+.. sample:: Compute/v2/servers/get_server_metadata.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_getMetadata
 
 Reset metadata
@@ -182,7 +182,7 @@ Reset metadata
 This operation will _replace_ all existing metadata with whatever is provided in the request. Any existing metadata
 not specified in the request will be deleted.
 
-.. sample:: compute/v2/servers/reset_server_metadata.php
+.. sample:: Compute/v2/servers/reset_server_metadata.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resetMetadata
 
 Merge metadata
@@ -191,7 +191,7 @@ Merge metadata
 This operation will _merge_ specified metadata with what already exists. Existing values will be overriden, new values
 will be added. Any existing keys that are not specified in the request will remain unaffected.
 
-.. sample:: compute/v2/servers/merge_server_metadata.php
+.. sample:: Compute/v2/servers/merge_server_metadata.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_mergeMetadata
 
 Retrieve metadata item
@@ -199,7 +199,7 @@ Retrieve metadata item
 
 This operation allows you to retrieve the value for a specific metadata item:
 
-.. sample:: compute/v2/servers/get_server_metadata_item.php
+.. sample:: Compute/v2/servers/get_server_metadata_item.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_getMetadataItem
 
 Delete metadata item
@@ -207,7 +207,7 @@ Delete metadata item
 
 This operation allows you to remove a specific metadata item:
 
-.. sample:: compute/v2/servers/delete_server_metadata_item.php
+.. sample:: Compute/v2/servers/delete_server_metadata_item.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_deleteMetadataItem
 
 Change root password
@@ -215,7 +215,7 @@ Change root password
 
 This operation will replace the root password for a server.
 
-.. sample:: compute/v2/servers/change_server_password.php
+.. sample:: Compute/v2/servers/change_server_password.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_changePassword
 
 Reset server state
@@ -223,7 +223,7 @@ Reset server state
 
 This operation will reset the state of the server.
 
-.. sample:: compute/v2/servers/reset_server_state.php
+.. sample:: Compute/v2/servers/reset_server_state.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resetState
 
 Reboot server
@@ -232,7 +232,7 @@ Reboot server
 This operation will reboot a server. Please be aware that you must specify whether you want to initiate a HARD or
 SOFT reboot (you specify this as a string argument).
 
-.. sample:: compute/v2/servers/reboot_server.php
+.. sample:: Compute/v2/servers/reboot_server.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_reboot
 
 Rebuild server
@@ -242,7 +242,7 @@ Rebuilding a server will re-initialize the booting procedure for the server and
 system. It will shutdown, re-image and then reboot your instance. Any data saved on your instance will be lost when
 the rebuild is performed.
 
-.. sample:: compute/v2/servers/rebuild_server.php
+.. sample:: Compute/v2/servers/rebuild_server.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_rebuild
 
 Resize server
@@ -252,7 +252,7 @@ You can resize the flavor of a server by performing this operation. As soon the
 transition to a VERIFY_RESIZE state and a VM status of RESIZED. You will either need to confirm or revert the
 resize in order to continue.
 
-.. sample:: compute/v2/servers/resize_server.php
+.. sample:: Compute/v2/servers/resize_server.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resize
 
 Confirm server resize
@@ -262,7 +262,7 @@ Once a server has been resized, you can confirm the operation by calling this. T
 VERIFY_RESIZE and a VM status of RESIZED. Once this operation completes, the server should transition to an
 ACTIVE state and a migration status of confirmed.
 
-.. sample:: compute/v2/servers/confirm_server_resize.php
+.. sample:: Compute/v2/servers/confirm_server_resize.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_confirmResize
 
 Revert server resize
@@ -272,7 +272,7 @@ Once a server has been resized, you can revert the operation by calling this. Th
 VERIFY_RESIZE and a VM status of RESIZED. Once this operation completes, the server should transition to an
 ACTIVE state and a migration status of reverted.
 
-.. sample:: compute/v2/servers/revert_server_resize.php
+.. sample:: Compute/v2/servers/revert_server_resize.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_revertResize
 
 Create server image
@@ -281,7 +281,7 @@ Create server image
 This operation will create a new server image. The only required option is the new image's name. You may also specify
 additional metadata:
 
-.. sample:: compute/v2/images/create_server_image.php
+.. sample:: Compute/v2/images/create_server_image.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_createImage
 
 List server IP addresses
diff --git a/doc/services/identity/v2/authentication.rst b/doc/services/identity/v2/authentication.rst
index eb3edfc6..6f5d515f 100644
--- a/doc/services/identity/v2/authentication.rst
+++ b/doc/services/identity/v2/authentication.rst
@@ -9,4 +9,4 @@ We recommend users to use identity v3 when possible.
 RackSpace cloud and OVH cloud, however, are still using Keystone v2.0. This following code will work for such providers.
 
 
-.. sample:: identity/v2/authentication.php
+.. sample:: Identity/v2/authentication.php
diff --git a/doc/services/identity/v3/credentials.rst b/doc/services/identity/v3/credentials.rst
index 0471cc9e..b0cf1d84 100644
--- a/doc/services/identity/v3/credentials.rst
+++ b/doc/services/identity/v3/credentials.rst
@@ -7,7 +7,7 @@ Add credential
 Create a secret/access pair for use with ec2 style auth. This operation will generates a new set of credentials that
 map the user/tenant pair.
 
-.. sample:: identity/v3/credentials/add_cred.php
+.. sample:: Identity/v2/credentials/add_cred.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createCredential
 
 List credentials
@@ -15,7 +15,7 @@ List credentials
 
 List all credentials for a given user.
 
-.. sample:: identity/v3/credentials/list_creds.php
+.. sample:: Identity/v2/credentials/list_creds.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listCredentials
 
 Show credential details
@@ -23,13 +23,13 @@ Show credential details
 
 Retrieve a user's access/secret pair by the access key.
 
-.. sample:: identity/v3/credentials/get_cred.php
+.. sample:: Identity/v2/credentials/get_cred.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getCredential
 
 Update credential
 -----------------
 
-.. sample:: identity/v3/credentials/update_cred.php
+.. sample:: Identity/v2/credentials/update_cred.php
 .. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_update
 
 Delete credential
@@ -37,5 +37,5 @@ Delete credential
 
 Delete a user's access/secret pair.
 
-.. sample:: identity/v3/credentials/delete_cred.php
+.. sample:: Identity/v2/credentials/delete_cred.php
 .. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_delete
diff --git a/doc/services/identity/v3/domains.rst b/doc/services/identity/v3/domains.rst
index c56c0bd6..079937e8 100644
--- a/doc/services/identity/v3/domains.rst
+++ b/doc/services/identity/v3/domains.rst
@@ -4,77 +4,77 @@ Domains
 Add domain
 ----------
 
-.. sample:: identity/v3/domains/add_domain.php
+.. sample:: Identity/v2/domains/add_domain.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createDomain
 
 List domains
 ------------
 
-.. sample:: identity/v3/domains/list_domains.php
+.. sample:: Identity/v2/domains/list_domains.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listDomains
 
 Show domain details
 -------------------
 
-.. sample:: identity/v3/domains/show_domain.php
+.. sample:: Identity/v2/domains/show_domain.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getDomain
 
 Update domain
 -------------
 
-.. sample:: identity/v3/domains/update_domain.php
+.. sample:: Identity/v2/domains/update_domain.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_update
 
 Delete domain
 -------------
 
-.. sample:: identity/v3/domains/delete_domain.php
+.. sample:: Identity/v2/domains/delete_domain.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_delete
 
 List roles for domain user
 --------------------------
 
-.. sample:: identity/v3/domains/list_user_roles.php
+.. sample:: Identity/v2/domains/list_user_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listUserRoles
 
 Grant role to domain user
 -------------------------
 
-.. sample:: identity/v3/domains/grant_user_role.php
+.. sample:: Identity/v2/domains/grant_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantUserRole
 
 Check role for domain user
 --------------------------
 
-.. sample:: identity/v3/domains/check_user_role.php
+.. sample:: Identity/v2/domains/check_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkUserRole
 
 Revoke role for domain user
 ---------------------------
 
-.. sample:: identity/v3/domains/revoke_user_role.php
+.. sample:: Identity/v2/domains/revoke_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeUserRole
 
 List roles for domain group
 ---------------------------
 
-.. sample:: identity/v3/domains/list_group_roles.php
+.. sample:: Identity/v2/domains/list_group_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listGroupRoles
 
 Grant role to domain group
 --------------------------
 
-.. sample:: identity/v3/domains/grant_group_role.php
+.. sample:: Identity/v2/domains/grant_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantGroupRole
 
 Check role for domain group
 ---------------------------
 
-.. sample:: identity/v3/domains/check_group_role.php
+.. sample:: Identity/v2/domains/check_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkGroupRole
 
 Revoke role for domain group
 ----------------------------
 
-.. sample:: identity/v3/domains/revoke_group_role.php
+.. sample:: Identity/v2/domains/revoke_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeGroupRole
diff --git a/doc/services/identity/v3/endpoints.rst b/doc/services/identity/v3/endpoints.rst
index 0040aaca..c4aadb84 100644
--- a/doc/services/identity/v3/endpoints.rst
+++ b/doc/services/identity/v3/endpoints.rst
@@ -4,29 +4,29 @@ Endpoints
 Add endpoints
 -------------
 
-.. sample:: identity/v3/endpoints/add_endpoint.php
+.. sample:: Identity/v2/endpoints/add_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createEndpoint
 
 Get endpoint
 ------------
 
-.. sample:: identity/v3/endpoints/get_endpoint.php
+.. sample:: Identity/v2/endpoints/get_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getEndpoint
 
 List endpoints
 --------------
 
-.. sample:: identity/v3/endpoints/list_endpoints.php
+.. sample:: Identity/v2/endpoints/list_endpoints.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listEndpoints
 
 Update endpoint
 ---------------
 
-.. sample:: identity/v3/endpoints/update_endpoint.php
+.. sample:: Identity/v2/endpoints/update_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_update
 
 Delete endpoint
 ---------------
 
-.. sample:: identity/v3/endpoints/delete_endpoint.php
+.. sample:: Identity/v2/endpoints/delete_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_delete
diff --git a/doc/services/identity/v3/groups.rst b/doc/services/identity/v3/groups.rst
index f9db091b..7a29b672 100644
--- a/doc/services/identity/v3/groups.rst
+++ b/doc/services/identity/v3/groups.rst
@@ -4,53 +4,53 @@ Groups
 Add group
 ---------
 
-.. sample:: identity/v3/groups/add_group.php
+.. sample:: Identity/v2/groups/add_group.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createGroup
 
 List groups
 -----------
 
-.. sample:: identity/v3/groups/list_groups.php
+.. sample:: Identity/v2/groups/list_groups.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listGroups
 
 Show group details
 ------------------
 
-.. sample:: identity/v3/groups/get_group.php
+.. sample:: Identity/v2/groups/get_group.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getGroup
 
 Update group
 ------------
 
-.. sample:: identity/v3/groups/update_group.php
+.. sample:: Identity/v2/groups/update_group.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_update
 
 Delete group
 ------------
 
-.. sample:: identity/v3/groups/delete_group.php
+.. sample:: Identity/v2/groups/delete_group.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_delete
 
 List users in a group
 ---------------------
 
-.. sample:: identity/v3/groups/list_users.php
+.. sample:: Identity/v2/groups/list_users.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_listUsers
 
 Add user to group
 -----------------
 
-.. sample:: identity/v3/groups/add_user.php
+.. sample:: Identity/v2/groups/add_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_addUser
 
 Remove user from group
 ----------------------
 
-.. sample:: identity/v3/groups/remove_user.php
+.. sample:: Identity/v2/groups/remove_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_removeUser
 
 Check user membership in a group
 --------------------------------
 
-.. sample:: identity/v3/groups/check_user_membership.php
+.. sample:: Identity/v2/groups/check_user_membership.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_checkMembership
diff --git a/doc/services/identity/v3/projects.rst b/doc/services/identity/v3/projects.rst
index cd2e07b2..55177cf2 100644
--- a/doc/services/identity/v3/projects.rst
+++ b/doc/services/identity/v3/projects.rst
@@ -4,77 +4,77 @@ Projects
 Add project
 -----------
 
-.. sample:: identity/v3/projects/add_project.php
+.. sample:: Identity/v2/projects/add_project.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createProject
 
 List projects
 -------------
 
-.. sample:: identity/v3/projects/list_projects.php
+.. sample:: Identity/v2/projects/list_projects.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listProjects
 
 Show project details
 --------------------
 
-.. sample:: identity/v3/projects/get_project.php
+.. sample:: Identity/v2/projects/get_project.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getProject
 
 Update project
 --------------
 
-.. sample:: identity/v3/projects/update_project.php
+.. sample:: Identity/v2/projects/update_project.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_update
 
 Delete project
 --------------
 
-.. sample:: identity/v3/projects/delete_project.php
+.. sample:: Identity/v2/projects/delete_project.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_delete
 
 List roles for project user
 ---------------------------
 
-.. sample:: identity/v3/projects/list_user_roles.php
+.. sample:: Identity/v2/projects/list_user_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listUserRoles
 
 Grant role to project user
 --------------------------
 
-.. sample:: identity/v3/projects/grant_user_role.php
+.. sample:: Identity/v2/projects/grant_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantUserRole
 
 Check role for project user
 ---------------------------
 
-.. sample:: identity/v3/projects/check_user_role.php
+.. sample:: Identity/v2/projects/check_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkUserRole
 
 Revoke role for project user
 ----------------------------
 
-.. sample:: identity/v3/projects/revoke_user_role.php
+.. sample:: Identity/v2/projects/revoke_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeUserRole
 
 List roles for project group
 ----------------------------
 
-.. sample:: identity/v3/projects/list_group_roles.php
+.. sample:: Identity/v2/projects/list_group_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listGroupRoles
 
 Grant role to project group
 ---------------------------
 
-.. sample:: identity/v3/projects/grant_group_role.php
+.. sample:: Identity/v2/projects/grant_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantGroupRole
 
 Check role for project group
 ----------------------------
 
-.. sample:: identity/v3/projects/check_group_role.php
+.. sample:: Identity/v2/projects/check_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkGroupRole
 
 Revoke role for project group
 -----------------------------
 
-.. sample:: identity/v3/projects/revoke_group_role.php
+.. sample:: Identity/v2/projects/revoke_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeGroupRole
\ No newline at end of file
diff --git a/doc/services/identity/v3/roles.rst b/doc/services/identity/v3/roles.rst
index 27d3458c..5baf9ab1 100644
--- a/doc/services/identity/v3/roles.rst
+++ b/doc/services/identity/v3/roles.rst
@@ -4,17 +4,17 @@ Roles
 Add role
 --------
 
-.. sample:: identity/v3/roles/add_role.php
+.. sample:: Identity/v2/roles/add_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_createRole
 
 List roles
 ----------
 
-.. sample:: identity/v3/roles/list_roles.php
+.. sample:: Identity/v2/roles/list_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoles
 
 List role assignments
 ---------------------
 
-.. sample:: identity/v3/roles/list_assignments.php
+.. sample:: Identity/v2/roles/list_assignments.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoleAssignments
diff --git a/doc/services/identity/v3/services.rst b/doc/services/identity/v3/services.rst
index 770ded17..4ba154af 100644
--- a/doc/services/identity/v3/services.rst
+++ b/doc/services/identity/v3/services.rst
@@ -4,23 +4,23 @@ Services
 Add service
 -----------
 
-.. sample:: identity/v3/services/add_service.php
+.. sample:: Identity/v2/services/add_service.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createService
 
 List services
 -------------
 
-.. sample:: identity/v3/services/list_services.php
+.. sample:: Identity/v2/services/list_services.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listServices
 
 Show service details
 --------------------
 
-.. sample:: identity/v3/services/get_service.php
+.. sample:: Identity/v2/services/get_service.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getService
 
 Delete service
 --------------
 
-.. sample:: identity/v3/services/delete_service.php
+.. sample:: Identity/v2/services/delete_service.php
 .. refdoc:: OpenStack/Identity/v3/Models/Service.html#method_delete
\ No newline at end of file
diff --git a/doc/services/identity/v3/tokens.rst b/doc/services/identity/v3/tokens.rst
index 9fe4b25c..72e8617e 100644
--- a/doc/services/identity/v3/tokens.rst
+++ b/doc/services/identity/v3/tokens.rst
@@ -10,38 +10,38 @@ Authenticate (generate) token
 Generate token with user ID
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: identity/v3/tokens/generate_token_with_user_id.php
+.. sample:: Identity/v2/tokens/generate_token_with_user_id.php
 
 Generate token with username
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: identity/v3/tokens/generate_token_with_username.php
+.. sample:: Identity/v2/tokens/generate_token_with_username.php
 
 Generate token from ID
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: identity/v3/tokens/generate_token_from_id.php
+.. sample:: Identity/v2/tokens/generate_token_from_id.php
 
 Generate token scoped to project ID
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: identity/v3/tokens/generate_token_scoped_to_project_id.php
+.. sample:: Identity/v2/tokens/generate_token_scoped_to_project_id.php
 
 Generate token scoped to project name
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: identity/v3/tokens/generate_token_scoped_to_project_name.php
+.. sample:: Identity/v2/tokens/generate_token_scoped_to_project_name.php
 
 Validate token
 --------------
 
-.. sample:: identity/v3/tokens/validate_token.php
+.. sample:: Identity/v2/tokens/validate_token.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_validateToken
 
 Revoke token
 ------------
 
-.. sample:: identity/v3/tokens/revoke_token.php
+.. sample:: Identity/v2/tokens/revoke_token.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_revokeToken
 
 Cache authentication token
@@ -66,7 +66,7 @@ expire.
 Generate token and persist to file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: identity/v3/tokens/export_authentication_token.php
+.. sample:: Identity/v2/tokens/export_authentication_token.php
 
 
 For scalability, it is recommended that cached tokens are stored in persistent storage such as memcache or redis instead
@@ -75,4 +75,4 @@ of a local file.
 Initialize Open Stack using cached authentication token
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: identity/v3/tokens/use_cached_authentication_token.php
+.. sample:: Identity/v2/tokens/use_cached_authentication_token.php
diff --git a/doc/services/identity/v3/users.rst b/doc/services/identity/v3/users.rst
index 9fd79ec2..db27edbd 100644
--- a/doc/services/identity/v3/users.rst
+++ b/doc/services/identity/v3/users.rst
@@ -4,41 +4,41 @@ Users
 Add user
 --------
 
-.. sample:: identity/v3/users/add_user.php
+.. sample:: Identity/v2/users/add_user.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createUser
 
 List users
 ----------
 
-.. sample:: identity/v3/users/list_users.php
+.. sample:: Identity/v2/users/list_users.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listUsers
 
 Show user details
 -----------------
 
-.. sample:: identity/v3/users/get_user.php
+.. sample:: Identity/v2/users/get_user.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getUser
 
 Update user
 -----------
 
-.. sample:: identity/v3/users/update_user.php
+.. sample:: Identity/v2/users/update_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_update
 
 Delete user
 -----------
 
-.. sample:: identity/v3/users/delete_user.php
+.. sample:: Identity/v2/users/delete_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_delete
 
 List groups for user
 --------------------
 
-.. sample:: identity/v3/users/list_groups.php
+.. sample:: Identity/v2/users/list_groups.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listGroups
 
 List projects for user
 ----------------------
 
-.. sample:: identity/v3/users/list_projects.php
+.. sample:: Identity/v2/users/list_projects.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listProjects
diff --git a/doc/services/images/v2/images.rst b/doc/services/images/v2/images.rst
index 1bd8949a..eacc94f5 100644
--- a/doc/services/images/v2/images.rst
+++ b/doc/services/images/v2/images.rst
@@ -6,13 +6,13 @@ Create image
 
 The only required attribute when creating a new image is ``name``.
 
-.. sample:: images/v2/images/create.php
+.. sample:: Images/v2/images/create.php
 .. refdoc:: OpenStack/Images/v2/Service.html#method_createImage
 
 List images
 -----------
 
-.. sample:: images/v2/images/list.php
+.. sample:: Images/v2/images/list.php
 .. refdoc:: OpenStack/Images/v2/Service.html#method_listImages
 
 .. include:: /common/generators.rst
@@ -20,25 +20,25 @@ List images
 Show image details
 ------------------
 
-.. sample:: images/v2/images/get.php
+.. sample:: Images/v2/images/get.php
 .. refdoc:: OpenStack/Images/v2/Service.html#method_getImage
 
 Update image
 ------------
 
-.. sample:: images/v2/images/update.php
+.. sample:: Images/v2/images/update.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_update
 
 Delete image
 ------------
 
-.. sample:: images/v2/images/delete.php
+.. sample:: Images/v2/images/delete.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_delete
 
 Reactivate image
 ----------------
 
-.. sample:: images/v2/images/reactivate.php
+.. sample:: Images/v2/images/reactivate.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_reactivate
 
 Deactivate image
@@ -46,7 +46,7 @@ Deactivate image
 
 If you try to download a deactivated image, a Forbidden error is returned.
 
-.. sample:: images/v2/images/deactivate.php
+.. sample:: Images/v2/images/deactivate.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_deactivate
 
 Upload binary data
@@ -61,11 +61,11 @@ Before you can store binary image data, you must meet the following precondition
 
 The size of the data that you want to store must not exceed the size that the Image service allows.
 
-.. sample:: images/v2/images/upload_binary_data.php
+.. sample:: Images/v2/images/upload_binary_data.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_uploadData
 
 Download binary data
 --------------------
 
-.. sample:: images/v2/images/download_binary_data.php
+.. sample:: Images/v2/images/download_binary_data.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_downloadData
\ No newline at end of file
diff --git a/doc/services/images/v2/members.rst b/doc/services/images/v2/members.rst
index 5b8bee40..08abc547 100644
--- a/doc/services/images/v2/members.rst
+++ b/doc/services/images/v2/members.rst
@@ -4,13 +4,13 @@ Image Members
 Add member to image
 -------------------
 
-.. sample:: images/v2/members/add.php
+.. sample:: Images/v2/members/add.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_addMember
 
 List image members
 ------------------
 
-.. sample:: images/v2/members/list.php
+.. sample:: Images/v2/members/list.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_listMembers
 
 .. include:: /common/generators.rst
@@ -18,17 +18,17 @@ List image members
 Show member details
 -------------------
 
-.. sample:: images/v2/members/get.php
+.. sample:: Images/v2/members/get.php
 .. refdoc:: OpenStack/Images/v2/Models/Image.html#method_getMember
 
 Remove member from image
 ------------------------
 
-.. sample:: images/v2/members/delete.php
+.. sample:: Images/v2/members/delete.php
 .. refdoc:: OpenStack/Images/v2/Models/Member.html#method_delete
 
 Update status of image member
 -----------------------------
 
-.. sample:: images/v2/members/update_status.php
+.. sample:: Images/v2/members/update_status.php
 .. refdoc:: OpenStack/Images/v2/Models/Member.html#method_updateStatus
\ No newline at end of file
diff --git a/doc/services/networking/v2/loadbalancer-healthmonitors.rst b/doc/services/networking/v2/loadbalancer-healthmonitors.rst
index 5a8a27ba..e383a2ff 100644
--- a/doc/services/networking/v2/loadbalancer-healthmonitors.rst
+++ b/doc/services/networking/v2/loadbalancer-healthmonitors.rst
@@ -4,29 +4,29 @@ LoadBalancer HealthMonitors
 Create HealthMonitor
 --------------------
 
-.. sample:: networking/v2/lbaas/healthmonitors/create.php
+.. sample:: Networking/v2/lbaas/healthmonitors/create.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerHealthMonitor
 
 Get HealthMonitor
 -----------------
 
-.. sample:: networking/v2/lbaas/healthmonitors/get.php
+.. sample:: Networking/v2/lbaas/healthmonitors/get.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerHealthMonitor
 
 List HealthMonitors
 -------------------
 
-.. sample:: networking/v2/lbaas/healthmonitors/list.php
+.. sample:: Networking/v2/lbaas/healthmonitors/list.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerHealthMonitors
 
 Update HealthMonitor
 --------------------
 
-.. sample:: networking/v2/lbaas/healthmonitors/update.php
+.. sample:: Networking/v2/lbaas/healthmonitors/update.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_update
 
 Delete HealthMonitor
 --------------------
 
-.. sample:: networking/v2/lbaas/healthmonitors/delete.php
+.. sample:: Networking/v2/lbaas/healthmonitors/delete.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_delete
diff --git a/doc/services/networking/v2/loadbalancer-listeners.rst b/doc/services/networking/v2/loadbalancer-listeners.rst
index 90237d86..a99a1df5 100644
--- a/doc/services/networking/v2/loadbalancer-listeners.rst
+++ b/doc/services/networking/v2/loadbalancer-listeners.rst
@@ -4,29 +4,29 @@ LoadBalancer Listeners
 Create Listener
 ---------------
 
-.. sample:: networking/v2/lbaas/listeners/create.php
+.. sample:: Networking/v2/lbaas/listeners/create.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerListener
 
 Get Listener
 ------------
 
-.. sample:: networking/v2/lbaas/listeners/get.php
+.. sample:: Networking/v2/lbaas/listeners/get.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerListener
 
 List Listeners
 --------------
 
-.. sample:: networking/v2/lbaas/listeners/list.php
+.. sample:: Networking/v2/lbaas/listeners/list.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerListeners
 
 Update Listener
 ---------------
 
-.. sample:: networking/v2/lbaas/listeners/update.php
+.. sample:: Networking/v2/lbaas/listeners/update.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerListener.html#method_update
 
 Delete Listener
 ---------------
 
-.. sample:: networking/v2/lbaas/listeners/delete.php
+.. sample:: Networking/v2/lbaas/listeners/delete.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerListener.html#method_delete
diff --git a/doc/services/networking/v2/loadbalancer-pools.rst b/doc/services/networking/v2/loadbalancer-pools.rst
index ce148918..891b487d 100644
--- a/doc/services/networking/v2/loadbalancer-pools.rst
+++ b/doc/services/networking/v2/loadbalancer-pools.rst
@@ -4,53 +4,53 @@ LoadBalancer Pools
 Create Pool
 -----------
 
-.. sample:: networking/v2/lbaas/pools/create.php
+.. sample:: Networking/v2/lbaas/pools/create.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerPool
 
 Get Pool
 --------
 
-.. sample:: networking/v2/lbaas/pools/get.php
+.. sample:: Networking/v2/lbaas/pools/get.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerPool
 
 List Pools
 ----------
 
-.. sample:: networking/v2/lbaas/pools/list.php
+.. sample:: Networking/v2/lbaas/pools/list.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerPools
 
 Update Pool
 -----------
 
-.. sample:: networking/v2/lbaas/pools/update.php
+.. sample:: Networking/v2/lbaas/pools/update.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_update
 
 Delete Pool
 -----------
 
-.. sample:: networking/v2/lbaas/pools/delete.php
+.. sample:: Networking/v2/lbaas/pools/delete.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_delete
 
 Add Member
 ----------
 
-.. sample:: networking/v2/lbaas/pools/add-member.php
+.. sample:: Networking/v2/lbaas/pools/add-member.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_addMember
 
 Get Member
 ----------
 
-.. sample:: networking/v2/lbaas/pools/get-member.php
+.. sample:: Networking/v2/lbaas/pools/get-member.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_getMember
 
 Delete Member
 -------------
 
-.. sample:: networking/v2/lbaas/pools/delete-member.php
+.. sample:: Networking/v2/lbaas/pools/delete-member.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_deleteMember
 
 Add Health Monitor
 ------------------
 
-.. sample:: networking/v2/lbaas/pools/add-healthmonitor.php
+.. sample:: Networking/v2/lbaas/pools/add-healthmonitor.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_addHealthMonitor
diff --git a/doc/services/networking/v2/loadbalancers.rst b/doc/services/networking/v2/loadbalancers.rst
index 1733a54d..a04ae815 100644
--- a/doc/services/networking/v2/loadbalancers.rst
+++ b/doc/services/networking/v2/loadbalancers.rst
@@ -4,44 +4,44 @@ LoadBalancers
 Create LoadBalancer
 -------------------
 
-.. sample:: networking/v2/lbaas/loadbalancers/create.php
+.. sample:: Networking/v2/lbaas/loadbalancers/create.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancer
 
 Get LoadBalancer
 ----------------
 
-.. sample:: networking/v2/lbaas/loadbalancers/get.php
+.. sample:: Networking/v2/lbaas/loadbalancers/get.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancer
 
 List LoadBalancers
 ------------------
 
-.. sample:: networking/v2/lbaas/loadbalancers/list.php
+.. sample:: Networking/v2/lbaas/loadbalancers/list.php
 .. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancers
 
 Update LoadBalancer
 -------------------
 
-.. sample:: networking/v2/lbaas/loadbalancers/update.php
+.. sample:: Networking/v2/lbaas/loadbalancers/update.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_update
 
 Delete LoadBalancer
 -------------------
 
-.. sample:: networking/v2/lbaas/loadbalancers/delete.php
+.. sample:: Networking/v2/lbaas/loadbalancers/delete.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_delete
 
 Add Listener to LoadBalancer
 ----------------------------
-.. sample:: networking/v2/lbaas/loadbalancers/add_listener.php
+.. sample:: Networking/v2/lbaas/loadbalancers/add_listener.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_addListener
 
 Get Stats for LoadBalancer
 --------------------------
-.. sample:: networking/v2/lbaas/loadbalancers/get_stats.php
+.. sample:: Networking/v2/lbaas/loadbalancers/get_stats.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_getStats
 
 Get Status Tree for LoadBalancer
 --------------------------------
-.. sample:: networking/v2/lbaas/loadbalancers/get_statuses.php
+.. sample:: Networking/v2/lbaas/loadbalancers/get_statuses.php
 .. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_getStatuses
diff --git a/doc/services/networking/v2/networks.rst b/doc/services/networking/v2/networks.rst
index 3f3d67f8..27719c39 100644
--- a/doc/services/networking/v2/networks.rst
+++ b/doc/services/networking/v2/networks.rst
@@ -4,29 +4,29 @@ Networks
 Create network
 --------------
 
-.. sample:: networking/v2/networks/create.php
+.. sample:: Networking/v2/networks/create.php
 .. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_createNetwork
 
 Create networks
 ---------------
 
-.. sample:: networking/v2/networks/create_batch.php
+.. sample:: Networking/v2/networks/create_batch.php
 .. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_createNetworks
 
 Get network
 -----------
 
-.. sample:: networking/v2/networks/get.php
+.. sample:: Networking/v2/networks/get.php
 .. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_getNetwork
 
 Update network
 --------------
 
-.. sample:: networking/v2/networks/update.php
+.. sample:: Networking/v2/networks/update.php
 .. refdoc:: OpenStack/Networking/v2/networks/Models/Network.html#method_update
 
 Delete network
 --------------
 
-.. sample:: networking/v2/networks/delete.php
+.. sample:: Networking/v2/networks/delete.php
 .. refdoc:: OpenStack/Networking/v2/networks/Models/Network.html#method_delete
\ No newline at end of file
diff --git a/doc/services/networking/v2/ports.rst b/doc/services/networking/v2/ports.rst
index 157d3281..7efc7e90 100644
--- a/doc/services/networking/v2/ports.rst
+++ b/doc/services/networking/v2/ports.rst
@@ -4,29 +4,29 @@ Ports
 Create port
 -----------
 
-.. sample:: networking/v2/ports/create.php
+.. sample:: Networking/v2/ports/create.php
 .. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_createPort
 
 Create ports
 ------------
 
-.. sample:: networking/v2/ports/create_batch.php
+.. sample:: Networking/v2/ports/create_batch.php
 .. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_createPorts
 
 Get port
 --------
 
-.. sample:: networking/v2/ports/get.php
+.. sample:: Networking/v2/ports/get.php
 .. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_getPort
 
 Update port
 -----------
 
-.. sample:: networking/v2/ports/update.php
+.. sample:: Networking/v2/ports/update.php
 .. refdoc:: OpenStack/Networking/v2/ports/Models/Port.html#method_update
 
 Delete port
 -----------
 
-.. sample:: networking/v2/ports/delete.php
+.. sample:: Networking/v2/ports/delete.php
 .. refdoc:: OpenStack/Networking/v2/ports/Models/Port.html#method_delete
\ No newline at end of file
diff --git a/doc/services/networking/v2/subnets.rst b/doc/services/networking/v2/subnets.rst
index cb0f7409..39b50901 100644
--- a/doc/services/networking/v2/subnets.rst
+++ b/doc/services/networking/v2/subnets.rst
@@ -4,31 +4,31 @@ Subnets
 Create subnet
 -------------
 
-.. sample:: networking/v2/subnets/create.php
+.. sample:: Networking/v2/subnets/create.php
 .. refdoc:: OpenStack/Networking/v2/subnets/Service.html#method_createSubnet
 
 To create a subnet with gateway IP:
 
-.. sample:: networking/v2/subnets/create_with_gateway_ip.php
+.. sample:: Networking/v2/subnets/create_with_gateway_ip.php
 
 To create a subnet with host routes:
 
-.. sample:: networking/v2/subnets/create_with_host_routes.php
+.. sample:: Networking/v2/subnets/create_with_host_routes.php
 
 Get subnet
 ----------
 
-.. sample:: networking/v2/subnets/get.php
+.. sample:: Networking/v2/subnets/get.php
 .. refdoc:: OpenStack/Networking/v2/subnets/Service.html#method_getSubnet
 
 Update subnet
 -------------
 
-.. sample:: networking/v2/subnets/update.php
+.. sample:: Networking/v2/subnets/update.php
 .. refdoc:: OpenStack/Networking/v2/subnets/Models/Subnet.html#method_update
 
 Delete subnet
 -------------
 
-.. sample:: networking/v2/subnets/delete.php
+.. sample:: Networking/v2/subnets/delete.php
 .. refdoc:: OpenStack/Networking/v2/subnets/Models/Subnet.html#method_delete
\ No newline at end of file
diff --git a/doc/services/object-store/v1/account.rst b/doc/services/object-store/v1/account.rst
index adc06e09..972e9f20 100644
--- a/doc/services/object-store/v1/account.rst
+++ b/doc/services/object-store/v1/account.rst
@@ -6,13 +6,13 @@ Show account details
 
 To work with an Object Store account, you must first retrieve an account object like so:
 
-.. sample:: objectstore/v1/account/get.php
+.. sample:: ObjectStore/v2/account/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getAccount
 
 Get account metadata
 --------------------
 
-.. sample:: objectstore/v1/account/get_metadata.php
+.. sample:: ObjectStore/v2/account/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_getMetadata
 
 Replace all metadata with new values
@@ -43,7 +43,7 @@ the metadata of the account will now be:
 
 To merge metadata, you must run:
 
-.. sample:: objectstore/v1/account/reset_metadata.php
+.. sample:: ObjectStore/v2/account/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_resetMetadata
 
 Merge new metadata values with existing
@@ -75,5 +75,5 @@ the metadata of the account will now be:
 
 To reset metadata, you must run:
 
-.. sample:: objectstore/v1/account/merge_metadata.php
+.. sample:: ObjectStore/v2/account/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_mergeMetadata
\ No newline at end of file
diff --git a/doc/services/object-store/v1/containers.rst b/doc/services/object-store/v1/containers.rst
index 8c40d060..fdf742f3 100644
--- a/doc/services/object-store/v1/containers.rst
+++ b/doc/services/object-store/v1/containers.rst
@@ -4,7 +4,7 @@ Containers
 Show details for a container
 ----------------------------
 
-.. sample:: objectstore/v1/containers/get.php
+.. sample:: ObjectStore/v2/containers/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getContainer
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -25,7 +25,7 @@ and all of the local properties will match those of the remote resource.
 List containers
 ---------------
 
-.. sample:: objectstore/v1/containers/list.php
+.. sample:: ObjectStore/v2/containers/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_listContainers
 
 When listing containers, you must be aware that not *all* information about a container is returned in a collection.
@@ -46,7 +46,7 @@ container.
 Delete container
 ----------------
 
-.. sample:: objectstore/v1/containers/delete.php
+.. sample:: ObjectStore/v2/containers/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_delete
 
 The API will only accept DELETE requests on containers when they are empty. If you have a container with any objects
@@ -55,7 +55,7 @@ inside, the operation will fail.
 Get metadata
 ------------
 
-.. sample:: objectstore/v1/containers/get_metadata.php
+.. sample:: ObjectStore/v2/containers/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -65,7 +65,7 @@ correspond to the values set either when the container was created, or when a pr
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: objectstore/v1/containers/reset_metadata.php
+.. sample:: ObjectStore/v2/containers/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -95,7 +95,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: objectstore/v1/containers/merge_metadata.php
+.. sample:: ObjectStore/v2/containers/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing
diff --git a/doc/services/object-store/v1/objects.rst b/doc/services/object-store/v1/objects.rst
index 97fff919..a679330e 100644
--- a/doc/services/object-store/v1/objects.rst
+++ b/doc/services/object-store/v1/objects.rst
@@ -4,7 +4,7 @@ Objects
 Show details for an object
 --------------------------
 
-.. sample:: objectstore/v1/objects/get.php
+.. sample:: ObjectStore/v2/objects/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getObject
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -26,7 +26,7 @@ of the object's metadata, will not download the object's content. To do this, se
 Download an object
 ------------------
 
-.. sample:: objectstore/v1/objects/download.php
+.. sample:: ObjectStore/v2/objects/download.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_download
 
 As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
@@ -41,7 +41,7 @@ parameter ``$data`` to ``['stream' => true]`` to get the stream before the end o
 List objects
 ------------
 
-.. sample:: objectstore/v1/objects/list.php
+.. sample:: ObjectStore/v2/objects/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_listObjects
 
 When listing objects, you must be aware that not *all* information about a container is returned in a collection.
@@ -64,13 +64,13 @@ Create an object
 
 When creating an object, you can upload its content according to a string representation:
 
-.. sample:: objectstore/v1/objects/create.php
+.. sample:: ObjectStore/v2/objects/create.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createObject
 
 If that is not optimal or convenient, you can use a stream instead. Any instance of ``\Psr\Http\Message\StreamInterface``
 is acceptable. For example, to use a normal Guzzle stream:
 
-.. sample:: objectstore/v1/objects/create_from_stream.php
+.. sample:: ObjectStore/v2/objects/create_from_stream.php
 
 Create a large object (over 5GB)
 --------------------------------
@@ -84,25 +84,25 @@ uploading, this is what happens under the hood:
 
 To upload a DLO, you need to call:
 
-.. sample:: objectstore/v1/objects/create_large_object.php
+.. sample:: ObjectStore/v2/objects/create_large_object.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createLargeObject
 
 Copy object
 -----------
 
-.. sample:: objectstore/v1/objects/copy.php
+.. sample:: ObjectStore/v2/objects/copy.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_copy
 
 Delete object
 -------------
 
-.. sample:: objectstore/v1/objects/delete.php
+.. sample:: ObjectStore/v2/objects/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_delete
 
 Get metadata
 ------------
 
-.. sample:: objectstore/v1/objects/get_metadata.php
+.. sample:: ObjectStore/v2/objects/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -112,7 +112,7 @@ correspond to the values set either when the object was created, or when a previ
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: objectstore/v1/objects/reset_metadata.php
+.. sample:: ObjectStore/v2/objects/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -142,7 +142,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: objectstore/v1/objects/merge_metadata.php
+.. sample:: ObjectStore/v2/objects/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing
diff --git a/samples/blockstorage/v2/snapshots/create.php b/samples/BlockStorage/v2/snapshots/create.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/create.php
rename to samples/BlockStorage/v2/snapshots/create.php
diff --git a/samples/blockstorage/v2/snapshots/delete.php b/samples/BlockStorage/v2/snapshots/delete.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/delete.php
rename to samples/BlockStorage/v2/snapshots/delete.php
diff --git a/samples/blockstorage/v2/snapshots/get.php b/samples/BlockStorage/v2/snapshots/get.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/get.php
rename to samples/BlockStorage/v2/snapshots/get.php
diff --git a/samples/blockstorage/v2/snapshots/get_metadata.php b/samples/BlockStorage/v2/snapshots/get_metadata.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/get_metadata.php
rename to samples/BlockStorage/v2/snapshots/get_metadata.php
diff --git a/samples/blockstorage/v2/snapshots/list.php b/samples/BlockStorage/v2/snapshots/list.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/list.php
rename to samples/BlockStorage/v2/snapshots/list.php
diff --git a/samples/blockstorage/v2/snapshots/list_detail.php b/samples/BlockStorage/v2/snapshots/list_detail.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/list_detail.php
rename to samples/BlockStorage/v2/snapshots/list_detail.php
diff --git a/samples/blockstorage/v2/snapshots/merge_metadata.php b/samples/BlockStorage/v2/snapshots/merge_metadata.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/merge_metadata.php
rename to samples/BlockStorage/v2/snapshots/merge_metadata.php
diff --git a/samples/blockstorage/v2/snapshots/reset_metadata.php b/samples/BlockStorage/v2/snapshots/reset_metadata.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/reset_metadata.php
rename to samples/BlockStorage/v2/snapshots/reset_metadata.php
diff --git a/samples/blockstorage/v2/snapshots/update.php b/samples/BlockStorage/v2/snapshots/update.php
similarity index 100%
rename from samples/blockstorage/v2/snapshots/update.php
rename to samples/BlockStorage/v2/snapshots/update.php
diff --git a/samples/blockstorage/v2/volume_types/create.php b/samples/BlockStorage/v2/volume_types/create.php
similarity index 100%
rename from samples/blockstorage/v2/volume_types/create.php
rename to samples/BlockStorage/v2/volume_types/create.php
diff --git a/samples/blockstorage/v2/volume_types/delete.php b/samples/BlockStorage/v2/volume_types/delete.php
similarity index 100%
rename from samples/blockstorage/v2/volume_types/delete.php
rename to samples/BlockStorage/v2/volume_types/delete.php
diff --git a/samples/blockstorage/v2/volume_types/get.php b/samples/BlockStorage/v2/volume_types/get.php
similarity index 100%
rename from samples/blockstorage/v2/volume_types/get.php
rename to samples/BlockStorage/v2/volume_types/get.php
diff --git a/samples/blockstorage/v2/volume_types/list.php b/samples/BlockStorage/v2/volume_types/list.php
similarity index 100%
rename from samples/blockstorage/v2/volume_types/list.php
rename to samples/BlockStorage/v2/volume_types/list.php
diff --git a/samples/blockstorage/v2/volume_types/update.php b/samples/BlockStorage/v2/volume_types/update.php
similarity index 100%
rename from samples/blockstorage/v2/volume_types/update.php
rename to samples/BlockStorage/v2/volume_types/update.php
diff --git a/samples/blockstorage/v2/volumes/create.php b/samples/BlockStorage/v2/volumes/create.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/create.php
rename to samples/BlockStorage/v2/volumes/create.php
diff --git a/samples/blockstorage/v2/volumes/create_from_image.php b/samples/BlockStorage/v2/volumes/create_from_image.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/create_from_image.php
rename to samples/BlockStorage/v2/volumes/create_from_image.php
diff --git a/samples/blockstorage/v2/volumes/create_from_snapshot.php b/samples/BlockStorage/v2/volumes/create_from_snapshot.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/create_from_snapshot.php
rename to samples/BlockStorage/v2/volumes/create_from_snapshot.php
diff --git a/samples/blockstorage/v2/volumes/create_from_source_volume.php b/samples/BlockStorage/v2/volumes/create_from_source_volume.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/create_from_source_volume.php
rename to samples/BlockStorage/v2/volumes/create_from_source_volume.php
diff --git a/samples/blockstorage/v2/volumes/delete.php b/samples/BlockStorage/v2/volumes/delete.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/delete.php
rename to samples/BlockStorage/v2/volumes/delete.php
diff --git a/samples/blockstorage/v2/volumes/get.php b/samples/BlockStorage/v2/volumes/get.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/get.php
rename to samples/BlockStorage/v2/volumes/get.php
diff --git a/samples/blockstorage/v2/volumes/list.php b/samples/BlockStorage/v2/volumes/list.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/list.php
rename to samples/BlockStorage/v2/volumes/list.php
diff --git a/samples/blockstorage/v2/volumes/list_detail.php b/samples/BlockStorage/v2/volumes/list_detail.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/list_detail.php
rename to samples/BlockStorage/v2/volumes/list_detail.php
diff --git a/samples/blockstorage/v2/volumes/update.php b/samples/BlockStorage/v2/volumes/update.php
similarity index 100%
rename from samples/blockstorage/v2/volumes/update.php
rename to samples/BlockStorage/v2/volumes/update.php
diff --git a/samples/compute/v2/flavors/create_flavor.php b/samples/Compute/v2/flavors/create_flavor.php
similarity index 100%
rename from samples/compute/v2/flavors/create_flavor.php
rename to samples/Compute/v2/flavors/create_flavor.php
diff --git a/samples/compute/v2/flavors/delete_flavor.php b/samples/Compute/v2/flavors/delete_flavor.php
similarity index 100%
rename from samples/compute/v2/flavors/delete_flavor.php
rename to samples/Compute/v2/flavors/delete_flavor.php
diff --git a/samples/compute/v2/flavors/get_flavor.php b/samples/Compute/v2/flavors/get_flavor.php
similarity index 100%
rename from samples/compute/v2/flavors/get_flavor.php
rename to samples/Compute/v2/flavors/get_flavor.php
diff --git a/samples/compute/v2/flavors/list_flavors.php b/samples/Compute/v2/flavors/list_flavors.php
similarity index 100%
rename from samples/compute/v2/flavors/list_flavors.php
rename to samples/Compute/v2/flavors/list_flavors.php
diff --git a/samples/compute/v2/hypervisors/get_hypervisor.php b/samples/Compute/v2/hypervisors/get_hypervisor.php
similarity index 100%
rename from samples/compute/v2/hypervisors/get_hypervisor.php
rename to samples/Compute/v2/hypervisors/get_hypervisor.php
diff --git a/samples/compute/v2/hypervisors/get_hypervisors_statistics.php b/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php
similarity index 100%
rename from samples/compute/v2/hypervisors/get_hypervisors_statistics.php
rename to samples/Compute/v2/hypervisors/get_hypervisors_statistics.php
diff --git a/samples/compute/v2/hypervisors/list_hypervisors.php b/samples/Compute/v2/hypervisors/list_hypervisors.php
similarity index 100%
rename from samples/compute/v2/hypervisors/list_hypervisors.php
rename to samples/Compute/v2/hypervisors/list_hypervisors.php
diff --git a/samples/compute/v2/images/create_server_image.php b/samples/Compute/v2/images/create_server_image.php
similarity index 100%
rename from samples/compute/v2/images/create_server_image.php
rename to samples/Compute/v2/images/create_server_image.php
diff --git a/samples/compute/v2/images/delete_image.php b/samples/Compute/v2/images/delete_image.php
similarity index 100%
rename from samples/compute/v2/images/delete_image.php
rename to samples/Compute/v2/images/delete_image.php
diff --git a/samples/compute/v2/images/delete_image_metadata_item.php b/samples/Compute/v2/images/delete_image_metadata_item.php
similarity index 100%
rename from samples/compute/v2/images/delete_image_metadata_item.php
rename to samples/Compute/v2/images/delete_image_metadata_item.php
diff --git a/samples/compute/v2/images/get_image.php b/samples/Compute/v2/images/get_image.php
similarity index 100%
rename from samples/compute/v2/images/get_image.php
rename to samples/Compute/v2/images/get_image.php
diff --git a/samples/compute/v2/images/list_images.php b/samples/Compute/v2/images/list_images.php
similarity index 100%
rename from samples/compute/v2/images/list_images.php
rename to samples/Compute/v2/images/list_images.php
diff --git a/samples/compute/v2/images/reset_image_metadata.php b/samples/Compute/v2/images/reset_image_metadata.php
similarity index 100%
rename from samples/compute/v2/images/reset_image_metadata.php
rename to samples/Compute/v2/images/reset_image_metadata.php
diff --git a/samples/compute/v2/images/retrieve_image_metadata.php b/samples/Compute/v2/images/retrieve_image_metadata.php
similarity index 100%
rename from samples/compute/v2/images/retrieve_image_metadata.php
rename to samples/Compute/v2/images/retrieve_image_metadata.php
diff --git a/samples/compute/v2/keypairs/create_keypair.php b/samples/Compute/v2/keypairs/create_keypair.php
similarity index 100%
rename from samples/compute/v2/keypairs/create_keypair.php
rename to samples/Compute/v2/keypairs/create_keypair.php
diff --git a/samples/compute/v2/keypairs/delete_keypair.php b/samples/Compute/v2/keypairs/delete_keypair.php
similarity index 100%
rename from samples/compute/v2/keypairs/delete_keypair.php
rename to samples/Compute/v2/keypairs/delete_keypair.php
diff --git a/samples/compute/v2/keypairs/get_keypair.php b/samples/Compute/v2/keypairs/get_keypair.php
similarity index 100%
rename from samples/compute/v2/keypairs/get_keypair.php
rename to samples/Compute/v2/keypairs/get_keypair.php
diff --git a/samples/compute/v2/keypairs/list_keypairs.php b/samples/Compute/v2/keypairs/list_keypairs.php
similarity index 100%
rename from samples/compute/v2/keypairs/list_keypairs.php
rename to samples/Compute/v2/keypairs/list_keypairs.php
diff --git a/samples/compute/v2/limits/get_limits.php b/samples/Compute/v2/limits/get_limits.php
similarity index 100%
rename from samples/compute/v2/limits/get_limits.php
rename to samples/Compute/v2/limits/get_limits.php
diff --git a/samples/compute/v2/servers/add_security_group.php b/samples/Compute/v2/servers/add_security_group.php
similarity index 100%
rename from samples/compute/v2/servers/add_security_group.php
rename to samples/Compute/v2/servers/add_security_group.php
diff --git a/samples/compute/v2/servers/attach_volume_attachment.php b/samples/Compute/v2/servers/attach_volume_attachment.php
similarity index 100%
rename from samples/compute/v2/servers/attach_volume_attachment.php
rename to samples/Compute/v2/servers/attach_volume_attachment.php
diff --git a/samples/compute/v2/servers/change_server_password.php b/samples/Compute/v2/servers/change_server_password.php
similarity index 100%
rename from samples/compute/v2/servers/change_server_password.php
rename to samples/Compute/v2/servers/change_server_password.php
diff --git a/samples/compute/v2/servers/confirm_server_resize.php b/samples/Compute/v2/servers/confirm_server_resize.php
similarity index 100%
rename from samples/compute/v2/servers/confirm_server_resize.php
rename to samples/Compute/v2/servers/confirm_server_resize.php
diff --git a/samples/compute/v2/servers/create_interface_attachment.php b/samples/Compute/v2/servers/create_interface_attachment.php
similarity index 100%
rename from samples/compute/v2/servers/create_interface_attachment.php
rename to samples/Compute/v2/servers/create_interface_attachment.php
diff --git a/samples/compute/v2/servers/create_server.php b/samples/Compute/v2/servers/create_server.php
similarity index 100%
rename from samples/compute/v2/servers/create_server.php
rename to samples/Compute/v2/servers/create_server.php
diff --git a/samples/compute/v2/servers/delete_interface_attachment.php b/samples/Compute/v2/servers/delete_interface_attachment.php
similarity index 100%
rename from samples/compute/v2/servers/delete_interface_attachment.php
rename to samples/Compute/v2/servers/delete_interface_attachment.php
diff --git a/samples/compute/v2/servers/delete_server.php b/samples/Compute/v2/servers/delete_server.php
similarity index 100%
rename from samples/compute/v2/servers/delete_server.php
rename to samples/Compute/v2/servers/delete_server.php
diff --git a/samples/compute/v2/servers/delete_server_metadata_item.php b/samples/Compute/v2/servers/delete_server_metadata_item.php
similarity index 100%
rename from samples/compute/v2/servers/delete_server_metadata_item.php
rename to samples/Compute/v2/servers/delete_server_metadata_item.php
diff --git a/samples/compute/v2/servers/detach_volume_attachment.php b/samples/Compute/v2/servers/detach_volume_attachment.php
similarity index 100%
rename from samples/compute/v2/servers/detach_volume_attachment.php
rename to samples/Compute/v2/servers/detach_volume_attachment.php
diff --git a/samples/compute/v2/servers/get_interface_attachment.php b/samples/Compute/v2/servers/get_interface_attachment.php
similarity index 100%
rename from samples/compute/v2/servers/get_interface_attachment.php
rename to samples/Compute/v2/servers/get_interface_attachment.php
diff --git a/samples/compute/v2/servers/get_server.php b/samples/Compute/v2/servers/get_server.php
similarity index 100%
rename from samples/compute/v2/servers/get_server.php
rename to samples/Compute/v2/servers/get_server.php
diff --git a/samples/compute/v2/servers/get_server_console_output.php b/samples/Compute/v2/servers/get_server_console_output.php
similarity index 100%
rename from samples/compute/v2/servers/get_server_console_output.php
rename to samples/Compute/v2/servers/get_server_console_output.php
diff --git a/samples/compute/v2/servers/get_server_metadata.php b/samples/Compute/v2/servers/get_server_metadata.php
similarity index 100%
rename from samples/compute/v2/servers/get_server_metadata.php
rename to samples/Compute/v2/servers/get_server_metadata.php
diff --git a/samples/compute/v2/servers/get_server_metadata_item.php b/samples/Compute/v2/servers/get_server_metadata_item.php
similarity index 100%
rename from samples/compute/v2/servers/get_server_metadata_item.php
rename to samples/Compute/v2/servers/get_server_metadata_item.php
diff --git a/samples/compute/v2/servers/get_server_rdp_console.php b/samples/Compute/v2/servers/get_server_rdp_console.php
similarity index 100%
rename from samples/compute/v2/servers/get_server_rdp_console.php
rename to samples/Compute/v2/servers/get_server_rdp_console.php
diff --git a/samples/compute/v2/servers/get_server_serial_console.php b/samples/Compute/v2/servers/get_server_serial_console.php
similarity index 100%
rename from samples/compute/v2/servers/get_server_serial_console.php
rename to samples/Compute/v2/servers/get_server_serial_console.php
diff --git a/samples/compute/v2/servers/get_server_spice_console.php b/samples/Compute/v2/servers/get_server_spice_console.php
similarity index 100%
rename from samples/compute/v2/servers/get_server_spice_console.php
rename to samples/Compute/v2/servers/get_server_spice_console.php
diff --git a/samples/compute/v2/servers/get_server_vnc_console.php b/samples/Compute/v2/servers/get_server_vnc_console.php
similarity index 100%
rename from samples/compute/v2/servers/get_server_vnc_console.php
rename to samples/Compute/v2/servers/get_server_vnc_console.php
diff --git a/samples/compute/v2/servers/list_security_groups.php b/samples/Compute/v2/servers/list_security_groups.php
similarity index 100%
rename from samples/compute/v2/servers/list_security_groups.php
rename to samples/Compute/v2/servers/list_security_groups.php
diff --git a/samples/compute/v2/servers/list_server_addresses.php b/samples/Compute/v2/servers/list_server_addresses.php
similarity index 100%
rename from samples/compute/v2/servers/list_server_addresses.php
rename to samples/Compute/v2/servers/list_server_addresses.php
diff --git a/samples/compute/v2/servers/list_servers.php b/samples/Compute/v2/servers/list_servers.php
similarity index 100%
rename from samples/compute/v2/servers/list_servers.php
rename to samples/Compute/v2/servers/list_servers.php
diff --git a/samples/compute/v2/servers/list_volume_attachments.php b/samples/Compute/v2/servers/list_volume_attachments.php
similarity index 100%
rename from samples/compute/v2/servers/list_volume_attachments.php
rename to samples/Compute/v2/servers/list_volume_attachments.php
diff --git a/samples/compute/v2/servers/merge_server_metadata.php b/samples/Compute/v2/servers/merge_server_metadata.php
similarity index 100%
rename from samples/compute/v2/servers/merge_server_metadata.php
rename to samples/Compute/v2/servers/merge_server_metadata.php
diff --git a/samples/compute/v2/servers/reboot_server.php b/samples/Compute/v2/servers/reboot_server.php
similarity index 100%
rename from samples/compute/v2/servers/reboot_server.php
rename to samples/Compute/v2/servers/reboot_server.php
diff --git a/samples/compute/v2/servers/rebuild_server.php b/samples/Compute/v2/servers/rebuild_server.php
similarity index 100%
rename from samples/compute/v2/servers/rebuild_server.php
rename to samples/Compute/v2/servers/rebuild_server.php
diff --git a/samples/compute/v2/servers/remove_security_group.php b/samples/Compute/v2/servers/remove_security_group.php
similarity index 100%
rename from samples/compute/v2/servers/remove_security_group.php
rename to samples/Compute/v2/servers/remove_security_group.php
diff --git a/samples/compute/v2/servers/rescue_server.php b/samples/Compute/v2/servers/rescue_server.php
similarity index 100%
rename from samples/compute/v2/servers/rescue_server.php
rename to samples/Compute/v2/servers/rescue_server.php
diff --git a/samples/compute/v2/servers/reset_server_metadata.php b/samples/Compute/v2/servers/reset_server_metadata.php
similarity index 100%
rename from samples/compute/v2/servers/reset_server_metadata.php
rename to samples/Compute/v2/servers/reset_server_metadata.php
diff --git a/samples/compute/v2/servers/reset_server_state.php b/samples/Compute/v2/servers/reset_server_state.php
similarity index 100%
rename from samples/compute/v2/servers/reset_server_state.php
rename to samples/Compute/v2/servers/reset_server_state.php
diff --git a/samples/compute/v2/servers/resize_server.php b/samples/Compute/v2/servers/resize_server.php
similarity index 100%
rename from samples/compute/v2/servers/resize_server.php
rename to samples/Compute/v2/servers/resize_server.php
diff --git a/samples/compute/v2/servers/revert_server_resize.php b/samples/Compute/v2/servers/revert_server_resize.php
similarity index 100%
rename from samples/compute/v2/servers/revert_server_resize.php
rename to samples/Compute/v2/servers/revert_server_resize.php
diff --git a/samples/compute/v2/servers/start_server.php b/samples/Compute/v2/servers/start_server.php
similarity index 100%
rename from samples/compute/v2/servers/start_server.php
rename to samples/Compute/v2/servers/start_server.php
diff --git a/samples/compute/v2/servers/stop_server.php b/samples/Compute/v2/servers/stop_server.php
similarity index 100%
rename from samples/compute/v2/servers/stop_server.php
rename to samples/Compute/v2/servers/stop_server.php
diff --git a/samples/compute/v2/servers/unrescue_server.php b/samples/Compute/v2/servers/unrescue_server.php
similarity index 100%
rename from samples/compute/v2/servers/unrescue_server.php
rename to samples/Compute/v2/servers/unrescue_server.php
diff --git a/samples/compute/v2/servers/update_server.php b/samples/Compute/v2/servers/update_server.php
similarity index 100%
rename from samples/compute/v2/servers/update_server.php
rename to samples/Compute/v2/servers/update_server.php
diff --git a/samples/identity/v2/authentication.php b/samples/Identity/v2/authentication.php
similarity index 100%
rename from samples/identity/v2/authentication.php
rename to samples/Identity/v2/authentication.php
diff --git a/samples/identity/v2/generate_token.php b/samples/Identity/v2/generate_token.php
similarity index 100%
rename from samples/identity/v2/generate_token.php
rename to samples/Identity/v2/generate_token.php
diff --git a/samples/identity/v3/credentials/add_cred.php b/samples/Identity/v3/credentials/add_cred.php
similarity index 100%
rename from samples/identity/v3/credentials/add_cred.php
rename to samples/Identity/v3/credentials/add_cred.php
diff --git a/samples/identity/v3/credentials/delete_cred.php b/samples/Identity/v3/credentials/delete_cred.php
similarity index 100%
rename from samples/identity/v3/credentials/delete_cred.php
rename to samples/Identity/v3/credentials/delete_cred.php
diff --git a/samples/identity/v3/credentials/get_cred.php b/samples/Identity/v3/credentials/get_cred.php
similarity index 100%
rename from samples/identity/v3/credentials/get_cred.php
rename to samples/Identity/v3/credentials/get_cred.php
diff --git a/samples/identity/v3/credentials/list_creds.php b/samples/Identity/v3/credentials/list_creds.php
similarity index 100%
rename from samples/identity/v3/credentials/list_creds.php
rename to samples/Identity/v3/credentials/list_creds.php
diff --git a/samples/identity/v3/credentials/update_cred.php b/samples/Identity/v3/credentials/update_cred.php
similarity index 100%
rename from samples/identity/v3/credentials/update_cred.php
rename to samples/Identity/v3/credentials/update_cred.php
diff --git a/samples/identity/v3/domains/add_domain.php b/samples/Identity/v3/domains/add_domain.php
similarity index 100%
rename from samples/identity/v3/domains/add_domain.php
rename to samples/Identity/v3/domains/add_domain.php
diff --git a/samples/identity/v3/domains/check_group_role.php b/samples/Identity/v3/domains/check_group_role.php
similarity index 100%
rename from samples/identity/v3/domains/check_group_role.php
rename to samples/Identity/v3/domains/check_group_role.php
diff --git a/samples/identity/v3/domains/check_user_role.php b/samples/Identity/v3/domains/check_user_role.php
similarity index 100%
rename from samples/identity/v3/domains/check_user_role.php
rename to samples/Identity/v3/domains/check_user_role.php
diff --git a/samples/identity/v3/domains/delete_domain.php b/samples/Identity/v3/domains/delete_domain.php
similarity index 100%
rename from samples/identity/v3/domains/delete_domain.php
rename to samples/Identity/v3/domains/delete_domain.php
diff --git a/samples/identity/v3/domains/grant_group_role.php b/samples/Identity/v3/domains/grant_group_role.php
similarity index 100%
rename from samples/identity/v3/domains/grant_group_role.php
rename to samples/Identity/v3/domains/grant_group_role.php
diff --git a/samples/identity/v3/domains/grant_user_role.php b/samples/Identity/v3/domains/grant_user_role.php
similarity index 100%
rename from samples/identity/v3/domains/grant_user_role.php
rename to samples/Identity/v3/domains/grant_user_role.php
diff --git a/samples/identity/v3/domains/list_domains.php b/samples/Identity/v3/domains/list_domains.php
similarity index 100%
rename from samples/identity/v3/domains/list_domains.php
rename to samples/Identity/v3/domains/list_domains.php
diff --git a/samples/identity/v3/domains/list_group_roles.php b/samples/Identity/v3/domains/list_group_roles.php
similarity index 100%
rename from samples/identity/v3/domains/list_group_roles.php
rename to samples/Identity/v3/domains/list_group_roles.php
diff --git a/samples/identity/v3/domains/list_user_roles.php b/samples/Identity/v3/domains/list_user_roles.php
similarity index 100%
rename from samples/identity/v3/domains/list_user_roles.php
rename to samples/Identity/v3/domains/list_user_roles.php
diff --git a/samples/identity/v3/domains/revoke_group_role.php b/samples/Identity/v3/domains/revoke_group_role.php
similarity index 100%
rename from samples/identity/v3/domains/revoke_group_role.php
rename to samples/Identity/v3/domains/revoke_group_role.php
diff --git a/samples/identity/v3/domains/revoke_user_role.php b/samples/Identity/v3/domains/revoke_user_role.php
similarity index 100%
rename from samples/identity/v3/domains/revoke_user_role.php
rename to samples/Identity/v3/domains/revoke_user_role.php
diff --git a/samples/identity/v3/domains/show_domain.php b/samples/Identity/v3/domains/show_domain.php
similarity index 100%
rename from samples/identity/v3/domains/show_domain.php
rename to samples/Identity/v3/domains/show_domain.php
diff --git a/samples/identity/v3/domains/update_domain.php b/samples/Identity/v3/domains/update_domain.php
similarity index 100%
rename from samples/identity/v3/domains/update_domain.php
rename to samples/Identity/v3/domains/update_domain.php
diff --git a/samples/identity/v3/endpoints/add_endpoint.php b/samples/Identity/v3/endpoints/add_endpoint.php
similarity index 100%
rename from samples/identity/v3/endpoints/add_endpoint.php
rename to samples/Identity/v3/endpoints/add_endpoint.php
diff --git a/samples/identity/v3/endpoints/delete_endpoint.php b/samples/Identity/v3/endpoints/delete_endpoint.php
similarity index 100%
rename from samples/identity/v3/endpoints/delete_endpoint.php
rename to samples/Identity/v3/endpoints/delete_endpoint.php
diff --git a/samples/identity/v3/endpoints/get_endpoint.php b/samples/Identity/v3/endpoints/get_endpoint.php
similarity index 100%
rename from samples/identity/v3/endpoints/get_endpoint.php
rename to samples/Identity/v3/endpoints/get_endpoint.php
diff --git a/samples/identity/v3/endpoints/list_endpoints.php b/samples/Identity/v3/endpoints/list_endpoints.php
similarity index 100%
rename from samples/identity/v3/endpoints/list_endpoints.php
rename to samples/Identity/v3/endpoints/list_endpoints.php
diff --git a/samples/identity/v3/endpoints/update_endpoint.php b/samples/Identity/v3/endpoints/update_endpoint.php
similarity index 100%
rename from samples/identity/v3/endpoints/update_endpoint.php
rename to samples/Identity/v3/endpoints/update_endpoint.php
diff --git a/samples/identity/v3/groups/add_group.php b/samples/Identity/v3/groups/add_group.php
similarity index 100%
rename from samples/identity/v3/groups/add_group.php
rename to samples/Identity/v3/groups/add_group.php
diff --git a/samples/identity/v3/groups/add_user.php b/samples/Identity/v3/groups/add_user.php
similarity index 100%
rename from samples/identity/v3/groups/add_user.php
rename to samples/Identity/v3/groups/add_user.php
diff --git a/samples/identity/v3/groups/check_user_membership.php b/samples/Identity/v3/groups/check_user_membership.php
similarity index 100%
rename from samples/identity/v3/groups/check_user_membership.php
rename to samples/Identity/v3/groups/check_user_membership.php
diff --git a/samples/identity/v3/groups/delete_group.php b/samples/Identity/v3/groups/delete_group.php
similarity index 100%
rename from samples/identity/v3/groups/delete_group.php
rename to samples/Identity/v3/groups/delete_group.php
diff --git a/samples/identity/v3/groups/get_group.php b/samples/Identity/v3/groups/get_group.php
similarity index 100%
rename from samples/identity/v3/groups/get_group.php
rename to samples/Identity/v3/groups/get_group.php
diff --git a/samples/identity/v3/groups/list_groups.php b/samples/Identity/v3/groups/list_groups.php
similarity index 100%
rename from samples/identity/v3/groups/list_groups.php
rename to samples/Identity/v3/groups/list_groups.php
diff --git a/samples/identity/v3/groups/list_users.php b/samples/Identity/v3/groups/list_users.php
similarity index 100%
rename from samples/identity/v3/groups/list_users.php
rename to samples/Identity/v3/groups/list_users.php
diff --git a/samples/identity/v3/groups/remove_user.php b/samples/Identity/v3/groups/remove_user.php
similarity index 100%
rename from samples/identity/v3/groups/remove_user.php
rename to samples/Identity/v3/groups/remove_user.php
diff --git a/samples/identity/v3/groups/update_group.php b/samples/Identity/v3/groups/update_group.php
similarity index 100%
rename from samples/identity/v3/groups/update_group.php
rename to samples/Identity/v3/groups/update_group.php
diff --git a/samples/identity/v3/projects/add_project.php b/samples/Identity/v3/projects/add_project.php
similarity index 100%
rename from samples/identity/v3/projects/add_project.php
rename to samples/Identity/v3/projects/add_project.php
diff --git a/samples/identity/v3/projects/check_group_role.php b/samples/Identity/v3/projects/check_group_role.php
similarity index 100%
rename from samples/identity/v3/projects/check_group_role.php
rename to samples/Identity/v3/projects/check_group_role.php
diff --git a/samples/identity/v3/projects/check_user_role.php b/samples/Identity/v3/projects/check_user_role.php
similarity index 100%
rename from samples/identity/v3/projects/check_user_role.php
rename to samples/Identity/v3/projects/check_user_role.php
diff --git a/samples/identity/v3/projects/delete_project.php b/samples/Identity/v3/projects/delete_project.php
similarity index 100%
rename from samples/identity/v3/projects/delete_project.php
rename to samples/Identity/v3/projects/delete_project.php
diff --git a/samples/identity/v3/projects/get_project.php b/samples/Identity/v3/projects/get_project.php
similarity index 100%
rename from samples/identity/v3/projects/get_project.php
rename to samples/Identity/v3/projects/get_project.php
diff --git a/samples/identity/v3/projects/grant_group_role.php b/samples/Identity/v3/projects/grant_group_role.php
similarity index 100%
rename from samples/identity/v3/projects/grant_group_role.php
rename to samples/Identity/v3/projects/grant_group_role.php
diff --git a/samples/identity/v3/projects/grant_user_role.php b/samples/Identity/v3/projects/grant_user_role.php
similarity index 100%
rename from samples/identity/v3/projects/grant_user_role.php
rename to samples/Identity/v3/projects/grant_user_role.php
diff --git a/samples/identity/v3/projects/list_group_roles.php b/samples/Identity/v3/projects/list_group_roles.php
similarity index 100%
rename from samples/identity/v3/projects/list_group_roles.php
rename to samples/Identity/v3/projects/list_group_roles.php
diff --git a/samples/identity/v3/projects/list_projects.php b/samples/Identity/v3/projects/list_projects.php
similarity index 100%
rename from samples/identity/v3/projects/list_projects.php
rename to samples/Identity/v3/projects/list_projects.php
diff --git a/samples/identity/v3/projects/list_user_roles.php b/samples/Identity/v3/projects/list_user_roles.php
similarity index 100%
rename from samples/identity/v3/projects/list_user_roles.php
rename to samples/Identity/v3/projects/list_user_roles.php
diff --git a/samples/identity/v3/projects/revoke_group_role.php b/samples/Identity/v3/projects/revoke_group_role.php
similarity index 100%
rename from samples/identity/v3/projects/revoke_group_role.php
rename to samples/Identity/v3/projects/revoke_group_role.php
diff --git a/samples/identity/v3/projects/revoke_user_role.php b/samples/Identity/v3/projects/revoke_user_role.php
similarity index 100%
rename from samples/identity/v3/projects/revoke_user_role.php
rename to samples/Identity/v3/projects/revoke_user_role.php
diff --git a/samples/identity/v3/projects/update_project.php b/samples/Identity/v3/projects/update_project.php
similarity index 100%
rename from samples/identity/v3/projects/update_project.php
rename to samples/Identity/v3/projects/update_project.php
diff --git a/samples/identity/v3/roles/add_role.php b/samples/Identity/v3/roles/add_role.php
similarity index 100%
rename from samples/identity/v3/roles/add_role.php
rename to samples/Identity/v3/roles/add_role.php
diff --git a/samples/identity/v3/roles/list_assignments.php b/samples/Identity/v3/roles/list_assignments.php
similarity index 100%
rename from samples/identity/v3/roles/list_assignments.php
rename to samples/Identity/v3/roles/list_assignments.php
diff --git a/samples/identity/v3/roles/list_roles.php b/samples/Identity/v3/roles/list_roles.php
similarity index 100%
rename from samples/identity/v3/roles/list_roles.php
rename to samples/Identity/v3/roles/list_roles.php
diff --git a/samples/identity/v3/services/add_service.php b/samples/Identity/v3/services/add_service.php
similarity index 100%
rename from samples/identity/v3/services/add_service.php
rename to samples/Identity/v3/services/add_service.php
diff --git a/samples/identity/v3/services/delete_service.php b/samples/Identity/v3/services/delete_service.php
similarity index 100%
rename from samples/identity/v3/services/delete_service.php
rename to samples/Identity/v3/services/delete_service.php
diff --git a/samples/identity/v3/services/get_service.php b/samples/Identity/v3/services/get_service.php
similarity index 100%
rename from samples/identity/v3/services/get_service.php
rename to samples/Identity/v3/services/get_service.php
diff --git a/samples/identity/v3/services/list_services.php b/samples/Identity/v3/services/list_services.php
similarity index 100%
rename from samples/identity/v3/services/list_services.php
rename to samples/Identity/v3/services/list_services.php
diff --git a/samples/identity/v3/services/update_service.php b/samples/Identity/v3/services/update_service.php
similarity index 100%
rename from samples/identity/v3/services/update_service.php
rename to samples/Identity/v3/services/update_service.php
diff --git a/samples/identity/v3/tokens/export_authentication_token.php b/samples/Identity/v3/tokens/export_authentication_token.php
similarity index 100%
rename from samples/identity/v3/tokens/export_authentication_token.php
rename to samples/Identity/v3/tokens/export_authentication_token.php
diff --git a/samples/identity/v3/tokens/generate_token_from_id.php b/samples/Identity/v3/tokens/generate_token_from_id.php
similarity index 100%
rename from samples/identity/v3/tokens/generate_token_from_id.php
rename to samples/Identity/v3/tokens/generate_token_from_id.php
diff --git a/samples/identity/v3/tokens/generate_token_scoped_to_project_id.php b/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php
similarity index 100%
rename from samples/identity/v3/tokens/generate_token_scoped_to_project_id.php
rename to samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php
diff --git a/samples/identity/v3/tokens/generate_token_scoped_to_project_name.php b/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php
similarity index 100%
rename from samples/identity/v3/tokens/generate_token_scoped_to_project_name.php
rename to samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php
diff --git a/samples/identity/v3/tokens/generate_token_with_user_id.php b/samples/Identity/v3/tokens/generate_token_with_user_id.php
similarity index 100%
rename from samples/identity/v3/tokens/generate_token_with_user_id.php
rename to samples/Identity/v3/tokens/generate_token_with_user_id.php
diff --git a/samples/identity/v3/tokens/generate_token_with_username.php b/samples/Identity/v3/tokens/generate_token_with_username.php
similarity index 100%
rename from samples/identity/v3/tokens/generate_token_with_username.php
rename to samples/Identity/v3/tokens/generate_token_with_username.php
diff --git a/samples/identity/v3/tokens/revoke_token.php b/samples/Identity/v3/tokens/revoke_token.php
similarity index 100%
rename from samples/identity/v3/tokens/revoke_token.php
rename to samples/Identity/v3/tokens/revoke_token.php
diff --git a/samples/identity/v3/tokens/use_cached_authentication_token.php b/samples/Identity/v3/tokens/use_cached_authentication_token.php
similarity index 100%
rename from samples/identity/v3/tokens/use_cached_authentication_token.php
rename to samples/Identity/v3/tokens/use_cached_authentication_token.php
diff --git a/samples/identity/v3/tokens/validate_token.php b/samples/Identity/v3/tokens/validate_token.php
similarity index 100%
rename from samples/identity/v3/tokens/validate_token.php
rename to samples/Identity/v3/tokens/validate_token.php
diff --git a/samples/identity/v3/users/add_user.php b/samples/Identity/v3/users/add_user.php
similarity index 100%
rename from samples/identity/v3/users/add_user.php
rename to samples/Identity/v3/users/add_user.php
diff --git a/samples/identity/v3/users/delete_user.php b/samples/Identity/v3/users/delete_user.php
similarity index 100%
rename from samples/identity/v3/users/delete_user.php
rename to samples/Identity/v3/users/delete_user.php
diff --git a/samples/identity/v3/users/get_user.php b/samples/Identity/v3/users/get_user.php
similarity index 100%
rename from samples/identity/v3/users/get_user.php
rename to samples/Identity/v3/users/get_user.php
diff --git a/samples/identity/v3/users/list_groups.php b/samples/Identity/v3/users/list_groups.php
similarity index 100%
rename from samples/identity/v3/users/list_groups.php
rename to samples/Identity/v3/users/list_groups.php
diff --git a/samples/identity/v3/users/list_projects.php b/samples/Identity/v3/users/list_projects.php
similarity index 100%
rename from samples/identity/v3/users/list_projects.php
rename to samples/Identity/v3/users/list_projects.php
diff --git a/samples/identity/v3/users/list_users.php b/samples/Identity/v3/users/list_users.php
similarity index 100%
rename from samples/identity/v3/users/list_users.php
rename to samples/Identity/v3/users/list_users.php
diff --git a/samples/identity/v3/users/update_user.php b/samples/Identity/v3/users/update_user.php
similarity index 100%
rename from samples/identity/v3/users/update_user.php
rename to samples/Identity/v3/users/update_user.php
diff --git a/samples/images/v2/images/create.php b/samples/Images/v2/images/create.php
similarity index 100%
rename from samples/images/v2/images/create.php
rename to samples/Images/v2/images/create.php
diff --git a/samples/images/v2/images/deactivate.php b/samples/Images/v2/images/deactivate.php
similarity index 100%
rename from samples/images/v2/images/deactivate.php
rename to samples/Images/v2/images/deactivate.php
diff --git a/samples/images/v2/images/delete.php b/samples/Images/v2/images/delete.php
similarity index 100%
rename from samples/images/v2/images/delete.php
rename to samples/Images/v2/images/delete.php
diff --git a/samples/images/v2/images/download_binary_data.php b/samples/Images/v2/images/download_binary_data.php
similarity index 100%
rename from samples/images/v2/images/download_binary_data.php
rename to samples/Images/v2/images/download_binary_data.php
diff --git a/samples/images/v2/images/get.php b/samples/Images/v2/images/get.php
similarity index 100%
rename from samples/images/v2/images/get.php
rename to samples/Images/v2/images/get.php
diff --git a/samples/images/v2/images/list.php b/samples/Images/v2/images/list.php
similarity index 100%
rename from samples/images/v2/images/list.php
rename to samples/Images/v2/images/list.php
diff --git a/samples/images/v2/images/reactivate.php b/samples/Images/v2/images/reactivate.php
similarity index 100%
rename from samples/images/v2/images/reactivate.php
rename to samples/Images/v2/images/reactivate.php
diff --git a/samples/images/v2/images/update.php b/samples/Images/v2/images/update.php
similarity index 100%
rename from samples/images/v2/images/update.php
rename to samples/Images/v2/images/update.php
diff --git a/samples/images/v2/images/upload_binary_data.php b/samples/Images/v2/images/upload_binary_data.php
similarity index 100%
rename from samples/images/v2/images/upload_binary_data.php
rename to samples/Images/v2/images/upload_binary_data.php
diff --git a/samples/images/v2/members/add.php b/samples/Images/v2/members/add.php
similarity index 100%
rename from samples/images/v2/members/add.php
rename to samples/Images/v2/members/add.php
diff --git a/samples/images/v2/members/delete.php b/samples/Images/v2/members/delete.php
similarity index 100%
rename from samples/images/v2/members/delete.php
rename to samples/Images/v2/members/delete.php
diff --git a/samples/images/v2/members/get.php b/samples/Images/v2/members/get.php
similarity index 100%
rename from samples/images/v2/members/get.php
rename to samples/Images/v2/members/get.php
diff --git a/samples/images/v2/members/list.php b/samples/Images/v2/members/list.php
similarity index 100%
rename from samples/images/v2/members/list.php
rename to samples/Images/v2/members/list.php
diff --git a/samples/images/v2/members/update_status.php b/samples/Images/v2/members/update_status.php
similarity index 100%
rename from samples/images/v2/members/update_status.php
rename to samples/Images/v2/members/update_status.php
diff --git a/samples/networking/v2/floatingIPs/create.php b/samples/Networking/v2/floatingIPs/create.php
similarity index 100%
rename from samples/networking/v2/floatingIPs/create.php
rename to samples/Networking/v2/floatingIPs/create.php
diff --git a/samples/networking/v2/floatingIPs/delete.php b/samples/Networking/v2/floatingIPs/delete.php
similarity index 100%
rename from samples/networking/v2/floatingIPs/delete.php
rename to samples/Networking/v2/floatingIPs/delete.php
diff --git a/samples/networking/v2/floatingIPs/get.php b/samples/Networking/v2/floatingIPs/get.php
similarity index 100%
rename from samples/networking/v2/floatingIPs/get.php
rename to samples/Networking/v2/floatingIPs/get.php
diff --git a/samples/networking/v2/floatingIPs/list.php b/samples/Networking/v2/floatingIPs/list.php
similarity index 100%
rename from samples/networking/v2/floatingIPs/list.php
rename to samples/Networking/v2/floatingIPs/list.php
diff --git a/samples/networking/v2/floatingIPs/update.php b/samples/Networking/v2/floatingIPs/update.php
similarity index 100%
rename from samples/networking/v2/floatingIPs/update.php
rename to samples/Networking/v2/floatingIPs/update.php
diff --git a/samples/networking/v2/lbaas/healthmonitors/create.php b/samples/Networking/v2/lbaas/healthmonitors/create.php
similarity index 100%
rename from samples/networking/v2/lbaas/healthmonitors/create.php
rename to samples/Networking/v2/lbaas/healthmonitors/create.php
diff --git a/samples/networking/v2/lbaas/healthmonitors/delete.php b/samples/Networking/v2/lbaas/healthmonitors/delete.php
similarity index 100%
rename from samples/networking/v2/lbaas/healthmonitors/delete.php
rename to samples/Networking/v2/lbaas/healthmonitors/delete.php
diff --git a/samples/networking/v2/lbaas/healthmonitors/get.php b/samples/Networking/v2/lbaas/healthmonitors/get.php
similarity index 100%
rename from samples/networking/v2/lbaas/healthmonitors/get.php
rename to samples/Networking/v2/lbaas/healthmonitors/get.php
diff --git a/samples/networking/v2/lbaas/healthmonitors/list.php b/samples/Networking/v2/lbaas/healthmonitors/list.php
similarity index 100%
rename from samples/networking/v2/lbaas/healthmonitors/list.php
rename to samples/Networking/v2/lbaas/healthmonitors/list.php
diff --git a/samples/networking/v2/lbaas/healthmonitors/update.php b/samples/Networking/v2/lbaas/healthmonitors/update.php
similarity index 100%
rename from samples/networking/v2/lbaas/healthmonitors/update.php
rename to samples/Networking/v2/lbaas/healthmonitors/update.php
diff --git a/samples/networking/v2/lbaas/listeners/create.php b/samples/Networking/v2/lbaas/listeners/create.php
similarity index 100%
rename from samples/networking/v2/lbaas/listeners/create.php
rename to samples/Networking/v2/lbaas/listeners/create.php
diff --git a/samples/networking/v2/lbaas/listeners/delete.php b/samples/Networking/v2/lbaas/listeners/delete.php
similarity index 100%
rename from samples/networking/v2/lbaas/listeners/delete.php
rename to samples/Networking/v2/lbaas/listeners/delete.php
diff --git a/samples/networking/v2/lbaas/listeners/get.php b/samples/Networking/v2/lbaas/listeners/get.php
similarity index 100%
rename from samples/networking/v2/lbaas/listeners/get.php
rename to samples/Networking/v2/lbaas/listeners/get.php
diff --git a/samples/networking/v2/lbaas/listeners/list.php b/samples/Networking/v2/lbaas/listeners/list.php
similarity index 100%
rename from samples/networking/v2/lbaas/listeners/list.php
rename to samples/Networking/v2/lbaas/listeners/list.php
diff --git a/samples/networking/v2/lbaas/listeners/update.php b/samples/Networking/v2/lbaas/listeners/update.php
similarity index 100%
rename from samples/networking/v2/lbaas/listeners/update.php
rename to samples/Networking/v2/lbaas/listeners/update.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/add_listener.php b/samples/Networking/v2/lbaas/loadbalancers/add_listener.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/add_listener.php
rename to samples/Networking/v2/lbaas/loadbalancers/add_listener.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/create.php b/samples/Networking/v2/lbaas/loadbalancers/create.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/create.php
rename to samples/Networking/v2/lbaas/loadbalancers/create.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/delete.php b/samples/Networking/v2/lbaas/loadbalancers/delete.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/delete.php
rename to samples/Networking/v2/lbaas/loadbalancers/delete.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/get.php b/samples/Networking/v2/lbaas/loadbalancers/get.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/get.php
rename to samples/Networking/v2/lbaas/loadbalancers/get.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/get_stats.php b/samples/Networking/v2/lbaas/loadbalancers/get_stats.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/get_stats.php
rename to samples/Networking/v2/lbaas/loadbalancers/get_stats.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/get_statuses.php b/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/get_statuses.php
rename to samples/Networking/v2/lbaas/loadbalancers/get_statuses.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/list.php b/samples/Networking/v2/lbaas/loadbalancers/list.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/list.php
rename to samples/Networking/v2/lbaas/loadbalancers/list.php
diff --git a/samples/networking/v2/lbaas/loadbalancers/update.php b/samples/Networking/v2/lbaas/loadbalancers/update.php
similarity index 100%
rename from samples/networking/v2/lbaas/loadbalancers/update.php
rename to samples/Networking/v2/lbaas/loadbalancers/update.php
diff --git a/samples/networking/v2/lbaas/pools/add-healthmonitor.php b/samples/Networking/v2/lbaas/pools/add-healthmonitor.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/add-healthmonitor.php
rename to samples/Networking/v2/lbaas/pools/add-healthmonitor.php
diff --git a/samples/networking/v2/lbaas/pools/add-member.php b/samples/Networking/v2/lbaas/pools/add-member.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/add-member.php
rename to samples/Networking/v2/lbaas/pools/add-member.php
diff --git a/samples/networking/v2/lbaas/pools/create.php b/samples/Networking/v2/lbaas/pools/create.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/create.php
rename to samples/Networking/v2/lbaas/pools/create.php
diff --git a/samples/networking/v2/lbaas/pools/delete-member.php b/samples/Networking/v2/lbaas/pools/delete-member.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/delete-member.php
rename to samples/Networking/v2/lbaas/pools/delete-member.php
diff --git a/samples/networking/v2/lbaas/pools/delete.php b/samples/Networking/v2/lbaas/pools/delete.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/delete.php
rename to samples/Networking/v2/lbaas/pools/delete.php
diff --git a/samples/networking/v2/lbaas/pools/get-member.php b/samples/Networking/v2/lbaas/pools/get-member.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/get-member.php
rename to samples/Networking/v2/lbaas/pools/get-member.php
diff --git a/samples/networking/v2/lbaas/pools/get.php b/samples/Networking/v2/lbaas/pools/get.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/get.php
rename to samples/Networking/v2/lbaas/pools/get.php
diff --git a/samples/networking/v2/lbaas/pools/list.php b/samples/Networking/v2/lbaas/pools/list.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/list.php
rename to samples/Networking/v2/lbaas/pools/list.php
diff --git a/samples/networking/v2/lbaas/pools/update.php b/samples/Networking/v2/lbaas/pools/update.php
similarity index 100%
rename from samples/networking/v2/lbaas/pools/update.php
rename to samples/Networking/v2/lbaas/pools/update.php
diff --git a/samples/networking/v2/networks/create.php b/samples/Networking/v2/networks/create.php
similarity index 100%
rename from samples/networking/v2/networks/create.php
rename to samples/Networking/v2/networks/create.php
diff --git a/samples/networking/v2/networks/create_batch.php b/samples/Networking/v2/networks/create_batch.php
similarity index 100%
rename from samples/networking/v2/networks/create_batch.php
rename to samples/Networking/v2/networks/create_batch.php
diff --git a/samples/networking/v2/networks/delete.php b/samples/Networking/v2/networks/delete.php
similarity index 100%
rename from samples/networking/v2/networks/delete.php
rename to samples/Networking/v2/networks/delete.php
diff --git a/samples/networking/v2/networks/get.php b/samples/Networking/v2/networks/get.php
similarity index 100%
rename from samples/networking/v2/networks/get.php
rename to samples/Networking/v2/networks/get.php
diff --git a/samples/networking/v2/networks/update.php b/samples/Networking/v2/networks/update.php
similarity index 100%
rename from samples/networking/v2/networks/update.php
rename to samples/Networking/v2/networks/update.php
diff --git a/samples/networking/v2/ports/create.php b/samples/Networking/v2/ports/create.php
similarity index 100%
rename from samples/networking/v2/ports/create.php
rename to samples/Networking/v2/ports/create.php
diff --git a/samples/networking/v2/ports/create_batch.php b/samples/Networking/v2/ports/create_batch.php
similarity index 100%
rename from samples/networking/v2/ports/create_batch.php
rename to samples/Networking/v2/ports/create_batch.php
diff --git a/samples/networking/v2/ports/create_with_fixed_ips.php b/samples/Networking/v2/ports/create_with_fixed_ips.php
similarity index 100%
rename from samples/networking/v2/ports/create_with_fixed_ips.php
rename to samples/Networking/v2/ports/create_with_fixed_ips.php
diff --git a/samples/networking/v2/ports/delete.php b/samples/Networking/v2/ports/delete.php
similarity index 100%
rename from samples/networking/v2/ports/delete.php
rename to samples/Networking/v2/ports/delete.php
diff --git a/samples/networking/v2/ports/get.php b/samples/Networking/v2/ports/get.php
similarity index 100%
rename from samples/networking/v2/ports/get.php
rename to samples/Networking/v2/ports/get.php
diff --git a/samples/networking/v2/ports/list.php b/samples/Networking/v2/ports/list.php
similarity index 100%
rename from samples/networking/v2/ports/list.php
rename to samples/Networking/v2/ports/list.php
diff --git a/samples/networking/v2/ports/update.php b/samples/Networking/v2/ports/update.php
similarity index 100%
rename from samples/networking/v2/ports/update.php
rename to samples/Networking/v2/ports/update.php
diff --git a/samples/networking/v2/securityGroupRules/create.php b/samples/Networking/v2/securityGroupRules/create.php
similarity index 100%
rename from samples/networking/v2/securityGroupRules/create.php
rename to samples/Networking/v2/securityGroupRules/create.php
diff --git a/samples/networking/v2/securityGroupRules/delete.php b/samples/Networking/v2/securityGroupRules/delete.php
similarity index 100%
rename from samples/networking/v2/securityGroupRules/delete.php
rename to samples/Networking/v2/securityGroupRules/delete.php
diff --git a/samples/networking/v2/securityGroupRules/get.php b/samples/Networking/v2/securityGroupRules/get.php
similarity index 100%
rename from samples/networking/v2/securityGroupRules/get.php
rename to samples/Networking/v2/securityGroupRules/get.php
diff --git a/samples/networking/v2/securityGroupRules/list.php b/samples/Networking/v2/securityGroupRules/list.php
similarity index 100%
rename from samples/networking/v2/securityGroupRules/list.php
rename to samples/Networking/v2/securityGroupRules/list.php
diff --git a/samples/networking/v2/securityGroups/create.php b/samples/Networking/v2/securityGroups/create.php
similarity index 100%
rename from samples/networking/v2/securityGroups/create.php
rename to samples/Networking/v2/securityGroups/create.php
diff --git a/samples/networking/v2/securityGroups/delete.php b/samples/Networking/v2/securityGroups/delete.php
similarity index 100%
rename from samples/networking/v2/securityGroups/delete.php
rename to samples/Networking/v2/securityGroups/delete.php
diff --git a/samples/networking/v2/securityGroups/get.php b/samples/Networking/v2/securityGroups/get.php
similarity index 100%
rename from samples/networking/v2/securityGroups/get.php
rename to samples/Networking/v2/securityGroups/get.php
diff --git a/samples/networking/v2/securityGroups/list.php b/samples/Networking/v2/securityGroups/list.php
similarity index 100%
rename from samples/networking/v2/securityGroups/list.php
rename to samples/Networking/v2/securityGroups/list.php
diff --git a/samples/networking/v2/subnets/create.php b/samples/Networking/v2/subnets/create.php
similarity index 100%
rename from samples/networking/v2/subnets/create.php
rename to samples/Networking/v2/subnets/create.php
diff --git a/samples/networking/v2/subnets/create_batch.php b/samples/Networking/v2/subnets/create_batch.php
similarity index 100%
rename from samples/networking/v2/subnets/create_batch.php
rename to samples/Networking/v2/subnets/create_batch.php
diff --git a/samples/networking/v2/subnets/create_with_gateway_ip.php b/samples/Networking/v2/subnets/create_with_gateway_ip.php
similarity index 100%
rename from samples/networking/v2/subnets/create_with_gateway_ip.php
rename to samples/Networking/v2/subnets/create_with_gateway_ip.php
diff --git a/samples/networking/v2/subnets/create_with_host_routes.php b/samples/Networking/v2/subnets/create_with_host_routes.php
similarity index 100%
rename from samples/networking/v2/subnets/create_with_host_routes.php
rename to samples/Networking/v2/subnets/create_with_host_routes.php
diff --git a/samples/networking/v2/subnets/delete.php b/samples/Networking/v2/subnets/delete.php
similarity index 100%
rename from samples/networking/v2/subnets/delete.php
rename to samples/Networking/v2/subnets/delete.php
diff --git a/samples/networking/v2/subnets/get.php b/samples/Networking/v2/subnets/get.php
similarity index 100%
rename from samples/networking/v2/subnets/get.php
rename to samples/Networking/v2/subnets/get.php
diff --git a/samples/networking/v2/subnets/update.php b/samples/Networking/v2/subnets/update.php
similarity index 100%
rename from samples/networking/v2/subnets/update.php
rename to samples/Networking/v2/subnets/update.php
diff --git a/samples/objectstore/v1/account/get.php b/samples/ObjectStore/v1/account/get.php
similarity index 100%
rename from samples/objectstore/v1/account/get.php
rename to samples/ObjectStore/v1/account/get.php
diff --git a/samples/objectstore/v1/account/get_metadata.php b/samples/ObjectStore/v1/account/get_metadata.php
similarity index 100%
rename from samples/objectstore/v1/account/get_metadata.php
rename to samples/ObjectStore/v1/account/get_metadata.php
diff --git a/samples/objectstore/v1/account/merge_metadata.php b/samples/ObjectStore/v1/account/merge_metadata.php
similarity index 100%
rename from samples/objectstore/v1/account/merge_metadata.php
rename to samples/ObjectStore/v1/account/merge_metadata.php
diff --git a/samples/objectstore/v1/account/reset_metadata.php b/samples/ObjectStore/v1/account/reset_metadata.php
similarity index 100%
rename from samples/objectstore/v1/account/reset_metadata.php
rename to samples/ObjectStore/v1/account/reset_metadata.php
diff --git a/samples/objectstore/v1/containers/create.php b/samples/ObjectStore/v1/containers/create.php
similarity index 100%
rename from samples/objectstore/v1/containers/create.php
rename to samples/ObjectStore/v1/containers/create.php
diff --git a/samples/objectstore/v1/containers/delete.php b/samples/ObjectStore/v1/containers/delete.php
similarity index 100%
rename from samples/objectstore/v1/containers/delete.php
rename to samples/ObjectStore/v1/containers/delete.php
diff --git a/samples/objectstore/v1/containers/get.php b/samples/ObjectStore/v1/containers/get.php
similarity index 100%
rename from samples/objectstore/v1/containers/get.php
rename to samples/ObjectStore/v1/containers/get.php
diff --git a/samples/objectstore/v1/containers/get_metadata.php b/samples/ObjectStore/v1/containers/get_metadata.php
similarity index 100%
rename from samples/objectstore/v1/containers/get_metadata.php
rename to samples/ObjectStore/v1/containers/get_metadata.php
diff --git a/samples/objectstore/v1/containers/list.php b/samples/ObjectStore/v1/containers/list.php
similarity index 100%
rename from samples/objectstore/v1/containers/list.php
rename to samples/ObjectStore/v1/containers/list.php
diff --git a/samples/objectstore/v1/containers/merge_metadata.php b/samples/ObjectStore/v1/containers/merge_metadata.php
similarity index 100%
rename from samples/objectstore/v1/containers/merge_metadata.php
rename to samples/ObjectStore/v1/containers/merge_metadata.php
diff --git a/samples/objectstore/v1/containers/reset_metadata.php b/samples/ObjectStore/v1/containers/reset_metadata.php
similarity index 100%
rename from samples/objectstore/v1/containers/reset_metadata.php
rename to samples/ObjectStore/v1/containers/reset_metadata.php
diff --git a/samples/objectstore/v1/objects/check_exists.php b/samples/ObjectStore/v1/objects/check_exists.php
similarity index 100%
rename from samples/objectstore/v1/objects/check_exists.php
rename to samples/ObjectStore/v1/objects/check_exists.php
diff --git a/samples/objectstore/v1/objects/copy.php b/samples/ObjectStore/v1/objects/copy.php
similarity index 100%
rename from samples/objectstore/v1/objects/copy.php
rename to samples/ObjectStore/v1/objects/copy.php
diff --git a/samples/objectstore/v1/objects/create.php b/samples/ObjectStore/v1/objects/create.php
similarity index 100%
rename from samples/objectstore/v1/objects/create.php
rename to samples/ObjectStore/v1/objects/create.php
diff --git a/samples/objectstore/v1/objects/create_from_stream.php b/samples/ObjectStore/v1/objects/create_from_stream.php
similarity index 100%
rename from samples/objectstore/v1/objects/create_from_stream.php
rename to samples/ObjectStore/v1/objects/create_from_stream.php
diff --git a/samples/objectstore/v1/objects/create_large_object.php b/samples/ObjectStore/v1/objects/create_large_object.php
similarity index 100%
rename from samples/objectstore/v1/objects/create_large_object.php
rename to samples/ObjectStore/v1/objects/create_large_object.php
diff --git a/samples/objectstore/v1/objects/delete.php b/samples/ObjectStore/v1/objects/delete.php
similarity index 100%
rename from samples/objectstore/v1/objects/delete.php
rename to samples/ObjectStore/v1/objects/delete.php
diff --git a/samples/objectstore/v1/objects/download.php b/samples/ObjectStore/v1/objects/download.php
similarity index 100%
rename from samples/objectstore/v1/objects/download.php
rename to samples/ObjectStore/v1/objects/download.php
diff --git a/samples/objectstore/v1/objects/download_stream.php b/samples/ObjectStore/v1/objects/download_stream.php
similarity index 100%
rename from samples/objectstore/v1/objects/download_stream.php
rename to samples/ObjectStore/v1/objects/download_stream.php
diff --git a/samples/objectstore/v1/objects/get.php b/samples/ObjectStore/v1/objects/get.php
similarity index 100%
rename from samples/objectstore/v1/objects/get.php
rename to samples/ObjectStore/v1/objects/get.php
diff --git a/samples/objectstore/v1/objects/get_metadata.php b/samples/ObjectStore/v1/objects/get_metadata.php
similarity index 100%
rename from samples/objectstore/v1/objects/get_metadata.php
rename to samples/ObjectStore/v1/objects/get_metadata.php
diff --git a/samples/objectstore/v1/objects/list.php b/samples/ObjectStore/v1/objects/list.php
similarity index 100%
rename from samples/objectstore/v1/objects/list.php
rename to samples/ObjectStore/v1/objects/list.php
diff --git a/samples/objectstore/v1/objects/merge_metadata.php b/samples/ObjectStore/v1/objects/merge_metadata.php
similarity index 100%
rename from samples/objectstore/v1/objects/merge_metadata.php
rename to samples/ObjectStore/v1/objects/merge_metadata.php
diff --git a/samples/objectstore/v1/objects/reset_metadata.php b/samples/ObjectStore/v1/objects/reset_metadata.php
similarity index 100%
rename from samples/objectstore/v1/objects/reset_metadata.php
rename to samples/ObjectStore/v1/objects/reset_metadata.php
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
index 8a00f0f0..5d7c0b67 100644
--- a/tests/integration/Compute/v2/CoreTest.php
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -107,7 +107,7 @@ private function searchImages($name)
         }
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->network = $this->getNetworkService()->createNetwork(
             [
@@ -498,7 +498,7 @@ private function createServerImage()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'images/create_server_image.php');
+        require_once $this->sampleFile($replacements, 'Images/create_server_image.php');
 
         $server->waitWithCallback(function (Server $server) {
             return !$server->taskState;
@@ -511,7 +511,7 @@ private function createServerImage()
 
     private function listImages()
     {
-        require_once $this->sampleFile([], 'images/list_images.php');
+        require_once $this->sampleFile([], 'Images/list_images.php');
 
         $this->logStep('Listed all available images');
     }
@@ -520,7 +520,7 @@ private function getImage()
     {
         $replacements = ['{imageId}' => $this->imageId];
 
-        require_once $this->sampleFile($replacements, 'images/get_image.php');
+        require_once $this->sampleFile($replacements, 'Images/get_image.php');
 
         $this->logStep('Retrieved details for image {imageId}', $replacements);
     }
@@ -530,20 +530,20 @@ private function imageMetadata()
         $replacements = ['{imageId}' => $this->imageId];
 
         /** @var $image \OpenStack\Compute\v2\Models\Image */
-        require_once $this->sampleFile($replacements, 'images/reset_image_metadata.php');
+        require_once $this->sampleFile($replacements, 'Images/reset_image_metadata.php');
         $this->logStep('Reset metadata of image {imageId}', $replacements);
 
-        require_once $this->sampleFile($replacements, 'images/retrieve_image_metadata.php');
+        require_once $this->sampleFile($replacements, 'Images/retrieve_image_metadata.php');
         $this->logStep('Retrieved metadata of image {imageId}', $replacements);
 
-        require_once $this->sampleFile($replacements + ['{metadataKey}'], 'images/delete_image_metadata_item.php');
+        require_once $this->sampleFile($replacements + ['{metadataKey}'], 'Images/delete_image_metadata_item.php');
         $this->logStep('Deleted metadata key of image {imageId}', $replacements);
     }
 
     private function deleteServerImage()
     {
         $replacements = ['{imageId}' => $this->imageId];
-        require_once $this->sampleFile($replacements, 'images/delete_image.php');
+        require_once $this->sampleFile($replacements, 'Images/delete_image.php');
         $this->logStep('Deleted image {imageId}', $replacements);
     }
 
diff --git a/tests/integration/Runner.php b/tests/integration/Runner.php
index 8a385e74..e2cdeda1 100644
--- a/tests/integration/Runner.php
+++ b/tests/integration/Runner.php
@@ -36,7 +36,7 @@ private function assembleTestFiles()
                         foreach ($this->traverse($versionPath->getPathname()) as $testPath) {
                             if (strpos($testPath->getFilename(), 'Test.php')) {
                                 $testBn = strtolower(substr($testPath->getBasename(), 0, -8));
-                                $this->tests[strtolower($serviceBn)][strtolower($versionBn)][] = $testBn;
+                                $this->tests[$serviceBn][strtolower($versionBn)][] = $testBn;
                             }
                         }
                     }
@@ -57,7 +57,7 @@ private function getOpts()
                     break;
                 }
             }
-            return strtolower($value);
+            return $value;
         };
 
         return [
diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php
index f382e301..136f4e9e 100644
--- a/tests/integration/TestCase.php
+++ b/tests/integration/TestCase.php
@@ -19,7 +19,7 @@ public function __construct(LoggerInterface $logger, SampleManagerInterface $sam
         $this->sampleManager = $sampleManager;
     }
 
-    public function teardown()
+    public function teardown(): void
     {
         $this->sampleManager->deletePaths();
     }

From 42e66d8b274d50f629697d6e9d8a4d80e3bfa1f4 Mon Sep 17 00:00:00 2001
From: Vlastimil Pecinka <pecinka@email.cz>
Date: Mon, 25 Sep 2023 20:30:00 +0200
Subject: [PATCH 052/102] format segment name, close #365 (#366)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* format segment name, close php-opencloud/openstack#365

---------

Co-authored-by: Vlastimil Pečínka <vlastimil.pecinka@firma.seznam.cz>
---
 src/ObjectStore/v1/Models/Container.php       | 34 +++++++++++++++----
 .../ObjectStore/v1/Models/ContainerTest.php   | 15 ++++++--
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index 55068184..4736d2a1 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -180,6 +180,22 @@ public function objectExists(string $name): bool
         }
     }
 
+    /**
+     * Verifies if provied segment index format for DLOs is valid.
+     * 
+     * @param string $fmt The format of segment index name, e.g. %05d for 00001, 00002, etc.
+     * 
+     * @return bool TRUE if the format is valid, FALSE if it is not
+     */
+    public function isValidSegmentIndexFormat($fmt)
+    {
+        $testValue1 = sprintf($fmt, 1);
+        $testValue2 = sprintf($fmt, 10);
+    
+        // Test if different results of the same string length
+        return ($testValue1 !== $testValue2) && (strlen($testValue1) === strlen($testValue2));
+    }
+
     /**
      * Creates a single object according to the values provided.
      *
@@ -197,11 +213,12 @@ public function createObject(array $data): StorageObject
      * container. When this completes, a manifest file is uploaded which references the prefix of the segments,
      * allowing concatenation when a request is executed against the manifest.
      *
-     * @param array  $data                     {@see \OpenStack\ObjectStore\v1\Api::putObject}
-     * @param int    $data['segmentSize']      The size in Bytes of each segment
-     * @param string $data['segmentContainer'] The container to which each segment will be uploaded
-     * @param string $data['segmentPrefix']    The prefix that will come before each segment. If omitted, a default
-     *                                         is used: name/timestamp/filesize
+     * @param array  $data                       {@see \OpenStack\ObjectStore\v1\Api::putObject}
+     * @param int    $data['segmentSize']        The size in Bytes of each segment
+     * @param string $data['segmentContainer']   The container to which each segment will be uploaded
+     * @param string $data['segmentPrefix']      The prefix that will come before each segment. If omitted, a default
+     *                                           is used: name/timestamp/filesize
+     * @param string $data['segmentIndexFormat'] The format of segment index name, default %05d - 00001, 00002, etc.
      */
     public function createLargeObject(array $data): StorageObject
     {
@@ -213,6 +230,11 @@ public function createLargeObject(array $data): StorageObject
         $segmentPrefix    = isset($data['segmentPrefix'])
             ? $data['segmentPrefix']
             : sprintf('%s/%s/%d', $data['name'], microtime(true), $stream->getSize());
+        $segmentIndexFormat = isset($data['segmentIndexFormat']) ? $data['segmentIndexFormat'] : '%05d';
+
+        if (!$this->isValidSegmentIndexFormat($segmentIndexFormat)) {
+            throw new \InvalidArgumentException('The provided segmentIndexFormat is not valid.');
+        }
 
         /** @var \OpenStack\ObjectStore\v1\Service $service */
         $service = $this->getService();
@@ -226,7 +248,7 @@ public function createLargeObject(array $data): StorageObject
 
         while (!$stream->eof() && $count < $totalSegments) {
             $promises[] = $this->model(StorageObject::class)->createAsync([
-                'name'          => sprintf('%s/%d', $segmentPrefix, ++$count),
+                'name'          => sprintf('%s/'.$segmentIndexFormat, $segmentPrefix, ++$count),
                 'stream'        => new LimitStream($stream, $segmentSize, ($count - 1) * $segmentSize),
                 'containerName' => $segmentContainer,
             ]);
diff --git a/tests/unit/ObjectStore/v1/Models/ContainerTest.php b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
index c34cd924..be363cab 100644
--- a/tests/unit/ObjectStore/v1/Models/ContainerTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
@@ -208,6 +208,14 @@ public function test_other_exceptions_are_thrown()
         $this->container->objectExists('bar');
     }
 
+    public function test_valid_segment_index_format()
+    {
+        self::assertTrue($this->container->isValidSegmentIndexFormat("%03d"));
+        self::assertTrue($this->container->isValidSegmentIndexFormat("%05d"));
+        self::assertFalse($this->container->isValidSegmentIndexFormat("%d"));
+        self::assertFalse($this->container->isValidSegmentIndexFormat("d"));
+    }
+
     public function test_it_chunks_according_to_provided_segment_size()
     {
         $stream = function_exists('\GuzzleHttp\Psr7\stream_for')
@@ -220,6 +228,7 @@ public function test_it_chunks_according_to_provided_segment_size()
             'segmentSize'      => 10,
             'segmentPrefix'    => 'objectPrefix',
             'segmentContainer' => 'segments',
+            'segmentIndexFormat' => '%03d',
         ];
 
         // check container creation
@@ -235,9 +244,9 @@ public function test_it_chunks_according_to_provided_segment_size()
         $this->setupMock('PUT', 'segments', null, [], new Response(201));
 
         // The stream has size 24 so we expect three segments.
-        $this->setupMock('PUT', 'segments/objectPrefix/1', $stream->read(10), [], new Response(201));
-        $this->setupMock('PUT', 'segments/objectPrefix/2', $stream->read(10), [], new Response(201));
-        $this->setupMock('PUT', 'segments/objectPrefix/3', $stream->read(10), [], new Response(201));
+        $this->setupMock('PUT', 'segments/objectPrefix/001', $stream->read(10), [], new Response(201));
+        $this->setupMock('PUT', 'segments/objectPrefix/002', $stream->read(10), [], new Response(201));
+        $this->setupMock('PUT', 'segments/objectPrefix/003', $stream->read(10), [], new Response(201));
         $this->setupMock('PUT', 'test/object', null, ['X-Object-Manifest' => 'segments/objectPrefix'], new Response(201));
 
         $stream->rewind();

From b6f959aa517a80bd4da623b170de239b535d5e0d Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Thu, 7 Dec 2023 10:01:44 +0100
Subject: [PATCH 053/102] GitHub workflows (#369)

Add integration workflows for services:
- BlockStorage
- Compute
- Images
- Networking
---
 .../workflows/integration_block_storage.yml   | 74 +++++++++++++++++++
 .github/workflows/integration_compute.yml     | 73 ++++++++++++++++++
 .github/workflows/integration_identity.yml    |  5 +-
 .github/workflows/integration_images.yml      | 72 ++++++++++++++++++
 .github/workflows/integration_networking.yml  | 72 ++++++++++++++++++
 .../workflows/integration_object_storage.yml  |  5 +-
 .../integration/BlockStorage/v2/CoreTest.php  |  9 ++-
 tests/integration/Compute/v2/CoreTest.php     | 16 ++--
 tests/integration/Images/v2/CoreTest.php      |  2 -
 .../integration/Networking/v2/Layer3Test.php  |  3 +-
 tests/integration/Runner.php                  |  2 +-
 11 files changed, 317 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/integration_block_storage.yml
 create mode 100644 .github/workflows/integration_compute.yml
 create mode 100644 .github/workflows/integration_images.yml
 create mode 100644 .github/workflows/integration_networking.yml

diff --git a/.github/workflows/integration_block_storage.yml b/.github/workflows/integration_block_storage.yml
new file mode 100644
index 00000000..371c6573
--- /dev/null
+++ b/.github/workflows/integration_block_storage.yml
@@ -0,0 +1,74 @@
+name: Run Block Storage Integration Tests
+
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - '**BlockStorage**'
+      - '**Common**'
+
+jobs:
+  tests:
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        openstack_version: [ "stable/wallaby" ] # v2 is removed from xena
+        php_version: [ 8.1 ]
+        ubuntu_version: [ 20.04 ]
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
+    name: Deploy OpenStack ${{ matrix.name }} and run Block Storage integration tests with php ${{matrix.php_version}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: curl
+          tools: composer:v2
+          coverage: none
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - name: Restore devstack cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            /opt/stack/*
+            !/opt/stack/data
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
+      - name: Deploy devstack
+        uses: EmilienM/devstack-action@v0.11
+        with:
+          branch: ${{ matrix.openstack_version }}
+          conf_overrides: |
+            CINDER_ISCSI_HELPER=lioadm
+          enabled_services: 's-account,s-container,s-object,s-proxy,s-bak'
+      - name: Set env variables
+        run: |
+          {
+            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
+            echo OS_REGION=RegionOne
+            echo OS_REGION_NAME=RegionOne
+            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
+            echo OS_USERNAME=admin
+            echo OS_PASSWORD=secret
+            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
+            echo OS_PROJECT_NAME=admin
+            echo OS_RESIZE_FLAVOR=c1
+            echo OS_FLAVOR=1
+            echo OS_DOMAIN_ID=default
+          } >> "$GITHUB_ENV"
+      - name: Execute integration tests
+        run: php ./tests/integration/run.php -s=BlockStorage
+
diff --git a/.github/workflows/integration_compute.yml b/.github/workflows/integration_compute.yml
new file mode 100644
index 00000000..7d072378
--- /dev/null
+++ b/.github/workflows/integration_compute.yml
@@ -0,0 +1,73 @@
+name: Run Compute Integration Tests
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - '**Compute**'
+      - '**Common**'
+
+jobs:
+  tests:
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        openstack_version: [ "stable/wallaby" ] # Cinder v2 is removed from xena
+        php_version: [ 8.1 ]
+        ubuntu_version: [ 20.04 ]
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
+    name: Deploy OpenStack ${{ matrix.name }} with Nova and run Compute integration tests with php ${{matrix.php_version}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: curl
+          tools: composer:v2
+          coverage: none
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - name: Restore devstack cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            /opt/stack/*
+            !/opt/stack/data
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
+      - name: Deploy devstack
+        uses: EmilienM/devstack-action@v0.11
+        with:
+          branch: ${{ matrix.openstack_version }}
+          conf_overrides: |
+            CINDER_ISCSI_HELPER=lioadm
+          enabled_services: 's-account,s-container,s-object,s-proxy,s-bak'
+      - name: Set env variables
+        run: |
+          {
+            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
+            echo OS_REGION=RegionOne
+            echo OS_REGION_NAME=RegionOne
+            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
+            echo OS_USERNAME=admin
+            echo OS_PASSWORD=secret
+            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
+            echo OS_PROJECT_NAME=admin
+            echo OS_RESIZE_FLAVOR=c1
+            echo OS_FLAVOR=1
+            echo OS_DOMAIN_ID=default
+          } >> "$GITHUB_ENV"
+      - name: Execute integration tests
+        run: php ./tests/integration/run.php -s=Compute
+
diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml
index 0c52d3a3..c7f2f8a9 100644
--- a/.github/workflows/integration_identity.yml
+++ b/.github/workflows/integration_identity.yml
@@ -1,8 +1,11 @@
 name: Run Identity Integration Tests
 on:
+  workflow_dispatch:
   pull_request:
     paths:
       - '**Identity**'
+      - '**Common**'
+
 jobs:
   tests:
     if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
@@ -58,7 +61,7 @@ jobs:
             echo OS_PASSWORD=secret
             echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
             echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=2
+            echo OS_RESIZE_FLAVOR=c1
             echo OS_FLAVOR=1
             echo OS_DOMAIN_ID=default
           } >> "$GITHUB_ENV"
diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml
new file mode 100644
index 00000000..feddef03
--- /dev/null
+++ b/.github/workflows/integration_images.yml
@@ -0,0 +1,72 @@
+name: Run Images Integration Tests
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - '**Images**'
+      - '**Common**'
+
+jobs:
+  tests:
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        openstack_version: [ "stable/zed" ]
+        php_version: [ 8.1 ]
+        ubuntu_version: [ 20.04 ]
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
+    name: Deploy OpenStack ${{ matrix.name }} with Glance and run Images integration tests with php ${{matrix.php_version}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: curl
+          tools: composer:v2
+          coverage: none
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - name: Restore devstack cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            /opt/stack/*
+            !/opt/stack/data
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
+      - name: Deploy devstack
+        uses: EmilienM/devstack-action@v0.11
+        with:
+          branch: ${{ matrix.openstack_version }}
+          conf_overrides: |
+            CINDER_ISCSI_HELPER=lioadm
+      - name: Set env variables
+        run: |
+          {
+            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
+            echo OS_REGION=RegionOne
+            echo OS_REGION_NAME=RegionOne
+            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
+            echo OS_USERNAME=admin
+            echo OS_PASSWORD=secret
+            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
+            echo OS_PROJECT_NAME=admin
+            echo OS_RESIZE_FLAVOR=c1
+            echo OS_FLAVOR=1
+            echo OS_DOMAIN_ID=default
+          } >> "$GITHUB_ENV"
+      - name: Execute integration tests
+        run: php ./tests/integration/run.php -s=Images
+
diff --git a/.github/workflows/integration_networking.yml b/.github/workflows/integration_networking.yml
new file mode 100644
index 00000000..cc18661c
--- /dev/null
+++ b/.github/workflows/integration_networking.yml
@@ -0,0 +1,72 @@
+name: Run Networking Integration Tests
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - '**Networking**'
+      - '**Common**'
+
+jobs:
+  tests:
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        openstack_version: [ "stable/zed" ]
+        php_version: [ 8.1 ]
+        ubuntu_version: [ 20.04 ]
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
+    name: Deploy OpenStack ${{ matrix.name }} with Neutron and run Networking integration tests with php ${{matrix.php_version}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: get cache directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.php_cs.cache
+            ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php_version }}-
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: curl
+          tools: composer:v2
+          coverage: none
+      - run: composer install --prefer-dist --no-interaction --no-progress
+      - name: Restore devstack cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            /opt/stack/*
+            !/opt/stack/data
+            ~/devstack/
+          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
+      - name: Deploy devstack
+        uses: EmilienM/devstack-action@v0.11
+        with:
+          branch: ${{ matrix.openstack_version }}
+          conf_overrides: |
+            CINDER_ISCSI_HELPER=lioadm
+      - name: Set env variables
+        run: |
+          {
+            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
+            echo OS_REGION=RegionOne
+            echo OS_REGION_NAME=RegionOne
+            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
+            echo OS_USERNAME=admin
+            echo OS_PASSWORD=secret
+            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
+            echo OS_PROJECT_NAME=admin
+            echo OS_RESIZE_FLAVOR=c1
+            echo OS_FLAVOR=1
+            echo OS_DOMAIN_ID=default
+          } >> "$GITHUB_ENV"
+      - name: Execute integration tests
+        run: php ./tests/integration/run.php -s=Networking
+
diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml
index 9e94f73e..252e4e37 100644
--- a/.github/workflows/integration_object_storage.yml
+++ b/.github/workflows/integration_object_storage.yml
@@ -1,8 +1,11 @@
 name: Run Object Storage Integration Tests
 on:
+  workflow_dispatch:
   pull_request:
     paths:
       - '**ObjectStore**'
+      - '**Common**'
+
 jobs:
   tests:
     if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
@@ -65,7 +68,7 @@ jobs:
             echo OS_PASSWORD=secret
             echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
             echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=2
+            echo OS_RESIZE_FLAVOR=c1
             echo OS_FLAVOR=1
             echo OS_DOMAIN_ID=default
           } >> "$GITHUB_ENV"
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
index a94ca077..9063e80f 100644
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -68,7 +68,10 @@ public function volumes()
         require_once $this->sampleFile($replacements, 'volumes/get.php');
         self::assertInstanceOf(Volume::class, $volume);
 
-        $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
+        $replacements += [
+            '{newName}' => $this->randomStr(),
+            '{newDescription}' => $this->randomStr()
+        ];
 
         $this->logStep('Updating volume');
         /** @var Volume $volume */
@@ -79,6 +82,8 @@ public function volumes()
         /** @var \Generator $volumes */
         require_once $this->sampleFile($replacements, 'volumes/list.php');
 
+        $volume->waitUntil('available');
+
         $this->logStep('Deleting volume');
         require_once $this->sampleFile($replacements, 'volumes/delete.php');
 
@@ -176,6 +181,8 @@ public function snapshots()
         $this->logStep('Updating snapshot');
         require_once $this->sampleFile($replacements, 'snapshots/update.php');
 
+        $snapshot->waitUntil('available', 60);
+
         $this->logStep('Deleting snapshot');
         require_once $this->sampleFile($replacements, 'snapshots/delete.php');
         $snapshot->waitUntilDeleted();
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
index 5d7c0b67..f1f20528 100644
--- a/tests/integration/Compute/v2/CoreTest.php
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -139,7 +139,7 @@ protected function setUp(): void
 
         $this->logStep('Created volume {name} with {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]);
 
-        $this->getSecurityGroupService()->createSecurityGroup(['name' => self::SECGROUP]);
+        $this->secgroup = $this->getSecurityGroupService()->createSecurityGroup(['name' => self::SECGROUP]);
 
         $this->logStep('Created security group {secgroup}', ['secgroup' => self::SECGROUP]);
     }
@@ -498,7 +498,7 @@ private function createServerImage()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'Images/create_server_image.php');
+        require_once $this->sampleFile($replacements, 'images/create_server_image.php');
 
         $server->waitWithCallback(function (Server $server) {
             return !$server->taskState;
@@ -511,7 +511,7 @@ private function createServerImage()
 
     private function listImages()
     {
-        require_once $this->sampleFile([], 'Images/list_images.php');
+        require_once $this->sampleFile([], 'images/list_images.php');
 
         $this->logStep('Listed all available images');
     }
@@ -520,7 +520,7 @@ private function getImage()
     {
         $replacements = ['{imageId}' => $this->imageId];
 
-        require_once $this->sampleFile($replacements, 'Images/get_image.php');
+        require_once $this->sampleFile($replacements, 'images/get_image.php');
 
         $this->logStep('Retrieved details for image {imageId}', $replacements);
     }
@@ -530,20 +530,20 @@ private function imageMetadata()
         $replacements = ['{imageId}' => $this->imageId];
 
         /** @var $image \OpenStack\Compute\v2\Models\Image */
-        require_once $this->sampleFile($replacements, 'Images/reset_image_metadata.php');
+        require_once $this->sampleFile($replacements, 'images/reset_image_metadata.php');
         $this->logStep('Reset metadata of image {imageId}', $replacements);
 
-        require_once $this->sampleFile($replacements, 'Images/retrieve_image_metadata.php');
+        require_once $this->sampleFile($replacements, 'images/retrieve_image_metadata.php');
         $this->logStep('Retrieved metadata of image {imageId}', $replacements);
 
-        require_once $this->sampleFile($replacements + ['{metadataKey}'], 'Images/delete_image_metadata_item.php');
+        require_once $this->sampleFile($replacements + ['{metadataKey}'], 'images/delete_image_metadata_item.php');
         $this->logStep('Deleted metadata key of image {imageId}', $replacements);
     }
 
     private function deleteServerImage()
     {
         $replacements = ['{imageId}' => $this->imageId];
-        require_once $this->sampleFile($replacements, 'Images/delete_image.php');
+        require_once $this->sampleFile($replacements, 'images/delete_image.php');
         $this->logStep('Deleted image {imageId}', $replacements);
     }
 
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
index 8a459481..bc7f7fbf 100644
--- a/tests/integration/Images/v2/CoreTest.php
+++ b/tests/integration/Images/v2/CoreTest.php
@@ -75,8 +75,6 @@ public function members()
         /** @var Image $image */
         require_once $this->sampleFile($replacements, 'images/create.php');
 
-
-
         $this->logStep(sprintf('Image created with id=%s', $image->id));
 
         $this->logStep('Adding member');
diff --git a/tests/integration/Networking/v2/Layer3Test.php b/tests/integration/Networking/v2/Layer3Test.php
index 2efad65f..71bc67e6 100644
--- a/tests/integration/Networking/v2/Layer3Test.php
+++ b/tests/integration/Networking/v2/Layer3Test.php
@@ -2,7 +2,6 @@
 
 namespace OpenStack\Integration\Networking\v2;
 
-use Guzzle\Tests\Service\Mock\Command\Sub\Sub;
 use OpenStack\Integration\TestCase;
 use OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp;
 use OpenStack\Networking\v2\Models\Network;
@@ -28,7 +27,7 @@ public function runTests()
         $this->outputTimeTaken();
     }
 
-    public function teardown()
+    public function teardown(): void
     {
         parent::teardown();
 
diff --git a/tests/integration/Runner.php b/tests/integration/Runner.php
index e2cdeda1..dc377638 100644
--- a/tests/integration/Runner.php
+++ b/tests/integration/Runner.php
@@ -35,7 +35,7 @@ private function assembleTestFiles()
                     if ($servicePath->isDir() && $versionBn[0] == 'v') {
                         foreach ($this->traverse($versionPath->getPathname()) as $testPath) {
                             if (strpos($testPath->getFilename(), 'Test.php')) {
-                                $testBn = strtolower(substr($testPath->getBasename(), 0, -8));
+                                $testBn = substr($testPath->getBasename(), 0, -8);
                                 $this->tests[$serviceBn][strtolower($versionBn)][] = $testBn;
                             }
                         }

From b49c6a69bdb9a86998d179efe308811de84dafe3 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Thu, 7 Dec 2023 10:13:42 +0100
Subject: [PATCH 054/102] always recheck all tests on push to master (#370)

---
 .github/workflows/integration_block_storage.yml  | 3 +++
 .github/workflows/integration_compute.yml        | 3 +++
 .github/workflows/integration_identity.yml       | 3 +++
 .github/workflows/integration_images.yml         | 3 +++
 .github/workflows/integration_networking.yml     | 3 +++
 .github/workflows/integration_object_storage.yml | 3 +++
 .github/workflows/unit_tests.yml                 | 5 +++++
 7 files changed, 23 insertions(+)

diff --git a/.github/workflows/integration_block_storage.yml b/.github/workflows/integration_block_storage.yml
index 371c6573..3c344dba 100644
--- a/.github/workflows/integration_block_storage.yml
+++ b/.github/workflows/integration_block_storage.yml
@@ -6,6 +6,9 @@ on:
     paths:
       - '**BlockStorage**'
       - '**Common**'
+  push:
+    branches:
+      - master
 
 jobs:
   tests:
diff --git a/.github/workflows/integration_compute.yml b/.github/workflows/integration_compute.yml
index 7d072378..a331f2e3 100644
--- a/.github/workflows/integration_compute.yml
+++ b/.github/workflows/integration_compute.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - '**Compute**'
       - '**Common**'
+  push:
+    branches:
+      - master
 
 jobs:
   tests:
diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml
index c7f2f8a9..97b81bc0 100644
--- a/.github/workflows/integration_identity.yml
+++ b/.github/workflows/integration_identity.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - '**Identity**'
       - '**Common**'
+  push:
+    branches:
+      - master
 
 jobs:
   tests:
diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml
index feddef03..e6278453 100644
--- a/.github/workflows/integration_images.yml
+++ b/.github/workflows/integration_images.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - '**Images**'
       - '**Common**'
+  push:
+    branches:
+      - master
 
 jobs:
   tests:
diff --git a/.github/workflows/integration_networking.yml b/.github/workflows/integration_networking.yml
index cc18661c..eceef16f 100644
--- a/.github/workflows/integration_networking.yml
+++ b/.github/workflows/integration_networking.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - '**Networking**'
       - '**Common**'
+  push:
+    branches:
+      - master
 
 jobs:
   tests:
diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml
index 252e4e37..1a76bcaf 100644
--- a/.github/workflows/integration_object_storage.yml
+++ b/.github/workflows/integration_object_storage.yml
@@ -5,6 +5,9 @@ on:
     paths:
       - '**ObjectStore**'
       - '**Common**'
+  push:
+    branches:
+      - master
 
 jobs:
   tests:
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 2e22005c..fefbc865 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -1,6 +1,11 @@
 name: Run Unit Tests
 on:
+  workflow_dispatch:
   pull_request:
+  push:
+    branches:
+      - master
+
 jobs:
   tests:
     runs-on: ubuntu-22.04

From 184990e1c256a4bd4d990092b4ce37ed7400d084 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Tue, 12 Dec 2023 12:00:23 +0100
Subject: [PATCH 055/102] Restore read the docs (#371)

* add readthedocs.yaml
* remove button
* move to python 3
---
 .readthedocs.yaml                           | 22 +++++++++++++++++
 doc/.gitignore                              |  1 +
 doc/_exts/samples.py                        | 12 ++--------
 doc/requirements.txt                        |  2 +-
 doc/services/identity/v3/credentials.rst    | 10 ++++----
 doc/services/identity/v3/domains.rst        | 26 ++++++++++-----------
 doc/services/identity/v3/endpoints.rst      | 10 ++++----
 doc/services/identity/v3/groups.rst         | 18 +++++++-------
 doc/services/identity/v3/projects.rst       | 26 ++++++++++-----------
 doc/services/identity/v3/roles.rst          |  6 ++---
 doc/services/identity/v3/services.rst       |  8 +++----
 doc/services/identity/v3/tokens.rst         | 18 +++++++-------
 doc/services/identity/v3/users.rst          | 14 +++++------
 doc/services/object-store/v1/account.rst    |  8 +++----
 doc/services/object-store/v1/containers.rst | 12 +++++-----
 doc/services/object-store/v1/objects.rst    | 22 ++++++++---------
 16 files changed, 115 insertions(+), 100 deletions(-)
 create mode 100644 .readthedocs.yaml

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 00000000..5775c3f6
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,22 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+# Build documentation in the "doc/" directory with Sphinx
+sphinx:
+  configuration: doc/conf.py
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+  install:
+    - requirements: doc/requirements.txt
\ No newline at end of file
diff --git a/doc/.gitignore b/doc/.gitignore
index 33ce1477..363a3335 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,2 +1,3 @@
+.idea/
 _build/
 api-docs/build
diff --git a/doc/_exts/samples.py b/doc/_exts/samples.py
index 5daa1f9a..bb11d3eb 100644
--- a/doc/_exts/samples.py
+++ b/doc/_exts/samples.py
@@ -1,7 +1,6 @@
-from sphinx.directives import LiteralInclude
 from docutils import nodes
 from sphinx.addnodes import download_reference
-from sphinx.writers.html import HTMLTranslator
+from sphinx.directives.code import LiteralInclude
 import re
 
 class Sample(LiteralInclude):
@@ -10,7 +9,7 @@ def run(self):
     self.arguments[0] = "/../samples/" + self.arguments[0]
     self.options['language'] = 'php'
 
-    pattern = "[\s+]?(\<\?php.*?]\);)"
+    pattern = r"[\s+]?(\<\?php.*?]\);)"
 
     code_block = super(Sample, self).run()[0]
     string = str(code_block[0])
@@ -29,13 +28,6 @@ def run(self):
         nodes.literal_block(auth_str, auth_str, language="php"), 
         nodes.literal_block(main_str, main_str, language="php")]
 
-def visit_download_reference(self, node):
-  self.context.append('<a href="javascript:void(0);" class="toggle btn">Show auth code</a>')
-
-def depart_download_reference(self, node):
-  self.body.append(self.context.pop())
-
 def setup(app):
-  app.add_node(download_reference, html=(visit_download_reference, depart_download_reference))
   app.add_directive('sample', Sample)
   return {'version': '0.1'}
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 449e06ca..44f7df3f 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1 +1 @@
-sphinxcontrib-phpdomain==0.1.4
+sphinxcontrib-phpdomain>=0.11.0
diff --git a/doc/services/identity/v3/credentials.rst b/doc/services/identity/v3/credentials.rst
index b0cf1d84..56a1e55e 100644
--- a/doc/services/identity/v3/credentials.rst
+++ b/doc/services/identity/v3/credentials.rst
@@ -7,7 +7,7 @@ Add credential
 Create a secret/access pair for use with ec2 style auth. This operation will generates a new set of credentials that
 map the user/tenant pair.
 
-.. sample:: Identity/v2/credentials/add_cred.php
+.. sample:: Identity/v3/credentials/add_cred.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createCredential
 
 List credentials
@@ -15,7 +15,7 @@ List credentials
 
 List all credentials for a given user.
 
-.. sample:: Identity/v2/credentials/list_creds.php
+.. sample:: Identity/v3/credentials/list_creds.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listCredentials
 
 Show credential details
@@ -23,13 +23,13 @@ Show credential details
 
 Retrieve a user's access/secret pair by the access key.
 
-.. sample:: Identity/v2/credentials/get_cred.php
+.. sample:: Identity/v3/credentials/get_cred.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getCredential
 
 Update credential
 -----------------
 
-.. sample:: Identity/v2/credentials/update_cred.php
+.. sample:: Identity/v3/credentials/update_cred.php
 .. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_update
 
 Delete credential
@@ -37,5 +37,5 @@ Delete credential
 
 Delete a user's access/secret pair.
 
-.. sample:: Identity/v2/credentials/delete_cred.php
+.. sample:: Identity/v3/credentials/delete_cred.php
 .. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_delete
diff --git a/doc/services/identity/v3/domains.rst b/doc/services/identity/v3/domains.rst
index 079937e8..409059d9 100644
--- a/doc/services/identity/v3/domains.rst
+++ b/doc/services/identity/v3/domains.rst
@@ -4,77 +4,77 @@ Domains
 Add domain
 ----------
 
-.. sample:: Identity/v2/domains/add_domain.php
+.. sample:: Identity/v3/domains/add_domain.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createDomain
 
 List domains
 ------------
 
-.. sample:: Identity/v2/domains/list_domains.php
+.. sample:: Identity/v3/domains/list_domains.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listDomains
 
 Show domain details
 -------------------
 
-.. sample:: Identity/v2/domains/show_domain.php
+.. sample:: Identity/v3/domains/show_domain.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getDomain
 
 Update domain
 -------------
 
-.. sample:: Identity/v2/domains/update_domain.php
+.. sample:: Identity/v3/domains/update_domain.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_update
 
 Delete domain
 -------------
 
-.. sample:: Identity/v2/domains/delete_domain.php
+.. sample:: Identity/v3/domains/delete_domain.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_delete
 
 List roles for domain user
 --------------------------
 
-.. sample:: Identity/v2/domains/list_user_roles.php
+.. sample:: Identity/v3/domains/list_user_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listUserRoles
 
 Grant role to domain user
 -------------------------
 
-.. sample:: Identity/v2/domains/grant_user_role.php
+.. sample:: Identity/v3/domains/grant_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantUserRole
 
 Check role for domain user
 --------------------------
 
-.. sample:: Identity/v2/domains/check_user_role.php
+.. sample:: Identity/v3/domains/check_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkUserRole
 
 Revoke role for domain user
 ---------------------------
 
-.. sample:: Identity/v2/domains/revoke_user_role.php
+.. sample:: Identity/v3/domains/revoke_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeUserRole
 
 List roles for domain group
 ---------------------------
 
-.. sample:: Identity/v2/domains/list_group_roles.php
+.. sample:: Identity/v3/domains/list_group_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listGroupRoles
 
 Grant role to domain group
 --------------------------
 
-.. sample:: Identity/v2/domains/grant_group_role.php
+.. sample:: Identity/v3/domains/grant_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantGroupRole
 
 Check role for domain group
 ---------------------------
 
-.. sample:: Identity/v2/domains/check_group_role.php
+.. sample:: Identity/v3/domains/check_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkGroupRole
 
 Revoke role for domain group
 ----------------------------
 
-.. sample:: Identity/v2/domains/revoke_group_role.php
+.. sample:: Identity/v3/domains/revoke_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeGroupRole
diff --git a/doc/services/identity/v3/endpoints.rst b/doc/services/identity/v3/endpoints.rst
index c4aadb84..d5d99e6a 100644
--- a/doc/services/identity/v3/endpoints.rst
+++ b/doc/services/identity/v3/endpoints.rst
@@ -4,29 +4,29 @@ Endpoints
 Add endpoints
 -------------
 
-.. sample:: Identity/v2/endpoints/add_endpoint.php
+.. sample:: Identity/v3/endpoints/add_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createEndpoint
 
 Get endpoint
 ------------
 
-.. sample:: Identity/v2/endpoints/get_endpoint.php
+.. sample:: Identity/v3/endpoints/get_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getEndpoint
 
 List endpoints
 --------------
 
-.. sample:: Identity/v2/endpoints/list_endpoints.php
+.. sample:: Identity/v3/endpoints/list_endpoints.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listEndpoints
 
 Update endpoint
 ---------------
 
-.. sample:: Identity/v2/endpoints/update_endpoint.php
+.. sample:: Identity/v3/endpoints/update_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_update
 
 Delete endpoint
 ---------------
 
-.. sample:: Identity/v2/endpoints/delete_endpoint.php
+.. sample:: Identity/v3/endpoints/delete_endpoint.php
 .. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_delete
diff --git a/doc/services/identity/v3/groups.rst b/doc/services/identity/v3/groups.rst
index 7a29b672..4fc03775 100644
--- a/doc/services/identity/v3/groups.rst
+++ b/doc/services/identity/v3/groups.rst
@@ -4,53 +4,53 @@ Groups
 Add group
 ---------
 
-.. sample:: Identity/v2/groups/add_group.php
+.. sample:: Identity/v3/groups/add_group.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createGroup
 
 List groups
 -----------
 
-.. sample:: Identity/v2/groups/list_groups.php
+.. sample:: Identity/v3/groups/list_groups.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listGroups
 
 Show group details
 ------------------
 
-.. sample:: Identity/v2/groups/get_group.php
+.. sample:: Identity/v3/groups/get_group.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getGroup
 
 Update group
 ------------
 
-.. sample:: Identity/v2/groups/update_group.php
+.. sample:: Identity/v3/groups/update_group.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_update
 
 Delete group
 ------------
 
-.. sample:: Identity/v2/groups/delete_group.php
+.. sample:: Identity/v3/groups/delete_group.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_delete
 
 List users in a group
 ---------------------
 
-.. sample:: Identity/v2/groups/list_users.php
+.. sample:: Identity/v3/groups/list_users.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_listUsers
 
 Add user to group
 -----------------
 
-.. sample:: Identity/v2/groups/add_user.php
+.. sample:: Identity/v3/groups/add_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_addUser
 
 Remove user from group
 ----------------------
 
-.. sample:: Identity/v2/groups/remove_user.php
+.. sample:: Identity/v3/groups/remove_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_removeUser
 
 Check user membership in a group
 --------------------------------
 
-.. sample:: Identity/v2/groups/check_user_membership.php
+.. sample:: Identity/v3/groups/check_user_membership.php
 .. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_checkMembership
diff --git a/doc/services/identity/v3/projects.rst b/doc/services/identity/v3/projects.rst
index 55177cf2..1de4f2ab 100644
--- a/doc/services/identity/v3/projects.rst
+++ b/doc/services/identity/v3/projects.rst
@@ -4,77 +4,77 @@ Projects
 Add project
 -----------
 
-.. sample:: Identity/v2/projects/add_project.php
+.. sample:: Identity/v3/projects/add_project.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createProject
 
 List projects
 -------------
 
-.. sample:: Identity/v2/projects/list_projects.php
+.. sample:: Identity/v3/projects/list_projects.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listProjects
 
 Show project details
 --------------------
 
-.. sample:: Identity/v2/projects/get_project.php
+.. sample:: Identity/v3/projects/get_project.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getProject
 
 Update project
 --------------
 
-.. sample:: Identity/v2/projects/update_project.php
+.. sample:: Identity/v3/projects/update_project.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_update
 
 Delete project
 --------------
 
-.. sample:: Identity/v2/projects/delete_project.php
+.. sample:: Identity/v3/projects/delete_project.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_delete
 
 List roles for project user
 ---------------------------
 
-.. sample:: Identity/v2/projects/list_user_roles.php
+.. sample:: Identity/v3/projects/list_user_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listUserRoles
 
 Grant role to project user
 --------------------------
 
-.. sample:: Identity/v2/projects/grant_user_role.php
+.. sample:: Identity/v3/projects/grant_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantUserRole
 
 Check role for project user
 ---------------------------
 
-.. sample:: Identity/v2/projects/check_user_role.php
+.. sample:: Identity/v3/projects/check_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkUserRole
 
 Revoke role for project user
 ----------------------------
 
-.. sample:: Identity/v2/projects/revoke_user_role.php
+.. sample:: Identity/v3/projects/revoke_user_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeUserRole
 
 List roles for project group
 ----------------------------
 
-.. sample:: Identity/v2/projects/list_group_roles.php
+.. sample:: Identity/v3/projects/list_group_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listGroupRoles
 
 Grant role to project group
 ---------------------------
 
-.. sample:: Identity/v2/projects/grant_group_role.php
+.. sample:: Identity/v3/projects/grant_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_grantGroupRole
 
 Check role for project group
 ----------------------------
 
-.. sample:: Identity/v2/projects/check_group_role.php
+.. sample:: Identity/v3/projects/check_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_checkGroupRole
 
 Revoke role for project group
 -----------------------------
 
-.. sample:: Identity/v2/projects/revoke_group_role.php
+.. sample:: Identity/v3/projects/revoke_group_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_revokeGroupRole
\ No newline at end of file
diff --git a/doc/services/identity/v3/roles.rst b/doc/services/identity/v3/roles.rst
index 5baf9ab1..143dabee 100644
--- a/doc/services/identity/v3/roles.rst
+++ b/doc/services/identity/v3/roles.rst
@@ -4,17 +4,17 @@ Roles
 Add role
 --------
 
-.. sample:: Identity/v2/roles/add_role.php
+.. sample:: Identity/v3/roles/add_role.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_createRole
 
 List roles
 ----------
 
-.. sample:: Identity/v2/roles/list_roles.php
+.. sample:: Identity/v3/roles/list_roles.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoles
 
 List role assignments
 ---------------------
 
-.. sample:: Identity/v2/roles/list_assignments.php
+.. sample:: Identity/v3/roles/list_assignments.php
 .. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoleAssignments
diff --git a/doc/services/identity/v3/services.rst b/doc/services/identity/v3/services.rst
index 4ba154af..39276162 100644
--- a/doc/services/identity/v3/services.rst
+++ b/doc/services/identity/v3/services.rst
@@ -4,23 +4,23 @@ Services
 Add service
 -----------
 
-.. sample:: Identity/v2/services/add_service.php
+.. sample:: Identity/v3/services/add_service.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createService
 
 List services
 -------------
 
-.. sample:: Identity/v2/services/list_services.php
+.. sample:: Identity/v3/services/list_services.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listServices
 
 Show service details
 --------------------
 
-.. sample:: Identity/v2/services/get_service.php
+.. sample:: Identity/v3/services/get_service.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getService
 
 Delete service
 --------------
 
-.. sample:: Identity/v2/services/delete_service.php
+.. sample:: Identity/v3/services/delete_service.php
 .. refdoc:: OpenStack/Identity/v3/Models/Service.html#method_delete
\ No newline at end of file
diff --git a/doc/services/identity/v3/tokens.rst b/doc/services/identity/v3/tokens.rst
index 72e8617e..aff224d1 100644
--- a/doc/services/identity/v3/tokens.rst
+++ b/doc/services/identity/v3/tokens.rst
@@ -10,38 +10,38 @@ Authenticate (generate) token
 Generate token with user ID
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: Identity/v2/tokens/generate_token_with_user_id.php
+.. sample:: Identity/v3/tokens/generate_token_with_user_id.php
 
 Generate token with username
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: Identity/v2/tokens/generate_token_with_username.php
+.. sample:: Identity/v3/tokens/generate_token_with_username.php
 
 Generate token from ID
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: Identity/v2/tokens/generate_token_from_id.php
+.. sample:: Identity/v3/tokens/generate_token_from_id.php
 
 Generate token scoped to project ID
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: Identity/v2/tokens/generate_token_scoped_to_project_id.php
+.. sample:: Identity/v3/tokens/generate_token_scoped_to_project_id.php
 
 Generate token scoped to project name
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: Identity/v2/tokens/generate_token_scoped_to_project_name.php
+.. sample:: Identity/v3/tokens/generate_token_scoped_to_project_name.php
 
 Validate token
 --------------
 
-.. sample:: Identity/v2/tokens/validate_token.php
+.. sample:: Identity/v3/tokens/validate_token.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_validateToken
 
 Revoke token
 ------------
 
-.. sample:: Identity/v2/tokens/revoke_token.php
+.. sample:: Identity/v3/tokens/revoke_token.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_revokeToken
 
 Cache authentication token
@@ -66,7 +66,7 @@ expire.
 Generate token and persist to file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: Identity/v2/tokens/export_authentication_token.php
+.. sample:: Identity/v3/tokens/export_authentication_token.php
 
 
 For scalability, it is recommended that cached tokens are stored in persistent storage such as memcache or redis instead
@@ -75,4 +75,4 @@ of a local file.
 Initialize Open Stack using cached authentication token
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: Identity/v2/tokens/use_cached_authentication_token.php
+.. sample:: Identity/v3/tokens/use_cached_authentication_token.php
diff --git a/doc/services/identity/v3/users.rst b/doc/services/identity/v3/users.rst
index db27edbd..3453c3dc 100644
--- a/doc/services/identity/v3/users.rst
+++ b/doc/services/identity/v3/users.rst
@@ -4,41 +4,41 @@ Users
 Add user
 --------
 
-.. sample:: Identity/v2/users/add_user.php
+.. sample:: Identity/v3/users/add_user.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_createUser
 
 List users
 ----------
 
-.. sample:: Identity/v2/users/list_users.php
+.. sample:: Identity/v3/users/list_users.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_listUsers
 
 Show user details
 -----------------
 
-.. sample:: Identity/v2/users/get_user.php
+.. sample:: Identity/v3/users/get_user.php
 .. refdoc:: OpenStack/Identity/v3/Service.html#method_getUser
 
 Update user
 -----------
 
-.. sample:: Identity/v2/users/update_user.php
+.. sample:: Identity/v3/users/update_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_update
 
 Delete user
 -----------
 
-.. sample:: Identity/v2/users/delete_user.php
+.. sample:: Identity/v3/users/delete_user.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_delete
 
 List groups for user
 --------------------
 
-.. sample:: Identity/v2/users/list_groups.php
+.. sample:: Identity/v3/users/list_groups.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listGroups
 
 List projects for user
 ----------------------
 
-.. sample:: Identity/v2/users/list_projects.php
+.. sample:: Identity/v3/users/list_projects.php
 .. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listProjects
diff --git a/doc/services/object-store/v1/account.rst b/doc/services/object-store/v1/account.rst
index 972e9f20..12a4a31e 100644
--- a/doc/services/object-store/v1/account.rst
+++ b/doc/services/object-store/v1/account.rst
@@ -6,13 +6,13 @@ Show account details
 
 To work with an Object Store account, you must first retrieve an account object like so:
 
-.. sample:: ObjectStore/v2/account/get.php
+.. sample:: ObjectStore/v1/account/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getAccount
 
 Get account metadata
 --------------------
 
-.. sample:: ObjectStore/v2/account/get_metadata.php
+.. sample:: ObjectStore/v1/account/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_getMetadata
 
 Replace all metadata with new values
@@ -43,7 +43,7 @@ the metadata of the account will now be:
 
 To merge metadata, you must run:
 
-.. sample:: ObjectStore/v2/account/reset_metadata.php
+.. sample:: ObjectStore/v1/account/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_resetMetadata
 
 Merge new metadata values with existing
@@ -75,5 +75,5 @@ the metadata of the account will now be:
 
 To reset metadata, you must run:
 
-.. sample:: ObjectStore/v2/account/merge_metadata.php
+.. sample:: ObjectStore/v1/account/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_mergeMetadata
\ No newline at end of file
diff --git a/doc/services/object-store/v1/containers.rst b/doc/services/object-store/v1/containers.rst
index fdf742f3..18b2d656 100644
--- a/doc/services/object-store/v1/containers.rst
+++ b/doc/services/object-store/v1/containers.rst
@@ -4,7 +4,7 @@ Containers
 Show details for a container
 ----------------------------
 
-.. sample:: ObjectStore/v2/containers/get.php
+.. sample:: ObjectStore/v1/containers/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getContainer
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -25,7 +25,7 @@ and all of the local properties will match those of the remote resource.
 List containers
 ---------------
 
-.. sample:: ObjectStore/v2/containers/list.php
+.. sample:: ObjectStore/v1/containers/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_listContainers
 
 When listing containers, you must be aware that not *all* information about a container is returned in a collection.
@@ -46,7 +46,7 @@ container.
 Delete container
 ----------------
 
-.. sample:: ObjectStore/v2/containers/delete.php
+.. sample:: ObjectStore/v1/containers/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_delete
 
 The API will only accept DELETE requests on containers when they are empty. If you have a container with any objects
@@ -55,7 +55,7 @@ inside, the operation will fail.
 Get metadata
 ------------
 
-.. sample:: ObjectStore/v2/containers/get_metadata.php
+.. sample:: ObjectStore/v1/containers/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -65,7 +65,7 @@ correspond to the values set either when the container was created, or when a pr
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: ObjectStore/v2/containers/reset_metadata.php
+.. sample:: ObjectStore/v1/containers/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -95,7 +95,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: ObjectStore/v2/containers/merge_metadata.php
+.. sample:: ObjectStore/v1/containers/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing
diff --git a/doc/services/object-store/v1/objects.rst b/doc/services/object-store/v1/objects.rst
index a679330e..7b326b15 100644
--- a/doc/services/object-store/v1/objects.rst
+++ b/doc/services/object-store/v1/objects.rst
@@ -4,7 +4,7 @@ Objects
 Show details for an object
 --------------------------
 
-.. sample:: ObjectStore/v2/objects/get.php
+.. sample:: ObjectStore/v1/objects/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getObject
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -26,7 +26,7 @@ of the object's metadata, will not download the object's content. To do this, se
 Download an object
 ------------------
 
-.. sample:: ObjectStore/v2/objects/download.php
+.. sample:: ObjectStore/v1/objects/download.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_download
 
 As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
@@ -41,7 +41,7 @@ parameter ``$data`` to ``['stream' => true]`` to get the stream before the end o
 List objects
 ------------
 
-.. sample:: ObjectStore/v2/objects/list.php
+.. sample:: ObjectStore/v1/objects/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_listObjects
 
 When listing objects, you must be aware that not *all* information about a container is returned in a collection.
@@ -64,13 +64,13 @@ Create an object
 
 When creating an object, you can upload its content according to a string representation:
 
-.. sample:: ObjectStore/v2/objects/create.php
+.. sample:: ObjectStore/v1/objects/create.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createObject
 
 If that is not optimal or convenient, you can use a stream instead. Any instance of ``\Psr\Http\Message\StreamInterface``
 is acceptable. For example, to use a normal Guzzle stream:
 
-.. sample:: ObjectStore/v2/objects/create_from_stream.php
+.. sample:: ObjectStore/v1/objects/create_from_stream.php
 
 Create a large object (over 5GB)
 --------------------------------
@@ -84,25 +84,25 @@ uploading, this is what happens under the hood:
 
 To upload a DLO, you need to call:
 
-.. sample:: ObjectStore/v2/objects/create_large_object.php
+.. sample:: ObjectStore/v1/objects/create_large_object.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createLargeObject
 
 Copy object
 -----------
 
-.. sample:: ObjectStore/v2/objects/copy.php
+.. sample:: ObjectStore/v1/objects/copy.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_copy
 
 Delete object
 -------------
 
-.. sample:: ObjectStore/v2/objects/delete.php
+.. sample:: ObjectStore/v1/objects/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_delete
 
 Get metadata
 ------------
 
-.. sample:: ObjectStore/v2/objects/get_metadata.php
+.. sample:: ObjectStore/v1/objects/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -112,7 +112,7 @@ correspond to the values set either when the object was created, or when a previ
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: ObjectStore/v2/objects/reset_metadata.php
+.. sample:: ObjectStore/v1/objects/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -142,7 +142,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: ObjectStore/v2/objects/merge_metadata.php
+.. sample:: ObjectStore/v1/objects/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing

From e1c63af8585deb7b7e344552ebbf8d581c53f089 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Tue, 12 Dec 2023 14:21:01 +0100
Subject: [PATCH 056/102] Fix documentation (#372)

* fix #351

* fix documentation requirements, remove unused links in docs

* add badges, remove old contacts from README.md
---
 .../workflows/integration_block_storage.yml   |  2 +-
 .github/workflows/integration_compute.yml     |  2 +-
 .github/workflows/integration_identity.yml    |  2 +-
 .github/workflows/integration_images.yml      |  2 +-
 .github/workflows/integration_networking.yml  |  2 +-
 .../workflows/integration_object_storage.yml  |  2 +-
 .github/workflows/unit_tests.yml              |  2 +-
 README.md                                     | 21 ++++++++++++-------
 doc/index.rst                                 | 11 ++--------
 samples/Compute/v2/images/delete_image.php    |  2 ++
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/integration_block_storage.yml b/.github/workflows/integration_block_storage.yml
index 3c344dba..93dae725 100644
--- a/.github/workflows/integration_block_storage.yml
+++ b/.github/workflows/integration_block_storage.yml
@@ -1,4 +1,4 @@
-name: Run Block Storage Integration Tests
+name: Block Storage Integration Tests
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/integration_compute.yml b/.github/workflows/integration_compute.yml
index a331f2e3..e8c41bed 100644
--- a/.github/workflows/integration_compute.yml
+++ b/.github/workflows/integration_compute.yml
@@ -1,4 +1,4 @@
-name: Run Compute Integration Tests
+name: Compute Integration Tests
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml
index 97b81bc0..d35c5438 100644
--- a/.github/workflows/integration_identity.yml
+++ b/.github/workflows/integration_identity.yml
@@ -1,4 +1,4 @@
-name: Run Identity Integration Tests
+name: Identity Integration Tests
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml
index e6278453..21d07102 100644
--- a/.github/workflows/integration_images.yml
+++ b/.github/workflows/integration_images.yml
@@ -1,4 +1,4 @@
-name: Run Images Integration Tests
+name: Images Integration Tests
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/integration_networking.yml b/.github/workflows/integration_networking.yml
index eceef16f..db3678a0 100644
--- a/.github/workflows/integration_networking.yml
+++ b/.github/workflows/integration_networking.yml
@@ -1,4 +1,4 @@
-name: Run Networking Integration Tests
+name: Networking Integration Tests
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_object_storage.yml
index 1a76bcaf..5e0e7cc3 100644
--- a/.github/workflows/integration_object_storage.yml
+++ b/.github/workflows/integration_object_storage.yml
@@ -1,4 +1,4 @@
-name: Run Object Storage Integration Tests
+name: Object Storage Integration Tests
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index fefbc865..ec1fccbe 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -1,4 +1,4 @@
-name: Run Unit Tests
+name: Unit Tests
 on:
   workflow_dispatch:
   pull_request:
diff --git a/README.md b/README.md
index 85ca6e09..263eea21 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,15 @@
 # PHP OpenStack SDK
 
-[![Build Status](https://travis-ci.org/php-opencloud/openstack.svg?branch=master)](https://travis-ci.org/php-opencloud/openstack)
-[![Coverage Status](https://coveralls.io/repos/github/php-opencloud/openstack/badge.svg?branch=master)](https://coveralls.io/github/php-opencloud/openstack?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/php-opencloud/openstack/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/php-opencloud/openstack/?branch=master)
+
+![Unit tests](https://github.com/php-opencloud/openstack/actions/workflows/unit_tests.yml/badge.svg)
+[![Documentation Status](https://readthedocs.org/projects/php-openstack-sdk/badge/?version=latest)](https://php-openstack-sdk.readthedocs.io/en/latest/?badge=latest)
+
+[![Block Storage Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_block_storage.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_block_storage.yml)
+[![Compute Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_compute.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_compute.yml)
+[![Identity Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_identity.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_identity.yml)
+[![Images Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_images.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_images.yml)
+[![Networking Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_networking.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_networking.yml)
+[![Object Storage Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_object_storage.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_object_storage.yml)
 
 `php-opencloud/openstack` is an SDK which allows PHP developers to easily connect to OpenStack APIs in a simple and 
 idiomatic way. This binding is specifically designed for OpenStack APIs, but other provider SDKs are available. Multiple 
@@ -34,14 +41,13 @@ out by open an issue in github.
 
 ## Join the community
    
-- Meet us on Slack: https://phpopencloud.slack.com ([Get your invitation](https://launchpass.com/phpopencloud))
 - Report an issue: https://github.com/php-opencloud/openstack/issues
 
 ## Version Guidance
 
 | Version   | Status                      | PHP Version      | Support until           |
 | --------- | --------------------------- | ---------------- | ----------------------- |
-| `^3.2`    | Latest                      | `>=7.2.5, >=8.0`  | Current                 |
+| `^3.2`    | Latest                      | `>=7.2.5, >=8.0` | Current                 |
 | `^3.1`    | Latest                      | `>=7.2.5`        | Current                 |
 | `^3.0`    | Bug fixed only              | `>=7.0`          | Oct 2020                |
 | `^2.0`    | End of life                 | `>=7.0,<7.2`     | March 2018              |
@@ -57,7 +63,7 @@ This change was introduced in [#184](https://github.com/php-opencloud/openstack/
 
 ## Requirements
 
-* PHP 7.0
+* PHP >= 7.2.5
 * `ext-curl`
 
 ## How to install
@@ -71,6 +77,5 @@ composer require php-opencloud/openstack
 Engaging the community and lowering barriers for contributors is something we care a lot about. For this reason, we've 
 taken the time to write a [contributing guide](CONTRIBUTING.md) for folks interested in getting involved in our project. 
 If you're not sure how you can get involved, feel free to 
-[submit an issue](https://github.com/php-opencloud/openstack/issues/new) or 
-[contact us](https://developer.rackspace.com/support/). You don't need to be a PHP expert - all members of the 
+[submit an issue](https://github.com/php-opencloud/openstack/issues/new). You don't need to be a PHP expert - all members of the 
 community are welcome!
diff --git a/doc/index.rst b/doc/index.rst
index 9b76c16d..0feb0b93 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -4,7 +4,7 @@ Welcome to the OpenStack SDK for PHP!
 Requirements
 ------------
 
-* PHP 7
+* PHP >= 7, < 9
 * cURL extension
 
 Installation
@@ -41,13 +41,7 @@ Supported services
 Help and support
 ----------------
 
-If you have specific problems or bugs with this SDK, please file an issue on our official `Github repo`_. We also
-have a `mailing list`_, so feel free to join to keep up to date with all the latest changes and announcements to the
-library.
-
-For general feedback and support requests, send an email to sdk-support@rackspace.com.
-
-You can also find assistance via IRC on #rackspace at freenode.net.
+If you have specific problems or bugs with this SDK, please file an issue on our official `Github repo`_.
 
 Contributing
 ------------
@@ -57,5 +51,4 @@ If you'd like to contribute to the project, or require help running the unit/int
 
 .. _Composer installation instructions: `https://getcomposer.org/doc/00-intro.md`
 .. _Github repo: `https://github.com/php-opencloud/openstack`
-.. _mailing list: `https://groups.google.com/forum/#!forum/php-opencloud`
 .. _contributing guidelines: `https://github.com/php-opencloud/openstack/blob/master/CONTRIBUTING.md`
diff --git a/samples/Compute/v2/images/delete_image.php b/samples/Compute/v2/images/delete_image.php
index a8462863..51e08b0f 100644
--- a/samples/Compute/v2/images/delete_image.php
+++ b/samples/Compute/v2/images/delete_image.php
@@ -15,3 +15,5 @@
 $compute = $openstack->computeV2(['region' => '{region}']);
 
 $image = $compute->getImage(['id' => '{imageId}']);
+
+$image->delete();

From 3c85b6fc6a1b4cbfe8e3d927668f6b1f43d6c069 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Tue, 12 Dec 2023 14:30:47 +0100
Subject: [PATCH 057/102] Fix documentation (#373)

* clarify versioning
* change documentation copyright
---
 README.md   | 36 ++++++++++++------------------------
 doc/conf.py |  2 +-
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 263eea21..4dea18a4 100644
--- a/README.md
+++ b/README.md
@@ -22,35 +22,23 @@ OpenStack services, and versions of services, are supported.
 * [Contributing guide](/CONTRIBUTING.md)
 * [Code of Conduct](/CODE_OF_CONDUCT.md)
 
-
-## We need your help :smiley: 
-
-We invest a large amount of work to ensure this SDK works with many OpenStack distributions via running end-to-end 
-integration tests with a real cluster.
-
-If you or your organization are in a position that can help us access popular distributions as listed below, do reach 
-out by open an issue in github.
-
-| Distribution                       |                         |
-|------------------------------------|-------------------------|
-|OpenStack RDO<br>MicroStack Openstack | Sponsored by [![Ai.net](https://i.imgur.com/wsFRFuX.png)](https://www.ai.net/) |
-|Red Hat OpenStack                   | Need sponsor!           |
-|OVH OpenStack                       | Need sponsor!           |
-|SUSE OpenStack                      | Need sponsor!           |
-|RackSpace OpenStack                 | Need sponsor!           |
-
 ## Join the community
    
 - Report an issue: https://github.com/php-opencloud/openstack/issues
 
-## Version Guidance
+## Versioning
+
+Openstack SDK follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+Updating between minor versions will not require changes to PHP code or configuration
+and cause no breaking behavioural changes for consumers.
 
-| Version   | Status                      | PHP Version      | Support until           |
-| --------- | --------------------------- | ---------------- | ----------------------- |
-| `^3.2`    | Latest                      | `>=7.2.5, >=8.0` | Current                 |
-| `^3.1`    | Latest                      | `>=7.2.5`        | Current                 |
-| `^3.0`    | Bug fixed only              | `>=7.0`          | Oct 2020                |
-| `^2.0`    | End of life                 | `>=7.0,<7.2`     | March 2018              |
+| Version   | Status      | PHP Version      | Support until           |
+| --------- |-------------| ---------------- | ----------------------- |
+| `^3.2`    | Latest      | `>=7.2.5, >=8.0` | Current                 |
+| `^3.1`    | Latest      | `>=7.2.5`        | Current                 |
+| `^3.0`    | End of life | `>=7.0`          | Oct 2020                |
+| `^2.0`    | End of life | `>=7.0,<7.2`     | March 2018              |
 
 
 ## Upgrade from 2.x to 3.x
diff --git a/doc/conf.py b/doc/conf.py
index 9394ea7d..917c7d00 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -27,7 +27,7 @@
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'php-opencloud'
-copyright = u'2015, Jamie Hannaford'
+copyright = u'2015-2023, PHP OpenCloud & contributors'
 version = '1.12'
 release = '1.12.1'
 exclude_patterns = ['_build']

From 5712c307ed148ef700eca856dba0dbc63713afff Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 20 Dec 2023 09:42:59 +0100
Subject: [PATCH 058/102] Fix sort_key and sort_dir parameters for
 BlockStorage/v2/listSnapshots and Images/v2/listImages

---
 doc/services/block-storage/v2/snapshots.rst   | 22 +++++
 doc/services/images/v2/images.rst             | 12 +++
 .../BlockStorage/v2/snapshots/list_sorted.php | 18 +++++
 samples/Images/v2/images/list.php             |  1 +
 samples/Images/v2/images/list_sorted.php      | 16 ++++
 src/Common/Api/AbstractParams.php             |  2 +
 .../integration/BlockStorage/v2/CoreTest.php  | 80 ++++++++++++++++---
 tests/integration/Images/v2/CoreTest.php      | 67 +++++++++++++++-
 8 files changed, 207 insertions(+), 11 deletions(-)
 create mode 100644 samples/BlockStorage/v2/snapshots/list_sorted.php
 create mode 100644 samples/Images/v2/images/list_sorted.php

diff --git a/doc/services/block-storage/v2/snapshots.rst b/doc/services/block-storage/v2/snapshots.rst
index db9c9da5..2ad7a512 100644
--- a/doc/services/block-storage/v2/snapshots.rst
+++ b/doc/services/block-storage/v2/snapshots.rst
@@ -1,2 +1,24 @@
 Snapshots
 =========
+
+List volumes
+------------
+
+.. sample:: BlockStorage/v2/snapshots/list.php
+.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listSnapshots
+
+Each iteration will return a php:class:`Snapshot` instance <OpenStack/BlockStorage/v2/Models/Snapshot.html>.
+
+.. include:: /common/generators.rst
+
+List volumes sorted
+~~~~~~~~~~~~~~~~~~~
+
+Possible values for sort_key are:
+* display_name
+
+Possible values for sort_dir are:
+* asc
+* desc
+
+.. sample:: BlockStorage/v2/snapshots/list_sorted.php
\ No newline at end of file
diff --git a/doc/services/images/v2/images.rst b/doc/services/images/v2/images.rst
index eacc94f5..0020d758 100644
--- a/doc/services/images/v2/images.rst
+++ b/doc/services/images/v2/images.rst
@@ -17,6 +17,18 @@ List images
 
 .. include:: /common/generators.rst
 
+List images sorted
+-----------
+
+Possible values for sort_key are:
+* name
+
+Possible values for sort_dir are:
+* asc
+* desc
+
+.. sample:: Images/v2/images/list_sorted.php
+
 Show image details
 ------------------
 
diff --git a/samples/BlockStorage/v2/snapshots/list_sorted.php b/samples/BlockStorage/v2/snapshots/list_sorted.php
new file mode 100644
index 00000000..e00c18aa
--- /dev/null
+++ b/samples/BlockStorage/v2/snapshots/list_sorted.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$snapshots = $service->listSnapshots(false, ['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
+
+foreach ($snapshots as $snapshot) {
+    /** @var $snapshot \OpenStack\BlockStorage\v2\Models\Snapshot */
+}
diff --git a/samples/Images/v2/images/list.php b/samples/Images/v2/images/list.php
index 0173cf32..42a714c6 100644
--- a/samples/Images/v2/images/list.php
+++ b/samples/Images/v2/images/list.php
@@ -13,4 +13,5 @@
                     ->listImages();
 
 foreach ($images as $image) {
+    /** @var \OpenStack\Images\v2\Models\Image $image */
 }
diff --git a/samples/Images/v2/images/list_sorted.php b/samples/Images/v2/images/list_sorted.php
new file mode 100644
index 00000000..07f85f62
--- /dev/null
+++ b/samples/Images/v2/images/list_sorted.php
@@ -0,0 +1,16 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$images = $openstack->imagesV2()->listImages(['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
+
+foreach ($images as $image) {
+    /** @var \OpenStack\Images\v2\Models\Image $image */
+}
diff --git a/src/Common/Api/AbstractParams.php b/src/Common/Api/AbstractParams.php
index 02546062..7b7b2c77 100644
--- a/src/Common/Api/AbstractParams.php
+++ b/src/Common/Api/AbstractParams.php
@@ -85,6 +85,7 @@ public function sortDir(): array
         return [
             'type'        => self::STRING_TYPE,
             'location'    => self::QUERY,
+            'sentAs'      => 'sort_dir',
             'description' => 'Sorts by one or more sets of attribute and sort direction combinations.',
             'enum'        => ['asc', 'desc'],
         ];
@@ -95,6 +96,7 @@ public function sortKey(): array
         return [
             'type'        => self::STRING_TYPE,
             'location'    => self::QUERY,
+            'sentAs'      => 'sort_key',
             'description' => 'Sorts by one or more sets of attribute and sort direction combinations.',
         ];
     }
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
index 9063e80f..352e0744 100644
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\integration\BlockStorage\v2;
+namespace OpenStack\Integration\BlockStorage\v2;
 
 use OpenStack\BlockStorage\v2\Models\Snapshot;
 use OpenStack\BlockStorage\v2\Models\Volume;
@@ -34,22 +34,24 @@ public function runTests()
         $this->volumeTypes();
         $this->logger->info('-> Snapshots');
         $this->snapshots();
+        $this->logger->info('-> Snapshot list');
+        $this->snapshotList();
 
         $this->outputTimeTaken();
     }
 
     public function volumes()
     {
-        $this->logStep('-> Volumes tests');
+        $this->logStep('Creating volume type');
         $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
 
         $replacements = [
             '{description}' => $this->randomStr(),
-            "'{size}'"      => 1,
-            '{name}'        => $this->randomStr(),
-            '{volumeType}'  => $volumeType->id,
-            '{key1}'        => $this->randomStr(),
-            '{val1}'        => $this->randomStr(),
+            "'{size}'" => 1,
+            '{name}' => $this->randomStr(),
+            '{volumeType}' => $volumeType->id,
+            '{key1}' => $this->randomStr(),
+            '{val1}' => $this->randomStr(),
         ];
 
         $this->logStep('Creating volume');
@@ -70,7 +72,7 @@ public function volumes()
 
         $replacements += [
             '{newName}' => $this->randomStr(),
-            '{newDescription}' => $this->randomStr()
+            '{newDescription}' => $this->randomStr(),
         ];
 
         $this->logStep('Updating volume');
@@ -82,6 +84,7 @@ public function volumes()
         /** @var \Generator $volumes */
         require_once $this->sampleFile($replacements, 'volumes/list.php');
 
+        $volume = $this->getService()->getVolume($volumeId);
         $volume->waitUntil('available');
 
         $this->logStep('Deleting volume');
@@ -135,8 +138,8 @@ public function snapshots()
         $volume->waitUntil('available', 60);
 
         $replacements = [
-            '{volumeId}'    => $volume->id,
-            '{name}'        => $this->randomStr(),
+            '{volumeId}' => $volume->id,
+            '{name}' => $this->randomStr(),
             '{description}' => $this->randomStr(),
         ];
 
@@ -183,6 +186,9 @@ public function snapshots()
 
         $snapshot->waitUntil('available', 60);
 
+        $this->logStep('Listing snapshots');
+        require_once $this->sampleFile($replacements, 'snapshots/list.php');
+
         $this->logStep('Deleting snapshot');
         require_once $this->sampleFile($replacements, 'snapshots/delete.php');
         $snapshot->waitUntilDeleted();
@@ -190,4 +196,58 @@ public function snapshots()
         $this->logStep('Deleting volume');
         $volume->delete();
     }
+
+    public function snapshotList()
+    {
+        $this->logStep('Creating volume');
+        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
+        $volume->waitUntil('available', 60);
+
+        $names = ['b' . $this->randomStr(), 'a' . $this->randomStr(), 'd' . $this->randomStr(), 'c' . $this->randomStr()];
+        $createdSnapshots = [];
+        foreach ($names as $name) {
+            $this->logStep('Creating snapshot ' . $name);
+            $snapshot = $this->getService()->createSnapshot([
+                'volumeId' => $volume->id,
+                'name' => $name,
+            ]);
+
+            self::assertInstanceOf(Snapshot::class, $snapshot);
+
+            $createdSnapshots[] = $snapshot;
+            $snapshot->waitUntil('available', 60);
+        }
+
+        try {
+            $replacements = [
+                '{sortKey}' => 'display_name',
+                '{sortDir}' => 'asc',
+            ];
+
+            $this->logStep('Listing snapshots');
+            require_once $this->sampleFile($replacements, 'snapshots/list.php');
+
+            $this->logStep('Listing snapshots sorted asc');
+            /** @var Snapshot $snapshot */
+            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
+            self::assertInstanceOf(Snapshot::class, $snapshot);
+            self::assertEquals($names[2], $snapshot->name);
+
+            $this->logStep('Listing snapshots sorted desc');
+            $replacements['{sortDir}'] = 'desc';
+            /** @var Snapshot $snapshot */
+            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
+            self::assertInstanceOf(Snapshot::class, $snapshot);
+            self::assertEquals($names[1], $snapshot->name);
+        } finally {
+            foreach ($createdSnapshots as $snapshot) {
+                $this->logStep('Deleting snapshot ' . $snapshot->name);
+                $snapshot->delete();
+                $snapshot->waitUntilDeleted();
+            }
+
+            $this->logStep('Deleting volume');
+            $volume->delete();
+        }
+    }
 }
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
index bc7f7fbf..ec3ac642 100644
--- a/tests/integration/Images/v2/CoreTest.php
+++ b/tests/integration/Images/v2/CoreTest.php
@@ -1,20 +1,39 @@
 <?php
 
-namespace OpenStack\integration\Images\v2;
+namespace OpenStack\Integration\Images\v2;
 
+use OpenStack\BlockStorage\v2\Models\Snapshot;
 use OpenStack\Images\v2\Models\Image;
 use OpenStack\Images\v2\Models\Member;
 use OpenStack\Integration\TestCase;
+use OpenStack\Integration\Utils;
 
 class CoreTest extends TestCase
 {
+    private $service;
+
+    private function getService(): \OpenStack\Images\v2\Service
+    {
+        if (null === $this->service) {
+            $this->service = Utils::getOpenStack()->imagesV2();
+        }
+
+        return $this->service;
+    }
+
     public function runTests()
     {
         $this->startTimer();
 
+        $this->logger->info('-> Images');
         $this->images();
+
+        $this->logger->info('-> Members');
         $this->members();
 
+        $this->logger->info('-> Image list');
+        $this->imageList();
+
         $this->outputTimeTaken();
     }
 
@@ -97,4 +116,50 @@ public function members()
         /** @var Image $image */
         require_once $this->sampleFile($replacements, 'images/delete.php');
     }
+
+    public function imageList()
+    {
+        $this->logStep('Creating image');
+
+        $postfix = $this->randomStr();
+        $names = ['b' . $postfix, 'a' . $postfix, 'd' . $postfix, 'c' . $postfix];
+        $createdImages = [];
+        foreach ($names as $name) {
+            $this->logStep("Creating image $name");
+            $image = $this->getService()->createImage([
+                'name' => $name,
+            ]);
+
+            self::assertInstanceOf(Image::class, $image);
+            $createdImages[] = $image;
+        }
+
+
+        $this->logStep('Listing images sorted asc');
+
+        $replacements = [
+            '{sortKey}' => 'name',
+            '{sortDir}' => 'asc',
+        ];
+
+        /** @var \OpenStack\Images\v2\Models\Image $image */
+        require_once $this->sampleFile($replacements, 'images/list_sorted.php');
+        self::assertInstanceOf(Image::class, $image);
+        self::assertEquals($names[2], $image->name);
+
+
+        $this->logStep('Listing images sorted desc');
+
+        $replacements['{sortDir}'] = 'desc';
+        /** @var \OpenStack\Images\v2\Models\Image $image */
+        require_once $this->sampleFile($replacements, 'images/list_sorted.php');
+        self::assertInstanceOf(Image::class, $image);
+        self::assertEquals($names[1], $image->name);
+
+        foreach ($createdImages as $image) {
+            $this->logStep("Deleting image $image->name");
+            $image->delete();
+        }
+    }
+
 }

From 042176430f3f8c4dd0fecd70601dd5b01aaf3a26 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 20 Dec 2023 10:39:35 +0100
Subject: [PATCH 059/102] fix list formating in documentation (#375)

remove custom theme
---
 doc/_templates/sphinx_rtd_theme/__init__.py   |  17 -
 .../sphinx_rtd_theme/breadcrumbs.html         |  23 -
 doc/_templates/sphinx_rtd_theme/footer.html   |  50 ---
 doc/_templates/sphinx_rtd_theme/layout.html   | 207 ---------
 .../sphinx_rtd_theme/layout_old.html          | 205 ---------
 doc/_templates/sphinx_rtd_theme/search.html   |  50 ---
 .../sphinx_rtd_theme/searchbox.html           |   9 -
 .../static/css/badge_only.css                 |   2 -
 .../static/css/badge_only.css.map             |   7 -
 .../sphinx_rtd_theme/static/css/theme.css     |   6 -
 .../sphinx_rtd_theme/static/css/theme.css.map |   7 -
 .../static/fonts/FontAwesome.otf              | Bin 62856 -> 0 bytes
 .../static/fonts/Inconsolata-Bold.ttf         | Bin 47064 -> 0 bytes
 .../static/fonts/Inconsolata.ttf              | Bin 63184 -> 0 bytes
 .../static/fonts/Lato-Bold.ttf                | Bin 82368 -> 0 bytes
 .../static/fonts/Lato-Regular.ttf             | Bin 81980 -> 0 bytes
 .../static/fonts/RobotoSlab-Bold.ttf          | Bin 36596 -> 0 bytes
 .../static/fonts/RobotoSlab-Regular.ttf       | Bin 36276 -> 0 bytes
 .../static/fonts/fontawesome-webfont.eot      | Bin 38205 -> 0 bytes
 .../static/fonts/fontawesome-webfont.svg      | 414 ------------------
 .../static/fonts/fontawesome-webfont.ttf      | Bin 80652 -> 0 bytes
 .../static/fonts/fontawesome-webfont.woff     | Bin 44432 -> 0 bytes
 .../static/js/modernizr.min.js                |   4 -
 .../sphinx_rtd_theme/static/js/theme.js       | 131 ------
 doc/_templates/sphinx_rtd_theme/theme.conf    |  11 -
 doc/_templates/sphinx_rtd_theme/versions.html |  37 --
 doc/conf.py                                   |   2 +-
 doc/requirements.txt                          |   1 +
 doc/services/block-storage/v2/snapshots.rst   |   2 +
 doc/services/images/v2/images.rst             |   2 +
 30 files changed, 6 insertions(+), 1181 deletions(-)
 delete mode 100644 doc/_templates/sphinx_rtd_theme/__init__.py
 delete mode 100644 doc/_templates/sphinx_rtd_theme/breadcrumbs.html
 delete mode 100644 doc/_templates/sphinx_rtd_theme/footer.html
 delete mode 100644 doc/_templates/sphinx_rtd_theme/layout.html
 delete mode 100644 doc/_templates/sphinx_rtd_theme/layout_old.html
 delete mode 100644 doc/_templates/sphinx_rtd_theme/search.html
 delete mode 100644 doc/_templates/sphinx_rtd_theme/searchbox.html
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/css/badge_only.css
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/css/badge_only.css.map
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/css/theme.css
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/css/theme.css.map
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/FontAwesome.otf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/Inconsolata.ttf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/js/modernizr.min.js
 delete mode 100644 doc/_templates/sphinx_rtd_theme/static/js/theme.js
 delete mode 100644 doc/_templates/sphinx_rtd_theme/theme.conf
 delete mode 100644 doc/_templates/sphinx_rtd_theme/versions.html

diff --git a/doc/_templates/sphinx_rtd_theme/__init__.py b/doc/_templates/sphinx_rtd_theme/__init__.py
deleted file mode 100644
index 95ddc52a..00000000
--- a/doc/_templates/sphinx_rtd_theme/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Sphinx ReadTheDocs theme.
-
-From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
-
-"""
-import os
-
-VERSION = (0, 1, 8)
-
-__version__ = ".".join(str(v) for v in VERSION)
-__version_full__ = __version__
-
-
-def get_html_theme_path():
-    """Return list of HTML theme paths."""
-    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-    return cur_dir
diff --git a/doc/_templates/sphinx_rtd_theme/breadcrumbs.html b/doc/_templates/sphinx_rtd_theme/breadcrumbs.html
deleted file mode 100644
index 0028421e..00000000
--- a/doc/_templates/sphinx_rtd_theme/breadcrumbs.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div role="navigation" aria-label="breadcrumbs navigation">
-  <ul class="wy-breadcrumbs">
-    <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
-      {% for doc in parents %}
-          <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-      {% endfor %}
-    <li>{{ title }}</li>
-      <li class="wy-breadcrumbs-aside">
-        {% if pagename != "search" %}
-          {% if display_github %}
-            <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-github"> Edit on GitHub</a>
-          {% elif display_bitbucket %}
-            <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
-          {% elif show_source and source_url_prefix %}
-            <a href="{{ source_url_prefix }}{{ pagename }}{{ source_suffix }}">View page source</a>
-          {% elif show_source and has_source and sourcename %}
-            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
-          {% endif %}
-        {% endif %}
-      </li>
-  </ul>
-  <hr/>
-</div>
diff --git a/doc/_templates/sphinx_rtd_theme/footer.html b/doc/_templates/sphinx_rtd_theme/footer.html
deleted file mode 100644
index 63703d01..00000000
--- a/doc/_templates/sphinx_rtd_theme/footer.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<footer>
-  {% if next or prev %}
-    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-      {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
-      {% endif %}
-      {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
-      {% endif %}
-    </div>
-  {% endif %}
-
-  <hr/>
-
-  <div role="contentinfo">
-    <p>
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-      {%- endif %}
-    {%- endif %}
-
-    {%- if build_id and build_url %}
-      {% trans build_url=build_url, build_id=build_id %}
-        <span class="build">
-          Build
-          <a href="{{ build_url }}">{{ build_id }}</a>.
-        </span>
-      {% endtrans %}
-    {%- elif commit %}
-      {% trans commit=commit %}
-        <span class="commit">
-          Revision <code>{{ commit }}</code>.
-        </span>
-      {% endtrans %}
-    {%- elif last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-
-    </p>
-  </div>
-
-  {%- if show_sphinx %}
-  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
-  {%- endif %}
-
-</footer>
-
diff --git a/doc/_templates/sphinx_rtd_theme/layout.html b/doc/_templates/sphinx_rtd_theme/layout.html
deleted file mode 100644
index eea34ccc..00000000
--- a/doc/_templates/sphinx_rtd_theme/layout.html
+++ /dev/null
@@ -1,207 +0,0 @@
-{# TEMPLATE VAR SETTINGS #}
-{%- set url_root = pathto('', 1) %}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  {{ metatags }}
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  {% block htmltitle %}
-  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {% endblock %}
-
-  {# FAVICON #}
-  {% if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-  {% endif %}
-
-  {# CSS #}
-
-  {# OPENSEARCH #}
-  {% if not embedded %}
-    {% if use_opensearch %}
-      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {% endif %}
-
-  {% endif %}
-
-  {# RTD hosts this file, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-  {% endif %}
-
-  {% for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}
-
-  {% for cssfile in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}
-
-  {%- block linktags %}
-    {%- if hasdoc('about') %}
-        <link rel="author" title="{{ _('About these documents') }}"
-              href="{{ pathto('about') }}"/>
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-        <link rel="index" title="{{ _('Index') }}"
-              href="{{ pathto('genindex') }}"/>
-    {%- endif %}
-    {%- if hasdoc('search') %}
-        <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}"/>
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-        <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}"/>
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}"/>
-    {%- if parents %}
-        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}"/>
-    {%- endif %}
-    {%- if next %}
-        <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}"/>
-    {%- endif %}
-    {%- if prev %}
-        <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}"/>
-    {%- endif %}
-  {%- endblock %}
-  {%- block extrahead %} {% endblock %}
-
-  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
-  <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
-
-</head>
-
-<body class="wy-body-for-nav" role="document">
-
-  <div class="wy-grid-for-nav">
-
-    {# SIDE NAV, TOGGLES ON MOBILE #}
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-nav-search">
-        {% block sidebartitle %}
-
-        {% if logo and theme_logo_only %}
-          <a href="{{ pathto(master_doc) }}">
-        {% else %}
-          <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
-        {% endif %}
-
-        {% if logo %}
-          {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
-          <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
-        {% endif %}
-        </a>
-
-        {% if theme_display_version %}
-          {%- set nav_version = version %}
-          {% if READTHEDOCS and current_version %}
-            {%- set nav_version = current_version %}
-          {% endif %}
-          {% if nav_version %}
-            <div class="version">
-              {{ nav_version }}
-            </div>
-          {% endif %}
-        {% endif %}
-
-        {% include "searchbox.html" %}
-
-        {% endblock %}
-      </div>
-
-      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-        {% block menu %}
-          {% set toctree = toctree(maxdepth=4, collapse=theme_collapse_navigation, includehidden=True) %}
-          {% if toctree %}
-              {{ toctree }}
-          {% else %}
-              <!-- Local TOC -->
-              <div class="local-toc">{{ toc }}</div>
-          {% endif %}
-        {% endblock %}
-      </div>
-      &nbsp;
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="{{ pathto(master_doc) }}">{{ project }}</a>
-      </nav>
-
-
-      {# PAGE CONTENT #}
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          {% include "breadcrumbs.html" %}
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
-            {% block body %}{% endblock %}
-           </div>
-          </div>
-          {% include "footer.html" %}
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  {% include "versions.html" %}
-
-  {% if not embedded %}
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'{{ url_root }}',
-            VERSION:'{{ release|e }}',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-            HAS_SOURCE:  {{ has_source|lower }}
-        };
-    </script>
-    {%- for scriptfile in script_files %}
-      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-
-  {% endif %}
-
-  {# RTD hosts this file, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
-  {% endif %}
-
-  {# STICKY NAVIGATION #}
-  {% if theme_sticky_navigation %}
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-  {% endif %}
-
-  <script>
-      jQuery(function () {
-          jQuery('a.toggle').on('click', function () {
-              var neighbour = jQuery(this).next('div.highlight-php');
-              var verb = neighbour.hasClass("enabled") ? "Show" : "Hide";
-              neighbour.toggleClass("enabled").toggle();
-              $(this).text(verb + " auth code");
-          });
-          jQuery('a.toggle').next('div.highlight-php').hide();
-      });
-  </script>
-
-  {%- block footer %} {% endblock %}
-
-</body>
-</html>
diff --git a/doc/_templates/sphinx_rtd_theme/layout_old.html b/doc/_templates/sphinx_rtd_theme/layout_old.html
deleted file mode 100644
index deb8df2a..00000000
--- a/doc/_templates/sphinx_rtd_theme/layout_old.html
+++ /dev/null
@@ -1,205 +0,0 @@
-{#
-    basic/layout.html
-    ~~~~~~~~~~~~~~~~~
-
-    Master layout template for Sphinx themes.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- block doctype -%}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-{%- endblock %}
-{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
-{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
-                         (sidebars != []) %}
-{%- set url_root = pathto('', 1) %}
-{# XXX necessary? #}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-{%- macro relbar() %}
-    <div class="related">
-      <h3>{{ _('Navigation') }}</h3>
-      <ul>
-        {%- for rellink in rellinks %}
-        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
-          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
-             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
-          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
-        {%- endfor %}
-        {%- block rootrellink %}
-        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
-        {%- endblock %}
-        {%- for parent in parents %}
-          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
-        {%- endfor %}
-        {%- block relbaritems %} {% endblock %}
-      </ul>
-    </div>
-{%- endmacro %}
-
-{%- macro sidebar() %}
-      {%- if render_sidebar %}
-      <div class="sphinxsidebar">
-        <div class="sphinxsidebarwrapper">
-          {%- block sidebarlogo %}
-          {%- if logo %}
-            <p class="logo"><a href="{{ pathto(master_doc) }}">
-              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
-            </a></p>
-          {%- endif %}
-          {%- endblock %}
-          {%- if sidebars != None %}
-            {#- new style sidebar: explicitly include/exclude templates #}
-            {%- for sidebartemplate in sidebars %}
-            {%- include sidebartemplate %}
-            {%- endfor %}
-          {%- else %}
-            {#- old style sidebars: using blocks -- should be deprecated #}
-            {%- block sidebartoc %}
-            {%- include "localtoc.html" %}
-            {%- endblock %}
-            {%- block sidebarrel %}
-            {%- include "relations.html" %}
-            {%- endblock %}
-            {%- block sidebarsourcelink %}
-            {%- include "sourcelink.html" %}
-            {%- endblock %}
-            {%- if customsidebar %}
-            {%- include customsidebar %}
-            {%- endif %}
-            {%- block sidebarsearch %}
-            {%- include "searchbox.html" %}
-            {%- endblock %}
-          {%- endif %}
-        </div>
-      </div>
-      {%- endif %}
-{%- endmacro %}
-
-{%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro css() %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-    {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-    {%- endfor %}
-{%- endmacro %}
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
-    {{ metatags }}
-    {%- block htmltitle %}
-    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-    {%- endblock %}
-    {{ css() }}
-    {%- if not embedded %}
-    {{ script() }}
-    {%- if use_opensearch %}
-    <link rel="search" type="application/opensearchdescription+xml"
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {%- endif %}
-    {%- if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-    {%- endif %}
-    {%- endif %}
-{%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
-    {%- if parents %}
-    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
-    {%- endif %}
-{%- endblock %}
-{%- block extrahead %} {% endblock %}
-  </head>
-  <body>
-{%- block header %}{% endblock %}
-
-{%- block relbar1 %}{{ relbar() }}{% endblock %}
-
-{%- block content %}
-  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
-
-    <div class="document">
-  {%- block document %}
-      <div class="documentwrapper">
-      {%- if render_sidebar %}
-        <div class="bodywrapper">
-      {%- endif %}
-          <div class="body">
-            {% block body %} {% endblock %}
-          </div>
-      {%- if render_sidebar %}
-        </div>
-      {%- endif %}
-      </div>
-  {%- endblock %}
-
-  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
-      <div class="clearer"></div>
-    </div>
-{%- endblock %}
-
-{%- block relbar2 %}{{ relbar() }}{% endblock %}
-
-{%- block footer %}
-    <div class="footer">
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-      {%- endif %}
-    {%- endif %}
-    {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-    {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
-    {%- endif %}
-    </div>
-    <p>asdf asdf asdf asdf 22</p>
-{%- endblock %}
-  </body>
-</html>
-
diff --git a/doc/_templates/sphinx_rtd_theme/search.html b/doc/_templates/sphinx_rtd_theme/search.html
deleted file mode 100644
index e3aa9b5c..00000000
--- a/doc/_templates/sphinx_rtd_theme/search.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{#
-    basic/search.html
-    ~~~~~~~~~~~~~~~~~
-
-    Template for the search page.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- extends "layout.html" %}
-{% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block footer %}
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
-  </script>
-  {# this is used when loading the search index using $.ajax fails,
-     such as on Chrome for documents on localhost #}
-  <script type="text/javascript" id="searchindexloader"></script>
-  {{ super() }}
-{% endblock %}
-{% block body %}
-  <noscript>
-  <div id="fallback" class="admonition warning">
-    <p class="last">
-      {% trans %}Please activate JavaScript to enable the search
-      functionality.{% endtrans %}
-    </p>
-  </div>
-  </noscript>
-
-  {% if search_performed %}
-    <h2>{{ _('Search Results') }}</h2>
-    {% if not search_results %}
-      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
-    {% endif %}
-  {% endif %}
-  <div id="search-results">
-  {% if search_results %}
-    <ul>
-    {% for href, caption, context in search_results %}
-      <li>
-        <a href="{{ pathto(item.href) }}">{{ caption }}</a>
-        <p class="context">{{ context|e }}</p>
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  </div>
-{% endblock %}
diff --git a/doc/_templates/sphinx_rtd_theme/searchbox.html b/doc/_templates/sphinx_rtd_theme/searchbox.html
deleted file mode 100644
index 35ad52c5..00000000
--- a/doc/_templates/sphinx_rtd_theme/searchbox.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{%- if builder != 'singlehtml' %}
-<div role="search">
-  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
-    <input type="hidden" name="check_keywords" value="yes" />
-    <input type="hidden" name="area" value="default" />
-  </form>
-</div>
-{%- endif %}
diff --git a/doc/_templates/sphinx_rtd_theme/static/css/badge_only.css b/doc/_templates/sphinx_rtd_theme/static/css/badge_only.css
deleted file mode 100644
index 7e17fb14..00000000
--- a/doc/_templates/sphinx_rtd_theme/static/css/badge_only.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
-/*# sourceMappingURL=badge_only.css.map */
diff --git a/doc/_templates/sphinx_rtd_theme/static/css/badge_only.css.map b/doc/_templates/sphinx_rtd_theme/static/css/badge_only.css.map
deleted file mode 100644
index b09cc628..00000000
--- a/doc/_templates/sphinx_rtd_theme/static/css/badge_only.css.map
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
-"names": [],
-"file": "badge_only.css"
-}
diff --git a/doc/_templates/sphinx_rtd_theme/static/css/theme.css b/doc/_templates/sphinx_rtd_theme/static/css/theme.css
deleted file mode 100644
index 430c1f45..00000000
--- a/doc/_templates/sphinx_rtd_theme/static/css/theme.css
+++ /dev/null
@@ -1,6 +0,0 @@
-*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content tt,.rst-content code,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:0.2em 0;background:#ccc;color:#000;padding:0.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,.rst-content .toctree-wrapper p.caption,h3{orphans:3;widows:3}h2,.rst-content .toctree-wrapper p.caption,h3{page-break-after:avoid}}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}/*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.2.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.2.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:0.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.wy-menu-vertical li span.pull-left.toctree-expand,.wy-menu-vertical li.on a span.pull-left.toctree-expand,.wy-menu-vertical li.current>a span.pull-left.toctree-expand,.rst-content .pull-left.admonition-title,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content dl dt .pull-left.headerlink,.rst-content p.caption .pull-left.headerlink,.rst-content tt.download span.pull-left:first-child,.rst-content code.download span.pull-left:first-child,.pull-left.icon{margin-right:.3em}.fa.pull-right,.wy-menu-vertical li span.pull-right.toctree-expand,.wy-menu-vertical li.on a span.pull-right.toctree-expand,.wy-menu-vertical li.current>a span.pull-right.toctree-expand,.rst-content .pull-right.admonition-title,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content dl dt .pull-right.headerlink,.rst-content p.caption .pull-right.headerlink,.rst-content tt.download span.pull-right:first-child,.rst-content code.download span.pull-right:first-child,.pull-right.icon{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-remove:before,.fa-close:before,.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before,.fa-bar-chart:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.wy-dropdown .caret:before,.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before,.wy-menu-vertical li span.toctree-expand:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:""}.fa-tty:before{content:""}.fa-binoculars:before{content:""}.fa-plug:before{content:""}.fa-slideshare:before{content:""}.fa-twitch:before{content:""}.fa-yelp:before{content:""}.fa-newspaper-o:before{content:""}.fa-wifi:before{content:""}.fa-calculator:before{content:""}.fa-paypal:before{content:""}.fa-google-wallet:before{content:""}.fa-cc-visa:before{content:""}.fa-cc-mastercard:before{content:""}.fa-cc-discover:before{content:""}.fa-cc-amex:before{content:""}.fa-cc-paypal:before{content:""}.fa-cc-stripe:before{content:""}.fa-bell-slash:before{content:""}.fa-bell-slash-o:before{content:""}.fa-trash:before{content:""}.fa-copyright:before{content:""}.fa-at:before{content:""}.fa-eyedropper:before{content:""}.fa-paint-brush:before{content:""}.fa-birthday-cake:before{content:""}.fa-area-chart:before{content:""}.fa-pie-chart:before{content:""}.fa-line-chart:before{content:""}.fa-lastfm:before{content:""}.fa-lastfm-square:before{content:""}.fa-toggle-off:before{content:""}.fa-toggle-on:before{content:""}.fa-bicycle:before{content:""}.fa-bus:before{content:""}.fa-ioxhost:before{content:""}.fa-angellist:before{content:""}.fa-cc:before{content:""}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:""}.fa-meanpath:before{content:""}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context{font-family:inherit}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before{font-family:"FontAwesome";display:inline-block;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa,a .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink,a .rst-content p.caption .headerlink,.rst-content p.caption a .headerlink,a .rst-content tt.download span:first-child,.rst-content tt.download a span:first-child,a .rst-content code.download span:first-child,.rst-content code.download a span:first-child,a .icon{display:inline-block;text-decoration:inherit}.btn .fa,.btn .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .btn span.toctree-expand,.btn .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .btn span.toctree-expand,.btn .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .btn span.toctree-expand,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.btn .rst-content p.caption .headerlink,.rst-content p.caption .btn .headerlink,.btn .rst-content tt.download span:first-child,.rst-content tt.download .btn span:first-child,.btn .rst-content code.download span:first-child,.rst-content code.download .btn span:first-child,.btn .icon,.nav .fa,.nav .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .nav span.toctree-expand,.nav .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .nav span.toctree-expand,.nav .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .nav span.toctree-expand,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink,.nav .rst-content p.caption .headerlink,.rst-content p.caption .nav .headerlink,.nav .rst-content tt.download span:first-child,.rst-content tt.download .nav span:first-child,.nav .rst-content code.download span:first-child,.rst-content code.download .nav span:first-child,.nav .icon{display:inline}.btn .fa.fa-large,.btn .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .btn span.fa-large.toctree-expand,.btn .rst-content .fa-large.admonition-title,.rst-content .btn .fa-large.admonition-title,.btn .rst-content h1 .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.btn .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .btn .fa-large.headerlink,.btn .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .btn .fa-large.headerlink,.btn .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .btn span.fa-large:first-child,.btn .rst-content code.download span.fa-large:first-child,.rst-content code.download .btn span.fa-large:first-child,.btn .fa-large.icon,.nav .fa.fa-large,.nav .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .nav span.fa-large.toctree-expand,.nav .rst-content .fa-large.admonition-title,.rst-content .nav .fa-large.admonition-title,.nav .rst-content h1 .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.nav .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.nav .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .nav .fa-large.headerlink,.nav .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .nav span.fa-large:first-child,.nav .rst-content code.download span.fa-large:first-child,.rst-content code.download .nav span.fa-large:first-child,.nav .fa-large.icon{line-height:0.9em}.btn .fa.fa-spin,.btn .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .btn span.fa-spin.toctree-expand,.btn .rst-content .fa-spin.admonition-title,.rst-content .btn .fa-spin.admonition-title,.btn .rst-content h1 .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.btn .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .btn .fa-spin.headerlink,.btn .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .btn .fa-spin.headerlink,.btn .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .btn span.fa-spin:first-child,.btn .rst-content code.download span.fa-spin:first-child,.rst-content code.download .btn span.fa-spin:first-child,.btn .fa-spin.icon,.nav .fa.fa-spin,.nav .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .nav span.fa-spin.toctree-expand,.nav .rst-content .fa-spin.admonition-title,.rst-content .nav .fa-spin.admonition-title,.nav .rst-content h1 .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.nav .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.nav .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .nav .fa-spin.headerlink,.nav .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .nav span.fa-spin:first-child,.nav .rst-content code.download span.fa-spin:first-child,.rst-content code.download .nav span.fa-spin:first-child,.nav .fa-spin.icon{display:inline-block}.btn.fa:before,.wy-menu-vertical li span.btn.toctree-expand:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before,.rst-content p.caption .btn.headerlink:before,.rst-content tt.download span.btn:first-child:before,.rst-content code.download span.btn:first-child:before,.btn.icon:before{opacity:0.5;-webkit-transition:opacity 0.05s ease-in;-moz-transition:opacity 0.05s ease-in;transition:opacity 0.05s ease-in}.btn.fa:hover:before,.wy-menu-vertical li span.btn.toctree-expand:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.rst-content p.caption .btn.headerlink:hover:before,.rst-content tt.download span.btn:first-child:hover:before,.rst-content code.download span.btn:first-child:hover:before,.btn.icon:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li .btn-mini span.toctree-expand:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before,.btn-mini .rst-content p.caption .headerlink:before,.rst-content p.caption .btn-mini .headerlink:before,.btn-mini .rst-content tt.download span:first-child:before,.rst-content tt.download .btn-mini span:first-child:before,.btn-mini .rst-content code.download span:first-child:before,.rst-content code.download .btn-mini span:first-child:before,.btn-mini .icon:before{font-size:14px;vertical-align:-15%}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.wy-alert-title,.rst-content .admonition-title{color:#fff;font-weight:bold;display:block;color:#fff;background:#6ab0de;margin:-12px;padding:6px 12px;margin-bottom:12px}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.admonition-todo{background:#fdf3f2}.wy-alert.wy-alert-danger .wy-alert-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .danger .wy-alert-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .danger .admonition-title,.rst-content .error .admonition-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title{background:#f29f97}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning,.rst-content .wy-alert-warning.seealso,.rst-content .admonition-todo{background:#ffedcc}.wy-alert.wy-alert-warning .wy-alert-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .attention .wy-alert-title,.rst-content .caution .wy-alert-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .admonition-todo .wy-alert-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .attention .admonition-title,.rst-content .caution .admonition-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .warning .admonition-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .admonition-todo .admonition-title{background:#f0b37e}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.rst-content .seealso,.rst-content .wy-alert-info.admonition-todo{background:#e7f2fa}.wy-alert.wy-alert-info .wy-alert-title,.rst-content .note .wy-alert-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.rst-content .note .admonition-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .seealso .admonition-title,.rst-content .wy-alert-info.admonition-todo .admonition-title{background:#6ab0de}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.warning,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.admonition-todo{background:#dbfaf4}.wy-alert.wy-alert-success .wy-alert-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .hint .wy-alert-title,.rst-content .important .wy-alert-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .hint .admonition-title,.rst-content .important .admonition-title,.rst-content .tip .admonition-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.admonition-todo .admonition-title{background:#1abc9c}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.admonition-todo{background:#f3f6f6}.wy-alert.wy-alert-neutral .wy-alert-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .admonition-title{color:#404040;background:#e1e4e5}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.admonition-todo a{color:#2980B9}.wy-alert p:last-child,.rst-content .note p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.rst-content .seealso p:last-child,.rst-content .admonition-todo p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0px;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all 0.3s ease-in;-moz-transition:all 0.3s ease-in;transition:all 0.3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27AE60}.wy-tray-container li.wy-tray-item-info{background:#2980B9}.wy-tray-container li.wy-tray-item-warning{background:#E67E22}.wy-tray-container li.wy-tray-item-danger{background:#E74C3C}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width: 768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);background-color:#27AE60;text-decoration:none;font-weight:normal;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset,0px -2px 0px 0px rgba(0,0,0,0.1) inset;outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all 0.1s linear;-moz-transition:all 0.1s linear;transition:all 0.1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:0px -1px 0px 0px rgba(0,0,0,0.05) inset,0px 2px 0px 0px rgba(0,0,0,0.1) inset;padding:8px 12px 6px 12px}.btn:visited{color:#fff}.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980B9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-neutral:visited{color:#404040 !important}.btn-success{background-color:#27AE60 !important}.btn-success:hover{background-color:#295 !important}.btn-danger{background-color:#E74C3C !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#E67E22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f !important}.btn-link{background-color:transparent !important;color:#2980B9;box-shadow:none;border-color:transparent !important}.btn-link:hover{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:active{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:visited{color:#9B59B6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-active .wy-dropdown-menu{display:block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980B9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980B9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;left:auto;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 0.3125em 0;color:#333;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#E74C3C}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full input[type="text"],.wy-control-group .wy-form-full input[type="password"],.wy-control-group .wy-form-full input[type="email"],.wy-control-group .wy-form-full input[type="url"],.wy-control-group .wy-form-full input[type="date"],.wy-control-group .wy-form-full input[type="month"],.wy-control-group .wy-form-full input[type="time"],.wy-control-group .wy-form-full input[type="datetime"],.wy-control-group .wy-form-full input[type="datetime-local"],.wy-control-group .wy-form-full input[type="week"],.wy-control-group .wy-form-full input[type="number"],.wy-control-group .wy-form-full input[type="search"],.wy-control-group .wy-form-full input[type="tel"],.wy-control-group .wy-form-full input[type="color"],.wy-control-group .wy-form-halves input[type="text"],.wy-control-group .wy-form-halves input[type="password"],.wy-control-group .wy-form-halves input[type="email"],.wy-control-group .wy-form-halves input[type="url"],.wy-control-group .wy-form-halves input[type="date"],.wy-control-group .wy-form-halves input[type="month"],.wy-control-group .wy-form-halves input[type="time"],.wy-control-group .wy-form-halves input[type="datetime"],.wy-control-group .wy-form-halves input[type="datetime-local"],.wy-control-group .wy-form-halves input[type="week"],.wy-control-group .wy-form-halves input[type="number"],.wy-control-group .wy-form-halves input[type="search"],.wy-control-group .wy-form-halves input[type="tel"],.wy-control-group .wy-form-halves input[type="color"],.wy-control-group .wy-form-thirds input[type="text"],.wy-control-group .wy-form-thirds input[type="password"],.wy-control-group .wy-form-thirds input[type="email"],.wy-control-group .wy-form-thirds input[type="url"],.wy-control-group .wy-form-thirds input[type="date"],.wy-control-group .wy-form-thirds input[type="month"],.wy-control-group .wy-form-thirds input[type="time"],.wy-control-group .wy-form-thirds input[type="datetime"],.wy-control-group .wy-form-thirds input[type="datetime-local"],.wy-control-group .wy-form-thirds input[type="week"],.wy-control-group .wy-form-thirds input[type="number"],.wy-control-group .wy-form-thirds input[type="search"],.wy-control-group .wy-form-thirds input[type="tel"],.wy-control-group .wy-form-thirds input[type="color"]{width:100%}.wy-control-group .wy-form-full{float:left;display:block;margin-right:2.35765%;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.35765%;width:48.82117%}.wy-control-group .wy-form-halves:last-child{margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n+1){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.35765%;width:31.76157%}.wy-control-group .wy-form-thirds:last-child{margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control{margin:6px 0 0 0;font-size:90%}.wy-control-no-input{display:inline-block;margin:6px 0 0 0;font-size:90%}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:0.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:0.3125em;font-style:italic}.wy-form-message p{font-size:inherit;font-style:italic;margin-bottom:6px}.wy-form-message p:last-child{margin-bottom:0}input{line-height:normal}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}input[type="datetime-local"]{padding:0.34375em 0.625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:0.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#333}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129FEA}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#fafafa}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#E74C3C;border:1px solid #E74C3C}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#E74C3C}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#E74C3C}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}select,textarea{padding:0.5em 0.625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fafafa}input[type="radio"][disabled],input[type="checkbox"][disabled]{cursor:not-allowed}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap;padding:6px}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{line-height:27px;padding:0 8px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-switch{width:36px;height:12px;margin:12px 0;position:relative;border-radius:4px;background:#ccc;cursor:pointer;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:before{position:absolute;content:"";display:block;width:18px;height:18px;border-radius:4px;background:#999;left:-3px;top:-3px;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:after{content:"false";position:absolute;left:48px;display:block;font-size:12px;color:#ccc}.wy-switch.active{background:#1e8449}.wy-switch.active:before{left:24px;background:#27AE60}.wy-switch.active:after{content:"true"}.wy-switch.disabled,.wy-switch.active.disabled{cursor:not-allowed}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#E74C3C}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 1px #E74C3C}.wy-control-group.wy-control-group-error textarea{border:solid 1px #E74C3C}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:0.5em 0.625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27AE60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#E74C3C}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#E67E22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980B9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:0.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0.3em;display:block}.wy-form label{margin-bottom:0.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:0.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-table,.rst-content table.docutils,.rst-content table.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.rst-content table.field-list td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.field-list td p{line-height:18px}.wy-table td p:last-child,.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child{margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980B9;text-decoration:none;cursor:pointer}a:hover{color:#3091d1}a:visited{color:#9B59B6}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#E67E22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980B9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27AE60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#E74C3C !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}h1,h2,.rst-content .toctree-wrapper p.caption,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2,.rst-content .toctree-wrapper p.caption{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}code,.rst-content tt,.rst-content code{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:75%;padding:0 5px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;color:#E74C3C;overflow-x:auto}code.code-large,.rst-content tt.code-large{font-size:90%}.wy-plain-list-disc,.rst-content .section ul,.rst-content .toctree-wrapper ul,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content .toctree-wrapper ul li,article ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li p:last-child,.rst-content .section ul li p:last-child,.rst-content .toctree-wrapper ul li p:last-child,article ul li p:last-child{margin-bottom:0}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li ul,article ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,article ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,article ul li li li{list-style:square}.wy-plain-list-disc li ol li,.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,article ul li ol li{list-style:decimal}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.arabic,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.arabic li,article ol li{list-style:decimal;margin-left:24px}.wy-plain-list-decimal li p:last-child,.rst-content .section ol li p:last-child,.rst-content ol.arabic li p:last-child,article ol li p:last-child{margin-bottom:0}.wy-plain-list-decimal li ul,.rst-content .section ol li ul,.rst-content ol.arabic li ul,article ol li ul{margin-bottom:0}.wy-plain-list-decimal li ul li,.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,article ol li ul li{list-style:disc}.codeblock-example{border:1px solid #e1e4e5;border-bottom:none;padding:24px;padding-top:48px;font-weight:500;background:#fff;position:relative}.codeblock-example:after{content:"Example";position:absolute;top:0px;left:0px;background:#9B59B6;color:#fff;padding:6px 12px}.codeblock-example.prettyprint-example-only{border:1px solid #e1e4e5;margin-bottom:24px}.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight']{border:1px solid #e1e4e5;padding:0px;overflow-x:auto;background:#fff;margin:1px 0 24px 0}.codeblock div[class^='highlight'],pre.literal-block div[class^='highlight'],.rst-content .literal-block div[class^='highlight'],div[class^='highlight'] div[class^='highlight']{border:none;background:none;margin:0}div[class^='highlight'] td.code{width:100%}.linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;color:#d9d9d9}div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;display:block;overflow:auto;color:#404040}@media print{.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight'],div[class^='highlight'] pre{white-space:pre-wrap}}.hll{background-color:#ffc;margin:0 -12px;padding:0 12px;display:block}.c{color:#998;font-style:italic}.err{color:#a61717;background-color:#e3d2d2}.k{font-weight:bold}.o{font-weight:bold}.cm{color:#998;font-style:italic}.cp{color:#999;font-weight:bold}.c1{color:#998;font-style:italic}.cs{color:#999;font-weight:bold;font-style:italic}.gd{color:#000;background-color:#fdd}.gd .x{color:#000;background-color:#faa}.ge{font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000;background-color:#dfd}.gi .x{color:#000;background-color:#afa}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:purple;font-weight:bold}.gt{color:#a00}.kc{font-weight:bold}.kd{font-weight:bold}.kn{font-weight:bold}.kp{font-weight:bold}.kr{font-weight:bold}.kt{color:#458;font-weight:bold}.m{color:#099}.s{color:#d14}.n{color:#333}.na{color:teal}.nb{color:#0086b3}.nc{color:#458;font-weight:bold}.no{color:teal}.ni{color:purple}.ne{color:#900;font-weight:bold}.nf{color:#900;font-weight:bold}.nn{color:#555}.nt{color:navy}.nv{color:teal}.ow{font-weight:bold}.w{color:#bbb}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.sb{color:#d14}.sc{color:#d14}.sd{color:#d14}.s2{color:#d14}.se{color:#d14}.sh{color:#d14}.si{color:#d14}.sx{color:#d14}.sr{color:#009926}.s1{color:#d14}.ss{color:#990073}.bp{color:#999}.vc{color:teal}.vg{color:teal}.vi{color:teal}.il{color:#099}.gc{color:#999;background-color:#EAF2F5}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs li code,.wy-breadcrumbs li .rst-content tt,.rst-content .wy-breadcrumbs li tt{padding:5px;border:none;background:none}.wy-breadcrumbs li code.literal,.wy-breadcrumbs li .rst-content tt.literal,.rst-content .wy-breadcrumbs li tt.literal{color:#404040}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical header,.wy-menu-vertical p.caption{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;margin-bottom:0;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;color:#555;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li code,.wy-menu-vertical li .rst-content tt,.rst-content .wy-menu-vertical li tt{border:none;background:inherit;color:inherit;padding-left:0;padding-right:0}.wy-menu-vertical li span.toctree-expand{display:block;float:left;margin-left:-1.2em;font-size:0.8em;line-height:1.6em;color:#4d4d4d}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:0.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;border-bottom:solid 1px #c9c9c9;border-top:solid 1px #c9c9c9;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.on a:hover span.toctree-expand,.wy-menu-vertical li.current>a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand{display:block;font-size:0.8em;line-height:1.6em;color:#333}.wy-menu-vertical li.toctree-l1.current li.toctree-l2>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3>ul{display:none}.wy-menu-vertical li.toctree-l1.current li.toctree-l2.current>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3.current>ul{display:block}.wy-menu-vertical li.toctree-l2.current>a{background:#c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a{display:block;background:#c9c9c9;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l2 span.toctree-expand{color:#a3a3a3}.wy-menu-vertical li.toctree-l3{font-size:0.9em}.wy-menu-vertical li.toctree-l3.current>a{background:#bdbdbd;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a{display:block;background:#bdbdbd;padding:0.4045em 5.663em;border-top:none;border-bottom:none}.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l3 span.toctree-expand{color:#969696}.wy-menu-vertical li.toctree-l4{font-size:0.9em}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical .local-toc li ul{display:block}.wy-menu-vertical li ul li a{margin-bottom:0;color:#b3b3b3;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:0.4045em 1.618em;display:block;position:relative;font-size:90%;color:#b3b3b3}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:hover span.toctree-expand{color:#b3b3b3}.wy-menu-vertical a:active{background-color:#2980B9;cursor:pointer;color:#fff}.wy-menu-vertical a:active span.toctree-expand{color:#fff}.wy-side-nav-search{z-index:200;background-color:#2980B9;text-align:center;padding:0.809em;display:block;color:#fcfcfc;margin-bottom:0.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto 0.809em auto;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:0.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-side-nav-search>a img.logo,.wy-side-nav-search .wy-dropdown>a img.logo{display:block;margin:0 auto;height:auto;width:auto;border-radius:0;max-width:100%;background:transparent}.wy-side-nav-search>a.icon img.logo,.wy-side-nav-search .wy-dropdown>a.icon img.logo{margin-top:0.85em}.wy-side-nav-search>div.version{margin-top:-0.4045em;margin-bottom:0.809em;font-weight:normal;color:rgba(255,255,255,0.3)}.wy-nav .wy-menu-vertical header{color:#2980B9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980B9;color:#fff}[data-menu-wrap]{-webkit-transition:all 0.2s ease-in;-moz-transition:all 0.2s ease-in;transition:all 0.2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:left repeat-y #fcfcfc;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);background-size:300px 1px}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:fixed;top:0;bottom:0;left:0;padding-bottom:2em;width:300px;overflow-x:hidden;overflow-y:scroll;min-height:100%;background:#343131;z-index:200}.wy-nav-top{display:none;background:#2980B9;color:#fff;padding:0.4045em 0.809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:#999}footer p{margin-bottom:12px}footer span.commit code,footer span.commit .rst-content tt,.rst-content footer span.commit tt{padding:0px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:1em;background:none;border:none;color:#999}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:before,.rst-footer-buttons:after{display:table;content:""}.rst-footer-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:gray;font-size:90%}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1400px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,footer,.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .rst-versions .rst-current-version span.toctree-expand,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content p.caption .headerlink,.rst-content p.caption .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content tt.download span:first-child,.rst-content tt.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .rst-content code.download span:first-child,.rst-content code.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}.rst-content img{max-width:100%;height:auto !important}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure p.caption{font-style:italic}.rst-content div.figure.align-center{text-align:center}.rst-content .section>img,.rst-content .section>a>img{margin-bottom:24px}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content .note .last,.rst-content .attention .last,.rst-content .caution .last,.rst-content .danger .last,.rst-content .error .last,.rst-content .hint .last,.rst-content .important .last,.rst-content .tip .last,.rst-content .warning .last,.rst-content .seealso .last,.rst-content .admonition-todo .last{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,0.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent !important;border-color:rgba(0,0,0,0.1) !important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha li{list-style:upper-alpha}.rst-content .section ol p,.rst-content .section ul p{margin-bottom:12px}.rst-content .line-block{margin-left:24px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content .align-center{margin:auto;display:block}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content .toctree-wrapper p.caption .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink{display:none;visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content .toctree-wrapper p.caption .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after,.rst-content p.caption .headerlink:after{visibility:visible;content:"";font-family:FontAwesome;display:inline-block}.rst-content h1:hover .headerlink,.rst-content h2:hover .headerlink,.rst-content .toctree-wrapper p.caption:hover .headerlink,.rst-content h3:hover .headerlink,.rst-content h4:hover .headerlink,.rst-content h5:hover .headerlink,.rst-content h6:hover .headerlink,.rst-content dl dt:hover .headerlink,.rst-content p.caption:hover .headerlink{display:inline-block}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:solid 1px #e1e4e5}.rst-content .sidebar p,.rst-content .sidebar ul,.rst-content .sidebar dl{font-size:90%}.rst-content .sidebar .last{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;font-weight:bold;background:#e1e4e5;padding:6px 12px;margin:-24px;margin-bottom:24px;font-size:100%}.rst-content .highlighted{background:#F1C40F;display:inline-block;font-weight:bold;padding:0 6px}.rst-content .footnote-reference,.rst-content .citation-reference{vertical-align:super;font-size:90%}.rst-content table.docutils.citation,.rst-content table.docutils.footnote{background:none;border:none;color:#999}.rst-content table.docutils.citation td,.rst-content table.docutils.citation tr,.rst-content table.docutils.footnote td,.rst-content table.docutils.footnote tr{border:none;background-color:transparent !important;white-space:normal}.rst-content table.docutils.citation td.label,.rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}.rst-content table.docutils.citation tt,.rst-content table.docutils.citation code,.rst-content table.docutils.footnote tt,.rst-content table.docutils.footnote code{color:#555}.rst-content table.field-list{border:none}.rst-content table.field-list td{border:none;padding-top:5px}.rst-content table.field-list td>strong{display:inline-block;margin-top:3px}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left;padding-left:0}.rst-content tt,.rst-content tt,.rst-content code{color:#000}.rst-content tt big,.rst-content tt em,.rst-content tt big,.rst-content code big,.rst-content tt em,.rst-content code em{font-size:100% !important;line-height:normal}.rst-content tt.literal,.rst-content tt.literal,.rst-content code.literal{color:#E74C3C}.rst-content tt.xref,a .rst-content tt,.rst-content tt.xref,.rst-content code.xref,a .rst-content tt,a .rst-content code{font-weight:bold;color:#404040}.rst-content a tt,.rst-content a tt,.rst-content a code{color:#2980B9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:bold}.rst-content dl p,.rst-content dl table,.rst-content dl ul,.rst-content dl ol{margin-bottom:12px !important}.rst-content dl dd{margin:0 0 12px 24px}.rst-content dl:not(.docutils){margin-bottom:24px}.rst-content dl:not(.docutils) dt{display:inline-block;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980B9;border-top:solid 3px #6ab0de;padding:6px;position:relative}.rst-content dl:not(.docutils) dt:before{color:#6ab0de}.rst-content dl:not(.docutils) dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dl dt{margin-bottom:6px;border:none;border-left:solid 3px #ccc;background:#f0f0f0;color:gray}.rst-content dl:not(.docutils) dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dt:first-child{margin-top:0}.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) code{font-weight:bold}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) code.descclassname{background-color:transparent;border:none;padding:0;font-size:100% !important}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname{font-weight:bold}.rst-content dl:not(.docutils) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:bold}.rst-content dl:not(.docutils) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-link,.rst-content .viewcode-back{display:inline-block;color:#27AE60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:bold}.rst-content tt.download,.rst-content code.download{background:inherit;padding:inherit;font-family:inherit;font-size:inherit;color:inherit;border:inherit;white-space:inherit}.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{margin-right:4px}@media screen and (max-width: 480px){.rst-content .sidebar{width:100%}}span[id*='MathJax-Span']{color:#404040}.math{text-align:center}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:400;src:local("Inconsolata"),url(../fonts/Inconsolata.ttf) format("truetype")}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:700;src:local("Inconsolata Bold"),local("Inconsolata-Bold"),url(../fonts/Inconsolata-Bold.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:400;src:local("Lato Regular"),local("Lato-Regular"),url(../fonts/Lato-Regular.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:700;src:local("Lato Bold"),local("Lato-Bold"),url(../fonts/Lato-Bold.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:400;src:local("Roboto Slab Regular"),local("RobotoSlab-Regular"),url(../fonts/RobotoSlab-Regular.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:700;src:local("Roboto Slab Bold"),local("RobotoSlab-Bold"),url(../fonts/RobotoSlab-Bold.ttf) format("truetype")}
-.btn.toggle{margin-bottom:15px;}
-/*# sourceMappingURL=theme.css.map */
diff --git a/doc/_templates/sphinx_rtd_theme/static/css/theme.css.map b/doc/_templates/sphinx_rtd_theme/static/css/theme.css.map
deleted file mode 100644
index 2ee14e05..00000000
--- a/doc/_templates/sphinx_rtd_theme/static/css/theme.css.map
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["../../../bower_components/neat/app/assets/stylesheets/grid/_grid.scss","../../../bower_components/bourbon/dist/addons/_prefixer.scss","../../../bower_components/wyrm/sass/wyrm_core/_reset.sass","../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/font-awesome/scss/_path.scss","../../../bower_components/font-awesome/scss/_core.scss","../../../bower_components/font-awesome/scss/_larger.scss","../../../bower_components/font-awesome/scss/_fixed-width.scss","../../../bower_components/font-awesome/scss/_list.scss","../../../bower_components/font-awesome/scss/_variables.scss","../../../bower_components/font-awesome/scss/_bordered-pulled.scss","../../../bower_components/font-awesome/scss/_spinning.scss","../../../bower_components/font-awesome/scss/_rotated-flipped.scss","../../../bower_components/font-awesome/scss/_mixins.scss","../../../bower_components/font-awesome/scss/_stacked.scss","../../../bower_components/font-awesome/scss/_icons.scss","../../../bower_components/wyrm/sass/wyrm_core/_font_icon_defaults.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../bower_components/wyrm/sass/wyrm_core/_alert.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss","../../../bower_components/wyrm/sass/wyrm_core/_button.sass","../../../bower_components/wyrm/sass/wyrm_core/_dropdown.sass","../../../bower_components/wyrm/sass/wyrm_core/_form.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_outer-container.scss","../../../bower_components/neat/app/assets/stylesheets/settings/_grid.scss","../../../bower_components/neat/app/assets/stylesheets/grid/_span-columns.scss","../../../bower_components/wyrm/sass/wyrm_core/_neat_extra.sass","../../../bower_components/wyrm/sass/wyrm_core/_generic.sass","../../../bower_components/wyrm/sass/wyrm_core/_table.sass","../../../bower_components/wyrm/sass/wyrm_core/_type.sass","../../../bower_components/wyrm/sass/wyrm_addons/pygments/_pygments.sass","../../../bower_components/wyrm/sass/wyrm_addons/pygments/_pygments_light.sass","../../../sass/_theme_breadcrumbs.sass","../../../sass/_theme_layout.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_private.scss","../../../sass/_theme_badge.sass","../../../sass/_theme_rst.sass","../../../sass/_theme_mathjax.sass","../../../sass/_theme_font_local.sass"],
-"names": [],
-"file": "theme.css"
-}
diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/FontAwesome.otf b/doc/_templates/sphinx_rtd_theme/static/fonts/FontAwesome.otf
deleted file mode 100644
index 8b0f54e47e1d356dcf1496942a50e228e0f1ee14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 62856
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

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf b/doc/_templates/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
deleted file mode 100644
index 360a232dd09e43114a50814b999f67351cdf9a24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 47064
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

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/Inconsolata.ttf b/doc/_templates/sphinx_rtd_theme/static/fonts/Inconsolata.ttf
deleted file mode 100644
index 4b8a36d249a05a0fe1575dc3d96ef7079dba6b07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 63184
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
TVR6LSBV)!C>1!7IlI4E^;wHNX

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf b/doc/_templates/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
deleted file mode 100644
index e8b9bf6a20e1f67fd0e8b42b25e3f0e627babe39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 82368
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
WwHG^1yNvPL2mL_!h-%}4hyNEi*y0iZ

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf b/doc/_templates/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
deleted file mode 100644
index 7608bc3e0fd03fc3cf3a41501ed9c1b49b773ac4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 81980
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

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf b/doc/_templates/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
deleted file mode 100644
index e6ed0de530e99cc8c0ef6e4a20012ed1533b62d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36596
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
JoZ<2*`445*q+|d9

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf b/doc/_templates/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf
deleted file mode 100644
index 141d6c08c8ec7248a98ac72c921fc54f823dc75c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36276
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
RSg!Ve%a_?+M=YcCe*u#^n}GlT

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot b/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
deleted file mode 100644
index 7c79c6a6bc9a128a2a8eaffbe49a4338625fdbc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38205
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
E0QL`y%>V!Z

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg b/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
deleted file mode 100644
index 45fdf338..00000000
--- a/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
-<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="1792" />
-<glyph unicode="&#xf198;" horiz-adv-x="1792" />
-<glyph unicode="&#xf199;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf b/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index e89738de5eaf8fca33a2f2cdc5cb4929caa62b71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 80652
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

diff --git a/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff b/doc/_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 8c1748aab7a790d510fb3f42a8a8971d96efa79d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44432
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
VoBs<Y3))5i00001Qg^x6008Up2bBN-

diff --git a/doc/_templates/sphinx_rtd_theme/static/js/modernizr.min.js b/doc/_templates/sphinx_rtd_theme/static/js/modernizr.min.js
deleted file mode 100644
index f65d4797..00000000
--- a/doc/_templates/sphinx_rtd_theme/static/js/modernizr.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
- * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-mq-cssclasses-addtest-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function D(a){j.cssText=a}function E(a,b){return D(n.join(a+";")+(b||""))}function F(a,b){return typeof a===b}function G(a,b){return!!~(""+a).indexOf(b)}function H(a,b){for(var d in a){var e=a[d];if(!G(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function I(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:F(f,"function")?f.bind(d||b):f}return!1}function J(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+p.join(d+" ")+d).split(" ");return F(b,"string")||F(b,"undefined")?H(e,b):(e=(a+" "+q.join(d+" ")+d).split(" "),I(e,b,c))}function K(){e.input=function(c){for(var d=0,e=c.length;d<e;d++)u[c[d]]=c[d]in k;return u.list&&(u.list=!!b.createElement("datalist")&&!!a.HTMLDataListElement),u}("autocomplete autofocus list placeholder max min multiple pattern required step".split(" ")),e.inputtypes=function(a){for(var d=0,e,f,h,i=a.length;d<i;d++)k.setAttribute("type",f=a[d]),e=k.type!=="text",e&&(k.value=l,k.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(f)&&k.style.WebkitAppearance!==c?(g.appendChild(k),h=b.defaultView,e=h.getComputedStyle&&h.getComputedStyle(k,null).WebkitAppearance!=="textfield"&&k.offsetHeight!==0,g.removeChild(k)):/^(search|tel)$/.test(f)||(/^(url|email)$/.test(f)?e=k.checkValidity&&k.checkValidity()===!1:e=k.value!=l)),t[a[d]]=!!e;return t}("search tel url email datetime date month week time datetime-local number range color".split(" "))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k=b.createElement("input"),l=":)",m={}.toString,n=" -webkit- -moz- -o- -ms- ".split(" "),o="Webkit Moz O ms",p=o.split(" "),q=o.toLowerCase().split(" "),r={svg:"http://www.w3.org/2000/svg"},s={},t={},u={},v=[],w=v.slice,x,y=function(a,c,d,e){var f,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:h+(d+1),l.appendChild(j);return f=["&#173;",'<style id="s',h,'">',a,"</style>"].join(""),l.id=h,(m?l:n).innerHTML+=f,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=g.style.overflow,g.style.overflow="hidden",g.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),g.style.overflow=k),!!i},z=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b).matches;var d;return y("@media "+b+" { #"+h+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},A=function(){function d(d,e){e=e||b.createElement(a[d]||"div"),d="on"+d;var f=d in e;return f||(e.setAttribute||(e=b.createElement("div")),e.setAttribute&&e.removeAttribute&&(e.setAttribute(d,""),f=F(e[d],"function"),F(e[d],"undefined")||(e[d]=c),e.removeAttribute(d))),e=null,f}var a={select:"input",change:"input",submit:"form",reset:"form",error:"img",load:"img",abort:"img"};return d}(),B={}.hasOwnProperty,C;!F(B,"undefined")&&!F(B.call,"undefined")?C=function(a,b){return B.call(a,b)}:C=function(a,b){return b in a&&F(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=w.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(w.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(w.call(arguments)))};return e}),s.flexbox=function(){return J("flexWrap")},s.canvas=function(){var a=b.createElement("canvas");return!!a.getContext&&!!a.getContext("2d")},s.canvastext=function(){return!!e.canvas&&!!F(b.createElement("canvas").getContext("2d").fillText,"function")},s.webgl=function(){return!!a.WebGLRenderingContext},s.touch=function(){var c;return"ontouchstart"in a||a.DocumentTouch&&b instanceof DocumentTouch?c=!0:y(["@media (",n.join("touch-enabled),("),h,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(a){c=a.offsetTop===9}),c},s.geolocation=function(){return"geolocation"in navigator},s.postmessage=function(){return!!a.postMessage},s.websqldatabase=function(){return!!a.openDatabase},s.indexedDB=function(){return!!J("indexedDB",a)},s.hashchange=function(){return A("hashchange",a)&&(b.documentMode===c||b.documentMode>7)},s.history=function(){return!!a.history&&!!history.pushState},s.draganddrop=function(){var a=b.createElement("div");return"draggable"in a||"ondragstart"in a&&"ondrop"in a},s.websockets=function(){return"WebSocket"in a||"MozWebSocket"in a},s.rgba=function(){return D("background-color:rgba(150,255,150,.5)"),G(j.backgroundColor,"rgba")},s.hsla=function(){return D("background-color:hsla(120,40%,100%,.5)"),G(j.backgroundColor,"rgba")||G(j.backgroundColor,"hsla")},s.multiplebgs=function(){return D("background:url(https://),url(https://),red url(https://)"),/(url\s*\(.*?){3}/.test(j.background)},s.backgroundsize=function(){return J("backgroundSize")},s.borderimage=function(){return J("borderImage")},s.borderradius=function(){return J("borderRadius")},s.boxshadow=function(){return J("boxShadow")},s.textshadow=function(){return b.createElement("div").style.textShadow===""},s.opacity=function(){return E("opacity:.55"),/^0.55$/.test(j.opacity)},s.cssanimations=function(){return J("animationName")},s.csscolumns=function(){return J("columnCount")},s.cssgradients=function(){var a="background-image:",b="gradient(linear,left top,right bottom,from(#9f9),to(white));",c="linear-gradient(left top,#9f9, white);";return D((a+"-webkit- ".split(" ").join(b+a)+n.join(c+a)).slice(0,-a.length)),G(j.backgroundImage,"gradient")},s.cssreflections=function(){return J("boxReflect")},s.csstransforms=function(){return!!J("transform")},s.csstransforms3d=function(){var a=!!J("perspective");return a&&"webkitPerspective"in g.style&&y("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(b,c){a=b.offsetLeft===9&&b.offsetHeight===3}),a},s.csstransitions=function(){return J("transition")},s.fontface=function(){var a;return y('@font-face {font-family:"font";src:url("https://")}',function(c,d){var e=b.getElementById("smodernizr"),f=e.sheet||e.styleSheet,g=f?f.cssRules&&f.cssRules[0]?f.cssRules[0].cssText:f.cssText||"":"";a=/src/i.test(g)&&g.indexOf(d.split(" ")[0])===0}),a},s.generatedcontent=function(){var a;return y(["#",h,"{font:0/0 a}#",h,':after{content:"',l,'";visibility:hidden;font:3px/1 a}'].join(""),function(b){a=b.offsetHeight>=3}),a},s.video=function(){var a=b.createElement("video"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),c.h264=a.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),c.webm=a.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")}catch(d){}return c},s.audio=function(){var a=b.createElement("audio"),c=!1;try{if(c=!!a.canPlayType)c=new Boolean(c),c.ogg=a.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),c.mp3=a.canPlayType("audio/mpeg;").replace(/^no$/,""),c.wav=a.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),c.m4a=(a.canPlayType("audio/x-m4a;")||a.canPlayType("audio/aac;")).replace(/^no$/,"")}catch(d){}return c},s.localstorage=function(){try{return localStorage.setItem(h,h),localStorage.removeItem(h),!0}catch(a){return!1}},s.sessionstorage=function(){try{return sessionStorage.setItem(h,h),sessionStorage.removeItem(h),!0}catch(a){return!1}},s.webworkers=function(){return!!a.Worker},s.applicationcache=function(){return!!a.applicationCache},s.svg=function(){return!!b.createElementNS&&!!b.createElementNS(r.svg,"svg").createSVGRect},s.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==r.svg},s.smil=function(){return!!b.createElementNS&&/SVGAnimate/.test(m.call(b.createElementNS(r.svg,"animate")))},s.svgclippaths=function(){return!!b.createElementNS&&/SVGClipPath/.test(m.call(b.createElementNS(r.svg,"clipPath")))};for(var L in s)C(s,L)&&(x=L.toLowerCase(),e[x]=s[L](),v.push((e[x]?"":"no-")+x));return e.input||K(),e.addTest=function(a,b){if(typeof a=="object")for(var d in a)C(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},D(""),i=k=null,function(a,b){function k(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e<g;e++)d.createElement(f[e]);return d}function p(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return r.shivMethods?n(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+l().join().replace(/\w+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(r,b.frag)}function q(a){a||(a=b);var c=m(a);return r.shivCSS&&!f&&!c.hasCSS&&(c.hasCSS=!!k(a,"article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}")),j||p(a,c),a}var c=a.html5||{},d=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,e=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,f,g="_html5shiv",h=0,i={},j;(function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,e._prefixes=n,e._domPrefixes=q,e._cssomPrefixes=p,e.mq=z,e.hasEvent=A,e.testProp=function(a){return H([a])},e.testAllProps=J,e.testStyles=y,e.prefixed=function(a,b,c){return b?J(a,b,c):J(a,"pfx")},g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+v.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}}(this,document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
diff --git a/doc/_templates/sphinx_rtd_theme/static/js/theme.js b/doc/_templates/sphinx_rtd_theme/static/js/theme.js
deleted file mode 100644
index f9c3949b..00000000
--- a/doc/_templates/sphinx_rtd_theme/static/js/theme.js
+++ /dev/null
@@ -1,131 +0,0 @@
-function toggleCurrent (elem) {
-    var parent_li = elem.closest('li');
-    parent_li.siblings('li.current').removeClass('current');
-    parent_li.siblings().find('li.current').removeClass('current');
-    parent_li.find('> ul li.current').removeClass('current');
-    parent_li.toggleClass('current');
-}
-
-$(document).ready(function() {
-    // Shift nav in mobile when clicking the menu.
-    $(document).on('click', "[data-toggle='wy-nav-top']", function() {
-        $("[data-toggle='wy-nav-shift']").toggleClass("shift");
-        $("[data-toggle='rst-versions']").toggleClass("shift");
-    });
-    // Nav menu link click operations
-    $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
-        var target = $(this);
-        // Close menu when you click a link.
-        $("[data-toggle='wy-nav-shift']").removeClass("shift");
-        $("[data-toggle='rst-versions']").toggleClass("shift");
-        // Handle dynamic display of l3 and l4 nav lists
-        toggleCurrent(target);
-        if (typeof(window.SphinxRtdTheme) != 'undefined') {
-            window.SphinxRtdTheme.StickyNav.hashChange();
-        }
-    });
-    $(document).on('click', "[data-toggle='rst-current-version']", function() {
-        $("[data-toggle='rst-versions']").toggleClass("shift-up");
-    });
-    // Make tables responsive
-    $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
-
-    // Add expand links to all parents of nested ul
-    $('.wy-menu-vertical ul').not('.simple').siblings('a').each(function () {
-        var link = $(this);
-            expand = $('<span class="toctree-expand"></span>');
-        expand.on('click', function (ev) {
-            toggleCurrent(link);
-            ev.stopPropagation();
-            return false;
-        });
-        link.prepend(expand);
-    });
-});
-
-// Sphinx theme state
-window.SphinxRtdTheme = (function (jquery) {
-    var stickyNav = (function () {
-        var navBar,
-            win,
-            winScroll = false,
-            winResize = false,
-            linkScroll = false,
-            winPosition = 0,
-            winHeight,
-            docHeight,
-            enable = function () {
-                init();
-                reset();
-                win.on('hashchange', reset);
-
-                // Set scroll monitor
-                win.on('scroll', function () {
-                    if (!linkScroll) {
-                        winScroll = true;
-                    }
-                });
-                setInterval(function () { if (winScroll) scroll(); }, 25);
-
-                // Set resize monitor
-                win.on('resize', function () {
-                    winResize = true;
-                });
-                setInterval(function () { if (winResize) resize(); }, 25);
-                resize();
-            },
-            init = function () {
-                navBar = jquery('nav.wy-nav-side:first');
-                win = jquery(window);
-            },
-            reset = function () {
-                // Get anchor from URL and open up nested nav
-                var anchor = encodeURI(window.location.hash);
-                if (anchor) {
-                    try {
-                        var link = $('.wy-menu-vertical')
-                            .find('[href="' + anchor + '"]');
-                        $('.wy-menu-vertical li.toctree-l1 li.current')
-                            .removeClass('current');
-                        link.closest('li.toctree-l2').addClass('current');
-                        link.closest('li.toctree-l3').addClass('current');
-                        link.closest('li.toctree-l4').addClass('current');
-                    }
-                    catch (err) {
-                        console.log("Error expanding nav for anchor", err);
-                    }
-                }
-            },
-            scroll = function () {
-                winScroll = false;
-                var newWinPosition = win.scrollTop(),
-                    winBottom = newWinPosition + winHeight,
-                    navPosition = navBar.scrollTop(),
-                    newNavPosition = navPosition + (newWinPosition - winPosition);
-                if (newWinPosition < 0 || winBottom > docHeight) {
-                    return;
-                }
-                navBar.scrollTop(newNavPosition);
-                winPosition = newWinPosition;
-            },
-            resize = function () {
-                winResize = false;
-                winHeight = win.height();
-                docHeight = $(document).height();
-            },
-            hashChange = function () {
-                linkScroll = true;
-                win.one('hashchange', function () {
-                    linkScroll = false;
-                });
-            };
-        jquery(init);
-        return {
-            enable: enable,
-            hashChange: hashChange
-        };
-    }());
-    return {
-        StickyNav: stickyNav
-    };
-}($));
diff --git a/doc/_templates/sphinx_rtd_theme/theme.conf b/doc/_templates/sphinx_rtd_theme/theme.conf
deleted file mode 100644
index 3896d4d3..00000000
--- a/doc/_templates/sphinx_rtd_theme/theme.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = css/theme.css
-
-[options]
-typekit_id = hiw1hhg
-analytics_id = 
-sticky_navigation = False
-logo_only =
-collapse_navigation = False
-display_version = True
diff --git a/doc/_templates/sphinx_rtd_theme/versions.html b/doc/_templates/sphinx_rtd_theme/versions.html
deleted file mode 100644
index 8b3eb79d..00000000
--- a/doc/_templates/sphinx_rtd_theme/versions.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% if READTHEDOCS %}
-{# Add rst-badge after rst-versions for small badge style. #}
-  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      <span class="fa fa-book"> Read the Docs</span>
-      v: {{ current_version }}
-      <span class="fa fa-caret-down"></span>
-    </span>
-    <div class="rst-other-versions">
-      <dl>
-        <dt>Versions</dt>
-        {% for slug, url in versions %}
-          <dd><a href="{{ url }}">{{ slug }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>Downloads</dt>
-        {% for type, url in downloads %}
-          <dd><a href="{{ url }}">{{ type }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>On Read the Docs</dt>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">Project Home</a>
-          </dd>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">Builds</a>
-          </dd>
-      </dl>
-      <hr/>
-      Free document hosting provided by <a href="http://www.readthedocs.org">Read the Docs</a>.
-
-    </div>
-  </div>
-{% endif %}
-
diff --git a/doc/conf.py b/doc/conf.py
index 917c7d00..16f6c857 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -34,7 +34,7 @@
 pygments_style = 'sphinx'
 
 html_theme = 'sphinx_rtd_theme'
-html_theme_path = ["_templates", ]
+# html_theme_path = ["_templates", ]
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'php-openclouddoc'
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 44f7df3f..6c439f25 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1 +1,2 @@
 sphinxcontrib-phpdomain>=0.11.0
+sphinx-rtd-theme>=0.5.1
\ No newline at end of file
diff --git a/doc/services/block-storage/v2/snapshots.rst b/doc/services/block-storage/v2/snapshots.rst
index 2ad7a512..5365d635 100644
--- a/doc/services/block-storage/v2/snapshots.rst
+++ b/doc/services/block-storage/v2/snapshots.rst
@@ -15,9 +15,11 @@ List volumes sorted
 ~~~~~~~~~~~~~~~~~~~
 
 Possible values for sort_key are:
+
 * display_name
 
 Possible values for sort_dir are:
+
 * asc
 * desc
 
diff --git a/doc/services/images/v2/images.rst b/doc/services/images/v2/images.rst
index 0020d758..d01af019 100644
--- a/doc/services/images/v2/images.rst
+++ b/doc/services/images/v2/images.rst
@@ -21,9 +21,11 @@ List images sorted
 -----------
 
 Possible values for sort_key are:
+
 * name
 
 Possible values for sort_dir are:
+
 * asc
 * desc
 

From a5ecd5402b6de7c8019a8486d4e64aa3d94e4945 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 20 Dec 2023 14:14:19 +0100
Subject: [PATCH 060/102] added phpdocs for better type hinting (#376)

---
 src/BlockStorage/v2/Models/Snapshot.php           |  2 ++
 src/BlockStorage/v2/Models/Volume.php             |  2 ++
 src/BlockStorage/v2/Models/VolumeType.php         |  2 ++
 src/BlockStorage/v2/Service.php                   |  7 +++++++
 src/Common/Resource/AbstractResource.php          |  2 +-
 src/Common/Resource/Creatable.php                 |  2 +-
 src/Common/Resource/Listable.php                  |  2 +-
 src/Common/Resource/OperatorResource.php          |  9 ++++++++-
 src/Common/Resource/ResourceInterface.php         |  8 +++++---
 src/Compute/v2/Models/Keypair.php                 |  3 +++
 src/Compute/v2/Models/Server.php                  |  6 ++++++
 src/Compute/v2/Service.php                        |  7 +++++++
 src/Identity/v3/Models/Domain.php                 |  2 ++
 src/Identity/v3/Models/Group.php                  |  1 +
 src/Identity/v3/Models/Project.php                |  2 ++
 src/Identity/v3/Models/User.php                   |  6 ++++++
 src/Identity/v3/Service.php                       | 11 +++++++++++
 src/Images/v2/Models/Image.php                    |  6 ++++++
 src/Images/v2/Models/Member.php                   |  3 +++
 src/Images/v2/Service.php                         |  3 +++
 src/Metric/v1/Gnocchi/Models/Resource.php         |  1 +
 src/Metric/v1/Gnocchi/Service.php                 |  4 ++++
 .../v2/Extensions/Layer3/Models/FloatingIp.php    |  3 +++
 .../v2/Extensions/Layer3/Models/Router.php        |  3 +++
 src/Networking/v2/Extensions/Layer3/Service.php   |  6 ++++++
 .../v2/Extensions/SecurityGroups/Service.php      |  7 +++++++
 src/Networking/v2/Service.php                     | 15 +++++++++++++++
 src/ObjectStore/v1/Models/Container.php           |  5 +++--
 src/ObjectStore/v1/Models/StorageObject.php       |  4 ++--
 src/ObjectStore/v1/Service.php                    |  1 +
 30 files changed, 124 insertions(+), 11 deletions(-)

diff --git a/src/BlockStorage/v2/Models/Snapshot.php b/src/BlockStorage/v2/Models/Snapshot.php
index f36dbeba..fbf266c4 100644
--- a/src/BlockStorage/v2/Models/Snapshot.php
+++ b/src/BlockStorage/v2/Models/Snapshot.php
@@ -84,6 +84,8 @@ public function retrieve()
     }
 
     /**
+     * {@inheritdoc}
+     *
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postSnapshots}
      */
     public function create(array $userOptions): Creatable
diff --git a/src/BlockStorage/v2/Models/Volume.php b/src/BlockStorage/v2/Models/Volume.php
index 55e886b6..7e377f67 100644
--- a/src/BlockStorage/v2/Models/Volume.php
+++ b/src/BlockStorage/v2/Models/Volume.php
@@ -110,6 +110,8 @@ public function retrieve()
     }
 
     /**
+     * {@inheritdoc}
+     *
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postVolumes}
      */
     public function create(array $userOptions): Creatable
diff --git a/src/BlockStorage/v2/Models/VolumeType.php b/src/BlockStorage/v2/Models/VolumeType.php
index c54425e2..d85ecb93 100644
--- a/src/BlockStorage/v2/Models/VolumeType.php
+++ b/src/BlockStorage/v2/Models/VolumeType.php
@@ -25,6 +25,8 @@ class VolumeType extends OperatorResource implements Listable, Creatable, Update
     protected $resourcesKey = 'volume_types';
 
     /**
+     * {@inheritdoc}
+     *
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postTypes}
      */
     public function create(array $userOptions): Creatable
diff --git a/src/BlockStorage/v2/Service.php b/src/BlockStorage/v2/Service.php
index 5df79b55..b731d2c2 100644
--- a/src/BlockStorage/v2/Service.php
+++ b/src/BlockStorage/v2/Service.php
@@ -31,6 +31,7 @@ public function createVolume(array $userOptions): Volume
      *
      * @param bool  $detail      if set to TRUE, more information will be returned
      * @param array $userOptions {@see Api::getVolumes}
+     * @return \Generator<mixed, \OpenStack\BlockStorage\v2\Models\Volume>
      */
     public function listVolumes(bool $detail = false, array $userOptions = []): \Generator
     {
@@ -58,6 +59,9 @@ public function createVolumeType(array $userOptions): VolumeType
         return $this->model(VolumeType::class)->create($userOptions);
     }
 
+    /**
+     * @return \Generator<mixed, \OpenStack\BlockStorage\v2\Models\VolumeType>
+     */
     public function listVolumeTypes(): \Generator
     {
         return $this->model(VolumeType::class)->enumerate($this->api->getTypes(), []);
@@ -79,6 +83,9 @@ public function createSnapshot(array $userOptions): Snapshot
         return $this->model(Snapshot::class)->create($userOptions);
     }
 
+    /**
+     * @return \Generator<mixed, \OpenStack\BlockStorage\v2\Models\Snapshot>
+     */
     public function listSnapshots(bool $detail = false, array $userOptions = []): \Generator
     {
         $def = (true === $detail) ? $this->api->getSnapshotsDetail() : $this->api->getSnapshots();
diff --git a/src/Common/Resource/AbstractResource.php b/src/Common/Resource/AbstractResource.php
index 2dcf5632..75f2b1ba 100644
--- a/src/Common/Resource/AbstractResource.php
+++ b/src/Common/Resource/AbstractResource.php
@@ -55,7 +55,7 @@ public function populateFromResponse(ResponseInterface $response)
     /**
      * Populates the current resource from a data array.
      *
-     * @return mixed|void
+     * @return self
      */
     public function populateFromArray(array $array)
     {
diff --git a/src/Common/Resource/Creatable.php b/src/Common/Resource/Creatable.php
index 80ac7570..d07280b0 100644
--- a/src/Common/Resource/Creatable.php
+++ b/src/Common/Resource/Creatable.php
@@ -12,7 +12,7 @@ interface Creatable
     /**
      * Create a new resource according to the configuration set in the options.
      *
-     * @return self
+     * @return static
      */
     public function create(array $userOptions): Creatable;
 }
diff --git a/src/Common/Resource/Listable.php b/src/Common/Resource/Listable.php
index 9b8744ee..a19499e3 100644
--- a/src/Common/Resource/Listable.php
+++ b/src/Common/Resource/Listable.php
@@ -22,7 +22,7 @@ interface Listable
      * @param array    $userVals The user values
      * @param callable $mapFn    an optional callback that will be executed on every resource iteration
      *
-     * @returns void
+     * @returns \Generator<mixed, static>
      */
     public function enumerate(array $def, array $userVals = [], callable $mapFn = null);
 }
diff --git a/src/Common/Resource/OperatorResource.php b/src/Common/Resource/OperatorResource.php
index 35cf3186..11414e28 100644
--- a/src/Common/Resource/OperatorResource.php
+++ b/src/Common/Resource/OperatorResource.php
@@ -68,7 +68,9 @@ private function getResourcesKey(): string
     }
 
     /**
-     * {@inheritdoc}
+     * Creates a generator for enumerating over a collection of resources returned by the request.
+     *
+     * @returns \Generator<mixed, static>
      */
     public function enumerate(array $def, array $userVals = [], callable $mapFn = null): \Generator
     {
@@ -101,6 +103,11 @@ public function enumerate(array $def, array $userVals = [], callable $mapFn = nu
         return $iterator();
     }
 
+    /**
+     * Extracts multiple instances of the current resource from a response.
+     *
+     * @return array<self>
+     */
     public function extractMultipleInstances(ResponseInterface $response, string $key = null): array
     {
         $key           = $key ?: $this->getResourcesKey();
diff --git a/src/Common/Resource/ResourceInterface.php b/src/Common/Resource/ResourceInterface.php
index ae3249dd..346ec267 100644
--- a/src/Common/Resource/ResourceInterface.php
+++ b/src/Common/Resource/ResourceInterface.php
@@ -15,21 +15,23 @@ interface ResourceInterface
      * All models which represent an API resource should be able to be populated
      * from a {@see ResponseInterface} object.
      *
+     * @param \Psr\Http\Message\ResponseInterface $response
      * @return self
      */
     public function populateFromResponse(ResponseInterface $response);
 
     /**
-     * @return mixed
+     * @return self
      */
     public function populateFromArray(array $data);
 
     /**
-     * @param string $name the name of the model class
+     * @template T of \OpenStack\Common\Resource\ResourceInterface
+     * @param class-string<T> $class the name of the model class
      * @param mixed  $data either a {@see ResponseInterface} or data array that will populate the newly
      *                     created model class
      *
-     * @return \OpenStack\Common\Resource\ResourceInterface
+     * @return T
      */
     public function model(string $class, $data = null): ResourceInterface;
 }
diff --git a/src/Compute/v2/Models/Keypair.php b/src/Compute/v2/Models/Keypair.php
index 065052e2..61c17865 100644
--- a/src/Compute/v2/Models/Keypair.php
+++ b/src/Compute/v2/Models/Keypair.php
@@ -75,6 +75,9 @@ public function retrieve()
         $this->populateFromResponse($response);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postKeypair(), $userOptions);
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index e2390fd4..85ab5c35 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -394,6 +394,8 @@ public function listAddresses(array $options = []): array
 
     /**
      * Returns Generator for InterfaceAttachment.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\InterfaceAttachment>
      */
     public function listInterfaceAttachments(array $options = []): \Generator
     {
@@ -541,6 +543,8 @@ public function parseMetadata(ResponseInterface $response): array
 
     /**
      * Returns Generator for SecurityGroups.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup>
      */
     public function listSecurityGroups(): \Generator
     {
@@ -549,6 +553,8 @@ public function listSecurityGroups(): \Generator
 
     /**
      * Returns Generator for VolumeAttachment.
+     *
+     * @return \Generator<mixed, \OpenStack\BlockStorage\v2\Models\VolumeAttachment>
      */
     public function listVolumeAttachments(): \Generator
     {
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index a67e33eb..3d39c3de 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -41,6 +41,7 @@ public function createServer(array $options): Server
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getServers}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
+     * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Server>
      */
     public function listServers(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
     {
@@ -73,6 +74,7 @@ public function getServer(array $options = []): Server
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getFlavors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
      * @param bool     $detailed set to true to fetch flavors' details
+     * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Flavor>
      */
     public function listFlavors(array $options = [], callable $mapFn = null, bool $detailed = false): \Generator
     {
@@ -112,6 +114,7 @@ public function createFlavor(array $options = []): Flavor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getImages}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Image>
      */
     public function listImages(array $options = [], callable $mapFn = null): \Generator
     {
@@ -139,6 +142,7 @@ public function getImage(array $options = []): Image
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getKeyPairs}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Keypair>
      */
     public function listKeypairs(array $options = [], callable $mapFn = null): \Generator
     {
@@ -193,6 +197,7 @@ public function getHypervisorStatistics(): HypervisorStatistic
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getHypervisors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
+     * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Hypervisor>
      */
     public function listHypervisors(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
     {
@@ -216,6 +221,7 @@ public function getHypervisor(array $options = []): Hypervisor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getHosts}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Host>
      */
     public function listHosts(array $options = [], callable $mapFn = null): \Generator
     {
@@ -245,6 +251,7 @@ public function getHost(array $options = []): Host
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getAvailabilityZones}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @return \Generator<mixed, \OpenStack\Compute\v2\Models\AvailabilityZone>
      */
     public function listAvailabilityZones(array $options = [], callable $mapFn = null): \Generator
     {
diff --git a/src/Identity/v3/Models/Domain.php b/src/Identity/v3/Models/Domain.php
index 9118d38f..83263ef9 100644
--- a/src/Identity/v3/Models/Domain.php
+++ b/src/Identity/v3/Models/Domain.php
@@ -75,6 +75,7 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getUserRoles}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listUserRoles(array $options = []): \Generator
     {
@@ -115,6 +116,7 @@ public function revokeUserRole(array $options = [])
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupRoles}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listGroupRoles(array $options = []): \Generator
     {
diff --git a/src/Identity/v3/Models/Group.php b/src/Identity/v3/Models/Group.php
index 8bfee36b..2854a92a 100644
--- a/src/Identity/v3/Models/Group.php
+++ b/src/Identity/v3/Models/Group.php
@@ -77,6 +77,7 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupUsers}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\User>
      */
     public function listUsers(array $options = []): \Generator
     {
diff --git a/src/Identity/v3/Models/Project.php b/src/Identity/v3/Models/Project.php
index 62041c69..68beb3ce 100644
--- a/src/Identity/v3/Models/Project.php
+++ b/src/Identity/v3/Models/Project.php
@@ -87,6 +87,7 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectUserRoles}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listUserRoles(array $options = []): \Generator
     {
@@ -127,6 +128,7 @@ public function revokeUserRole(array $options)
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectGroupRoles}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listGroupRoles(array $options = []): \Generator
     {
diff --git a/src/Identity/v3/Models/User.php b/src/Identity/v3/Models/User.php
index 81aa561e..fb9480a1 100644
--- a/src/Identity/v3/Models/User.php
+++ b/src/Identity/v3/Models/User.php
@@ -86,6 +86,9 @@ public function delete()
         $this->execute($this->api->deleteUser(), ['id' => $this->id]);
     }
 
+    /**
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Group>
+     */
     public function listGroups(): \Generator
     {
         $options['id'] = $this->id;
@@ -93,6 +96,9 @@ public function listGroups(): \Generator
         return $this->model(Group::class)->enumerate($this->api->getUserGroups(), $options);
     }
 
+    /**
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Project>
+     */
     public function listProjects(): \Generator
     {
         return $this->model(Project::class)->enumerate($this->api->getUserProjects(), ['id' => $this->id]);
diff --git a/src/Identity/v3/Service.php b/src/Identity/v3/Service.php
index ca16aac5..fd6fa07e 100644
--- a/src/Identity/v3/Service.php
+++ b/src/Identity/v3/Service.php
@@ -128,6 +128,7 @@ public function createService(array $options): Models\Service
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getServices}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Service>
      */
     public function listServices(array $options = []): \Generator
     {
@@ -172,6 +173,7 @@ public function getEndpoint(string $id): Models\Endpoint
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getEndpoints}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Endpoint>
      */
     public function listEndpoints(array $options = []): \Generator
     {
@@ -194,6 +196,7 @@ public function createDomain(array $options): Models\Domain
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getDomains}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Domain>
      */
     public function listDomains(array $options = []): \Generator
     {
@@ -227,6 +230,7 @@ public function createProject(array $options): Models\Project
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjects}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Project>
      */
     public function listProjects(array $options = []): \Generator
     {
@@ -260,6 +264,7 @@ public function createUser(array $options): Models\User
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getUsers}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\User>
      */
     public function listUsers(array $options = []): \Generator
     {
@@ -293,6 +298,7 @@ public function createGroup(array $options): Models\Group
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroups}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Group>
      */
     public function listGroups(array $options = []): \Generator
     {
@@ -324,6 +330,8 @@ public function createCredential(array $options): Models\Credential
      * Returns a generator which will yield a collection of credential objects. The elements which generators yield can
      * be accessed using a foreach loop. Often the API will not return the full state of the resource in collections;
      * you will need to use retrieve() to pull in the full state of the remote resource from the API.
+     *
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Credential>
      */
     public function listCredentials(): \Generator
     {
@@ -357,6 +365,7 @@ public function createRole(array $options): Models\Role
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getRoles}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listRoles(array $options = []): \Generator
     {
@@ -369,6 +378,7 @@ public function listRoles(array $options = []): \Generator
      * collections; you will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getRoleAssignments}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Assignment>
      */
     public function listRoleAssignments(array $options = []): \Generator
     {
@@ -391,6 +401,7 @@ public function createPolicy(array $options): Models\Policy
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getPolicies}
+     * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Policy>
      */
     public function listPolicies(array $options = []): \Generator
     {
diff --git a/src/Images/v2/Models/Image.php b/src/Images/v2/Models/Image.php
index 8c0e8862..6cf172cf 100644
--- a/src/Images/v2/Models/Image.php
+++ b/src/Images/v2/Models/Image.php
@@ -115,6 +115,9 @@ public function populateFromArray(array $data): self
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $data): Creatable
     {
         $response = $this->execute($this->api->postImages(), $data);
@@ -213,6 +216,9 @@ public function addMember($memberId): Member
         return $this->model(Member::class, ['imageId' => $this->id, 'id' => $memberId])->create([]);
     }
 
+    /**
+     * @return \Generator<mixed, \OpenStack\Images\v2\Models\Member>
+     */
     public function listMembers(): \Generator
     {
         return $this->model(Member::class)->enumerate($this->api->getImageMembers(), ['imageId' => $this->id]);
diff --git a/src/Images/v2/Models/Member.php b/src/Images/v2/Models/Member.php
index c3cb00b7..4b6c6dbb 100644
--- a/src/Images/v2/Models/Member.php
+++ b/src/Images/v2/Models/Member.php
@@ -54,6 +54,9 @@ protected function getAliases(): array
         ];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->executeWithState($this->api->postImageMembers());
diff --git a/src/Images/v2/Service.php b/src/Images/v2/Service.php
index 9c977cf2..bcb8f434 100644
--- a/src/Images/v2/Service.php
+++ b/src/Images/v2/Service.php
@@ -17,6 +17,9 @@ public function createImage(array $data): Image
         return $this->model(Image::class)->create($data);
     }
 
+    /**
+     * @return \Generator<mixed, \OpenStack\Images\v2\Models\Image>
+     */
     public function listImages(array $data = []): \Generator
     {
         return $this->model(Image::class)->enumerate($this->api->getImages(), $data);
diff --git a/src/Metric/v1/Gnocchi/Models/Resource.php b/src/Metric/v1/Gnocchi/Models/Resource.php
index 33c39d89..c6041dcd 100644
--- a/src/Metric/v1/Gnocchi/Models/Resource.php
+++ b/src/Metric/v1/Gnocchi/Models/Resource.php
@@ -138,6 +138,7 @@ public function getMetricMeasures(array $options = []): array
 
     /**
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResourceMetrics}
+     * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Metric>
      */
     public function listResourceMetrics(array $options = []): \Generator
     {
diff --git a/src/Metric/v1/Gnocchi/Service.php b/src/Metric/v1/Gnocchi/Service.php
index c44dfafb..6e418b14 100644
--- a/src/Metric/v1/Gnocchi/Service.php
+++ b/src/Metric/v1/Gnocchi/Service.php
@@ -18,6 +18,7 @@ class Service extends AbstractService
 {
     /**
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\ResourceType type in a generator format.
+     * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\ResourceType>
      */
     public function listResourceTypes(): \Generator
     {
@@ -28,6 +29,7 @@ public function listResourceTypes(): \Generator
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResources}
+     * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Resource>
      */
     public function listResources(array $options = []): \Generator
     {
@@ -55,6 +57,7 @@ public function getResource(array $options = []): Resource
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::searchResources}
+     * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Resource>
      */
     public function searchResources(array $options = []): \Generator
     {
@@ -94,6 +97,7 @@ public function getMetric(string $id): Metric
      * Retrieves a collection of Metric type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getMetrics}
+     * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Metric>
      */
     public function listMetrics(array $options = []): \Generator
     {
diff --git a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
index 07dc0ddb..048b942b 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
@@ -51,6 +51,9 @@ class FloatingIp extends OperatorResource implements Listable, Creatable, Retrie
     protected $resourceKey  = 'floatingip';
     protected $resourcesKey = 'floatingips';
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postFloatingIps(), $userOptions);
diff --git a/src/Networking/v2/Extensions/Layer3/Models/Router.php b/src/Networking/v2/Extensions/Layer3/Models/Router.php
index f3e70175..63e89bbe 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/Router.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/Router.php
@@ -57,6 +57,9 @@ protected function getAliases(): array
         ];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postRouters(), $userOptions);
diff --git a/src/Networking/v2/Extensions/Layer3/Service.php b/src/Networking/v2/Extensions/Layer3/Service.php
index 9f9b04de..c033c4b7 100644
--- a/src/Networking/v2/Extensions/Layer3/Service.php
+++ b/src/Networking/v2/Extensions/Layer3/Service.php
@@ -31,6 +31,9 @@ public function getFloatingIp($id): FloatingIp
         return $this->floatingIp(['id' => $id]);
     }
 
+    /**
+     * @return \Generator<mixed, FloatingIp>
+     */
     public function listFloatingIps(array $options = []): \Generator
     {
         return $this->floatingIp()->enumerate($this->api->getFloatingIps(), $options);
@@ -46,6 +49,9 @@ public function getRouter($id): Router
         return $this->router(['id' => $id]);
     }
 
+    /**
+     * @return \Generator<mixed, Router>
+     */
     public function listRouters(array $options = []): \Generator
     {
         return $this->router()->enumerate($this->api->getRouters(), $options);
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Service.php b/src/Networking/v2/Extensions/SecurityGroups/Service.php
index cf10b733..088efd15 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Service.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Service.php
@@ -21,6 +21,10 @@ private function securityGroupRule(array $info = []): SecurityGroupRule
         return $this->model(SecurityGroupRule::class, $info);
     }
 
+    /**
+     * @param array $options
+     * @return \Generator<mixed, SecurityGroup>
+     */
     public function listSecurityGroups(array $options = []): \Generator
     {
         return $this->securityGroup()->enumerate($this->api->getSecurityGroups(), $options);
@@ -36,6 +40,9 @@ public function getSecurityGroup(string $id): SecurityGroup
         return $this->securityGroup(['id' => $id]);
     }
 
+    /**
+     * @return \Generator<mixed, SecurityGroupRule>
+     */
     public function listSecurityGroupRules(): \Generator
     {
         return $this->securityGroupRule()->enumerate($this->api->getSecurityRules());
diff --git a/src/Networking/v2/Service.php b/src/Networking/v2/Service.php
index 2e1f7169..e99c6176 100644
--- a/src/Networking/v2/Service.php
+++ b/src/Networking/v2/Service.php
@@ -57,6 +57,7 @@ public function getNetwork(string $id): Network
      * List networks.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getNetworks}
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\Network>
      */
     public function listNetworks(array $options = []): \Generator
     {
@@ -99,6 +100,7 @@ public function getSubnet(string $id): Subnet
      * List subnets.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getSubnets}
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\Subnet>
      */
     public function listSubnets(array $options = []): \Generator
     {
@@ -141,6 +143,7 @@ public function getPort(string $id): Port
      * List ports.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getPorts}
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\Port>
      */
     public function listPorts(array $options = []): \Generator
     {
@@ -149,6 +152,8 @@ public function listPorts(array $options = []): \Generator
 
     /**
      * Lists quotas for projects with non-default quota values.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\Quota>
      */
     public function listQuotas(): \Generator
     {
@@ -180,6 +185,8 @@ public function getDefaultQuota(string $tenantId): Quota
 
     /**
      * Lists loadbalancers for projects.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\LoadBalancer>
      */
     public function listLoadBalancers(): \Generator
     {
@@ -206,6 +213,8 @@ public function createLoadBalancer(array $options): LoadBalancer
 
     /**
      * Lists loadbalancer listeners.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\LoadBalancerListener>
      */
     public function listLoadBalancerListeners(): \Generator
     {
@@ -232,6 +241,8 @@ public function createLoadBalancerListener(array $options): LoadBalancerListener
 
     /**
      * Lists loadbalancer pools.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\LoadBalancerPool>
      */
     public function listLoadBalancerPools(): \Generator
     {
@@ -258,6 +269,8 @@ public function createLoadBalancerPool(array $options): LoadBalancerPool
 
     /**
      * Lists loadbalancer members.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\LoadBalancerMember>
      */
     public function listLoadBalancerMembers(string $poolId): \Generator
     {
@@ -284,6 +297,8 @@ public function createLoadBalancerMember(array $options): LoadBalancerMember
 
     /**
      * Lists loadbalancer healthmonitors.
+     *
+     * @return \Generator<mixed, \OpenStack\Networking\v2\Models\LoadBalancerHealthMonitor>
      */
     public function listLoadBalancerHealthMonitors(): \Generator
     {
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index 4736d2a1..6501bfd9 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -57,6 +57,7 @@ public function populateFromResponse(ResponseInterface $response): self
      *
      * @param array         $options {@see \OpenStack\ObjectStore\v1\Api::getContainer}
      * @param callable|null $mapFn   allows a function to be mapped over each element
+     * @return \Generator<mixed, \OpenStack\ObjectStore\v1\Models\StorageObject>
      */
     public function listObjects(array $options = [], callable $mapFn = null): \Generator
     {
@@ -82,9 +83,9 @@ public function retrieve()
     }
 
     /**
-     * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putContainer}
+     * {@inheritdoc}
      *
-     * @return $this
+     * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putContainer}
      */
     public function create(array $data): Creatable
     {
diff --git a/src/ObjectStore/v1/Models/StorageObject.php b/src/ObjectStore/v1/Models/StorageObject.php
index be4f2c8c..d639a0cd 100644
--- a/src/ObjectStore/v1/Models/StorageObject.php
+++ b/src/ObjectStore/v1/Models/StorageObject.php
@@ -97,9 +97,9 @@ public function getPublicUri(): Uri
     }
 
     /**
-     * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putObject}
+     * {@inheritdoc}
      *
-     * @return $this
+     * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putObject}
      */
     public function create(array $data): Creatable
     {
diff --git a/src/ObjectStore/v1/Service.php b/src/ObjectStore/v1/Service.php
index 0f41da3b..ce029479 100644
--- a/src/ObjectStore/v1/Service.php
+++ b/src/ObjectStore/v1/Service.php
@@ -27,6 +27,7 @@ public function getAccount(): Account
      *
      * @param array         $options {@see \OpenStack\ObjectStore\v1\Api::getAccount}
      * @param callable|null $mapFn   allows a function to be mapped over each element in the collection
+     * @return \Generator<mixed, \OpenStack\ObjectStore\v1\Models\Container>
      */
     public function listContainers(array $options = [], callable $mapFn = null): \Generator
     {

From 1cad223fedc97367dfe522cbc04294b5739686d0 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 20 Dec 2023 22:12:09 +0100
Subject: [PATCH 061/102] one integration workflow (#377)

* one integration workflow to rule them all

* update README.md with new badge
---
 .../workflows/integration_block_storage.yml   | 77 -------------------
 .github/workflows/integration_compute.yml     | 76 ------------------
 .github/workflows/integration_identity.yml    | 73 ------------------
 .github/workflows/integration_images.yml      | 75 ------------------
 .github/workflows/integration_networking.yml  | 75 ------------------
 ...ject_storage.yml => integration_tests.yml} | 39 +++++++---
 README.md                                     |  8 +-
 7 files changed, 31 insertions(+), 392 deletions(-)
 delete mode 100644 .github/workflows/integration_block_storage.yml
 delete mode 100644 .github/workflows/integration_compute.yml
 delete mode 100644 .github/workflows/integration_identity.yml
 delete mode 100644 .github/workflows/integration_images.yml
 delete mode 100644 .github/workflows/integration_networking.yml
 rename .github/workflows/{integration_object_storage.yml => integration_tests.yml} (67%)

diff --git a/.github/workflows/integration_block_storage.yml b/.github/workflows/integration_block_storage.yml
deleted file mode 100644
index 93dae725..00000000
--- a/.github/workflows/integration_block_storage.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: Block Storage Integration Tests
-
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - '**BlockStorage**'
-      - '**Common**'
-  push:
-    branches:
-      - master
-
-jobs:
-  tests:
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        openstack_version: [ "stable/wallaby" ] # v2 is removed from xena
-        php_version: [ 8.1 ]
-        ubuntu_version: [ 20.04 ]
-    runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.name }} and run Block Storage integration tests with php ${{matrix.php_version}}
-    steps:
-      - uses: actions/checkout@v2
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php_version }}-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php_version }}
-          extensions: curl
-          tools: composer:v2
-          coverage: none
-      - run: composer install --prefer-dist --no-interaction --no-progress
-      - name: Restore devstack cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            /opt/stack/*
-            !/opt/stack/data
-            ~/devstack/
-          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
-      - name: Deploy devstack
-        uses: EmilienM/devstack-action@v0.11
-        with:
-          branch: ${{ matrix.openstack_version }}
-          conf_overrides: |
-            CINDER_ISCSI_HELPER=lioadm
-          enabled_services: 's-account,s-container,s-object,s-proxy,s-bak'
-      - name: Set env variables
-        run: |
-          {
-            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
-            echo OS_REGION=RegionOne
-            echo OS_REGION_NAME=RegionOne
-            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
-            echo OS_USERNAME=admin
-            echo OS_PASSWORD=secret
-            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
-            echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=c1
-            echo OS_FLAVOR=1
-            echo OS_DOMAIN_ID=default
-          } >> "$GITHUB_ENV"
-      - name: Execute integration tests
-        run: php ./tests/integration/run.php -s=BlockStorage
-
diff --git a/.github/workflows/integration_compute.yml b/.github/workflows/integration_compute.yml
deleted file mode 100644
index e8c41bed..00000000
--- a/.github/workflows/integration_compute.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Compute Integration Tests
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - '**Compute**'
-      - '**Common**'
-  push:
-    branches:
-      - master
-
-jobs:
-  tests:
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        openstack_version: [ "stable/wallaby" ] # Cinder v2 is removed from xena
-        php_version: [ 8.1 ]
-        ubuntu_version: [ 20.04 ]
-    runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.name }} with Nova and run Compute integration tests with php ${{matrix.php_version}}
-    steps:
-      - uses: actions/checkout@v2
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php_version }}-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php_version }}
-          extensions: curl
-          tools: composer:v2
-          coverage: none
-      - run: composer install --prefer-dist --no-interaction --no-progress
-      - name: Restore devstack cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            /opt/stack/*
-            !/opt/stack/data
-            ~/devstack/
-          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
-      - name: Deploy devstack
-        uses: EmilienM/devstack-action@v0.11
-        with:
-          branch: ${{ matrix.openstack_version }}
-          conf_overrides: |
-            CINDER_ISCSI_HELPER=lioadm
-          enabled_services: 's-account,s-container,s-object,s-proxy,s-bak'
-      - name: Set env variables
-        run: |
-          {
-            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
-            echo OS_REGION=RegionOne
-            echo OS_REGION_NAME=RegionOne
-            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
-            echo OS_USERNAME=admin
-            echo OS_PASSWORD=secret
-            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
-            echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=c1
-            echo OS_FLAVOR=1
-            echo OS_DOMAIN_ID=default
-          } >> "$GITHUB_ENV"
-      - name: Execute integration tests
-        run: php ./tests/integration/run.php -s=Compute
-
diff --git a/.github/workflows/integration_identity.yml b/.github/workflows/integration_identity.yml
deleted file mode 100644
index d35c5438..00000000
--- a/.github/workflows/integration_identity.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-name: Identity Integration Tests
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - '**Identity**'
-      - '**Common**'
-  push:
-    branches:
-      - master
-
-jobs:
-  tests:
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        openstack_version: [ "stable/zed" ]
-        php_version: [ 8.1 ]
-        ubuntu_version: [ 20.04 ]
-    runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.name }} and run Identity integration tests with php ${{matrix.php_version}}
-    steps:
-      - uses: actions/checkout@v2
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-cache-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php_version }}-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php_version }}
-          extensions: curl
-          tools: composer:v2
-          coverage: none
-      - run: composer install --prefer-dist --no-interaction --no-progress
-      - name: Restore devstack cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            /opt/stack/*
-            !/opt/stack/data
-            ~/devstack/
-          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
-      - name: Deploy devstack
-        uses: EmilienM/devstack-action@v0.11
-        with:
-          branch: ${{ matrix.openstack_version }}
-      - name: Set env variables
-        run: |
-          {
-            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
-            echo OS_REGION=RegionOne
-            echo OS_REGION_NAME=RegionOne
-            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
-            echo OS_USERNAME=admin
-            echo OS_PASSWORD=secret
-            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
-            echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=c1
-            echo OS_FLAVOR=1
-            echo OS_DOMAIN_ID=default
-          } >> "$GITHUB_ENV"
-      - name: Execute integration tests
-        run: php ./tests/integration/run.php -s=Identity
-
diff --git a/.github/workflows/integration_images.yml b/.github/workflows/integration_images.yml
deleted file mode 100644
index 21d07102..00000000
--- a/.github/workflows/integration_images.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Images Integration Tests
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - '**Images**'
-      - '**Common**'
-  push:
-    branches:
-      - master
-
-jobs:
-  tests:
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        openstack_version: [ "stable/zed" ]
-        php_version: [ 8.1 ]
-        ubuntu_version: [ 20.04 ]
-    runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.name }} with Glance and run Images integration tests with php ${{matrix.php_version}}
-    steps:
-      - uses: actions/checkout@v2
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php_version }}-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php_version }}
-          extensions: curl
-          tools: composer:v2
-          coverage: none
-      - run: composer install --prefer-dist --no-interaction --no-progress
-      - name: Restore devstack cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            /opt/stack/*
-            !/opt/stack/data
-            ~/devstack/
-          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
-      - name: Deploy devstack
-        uses: EmilienM/devstack-action@v0.11
-        with:
-          branch: ${{ matrix.openstack_version }}
-          conf_overrides: |
-            CINDER_ISCSI_HELPER=lioadm
-      - name: Set env variables
-        run: |
-          {
-            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
-            echo OS_REGION=RegionOne
-            echo OS_REGION_NAME=RegionOne
-            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
-            echo OS_USERNAME=admin
-            echo OS_PASSWORD=secret
-            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
-            echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=c1
-            echo OS_FLAVOR=1
-            echo OS_DOMAIN_ID=default
-          } >> "$GITHUB_ENV"
-      - name: Execute integration tests
-        run: php ./tests/integration/run.php -s=Images
-
diff --git a/.github/workflows/integration_networking.yml b/.github/workflows/integration_networking.yml
deleted file mode 100644
index db3678a0..00000000
--- a/.github/workflows/integration_networking.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Networking Integration Tests
-on:
-  workflow_dispatch:
-  pull_request:
-    paths:
-      - '**Networking**'
-      - '**Common**'
-  push:
-    branches:
-      - master
-
-jobs:
-  tests:
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        openstack_version: [ "stable/zed" ]
-        php_version: [ 8.1 ]
-        ubuntu_version: [ 20.04 ]
-    runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.name }} with Neutron and run Networking integration tests with php ${{matrix.php_version}}
-    steps:
-      - uses: actions/checkout@v2
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php_version }}-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php_version }}
-          extensions: curl
-          tools: composer:v2
-          coverage: none
-      - run: composer install --prefer-dist --no-interaction --no-progress
-      - name: Restore devstack cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            /opt/stack/*
-            !/opt/stack/data
-            ~/devstack/
-          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
-      - name: Deploy devstack
-        uses: EmilienM/devstack-action@v0.11
-        with:
-          branch: ${{ matrix.openstack_version }}
-          conf_overrides: |
-            CINDER_ISCSI_HELPER=lioadm
-      - name: Set env variables
-        run: |
-          {
-            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
-            echo OS_REGION=RegionOne
-            echo OS_REGION_NAME=RegionOne
-            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
-            echo OS_USERNAME=admin
-            echo OS_PASSWORD=secret
-            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
-            echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=c1
-            echo OS_FLAVOR=1
-            echo OS_DOMAIN_ID=default
-          } >> "$GITHUB_ENV"
-      - name: Execute integration tests
-        run: php ./tests/integration/run.php -s=Networking
-
diff --git a/.github/workflows/integration_object_storage.yml b/.github/workflows/integration_tests.yml
similarity index 67%
rename from .github/workflows/integration_object_storage.yml
rename to .github/workflows/integration_tests.yml
index 5e0e7cc3..c75aabee 100644
--- a/.github/workflows/integration_object_storage.yml
+++ b/.github/workflows/integration_tests.yml
@@ -1,10 +1,8 @@
-name: Object Storage Integration Tests
+name: Integration Tests
+
 on:
   workflow_dispatch:
   pull_request:
-    paths:
-      - '**ObjectStore**'
-      - '**Common**'
   push:
     branches:
       - master
@@ -15,11 +13,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openstack_version: [ "stable/zed" ]
+        openstack_version: [ "stable/wallaby", "stable/zed", "stable/2023.2" ]
         php_version: [ 8.1 ]
-        ubuntu_version: [ 20.04 ]
+        include:
+          - name: "bobcat"
+            openstack_version: "stable/2023.2"
+            ubuntu_version: "22.04"
+          - name: "zed"
+            openstack_version: "stable/zed"
+            ubuntu_version: "20.04"
+          - name: "wallaby"
+            openstack_version: "stable/wallaby"
+            ubuntu_version: "20.04"
+            block_storage_v2: true
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.name }} and run ObjectStore integration tests with php ${{matrix.php_version}}
+    name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
     steps:
       - uses: actions/checkout@v2
       - name: get cache directory
@@ -54,12 +62,13 @@ jobs:
         with:
           branch: ${{ matrix.openstack_version }}
           conf_overrides: |
+            CINDER_ISCSI_HELPER=lioadm
             SWIFT_ENABLE_TEMPURLS=True
             SWIFT_TEMPURL_KEY=secretkey
             [[post-config|\$SWIFT_CONFIG_PROXY_SERVER]]
             [filter:versioned_writes]
             allow_object_versioning = true
-          enabled_services: 's-account,s-container,s-object,s-proxy'
+          enabled_services: 's-account,s-container,s-object,s-proxy,s-bak'
       - name: Set env variables
         run: |
           {
@@ -75,6 +84,18 @@ jobs:
             echo OS_FLAVOR=1
             echo OS_DOMAIN_ID=default
           } >> "$GITHUB_ENV"
-      - name: Execute integration tests
+      - name: Execute Block Storage tests
+        if: matrix.block_storage_v2 == true
+        run: php ./tests/integration/run.php -s=BlockStorage
+      - name: Execute Compute tests
+        if: matrix.block_storage_v2 == true
+        run: php ./tests/integration/run.php -s=Compute
+      - name: Execute Identity tests
+        run: php ./tests/integration/run.php -s=Identity
+      - name: Execute Images tests
+        run: php ./tests/integration/run.php -s=Images
+      - name: Execute Networking tests
+        run: php ./tests/integration/run.php -s=Networking
+      - name: Execute Object Storage tests
         run: php ./tests/integration/run.php -s=ObjectStore
 
diff --git a/README.md b/README.md
index 4dea18a4..b6d1fa70 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,9 @@
 
 
 ![Unit tests](https://github.com/php-opencloud/openstack/actions/workflows/unit_tests.yml/badge.svg)
+[![Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_tests.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_tests.yml)
 [![Documentation Status](https://readthedocs.org/projects/php-openstack-sdk/badge/?version=latest)](https://php-openstack-sdk.readthedocs.io/en/latest/?badge=latest)
 
-[![Block Storage Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_block_storage.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_block_storage.yml)
-[![Compute Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_compute.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_compute.yml)
-[![Identity Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_identity.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_identity.yml)
-[![Images Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_images.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_images.yml)
-[![Networking Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_networking.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_networking.yml)
-[![Object Storage Integration Tests](https://github.com/php-opencloud/openstack/actions/workflows/integration_object_storage.yml/badge.svg)](https://github.com/php-opencloud/openstack/actions/workflows/integration_object_storage.yml)
-
 `php-opencloud/openstack` is an SDK which allows PHP developers to easily connect to OpenStack APIs in a simple and 
 idiomatic way. This binding is specifically designed for OpenStack APIs, but other provider SDKs are available. Multiple 
 OpenStack services, and versions of services, are supported.

From 47c8ed94d5e44ba49d45d0e5da2d23f55651b864 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Fri, 5 Jan 2024 10:16:47 +0100
Subject: [PATCH 062/102] create BlockStorage v3 as copy of v2 (#378)

---
 .github/workflows/integration_tests.yml       |   7 +-
 COVERAGE.md                                   |  35 +--
 doc/services/block-storage/v2/index.rst       |  10 +-
 doc/services/block-storage/v3/index.rst       |   9 +
 .../block-storage/{v2 => v3}/snapshots.rst    |   4 +-
 .../block-storage/{v2 => v3}/volume-types.rst |  10 +-
 .../block-storage/{v2 => v3}/volumes.rst      |  18 +-
 samples/BlockStorage/v2/create_service.php    |  12 +
 .../{v2 => v3}/snapshots/create.php           |   2 +-
 .../{v2 => v3}/snapshots/delete.php           |   2 +-
 .../BlockStorage/{v2 => v3}/snapshots/get.php |   2 +-
 .../{v2 => v3}/snapshots/get_metadata.php     |   2 +-
 .../{v2 => v3}/snapshots/list.php             |   2 +-
 .../{v2 => v3}/snapshots/list_detail.php      |   2 +-
 .../{v2 => v3}/snapshots/list_sorted.php      |   2 +-
 .../{v2 => v3}/snapshots/merge_metadata.php   |   2 +-
 .../{v2 => v3}/snapshots/reset_metadata.php   |   2 +-
 .../{v2 => v3}/snapshots/update.php           |   2 +-
 .../{v2 => v3}/volume_types/create.php        |   2 +-
 .../{v2 => v3}/volume_types/delete.php        |   2 +-
 .../{v2 => v3}/volume_types/get.php           |   2 +-
 .../{v2 => v3}/volume_types/list.php          |   2 +-
 .../{v2 => v3}/volume_types/update.php        |   2 +-
 .../{v2 => v3}/volumes/create.php             |   2 +-
 .../{v2 => v3}/volumes/create_from_image.php  |   2 +-
 .../volumes/create_from_snapshot.php          |   2 +-
 .../volumes/create_from_source_volume.php     |   2 +-
 .../{v2 => v3}/volumes/delete.php             |   2 +-
 .../BlockStorage/{v2 => v3}/volumes/get.php   |   2 +-
 .../BlockStorage/{v2 => v3}/volumes/list.php  |   2 +-
 .../{v2 => v3}/volumes/list_detail.php        |   2 +-
 .../{v2 => v3}/volumes/update.php             |   2 +-
 src/BlockStorage/v3/Api.php                   |   8 +
 src/BlockStorage/v3/Service.php               |   8 +
 src/OpenStack.php                             |  14 +
 .../integration/BlockStorage/v2/CoreTest.php  | 246 +----------------
 .../BlockStorage/v3/CoreV2Test.php            | 252 ++++++++++++++++++
 tests/integration/Compute/v2/CoreTest.php     |   4 +-
 tests/integration/SampleManager.php           |   4 +-
 tests/integration/TestCase.php                |   2 +-
 .../BlockStorage/v2/Models/QuotaSetTest.php   |   2 +-
 .../BlockStorage/v2/Models/SnapshotTest.php   |   2 +-
 .../BlockStorage/v2/Models/VolumeTest.php     |   2 +-
 .../BlockStorage/v2/Models/VolumeTypeTest.php |   2 +-
 tests/unit/BlockStorage/v2/ServiceTest.php    |   7 +-
 .../v3/FromV2/Models/QuotaSetTest.php         |  17 ++
 .../v3/FromV2/Models/SnapshotTest.php         |  17 ++
 .../v3/FromV2/Models/VolumeTest.php           |  17 ++
 .../v3/FromV2/Models/VolumeTypeTest.php       |  17 ++
 .../BlockStorage/v3/FromV2/ServiceTest.php    |  16 ++
 tests/unit/OpenStackTest.php                  |  11 +
 51 files changed, 487 insertions(+), 314 deletions(-)
 create mode 100644 doc/services/block-storage/v3/index.rst
 rename doc/services/block-storage/{v2 => v3}/snapshots.rst (80%)
 rename doc/services/block-storage/{v2 => v3}/volume-types.rst (85%)
 rename doc/services/block-storage/{v2 => v3}/volumes.rst (80%)
 create mode 100644 samples/BlockStorage/v2/create_service.php
 rename samples/BlockStorage/{v2 => v3}/snapshots/create.php (90%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/delete.php (89%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/get.php (88%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/get_metadata.php (89%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/list.php (90%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/list_detail.php (91%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/list_sorted.php (92%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/merge_metadata.php (90%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/reset_metadata.php (90%)
 rename samples/BlockStorage/{v2 => v3}/snapshots/update.php (91%)
 rename samples/BlockStorage/{v2 => v3}/volume_types/create.php (89%)
 rename samples/BlockStorage/{v2 => v3}/volume_types/delete.php (89%)
 rename samples/BlockStorage/{v2 => v3}/volume_types/get.php (88%)
 rename samples/BlockStorage/{v2 => v3}/volume_types/list.php (91%)
 rename samples/BlockStorage/{v2 => v3}/volume_types/update.php (90%)
 rename samples/BlockStorage/{v2 => v3}/volumes/create.php (92%)
 rename samples/BlockStorage/{v2 => v3}/volumes/create_from_image.php (91%)
 rename samples/BlockStorage/{v2 => v3}/volumes/create_from_snapshot.php (91%)
 rename samples/BlockStorage/{v2 => v3}/volumes/create_from_source_volume.php (91%)
 rename samples/BlockStorage/{v2 => v3}/volumes/delete.php (88%)
 rename samples/BlockStorage/{v2 => v3}/volumes/get.php (88%)
 rename samples/BlockStorage/{v2 => v3}/volumes/list.php (90%)
 rename samples/BlockStorage/{v2 => v3}/volumes/list_detail.php (90%)
 rename samples/BlockStorage/{v2 => v3}/volumes/update.php (90%)
 create mode 100644 src/BlockStorage/v3/Api.php
 create mode 100644 src/BlockStorage/v3/Service.php
 create mode 100644 tests/integration/BlockStorage/v3/CoreV2Test.php
 create mode 100644 tests/unit/BlockStorage/v3/FromV2/Models/QuotaSetTest.php
 create mode 100644 tests/unit/BlockStorage/v3/FromV2/Models/SnapshotTest.php
 create mode 100644 tests/unit/BlockStorage/v3/FromV2/Models/VolumeTest.php
 create mode 100644 tests/unit/BlockStorage/v3/FromV2/Models/VolumeTypeTest.php
 create mode 100644 tests/unit/BlockStorage/v3/FromV2/ServiceTest.php

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index c75aabee..dce570d3 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -84,11 +84,12 @@ jobs:
             echo OS_FLAVOR=1
             echo OS_DOMAIN_ID=default
           } >> "$GITHUB_ENV"
-      - name: Execute Block Storage tests
+      - name: Execute Block Storage v2 tests
         if: matrix.block_storage_v2 == true
-        run: php ./tests/integration/run.php -s=BlockStorage
+        run: php ./tests/integration/run.php -s=BlockStorage -v=v2
+      - name: Execute Block Storage v3 tests
+        run: php ./tests/integration/run.php -s=BlockStorage -v=v3
       - name: Execute Compute tests
-        if: matrix.block_storage_v2 == true
         run: php ./tests/integration/run.php -s=Compute
       - name: Execute Identity tests
         run: php ./tests/integration/run.php -s=Identity
diff --git a/COVERAGE.md b/COVERAGE.md
index 84160fe9..7957e324 100644
--- a/COVERAGE.md
+++ b/COVERAGE.md
@@ -1,22 +1,23 @@
 # OpenStack services coverage
 
-|Name|PHP classes|API definition|Unit tests|Sample files|Integration tests|Documentation|
-|---|:--:|:--:|:--:|:--:|:--:|:--:|
-|Block Storage v2|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-|Compute v2|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-|Compute v2 exts|||||||
-|Data Processing v1|||||||
-|Database v1|||||||
-|Identity v2|&#10003;|&#10003;|&#10003;||||
-|Identity v2 exts|||||||
-|Identity v3|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-|Identity v3 exts|||||||
-|Images v2|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-|Networking v2|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-|Networking v2 exts|||||||
-|Object Storage v1|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-|Orchestration v1|||||||
-|Telemetry v2|||||||
+| Name               |PHP classes|API definition|Unit tests|Sample files|Integration tests|Documentation|
+|--------------------|:--:|:--:|:--:|:--:|:--:|:--:|
+| Block Storage v2   |&#10003;|&#10003;|&#10003;||&#10003;||
+| Block Storage v3   |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
+| Compute v2         |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
+| Compute v2 exts    |||||||
+| Data Processing v1 |||||||
+| Database v1        |||||||
+| Identity v2        |&#10003;|&#10003;|&#10003;||||
+| Identity v2 exts   |||||||
+| Identity v3        |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
+| Identity v3 exts   |||||||
+| Images v2          |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
+| Networking v2      |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
+| Networking v2 exts |||||||
+| Object Storage v1  |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
+| Orchestration v1   |||||||
+| Telemetry v2       |||||||
 
 ## Key
 
diff --git a/doc/services/block-storage/v2/index.rst b/doc/services/block-storage/v2/index.rst
index 8086efc0..9e046e31 100644
--- a/doc/services/block-storage/v2/index.rst
+++ b/doc/services/block-storage/v2/index.rst
@@ -1,9 +1,9 @@
 Block Storage v2
 ================
 
-.. toctree::
-   :maxdepth: 3
+Block Storage v2 API is deprecated since Pike release and was removed in the Xena release.
+It is recommended to use Block Storage v3 API instead. However most of endpoints are identical, so if you still need
+to use Block Storage v2 API, you can use the change `$openstack->blockStorageV3()` to `$openstack->blockStorageV2()` in examples.
+In most cases it will work without any other changes.
 
-   volumes
-   volume-types
-   snapshots
+.. sample:: BlockStorage/v2/create_service.php
diff --git a/doc/services/block-storage/v3/index.rst b/doc/services/block-storage/v3/index.rst
new file mode 100644
index 00000000..d012ed56
--- /dev/null
+++ b/doc/services/block-storage/v3/index.rst
@@ -0,0 +1,9 @@
+Block Storage v3
+================
+
+.. toctree::
+   :maxdepth: 3
+
+   volumes
+   volume-types
+   snapshots
diff --git a/doc/services/block-storage/v2/snapshots.rst b/doc/services/block-storage/v3/snapshots.rst
similarity index 80%
rename from doc/services/block-storage/v2/snapshots.rst
rename to doc/services/block-storage/v3/snapshots.rst
index 5365d635..e3aea5f5 100644
--- a/doc/services/block-storage/v2/snapshots.rst
+++ b/doc/services/block-storage/v3/snapshots.rst
@@ -4,7 +4,7 @@ Snapshots
 List volumes
 ------------
 
-.. sample:: BlockStorage/v2/snapshots/list.php
+.. sample:: BlockStorage/v3/snapshots/list.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listSnapshots
 
 Each iteration will return a php:class:`Snapshot` instance <OpenStack/BlockStorage/v2/Models/Snapshot.html>.
@@ -23,4 +23,4 @@ Possible values for sort_dir are:
 * asc
 * desc
 
-.. sample:: BlockStorage/v2/snapshots/list_sorted.php
\ No newline at end of file
+.. sample:: BlockStorage/v3/snapshots/list_sorted.php
\ No newline at end of file
diff --git a/doc/services/block-storage/v2/volume-types.rst b/doc/services/block-storage/v3/volume-types.rst
similarity index 85%
rename from doc/services/block-storage/v2/volume-types.rst
rename to doc/services/block-storage/v3/volume-types.rst
index cb515a0d..b89d0222 100644
--- a/doc/services/block-storage/v2/volume-types.rst
+++ b/doc/services/block-storage/v3/volume-types.rst
@@ -3,7 +3,7 @@ Volume Types
 
 Listing volume types
 --------------------
-.. sample:: BlockStorage/v2/volume_types/list.php
+.. sample:: BlockStorage/v3/volume_types/list.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumeTypes
 
 Each iteration will return a :php:class:`VolumeType` instance <OpenStack/BlockStorage/v2/Models/VolumeType.html>.
@@ -17,7 +17,7 @@ Create volume type
 The only attributes that are required when creating a volume are a name. The simplest example
 would therefore be this:
 
-.. sample:: BlockStorage/v2/volume_types/create.php
+.. sample:: BlockStorage/v3/volume_types/create.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_createVolumeType
 
 
@@ -27,7 +27,7 @@ Retrieve details of a volume type
 When retrieving a volume type, sometimes you only want to operate on it - say to update or delete it. If this is the
 case, then there is no need to perform an initial GET request to the API:
 
-.. sample:: BlockStorage/v2/volume_types/get.php
+.. sample:: BlockStorage/v3/volume_types/get.php
 
 If, however, you *do* want to retrieve all the details of a remote volume type from the API, you just call:
 
@@ -46,7 +46,7 @@ Update a volume type
 The first step when updating a volume type is modifying the attributes you want updated. By default, only a volume
 type's name can be edited.
 
-.. sample:: BlockStorage/v2/volume_types/update.php
+.. sample:: BlockStorage/v3/volume_types/update.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_update
 
 
@@ -55,5 +55,5 @@ Delete volume type
 
 To permanently delete a volume type:
 
-.. sample:: BlockStorage/v2/volume_types/delete.php
+.. sample:: BlockStorage/v3/volume_types/delete.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_delete
\ No newline at end of file
diff --git a/doc/services/block-storage/v2/volumes.rst b/doc/services/block-storage/v3/volumes.rst
similarity index 80%
rename from doc/services/block-storage/v2/volumes.rst
rename to doc/services/block-storage/v3/volumes.rst
index e0d0691f..82843b6c 100644
--- a/doc/services/block-storage/v2/volumes.rst
+++ b/doc/services/block-storage/v3/volumes.rst
@@ -4,7 +4,7 @@ Volumes
 List volumes
 ------------
 
-.. sample:: BlockStorage/v2/volumes/list.php
+.. sample:: BlockStorage/v3/volumes/list.php
 .. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumes
 
 Each iteration will return a php:class:`Volume` instance <OpenStack/BlockStorage/v2/Models/Volume.html>.
@@ -17,7 +17,7 @@ Detailed information
 By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information
 for a flavor, you must enable detailed information, like so:
 
-.. sample:: BlockStorage/v2/volumes/list_detail.php
+.. sample:: BlockStorage/v3/volumes/list_detail.php
 
 Create volume
 -------------
@@ -25,7 +25,7 @@ Create volume
 The only attributes that are required when creating a volume are a size in GiB. The simplest example
 would therefore be this:
 
-.. sample:: BlockStorage/v2/volumes/create.php
+.. sample:: BlockStorage/v3/volumes/create.php
 
 You can further configure your new volume, however, by following the below sections, which instruct you how to add
 specific functionality.
@@ -35,17 +35,17 @@ specific functionality.
 Create from image
 ~~~~~~~~~~~~~~~~~
 
-.. sample:: BlockStorage/v2/volumes/create_from_image.php
+.. sample:: BlockStorage/v3/volumes/create_from_image.php
 
 Create from snapshot
 ~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: BlockStorage/v2/volumes/create_from_snapshot.php
+.. sample:: BlockStorage/v3/volumes/create_from_snapshot.php
 
 Create from source volume
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: BlockStorage/v2/volumes/create_from_source_volume.php
+.. sample:: BlockStorage/v3/volumes/create_from_source_volume.php
 
 
 Retrieve volume details
@@ -54,7 +54,7 @@ Retrieve volume details
 When retrieving a volume, sometimes you only want to operate on it - say to update or delete it. If this is the case,
 then there is no need to perform an initial GET request to the API:
 
-.. sample:: BlockStorage/v2/volumes/get.php
+.. sample:: BlockStorage/v3/volumes/get.php
 
 If, however, you *do* want to retrieve all the details of a remote volume from the API, you just call:
 
@@ -73,7 +73,7 @@ Update volume
 The first step when updating a volume is modifying the attributes you want updated. By default, only a volume's name
 and description can be edited.
 
-.. sample:: BlockStorage/v2/volumes/update.php
+.. sample:: BlockStorage/v3/volumes/update.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_update
 
 Delete volume
@@ -81,5 +81,5 @@ Delete volume
 
 To permanently delete a volume:
 
-.. sample:: BlockStorage/v2/volumes/delete.php
+.. sample:: BlockStorage/v3/volumes/delete.php
 .. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_delete
\ No newline at end of file
diff --git a/samples/BlockStorage/v2/create_service.php b/samples/BlockStorage/v2/create_service.php
new file mode 100644
index 00000000..fbed17dc
--- /dev/null
+++ b/samples/BlockStorage/v2/create_service.php
@@ -0,0 +1,12 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v2/snapshots/create.php b/samples/BlockStorage/v3/snapshots/create.php
similarity index 90%
rename from samples/BlockStorage/v2/snapshots/create.php
rename to samples/BlockStorage/v3/snapshots/create.php
index fdab656a..94ad40ae 100644
--- a/samples/BlockStorage/v2/snapshots/create.php
+++ b/samples/BlockStorage/v3/snapshots/create.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshot = $service->createSnapshot([
     'volumeId'    => '{volumeId}',
diff --git a/samples/BlockStorage/v2/snapshots/delete.php b/samples/BlockStorage/v3/snapshots/delete.php
similarity index 89%
rename from samples/BlockStorage/v2/snapshots/delete.php
rename to samples/BlockStorage/v3/snapshots/delete.php
index a7bc30db..7136ca1e 100644
--- a/samples/BlockStorage/v2/snapshots/delete.php
+++ b/samples/BlockStorage/v3/snapshots/delete.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 $snapshot->delete();
diff --git a/samples/BlockStorage/v2/snapshots/get.php b/samples/BlockStorage/v3/snapshots/get.php
similarity index 88%
rename from samples/BlockStorage/v2/snapshots/get.php
rename to samples/BlockStorage/v3/snapshots/get.php
index d87a89c8..2466cbfc 100644
--- a/samples/BlockStorage/v2/snapshots/get.php
+++ b/samples/BlockStorage/v3/snapshots/get.php
@@ -9,6 +9,6 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
diff --git a/samples/BlockStorage/v2/snapshots/get_metadata.php b/samples/BlockStorage/v3/snapshots/get_metadata.php
similarity index 89%
rename from samples/BlockStorage/v2/snapshots/get_metadata.php
rename to samples/BlockStorage/v3/snapshots/get_metadata.php
index 17a29187..76e319a6 100644
--- a/samples/BlockStorage/v2/snapshots/get_metadata.php
+++ b/samples/BlockStorage/v3/snapshots/get_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $metadata = $service->getSnapshot('{snapshotId}')
                     ->getMetadata();
diff --git a/samples/BlockStorage/v2/snapshots/list.php b/samples/BlockStorage/v3/snapshots/list.php
similarity index 90%
rename from samples/BlockStorage/v2/snapshots/list.php
rename to samples/BlockStorage/v3/snapshots/list.php
index 6853cd9e..5d58bda9 100644
--- a/samples/BlockStorage/v2/snapshots/list.php
+++ b/samples/BlockStorage/v3/snapshots/list.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshots = $service->listSnapshots();
 
diff --git a/samples/BlockStorage/v2/snapshots/list_detail.php b/samples/BlockStorage/v3/snapshots/list_detail.php
similarity index 91%
rename from samples/BlockStorage/v2/snapshots/list_detail.php
rename to samples/BlockStorage/v3/snapshots/list_detail.php
index aab57992..525ea482 100644
--- a/samples/BlockStorage/v2/snapshots/list_detail.php
+++ b/samples/BlockStorage/v3/snapshots/list_detail.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshots = $service->listSnapshots(true);
 
diff --git a/samples/BlockStorage/v2/snapshots/list_sorted.php b/samples/BlockStorage/v3/snapshots/list_sorted.php
similarity index 92%
rename from samples/BlockStorage/v2/snapshots/list_sorted.php
rename to samples/BlockStorage/v3/snapshots/list_sorted.php
index e00c18aa..1f01301d 100644
--- a/samples/BlockStorage/v2/snapshots/list_sorted.php
+++ b/samples/BlockStorage/v3/snapshots/list_sorted.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshots = $service->listSnapshots(false, ['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
 
diff --git a/samples/BlockStorage/v2/snapshots/merge_metadata.php b/samples/BlockStorage/v3/snapshots/merge_metadata.php
similarity index 90%
rename from samples/BlockStorage/v2/snapshots/merge_metadata.php
rename to samples/BlockStorage/v3/snapshots/merge_metadata.php
index 182bfd50..c85386c7 100644
--- a/samples/BlockStorage/v2/snapshots/merge_metadata.php
+++ b/samples/BlockStorage/v3/snapshots/merge_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v2/snapshots/reset_metadata.php b/samples/BlockStorage/v3/snapshots/reset_metadata.php
similarity index 90%
rename from samples/BlockStorage/v2/snapshots/reset_metadata.php
rename to samples/BlockStorage/v3/snapshots/reset_metadata.php
index afaac8ef..d0d7a710 100644
--- a/samples/BlockStorage/v2/snapshots/reset_metadata.php
+++ b/samples/BlockStorage/v3/snapshots/reset_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v2/snapshots/update.php b/samples/BlockStorage/v3/snapshots/update.php
similarity index 91%
rename from samples/BlockStorage/v2/snapshots/update.php
rename to samples/BlockStorage/v3/snapshots/update.php
index f72a15a0..3310d44a 100644
--- a/samples/BlockStorage/v2/snapshots/update.php
+++ b/samples/BlockStorage/v3/snapshots/update.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v2/volume_types/create.php b/samples/BlockStorage/v3/volume_types/create.php
similarity index 89%
rename from samples/BlockStorage/v2/volume_types/create.php
rename to samples/BlockStorage/v3/volume_types/create.php
index f9042a7f..92a8eb45 100644
--- a/samples/BlockStorage/v2/volume_types/create.php
+++ b/samples/BlockStorage/v3/volume_types/create.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volumeType = $service->createVolumeType([
     'name' => '{name}',
diff --git a/samples/BlockStorage/v2/volume_types/delete.php b/samples/BlockStorage/v3/volume_types/delete.php
similarity index 89%
rename from samples/BlockStorage/v2/volume_types/delete.php
rename to samples/BlockStorage/v3/volume_types/delete.php
index 11f02cac..c8a68b75 100644
--- a/samples/BlockStorage/v2/volume_types/delete.php
+++ b/samples/BlockStorage/v3/volume_types/delete.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
 $volumeType->delete();
diff --git a/samples/BlockStorage/v2/volume_types/get.php b/samples/BlockStorage/v3/volume_types/get.php
similarity index 88%
rename from samples/BlockStorage/v2/volume_types/get.php
rename to samples/BlockStorage/v3/volume_types/get.php
index 19051d0f..fc86ab57 100644
--- a/samples/BlockStorage/v2/volume_types/get.php
+++ b/samples/BlockStorage/v3/volume_types/get.php
@@ -9,6 +9,6 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
diff --git a/samples/BlockStorage/v2/volume_types/list.php b/samples/BlockStorage/v3/volume_types/list.php
similarity index 91%
rename from samples/BlockStorage/v2/volume_types/list.php
rename to samples/BlockStorage/v3/volume_types/list.php
index 567aed53..3c6d3bf8 100644
--- a/samples/BlockStorage/v2/volume_types/list.php
+++ b/samples/BlockStorage/v3/volume_types/list.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volumeTypes = $service->listVolumeTypes();
 
diff --git a/samples/BlockStorage/v2/volume_types/update.php b/samples/BlockStorage/v3/volume_types/update.php
similarity index 90%
rename from samples/BlockStorage/v2/volume_types/update.php
rename to samples/BlockStorage/v3/volume_types/update.php
index 5f24db38..edcd9dec 100644
--- a/samples/BlockStorage/v2/volume_types/update.php
+++ b/samples/BlockStorage/v3/volume_types/update.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
 $volumeType->name = '{newName}';
diff --git a/samples/BlockStorage/v2/volumes/create.php b/samples/BlockStorage/v3/volumes/create.php
similarity index 92%
rename from samples/BlockStorage/v2/volumes/create.php
rename to samples/BlockStorage/v3/volumes/create.php
index eb48f8bd..b8fd9308 100644
--- a/samples/BlockStorage/v2/volumes/create.php
+++ b/samples/BlockStorage/v3/volumes/create.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volume = $service->createVolume([
     'description'      => '{description}',
diff --git a/samples/BlockStorage/v2/volumes/create_from_image.php b/samples/BlockStorage/v3/volumes/create_from_image.php
similarity index 91%
rename from samples/BlockStorage/v2/volumes/create_from_image.php
rename to samples/BlockStorage/v3/volumes/create_from_image.php
index 0701e39f..81d36d9e 100644
--- a/samples/BlockStorage/v2/volumes/create_from_image.php
+++ b/samples/BlockStorage/v3/volumes/create_from_image.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volume = $service->createVolume([
     'description'    => '{description}',
diff --git a/samples/BlockStorage/v2/volumes/create_from_snapshot.php b/samples/BlockStorage/v3/volumes/create_from_snapshot.php
similarity index 91%
rename from samples/BlockStorage/v2/volumes/create_from_snapshot.php
rename to samples/BlockStorage/v3/volumes/create_from_snapshot.php
index dfff8ea9..a88c2d44 100644
--- a/samples/BlockStorage/v2/volumes/create_from_snapshot.php
+++ b/samples/BlockStorage/v3/volumes/create_from_snapshot.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volume = $service->createVolume([
     'description' => '{description}',
diff --git a/samples/BlockStorage/v2/volumes/create_from_source_volume.php b/samples/BlockStorage/v3/volumes/create_from_source_volume.php
similarity index 91%
rename from samples/BlockStorage/v2/volumes/create_from_source_volume.php
rename to samples/BlockStorage/v3/volumes/create_from_source_volume.php
index 1f26a61e..571e1231 100644
--- a/samples/BlockStorage/v2/volumes/create_from_source_volume.php
+++ b/samples/BlockStorage/v3/volumes/create_from_source_volume.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volume = $service->createVolume([
     'description' => '{description}',
diff --git a/samples/BlockStorage/v2/volumes/delete.php b/samples/BlockStorage/v3/volumes/delete.php
similarity index 88%
rename from samples/BlockStorage/v2/volumes/delete.php
rename to samples/BlockStorage/v3/volumes/delete.php
index 46527f04..1821ca9e 100644
--- a/samples/BlockStorage/v2/volumes/delete.php
+++ b/samples/BlockStorage/v3/volumes/delete.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volume = $service->getVolume('{volumeId}');
 $volume->delete();
diff --git a/samples/BlockStorage/v2/volumes/get.php b/samples/BlockStorage/v3/volumes/get.php
similarity index 88%
rename from samples/BlockStorage/v2/volumes/get.php
rename to samples/BlockStorage/v3/volumes/get.php
index 2c347787..184c02af 100644
--- a/samples/BlockStorage/v2/volumes/get.php
+++ b/samples/BlockStorage/v3/volumes/get.php
@@ -9,6 +9,6 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volume = $service->getVolume('{volumeId}');
diff --git a/samples/BlockStorage/v2/volumes/list.php b/samples/BlockStorage/v3/volumes/list.php
similarity index 90%
rename from samples/BlockStorage/v2/volumes/list.php
rename to samples/BlockStorage/v3/volumes/list.php
index d91d0145..0b1d5c83 100644
--- a/samples/BlockStorage/v2/volumes/list.php
+++ b/samples/BlockStorage/v3/volumes/list.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volumes = $service->listVolumes();
 
diff --git a/samples/BlockStorage/v2/volumes/list_detail.php b/samples/BlockStorage/v3/volumes/list_detail.php
similarity index 90%
rename from samples/BlockStorage/v2/volumes/list_detail.php
rename to samples/BlockStorage/v3/volumes/list_detail.php
index a67d35a4..e495fbc3 100644
--- a/samples/BlockStorage/v2/volumes/list_detail.php
+++ b/samples/BlockStorage/v3/volumes/list_detail.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 foreach ($service->listVolumes(true) as $volume) {
     /** @var $volume \OpenStack\BlockStorage\v2\Models\Volume */
diff --git a/samples/BlockStorage/v2/volumes/update.php b/samples/BlockStorage/v3/volumes/update.php
similarity index 90%
rename from samples/BlockStorage/v2/volumes/update.php
rename to samples/BlockStorage/v3/volumes/update.php
index 07605d3f..d9de1d53 100644
--- a/samples/BlockStorage/v2/volumes/update.php
+++ b/samples/BlockStorage/v3/volumes/update.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV2();
+$service = $openstack->blockStorageV3();
 
 $volume = $service->getVolume('{volumeId}');
 
diff --git a/src/BlockStorage/v3/Api.php b/src/BlockStorage/v3/Api.php
new file mode 100644
index 00000000..1b8c194f
--- /dev/null
+++ b/src/BlockStorage/v3/Api.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OpenStack\BlockStorage\v3;
+
+class Api extends \OpenStack\BlockStorage\v2\Api
+{
+
+}
\ No newline at end of file
diff --git a/src/BlockStorage/v3/Service.php b/src/BlockStorage/v3/Service.php
new file mode 100644
index 00000000..9ec33954
--- /dev/null
+++ b/src/BlockStorage/v3/Service.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OpenStack\BlockStorage\v3;
+
+class Service extends \OpenStack\BlockStorage\v2\Service
+{
+
+}
\ No newline at end of file
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 822de303..750042da 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -160,6 +160,8 @@ public function objectStoreV1(array $options = []): ObjectStore\v1\Service
      * Creates a new Block Storage v2 service.
      *
      * @param array $options options that will be used in configuring the service
+     *
+     * @deprecated Use blockStorageV3 instead
      */
     public function blockStorageV2(array $options = []): BlockStorage\v2\Service
     {
@@ -168,6 +170,18 @@ public function blockStorageV2(array $options = []): BlockStorage\v2\Service
         return $this->builder->createService('BlockStorage\\v2', array_merge($defaults, $options));
     }
 
+    /**
+     * Creates a new Block Storage v3 service.
+     *
+     * @param array $options options that will be used in configuring the service
+     */
+    public function blockStorageV3(array $options = []): BlockStorage\v3\Service
+    {
+        $defaults = ['catalogName' => 'cinderv3', 'catalogType' => 'volumev3'];
+
+        return $this->builder->createService('BlockStorage\\v3', array_merge($defaults, $options));
+    }
+
     /**
      * Creates a new Images v2 service.
      *
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
index 352e0744..d4193929 100644
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -2,20 +2,13 @@
 
 namespace OpenStack\Integration\BlockStorage\v2;
 
-use OpenStack\BlockStorage\v2\Models\Snapshot;
-use OpenStack\BlockStorage\v2\Models\Volume;
-use OpenStack\BlockStorage\v2\Models\VolumeType;
-use OpenStack\Integration\TestCase;
+use OpenStack\BlockStorage\v2\Service;
+use OpenStack\Integration\BlockStorage\v3\CoreV2Test;
 use OpenStack\Integration\Utils;
 
-class CoreTest extends TestCase
+class CoreTest extends CoreV2Test
 {
-    private $service;
-
-    /**
-     * @return \OpenStack\BlockStorage\v2\Service
-     */
-    private function getService()
+    protected function getService() : Service
     {
         if (null === $this->service) {
             $this->service = Utils::getOpenStack()->blockStorageV2();
@@ -24,230 +17,13 @@ private function getService()
         return $this->service;
     }
 
-    public function runTests()
-    {
-        $this->startTimer();
-
-        $this->logger->info('-> Volumes');
-        $this->volumes();
-        $this->logger->info('-> Volume Types');
-        $this->volumeTypes();
-        $this->logger->info('-> Snapshots');
-        $this->snapshots();
-        $this->logger->info('-> Snapshot list');
-        $this->snapshotList();
-
-        $this->outputTimeTaken();
-    }
-
-    public function volumes()
+    protected function sampleFile(array $replacements, $path)
     {
-        $this->logStep('Creating volume type');
-        $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
-
-        $replacements = [
-            '{description}' => $this->randomStr(),
-            "'{size}'" => 1,
-            '{name}' => $this->randomStr(),
-            '{volumeType}' => $volumeType->id,
-            '{key1}' => $this->randomStr(),
-            '{val1}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Creating volume');
-        /** @var Volume $volume */
-        require_once $this->sampleFile($replacements, 'volumes/create.php');
-        self::assertInstanceOf(Volume::class, $volume);
-        self::assertEquals($replacements['{name}'], $volume->name);
-        self::assertEquals(1, $volume->size);
-        self::assertEquals($volumeType->name, $volume->volumeTypeName);
-
-        $volumeId = $volume->id;
-        $replacements = ['{volumeId}' => $volumeId];
-
-        $this->logStep('Getting volume');
-        /** @var Volume $volume */
-        require_once $this->sampleFile($replacements, 'volumes/get.php');
-        self::assertInstanceOf(Volume::class, $volume);
-
-        $replacements += [
-            '{newName}' => $this->randomStr(),
-            '{newDescription}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Updating volume');
-        /** @var Volume $volume */
-        require_once $this->sampleFile($replacements, 'volumes/update.php');
-        self::assertInstanceOf(Volume::class, $volume);
-
-        $this->logStep('Listing volumes');
-        /** @var \Generator $volumes */
-        require_once $this->sampleFile($replacements, 'volumes/list.php');
-
-        $volume = $this->getService()->getVolume($volumeId);
-        $volume->waitUntil('available');
-
-        $this->logStep('Deleting volume');
-        require_once $this->sampleFile($replacements, 'volumes/delete.php');
-
-        $volume = $this->getService()->getVolume($volumeId);
-        $volume->waitUntilDeleted();
-
-        $this->logStep('Deleting volume type');
-        $volumeType->delete();
-    }
-
-    public function volumeTypes()
-    {
-        $replacements = [
-            '{name}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Creating volume type');
-        /** @var VolumeType $volumeType */
-        require_once $this->sampleFile($replacements, 'volume_types/create.php');
-        self::assertInstanceOf(VolumeType::class, $volumeType);
-        self::assertEquals($replacements['{name}'], $volumeType->name);
-
-        $replacements = ['{volumeTypeId}' => $volumeType->id];
-
-        $this->logStep('Getting volume type');
-        /** @var VolumeType $volumeType */
-        require_once $this->sampleFile($replacements, 'volume_types/get.php');
-        self::assertInstanceOf(VolumeType::class, $volumeType);
-
-        $replacements += ['{newName}' => $this->randomStr()];
-
-        $this->logStep('Updating volume type');
-        /** @var VolumeType $volumeType */
-        require_once $this->sampleFile($replacements, 'volume_types/update.php');
-        self::assertInstanceOf(VolumeType::class, $volumeType);
-
-        $this->logStep('Listing volume types');
-        /** @var \Generator $volumeTypes */
-        require_once $this->sampleFile($replacements, 'volume_types/list.php');
-
-        $this->logStep('Deleting volume type');
-        require_once $this->sampleFile($replacements, 'volume_types/delete.php');
-    }
-
-    public function snapshots()
-    {
-        $this->logStep('Creating volume');
-        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
-        $volume->waitUntil('available', 60);
-
-        $replacements = [
-            '{volumeId}' => $volume->id,
-            '{name}' => $this->randomStr(),
-            '{description}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Creating snapshot');
-        /** @var Snapshot $snapshot */
-        require_once $this->sampleFile($replacements, 'snapshots/create.php');
-        self::assertInstanceOf(Snapshot::class, $snapshot);
-        self::assertEquals($replacements['{name}'], $snapshot->name);
-        $volume->waitUntil('available', 60);
-
-        $snapshotId = $snapshot->id;
-        $replacements = ['{snapshotId}' => $snapshotId];
-
-        $this->logStep('Getting snapshot');
-        /** @var Snapshot $snapshot */
-        require_once $this->sampleFile($replacements, 'snapshots/get.php');
-        self::assertInstanceOf(Snapshot::class, $snapshot);
-
-        $this->getService()
-            ->getSnapshot($snapshot->id)
-            ->mergeMetadata(['key1' => 'val1']);
-
-        $replacements += ['{key}' => 'key2', '{val}' => 'val2'];
-        $this->logStep('Adding metadata');
-        require_once $this->sampleFile($replacements, 'snapshots/merge_metadata.php');
-
-        $this->logStep('Retrieving metadata');
-        /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
-        self::assertEquals(['key1' => 'val1', 'key2' => 'val2'], $metadata);
-
-        $replacements = ['{snapshotId}' => $snapshot->id, '{key}' => 'key3', '{val}' => 'val3'];
-        $this->logStep('Resetting metadata');
-        require_once $this->sampleFile($replacements, 'snapshots/reset_metadata.php');
-
-        $this->logStep('Retrieving metadata');
-        /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
-        self::assertEquals(['key3' => 'val3'], $metadata);
-
-        $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
-        $this->logStep('Updating snapshot');
-        require_once $this->sampleFile($replacements, 'snapshots/update.php');
-
-        $snapshot->waitUntil('available', 60);
-
-        $this->logStep('Listing snapshots');
-        require_once $this->sampleFile($replacements, 'snapshots/list.php');
-
-        $this->logStep('Deleting snapshot');
-        require_once $this->sampleFile($replacements, 'snapshots/delete.php');
-        $snapshot->waitUntilDeleted();
-
-        $this->logStep('Deleting volume');
-        $volume->delete();
-    }
-
-    public function snapshotList()
-    {
-        $this->logStep('Creating volume');
-        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
-        $volume->waitUntil('available', 60);
-
-        $names = ['b' . $this->randomStr(), 'a' . $this->randomStr(), 'd' . $this->randomStr(), 'c' . $this->randomStr()];
-        $createdSnapshots = [];
-        foreach ($names as $name) {
-            $this->logStep('Creating snapshot ' . $name);
-            $snapshot = $this->getService()->createSnapshot([
-                'volumeId' => $volume->id,
-                'name' => $name,
-            ]);
-
-            self::assertInstanceOf(Snapshot::class, $snapshot);
-
-            $createdSnapshots[] = $snapshot;
-            $snapshot->waitUntil('available', 60);
-        }
-
-        try {
-            $replacements = [
-                '{sortKey}' => 'display_name',
-                '{sortDir}' => 'asc',
-            ];
-
-            $this->logStep('Listing snapshots');
-            require_once $this->sampleFile($replacements, 'snapshots/list.php');
-
-            $this->logStep('Listing snapshots sorted asc');
-            /** @var Snapshot $snapshot */
-            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
-            self::assertInstanceOf(Snapshot::class, $snapshot);
-            self::assertEquals($names[2], $snapshot->name);
-
-            $this->logStep('Listing snapshots sorted desc');
-            $replacements['{sortDir}'] = 'desc';
-            /** @var Snapshot $snapshot */
-            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
-            self::assertInstanceOf(Snapshot::class, $snapshot);
-            self::assertEquals($names[1], $snapshot->name);
-        } finally {
-            foreach ($createdSnapshots as $snapshot) {
-                $this->logStep('Deleting snapshot ' . $snapshot->name);
-                $snapshot->delete();
-                $snapshot->waitUntilDeleted();
-            }
-
-            $this->logStep('Deleting volume');
-            $volume->delete();
-        }
+        return parent::sampleFile(
+            array_merge(
+                $replacements,
+                ['$openstack->blockStorageV3()' => '$openstack->blockStorageV2()']
+            ),
+            '../v3/' . $path);
     }
 }
diff --git a/tests/integration/BlockStorage/v3/CoreV2Test.php b/tests/integration/BlockStorage/v3/CoreV2Test.php
new file mode 100644
index 00000000..977b7ba0
--- /dev/null
+++ b/tests/integration/BlockStorage/v3/CoreV2Test.php
@@ -0,0 +1,252 @@
+<?php
+
+namespace OpenStack\Integration\BlockStorage\v3;
+
+use OpenStack\BlockStorage\v2\Models\Snapshot;
+use OpenStack\BlockStorage\v2\Models\Volume;
+use OpenStack\BlockStorage\v2\Models\VolumeType;
+use OpenStack\BlockStorage\v2\Service;
+use OpenStack\Integration\TestCase;
+use OpenStack\Integration\Utils;
+
+class CoreV2Test extends TestCase
+{
+    protected $service;
+
+    protected function getService() : Service
+    {
+        if (null === $this->service) {
+            $this->service = Utils::getOpenStack()->blockStorageV3();
+        }
+
+        return $this->service;
+    }
+
+    public function runTests()
+    {
+        $this->startTimer();
+
+        $this->logger->info('-> Volumes');
+        $this->volumes();
+        $this->logger->info('-> Volume Types');
+        $this->volumeTypes();
+        $this->logger->info('-> Snapshots');
+        $this->snapshots();
+        $this->logger->info('-> Snapshot list');
+        $this->snapshotList();
+
+        $this->outputTimeTaken();
+    }
+
+    public function volumes()
+    {
+        $this->logStep('Creating volume type');
+        $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
+
+        $replacements = [
+            '{description}' => $this->randomStr(),
+            "'{size}'" => 1,
+            '{name}' => $this->randomStr(),
+            '{volumeType}' => $volumeType->id,
+            '{key1}' => $this->randomStr(),
+            '{val1}' => $this->randomStr(),
+        ];
+
+        $this->logStep('Creating volume');
+        /** @var Volume $volume */
+        require_once $this->sampleFile($replacements, 'volumes/create.php');
+        self::assertInstanceOf(Volume::class, $volume);
+        self::assertEquals($replacements['{name}'], $volume->name);
+        self::assertEquals(1, $volume->size);
+        self::assertEquals($volumeType->name, $volume->volumeTypeName);
+
+        $volumeId = $volume->id;
+        $replacements = ['{volumeId}' => $volumeId];
+
+        $this->logStep('Getting volume');
+        /** @var Volume $volume */
+        require_once $this->sampleFile($replacements, 'volumes/get.php');
+        self::assertInstanceOf(Volume::class, $volume);
+
+        $replacements += [
+            '{newName}' => $this->randomStr(),
+            '{newDescription}' => $this->randomStr(),
+        ];
+
+        $this->logStep('Updating volume');
+        /** @var Volume $volume */
+        require_once $this->sampleFile($replacements, 'volumes/update.php');
+        self::assertInstanceOf(Volume::class, $volume);
+
+        $this->logStep('Listing volumes');
+        /** @var \Generator $volumes */
+        require_once $this->sampleFile($replacements, 'volumes/list.php');
+
+        $volume = $this->getService()->getVolume($volumeId);
+        $volume->waitUntil('available');
+
+        $this->logStep('Deleting volume');
+        require_once $this->sampleFile($replacements, 'volumes/delete.php');
+
+        $volume = $this->getService()->getVolume($volumeId);
+        $volume->waitUntilDeleted();
+
+        $this->logStep('Deleting volume type');
+        $volumeType->delete();
+    }
+
+    public function volumeTypes()
+    {
+        $replacements = [
+            '{name}' => $this->randomStr(),
+        ];
+
+        $this->logStep('Creating volume type');
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile($replacements, 'volume_types/create.php');
+        self::assertInstanceOf(VolumeType::class, $volumeType);
+        self::assertEquals($replacements['{name}'], $volumeType->name);
+
+        $replacements = ['{volumeTypeId}' => $volumeType->id];
+
+        $this->logStep('Getting volume type');
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile($replacements, 'volume_types/get.php');
+        self::assertInstanceOf(VolumeType::class, $volumeType);
+
+        $replacements += ['{newName}' => $this->randomStr()];
+
+        $this->logStep('Updating volume type');
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile($replacements, 'volume_types/update.php');
+        self::assertInstanceOf(VolumeType::class, $volumeType);
+
+        $this->logStep('Listing volume types');
+        /** @var \Generator $volumeTypes */
+        require_once $this->sampleFile($replacements, 'volume_types/list.php');
+
+        $this->logStep('Deleting volume type');
+        require_once $this->sampleFile($replacements, 'volume_types/delete.php');
+    }
+
+    public function snapshots()
+    {
+        $this->logStep('Creating volume');
+        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
+        $volume->waitUntil('available', 60);
+
+        $replacements = [
+            '{volumeId}' => $volume->id,
+            '{name}' => $this->randomStr(),
+            '{description}' => $this->randomStr(),
+        ];
+
+        $this->logStep('Creating snapshot');
+        /** @var Snapshot $snapshot */
+        require_once $this->sampleFile($replacements, 'snapshots/create.php');
+        self::assertInstanceOf(Snapshot::class, $snapshot);
+        self::assertEquals($replacements['{name}'], $snapshot->name);
+        $volume->waitUntil('available', 60);
+
+        $snapshotId = $snapshot->id;
+        $replacements = ['{snapshotId}' => $snapshotId];
+
+        $this->logStep('Getting snapshot');
+        /** @var Snapshot $snapshot */
+        require_once $this->sampleFile($replacements, 'snapshots/get.php');
+        self::assertInstanceOf(Snapshot::class, $snapshot);
+
+        $this->getService()
+            ->getSnapshot($snapshot->id)
+            ->mergeMetadata(['key1' => 'val1']);
+
+        $replacements += ['{key}' => 'key2', '{val}' => 'val2'];
+        $this->logStep('Adding metadata');
+        require_once $this->sampleFile($replacements, 'snapshots/merge_metadata.php');
+
+        $this->logStep('Retrieving metadata');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
+        self::assertEquals(['key1' => 'val1', 'key2' => 'val2'], $metadata);
+
+        $replacements = ['{snapshotId}' => $snapshot->id, '{key}' => 'key3', '{val}' => 'val3'];
+        $this->logStep('Resetting metadata');
+        require_once $this->sampleFile($replacements, 'snapshots/reset_metadata.php');
+
+        $this->logStep('Retrieving metadata');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
+        self::assertEquals(['key3' => 'val3'], $metadata);
+
+        $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
+        $this->logStep('Updating snapshot');
+        require_once $this->sampleFile($replacements, 'snapshots/update.php');
+
+        $snapshot->waitUntil('available', 60);
+
+        $this->logStep('Listing snapshots');
+        require_once $this->sampleFile($replacements, 'snapshots/list.php');
+
+        $this->logStep('Deleting snapshot');
+        require_once $this->sampleFile($replacements, 'snapshots/delete.php');
+        $snapshot->waitUntilDeleted();
+
+        $this->logStep('Deleting volume');
+        $volume->delete();
+    }
+
+    public function snapshotList()
+    {
+        $this->logStep('Creating volume');
+        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
+        $volume->waitUntil('available', 60);
+
+        $names = ['b' . $this->randomStr(), 'a' . $this->randomStr(), 'd' . $this->randomStr(), 'c' . $this->randomStr()];
+        $createdSnapshots = [];
+        foreach ($names as $name) {
+            $this->logStep('Creating snapshot ' . $name);
+            $snapshot = $this->getService()->createSnapshot([
+                'volumeId' => $volume->id,
+                'name' => $name,
+            ]);
+
+            self::assertInstanceOf(Snapshot::class, $snapshot);
+
+            $createdSnapshots[] = $snapshot;
+            $snapshot->waitUntil('available', 60);
+        }
+
+        try {
+            $replacements = [
+                '{sortKey}' => 'display_name',
+                '{sortDir}' => 'asc',
+            ];
+
+            $this->logStep('Listing snapshots');
+            require_once $this->sampleFile($replacements, 'snapshots/list.php');
+
+            $this->logStep('Listing snapshots sorted asc');
+            /** @var Snapshot $snapshot */
+            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
+            self::assertInstanceOf(Snapshot::class, $snapshot);
+            self::assertEquals($names[2], $snapshot->name);
+
+            $this->logStep('Listing snapshots sorted desc');
+            $replacements['{sortDir}'] = 'desc';
+            /** @var Snapshot $snapshot */
+            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
+            self::assertInstanceOf(Snapshot::class, $snapshot);
+            self::assertEquals($names[1], $snapshot->name);
+        } finally {
+            foreach ($createdSnapshots as $snapshot) {
+                $this->logStep('Deleting snapshot ' . $snapshot->name);
+                $snapshot->delete();
+                $snapshot->waitUntilDeleted();
+            }
+
+            $this->logStep('Deleting volume');
+            $volume->delete();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
index f1f20528..e67eb419 100644
--- a/tests/integration/Compute/v2/CoreTest.php
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -87,7 +87,7 @@ private function getSecurityGroupService(): SecurityGroupService
     private function getBlockStorageService()
     {
         if (!$this->blockStorageService) {
-            $this->blockStorageService = Utils::getOpenStack()->blockStorageV2();
+            $this->blockStorageService = Utils::getOpenStack()->blockStorageV3();
         }
 
         return $this->blockStorageService;
@@ -690,7 +690,7 @@ private function attachVolumeToServer()
         ];
 
         require_once $this->sampleFile($replacements, 'servers/attach_volume_attachment.php');
-        /**@var VolumeAttachment $volumeAttachment */
+        /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
         $this->volumeAttachmentId = $volumeAttachment->id;
 
         $this->volume->waitUntil('in-use');
diff --git a/tests/integration/SampleManager.php b/tests/integration/SampleManager.php
index 42ee22c9..14998109 100644
--- a/tests/integration/SampleManager.php
+++ b/tests/integration/SampleManager.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace OpenStack\integration;
-
-use OpenStack\Integration\SampleManagerInterface;
+namespace OpenStack\Integration;
 
 class SampleManager implements SampleManagerInterface
 {
diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php
index 136f4e9e..cfa0075d 100644
--- a/tests/integration/TestCase.php
+++ b/tests/integration/TestCase.php
@@ -10,7 +10,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase implements TestInter
     protected $logger;
     private $startPoint;
     private $lastPoint;
-    private $sampleManager;
+    protected $sampleManager;
     private $namePrefix = 'phptest_';
 
     public function __construct(LoggerInterface $logger, SampleManagerInterface $sampleManager)
diff --git a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
index fa799587..71d888f4 100644
--- a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
+++ b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
@@ -10,7 +10,7 @@
 class QuotaSetTest extends TestCase
 {
     /** @var QuotaSet */
-    private $quotaSet;
+    protected $quotaSet;
 
     public function setUp(): void
     {
diff --git a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
index d435259a..fdc23eac 100644
--- a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
+++ b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
@@ -10,7 +10,7 @@
 class SnapshotTest extends TestCase
 {
     /** @var Snapshot */
-    private $snapshot;
+    protected $snapshot;
 
     public function setUp(): void
     {
diff --git a/tests/unit/BlockStorage/v2/Models/VolumeTest.php b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
index dadeddae..c29dba35 100644
--- a/tests/unit/BlockStorage/v2/Models/VolumeTest.php
+++ b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
@@ -10,7 +10,7 @@
 class VolumeTest extends TestCase
 {
     /** @var Volume */
-    private $volume;
+    protected $volume;
 
     public function setUp(): void
     {
diff --git a/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php b/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
index ddbb685a..7f760d15 100644
--- a/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
+++ b/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
@@ -10,7 +10,7 @@
 class VolumeTypeTest extends TestCase
 {
     /** @var VolumeType */
-    private $volumeType;
+    protected $volumeType;
 
     public function setUp(): void
     {
diff --git a/tests/unit/BlockStorage/v2/ServiceTest.php b/tests/unit/BlockStorage/v2/ServiceTest.php
index ce1dbe46..f51ff714 100644
--- a/tests/unit/BlockStorage/v2/ServiceTest.php
+++ b/tests/unit/BlockStorage/v2/ServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace unit\BlockStorage\v2;
+namespace OpenStack\Test\BlockStorage\v2;
 
 use GuzzleHttp\Psr7\Response;
 use OpenStack\BlockStorage\v2\Api;
@@ -14,14 +14,13 @@
 class ServiceTest extends TestCase
 {
     /** @var Service */
-    private $service;
+    protected $service;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->rootFixturesDir = __DIR__;
-
         $this->service = new Service($this->client->reveal(), new Api());
     }
 
diff --git a/tests/unit/BlockStorage/v3/FromV2/Models/QuotaSetTest.php b/tests/unit/BlockStorage/v3/FromV2/Models/QuotaSetTest.php
new file mode 100644
index 00000000..06fb93dc
--- /dev/null
+++ b/tests/unit/BlockStorage/v3/FromV2/Models/QuotaSetTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace OpenStack\Test\BlockStorage\v3\FromV2\Models;
+
+use OpenStack\BlockStorage\v3\Api;
+use OpenStack\BlockStorage\v2\Models\QuotaSet;
+
+class QuotaSetTest extends \OpenStack\Test\BlockStorage\v2\Models\QuotaSetTest
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->quotaSet = new QuotaSet($this->client->reveal(), new Api());
+        $this->quotaSet->tenantId = 'tenant-foo';
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/BlockStorage/v3/FromV2/Models/SnapshotTest.php b/tests/unit/BlockStorage/v3/FromV2/Models/SnapshotTest.php
new file mode 100644
index 00000000..de658b51
--- /dev/null
+++ b/tests/unit/BlockStorage/v3/FromV2/Models/SnapshotTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace OpenStack\Test\BlockStorage\v3\FromV2\Models;
+
+use OpenStack\BlockStorage\v3\Api;
+use OpenStack\BlockStorage\v2\Models\Snapshot;
+
+class SnapshotTest extends \OpenStack\Test\BlockStorage\v2\Models\SnapshotTest
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->snapshot = new Snapshot($this->client->reveal(), new Api());
+        $this->snapshot->id = '1';
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/BlockStorage/v3/FromV2/Models/VolumeTest.php b/tests/unit/BlockStorage/v3/FromV2/Models/VolumeTest.php
new file mode 100644
index 00000000..d31ab864
--- /dev/null
+++ b/tests/unit/BlockStorage/v3/FromV2/Models/VolumeTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace OpenStack\Test\BlockStorage\v3\FromV2\Models;
+
+use OpenStack\BlockStorage\v3\Api;
+use OpenStack\BlockStorage\v2\Models\Volume;
+
+class VolumeTest extends \OpenStack\Test\BlockStorage\v2\Models\VolumeTest
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->volume = new Volume($this->client->reveal(), new Api());
+        $this->volume->id = '1';
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/BlockStorage/v3/FromV2/Models/VolumeTypeTest.php b/tests/unit/BlockStorage/v3/FromV2/Models/VolumeTypeTest.php
new file mode 100644
index 00000000..30db3d2e
--- /dev/null
+++ b/tests/unit/BlockStorage/v3/FromV2/Models/VolumeTypeTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace OpenStack\Test\BlockStorage\v3\FromV2\Models;
+
+use OpenStack\BlockStorage\v3\Api;
+use OpenStack\BlockStorage\v2\Models\VolumeType;
+
+class VolumeTypeTest extends \OpenStack\Test\BlockStorage\v2\Models\VolumeTypeTest
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->volumeType = new VolumeType($this->client->reveal(), new Api());
+        $this->volumeType->id = '1';
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/BlockStorage/v3/FromV2/ServiceTest.php b/tests/unit/BlockStorage/v3/FromV2/ServiceTest.php
new file mode 100644
index 00000000..9d570628
--- /dev/null
+++ b/tests/unit/BlockStorage/v3/FromV2/ServiceTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace OpenStack\Test\BlockStorage\v3\FromV2;
+
+use OpenStack\BlockStorage\v2\Service;
+use OpenStack\BlockStorage\v3\Api;
+
+class ServiceTest extends \OpenStack\Test\BlockStorage\v2\ServiceTest
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->service = new Service($this->client->reveal(), new Api());
+    }
+}
diff --git a/tests/unit/OpenStackTest.php b/tests/unit/OpenStackTest.php
index 4ffe3f46..f0e9ee09 100644
--- a/tests/unit/OpenStackTest.php
+++ b/tests/unit/OpenStackTest.php
@@ -14,6 +14,7 @@
 use OpenStack\Networking\v2\Extensions\SecurityGroups\Service as NetworkingServiceV2ExtSecGroup;
 use OpenStack\ObjectStore\v1\Service as ObjectStoreServiceV1;
 use OpenStack\BlockStorage\v2\Service as BlockStorageServiceV2;
+use OpenStack\BlockStorage\v3\Service as BlockStorageServiceV3;
 use OpenStack\Images\v2\Service as ImageServiceV2;
 use OpenStack\Metric\v1\Gnocchi\Service as MetricGnocchiV1;
 
@@ -109,6 +110,16 @@ public function test_it_supports_block_storage_v2()
         $this->openstack->blockStorageV2();
     }
 
+    public function test_it_supports_block_storage_v3()
+    {
+        $this->builder
+            ->createService('BlockStorage\\v3', ['catalogName' => 'cinderv3', 'catalogType' => 'volumev3'])
+            ->shouldBeCalled()
+            ->willReturn($this->service(BlockStorageServiceV3::class));
+
+        $this->openstack->blockStorageV3();
+    }
+
     public function test_it_supports_images_v2()
     {
         $this->builder

From 76510386cfd75ebfa3debc25f5d6d32f2710710f Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Fri, 5 Jan 2024 13:55:39 +0100
Subject: [PATCH 063/102] Chores (#379)

* format via php-cs-fixer
* add unit tests with the lowest possible dependencies
* add unit tests with php 8.2 and 8.3
* add integration tests for  2023.1 antelope and yoga
* allow skipping integration, unit or both tests in pull requests

---------

Co-authored-by: k0ka <k0ka@users.noreply.github.com>
---
 .github/workflows/format.yml                  | 50 +++++++++++++++++
 .github/workflows/integration_tests.yml       | 10 +++-
 .github/workflows/unit_tests.yml              | 23 ++++++--
 .php_cs.dist => .php-cs-fixer.dist.php        |  2 +-
 COVERAGE.md                                   | 18 ++++---
 README.md                                     |  2 +-
 composer.json                                 | 53 ++++++++++++-------
 phpunit.xml.dist                              |  2 +-
 src/BlockStorage/v2/Models/QuotaSet.php       |  9 ----
 src/BlockStorage/v2/Models/Snapshot.php       |  5 --
 src/BlockStorage/v2/Models/Volume.php         | 11 ----
 src/BlockStorage/v2/Models/VolumeType.php     |  2 -
 src/BlockStorage/v2/Service.php               |  3 +-
 src/BlockStorage/v3/Api.php                   |  3 +-
 src/BlockStorage/v3/Service.php               |  3 +-
 src/Common/Api/AbstractParams.php             | 26 ++++-----
 src/Common/Api/ApiInterface.php               |  2 +-
 src/Common/Api/Operation.php                  |  2 -
 src/Common/Api/OperatorTrait.php              | 21 +-------
 src/Common/Api/Parameter.php                  |  4 +-
 src/Common/ArrayAccessTrait.php               |  1 -
 src/Common/Error/Builder.php                  |  5 --
 src/Common/JsonPath.php                       | 11 ----
 src/Common/JsonSchema/JsonPatch.php           |  6 +--
 src/Common/Resource/Alias.php                 |  5 --
 src/Common/Resource/OperatorResource.php      | 10 +---
 src/Common/Resource/ResourceInterface.php     |  6 +--
 src/Common/Service/Builder.php                |  2 -
 src/Common/Transport/HandlerStack.php         |  2 +-
 src/Common/Transport/JsonSerializer.php       |  3 +-
 src/Common/Transport/Middleware.php           |  3 --
 src/Common/Transport/Utils.php                |  2 -
 src/Compute/v2/Enum.php                       | 14 ++---
 src/Compute/v2/Models/Flavor.php              |  9 ----
 src/Compute/v2/Models/Host.php                |  3 --
 src/Compute/v2/Models/Hypervisor.php          |  3 --
 src/Compute/v2/Models/Image.php               | 11 ----
 src/Compute/v2/Models/Keypair.php             | 15 ------
 src/Compute/v2/Models/QuotaSet.php            |  9 ----
 src/Compute/v2/Models/Server.php              | 20 -------
 src/Compute/v2/Service.php                    |  9 +++-
 src/Identity/v2/Models/Catalog.php            |  8 +--
 src/Identity/v2/Models/Entry.php              |  3 --
 src/Identity/v2/Models/Token.php              |  6 ---
 src/Identity/v2/Service.php                   |  4 +-
 src/Identity/v3/Enum.php                      |  6 +--
 src/Identity/v3/Models/Assignment.php         |  3 --
 src/Identity/v3/Models/Catalog.php            |  3 --
 src/Identity/v3/Models/Credential.php         | 12 -----
 src/Identity/v3/Models/Domain.php             | 13 +----
 src/Identity/v3/Models/Endpoint.php           | 11 ----
 src/Identity/v3/Models/Group.php              | 12 +----
 src/Identity/v3/Models/Policy.php             | 11 ----
 src/Identity/v3/Models/Project.php            | 13 +----
 src/Identity/v3/Models/Role.php               |  5 --
 src/Identity/v3/Models/Service.php            | 14 -----
 src/Identity/v3/Models/Token.php              | 14 +----
 src/Identity/v3/Models/User.php               | 11 ----
 src/Identity/v3/Service.php                   | 11 +++-
 src/Images/v2/Models/Image.php                |  6 ---
 src/Images/v2/Models/Member.php               | 12 ++---
 src/Metric/v1/Gnocchi/Models/Metric.php       |  6 ---
 src/Metric/v1/Gnocchi/Models/Resource.php     | 31 +++++------
 src/Metric/v1/Gnocchi/Service.php             |  4 ++
 .../Extensions/Layer3/Models/FloatingIp.php   |  3 --
 .../Extensions/Layer3/Models/GatewayInfo.php  |  3 --
 .../v2/Extensions/Layer3/Models/Router.php    |  6 ---
 .../SecurityGroups/Models/SecurityGroup.php   | 12 -----
 .../Models/SecurityGroupRule.php              |  9 ----
 .../v2/Extensions/SecurityGroups/Service.php  |  1 -
 src/Networking/v2/Models/LoadBalancer.php     | 15 ------
 .../v2/Models/LoadBalancerHealthMonitor.php   | 15 ------
 .../v2/Models/LoadBalancerListener.php        | 15 ------
 .../v2/Models/LoadBalancerMember.php          | 12 -----
 src/Networking/v2/Models/LoadBalancerPool.php | 15 ------
 src/Networking/v2/Models/LoadBalancerStat.php |  3 --
 .../v2/Models/LoadBalancerStatus.php          |  6 ---
 src/Networking/v2/Models/Network.php          | 11 ----
 src/Networking/v2/Models/Port.php             |  3 --
 src/Networking/v2/Models/Quota.php            |  9 ----
 src/Networking/v2/Models/Subnet.php           | 14 -----
 src/Networking/v2/Service.php                 |  5 +-
 src/ObjectStore/v1/Models/Account.php         | 17 +-----
 src/ObjectStore/v1/Models/Container.php       | 38 +++----------
 src/ObjectStore/v1/Models/StorageObject.php   | 25 +--------
 src/ObjectStore/v1/Service.php                |  3 +-
 src/OpenStack.php                             |  1 -
 87 files changed, 229 insertions(+), 631 deletions(-)
 create mode 100644 .github/workflows/format.yml
 rename .php_cs.dist => .php-cs-fixer.dist.php (94%)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
new file mode 100644
index 00000000..db2aacd2
--- /dev/null
+++ b/.github/workflows/format.yml
@@ -0,0 +1,50 @@
+name: "Format"
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  composer-normalize:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          coverage: none
+          extensions: mbstring
+          php-version: 8.2
+
+      - run: composer install --no-interaction --no-progress --no-suggest
+
+      - run: composer normalize
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Normalize composer.json
+
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          coverage: none
+          extensions: mbstring
+          php-version: 8.1
+
+      - run: composer install --no-interaction --no-progress --no-suggest
+
+      - run: vendor/bin/php-cs-fixer fix
+
+      - run: git pull
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Apply php-cs-fixer changes
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index dce570d3..f1646ca8 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -9,7 +9,9 @@ on:
 
 jobs:
   tests:
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    if: |
+      !contains(github.event.pull_request.body, 'skip ci') 
+      && !contains(github.event.pull_request.body, 'skip integration')
     strategy:
       fail-fast: false
       matrix:
@@ -19,9 +21,15 @@ jobs:
           - name: "bobcat"
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
+          - name: "antelope"
+            openstack_version: "stable/2023.1"
+            ubuntu_version: "22.04"
           - name: "zed"
             openstack_version: "stable/zed"
             ubuntu_version: "20.04"
+          - name: "yoga"
+            openstack_version: "stable/yoga"
+            ubuntu_version: "20.04"
           - name: "wallaby"
             openstack_version: "stable/wallaby"
             ubuntu_version: "20.04"
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index ec1fccbe..88eb15c9 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -9,32 +9,45 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-22.04
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    if: |
+      !contains(github.event.pull_request.body, 'skip ci') 
+      && !contains(github.event.pull_request.body, 'skip unit')
     strategy:
       fail-fast: false
       matrix:
-         php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-    name: "php-${{ matrix.php }}"
+         php: [ 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 ]
+         composer:
+           - name: lowest
+             arg: "--prefer-lowest --prefer-stable"
+           - name: highest
+             arg: "" # No args added as highest is default
+    name: PHPUnit on PHP ${{ matrix.php }} with ${{ matrix.composer.name }} dependencies
     steps:
       - uses: actions/checkout@v2
+
       - name: get cache directory
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
+
       - uses: actions/cache@v2
         with:
           path: |
             ~/.php_cs.cache
             ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }}
+          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ matrix.composer.name }}-${{ hashFiles('**.composer.lock') }}
+
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: curl
           tools: composer:v2
           coverage: none
-      - run: composer install --prefer-dist --no-interaction --no-progress
+
+      - run: composer update --prefer-dist --no-interaction --no-progress ${{ matrix.composer.arg }}
+
       - run: vendor/bin/parallel-lint --exclude vendor .
+
       - name: execute unit tests
         run: vendor/bin/phpunit --configuration phpunit.xml.dist
 
diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 94%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index 32d7e97e..5a9aeecf 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -4,7 +4,7 @@
     exit(0);
 }
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules(
         [
             '@PSR2'                  => true,
diff --git a/COVERAGE.md b/COVERAGE.md
index 7957e324..c743bfcb 100644
--- a/COVERAGE.md
+++ b/COVERAGE.md
@@ -1,3 +1,12 @@
+# OpenStack versions coverage
+
+While we strive to support all versions of OpenStack, we can only test limited number of versions. The current set:
+* 2023.2 Bobcat
+* 2023.1 Antelope
+* Zed
+* Yoga
+* Wallaby - as the latest version which had BlockStorage v2 API
+
 # OpenStack services coverage
 
 | Name               |PHP classes|API definition|Unit tests|Sample files|Integration tests|Documentation|
@@ -5,19 +14,11 @@
 | Block Storage v2   |&#10003;|&#10003;|&#10003;||&#10003;||
 | Block Storage v3   |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
 | Compute v2         |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-| Compute v2 exts    |||||||
-| Data Processing v1 |||||||
-| Database v1        |||||||
 | Identity v2        |&#10003;|&#10003;|&#10003;||||
-| Identity v2 exts   |||||||
 | Identity v3        |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-| Identity v3 exts   |||||||
 | Images v2          |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
 | Networking v2      |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-| Networking v2 exts |||||||
 | Object Storage v1  |&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
-| Orchestration v1   |||||||
-| Telemetry v2       |||||||
 
 ## Key
 
@@ -55,3 +56,4 @@ In order for this to be marked complete, every public operation needs to be docu
   have all their keys defined. All types must be defined. Any required options must be marked.
 * a human-readable description
 * a code sample
+
diff --git a/README.md b/README.md
index b6d1fa70..056f8c3a 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ OpenStack services, and versions of services, are supported.
 ## Links
 
 * [Official documentation](https://php-openstack-sdk.readthedocs.io/en/latest/)
-* [Reference documentation](http://refdocs.os.php-opencloud.com)
+* [Supported services](/COVERAGE.md)
 * [Contributing guide](/CONTRIBUTING.md)
 * [Code of Conduct](/CODE_OF_CONDUCT.md)
 
diff --git a/composer.json b/composer.json
index ec065b98..6d460aad 100644
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,47 @@
 {
     "name": "php-opencloud/openstack",
     "description": "PHP SDK for OpenStack APIs. Supports BlockStorage, Compute, Identity, Images, Networking and Metric Gnocchi",
+    "license": "Apache-2.0",
     "keywords": [
         "php",
         "openstack",
         "api",
         "sdk"
     ],
-    "homepage": "https://github.com/php-opencloud/openstack",
-    "license": "Apache-2.0",
     "authors": [
         {
             "name": "Jamie Hannaford",
             "email": "jamie.hannaford@rackspace.com",
-            "homepage" : "https://github.com/jamiehannaford"
+            "homepage": "https://github.com/jamiehannaford"
         },
         {
             "name": "Ha Phan",
             "email": "thanhha.work@gmail.com",
-            "homepage" : "https://github.com/haphan"
+            "homepage": "https://github.com/haphan"
+        },
+        {
+            "name": "Konstantin Babushkin",
+            "email": "koka@idwrx.com",
+            "homepage": "https://github.com/k0ka"
         }
     ],
+    "homepage": "https://github.com/php-opencloud/openstack",
+    "require": {
+        "php": "^7.2.5 || ^8.0",
+        "guzzlehttp/guzzle": "^7.0",
+        "guzzlehttp/psr7": ">=1.7",
+        "guzzlehttp/uri-template": "^0.2 || ^1.0",
+        "justinrainbow/json-schema": "^5.2"
+    },
+    "require-dev": {
+        "ergebnis/composer-normalize": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3",
+        "php-coveralls/php-coveralls": "^2.0",
+        "php-parallel-lint/php-parallel-lint": "^1.2",
+        "phpspec/prophecy": "^1.17",
+        "phpunit/phpunit": ">=8.5.23 <9.0",
+        "psr/log": "^1.0"
+    },
     "autoload": {
         "psr-4": {
             "OpenStack\\": "src/"
@@ -28,27 +49,19 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "OpenStack\\Test\\": "tests/unit/",
-            "OpenStack\\Integration\\": "tests/integration/"
+            "OpenStack\\Integration\\": "tests/integration/",
+            "OpenStack\\Test\\": "tests/unit/"
         }
     },
-    "require": {
-        "php": "^7.2.5|^8.0",
-        "guzzlehttp/guzzle": "^7.0",
-        "guzzlehttp/uri-template": "^0.2|^1.0",
-        "justinrainbow/json-schema": "^5.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^8.0",
-        "psr/log": "^1.0",
-        "php-coveralls/php-coveralls": "^2.0",
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "php-parallel-lint/php-parallel-lint": "^1.2",
-        "phpspec/prophecy": "^1.17"
+    "config": {
+        "allow-plugins": {
+            "ergebnis/composer-normalize": true
+        },
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
-           "dev-master": "3.0-dev"
+            "dev-master": "3.0-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 05ba70a1..22694ff4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true" strict="true">
+<phpunit bootstrap="./vendor/autoload.php" colors="true" beStrictAboutOutputDuringTests="true">
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>
diff --git a/src/BlockStorage/v2/Models/QuotaSet.php b/src/BlockStorage/v2/Models/QuotaSet.php
index d2805248..c603bc28 100644
--- a/src/BlockStorage/v2/Models/QuotaSet.php
+++ b/src/BlockStorage/v2/Models/QuotaSet.php
@@ -58,27 +58,18 @@ class QuotaSet extends OperatorResource implements Retrievable, Updateable, Dele
 
     protected $resourceKey = 'quota_set';
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getQuotaSet(), ['tenantId' => (string) $this->tenantId]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putQuotaSet());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $response = $this->executeWithState($this->api->deleteQuotaSet());
diff --git a/src/BlockStorage/v2/Models/Snapshot.php b/src/BlockStorage/v2/Models/Snapshot.php
index fbf266c4..f05a403b 100644
--- a/src/BlockStorage/v2/Models/Snapshot.php
+++ b/src/BlockStorage/v2/Models/Snapshot.php
@@ -59,9 +59,6 @@ class Snapshot extends OperatorResource implements Listable, Creatable, Updateab
         'os-extended-snapshot-attributes:project_id' => 'projectId',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -84,8 +81,6 @@ public function retrieve()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postSnapshots}
      */
     public function create(array $userOptions): Creatable
diff --git a/src/BlockStorage/v2/Models/Volume.php b/src/BlockStorage/v2/Models/Volume.php
index 7e377f67..1aec74ab 100644
--- a/src/BlockStorage/v2/Models/Volume.php
+++ b/src/BlockStorage/v2/Models/Volume.php
@@ -85,9 +85,6 @@ class Volume extends OperatorResource implements Creatable, Listable, Updateable
         'volume_image_metadata'        => 'volumeImageMetadata',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -110,8 +107,6 @@ public function retrieve()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postVolumes}
      */
     public function create(array $userOptions): Creatable
@@ -179,12 +174,6 @@ public function setImageMetadata(array $metadata)
     /**
      * Administrator only. Resets the status, attach status, and migration status for a volume. Specify the os-reset_status action in the request body.
      *
-     * @param array $options
-     *
-     * $options['status']          = (string) The volume status.
-     * $options['migrationStatus'] = (string) The volume migration status.
-     * $options['attachStatus']    = (string) The volume attach status.    [OPTIONAL]
-     *
      * @see https://developer.openstack.org/api-ref/block-storage/v2/index.html#volume-actions-volumes-action
      */
     public function resetStatus(array $options)
diff --git a/src/BlockStorage/v2/Models/VolumeType.php b/src/BlockStorage/v2/Models/VolumeType.php
index d85ecb93..c54425e2 100644
--- a/src/BlockStorage/v2/Models/VolumeType.php
+++ b/src/BlockStorage/v2/Models/VolumeType.php
@@ -25,8 +25,6 @@ class VolumeType extends OperatorResource implements Listable, Creatable, Update
     protected $resourcesKey = 'volume_types';
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $userOptions {@see \OpenStack\BlockStorage\v2\Api::postTypes}
      */
     public function create(array $userOptions): Creatable
diff --git a/src/BlockStorage/v2/Service.php b/src/BlockStorage/v2/Service.php
index b731d2c2..b509a666 100644
--- a/src/BlockStorage/v2/Service.php
+++ b/src/BlockStorage/v2/Service.php
@@ -11,7 +11,7 @@
 use OpenStack\Common\Service\AbstractService;
 
 /**
- * @property \OpenStack\BlockStorage\v2\Api $api
+ * @property Api $api
  */
 class Service extends AbstractService
 {
@@ -31,6 +31,7 @@ public function createVolume(array $userOptions): Volume
      *
      * @param bool  $detail      if set to TRUE, more information will be returned
      * @param array $userOptions {@see Api::getVolumes}
+     *
      * @return \Generator<mixed, \OpenStack\BlockStorage\v2\Models\Volume>
      */
     public function listVolumes(bool $detail = false, array $userOptions = []): \Generator
diff --git a/src/BlockStorage/v3/Api.php b/src/BlockStorage/v3/Api.php
index 1b8c194f..c0ece274 100644
--- a/src/BlockStorage/v3/Api.php
+++ b/src/BlockStorage/v3/Api.php
@@ -4,5 +4,4 @@
 
 class Api extends \OpenStack\BlockStorage\v2\Api
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/BlockStorage/v3/Service.php b/src/BlockStorage/v3/Service.php
index 9ec33954..f998d727 100644
--- a/src/BlockStorage/v3/Service.php
+++ b/src/BlockStorage/v3/Service.php
@@ -4,5 +4,4 @@
 
 class Service extends \OpenStack\BlockStorage\v2\Service
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/Common/Api/AbstractParams.php b/src/Common/Api/AbstractParams.php
index 7b7b2c77..a62317ee 100644
--- a/src/Common/Api/AbstractParams.php
+++ b/src/Common/Api/AbstractParams.php
@@ -7,21 +7,21 @@
 abstract class AbstractParams
 {
     // locations
-    const QUERY  = 'query';
-    const HEADER = 'header';
-    const URL    = 'url';
-    const JSON   = 'json';
-    const RAW    = 'raw';
+    public const QUERY  = 'query';
+    public const HEADER = 'header';
+    public const URL    = 'url';
+    public const JSON   = 'json';
+    public const RAW    = 'raw';
 
     // types
-    const STRING_TYPE  = 'string';
-    const BOOL_TYPE    = 'boolean';
-    const BOOLEAN_TYPE = self::BOOL_TYPE;
-    const OBJECT_TYPE  = 'object';
-    const ARRAY_TYPE   = 'array';
-    const NULL_TYPE    = 'NULL';
-    const INT_TYPE     = 'integer';
-    const INTEGER_TYPE = self::INT_TYPE;
+    public const STRING_TYPE  = 'string';
+    public const BOOL_TYPE    = 'boolean';
+    public const BOOLEAN_TYPE = self::BOOL_TYPE;
+    public const OBJECT_TYPE  = 'object';
+    public const ARRAY_TYPE   = 'array';
+    public const NULL_TYPE    = 'NULL';
+    public const INT_TYPE     = 'integer';
+    public const INTEGER_TYPE = self::INT_TYPE;
 
     public static function isSupportedLocation(string $val): bool
     {
diff --git a/src/Common/Api/ApiInterface.php b/src/Common/Api/ApiInterface.php
index 149c1f03..86284b42 100644
--- a/src/Common/Api/ApiInterface.php
+++ b/src/Common/Api/ApiInterface.php
@@ -7,7 +7,7 @@
 /**
  * All classes which implement this interface are a data representation of a remote OpenStack API.
  * They do not execute functionality, but instead return data for each API operation for other parts
- * of the SDK to use. Usually, the data is injected into {@see OpenStack\Common\Api\Operation} objects.
+ * of the SDK to use. Usually, the data is injected into {@see Operation} objects.
  * The operation is then serialized into a {@see GuzzleHttp\Message\Request} and sent to the API.
  *
  * The reason for storing all the API-specific data is to decouple service information from client
diff --git a/src/Common/Api/Operation.php b/src/Common/Api/Operation.php
index 26278927..d42cb090 100644
--- a/src/Common/Api/Operation.php
+++ b/src/Common/Api/Operation.php
@@ -65,8 +65,6 @@ public function hasParam(string $key): bool
     }
 
     /**
-     * @param $name
-     *
      * @return Parameter
      */
     public function getParam(string $name)
diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index 1555c21d..7eed4e1b 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -20,9 +20,6 @@ trait OperatorTrait
     /** @var ApiInterface */
     protected $api;
 
-    /**
-     * {@inheritdoc}
-     */
     public function __construct(ClientInterface $client, ApiInterface $api)
     {
         $this->client = $client;
@@ -61,9 +58,9 @@ public function __debugInfo()
      * @param $methodName the name of the method being invoked
      * @param $args       the arguments to be passed to the sequential method
      *
-     * @throws \RuntimeException If method does not exist
-     *
      * @return Promise
+     *
+     * @throws \RuntimeException If method does not exist
      */
     public function __call($methodName, $args)
     {
@@ -90,17 +87,12 @@ function () use (&$promise, $realMethod, $args) {
         throw $e($methodName);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getOperation(array $definition): Operation
     {
         return new Operation($definition);
     }
 
     /**
-     * @return mixed
-     *
      * @throws \Exception
      */
     protected function sendRequest(Operation $operation, array $userValues = [], bool $async = false)
@@ -119,25 +111,16 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
         return $this->client->$method($operation->getMethod(), $uri, $options);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function execute(array $definition, array $userValues = []): ResponseInterface
     {
         return $this->sendRequest($this->getOperation($definition), $userValues);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function executeAsync(array $definition, array $userValues = []): PromiseInterface
     {
         return $this->sendRequest($this->getOperation($definition), $userValues, true);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function model(string $class, $data = null): ResourceInterface
     {
         $model = new $class($this->client, $this->api);
diff --git a/src/Common/Api/Parameter.php b/src/Common/Api/Parameter.php
index 5d46d7e3..bfa8d2e0 100644
--- a/src/Common/Api/Parameter.php
+++ b/src/Common/Api/Parameter.php
@@ -35,7 +35,7 @@ class Parameter
 {
     use HydratorStrategyTrait;
 
-    const DEFAULT_LOCATION = 'json';
+    public const DEFAULT_LOCATION = 'json';
 
     /**
      * The human-friendly name of the parameter. This is what the user will input.
@@ -304,8 +304,6 @@ public function getLocation(): string
 
     /**
      * Verifies whether the given location matches the parameter's location.
-     *
-     * @param $value
      */
     public function hasLocation($value): bool
     {
diff --git a/src/Common/ArrayAccessTrait.php b/src/Common/ArrayAccessTrait.php
index cbd709df..fa9e42f6 100644
--- a/src/Common/ArrayAccessTrait.php
+++ b/src/Common/ArrayAccessTrait.php
@@ -20,7 +20,6 @@ trait ArrayAccessTrait
      * Sets an internal key with a value.
      *
      * @param string $offset
-     * @param mixed  $value
      */
     public function offsetSet($offset, $value)
     {
diff --git a/src/Common/Error/Builder.php b/src/Common/Error/Builder.php
index f7ba9615..796415a2 100644
--- a/src/Common/Error/Builder.php
+++ b/src/Common/Error/Builder.php
@@ -33,9 +33,6 @@ class Builder
      */
     private $client;
 
-    /**
-     * @param ClientInterface $client
-     */
     public function __construct(ClientInterface $client = null)
     {
         $this->client = $client ?: new Client();
@@ -43,8 +40,6 @@ public function __construct(ClientInterface $client = null)
 
     /**
      * Internal method used when outputting headers in the error description.
-     *
-     * @param $name
      */
     private function header(string $name): string
     {
diff --git a/src/Common/JsonPath.php b/src/Common/JsonPath.php
index 346da5ed..18019c35 100644
--- a/src/Common/JsonPath.php
+++ b/src/Common/JsonPath.php
@@ -50,10 +50,6 @@ public function set(string $path, $value)
     /**
      * Internal method for recursive calls.
      *
-     * @param $path
-     * @param $value
-     * @param $json
-     *
      * @return mixed
      */
     private function setPath(string $path, $value, array $json): array
@@ -76,8 +72,6 @@ private function setPath(string $path, $value, array $json): array
 
     /**
      * Return the updated structure.
-     *
-     * @return mixed
      */
     public function getStructure()
     {
@@ -87,8 +81,6 @@ public function getStructure()
     /**
      * Get a path's value. If no path can be matched, NULL is returned.
      *
-     * @param $path
-     *
      * @return mixed|null
      */
     public function get(string $path)
@@ -98,9 +90,6 @@ public function get(string $path)
 
     /**
      * Internal method for recursion.
-     *
-     * @param $path
-     * @param $json
      */
     private function getPath(string $path, $json)
     {
diff --git a/src/Common/JsonSchema/JsonPatch.php b/src/Common/JsonSchema/JsonPatch.php
index 55f93abe..cce7c328 100644
--- a/src/Common/JsonSchema/JsonPatch.php
+++ b/src/Common/JsonSchema/JsonPatch.php
@@ -6,9 +6,9 @@
 
 class JsonPatch
 {
-    const OP_ADD     = 'add';
-    const OP_REPLACE = 'replace';
-    const OP_REMOVE  = 'remove';
+    public const OP_ADD     = 'add';
+    public const OP_REPLACE = 'replace';
+    public const OP_REMOVE  = 'remove';
 
     public static function diff($src, $dest)
     {
diff --git a/src/Common/Resource/Alias.php b/src/Common/Resource/Alias.php
index 69746f22..ebd7a6bf 100644
--- a/src/Common/Resource/Alias.php
+++ b/src/Common/Resource/Alias.php
@@ -33,11 +33,6 @@ public function __construct(string $propertyName, string $className = null, bool
         $this->className    = $className && class_exists($className) ? $className : null;
     }
 
-    /**
-     * @param mixed $value
-     *
-     * @return mixed
-     */
     public function getValue(ResourceInterface $resource, $value)
     {
         if (null === $value || !$this->className) {
diff --git a/src/Common/Resource/OperatorResource.php b/src/Common/Resource/OperatorResource.php
index 11414e28..89492598 100644
--- a/src/Common/Resource/OperatorResource.php
+++ b/src/Common/Resource/OperatorResource.php
@@ -11,7 +11,7 @@ abstract class OperatorResource extends AbstractResource implements OperatorInte
 {
     use OperatorTrait;
 
-    const DEFAULT_MARKER_KEY = 'id';
+    public const DEFAULT_MARKER_KEY = 'id';
 
     /**
      * The key that indicates how the API nests resource collections. For example, when
@@ -47,9 +47,6 @@ protected function getHttpBaseUrl()
         return $this->client->getConfig('base_uri');
     }
 
-    /**
-     * @return mixed
-     */
     public function executeWithState(array $definition)
     {
         return $this->execute($definition, $this->getAttrs(array_keys($definition['params'])));
@@ -84,7 +81,7 @@ public function enumerate(array $def, array $userVals = [], callable $mapFn = nu
             return $this->sendRequest($operation, $userVals);
         };
 
-        $resourceFn = function (array $data) {
+        $resourceFn   = function (array $data) {
             $resource = $this->newInstance();
             $resource->populateFromArray($data);
 
@@ -130,9 +127,6 @@ protected function getService()
         return new $service($this->client, $this->api);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function model(string $class, $data = null): ResourceInterface
     {
         $model = new $class($this->client, $this->api);
diff --git a/src/Common/Resource/ResourceInterface.php b/src/Common/Resource/ResourceInterface.php
index 346ec267..4e51c97e 100644
--- a/src/Common/Resource/ResourceInterface.php
+++ b/src/Common/Resource/ResourceInterface.php
@@ -15,7 +15,6 @@ interface ResourceInterface
      * All models which represent an API resource should be able to be populated
      * from a {@see ResponseInterface} object.
      *
-     * @param \Psr\Http\Message\ResponseInterface $response
      * @return self
      */
     public function populateFromResponse(ResponseInterface $response);
@@ -27,9 +26,10 @@ public function populateFromArray(array $data);
 
     /**
      * @template T of \OpenStack\Common\Resource\ResourceInterface
+     *
      * @param class-string<T> $class the name of the model class
-     * @param mixed  $data either a {@see ResponseInterface} or data array that will populate the newly
-     *                     created model class
+     * @param mixed           $data  either a {@see ResponseInterface} or data array that will populate the newly
+     *                               created model class
      *
      * @return T
      */
diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index 8103aca7..4259c255 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -70,8 +70,6 @@ private function getClasses($namespace)
      * @param string $namespace      The namespace of the service
      * @param array  $serviceOptions The service-specific options to use
      *
-     * @return \OpenStack\Common\Service\ServiceInterface
-     *
      * @throws \Exception
      */
     public function createService(string $namespace, array $serviceOptions = []): ServiceInterface
diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStack.php
index d0205d58..77814928 100644
--- a/src/Common/Transport/HandlerStack.php
+++ b/src/Common/Transport/HandlerStack.php
@@ -9,7 +9,7 @@
 
 class HandlerStack extends GuzzleStack
 {
-    public static function create(?callable $handler = null): GuzzleStack
+    public static function create(callable $handler = null): GuzzleStack
     {
         $stack = new self($handler ?: Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
diff --git a/src/Common/Transport/JsonSerializer.php b/src/Common/Transport/JsonSerializer.php
index 5cd2e25b..0ea5750a 100644
--- a/src/Common/Transport/JsonSerializer.php
+++ b/src/Common/Transport/JsonSerializer.php
@@ -87,6 +87,7 @@ public function stockJson(Parameter $param, $userValue, array $json): array
         } elseif ($param->isObject()) {
             $userValue = $this->stockObjectJson($param, $this->serializeObjectValue($userValue));
         }
+
         // Populate the final value
         return $this->stockValue($param, $userValue, $json);
     }
@@ -97,7 +98,7 @@ private function serializeObjectValue($value)
             if ($value instanceof Serializable) {
                 $value = $value->serialize();
             } elseif (!($value instanceof \stdClass)) {
-                throw new \InvalidArgumentException(sprintf('When an object value is provided, it must either be \stdClass or implement the Serializable '.'interface, you provided %s', print_r($value, true)));
+                throw new \InvalidArgumentException(sprintf('When an object value is provided, it must either be \stdClass or implement the Serializable interface, you provided %s', print_r($value, true)));
             }
         }
 
diff --git a/src/Common/Transport/Middleware.php b/src/Common/Transport/Middleware.php
index 5f3077ca..86f701ed 100644
--- a/src/Common/Transport/Middleware.php
+++ b/src/Common/Transport/Middleware.php
@@ -31,9 +31,6 @@ function (ResponseInterface $response) use ($request) {
         };
     }
 
-    /**
-     * @param Token $token
-     */
     public static function authHandler(callable $tokenGenerator, Token $token = null): callable
     {
         return function (callable $handler) use ($tokenGenerator, $token) {
diff --git a/src/Common/Transport/Utils.php b/src/Common/Transport/Utils.php
index 35ae5842..6a52a81a 100644
--- a/src/Common/Transport/Utils.php
+++ b/src/Common/Transport/Utils.php
@@ -69,8 +69,6 @@ public static function normalizeUrl(string $url): string
 
     /**
      * Add an unlimited list of paths to a given URI.
-     *
-     * @param ...$paths
      */
     public static function addPaths(UriInterface $uri, ...$paths): UriInterface
     {
diff --git a/src/Compute/v2/Enum.php b/src/Compute/v2/Enum.php
index 84e8f591..378445e6 100644
--- a/src/Compute/v2/Enum.php
+++ b/src/Compute/v2/Enum.php
@@ -9,11 +9,11 @@
  */
 abstract class Enum
 {
-    const REBOOT_SOFT         = 'SOFT';
-    const REBOOT_HARD         = 'HARD';
-    const CONSOLE_NOVNC       = 'novnc';
-    const CONSOLE_XVPNC       = 'xvpvnc';
-    const CONSOLE_RDP_HTML5   = 'rdp-html5';
-    const CONSOLE_SPICE_HTML5 = 'spice-html5';
-    const CONSOLE_SERIAL      = 'serial';
+    public const REBOOT_SOFT         = 'SOFT';
+    public const REBOOT_HARD         = 'HARD';
+    public const CONSOLE_NOVNC       = 'novnc';
+    public const CONSOLE_XVPNC       = 'xvpvnc';
+    public const CONSOLE_RDP_HTML5   = 'rdp-html5';
+    public const CONSOLE_SPICE_HTML5 = 'spice-html5';
+    public const CONSOLE_SERIAL      = 'serial';
 }
diff --git a/src/Compute/v2/Models/Flavor.php b/src/Compute/v2/Models/Flavor.php
index 1000aad4..c6ea08b6 100644
--- a/src/Compute/v2/Models/Flavor.php
+++ b/src/Compute/v2/Models/Flavor.php
@@ -41,18 +41,12 @@ class Flavor extends OperatorResource implements Listable, Retrievable, Creatabl
     protected $resourceKey  = 'flavor';
     protected $resourcesKey = 'flavors';
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getFlavor(), ['id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postFlavors(), $userOptions);
@@ -60,9 +54,6 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deleteFlavor(), ['id' => (string) $this->id]);
diff --git a/src/Compute/v2/Models/Host.php b/src/Compute/v2/Models/Host.php
index ad6bbc0f..002502a2 100644
--- a/src/Compute/v2/Models/Host.php
+++ b/src/Compute/v2/Models/Host.php
@@ -31,9 +31,6 @@ class Host extends OperatorResource implements Listable, Retrievable
       'host_name' => 'name',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getHost(), $this->getAttrs(['name']));
diff --git a/src/Compute/v2/Models/Hypervisor.php b/src/Compute/v2/Models/Hypervisor.php
index 6710f949..0490c938 100644
--- a/src/Compute/v2/Models/Hypervisor.php
+++ b/src/Compute/v2/Models/Hypervisor.php
@@ -94,9 +94,6 @@ class Hypervisor extends OperatorResource implements Retrievable, Listable
       'disk_available_least' => 'diskAvailableLeast',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getHypervisor(), ['id' => (string) $this->id]);
diff --git a/src/Compute/v2/Models/Image.php b/src/Compute/v2/Models/Image.php
index 5bd88134..e4614cdd 100644
--- a/src/Compute/v2/Models/Image.php
+++ b/src/Compute/v2/Models/Image.php
@@ -53,9 +53,6 @@ class Image extends OperatorResource implements Listable, Retrievable, Deletable
     protected $resourceKey  = 'image';
     protected $resourcesKey = 'images';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -64,18 +61,12 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getImage(), ['id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deleteImage(), ['id' => (string) $this->id]);
@@ -120,8 +111,6 @@ public function mergeMetadata(array $metadata)
      * Retrieve the value for a specific metadata key.
      *
      * @param string $key {@see \OpenStack\Compute\v2\Api::getImageMetadataKey}
-     *
-     * @return mixed
      */
     public function getMetadataItem(string $key)
     {
diff --git a/src/Compute/v2/Models/Keypair.php b/src/Compute/v2/Models/Keypair.php
index 61c17865..f5c37c76 100644
--- a/src/Compute/v2/Models/Keypair.php
+++ b/src/Compute/v2/Models/Keypair.php
@@ -56,9 +56,6 @@ class Keypair extends OperatorResource implements Listable, Retrievable, Deletab
     protected $resourceKey  = 'keypair';
     protected $resourcesKey = 'keypairs';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -66,18 +63,12 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getKeypair(), $this->getAttrs(['name', 'userId']));
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postKeypair(), $userOptions);
@@ -85,17 +76,11 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function populateFromArray(array $array): self
     {
         return parent::populateFromArray(Utils::flattenJson($array, $this->resourceKey));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deleteKeypair(), ['name' => (string) $this->name]);
diff --git a/src/Compute/v2/Models/QuotaSet.php b/src/Compute/v2/Models/QuotaSet.php
index 719375d5..9b44511f 100644
--- a/src/Compute/v2/Models/QuotaSet.php
+++ b/src/Compute/v2/Models/QuotaSet.php
@@ -147,27 +147,18 @@ class QuotaSet extends OperatorResource implements Retrievable, Updateable, Dele
         'server_groups'               => 'serverGroups',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getQuotaSet(), ['tenantId' => (string) $this->tenantId]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $response = $this->executeWithState($this->api->deleteQuotaSet());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putQuotaSet());
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index 85ab5c35..96a88b12 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -113,9 +113,6 @@ class Server extends OperatorResource implements Creatable, Updateable, Deletabl
         'OS-EXT-SRV-ATTR:hypervisor_hostname' => 'hypervisorHostname',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -127,8 +124,6 @@ protected function getAliases(): array
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $userOptions {@see \OpenStack\Compute\v2\Api::postServer}
      */
     public function create(array $userOptions): Creatable
@@ -142,26 +137,17 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->execute($this->api->putServer(), $this->getAttrs(['id', 'name', 'ipv4', 'ipv6']));
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deleteServer(), $this->getAttrs(['id']));
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getServer(), $this->getAttrs(['id']));
@@ -485,8 +471,6 @@ public function mergeMetadata(array $metadata)
      * Retrieve the value for a specific metadata key.
      *
      * @param string $key {@see \OpenStack\Compute\v2\Api::getServerMetadataKey}
-     *
-     * @return mixed
      */
     public function getMetadataItem(string $key)
     {
@@ -563,8 +547,6 @@ public function listVolumeAttachments(): \Generator
 
     /**
      * Attach a volume and returns volume that was attached.
-     *
-     * @param $volumeId
      */
     public function attachVolume(string $volumeId): VolumeAttachment
     {
@@ -575,8 +557,6 @@ public function attachVolume(string $volumeId): VolumeAttachment
 
     /**
      * Detach a volume.
-     *
-     * @param $attachmentId
      */
     public function detachVolume(string $attachmentId)
     {
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index 3d39c3de..05e7149e 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -19,7 +19,7 @@
 /**
  * Compute v2 service for OpenStack.
  *
- * @property \OpenStack\Compute\v2\Api $api
+ * @property Api $api
  */
 class Service extends AbstractService
 {
@@ -41,6 +41,7 @@ public function createServer(array $options): Server
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getServers}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
+     *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Server>
      */
     public function listServers(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
@@ -74,6 +75,7 @@ public function getServer(array $options = []): Server
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getFlavors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
      * @param bool     $detailed set to true to fetch flavors' details
+     *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Flavor>
      */
     public function listFlavors(array $options = [], callable $mapFn = null, bool $detailed = false): \Generator
@@ -114,6 +116,7 @@ public function createFlavor(array $options = []): Flavor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getImages}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Image>
      */
     public function listImages(array $options = [], callable $mapFn = null): \Generator
@@ -142,6 +145,7 @@ public function getImage(array $options = []): Image
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getKeyPairs}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Keypair>
      */
     public function listKeypairs(array $options = [], callable $mapFn = null): \Generator
@@ -197,6 +201,7 @@ public function getHypervisorStatistics(): HypervisorStatistic
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getHypervisors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
+     *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Hypervisor>
      */
     public function listHypervisors(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
@@ -221,6 +226,7 @@ public function getHypervisor(array $options = []): Hypervisor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getHosts}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Host>
      */
     public function listHosts(array $options = [], callable $mapFn = null): \Generator
@@ -251,6 +257,7 @@ public function getHost(array $options = []): Host
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getAvailabilityZones}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\AvailabilityZone>
      */
     public function listAvailabilityZones(array $options = [], callable $mapFn = null): \Generator
diff --git a/src/Identity/v2/Models/Catalog.php b/src/Identity/v2/Models/Catalog.php
index 247c9faf..91de2d2b 100644
--- a/src/Identity/v2/Models/Catalog.php
+++ b/src/Identity/v2/Models/Catalog.php
@@ -14,7 +14,7 @@
  */
 class Catalog extends OperatorResource implements \OpenStack\Common\Auth\Catalog
 {
-    const DEFAULT_URL_TYPE = 'publicURL';
+    public const DEFAULT_URL_TYPE = 'publicURL';
 
     /**
      * The catalog entries.
@@ -23,9 +23,6 @@ class Catalog extends OperatorResource implements \OpenStack\Common\Auth\Catalog
      */
     public $entries = [];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -33,9 +30,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function populateFromResponse(ResponseInterface $response): self
     {
         $entries = Utils::jsonDecode($response)['access']['serviceCatalog'];
diff --git a/src/Identity/v2/Models/Entry.php b/src/Identity/v2/Models/Entry.php
index 65042877..2c101688 100644
--- a/src/Identity/v2/Models/Entry.php
+++ b/src/Identity/v2/Models/Entry.php
@@ -21,9 +21,6 @@ class Entry extends OperatorResource
     /** @var []Endpoint */
     public $endpoints = [];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
diff --git a/src/Identity/v2/Models/Token.php b/src/Identity/v2/Models/Token.php
index 4599caf6..35281b4b 100644
--- a/src/Identity/v2/Models/Token.php
+++ b/src/Identity/v2/Models/Token.php
@@ -26,9 +26,6 @@ class Token extends OperatorResource implements \OpenStack\Common\Auth\Token
     /** @var Tenant */
     public $tenant;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -38,9 +35,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function populateFromResponse(ResponseInterface $response): self
     {
         $this->populateFromArray(Utils::jsonDecode($response)['access']['token']);
diff --git a/src/Identity/v2/Service.php b/src/Identity/v2/Service.php
index cded85fa..620f6b94 100644
--- a/src/Identity/v2/Service.php
+++ b/src/Identity/v2/Service.php
@@ -13,7 +13,7 @@
 /**
  * Represents the OpenStack Identity v2 service.
  *
- * @property \OpenStack\Identity\v2\Api $api
+ * @property Api $api
  */
 class Service extends AbstractService implements IdentityService
 {
@@ -44,8 +44,6 @@ public function authenticate(array $options = []): array
      * Generates a new authentication token.
      *
      * @param array $options {@see \OpenStack\Identity\v2\Api::postToken}
-     *
-     * @return Models\Token
      */
     public function generateToken(array $options = []): Token
     {
diff --git a/src/Identity/v3/Enum.php b/src/Identity/v3/Enum.php
index 1a6b1c60..60401a2b 100644
--- a/src/Identity/v3/Enum.php
+++ b/src/Identity/v3/Enum.php
@@ -6,7 +6,7 @@
 
 abstract class Enum
 {
-    const INTERFACE_INTERNAL = 'internal';
-    const INTERFACE_PUBLIC   = 'public';
-    const INTERFACE_ADMIN    = 'admin';
+    public const INTERFACE_INTERNAL = 'internal';
+    public const INTERFACE_PUBLIC   = 'public';
+    public const INTERFACE_ADMIN    = 'admin';
 }
diff --git a/src/Identity/v3/Models/Assignment.php b/src/Identity/v3/Models/Assignment.php
index e4bb157c..26032a5f 100644
--- a/src/Identity/v3/Models/Assignment.php
+++ b/src/Identity/v3/Models/Assignment.php
@@ -25,9 +25,6 @@ class Assignment extends OperatorResource implements Listable
     protected $resourcesKey = 'role_assignments';
     protected $resourceKey  = 'role_assignment';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
diff --git a/src/Identity/v3/Models/Catalog.php b/src/Identity/v3/Models/Catalog.php
index 3dc78453..d208d7b6 100644
--- a/src/Identity/v3/Models/Catalog.php
+++ b/src/Identity/v3/Models/Catalog.php
@@ -15,9 +15,6 @@ class Catalog extends OperatorResource implements \OpenStack\Common\Auth\Catalog
     /** @var []Service */
     public $services;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
diff --git a/src/Identity/v3/Models/Credential.php b/src/Identity/v3/Models/Credential.php
index ab844b3e..5bbd28e1 100644
--- a/src/Identity/v3/Models/Credential.php
+++ b/src/Identity/v3/Models/Credential.php
@@ -39,9 +39,6 @@ class Credential extends OperatorResource implements Creatable, Updateable, Retr
         'user_id'    => 'userId',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $data): Creatable
     {
         $response = $this->execute($this->api->postCredentials(), $data);
@@ -49,27 +46,18 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getCredential());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchCredential());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteCredential());
diff --git a/src/Identity/v3/Models/Domain.php b/src/Identity/v3/Models/Domain.php
index 83263ef9..332503e9 100644
--- a/src/Identity/v3/Models/Domain.php
+++ b/src/Identity/v3/Models/Domain.php
@@ -36,8 +36,6 @@ class Domain extends OperatorResource implements Creatable, Listable, Retrievabl
     protected $resourcesKey = 'domains';
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postDomains}
      */
     public function create(array $data): Creatable
@@ -47,27 +45,18 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getDomain());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchDomain());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteDomain());
@@ -75,6 +64,7 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getUserRoles}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listUserRoles(array $options = []): \Generator
@@ -116,6 +106,7 @@ public function revokeUserRole(array $options = [])
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupRoles}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listGroupRoles(array $options = []): \Generator
diff --git a/src/Identity/v3/Models/Endpoint.php b/src/Identity/v3/Models/Endpoint.php
index 5fe0a5bc..1f496fba 100644
--- a/src/Identity/v3/Models/Endpoint.php
+++ b/src/Identity/v3/Models/Endpoint.php
@@ -41,8 +41,6 @@ class Endpoint extends OperatorResource implements Creatable, Updateable, Deleta
     protected $aliases      = ['service_id' => 'serviceId'];
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postEndpoints}
      */
     public function create(array $data): Creatable
@@ -52,27 +50,18 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getEndpoint());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchEndpoint());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deleteEndpoint(), $this->getAttrs(['id']));
diff --git a/src/Identity/v3/Models/Group.php b/src/Identity/v3/Models/Group.php
index 2854a92a..c6869dea 100644
--- a/src/Identity/v3/Models/Group.php
+++ b/src/Identity/v3/Models/Group.php
@@ -38,8 +38,6 @@ class Group extends OperatorResource implements Creatable, Listable, Retrievable
     protected $resourcesKey = 'groups';
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postGroups}
      */
     public function create(array $data): Creatable
@@ -49,27 +47,18 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getGroup(), ['id' => $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchGroup());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deleteGroup(), ['id' => $this->id]);
@@ -77,6 +66,7 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroupUsers}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\User>
      */
     public function listUsers(array $options = []): \Generator
diff --git a/src/Identity/v3/Models/Policy.php b/src/Identity/v3/Models/Policy.php
index 12168829..1ccca4f0 100644
--- a/src/Identity/v3/Models/Policy.php
+++ b/src/Identity/v3/Models/Policy.php
@@ -43,8 +43,6 @@ class Policy extends OperatorResource implements Creatable, Listable, Retrievabl
     ];
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postPolicies}
      */
     public function create(array $data): Creatable
@@ -54,27 +52,18 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getPolicy(), ['id' => $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchPolicy());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deletePolicy(), ['id' => $this->id]);
diff --git a/src/Identity/v3/Models/Project.php b/src/Identity/v3/Models/Project.php
index 68beb3ce..8d58c223 100644
--- a/src/Identity/v3/Models/Project.php
+++ b/src/Identity/v3/Models/Project.php
@@ -47,8 +47,6 @@ class Project extends OperatorResource implements Creatable, Retrievable, Listab
     protected $resourcesKey = 'projects';
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postProjects}
      */
     public function create(array $data): Creatable
@@ -59,27 +57,18 @@ public function create(array $data): Creatable
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getProject());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchProject());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteProject());
@@ -87,6 +76,7 @@ public function delete()
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectUserRoles}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listUserRoles(array $options = []): \Generator
@@ -128,6 +118,7 @@ public function revokeUserRole(array $options)
 
     /**
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjectGroupRoles}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listGroupRoles(array $options = []): \Generator
diff --git a/src/Identity/v3/Models/Role.php b/src/Identity/v3/Models/Role.php
index 907b1005..d2236311 100644
--- a/src/Identity/v3/Models/Role.php
+++ b/src/Identity/v3/Models/Role.php
@@ -27,8 +27,6 @@ class Role extends OperatorResource implements Creatable, Listable, Deletable
     protected $resourcesKey = 'roles';
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postRoles}
      */
     public function create(array $data): Creatable
@@ -38,9 +36,6 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteRole());
diff --git a/src/Identity/v3/Models/Service.php b/src/Identity/v3/Models/Service.php
index 67d0b5f7..6a257dce 100644
--- a/src/Identity/v3/Models/Service.php
+++ b/src/Identity/v3/Models/Service.php
@@ -38,9 +38,6 @@ class Service extends OperatorResource implements Creatable, Listable, Retrievab
     protected $resourceKey  = 'service';
     protected $resourcesKey = 'services';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -49,8 +46,6 @@ protected function getAliases(): array
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postServices}
      */
     public function create(array $data): Creatable
@@ -60,27 +55,18 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getService());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchService());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteService());
diff --git a/src/Identity/v3/Models/Token.php b/src/Identity/v3/Models/Token.php
index b3808a54..56bfcd88 100644
--- a/src/Identity/v3/Models/Token.php
+++ b/src/Identity/v3/Models/Token.php
@@ -31,7 +31,6 @@ class Token extends OperatorResource implements Creatable, Retrievable, \OpenSta
     /** @var Catalog */
     public $catalog;
 
-    /** @var mixed */
     public $extras;
 
     /** @var User */
@@ -48,9 +47,6 @@ class Token extends OperatorResource implements Creatable, Retrievable, \OpenSta
 
     protected $cachedToken;
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -63,9 +59,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function populateFromResponse(ResponseInterface $response)
     {
         parent::populateFromResponse($response);
@@ -87,9 +80,6 @@ public function hasExpired(): bool
         return $this->expires <= new \DateTimeImmutable('now', $this->expires->getTimezone());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getTokens(), ['tokenId' => $this->id]);
@@ -97,8 +87,6 @@ public function retrieve()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postTokens}
      */
     public function create(array $data): Creatable
@@ -106,7 +94,7 @@ public function create(array $data): Creatable
         if (isset($data['user'])) {
             $data['methods'] = ['password'];
             if (!isset($data['user']['id']) && empty($data['user']['domain'])) {
-                throw new \InvalidArgumentException('When authenticating with a username, you must also provide either the domain name or domain ID to '.'which the user belongs to. Alternatively, if you provide a user ID instead, you do not need to '.'provide domain information.');
+                throw new \InvalidArgumentException('When authenticating with a username, you must also provide either the domain name or domain ID to which the user belongs to. Alternatively, if you provide a user ID instead, you do not need to provide domain information.');
             }
         } elseif (isset($data['tokenId'])) {
             $data['methods'] = ['token'];
diff --git a/src/Identity/v3/Models/User.php b/src/Identity/v3/Models/User.php
index fb9480a1..7d5f6dd0 100644
--- a/src/Identity/v3/Models/User.php
+++ b/src/Identity/v3/Models/User.php
@@ -49,8 +49,6 @@ class User extends OperatorResource implements Creatable, Listable, Retrievable,
     protected $resourcesKey = 'users';
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Identity\v3\Api::postUsers}
      */
     public function create(array $data): Creatable
@@ -60,27 +58,18 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getUser(), ['id' => $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->patchUser());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->execute($this->api->deleteUser(), ['id' => $this->id]);
diff --git a/src/Identity/v3/Service.php b/src/Identity/v3/Service.php
index fd6fa07e..1f67f28b 100644
--- a/src/Identity/v3/Service.php
+++ b/src/Identity/v3/Service.php
@@ -12,7 +12,7 @@
 /**
  * Represents the Keystone v3 service.
  *
- * @property \OpenStack\Identity\v3\Api $api
+ * @property Api $api
  */
 class Service extends AbstractService implements IdentityService
 {
@@ -128,6 +128,7 @@ public function createService(array $options): Models\Service
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getServices}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Service>
      */
     public function listServices(array $options = []): \Generator
@@ -173,6 +174,7 @@ public function getEndpoint(string $id): Models\Endpoint
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getEndpoints}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Endpoint>
      */
     public function listEndpoints(array $options = []): \Generator
@@ -196,6 +198,7 @@ public function createDomain(array $options): Models\Domain
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getDomains}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Domain>
      */
     public function listDomains(array $options = []): \Generator
@@ -230,6 +233,7 @@ public function createProject(array $options): Models\Project
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getProjects}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Project>
      */
     public function listProjects(array $options = []): \Generator
@@ -264,6 +268,7 @@ public function createUser(array $options): Models\User
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getUsers}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\User>
      */
     public function listUsers(array $options = []): \Generator
@@ -298,6 +303,7 @@ public function createGroup(array $options): Models\Group
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getGroups}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Group>
      */
     public function listGroups(array $options = []): \Generator
@@ -365,6 +371,7 @@ public function createRole(array $options): Models\Role
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getRoles}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Role>
      */
     public function listRoles(array $options = []): \Generator
@@ -378,6 +385,7 @@ public function listRoles(array $options = []): \Generator
      * collections; you will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getRoleAssignments}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Assignment>
      */
     public function listRoleAssignments(array $options = []): \Generator
@@ -401,6 +409,7 @@ public function createPolicy(array $options): Models\Policy
      * will need to use retrieve() to pull in the full state of the remote resource from the API.
      *
      * @param array $options {@see \OpenStack\Identity\v3\Api::getPolicies}
+     *
      * @return \Generator<mixed, \OpenStack\Identity\v3\Models\Policy>
      */
     public function listPolicies(array $options = []): \Generator
diff --git a/src/Images/v2/Models/Image.php b/src/Images/v2/Models/Image.php
index 6cf172cf..9cff176b 100644
--- a/src/Images/v2/Models/Image.php
+++ b/src/Images/v2/Models/Image.php
@@ -85,9 +85,6 @@ class Image extends OperatorResource implements Creatable, Listable, Retrievable
         'virtual_size'     => 'virtualSize',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -115,9 +112,6 @@ public function populateFromArray(array $data): self
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $data): Creatable
     {
         $response = $this->execute($this->api->postImages(), $data);
diff --git a/src/Images/v2/Models/Member.php b/src/Images/v2/Models/Member.php
index 4b6c6dbb..9023d281 100644
--- a/src/Images/v2/Models/Member.php
+++ b/src/Images/v2/Models/Member.php
@@ -16,9 +16,9 @@
  */
 class Member extends OperatorResource implements Creatable, Listable, Retrievable, Deletable
 {
-    const STATUS_ACCEPTED = 'accepted';
-    const STATUS_PENDING  = 'pending';
-    const STATUS_REJECTED = 'rejected';
+    public const STATUS_ACCEPTED = 'accepted';
+    public const STATUS_PENDING  = 'pending';
+    public const STATUS_REJECTED = 'rejected';
 
     /** @var string */
     public $imageId;
@@ -43,9 +43,6 @@ class Member extends OperatorResource implements Creatable, Listable, Retrievabl
         'image_id'  => 'imageId',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -54,9 +51,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->executeWithState($this->api->postImageMembers());
diff --git a/src/Metric/v1/Gnocchi/Models/Metric.php b/src/Metric/v1/Gnocchi/Models/Metric.php
index 71b489ca..9ad76011 100644
--- a/src/Metric/v1/Gnocchi/Models/Metric.php
+++ b/src/Metric/v1/Gnocchi/Models/Metric.php
@@ -40,9 +40,6 @@ class Metric extends OperatorResource implements Retrievable
         'archive_policy'        => 'archivePolicy',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -50,9 +47,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getMetric());
diff --git a/src/Metric/v1/Gnocchi/Models/Resource.php b/src/Metric/v1/Gnocchi/Models/Resource.php
index c6041dcd..06c2d694 100644
--- a/src/Metric/v1/Gnocchi/Models/Resource.php
+++ b/src/Metric/v1/Gnocchi/Models/Resource.php
@@ -14,21 +14,21 @@
  */
 class Resource extends OperatorResource implements Retrievable
 {
-    const RESOURCE_TYPE_GENERIC                    = 'generic';
-    const RESOURCE_TYPE_CEPH_ACCOUNT               = 'ceph_account';
-    const RESOURCE_TYPE_HOST                       = 'host';
-    const RESOURCE_TYPE_HOST_DISK                  = 'host_disk';
-    const RESOURCE_TYPE_HOST_NETWORK_INTERFACE     = 'host_network_interface';
-    const RESOURCE_TYPE_IDENTITY                   = 'identity';
-    const RESOURCE_TYPE_IMAGE                      = 'image';
-    const RESOURCE_TYPE_INSTANCE                   = 'instance';
-    const RESOURCE_TYPE_INSTANCE_DISK              = 'instance_disk';
-    const RESOURCE_TYPE_INSTANCE_NETWORK_INTERFACE = 'instance_network_interface';
-    const RESOURCE_TYPE_IPMI                       = 'ipmi';
-    const RESOURCE_TYPE_NETWORK                    = 'network';
-    const RESOURCE_TYPE_STACK                      = 'stack';
-    const RESOURCE_TYPE_SWIFT_ACCOUNT              = 'swift_account';
-    const RESOURCE_TYPE_VOLUME                     = 'volume';
+    public const RESOURCE_TYPE_GENERIC                    = 'generic';
+    public const RESOURCE_TYPE_CEPH_ACCOUNT               = 'ceph_account';
+    public const RESOURCE_TYPE_HOST                       = 'host';
+    public const RESOURCE_TYPE_HOST_DISK                  = 'host_disk';
+    public const RESOURCE_TYPE_HOST_NETWORK_INTERFACE     = 'host_network_interface';
+    public const RESOURCE_TYPE_IDENTITY                   = 'identity';
+    public const RESOURCE_TYPE_IMAGE                      = 'image';
+    public const RESOURCE_TYPE_INSTANCE                   = 'instance';
+    public const RESOURCE_TYPE_INSTANCE_DISK              = 'instance_disk';
+    public const RESOURCE_TYPE_INSTANCE_NETWORK_INTERFACE = 'instance_network_interface';
+    public const RESOURCE_TYPE_IPMI                       = 'ipmi';
+    public const RESOURCE_TYPE_NETWORK                    = 'network';
+    public const RESOURCE_TYPE_STACK                      = 'stack';
+    public const RESOURCE_TYPE_SWIFT_ACCOUNT              = 'swift_account';
+    public const RESOURCE_TYPE_VOLUME                     = 'volume';
 
     /** @var string */
     public $createdByUserId;
@@ -138,6 +138,7 @@ public function getMetricMeasures(array $options = []): array
 
     /**
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResourceMetrics}
+     *
      * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Metric>
      */
     public function listResourceMetrics(array $options = []): \Generator
diff --git a/src/Metric/v1/Gnocchi/Service.php b/src/Metric/v1/Gnocchi/Service.php
index 6e418b14..61be0e28 100644
--- a/src/Metric/v1/Gnocchi/Service.php
+++ b/src/Metric/v1/Gnocchi/Service.php
@@ -18,6 +18,7 @@ class Service extends AbstractService
 {
     /**
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\ResourceType type in a generator format.
+     *
      * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\ResourceType>
      */
     public function listResourceTypes(): \Generator
@@ -29,6 +30,7 @@ public function listResourceTypes(): \Generator
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResources}
+     *
      * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Resource>
      */
     public function listResources(array $options = []): \Generator
@@ -57,6 +59,7 @@ public function getResource(array $options = []): Resource
      * Retrieves a collection of \OpenStack\Metric\v1\Gnocchi\Models\Resource type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::searchResources}
+     *
      * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Resource>
      */
     public function searchResources(array $options = []): \Generator
@@ -97,6 +100,7 @@ public function getMetric(string $id): Metric
      * Retrieves a collection of Metric type in a generator format.
      *
      * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getMetrics}
+     *
      * @return \Generator<mixed, \OpenStack\Metric\v1\Gnocchi\Models\Metric>
      */
     public function listMetrics(array $options = []): \Generator
diff --git a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
index 048b942b..07dc0ddb 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
@@ -51,9 +51,6 @@ class FloatingIp extends OperatorResource implements Listable, Creatable, Retrie
     protected $resourceKey  = 'floatingip';
     protected $resourcesKey = 'floatingips';
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postFloatingIps(), $userOptions);
diff --git a/src/Networking/v2/Extensions/Layer3/Models/GatewayInfo.php b/src/Networking/v2/Extensions/Layer3/Models/GatewayInfo.php
index 0614fe05..9fff1ed7 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/GatewayInfo.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/GatewayInfo.php
@@ -21,9 +21,6 @@ class GatewayInfo extends AbstractResource
         'enable_snat' => 'enableSnat',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
diff --git a/src/Networking/v2/Extensions/Layer3/Models/Router.php b/src/Networking/v2/Extensions/Layer3/Models/Router.php
index 63e89bbe..883c46e8 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/Router.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/Router.php
@@ -47,9 +47,6 @@ class Router extends OperatorResource implements Listable, Creatable, Retrievabl
         'tenant_id'      => 'tenantId',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -57,9 +54,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postRouters(), $userOptions);
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
index 20516227..215fad49 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
@@ -51,9 +51,6 @@ class SecurityGroup extends OperatorResource implements Creatable, Listable, Del
     protected $resourceKey  = 'security_group';
     protected $resourcesKey = 'security_groups';
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -62,9 +59,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postSecurityGroups(), $userOptions);
@@ -72,17 +66,11 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteSecurityGroup());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getSecurityGroup());
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
index a7da99bd..825a2f51 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
@@ -80,9 +80,6 @@ class SecurityGroupRule extends OperatorResource implements Creatable, Listable,
 
     protected $resourcesKey = 'security_group_rules';
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postSecurityRules(), $userOptions);
@@ -90,17 +87,11 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteSecurityRule());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->getSecurityRule());
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Service.php b/src/Networking/v2/Extensions/SecurityGroups/Service.php
index 088efd15..4cc69d66 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Service.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Service.php
@@ -22,7 +22,6 @@ private function securityGroupRule(array $info = []): SecurityGroupRule
     }
 
     /**
-     * @param array $options
      * @return \Generator<mixed, SecurityGroup>
      */
     public function listSecurityGroups(array $options = []): \Generator
diff --git a/src/Networking/v2/Models/LoadBalancer.php b/src/Networking/v2/Models/LoadBalancer.php
index 42671b3d..70df8063 100644
--- a/src/Networking/v2/Models/LoadBalancer.php
+++ b/src/Networking/v2/Models/LoadBalancer.php
@@ -81,9 +81,6 @@ class LoadBalancer extends OperatorResource implements Creatable, Retrievable, U
         'provisioning_status' => 'provisioningStatus',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -91,9 +88,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postLoadBalancer(), $userOptions);
@@ -101,27 +95,18 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getLoadBalancer(), ['id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putLoadBalancer());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteLoadBalancer());
diff --git a/src/Networking/v2/Models/LoadBalancerHealthMonitor.php b/src/Networking/v2/Models/LoadBalancerHealthMonitor.php
index 1322e589..bc25dfdd 100644
--- a/src/Networking/v2/Models/LoadBalancerHealthMonitor.php
+++ b/src/Networking/v2/Models/LoadBalancerHealthMonitor.php
@@ -104,9 +104,6 @@ class LoadBalancerHealthMonitor extends OperatorResource implements Creatable, R
         'provisioning_status' => 'provisioningStatus',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -114,9 +111,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postLoadBalancerHealthMonitor(), $userOptions);
@@ -124,27 +118,18 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getLoadBalancerHealthMonitor(), ['id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putLoadBalancerHealthMonitor());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteLoadBalancerHealthMonitor());
diff --git a/src/Networking/v2/Models/LoadBalancerListener.php b/src/Networking/v2/Models/LoadBalancerListener.php
index 2ab1254b..bc817506 100644
--- a/src/Networking/v2/Models/LoadBalancerListener.php
+++ b/src/Networking/v2/Models/LoadBalancerListener.php
@@ -103,9 +103,6 @@ class LoadBalancerListener extends OperatorResource implements Creatable, Retrie
         'provisioning_status' => 'provisioningStatus',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -114,9 +111,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postLoadBalancerListener(), $userOptions);
@@ -124,27 +118,18 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getLoadBalancerListener(), ['id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putLoadBalancerListener());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteLoadBalancerListener());
diff --git a/src/Networking/v2/Models/LoadBalancerMember.php b/src/Networking/v2/Models/LoadBalancerMember.php
index a8d01c2b..a4835bd1 100644
--- a/src/Networking/v2/Models/LoadBalancerMember.php
+++ b/src/Networking/v2/Models/LoadBalancerMember.php
@@ -81,9 +81,6 @@ class LoadBalancerMember extends OperatorResource implements Creatable, Retrieva
         'provisioning_status' => 'provisioningStatus',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $userOptions = array_merge(['poolId' => $this->poolId], $userOptions);
@@ -92,27 +89,18 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getLoadBalancerMember(), ['poolId' => (string) $this->poolId, 'id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putLoadBalancerMember(), ['poolId' => (string) $this->poolId, 'id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteLoadBalancerMember(), ['poolId' => (string) $this->poolId, 'id' => (string) $this->id]);
diff --git a/src/Networking/v2/Models/LoadBalancerPool.php b/src/Networking/v2/Models/LoadBalancerPool.php
index b1881652..195c0e7c 100644
--- a/src/Networking/v2/Models/LoadBalancerPool.php
+++ b/src/Networking/v2/Models/LoadBalancerPool.php
@@ -103,9 +103,6 @@ class LoadBalancerPool extends OperatorResource implements Creatable, Retrievabl
         'provisioning_status' => 'provisioningStatus',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -115,9 +112,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postLoadBalancerPool(), $userOptions);
@@ -125,27 +119,18 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getLoadBalancerPool(), ['id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putLoadBalancerPool());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteLoadBalancerPool());
diff --git a/src/Networking/v2/Models/LoadBalancerStat.php b/src/Networking/v2/Models/LoadBalancerStat.php
index 4b34a91f..0bde1af1 100644
--- a/src/Networking/v2/Models/LoadBalancerStat.php
+++ b/src/Networking/v2/Models/LoadBalancerStat.php
@@ -49,9 +49,6 @@ class LoadBalancerStat extends OperatorResource implements Retrievable
         'loadbalancer_id'    => 'loadbalancerId',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getLoadBalancerStats(), ['loadbalancerId' => (string) $this->loadbalancerId]);
diff --git a/src/Networking/v2/Models/LoadBalancerStatus.php b/src/Networking/v2/Models/LoadBalancerStatus.php
index 367952aa..e89e301c 100644
--- a/src/Networking/v2/Models/LoadBalancerStatus.php
+++ b/src/Networking/v2/Models/LoadBalancerStatus.php
@@ -54,9 +54,6 @@ class LoadBalancerStatus extends OperatorResource implements Retrievable
         'provisioning_status' => 'provisioningStatus',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -64,9 +61,6 @@ protected function getAliases(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getLoadBalancerStatuses(), ['loadbalancerId' => (string) $this->loadbalancerId]);
diff --git a/src/Networking/v2/Models/Network.php b/src/Networking/v2/Models/Network.php
index 8bff5bc3..b9741ef5 100644
--- a/src/Networking/v2/Models/Network.php
+++ b/src/Networking/v2/Models/Network.php
@@ -53,9 +53,6 @@ class Network extends OperatorResource implements Listable, Retrievable, Creatab
     protected $resourceKey  = 'network';
     protected $resourcesKey = 'networks';
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getNetwork(), ['id' => (string) $this->id]);
@@ -77,8 +74,6 @@ public function bulkCreate(array $data): array
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Networking\v2\Api::postNetwork}
      */
     public function create(array $data): Creatable
@@ -88,18 +83,12 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putNetwork());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteNetwork());
diff --git a/src/Networking/v2/Models/Port.php b/src/Networking/v2/Models/Port.php
index 8f1cf03f..9c3dd6d5 100644
--- a/src/Networking/v2/Models/Port.php
+++ b/src/Networking/v2/Models/Port.php
@@ -136,9 +136,6 @@ class Port extends OperatorResource implements Creatable, Updateable, Deletable,
     protected $resourceKey  = 'port';
     protected $resourcesKey = 'ports';
 
-    /**
-     * {@inheritdoc}
-     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postSinglePort(), $userOptions);
diff --git a/src/Networking/v2/Models/Quota.php b/src/Networking/v2/Models/Quota.php
index 3398d1dc..637b9444 100644
--- a/src/Networking/v2/Models/Quota.php
+++ b/src/Networking/v2/Models/Quota.php
@@ -77,27 +77,18 @@ class Quota extends OperatorResource implements Retrievable, Updateable, Deletab
         'rbac_policy'         => 'rbacPolicy',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getQuota(), ['tenantId' => (string) $this->tenantId]);
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putQuota());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteQuota());
diff --git a/src/Networking/v2/Models/Subnet.php b/src/Networking/v2/Models/Subnet.php
index bf77c5c7..f1000c76 100644
--- a/src/Networking/v2/Models/Subnet.php
+++ b/src/Networking/v2/Models/Subnet.php
@@ -68,9 +68,6 @@ class Subnet extends OperatorResource implements Listable, Retrievable, Creatabl
     protected $resourceKey  = 'subnet';
     protected $resourcesKey = 'subnets';
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->getSubnet(), ['id' => (string) $this->id]);
@@ -92,8 +89,6 @@ public function bulkCreate(array $data): array
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\Networking\v2\Api::postSubnet}
      */
     public function create(array $data): Creatable
@@ -103,26 +98,17 @@ public function create(array $data): Creatable
         return $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function update()
     {
         $response = $this->executeWithState($this->api->putSubnet());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteSubnet());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAttrs(array $keys)
     {
         $output = parent::getAttrs($keys);
diff --git a/src/Networking/v2/Service.php b/src/Networking/v2/Service.php
index e99c6176..b66c63be 100644
--- a/src/Networking/v2/Service.php
+++ b/src/Networking/v2/Service.php
@@ -19,7 +19,7 @@
 /**
  * Network v2 service for OpenStack.
  *
- * @property \OpenStack\Networking\v2\Api $api
+ * @property Api $api
  */
 class Service extends AbstractService
 {
@@ -57,6 +57,7 @@ public function getNetwork(string $id): Network
      * List networks.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getNetworks}
+     *
      * @return \Generator<mixed, \OpenStack\Networking\v2\Models\Network>
      */
     public function listNetworks(array $options = []): \Generator
@@ -100,6 +101,7 @@ public function getSubnet(string $id): Subnet
      * List subnets.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getSubnets}
+     *
      * @return \Generator<mixed, \OpenStack\Networking\v2\Models\Subnet>
      */
     public function listSubnets(array $options = []): \Generator
@@ -143,6 +145,7 @@ public function getPort(string $id): Port
      * List ports.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getPorts}
+     *
      * @return \Generator<mixed, \OpenStack\Networking\v2\Models\Port>
      */
     public function listPorts(array $options = []): \Generator
diff --git a/src/ObjectStore/v1/Models/Account.php b/src/ObjectStore/v1/Models/Account.php
index 84ef1fd4..576c6b77 100644
--- a/src/ObjectStore/v1/Models/Account.php
+++ b/src/ObjectStore/v1/Models/Account.php
@@ -16,7 +16,7 @@ class Account extends OperatorResource implements Retrievable, HasMetadata
 {
     use MetadataTrait;
 
-    const METADATA_PREFIX = 'X-Account-Meta-';
+    public const METADATA_PREFIX = 'X-Account-Meta-';
 
     /** @var int */
     public $objectCount;
@@ -33,9 +33,6 @@ class Account extends OperatorResource implements Retrievable, HasMetadata
     /** @var string */
     public $tempUrl;
 
-    /**
-     * {@inheritdoc}
-     */
     public function populateFromResponse(ResponseInterface $response): self
     {
         parent::populateFromResponse($response);
@@ -49,27 +46,18 @@ public function populateFromResponse(ResponseInterface $response): self
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->execute($this->api->headAccount());
         $this->populateFromResponse($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function mergeMetadata(array $metadata)
     {
         $response       = $this->execute($this->api->postAccount(), ['metadata' => $metadata]);
         $this->metadata = $this->parseMetadata($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resetMetadata(array $metadata)
     {
         $options = [
@@ -87,9 +75,6 @@ public function resetMetadata(array $metadata)
         $this->metadata = $this->parseMetadata($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getMetadata(): array
     {
         $response = $this->execute($this->api->headAccount());
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index 6501bfd9..7d3d799e 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -22,7 +22,7 @@ class Container extends OperatorResource implements Creatable, Deletable, Retrie
 {
     use MetadataTrait;
 
-    const METADATA_PREFIX = 'X-Container-Meta-';
+    public const METADATA_PREFIX = 'X-Container-Meta-';
 
     /** @var int */
     public $objectCount;
@@ -38,9 +38,6 @@ class Container extends OperatorResource implements Creatable, Deletable, Retrie
 
     protected $markerKey = 'name';
 
-    /**
-     * {@inheritdoc}
-     */
     public function populateFromResponse(ResponseInterface $response): self
     {
         parent::populateFromResponse($response);
@@ -57,13 +54,14 @@ public function populateFromResponse(ResponseInterface $response): self
      *
      * @param array         $options {@see \OpenStack\ObjectStore\v1\Api::getContainer}
      * @param callable|null $mapFn   allows a function to be mapped over each element
+     *
      * @return \Generator<mixed, \OpenStack\ObjectStore\v1\Models\StorageObject>
      */
     public function listObjects(array $options = [], callable $mapFn = null): \Generator
     {
         $options = array_merge($options, ['name' => $this->name, 'format' => 'json']);
 
-        $appendContainerNameFn = function (StorageObject $resource) use ($mapFn) {
+        $appendContainerNameFn       = function (StorageObject $resource) use ($mapFn) {
             $resource->containerName = $this->name;
             if ($mapFn) {
                 call_user_func_array($mapFn, [&$resource]);
@@ -73,9 +71,6 @@ public function listObjects(array $options = [], callable $mapFn = null): \Gener
         return $this->model(StorageObject::class)->enumerate($this->api->getContainer(), $options, $appendContainerNameFn);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->headContainer());
@@ -83,8 +78,6 @@ public function retrieve()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putContainer}
      */
     public function create(array $data): Creatable
@@ -97,26 +90,17 @@ public function create(array $data): Creatable
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteContainer());
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function mergeMetadata(array $metadata)
     {
         $response       = $this->execute($this->api->postContainer(), ['name' => $this->name, 'metadata' => $metadata]);
         $this->metadata = $this->parseMetadata($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resetMetadata(array $metadata)
     {
         $options = [
@@ -135,9 +119,6 @@ public function resetMetadata(array $metadata)
         $this->metadata = $this->parseMetadata($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getMetadata(): array
     {
         $response = $this->executeWithState($this->api->headContainer());
@@ -183,16 +164,16 @@ public function objectExists(string $name): bool
 
     /**
      * Verifies if provied segment index format for DLOs is valid.
-     * 
+     *
      * @param string $fmt The format of segment index name, e.g. %05d for 00001, 00002, etc.
-     * 
+     *
      * @return bool TRUE if the format is valid, FALSE if it is not
      */
     public function isValidSegmentIndexFormat($fmt)
     {
         $testValue1 = sprintf($fmt, 1);
         $testValue2 = sprintf($fmt, 10);
-    
+
         // Test if different results of the same string length
         return ($testValue1 !== $testValue2) && (strlen($testValue1) === strlen($testValue2));
     }
@@ -214,12 +195,7 @@ public function createObject(array $data): StorageObject
      * container. When this completes, a manifest file is uploaded which references the prefix of the segments,
      * allowing concatenation when a request is executed against the manifest.
      *
-     * @param array  $data                       {@see \OpenStack\ObjectStore\v1\Api::putObject}
-     * @param int    $data['segmentSize']        The size in Bytes of each segment
-     * @param string $data['segmentContainer']   The container to which each segment will be uploaded
-     * @param string $data['segmentPrefix']      The prefix that will come before each segment. If omitted, a default
-     *                                           is used: name/timestamp/filesize
-     * @param string $data['segmentIndexFormat'] The format of segment index name, default %05d - 00001, 00002, etc.
+     * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putObject}
      */
     public function createLargeObject(array $data): StorageObject
     {
diff --git a/src/ObjectStore/v1/Models/StorageObject.php b/src/ObjectStore/v1/Models/StorageObject.php
index d639a0cd..77c40fdb 100644
--- a/src/ObjectStore/v1/Models/StorageObject.php
+++ b/src/ObjectStore/v1/Models/StorageObject.php
@@ -21,7 +21,7 @@ class StorageObject extends OperatorResource implements Creatable, Deletable, Ha
 {
     use MetadataTrait;
 
-    const METADATA_PREFIX = 'X-Object-Meta-';
+    public const METADATA_PREFIX = 'X-Object-Meta-';
 
     /** @var string */
     public $containerName;
@@ -52,9 +52,6 @@ class StorageObject extends OperatorResource implements Creatable, Deletable, Ha
         'subdir'       => 'name',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     protected function getAliases(): array
     {
         return parent::getAliases() + [
@@ -62,9 +59,6 @@ protected function getAliases(): array
             ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function populateFromResponse(ResponseInterface $response): self
     {
         parent::populateFromResponse($response);
@@ -97,8 +91,6 @@ public function getPublicUri(): Uri
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putObject}
      */
     public function create(array $data): Creatable
@@ -121,9 +113,6 @@ public function create(array $data): Creatable
         return $storageObject;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function retrieve()
     {
         $response = $this->executeWithState($this->api->headObject());
@@ -150,9 +139,6 @@ public function download(array $data = []): StreamInterface
         return $response->getBody();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function delete()
     {
         $this->executeWithState($this->api->deleteObject());
@@ -167,9 +153,6 @@ public function copy(array $options)
         $this->execute($this->api->copyObject(), $options);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function mergeMetadata(array $metadata)
     {
         $options = [
@@ -182,9 +165,6 @@ public function mergeMetadata(array $metadata)
         $this->metadata = $this->parseMetadata($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function resetMetadata(array $metadata)
     {
         $options = [
@@ -197,9 +177,6 @@ public function resetMetadata(array $metadata)
         $this->metadata = $this->parseMetadata($response);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getMetadata(): array
     {
         $response = $this->executeWithState($this->api->headObject());
diff --git a/src/ObjectStore/v1/Service.php b/src/ObjectStore/v1/Service.php
index ce029479..d4bdbae7 100644
--- a/src/ObjectStore/v1/Service.php
+++ b/src/ObjectStore/v1/Service.php
@@ -10,7 +10,7 @@
 use OpenStack\ObjectStore\v1\Models\Container;
 
 /**
- * @property \OpenStack\ObjectStore\v1\Api $api
+ * @property Api $api
  */
 class Service extends AbstractService
 {
@@ -27,6 +27,7 @@ public function getAccount(): Account
      *
      * @param array         $options {@see \OpenStack\ObjectStore\v1\Api::getAccount}
      * @param callable|null $mapFn   allows a function to be mapped over each element in the collection
+     *
      * @return \Generator<mixed, \OpenStack\ObjectStore\v1\Models\Container>
      */
     public function listContainers(array $options = [], callable $mapFn = null): \Generator
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 750042da..770b3324 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -33,7 +33,6 @@ class OpenStack
      *         ['messageFormatter'] = (MessageFormatter)  Must set if debugLog is true   [OPTIONAL]
      *         ['requestOptions']   = (array)             Guzzle Http request options    [OPTIONAL]
      *         ['cachedToken']      = (array)             Cached token credential        [OPTIONAL]
-     * @param Builder $builder
      */
     public function __construct(array $options = [], Builder $builder = null)
     {

From aeb50126595deca1331a01b56a088f5ea513e101 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sun, 7 Jan 2024 19:09:51 +0100
Subject: [PATCH 064/102] Application credentials (#380)

* add endpoints to create/get/remove application credentials
* add token creation using application credentials
* cancel running workflows on new commit

---------

Co-authored-by: smarcet <smarcet@gmail.com>
Co-authored-by: k0ka <k0ka@users.noreply.github.com>
---
 .github/workflows/integration_tests.yml       |  4 +
 .github/workflows/unit_tests.yml              |  4 +
 .../identity/v3/application-credentials.rst   | 17 ++++
 doc/services/identity/v3/index.rst            |  1 +
 doc/services/identity/v3/tokens.rst           |  6 ++
 .../add_application_credential.php            | 25 +++++
 .../delete_application_credential.php         | 24 +++++
 .../show_application_credential.php           | 24 +++++
 ...e_token_with_application_credential_id.php | 24 +++++
 .../tokens/generate_token_with_username.php   |  3 +-
 src/Identity/v3/Api.php                       | 48 ++++++++-
 .../v3/Models/ApplicationCredential.php       | 69 +++++++++++++
 src/Identity/v3/Models/Credential.php         |  4 +-
 src/Identity/v3/Models/Token.php              | 10 +-
 src/Identity/v3/Models/User.php               | 24 ++++-
 src/Identity/v3/Params.php                    | 18 ++++
 src/ObjectStore/v1/Models/Container.php       |  8 +-
 src/ObjectStore/v1/Models/StorageObject.php   |  1 +
 .../v3/ApplicationCredentialsTest.php         | 97 +++++++++++++++++++
 tests/integration/Identity/v3/CoreTest.php    | 91 +++++++++++++++--
 .../v3/Fixtures/application_credential.resp   | 31 ++++++
 .../v3/Models/ApplicationCredentialTest.php   | 41 ++++++++
 tests/unit/Identity/v3/Models/UserTest.php    | 20 ++++
 23 files changed, 568 insertions(+), 26 deletions(-)
 create mode 100644 doc/services/identity/v3/application-credentials.rst
 create mode 100644 samples/Identity/v3/application_credentials/add_application_credential.php
 create mode 100644 samples/Identity/v3/application_credentials/delete_application_credential.php
 create mode 100644 samples/Identity/v3/application_credentials/show_application_credential.php
 create mode 100644 samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
 create mode 100644 src/Identity/v3/Models/ApplicationCredential.php
 create mode 100644 tests/integration/Identity/v3/ApplicationCredentialsTest.php
 create mode 100644 tests/unit/Identity/v3/Fixtures/application_credential.resp
 create mode 100644 tests/unit/Identity/v3/Models/ApplicationCredentialTest.php

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index f1646ca8..b94f8184 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -7,6 +7,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     if: |
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 88eb15c9..22972dd7 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -6,6 +6,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     runs-on: ubuntu-22.04
diff --git a/doc/services/identity/v3/application-credentials.rst b/doc/services/identity/v3/application-credentials.rst
new file mode 100644
index 00000000..1d16efc9
--- /dev/null
+++ b/doc/services/identity/v3/application-credentials.rst
@@ -0,0 +1,17 @@
+Application Credentials
+=======================
+
+Add application credential
+--------------------------
+
+.. sample:: Identity/v3/application_credentials/add_application_credentials.php
+
+Show application credential details
+-----------------------------------
+
+.. sample:: Identity/v3/application_credentials/show_application_credentials.php
+
+Delete application credential
+-----------------------------
+
+.. sample:: Identity/v3/application_credentials/delete_application_credentials.php
diff --git a/doc/services/identity/v3/index.rst b/doc/services/identity/v3/index.rst
index 0ee47ad0..6520cc7b 100644
--- a/doc/services/identity/v3/index.rst
+++ b/doc/services/identity/v3/index.rst
@@ -4,6 +4,7 @@ Identity v3
 .. toctree::
   :maxdepth: 3
 
+  application-credentials
   credentials
   domains
   endpoints
diff --git a/doc/services/identity/v3/tokens.rst b/doc/services/identity/v3/tokens.rst
index aff224d1..4802065a 100644
--- a/doc/services/identity/v3/tokens.rst
+++ b/doc/services/identity/v3/tokens.rst
@@ -17,6 +17,12 @@ Generate token with username
 
 .. sample:: Identity/v3/tokens/generate_token_with_username.php
 
+Generate token with application credential ID
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. sample:: Identity/v3/tokens/generate_token_with_application_credential_id.php
+
+
 Generate token from ID
 ~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/samples/Identity/v3/application_credentials/add_application_credential.php b/samples/Identity/v3/application_credentials/add_application_credential.php
new file mode 100644
index 00000000..ae92e376
--- /dev/null
+++ b/samples/Identity/v3/application_credentials/add_application_credential.php
@@ -0,0 +1,25 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$identity = $openstack->identityV3(['region' => '{region}']);
+
+$user = $identity->getUser('{userId}');
+$applicationCredential = $user->createApplicationCredential([
+    'name'        => '{name}',
+    'description' => '{description}',
+]);
diff --git a/samples/Identity/v3/application_credentials/delete_application_credential.php b/samples/Identity/v3/application_credentials/delete_application_credential.php
new file mode 100644
index 00000000..23619cce
--- /dev/null
+++ b/samples/Identity/v3/application_credentials/delete_application_credential.php
@@ -0,0 +1,24 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$identity = $openstack->identityV3(['region' => '{region}']);
+
+$user = $identity->getUser('{userId}');
+$applicationCredential = $user->getApplicationCredential('{applicationCredentialId}');
+$applicationCredential->delete();
+
diff --git a/samples/Identity/v3/application_credentials/show_application_credential.php b/samples/Identity/v3/application_credentials/show_application_credential.php
new file mode 100644
index 00000000..704c63d3
--- /dev/null
+++ b/samples/Identity/v3/application_credentials/show_application_credential.php
@@ -0,0 +1,24 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$identity = $openstack->identityV3(['region' => '{region}']);
+
+$user = $identity->getUser('{userId}');
+$applicationCredential = $user->getApplicationCredential('{applicationCredentialId}');
+$applicationCredential->retrieve();
+
diff --git a/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php b/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
new file mode 100644
index 00000000..b64e8a28
--- /dev/null
+++ b/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
@@ -0,0 +1,24 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
+]);
+
+$identity = $openstack->identityV3();
+
+$token = $identity->generateToken([
+    'application_credential' => [
+        'id'     => '{applicationCredentialId}',
+        'secret' => '{secret}'
+    ]
+]);
diff --git a/samples/Identity/v3/tokens/generate_token_with_username.php b/samples/Identity/v3/tokens/generate_token_with_username.php
index cbab6dd5..632de736 100644
--- a/samples/Identity/v3/tokens/generate_token_with_username.php
+++ b/samples/Identity/v3/tokens/generate_token_with_username.php
@@ -18,9 +18,8 @@
 $identity = $openstack->identityV3();
 
 // Since usernames will not be unique across an entire OpenStack installation,
-// when authenticating with them you must also provide your domain ID. You do
+// when authenticating with them, you must also provide your domain ID. You do
 // not have to do this if you authenticate with a user ID.
-
 $token = $identity->generateToken([
     'user' => [
         'name'     => '{username}',
diff --git a/src/Identity/v3/Api.php b/src/Identity/v3/Api.php
index 325e3ac1..cd664668 100644
--- a/src/Identity/v3/Api.php
+++ b/src/Identity/v3/Api.php
@@ -19,10 +19,11 @@ public function postTokens(): array
             'method' => 'POST',
             'path'   => 'auth/tokens',
             'params' => [
-                'methods' => $this->params->methods(),
-                'user'    => $this->params->user(),
-                'tokenId' => $this->params->tokenBody(),
-                'scope'   => $this->params->scope(),
+                'methods'                => $this->params->methods(),
+                'user'                   => $this->params->user(),
+                'application_credential' => $this->params->applicationCredential(),
+                'tokenId'                => $this->params->tokenBody(),
+                'scope'                  => $this->params->scope(),
             ],
         ];
     }
@@ -837,4 +838,43 @@ public function deletePolicy(): array
             'params' => ['id' => $this->params->idUrl('policy')],
         ];
     }
+
+    public function getApplicationCredential(): array
+    {
+        return [
+            'method'  => 'GET',
+            'path'    => 'users/{userId}/application_credentials/{id}',
+            'jsonKey' => 'application_credential',
+            'params'  => [
+                'id'     => $this->params->idUrl('application_credential'),
+                'userId' => $this->params->idUrl('user'),
+            ],
+        ];
+    }
+
+    public function postApplicationCredential(): array
+    {
+        return [
+            'method'  => 'POST',
+            'path'    => 'users/{userId}/application_credentials',
+            'jsonKey' => 'application_credential',
+            'params'  => [
+                'userId'      => $this->params->idUrl('user'),
+                'name'        => $this->params->name('application_credential'),
+                'description' => $this->params->desc('application_credential'),
+            ],
+        ];
+    }
+
+    public function deleteApplicationCredential(): array
+    {
+        return [
+            'method' => 'DELETE',
+            'path'   => 'users/{userId}/application_credentials/{id}',
+            'params' => [
+                'id'     => $this->params->idUrl('application_credential'),
+                'userId' => $this->params->idUrl('user'),
+            ],
+        ];
+    }
 }
diff --git a/src/Identity/v3/Models/ApplicationCredential.php b/src/Identity/v3/Models/ApplicationCredential.php
new file mode 100644
index 00000000..32644f2e
--- /dev/null
+++ b/src/Identity/v3/Models/ApplicationCredential.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace OpenStack\Identity\v3\Models;
+
+use OpenStack\Common\Resource\Creatable;
+use OpenStack\Common\Resource\Deletable;
+use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
+use OpenStack\Common\Resource\Retrievable;
+
+/**
+ * @property \OpenStack\Identity\v3\Api $api
+ */
+class ApplicationCredential extends OperatorResource implements Creatable, Listable, Retrievable, Deletable
+{
+    /** @var string */
+    public $id;
+
+    /** @var string */
+    public $userId;
+
+    /** @var string */
+    public $name;
+
+    /** @var string */
+    public $description;
+
+    /** @var string|null */
+    public $secret = null;
+
+    protected $aliases = [
+        'user_id' => 'userId',
+    ];
+
+    protected $resourceKey  = 'application_credential';
+    protected $resourcesKey = 'application_credentials';
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param array $userOptions {@see \OpenStack\Identity\v3\Api::postApplicationCredential}
+     */
+    public function create(array $userOptions): Creatable
+    {
+        $response = $this->execute($this->api->postApplicationCredential(), $userOptions);
+
+        return $this->populateFromResponse($response);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function retrieve()
+    {
+        $response = $this->execute(
+            $this->api->getApplicationCredential(),
+            ['id' => $this->id, 'userId' => $this->userId]
+        );
+        $this->populateFromResponse($response);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete()
+    {
+        $this->executeWithState($this->api->deleteApplicationCredential());
+    }
+}
diff --git a/src/Identity/v3/Models/Credential.php b/src/Identity/v3/Models/Credential.php
index 5bbd28e1..294a3ec1 100644
--- a/src/Identity/v3/Models/Credential.php
+++ b/src/Identity/v3/Models/Credential.php
@@ -39,9 +39,9 @@ class Credential extends OperatorResource implements Creatable, Updateable, Retr
         'user_id'    => 'userId',
     ];
 
-    public function create(array $data): Creatable
+    public function create(array $userOptions): Creatable
     {
-        $response = $this->execute($this->api->postCredentials(), $data);
+        $response = $this->execute($this->api->postCredentials(), $userOptions);
 
         return $this->populateFromResponse($response);
     }
diff --git a/src/Identity/v3/Models/Token.php b/src/Identity/v3/Models/Token.php
index 56bfcd88..6794b7f8 100644
--- a/src/Identity/v3/Models/Token.php
+++ b/src/Identity/v3/Models/Token.php
@@ -4,6 +4,7 @@
 
 namespace OpenStack\Identity\v3\Models;
 
+use InvalidArgumentException;
 use OpenStack\Common\Resource\Alias;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\OperatorResource;
@@ -94,12 +95,17 @@ public function create(array $data): Creatable
         if (isset($data['user'])) {
             $data['methods'] = ['password'];
             if (!isset($data['user']['id']) && empty($data['user']['domain'])) {
-                throw new \InvalidArgumentException('When authenticating with a username, you must also provide either the domain name or domain ID to which the user belongs to. Alternatively, if you provide a user ID instead, you do not need to provide domain information.');
+                throw new InvalidArgumentException('When authenticating with a username, you must also provide either the domain name '.'or domain ID to which the user belongs to. Alternatively, if you provide a user ID instead, '.'you do not need to provide domain information.');
+            }
+        } elseif (isset($data['application_credential'])) {
+            $data['methods'] = ['application_credential'];
+            if (!isset($data['application_credential']['id']) || !isset($data['application_credential']['secret'])) {
+                throw new InvalidArgumentException('When authenticating with a application_credential, you must provide application credential ID '.' and application credential secret.');
             }
         } elseif (isset($data['tokenId'])) {
             $data['methods'] = ['token'];
         } else {
-            throw new \InvalidArgumentException('Either a user or token must be provided.');
+            throw new InvalidArgumentException('Either a user, tokenId or application_credential must be provided.');
         }
 
         $response = $this->execute($this->api->postTokens(), $data);
diff --git a/src/Identity/v3/Models/User.php b/src/Identity/v3/Models/User.php
index 7d5f6dd0..28efc859 100644
--- a/src/Identity/v3/Models/User.php
+++ b/src/Identity/v3/Models/User.php
@@ -80,9 +80,7 @@ public function delete()
      */
     public function listGroups(): \Generator
     {
-        $options['id'] = $this->id;
-
-        return $this->model(Group::class)->enumerate($this->api->getUserGroups(), $options);
+        return $this->model(Group::class)->enumerate($this->api->getUserGroups(), ['id' => $this->id]);
     }
 
     /**
@@ -92,4 +90,24 @@ public function listProjects(): \Generator
     {
         return $this->model(Project::class)->enumerate($this->api->getUserProjects(), ['id' => $this->id]);
     }
+
+    /**
+     * Creates a new application credential according to the provided options.
+     *
+     * @param array $options {@see \OpenStack\Identity\v3\Api::postApplicationCredential}
+     */
+    public function createApplicationCredential(array $options): ApplicationCredential
+    {
+        return $this->model(ApplicationCredential::class)->create(['userId' => $this->id] + $options);
+    }
+
+    /**
+     * Retrieves an application credential object and populates its unique identifier object. This operation will not
+     * perform a GET or HEAD request by default; you will need to call retrieve() if you want to pull in remote state
+     * from the API.
+     */
+    public function getApplicationCredential(string $id): ApplicationCredential
+    {
+        return $this->model(ApplicationCredential::class, ['id' => $id, 'userId' => $this->id]);
+    }
 }
diff --git a/src/Identity/v3/Params.php b/src/Identity/v3/Params.php
index f001d3c4..cba08f5f 100644
--- a/src/Identity/v3/Params.php
+++ b/src/Identity/v3/Params.php
@@ -21,6 +21,24 @@ public function methods(): array
         ];
     }
 
+    public function applicationCredential(): array
+    {
+        return [
+            'type'       => self::OBJECT_TYPE,
+            'path'       => 'auth.identity',
+            'properties' => [
+                'id' => [
+                    'type'        => self::STRING_TYPE,
+                    'description' => $this->id('application credential id'),
+                ],
+                'secret' => [
+                    'type'        => self::STRING_TYPE,
+                    'description' => 'The secret of the application credential',
+                ],
+            ],
+        ];
+    }
+
     public function user(): array
     {
         return [
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index 7d3d799e..6448694e 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -78,14 +78,14 @@ public function retrieve()
     }
 
     /**
-     * @param array $data {@see \OpenStack\ObjectStore\v1\Api::putContainer}
+     * @param array $userOptions {@see \OpenStack\ObjectStore\v1\Api::putContainer}
      */
-    public function create(array $data): Creatable
+    public function create(array $userOptions): Creatable
     {
-        $response = $this->execute($this->api->putContainer(), $data);
+        $response = $this->execute($this->api->putContainer(), $userOptions);
 
         $this->populateFromResponse($response);
-        $this->name = $data['name'];
+        $this->name = $userOptions['name'];
 
         return $this;
     }
diff --git a/src/ObjectStore/v1/Models/StorageObject.php b/src/ObjectStore/v1/Models/StorageObject.php
index 77c40fdb..c8a91f60 100644
--- a/src/ObjectStore/v1/Models/StorageObject.php
+++ b/src/ObjectStore/v1/Models/StorageObject.php
@@ -180,6 +180,7 @@ public function resetMetadata(array $metadata)
     public function getMetadata(): array
     {
         $response = $this->executeWithState($this->api->headObject());
+        $this->populateFromResponse($response);
 
         return $this->parseMetadata($response);
     }
diff --git a/tests/integration/Identity/v3/ApplicationCredentialsTest.php b/tests/integration/Identity/v3/ApplicationCredentialsTest.php
new file mode 100644
index 00000000..fcf68d01
--- /dev/null
+++ b/tests/integration/Identity/v3/ApplicationCredentialsTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace OpenStack\Integration\Identity\v3;
+
+use OpenStack\Identity\v3\Models;
+use OpenStack\Integration\TestCase;
+use OpenStack\Integration\Utils;
+
+class ApplicationCredentialsTest extends TestCase
+{
+    private $service;
+
+    /**
+     * @return \OpenStack\Identity\v3\Service
+     */
+    private function getService()
+    {
+        if (null === $this->service) {
+            $this->service = Utils::getOpenStack()->identityV3();
+        }
+
+        return $this->service;
+    }
+
+    public function runTests()
+    {
+        $this->startTimer();
+
+        $this->logger->info('-> Generate token');
+        $this->token();
+
+        $this->outputTimeTaken();
+    }
+
+    public function token()
+    {
+        $this->logStep('Create application credential');
+
+        $name = $this->randomStr();
+        $description = $this->randomStr();
+
+        /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
+        require_once $this->sampleFile(
+            [
+                '{name}' => $name,
+                '{description}' => $description,
+            ],
+            'application_credentials/add_application_credential.php'
+        );
+        self::assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
+        self::assertEquals($name, $applicationCredential->name);
+        self::assertEquals($description, $applicationCredential->description);
+
+        $this->logStep('Create token with id');
+
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        require_once $this->sampleFile(
+            [
+                '{applicationCredentialId}' => $applicationCredential->id,
+                '{secret}' => $applicationCredential->secret
+            ],
+            'tokens/generate_token_with_application_credential_id.php'
+        );
+        self::assertInstanceOf(Models\Token::class, $token);
+
+        /** @var $result bool */
+        require_once $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        self::assertTrue($result);
+
+
+        $this->logStep('Retrieve application credential');
+        $applicationCredentialId = $applicationCredential->id;
+        $applicationCredential = null;
+
+        /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
+        require_once $this->sampleFile(
+            ['{applicationCredentialId}' => $applicationCredentialId],
+            'application_credentials/show_application_credential.php'
+        );
+        self::assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
+        self::assertEquals($name, $applicationCredential->name);
+        self::assertEquals($description, $applicationCredential->description);
+
+
+        $this->logStep('Delete application credential');
+        require_once $this->sampleFile(
+            [
+                '{applicationCredentialId}' => $applicationCredential->id,
+            ],
+            'application_credentials/delete_application_credential.php'
+        );
+
+        /** @var $result bool */
+        require_once $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        self::assertFalse($result);
+    }
+}
\ No newline at end of file
diff --git a/tests/integration/Identity/v3/CoreTest.php b/tests/integration/Identity/v3/CoreTest.php
index 57175e7c..0ebb315f 100644
--- a/tests/integration/Identity/v3/CoreTest.php
+++ b/tests/integration/Identity/v3/CoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\integration\Identity\v3;
+namespace OpenStack\Integration\Identity\v3;
 
 use OpenStack\Identity\v3\Models;
 use OpenStack\Integration\TestCase;
@@ -24,60 +24,115 @@ private function getService()
 
     public function runTests()
     {
-        $this->defaultLogging = true;
         $this->startTimer();
 
+        $this->logger->info('-> Tokens');
         $this->tokens();
+
+        $this->logger->info('-> Domains');
         $this->domains();
 
+        $this->logger->info('-> Endpoints');
+        $this->endpoints();
+
+        $this->logger->info('-> Services');
+        $this->services();
+
+        $this->logger->info('-> Groups');
+        $this->groups();
+
+        $this->logger->info('-> Projects');
+        $this->projects();
+
+        $this->logger->info('-> Roles');
+        $this->roles();
+
+        $this->logger->info('-> Users');
+        $this->users();
+
         $this->outputTimeTaken();
     }
 
     public function tokens()
     {
+        $this->logStep('Generate token with user name');
+
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         $path = $this->sampleFile([], 'tokens/generate_token_with_username.php');
         require_once $path;
         self::assertInstanceOf(Models\Token::class, $token);
 
+        /** @var $result bool */
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        require_once $path;
+        self::assertTrue($result);
+
+
+        $this->logStep('Generate token with user id');
+
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         $path = $this->sampleFile([], 'tokens/generate_token_with_user_id.php');
         require_once $path;
         self::assertInstanceOf(Models\Token::class, $token);
 
-        $replacements = ['{tokenId}' => $token->id];
+        /** @var $result bool */
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        require_once $path;
+        self::assertTrue($result);
 
+
+        $this->logStep('Generate token scoped to project id');
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile($replacements, 'tokens/generate_token_scoped_to_project_id.php');
+        $path = $this->sampleFile([], 'tokens/generate_token_scoped_to_project_id.php');
         require_once $path;
         self::assertInstanceOf(Models\Token::class, $token);
 
+        /** @var $result bool */
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        require_once $path;
+        self::assertTrue($result);
+
+
+        $this->logStep('Generate token scoped to project name');
+
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile($replacements, 'tokens/generate_token_scoped_to_project_name.php');
+        $path = $this->sampleFile([], 'tokens/generate_token_scoped_to_project_name.php');
         require_once $path;
         self::assertInstanceOf(Models\Token::class, $token);
 
+        /** @var $result bool */
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        require_once $path;
+        self::assertTrue($result);
+
+
+        $this->logStep('Generate token from id');
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile($replacements, 'tokens/generate_token_from_id.php');
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/generate_token_from_id.php');
         require_once $path;
         self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements, 'tokens/validate_token.php');
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
         require_once $path;
         self::assertTrue($result);
 
-        $path = $this->sampleFile($replacements, 'tokens/revoke_token.php');
+
+        $this->logStep('Revoke token');
+
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/revoke_token.php');
         require_once $path;
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements, 'tokens/validate_token.php');
+        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
         require_once $path;
         self::assertFalse($result);
     }
 
     public function domains()
     {
+        $this->logStep('Create domain');
+
         $replacements = [
             '{name}'        => $this->randomStr(),
             '{description}' => $this->randomStr(),
@@ -88,16 +143,25 @@ public function domains()
         require_once $path;
         self::assertInstanceOf(Models\Domain::class, $domain);
 
+
+        $this->logStep('List domains');
+
         $replacements['{domainId}'] = $domain->id;
 
         $path = $this->sampleFile([], 'domains/list_domains.php');
         require_once $path;
 
+
+        $this->logStep('Show domain');
+
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
         $path = $this->sampleFile($replacements, 'domains/show_domain.php');
         require_once $path;
         self::assertInstanceOf(Models\Domain::class, $domain);
 
+
+        $this->logStep('Grant and revoke group role');
+
         $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
         $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
 
@@ -117,6 +181,9 @@ public function domains()
 
         $group->delete();
 
+
+        $this->logStep('Grant and revoke user role');
+
         $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
 
         $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/grant_user_role.php');
@@ -136,11 +203,17 @@ public function domains()
         $user->delete();
         $parentRole->delete();
 
+
+        $this->logStep('Update domain');
+
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
         $path = $this->sampleFile($replacements, 'domains/update_domain.php');
         require_once $path;
         self::assertInstanceOf(Models\Domain::class, $domain);
 
+
+        $this->logStep('Delete domain');
+
         $path = $this->sampleFile($replacements, 'domains/delete_domain.php');
         require_once $path;
     }
diff --git a/tests/unit/Identity/v3/Fixtures/application_credential.resp b/tests/unit/Identity/v3/Fixtures/application_credential.resp
new file mode 100644
index 00000000..6d38fea1
--- /dev/null
+++ b/tests/unit/Identity/v3/Fixtures/application_credential.resp
@@ -0,0 +1,31 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "application_credential": {
+    "description": "Application credential for monitoring.",
+    "roles": [
+      {
+        "id": "6aff702516544aeca22817fd3bc39683",
+        "domain_id": null,
+        "name": "Reader"
+      }
+    ],
+    "access_rules": [
+      {
+        "path": "/v2.0/metrics",
+        "id": "07d719df00f349ef8de77d542edf010c",
+        "service": "monitoring",
+        "method": "GET"
+      }
+    ],
+    "links": {
+      "self": "http://example.com/identity/v3/users/fd786d56402c4d1691372e7dee0d00b5/application_credentials/58d61ff8e6e34accb35874016d1dba8b"
+    },
+    "expires_at": "2018-02-27T18:30:59.000000",
+    "unrestricted": false,
+    "project_id": "231c62fb0fbd485b995e8b060c3f0d98",
+    "id": "58d61ff8e6e34accb35874016d1dba8b",
+    "name": "monitoring"
+  }
+}
\ No newline at end of file
diff --git a/tests/unit/Identity/v3/Models/ApplicationCredentialTest.php b/tests/unit/Identity/v3/Models/ApplicationCredentialTest.php
new file mode 100644
index 00000000..5dd357ac
--- /dev/null
+++ b/tests/unit/Identity/v3/Models/ApplicationCredentialTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace OpenStack\Test\Identity\v3\Models;
+
+use GuzzleHttp\Psr7\Response;
+use OpenStack\Identity\v3\Api;
+use OpenStack\Identity\v3\Models\ApplicationCredential;
+use OpenStack\Test\TestCase;
+
+class ApplicationCredentialTest extends TestCase
+{
+    private $applicationCredential;
+
+    public function setUp(): void
+    {
+        $this->rootFixturesDir = dirname(__DIR__);
+
+        parent::setUp();
+
+        $this->applicationCredential = new ApplicationCredential($this->client->reveal(), new Api());
+        $this->applicationCredential->id = 'APPLICATION_CREDENTIAL_ID';
+        $this->applicationCredential->userId = 'USER_ID';
+    }
+
+    public function test_it_retrieves()
+    {
+        $this->setupMock('GET', 'users/USER_ID/application_credentials/APPLICATION_CREDENTIAL_ID', null, [], 'application_credential');
+
+        $this->applicationCredential->retrieve();
+
+        $this->assertEquals('monitoring', $this->applicationCredential->name);
+        $this->assertEquals(null, $this->applicationCredential->secret);
+    }
+
+    public function test_it_deletes()
+    {
+        $this->setupMock('DELETE', 'users/USER_ID/application_credentials/APPLICATION_CREDENTIAL_ID', null, [], new Response(204));
+
+        $this->applicationCredential->delete();
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/Identity/v3/Models/UserTest.php b/tests/unit/Identity/v3/Models/UserTest.php
index b5dce6a5..7a9a9c61 100644
--- a/tests/unit/Identity/v3/Models/UserTest.php
+++ b/tests/unit/Identity/v3/Models/UserTest.php
@@ -65,4 +65,24 @@ public function test_it_lists_projects()
         $fn = $this->createFn($this->user, 'listProjects', []);
         $this->listTest($fn, 'users/USER_ID/projects', 'Project', 'projects');
     }
+
+    public function test_it_creates_application_credential()
+    {
+        $userOptions = [
+            'name'        => 'monitoring',
+            'description' => 'Application credential for monitoring.',
+        ];
+
+        $this->setupMock('POST', 'users/USER_ID/application_credentials', ['application_credential' => $userOptions], [], 'application_credential');
+
+        $applicationCredential = $this->user->createApplicationCredential($userOptions);
+
+        self::assertEquals('monitoring', $applicationCredential->name);
+        self::assertEquals('Application credential for monitoring.', $applicationCredential->description);
+    }
+
+    public function test_it_gets_application_credential()
+    {
+        $this->getTest($this->createFn($this->user, 'getApplicationCredential', 'id'), 'ApplicationCredential');
+    }
 }

From cb8caff6ee81c16c1461306e234c1127adde56bd Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sun, 7 Jan 2024 20:06:59 +0100
Subject: [PATCH 065/102] fix doc for application credentials (#381)

---
 doc/services/identity/v3/application-credentials.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/services/identity/v3/application-credentials.rst b/doc/services/identity/v3/application-credentials.rst
index 1d16efc9..c45b393f 100644
--- a/doc/services/identity/v3/application-credentials.rst
+++ b/doc/services/identity/v3/application-credentials.rst
@@ -4,14 +4,14 @@ Application Credentials
 Add application credential
 --------------------------
 
-.. sample:: Identity/v3/application_credentials/add_application_credentials.php
+.. sample:: Identity/v3/application_credentials/add_application_credential.php
 
 Show application credential details
 -----------------------------------
 
-.. sample:: Identity/v3/application_credentials/show_application_credentials.php
+.. sample:: Identity/v3/application_credentials/show_application_credential.php
 
 Delete application credential
 -----------------------------
 
-.. sample:: Identity/v3/application_credentials/delete_application_credentials.php
+.. sample:: Identity/v3/application_credentials/delete_application_credential.php

From ac3ca5c5a6f70ad6cb9ef97742208a0cb2aa69a7 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sun, 7 Jan 2024 21:00:40 +0100
Subject: [PATCH 066/102] Handler stack factory (#382)

* Changed guzzle final HandlerStack extension to factory class HandlerStackFactory

---------

Co-authored-by: k0ka <k0ka@users.noreply.github.com>
Co-authored-by: jarragon-slash2 <jarragon-slash2@users.noreply.github.com>
---
 src/Common/Service/Builder.php                           | 9 +++++----
 .../{HandlerStack.php => HandlerStackFactory.php}        | 8 ++++----
 src/OpenStack.php                                        | 4 ++--
 tests/unit/Common/Transport/HandlerStackTest.php         | 5 +++--
 4 files changed, 14 insertions(+), 12 deletions(-)
 rename src/Common/Transport/{HandlerStack.php => HandlerStackFactory.php} (54%)

diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index 4259c255..b9fe72c1 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -6,10 +6,11 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware as GuzzleMiddleware;
 use OpenStack\Common\Auth\IdentityService;
 use OpenStack\Common\Auth\Token;
-use OpenStack\Common\Transport\HandlerStack;
+use OpenStack\Common\Transport\HandlerStackFactory;
 use OpenStack\Common\Transport\Middleware;
 use OpenStack\Common\Transport\Utils;
 
@@ -79,7 +80,7 @@ public function createService(string $namespace, array $serviceOptions = []): Se
         $this->stockAuthHandler($options);
         $this->stockHttpClient($options, $namespace);
 
-        list($apiClass, $serviceClass) = $this->getClasses($namespace);
+        [$apiClass, $serviceClass] = $this->getClasses($namespace);
 
         return new $serviceClass($options['httpClient'], new $apiClass());
     }
@@ -91,7 +92,7 @@ private function stockHttpClient(array &$options, string $serviceName)
                 $baseUrl = $options['authUrl'];
                 $stack   = $this->getStack($options['authHandler']);
             } else {
-                list($token, $baseUrl) = $options['identityService']->authenticate($options);
+                [$token, $baseUrl]     = $options['identityService']->authenticate($options);
                 $stack                 = $this->getStack($options['authHandler'], $token);
             }
 
@@ -130,7 +131,7 @@ private function stockAuthHandler(array &$options)
 
     private function getStack(callable $authHandler, Token $token = null): HandlerStack
     {
-        $stack = HandlerStack::create();
+        $stack = HandlerStackFactory::create();
         $stack->push(Middleware::authHandler($authHandler, $token));
 
         return $stack;
diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStackFactory.php
similarity index 54%
rename from src/Common/Transport/HandlerStack.php
rename to src/Common/Transport/HandlerStackFactory.php
index 77814928..a0579a32 100644
--- a/src/Common/Transport/HandlerStack.php
+++ b/src/Common/Transport/HandlerStackFactory.php
@@ -4,14 +4,14 @@
 
 namespace OpenStack\Common\Transport;
 
-use GuzzleHttp\HandlerStack as GuzzleStack;
+use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Utils;
 
-class HandlerStack extends GuzzleStack
+class HandlerStackFactory
 {
-    public static function create(callable $handler = null): GuzzleStack
+    public static function create(callable $handler = null): HandlerStack
     {
-        $stack = new self($handler ?: Utils::chooseHandler());
+        $stack = new HandlerStack($handler ?: Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
         $stack->push(Middleware::prepareBody(), 'prepare_body');
 
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 770b3324..01da51fa 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -7,7 +7,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Middleware as GuzzleMiddleware;
 use OpenStack\Common\Service\Builder;
-use OpenStack\Common\Transport\HandlerStack;
+use OpenStack\Common\Transport\HandlerStackFactory;
 use OpenStack\Common\Transport\Utils;
 use OpenStack\Identity\v3\Service;
 
@@ -49,7 +49,7 @@ private function getDefaultIdentityService(array $options): Service
             throw new \InvalidArgumentException("'authUrl' is a required option");
         }
 
-        $stack = HandlerStack::create();
+        $stack = HandlerStackFactory::create();
 
         if (!empty($options['debugLog'])
             && !empty($options['logger'])
diff --git a/tests/unit/Common/Transport/HandlerStackTest.php b/tests/unit/Common/Transport/HandlerStackTest.php
index 12696bdf..3688838e 100644
--- a/tests/unit/Common/Transport/HandlerStackTest.php
+++ b/tests/unit/Common/Transport/HandlerStackTest.php
@@ -3,13 +3,14 @@
 namespace OpenStack\Test\Common\Transport;
 
 use GuzzleHttp\Handler\MockHandler;
-use OpenStack\Common\Transport\HandlerStack;
+use GuzzleHttp\HandlerStack;
+use OpenStack\Common\Transport\HandlerStackFactory;
 use OpenStack\Test\TestCase;
 
 class HandlerStackTest extends TestCase
 {
     public function test_it_is_created()
     {
-        self::assertInstanceOf(HandlerStack::class, HandlerStack::create(new MockHandler()));
+        self::assertInstanceOf(HandlerStack::class, HandlerStackFactory::create(new MockHandler()));
     }
 }

From 280487410d8661f20d9ce45123fdf1e41eb8f4b9 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sun, 7 Jan 2024 21:01:24 +0100
Subject: [PATCH 067/102] Fix testing class namespaces (#383)

Co-authored-by: peter279k <peter279k@gmail.com>
---
 tests/integration/Identity/v2/CoreTest.php                      | 2 +-
 tests/integration/ObjectStore/v1/CoreTest.php                   | 2 +-
 tests/unit/Common/Transport/MiddlewareTest.php                  | 2 +-
 tests/unit/Images/v2/Models/ImageTest.php                       | 2 +-
 tests/unit/Images/v2/Models/MemberTest.php                      | 2 +-
 .../unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php  | 2 +-
 .../Networking/v2/Extensions/SecurityGroups/ServiceTest.php     | 2 +-
 tests/unit/Networking/v2/Models/PortTest.php                    | 2 +-
 tests/unit/Networking/v2/Models/QuotaTest.php                   | 2 +-
 tests/unit/Networking/v2/Models/SubnetTest.php                  | 2 +-
 tests/unit/TestCase.php                                         | 1 -
 11 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/integration/Identity/v2/CoreTest.php b/tests/integration/Identity/v2/CoreTest.php
index c0382a4b..39045dad 100644
--- a/tests/integration/Identity/v2/CoreTest.php
+++ b/tests/integration/Identity/v2/CoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\integration\Identity\v2;
+namespace OpenStack\Integration\Identity\v2;
 
 use OpenStack\Integration\TestCase;
 
diff --git a/tests/integration/ObjectStore/v1/CoreTest.php b/tests/integration/ObjectStore/v1/CoreTest.php
index dd62a6de..f2889341 100644
--- a/tests/integration/ObjectStore/v1/CoreTest.php
+++ b/tests/integration/ObjectStore/v1/CoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\integration\ObjectStore\v1;
+namespace OpenStack\Integration\ObjectStore\v1;
 
 use OpenStack\Integration\TestCase;
 use OpenStack\Integration\Utils;
diff --git a/tests/unit/Common/Transport/MiddlewareTest.php b/tests/unit/Common/Transport/MiddlewareTest.php
index 06e8da9e..dc084d95 100644
--- a/tests/unit/Common/Transport/MiddlewareTest.php
+++ b/tests/unit/Common/Transport/MiddlewareTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace unit\Common\Transport;
+namespace OpenStack\Test\Common\Transport;
 
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Request;
diff --git a/tests/unit/Images/v2/Models/ImageTest.php b/tests/unit/Images/v2/Models/ImageTest.php
index b1ea1674..f46bc820 100644
--- a/tests/unit/Images/v2/Models/ImageTest.php
+++ b/tests/unit/Images/v2/Models/ImageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpensTack\Test\Images\v2\Models;
+namespace OpenStack\Test\Images\v2\Models;
 
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Stream;
diff --git a/tests/unit/Images/v2/Models/MemberTest.php b/tests/unit/Images/v2/Models/MemberTest.php
index 69880675..6224e921 100644
--- a/tests/unit/Images/v2/Models/MemberTest.php
+++ b/tests/unit/Images/v2/Models/MemberTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace unit\Images\v2\Models;
+namespace OpenStack\Test\Images\v2\Models;
 
 use GuzzleHttp\Psr7\Response;
 use OpenStack\Images\v2\Api;
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
index b6973b2a..844d7e5f 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace unit\Networking\v2\Extensions\Layer3\Models;
+namespace OpenStack\Test\Networking\v2\Extensions\Layer3\Models;
 
 use GuzzleHttp\Psr7\Response;
 use OpenStack\Test\TestCase;
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
index d899d907..e597b3a4 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace unit\Networking\v2\Extensions\SecurityGroups;
+namespace OpenStack\Test\Networking\v2\Extensions\SecurityGroups;
 
 use GuzzleHttp\Psr7\Response;
 use OpenStack\Test\TestCase;
diff --git a/tests/unit/Networking/v2/Models/PortTest.php b/tests/unit/Networking/v2/Models/PortTest.php
index b991ce60..b00a21cf 100644
--- a/tests/unit/Networking/v2/Models/PortTest.php
+++ b/tests/unit/Networking/v2/Models/PortTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\Test\Subneting\v2\Models;
+namespace OpenStack\Test\Networking\v2\Models;
 
 use GuzzleHttp\Psr7\Response;
 use OpenStack\Networking\v2\Api;
diff --git a/tests/unit/Networking/v2/Models/QuotaTest.php b/tests/unit/Networking/v2/Models/QuotaTest.php
index 325f9eb3..898bacd4 100644
--- a/tests/unit/Networking/v2/Models/QuotaTest.php
+++ b/tests/unit/Networking/v2/Models/QuotaTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\Test\Subneting\v2\Models;
+namespace OpenStack\Test\Networking\v2\Models;
 
 use GuzzleHttp\Psr7\Response;
 use OpenStack\Networking\v2\Api;
diff --git a/tests/unit/Networking/v2/Models/SubnetTest.php b/tests/unit/Networking/v2/Models/SubnetTest.php
index a586eb10..18a4876f 100644
--- a/tests/unit/Networking/v2/Models/SubnetTest.php
+++ b/tests/unit/Networking/v2/Models/SubnetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\Test\Subneting\v2\Models;
+namespace OpenStack\Test\Networking\v2\Models;
 
 use GuzzleHttp\Psr7\Response;
 use OpenStack\Networking\v2\Api;
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
index d29b38b7..d1752fe1 100644
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
@@ -6,7 +6,6 @@
 use GuzzleHttp\Psr7\Message;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Utils;
-use Prophecy\Argument;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {

From 45bd478376106c0cfffbd821bb4571274894c263 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Mon, 8 Jan 2024 23:03:10 +0100
Subject: [PATCH 068/102] Refactor tests (#384)

use `include_once $this->sampleFile(` instead of `$path = $this->sampleFile(..); include_once $path`
---
 src/Common/Resource/HasWaiterTrait.php        |   8 +-
 .../integration/BlockStorage/v2/CoreTest.php  |   6 +-
 .../BlockStorage/v3/CoreV2Test.php            |  44 ++--
 tests/integration/Compute/v2/CoreTest.php     | 113 +++++-----
 .../v3/ApplicationCredentialsTest.php         |  24 +--
 tests/integration/Identity/v3/CoreTest.php    | 198 ++++++------------
 tests/integration/Images/v2/CoreTest.php      |  24 +--
 tests/integration/Networking/v2/CoreTest.php  | 101 +++------
 .../integration/Networking/v2/Layer3Test.php  |  15 +-
 tests/integration/ObjectStore/v1/CoreTest.php |  48 ++---
 tests/integration/TestCase.php                |   4 +-
 11 files changed, 239 insertions(+), 346 deletions(-)

diff --git a/src/Common/Resource/HasWaiterTrait.php b/src/Common/Resource/HasWaiterTrait.php
index 7747fdbf..b5ca6e46 100644
--- a/src/Common/Resource/HasWaiterTrait.php
+++ b/src/Common/Resource/HasWaiterTrait.php
@@ -19,10 +19,10 @@ trait HasWaiterTrait
      * will enter a loop, requesting feedback from the remote API until it sends back an appropriate
      * status.
      *
-     * @param string $status      The state to be reached
-     * @param int    $timeout     The maximum timeout. If the total time taken by the waiter has reached
-     *                            or exceed this timeout, the blocking operation will immediately cease.
-     * @param int    $sleepPeriod the amount of time to pause between each HTTP request
+     * @param string   $status      The state to be reached
+     * @param bool|int $timeout     The maximum timeout. If the total time taken by the waiter has reached
+     *                              or exceed this timeout, the blocking operation will immediately cease.
+     * @param int      $sleepPeriod the amount of time to pause between each HTTP request
      */
     public function waitUntil(string $status, $timeout = 60, int $sleepPeriod = 1)
     {
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
index d4193929..41b47a81 100644
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -17,13 +17,13 @@ protected function getService() : Service
         return $this->service;
     }
 
-    protected function sampleFile(array $replacements, $path)
+    protected function sampleFile($path, array $replacements = [])
     {
         return parent::sampleFile(
+            '../v3/' . $path,
             array_merge(
                 $replacements,
                 ['$openstack->blockStorageV3()' => '$openstack->blockStorageV2()']
-            ),
-            '../v3/' . $path);
+            ));
     }
 }
diff --git a/tests/integration/BlockStorage/v3/CoreV2Test.php b/tests/integration/BlockStorage/v3/CoreV2Test.php
index 977b7ba0..a60884ee 100644
--- a/tests/integration/BlockStorage/v3/CoreV2Test.php
+++ b/tests/integration/BlockStorage/v3/CoreV2Test.php
@@ -54,7 +54,7 @@ public function volumes()
 
         $this->logStep('Creating volume');
         /** @var Volume $volume */
-        require_once $this->sampleFile($replacements, 'volumes/create.php');
+        require_once $this->sampleFile('volumes/create.php', $replacements);
         self::assertInstanceOf(Volume::class, $volume);
         self::assertEquals($replacements['{name}'], $volume->name);
         self::assertEquals(1, $volume->size);
@@ -65,7 +65,7 @@ public function volumes()
 
         $this->logStep('Getting volume');
         /** @var Volume $volume */
-        require_once $this->sampleFile($replacements, 'volumes/get.php');
+        require_once $this->sampleFile('volumes/get.php', $replacements);
         self::assertInstanceOf(Volume::class, $volume);
 
         $replacements += [
@@ -75,18 +75,18 @@ public function volumes()
 
         $this->logStep('Updating volume');
         /** @var Volume $volume */
-        require_once $this->sampleFile($replacements, 'volumes/update.php');
+        require_once $this->sampleFile('volumes/update.php', $replacements);
         self::assertInstanceOf(Volume::class, $volume);
 
         $this->logStep('Listing volumes');
         /** @var \Generator $volumes */
-        require_once $this->sampleFile($replacements, 'volumes/list.php');
+        require_once $this->sampleFile('volumes/list.php', $replacements);
 
         $volume = $this->getService()->getVolume($volumeId);
         $volume->waitUntil('available');
 
         $this->logStep('Deleting volume');
-        require_once $this->sampleFile($replacements, 'volumes/delete.php');
+        require_once $this->sampleFile('volumes/delete.php', $replacements);
 
         $volume = $this->getService()->getVolume($volumeId);
         $volume->waitUntilDeleted();
@@ -103,7 +103,7 @@ public function volumeTypes()
 
         $this->logStep('Creating volume type');
         /** @var VolumeType $volumeType */
-        require_once $this->sampleFile($replacements, 'volume_types/create.php');
+        require_once $this->sampleFile('volume_types/create.php', $replacements);
         self::assertInstanceOf(VolumeType::class, $volumeType);
         self::assertEquals($replacements['{name}'], $volumeType->name);
 
@@ -111,22 +111,22 @@ public function volumeTypes()
 
         $this->logStep('Getting volume type');
         /** @var VolumeType $volumeType */
-        require_once $this->sampleFile($replacements, 'volume_types/get.php');
+        require_once $this->sampleFile('volume_types/get.php', $replacements);
         self::assertInstanceOf(VolumeType::class, $volumeType);
 
         $replacements += ['{newName}' => $this->randomStr()];
 
         $this->logStep('Updating volume type');
         /** @var VolumeType $volumeType */
-        require_once $this->sampleFile($replacements, 'volume_types/update.php');
+        require_once $this->sampleFile('volume_types/update.php', $replacements);
         self::assertInstanceOf(VolumeType::class, $volumeType);
 
         $this->logStep('Listing volume types');
         /** @var \Generator $volumeTypes */
-        require_once $this->sampleFile($replacements, 'volume_types/list.php');
+        require_once $this->sampleFile('volume_types/list.php', $replacements);
 
         $this->logStep('Deleting volume type');
-        require_once $this->sampleFile($replacements, 'volume_types/delete.php');
+        require_once $this->sampleFile('volume_types/delete.php', $replacements);
     }
 
     public function snapshots()
@@ -143,7 +143,7 @@ public function snapshots()
 
         $this->logStep('Creating snapshot');
         /** @var Snapshot $snapshot */
-        require_once $this->sampleFile($replacements, 'snapshots/create.php');
+        require_once $this->sampleFile('snapshots/create.php', $replacements);
         self::assertInstanceOf(Snapshot::class, $snapshot);
         self::assertEquals($replacements['{name}'], $snapshot->name);
         $volume->waitUntil('available', 60);
@@ -153,7 +153,7 @@ public function snapshots()
 
         $this->logStep('Getting snapshot');
         /** @var Snapshot $snapshot */
-        require_once $this->sampleFile($replacements, 'snapshots/get.php');
+        require_once $this->sampleFile('snapshots/get.php', $replacements);
         self::assertInstanceOf(Snapshot::class, $snapshot);
 
         $this->getService()
@@ -162,33 +162,33 @@ public function snapshots()
 
         $replacements += ['{key}' => 'key2', '{val}' => 'val2'];
         $this->logStep('Adding metadata');
-        require_once $this->sampleFile($replacements, 'snapshots/merge_metadata.php');
+        require_once $this->sampleFile('snapshots/merge_metadata.php', $replacements);
 
         $this->logStep('Retrieving metadata');
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
+        require_once $this->sampleFile('snapshots/get_metadata.php', $replacements);
         self::assertEquals(['key1' => 'val1', 'key2' => 'val2'], $metadata);
 
         $replacements = ['{snapshotId}' => $snapshot->id, '{key}' => 'key3', '{val}' => 'val3'];
         $this->logStep('Resetting metadata');
-        require_once $this->sampleFile($replacements, 'snapshots/reset_metadata.php');
+        require_once $this->sampleFile('snapshots/reset_metadata.php', $replacements);
 
         $this->logStep('Retrieving metadata');
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
+        require_once $this->sampleFile('snapshots/get_metadata.php', $replacements);
         self::assertEquals(['key3' => 'val3'], $metadata);
 
         $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
         $this->logStep('Updating snapshot');
-        require_once $this->sampleFile($replacements, 'snapshots/update.php');
+        require_once $this->sampleFile('snapshots/update.php', $replacements);
 
         $snapshot->waitUntil('available', 60);
 
         $this->logStep('Listing snapshots');
-        require_once $this->sampleFile($replacements, 'snapshots/list.php');
+        require_once $this->sampleFile('snapshots/list.php', $replacements);
 
         $this->logStep('Deleting snapshot');
-        require_once $this->sampleFile($replacements, 'snapshots/delete.php');
+        require_once $this->sampleFile('snapshots/delete.php', $replacements);
         $snapshot->waitUntilDeleted();
 
         $this->logStep('Deleting volume');
@@ -223,18 +223,18 @@ public function snapshotList()
             ];
 
             $this->logStep('Listing snapshots');
-            require_once $this->sampleFile($replacements, 'snapshots/list.php');
+            require_once $this->sampleFile('snapshots/list.php', $replacements);
 
             $this->logStep('Listing snapshots sorted asc');
             /** @var Snapshot $snapshot */
-            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
+            require_once $this->sampleFile('snapshots/list_sorted.php', $replacements);
             self::assertInstanceOf(Snapshot::class, $snapshot);
             self::assertEquals($names[2], $snapshot->name);
 
             $this->logStep('Listing snapshots sorted desc');
             $replacements['{sortDir}'] = 'desc';
             /** @var Snapshot $snapshot */
-            require_once $this->sampleFile($replacements, 'snapshots/list_sorted.php');
+            require_once $this->sampleFile('snapshots/list_sorted.php', $replacements);
             self::assertInstanceOf(Snapshot::class, $snapshot);
             self::assertEquals($names[1], $snapshot->name);
         } finally {
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
index e67eb419..4bb035fd 100644
--- a/tests/integration/Compute/v2/CoreTest.php
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -18,6 +18,7 @@
 use OpenStack\Networking\v2\Service as NetworkService;
 use OpenStack\BlockStorage\v2\Service as BlockStorageService;
 use OpenStack\Networking\v2\Extensions\SecurityGroups\Service as SecurityGroupService;
+use RuntimeException;
 
 class CoreTest extends TestCase
 {
@@ -60,7 +61,7 @@ class CoreTest extends TestCase
     private $keypairName;
     private $volumeAttachmentId;
 
-    private function getService()
+    private function getService() : \OpenStack\Compute\v2\Service
     {
         if (null === $this->service) {
             $this->service = Utils::getOpenStack()->computeV2();
@@ -69,7 +70,7 @@ private function getService()
         return $this->service;
     }
 
-    private function getNetworkService()
+    private function getNetworkService() : \OpenStack\Networking\v2\Service
     {
         if (!$this->networkService) {
             $this->networkService = Utils::getOpenStack()->networkingV2();
@@ -103,7 +104,7 @@ private function searchImages($name)
         }
 
         if (!$this->imageId) {
-            throw new \RuntimeException(sprintf('Unable to find image "%s". Make sure this image is available for integration test.', $name));
+            throw new RuntimeException(sprintf('Unable to find image "%s". Make sure this image is available for integration test.', $name));
         }
     }
 
@@ -231,7 +232,7 @@ private function createServer()
         $flavorId = getenv('OS_FLAVOR');
 
         if (!$flavorId) {
-            throw new \RuntimeException('OS_FLAVOR env var must be set');
+            throw new RuntimeException('OS_FLAVOR env var must be set');
         }
 
         $replacements = [
@@ -242,10 +243,9 @@ private function createServer()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        $path = $this->sampleFile($replacements, 'servers/create_server.php');
-        require_once $path;
+        require_once $this->sampleFile('servers/create_server.php', $replacements);
 
-        $server->waitUntilActive(false);
+        $server->waitUntilActive();
 
         self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
         self::assertNotEmpty($server->id);
@@ -267,8 +267,7 @@ private function updateServer()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        $path = $this->sampleFile($replacements, 'servers/update_server.php');
-        require_once $path;
+        require_once $this->sampleFile('servers/update_server.php', $replacements);
 
         self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
         self::assertEquals($name, $server->name);
@@ -283,8 +282,7 @@ private function deleteServer()
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        $path = $this->sampleFile($replacements, 'servers/delete_server.php');
-        require_once $path;
+        require_once $this->sampleFile('servers/delete_server.php', $replacements);
 
         // Needed so that subnet and network can be removed
         $server->waitUntilDeleted();
@@ -296,8 +294,7 @@ private function retrieveServer()
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        $path = $this->sampleFile($replacements, 'servers/get_server.php');
-        require_once $path;
+        require_once $this->sampleFile('servers/get_server.php', $replacements);
 
         self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
         self::assertEquals($this->serverId, $server->id);
@@ -317,13 +314,13 @@ private function serverMetadata()
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/reset_server_metadata.php');
+        require_once $this->sampleFile('servers/reset_server_metadata.php', $replacements);
         $this->logStep('Reset metadata of server {serverId}', $replacements);
 
-        require_once $this->sampleFile($replacements, 'servers/get_server_metadata.php');
+        require_once $this->sampleFile('servers/get_server_metadata.php', $replacements);
         $this->logStep('Retrieved metadata of server {serverId}', $replacements);
 
-        require_once $this->sampleFile($replacements, 'servers/delete_server_metadata_item.php');
+        require_once $this->sampleFile('servers/delete_server_metadata_item.php', $replacements);
         $this->logStep('Deleted metadata key of server {serverId}', $replacements);
     }
 
@@ -336,7 +333,7 @@ private function changeServerPassword()
             '{newPassword}' => $this->adminPass,
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/change_server_password.php');
+        require_once $this->sampleFile('servers/change_server_password.php', $replacements);
 
         $this->logStep('Changed root password of server {serverId} to {newPassword}', $replacements);
     }
@@ -345,7 +342,7 @@ private function resizeServer()
     {
         $resizeFlavorId = getenv('OS_RESIZE_FLAVOR');
         if (!$resizeFlavorId) {
-            throw new \RuntimeException('OS_RESIZE_FLAVOR env var must be set');
+            throw new RuntimeException('OS_RESIZE_FLAVOR env var must be set');
         }
 
         $replacements = [
@@ -354,7 +351,7 @@ private function resizeServer()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/resize_server.php');
+        require_once $this->sampleFile('servers/resize_server.php', $replacements);
 
         $server->waitUntil('VERIFY_RESIZE');
 
@@ -367,7 +364,7 @@ private function confirmServerResize()
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/confirm_server_resize.php');
+        require_once $this->sampleFile('servers/confirm_server_resize.php', $replacements);
 
         $server->waitUntilActive();
 
@@ -383,7 +380,7 @@ private function rebuildServer()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/rebuild_server.php');
+        require_once $this->sampleFile('servers/rebuild_server.php', $replacements);
 
         $server->waitUntilActive();
 
@@ -399,11 +396,11 @@ private function rescueServer()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/rescue_server.php');
+        require_once $this->sampleFile('servers/rescue_server.php', $replacements);
 
         $server->waitUntil('RESCUE');
 
-        require_once $this->sampleFile($replacements, 'servers/unrescue_server.php');
+        require_once $this->sampleFile('servers/unrescue_server.php', $replacements);
 
         $server->waitUntilActive();
 
@@ -415,9 +412,9 @@ private function rebootServer()
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/reboot_server.php');
+        require_once $this->sampleFile('servers/reboot_server.php', $replacements);
 
-        $server->waitUntilActive(false);
+        $server->waitUntilActive();
 
         $this->logStep('Rebooted server {serverId}', $replacements);
     }
@@ -427,7 +424,7 @@ private function stopServer()
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/stop_server.php');
+        require_once $this->sampleFile('servers/stop_server.php', $replacements);
 
         $server->waitUntil('SHUTOFF', false);
 
@@ -439,9 +436,9 @@ private function startServer()
         $replacements = ['{serverId}' => $this->serverId];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'servers/start_server.php');
+        require_once $this->sampleFile('servers/start_server.php', $replacements);
 
-        $server->waitUntilActive(false);
+        $server->waitUntilActive();
 
         $this->logStep('Started server {serverId}', $replacements);
     }
@@ -453,8 +450,7 @@ private function createFlavor()
         ];
 
         /** @var $flavor \OpenStack\Compute\v2\Models\Flavor */
-        $path = $this->sampleFile($replacements, 'flavors/create_flavor.php');
-        require_once $path;
+        require_once $this->sampleFile('flavors/create_flavor.php', $replacements);
 
         self::assertInstanceOf('\OpenStack\Compute\v2\Models\Flavor', $flavor);
 
@@ -466,15 +462,14 @@ private function deleteFlavor()
     {
         $replacements = ['{flavorId}' => $this->flavorId];
 
-        $path = $this->sampleFile($replacements, 'flavors/delete_flavor.php');
-        require_once $path;
+        require_once $this->sampleFile('flavors/delete_flavor.php', $replacements);
 
         $this->logStep('Deleted flavor ID', ['ID' => $this->flavorId]);
     }
 
     private function listFlavors()
     {
-        require_once $this->sampleFile([], 'flavors/list_flavors.php');
+        require_once $this->sampleFile('flavors/list_flavors.php', []);
 
         $this->logStep('Listed all available flavors');
     }
@@ -483,7 +478,7 @@ private function getFlavor()
     {
         $replacements = ['{flavorId}' => 1];
 
-        require_once $this->sampleFile($replacements, 'flavors/get_flavor.php');
+        require_once $this->sampleFile('flavors/get_flavor.php', $replacements);
 
         $this->logStep('Retrieved details for flavor {flavorId}', $replacements);
     }
@@ -498,7 +493,7 @@ private function createServerImage()
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile($replacements, 'images/create_server_image.php');
+        require_once $this->sampleFile('images/create_server_image.php', $replacements);
 
         $server->waitWithCallback(function (Server $server) {
             return !$server->taskState;
@@ -511,7 +506,7 @@ private function createServerImage()
 
     private function listImages()
     {
-        require_once $this->sampleFile([], 'images/list_images.php');
+        require_once $this->sampleFile('images/list_images.php', []);
 
         $this->logStep('Listed all available images');
     }
@@ -520,7 +515,7 @@ private function getImage()
     {
         $replacements = ['{imageId}' => $this->imageId];
 
-        require_once $this->sampleFile($replacements, 'images/get_image.php');
+        require_once $this->sampleFile('images/get_image.php', $replacements);
 
         $this->logStep('Retrieved details for image {imageId}', $replacements);
     }
@@ -530,27 +525,27 @@ private function imageMetadata()
         $replacements = ['{imageId}' => $this->imageId];
 
         /** @var $image \OpenStack\Compute\v2\Models\Image */
-        require_once $this->sampleFile($replacements, 'images/reset_image_metadata.php');
+        require_once $this->sampleFile('images/reset_image_metadata.php', $replacements);
         $this->logStep('Reset metadata of image {imageId}', $replacements);
 
-        require_once $this->sampleFile($replacements, 'images/retrieve_image_metadata.php');
+        require_once $this->sampleFile('images/retrieve_image_metadata.php', $replacements);
         $this->logStep('Retrieved metadata of image {imageId}', $replacements);
 
-        require_once $this->sampleFile($replacements + ['{metadataKey}'], 'images/delete_image_metadata_item.php');
+        require_once $this->sampleFile('images/delete_image_metadata_item.php', $replacements + ['{metadataKey}']);
         $this->logStep('Deleted metadata key of image {imageId}', $replacements);
     }
 
     private function deleteServerImage()
     {
         $replacements = ['{imageId}' => $this->imageId];
-        require_once $this->sampleFile($replacements, 'images/delete_image.php');
+        require_once $this->sampleFile('images/delete_image.php', $replacements);
         $this->logStep('Deleted image {imageId}', $replacements);
     }
 
     private function listKeypairs()
     {
         /** @var $keypairs \Generator */
-        require_once $this->sampleFile([], 'keypairs/list_keypairs.php');
+        require_once $this->sampleFile('keypairs/list_keypairs.php', []);
 
         self::assertInstanceOf(\Generator::class, $keypairs);
 
@@ -564,7 +559,7 @@ private function createKeypair()
             '{publicKey}' => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp4H/vDGnLi0QgWgMsQkv//FEz0xgv/mujVX+XCh6fHXxc/PbaASY+MsoI2Xr238cG9eaeAAUvbpJuEuHQ0M9WX97bvsWaWzLQ9F6hzLAwUBGxcG8cSh1nB3Ah7alR2nbIZ1N94yE72hXLb1AGogJ97NBVIph438BCXUNejqoOBsXL8UBP3RGdPnTHJ/6XSMaNTQAJruQMoQwecyGFQmuS2IEy2mBOmSldD6JZirHpj7PTCKJY4CS89QChGpKIeOymKn4tEQQVVtNFUyULEMdin88H1yMftPfq7QqH+ULFT2X2XvP3CI+sESq84lrIcVu7LjJCRIwlKsnMu2ESYCdz foo@bar.com'
         ];
 
-        require_once $this->sampleFile($replacements, 'keypairs/create_keypair.php');
+        require_once $this->sampleFile('keypairs/create_keypair.php', $replacements);
         /**@var Keypair $keypair */
 
         self::assertInstanceOf(Keypair::class, $keypair);
@@ -581,7 +576,7 @@ private function getKeypair()
             '{name}' => $this->keypairName,
         ];
 
-        require_once $this->sampleFile($replacements, 'keypairs/get_keypair.php');
+        require_once $this->sampleFile('keypairs/get_keypair.php', $replacements);
 
         /**@var Keypair $keypair */
         self::assertInstanceOf(Keypair::class, $keypair);
@@ -597,13 +592,13 @@ private function deleteKeypair()
             '{name}' => $this->keypairName,
         ];
 
-        require_once $this->sampleFile($replacements, 'keypairs/delete_keypair.php');
+        require_once $this->sampleFile('keypairs/delete_keypair.php', $replacements);
         $this->logStep('Deleted keypair name {name}', ['{name}' => $this->keypairName]);
     }
 
     private function listHypervisors()
     {
-        require_once $this->sampleFile([], 'hypervisors/list_hypervisors.php');
+        require_once $this->sampleFile('hypervisors/list_hypervisors.php', []);
 
         $this->logStep('Listed all available hypervisors');
     }
@@ -614,7 +609,7 @@ private function getHypervisor()
             '{hypervisorId}' => '1',
         ];
 
-        require_once $this->sampleFile($replacements, 'hypervisors/get_hypervisor.php');
+        require_once $this->sampleFile('hypervisors/get_hypervisor.php', $replacements);
 
         /**@var Hypervisor $hypervisor */
         self::assertInstanceOf(Hypervisor::class, $hypervisor);
@@ -625,7 +620,7 @@ private function getHypervisor()
 
     private function getHypervisorsStatistics()
     {
-        require_once  $this->sampleFile([], 'hypervisors/get_hypervisors_statistics.php');
+        require_once $this->sampleFile('hypervisors/get_hypervisors_statistics.php', []);
 
         /**@var HypervisorStatistic $hypervisorStatistics */
         self::assertInstanceOf(HypervisorStatistic::class, $hypervisorStatistics);
@@ -635,7 +630,7 @@ private function getHypervisorsStatistics()
 
     private function getLimits()
     {
-        require_once $this->sampleFile([], 'limits/get_limits.php');
+        require_once $this->sampleFile('limits/get_limits.php', []);
 
         /**@var Limit $limit */
         self::assertInstanceOf(Limit::class, $limit);
@@ -650,7 +645,7 @@ private function addSecurityGroupToServer()
             '{secGroupName}' => self::SECGROUP,
         ];
 
-        require_once  $this->sampleFile($replacements, 'servers/add_security_group.php');
+        require_once $this->sampleFile('servers/add_security_group.php', $replacements);
 
         /**@var Server $server*/
         $this->logStep('Added security group {secGroupName} to server {serverId}', $replacements);
@@ -662,7 +657,7 @@ private function listServerSecurityGroups()
             '{serverId}' => $this->serverId
         ];
 
-        require_once  $this->sampleFile($replacements, 'servers/list_security_groups.php');
+        require_once $this->sampleFile('servers/list_security_groups.php', $replacements);
 
         /**@var \Generator $securityGroups */
         self::assertInstanceOf(\Generator::class, $securityGroups);
@@ -677,9 +672,9 @@ private function removeServerSecurityGroup()
             '{secGroupName}' => self::SECGROUP,
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/remove_security_group.php');
+        require_once $this->sampleFile('servers/remove_security_group.php', $replacements);
 
-        $this->logStep('Delete security group {secGroupName} from server {serverId}', $replacements);
+        $this->logStep(/** @lang text */ 'Delete security group {secGroupName} from server {serverId}', $replacements);
     }
 
     private function attachVolumeToServer()
@@ -689,7 +684,7 @@ private function attachVolumeToServer()
             '{volumeId}' => $this->volume->id
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/attach_volume_attachment.php');
+        require_once $this->sampleFile('servers/attach_volume_attachment.php', $replacements);
         /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
         $this->volumeAttachmentId = $volumeAttachment->id;
 
@@ -707,7 +702,7 @@ private function listVolumeAttachmentsForServer()
             '{serverId}' => $this->serverId
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/list_volume_attachments.php');
+        require_once $this->sampleFile('servers/list_volume_attachments.php', $replacements);
 
         $this->logStep('Retrieved volume attachments for server {serverId}', $replacements);
     }
@@ -719,7 +714,7 @@ private function detachVolumeFromServer()
             '{volumeAttachmentId}' => $this->volumeAttachmentId,
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/detach_volume_attachment.php');
+        require_once $this->sampleFile('servers/detach_volume_attachment.php', $replacements);
 
         $this->volume->waitUntil('available');
 
@@ -732,7 +727,7 @@ private function getVncConsole()
             '{serverId}' => $this->serverId
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/get_server_vnc_console.php');
+        require_once $this->sampleFile('servers/get_server_vnc_console.php', $replacements);
 
         $this->logStep('Get VNC console for server {serverId}', $replacements);
     }
@@ -744,7 +739,7 @@ private function createInterfaceAttachment()
             '{networkId}' => $this->network->id
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/create_interface_attachment.php');
+        require_once $this->sampleFile('servers/create_interface_attachment.php', $replacements);
 
         $this->logStep('Create interface attachment for server {serverId}', $replacements);
     }
@@ -755,7 +750,7 @@ private function getConsoleOutput()
             '{serverId}' => $this->serverId
         ];
 
-        require_once $this->sampleFile($replacements, 'servers/get_server_console_output.php');
+        require_once $this->sampleFile('servers/get_server_console_output.php', $replacements);
 
         $this->logStep('Get console output for server {serverId}', $replacements);
     }
diff --git a/tests/integration/Identity/v3/ApplicationCredentialsTest.php b/tests/integration/Identity/v3/ApplicationCredentialsTest.php
index fcf68d01..3bb057d9 100644
--- a/tests/integration/Identity/v3/ApplicationCredentialsTest.php
+++ b/tests/integration/Identity/v3/ApplicationCredentialsTest.php
@@ -41,11 +41,11 @@ public function token()
 
         /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
         require_once $this->sampleFile(
+            'application_credentials/add_application_credential.php',
             [
-                '{name}' => $name,
+                '{name}'        => $name,
                 '{description}' => $description,
-            ],
-            'application_credentials/add_application_credential.php'
+            ]
         );
         self::assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
         self::assertEquals($name, $applicationCredential->name);
@@ -55,16 +55,16 @@ public function token()
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
         require_once $this->sampleFile(
+            'tokens/generate_token_with_application_credential_id.php',
             [
                 '{applicationCredentialId}' => $applicationCredential->id,
-                '{secret}' => $applicationCredential->secret
-            ],
-            'tokens/generate_token_with_application_credential_id.php'
+                '{secret}'                  => $applicationCredential->secret
+            ]
         );
         self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
-        require_once $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertTrue($result);
 
 
@@ -74,8 +74,8 @@ public function token()
 
         /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
         require_once $this->sampleFile(
-            ['{applicationCredentialId}' => $applicationCredentialId],
-            'application_credentials/show_application_credential.php'
+            'application_credentials/show_application_credential.php',
+            ['{applicationCredentialId}' => $applicationCredentialId]
         );
         self::assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
         self::assertEquals($name, $applicationCredential->name);
@@ -84,14 +84,14 @@ public function token()
 
         $this->logStep('Delete application credential');
         require_once $this->sampleFile(
+            'application_credentials/delete_application_credential.php',
             [
                 '{applicationCredentialId}' => $applicationCredential->id,
-            ],
-            'application_credentials/delete_application_credential.php'
+            ]
         );
 
         /** @var $result bool */
-        require_once $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertFalse($result);
     }
 }
\ No newline at end of file
diff --git a/tests/integration/Identity/v3/CoreTest.php b/tests/integration/Identity/v3/CoreTest.php
index 0ebb315f..1e92c45b 100644
--- a/tests/integration/Identity/v3/CoreTest.php
+++ b/tests/integration/Identity/v3/CoreTest.php
@@ -58,74 +58,62 @@ public function tokens()
         $this->logStep('Generate token with user name');
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile([], 'tokens/generate_token_with_username.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/generate_token_with_username.php');
         self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertTrue($result);
 
 
         $this->logStep('Generate token with user id');
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile([], 'tokens/generate_token_with_user_id.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/generate_token_with_user_id.php');
         self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertTrue($result);
 
 
         $this->logStep('Generate token scoped to project id');
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile([], 'tokens/generate_token_scoped_to_project_id.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/generate_token_scoped_to_project_id.php');
         self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertTrue($result);
 
 
         $this->logStep('Generate token scoped to project name');
 
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile([], 'tokens/generate_token_scoped_to_project_name.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/generate_token_scoped_to_project_name.php');
         self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertTrue($result);
 
 
         $this->logStep('Generate token from id');
         /** @var $token \OpenStack\Identity\v3\Models\Token */
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/generate_token_from_id.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/generate_token_from_id.php', ['{tokenId}' => $token->id]);
         self::assertInstanceOf(Models\Token::class, $token);
 
         /** @var $result bool */
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertTrue($result);
 
 
         $this->logStep('Revoke token');
 
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/revoke_token.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/revoke_token.php', ['{tokenId}' => $token->id]);
 
         /** @var $result bool */
-        $path = $this->sampleFile(['{tokenId}' => $token->id], 'tokens/validate_token.php');
-        require_once $path;
+        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
         self::assertFalse($result);
     }
 
@@ -139,8 +127,7 @@ public function domains()
         ];
 
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
-        $path = $this->sampleFile($replacements, 'domains/add_domain.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/add_domain.php', $replacements);
         self::assertInstanceOf(Models\Domain::class, $domain);
 
 
@@ -148,15 +135,13 @@ public function domains()
 
         $replacements['{domainId}'] = $domain->id;
 
-        $path = $this->sampleFile([], 'domains/list_domains.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/list_domains.php', []);
 
 
         $this->logStep('Show domain');
 
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
-        $path = $this->sampleFile($replacements, 'domains/show_domain.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/show_domain.php', $replacements);
         self::assertInstanceOf(Models\Domain::class, $domain);
 
 
@@ -165,19 +150,15 @@ public function domains()
         $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
         $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
 
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'domains/grant_group_role.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/grant_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'domains/check_group_role.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/check_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
         self::assertTrue($result);
 
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id], 'domains/list_group_roles.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/list_group_roles.php', $replacements + ['{groupId}' => $group->id]);
 
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'domains/revoke_group_role.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/revoke_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
 
         $group->delete();
 
@@ -186,19 +167,15 @@ public function domains()
 
         $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
 
-        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/grant_user_role.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/grant_user_role.php', $replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id]);
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/check_user_role.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/check_user_role.php', $replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id]);
         self::assertTrue($result);
 
-        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id], 'domains/list_user_roles.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/list_user_roles.php', $replacements + ['{domainUserId}' => $user->id]);
 
-        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/revoke_user_role.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/revoke_user_role.php', $replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id]);
 
         $user->delete();
         $parentRole->delete();
@@ -207,15 +184,13 @@ public function domains()
         $this->logStep('Update domain');
 
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
-        $path = $this->sampleFile($replacements, 'domains/update_domain.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/update_domain.php', $replacements);
         self::assertInstanceOf(Models\Domain::class, $domain);
 
 
         $this->logStep('Delete domain');
 
-        $path = $this->sampleFile($replacements, 'domains/delete_domain.php');
-        require_once $path;
+        require_once $this->sampleFile('domains/delete_domain.php', $replacements);
     }
 
     public function endpoints()
@@ -230,21 +205,17 @@ public function endpoints()
         ];
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
-        $path = $this->sampleFile($replacements, 'endpoints/add_endpoint.php');
-        require_once $path;
+        require_once $this->sampleFile('endpoints/add_endpoint.php', $replacements);
         self::assertInstanceOf(Models\Endpoint::class, $endpoint);
 
         $replacements['{endpointId}'] = $endpoint->id;
 
-        $path = $this->sampleFile($replacements, 'endpoints/list_endpoints.php');
-        require_once $path;
+        require_once $this->sampleFile('endpoints/list_endpoints.php', $replacements);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
-        $path = $this->sampleFile($replacements, 'endpoints/update_endpoint.php');
-        require_once $path;
+        require_once $this->sampleFile('endpoints/update_endpoint.php', $replacements);
 
-        $path = $this->sampleFile($replacements, 'endpoints/delete_endpoint.php');
-        require_once $path;
+        require_once $this->sampleFile('endpoints/delete_endpoint.php', $replacements);
 
         $service->delete();
     }
@@ -257,27 +228,22 @@ public function services()
         ];
 
         /** @var $service \OpenStack\Identity\v3\Models\Service */
-        $path = $this->sampleFile($replacements, 'services/add_service.php');
-        require_once $path;
+        require_once $this->sampleFile('services/add_service.php', $replacements);
         self::assertInstanceOf(Models\Service::class, $service);
 
         $replacements['{serviceId}'] = $service->id;
 
-        $path = $this->sampleFile($replacements, 'services/list_services.php');
-        require_once $path;
+        require_once $this->sampleFile('services/list_services.php', $replacements);
 
         /** @var $service \OpenStack\Identity\v3\Models\Service */
-        $path = $this->sampleFile($replacements, 'services/update_service.php');
-        require_once $path;
+        require_once $this->sampleFile('services/update_service.php', $replacements);
         self::assertInstanceOf(Models\Service::class, $service);
 
         /** @var $service \OpenStack\Identity\v3\Models\Service */
-        $path = $this->sampleFile($replacements, 'services/get_service.php');
-        require_once $path;
+        require_once $this->sampleFile('services/get_service.php', $replacements);
         self::assertInstanceOf(Models\Service::class, $service);
 
-        $path = $this->sampleFile($replacements, 'services/delete_service.php');
-        require_once $path;
+        require_once $this->sampleFile('services/delete_service.php', $replacements);
     }
 
     public function groups()
@@ -285,44 +251,34 @@ public function groups()
         $groupUser = $this->getService()->createUser(['name' => $this->randomStr()]);
 
         /** @var $group \OpenStack\Identity\v3\Models\Group */
-        $path = $this->sampleFile(['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'groups/add_group.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/add_group.php', ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
         self::assertInstanceOf(Models\Group::class, $group);
 
         $replacements = ['{groupId}' => $group->id];
 
-        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/add_user.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/add_user.php', $replacements + ['{groupUserId}' => $groupUser->id]);
 
         /** @var $group \OpenStack\Identity\v3\Models\Group */
-        $path = $this->sampleFile($replacements, 'groups/get_group.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/get_group.php', $replacements);
         self::assertInstanceOf(Models\Group::class, $group);
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/check_user_membership.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/check_user_membership.php', $replacements + ['{groupUserId}' => $groupUser->id]);
         self::assertTrue($result);
 
-        $path = $this->sampleFile($replacements, 'groups/list_users.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/list_users.php', $replacements);
 
-        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/remove_user.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/remove_user.php', $replacements + ['{groupUserId}' => $groupUser->id]);
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/check_user_membership.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/check_user_membership.php', $replacements + ['{groupUserId}' => $groupUser->id]);
         self::assertFalse($result);
 
-        $path = $this->sampleFile($replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'groups/update_group.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/update_group.php', $replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
 
-        $path = $this->sampleFile($replacements, 'groups/list_groups.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/list_groups.php', $replacements);
 
-        $path = $this->sampleFile($replacements, 'groups/delete_group.php');
-        require_once $path;
+        require_once $this->sampleFile('groups/delete_group.php', $replacements);
 
         $groupUser->delete();
     }
@@ -330,58 +286,46 @@ public function groups()
     public function projects()
     {
         /** @var $project \OpenStack\Identity\v3\Models\Project */
-        $path = $this->sampleFile(['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'projects/add_project.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/add_project.php', ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
         self::assertInstanceOf(Models\Project::class, $project);
 
         $replacements = ['{id}' => $project->id];
 
         /** @var $project \OpenStack\Identity\v3\Models\Project */
-        $path = $this->sampleFile($replacements, 'projects/get_project.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/get_project.php', $replacements);
         self::assertInstanceOf(Models\Project::class, $project);
 
         $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
         $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
         $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
 
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'projects/grant_group_role.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/grant_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'projects/check_group_role.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/check_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
         self::assertTrue($result);
 
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id], 'projects/list_group_roles.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/list_group_roles.php', $replacements + ['{groupId}' => $group->id]);
 
-        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'projects/revoke_group_role.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/revoke_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
 
         $group->delete();
 
         $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
 
-        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id], 'projects/grant_user_role.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/grant_user_role.php', $replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id]);
 
         /** @var $result bool */
-        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id], 'projects/check_user_role.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/check_user_role.php', $replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id]);
         self::assertTrue($result);
 
-        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id], 'projects/list_user_roles.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/list_user_roles.php', $replacements + ['{projectUserId}' => $user->id]);
 
-        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id], 'projects/revoke_user_role.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/revoke_user_role.php', $replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id]);
 
-        $path = $this->sampleFile($replacements, 'projects/update_project.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/update_project.php', $replacements);
 
-        $path = $this->sampleFile($replacements, 'projects/delete_project.php');
-        require_once $path;
+        require_once $this->sampleFile('projects/delete_project.php', $replacements);
 
         $user->delete();
         $parentRole->delete();
@@ -394,15 +338,12 @@ public function projects()
     public function roles()
     {
         /** @var $role \OpenStack\Identity\v3\Models\Role */
-        $path = $this->sampleFile(['{name}' => $this->randomStr()], 'roles/add_role.php');
-        require_once $path;
+        require_once $this->sampleFile('roles/add_role.php', ['{name}' => $this->randomStr()]);
         self::assertInstanceOf(Models\Role::class, $role);
 
-        $path = $this->sampleFile([], 'roles/list_roles.php');
-        require_once $path;
+        require_once $this->sampleFile('roles/list_roles.php', []);
 
-        $path = $this->sampleFile([], 'roles/list_assignments.php');
-        require_once $path;
+        require_once $this->sampleFile('roles/list_assignments.php', []);
     }
 
     public function users()
@@ -421,33 +362,26 @@ public function users()
         ];
 
         /** @var $user \OpenStack\Identity\v3\Models\User */
-        $path = $this->sampleFile($replacements, 'users/add_user.php');
-        require_once $path;
+        require_once $this->sampleFile('users/add_user.php', $replacements);
         self::assertInstanceOf(Models\User::class, $user);
 
         $replacements = ['{id}' => $user->id];
 
         /** @var $user \OpenStack\Identity\v3\Models\User */
-        $path = $this->sampleFile($replacements, 'users/get_user.php');
-        require_once $path;
+        require_once $this->sampleFile('users/get_user.php', $replacements);
         self::assertInstanceOf(Models\User::class, $user);
 
-        $path = $this->sampleFile([], 'users/list_users.php');
-        require_once $path;
+        require_once $this->sampleFile('users/list_users.php', []);
 
-        $path = $this->sampleFile($replacements, 'users/list_groups.php');
-        require_once $path;
+        require_once $this->sampleFile('users/list_groups.php', $replacements);
 
-        $path = $this->sampleFile($replacements, 'users/list_projects.php');
-        require_once $path;
+        require_once $this->sampleFile('users/list_projects.php', $replacements);
 
         /** @var $user \OpenStack\Identity\v3\Models\User */
-        $path = $this->sampleFile($replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'users/update_user.php');
-        require_once $path;
+        require_once $this->sampleFile('users/update_user.php', $replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
         self::assertInstanceOf(Models\User::class, $user);
 
-        $path = $this->sampleFile($replacements, 'users/delete_user.php');
-        require_once $path;
+        require_once $this->sampleFile('users/delete_user.php', $replacements);
 
         $parentProject->delete();
 
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
index ec3ac642..9eec5e7f 100644
--- a/tests/integration/Images/v2/CoreTest.php
+++ b/tests/integration/Images/v2/CoreTest.php
@@ -50,18 +50,18 @@ public function images()
 
         $this->logStep('Creating image');
         /** @var Image $image */
-        require_once $this->sampleFile($replacements, 'images/create.php');
+        require_once $this->sampleFile('images/create.php', $replacements);
         self::assertInstanceOf(Image::class, $image);
 
         $replacements = ['{imageId}' => $image->id];
 
         $this->logStep('Listing images');
         /** @var \Generator $images */
-        require_once $this->sampleFile($replacements, 'images/list.php');
+        require_once $this->sampleFile('images/list.php', $replacements);
 
         $this->logStep('Getting image');
         /** @var Image $image */
-        require_once $this->sampleFile($replacements, 'images/get.php');
+        require_once $this->sampleFile('images/get.php', $replacements);
         self::assertInstanceOf(Image::class, $image);
 
         $replacements += [
@@ -71,11 +71,11 @@ public function images()
 
         $this->logStep('Updating image');
         /** @var Image $image */
-        require_once $this->sampleFile($replacements, 'images/update.php');
+        require_once $this->sampleFile('images/update.php', $replacements);
 
         $this->logStep('Deleting image');
         /** @var Image $image */
-        require_once $this->sampleFile($replacements, 'images/delete.php');
+        require_once $this->sampleFile('images/delete.php', $replacements);
     }
 
     public function members()
@@ -92,29 +92,29 @@ public function members()
 
         $this->logStep('Creating image');
         /** @var Image $image */
-        require_once $this->sampleFile($replacements, 'images/create.php');
+        require_once $this->sampleFile('images/create.php', $replacements);
 
         $this->logStep(sprintf('Image created with id=%s', $image->id));
 
         $this->logStep('Adding member');
         $replacements += ['{imageId}' => $image->id];
         /** @var Member $member */
-        require_once $this->sampleFile(['{imageId}' => $image->id, ], 'members/add.php');
+        require_once $this->sampleFile('members/add.php', ['{imageId}' => $image->id,]);
         self::assertInstanceOf(Member::class, $member);
 
         $replacements += ['status' => Member::STATUS_REJECTED];
         $this->logStep('Updating member status');
         /** @var Member $member */
-        require_once $this->sampleFile($replacements, 'members/update_status.php');
+        require_once $this->sampleFile('members/update_status.php', $replacements);
         self::assertInstanceOf(Member::class, $member);
 
         $this->logStep('Deleting member');
         /** @var Member $member */
-        require_once $this->sampleFile($replacements, 'members/delete.php');
+        require_once $this->sampleFile('members/delete.php', $replacements);
 
         $this->logStep('Deleting image');
         /** @var Image $image */
-        require_once $this->sampleFile($replacements, 'images/delete.php');
+        require_once $this->sampleFile('images/delete.php', $replacements);
     }
 
     public function imageList()
@@ -143,7 +143,7 @@ public function imageList()
         ];
 
         /** @var \OpenStack\Images\v2\Models\Image $image */
-        require_once $this->sampleFile($replacements, 'images/list_sorted.php');
+        require_once $this->sampleFile('images/list_sorted.php', $replacements);
         self::assertInstanceOf(Image::class, $image);
         self::assertEquals($names[2], $image->name);
 
@@ -152,7 +152,7 @@ public function imageList()
 
         $replacements['{sortDir}'] = 'desc';
         /** @var \OpenStack\Images\v2\Models\Image $image */
-        require_once $this->sampleFile($replacements, 'images/list_sorted.php');
+        require_once $this->sampleFile('images/list_sorted.php', $replacements);
         self::assertInstanceOf(Image::class, $image);
         self::assertEquals($names[1], $image->name);
 
diff --git a/tests/integration/Networking/v2/CoreTest.php b/tests/integration/Networking/v2/CoreTest.php
index 56b9da19..08a2266a 100644
--- a/tests/integration/Networking/v2/CoreTest.php
+++ b/tests/integration/Networking/v2/CoreTest.php
@@ -25,7 +25,7 @@ public function subnets()
         $this->createSubnetsAndDelete();
         $this->createSubnetWithHostRoutes();
 
-        list($subnetId, $networkId) = $this->createSubnet();
+        [$subnetId, $networkId] = $this->createSubnet();
 
         $this->updateSubnet($subnetId);
         $this->retrieveSubnet($subnetId);
@@ -51,8 +51,7 @@ private function createNetworksAndDelete()
         ];
 
         /** @var $networks array */
-        $path = $this->sampleFile($replacements, 'networks/create_batch.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create_batch.php', $replacements);
 
         foreach ($networks as $network) {
             self::assertInstanceOf(Network::class, $network);
@@ -72,8 +71,7 @@ private function createNetwork()
         ];
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile($replacements, 'networks/create.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create.php', $replacements);
 
         self::assertInstanceOf(Network::class, $network);
         self::assertNotEmpty($network->id);
@@ -93,8 +91,7 @@ private function updateNetwork($networkId)
         ];
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile($replacements, 'networks/update.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/update.php', $replacements);
 
         self::assertInstanceOf(Network::class, $network);
         self::assertEquals($name, $network->name);
@@ -107,8 +104,7 @@ private function retrieveNetwork($networkId)
         $replacements = ['{networkId}' => $networkId];
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile($replacements, 'networks/get.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/get.php', $replacements);
 
         self::assertInstanceOf(Network::class, $network);
 
@@ -120,8 +116,7 @@ private function deleteNetwork($networkId)
         $replacements = ['{networkId}' => $networkId];
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile($replacements, 'networks/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/delete.php', $replacements);
 
         $this->logStep('Deleted network ID', ['ID' => $networkId]);
     }
@@ -129,8 +124,7 @@ private function deleteNetwork($networkId)
     private function createSubnetsAndDelete()
     {
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
 
         $replacements = [
             '{subnetName1}' => $this->randomStr(),
@@ -140,8 +134,7 @@ private function createSubnetsAndDelete()
         ];
 
         /** @var $subnets array */
-        $path = $this->sampleFile($replacements, 'subnets/create_batch.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/create_batch.php', $replacements);
 
         foreach ($subnets as $subnet) {
             self::assertInstanceOf(Subnet::class, $subnet);
@@ -152,15 +145,13 @@ private function createSubnetsAndDelete()
             $this->deleteSubnet($subnet->id);
         }
 
-        $path = $this->sampleFile(['{networkId}' => $network->id], 'networks/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/delete.php', ['{networkId}' => $network->id]);
     }
 
     private function createSubnet()
     {
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
 
         $replacements = [
             '{subnetName}' => $this->randomStr(),
@@ -168,8 +159,7 @@ private function createSubnet()
         ];
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile($replacements, 'subnets/create.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/create.php', $replacements);
 
         self::assertInstanceOf(Subnet::class, $subnet);
         self::assertNotEmpty($subnet->id);
@@ -182,16 +172,14 @@ private function createSubnet()
     private function createSubnetWithGatewayIp()
     {
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
 
         $replacements = [
             '{networkId}' => $network->id,
         ];
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile($replacements, 'subnets/create_with_gateway_ip.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/create_with_gateway_ip.php', $replacements);
 
         self::assertInstanceOf(Subnet::class, $subnet);
         self::assertNotEmpty($subnet->id);
@@ -200,31 +188,27 @@ private function createSubnetWithGatewayIp()
 
         $this->logStep('Created subnet {id} with gateway ip', ['{id}' => $this->subnetId]);
 
-        $path = $this->sampleFile($replacements, 'networks/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/delete.php', $replacements);
     }
 
     private function createSubnetWithHostRoutes()
     {
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
 
         $replacements = [
             '{networkId}' => $network->id,
         ];
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile($replacements, 'subnets/create_with_host_routes.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/create_with_host_routes.php', $replacements);
 
         self::assertInstanceOf(Subnet::class, $subnet);
         self::assertNotEmpty($subnet->id);
 
         $this->logStep('Created subnet {id} with host routes', ['{id}' => $subnet->id]);
 
-        $path = $this->sampleFile($replacements, 'networks/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/delete.php', $replacements);
     }
 
     private function updateSubnet($subnetId)
@@ -237,8 +221,7 @@ private function updateSubnet($subnetId)
         ];
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile($replacements, 'subnets/update.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/update.php', $replacements);
 
         self::assertInstanceOf(Subnet::class, $subnet);
         self::assertEquals($name, $subnet->name);
@@ -252,8 +235,7 @@ private function retrieveSubnet($subnetId)
         $replacements = ['{subnetId}' => $subnetId];
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile($replacements, 'subnets/get.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/get.php', $replacements);
 
         self::assertInstanceOf(Subnet::class, $subnet);
 
@@ -265,8 +247,7 @@ private function deleteSubnet($subnetId)
         $replacements = ['{subnetId}' => $subnetId];
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile($replacements, 'subnets/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/delete.php', $replacements);
 
         $this->logStep('Deleted subnet ID', ['ID' => $subnetId]);
     }
@@ -278,45 +259,37 @@ public function ports()
         $replacements = ['{newName}' => $this->randomStr()];
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile($replacements, 'networks/create.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create.php', $replacements);
 
         $replacements = ['{networkId}' => $network->id];
 
         /** @var $port \OpenStack\Networking\v2\Models\Port */
-        $path = $this->sampleFile($replacements, 'ports/create.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/create.php', $replacements);
 
         $replacements['{portId}'] = $port->id;
         $port->networkId = $network->id;
 
         /** @var $ports array */
-        $path = $this->sampleFile($replacements, 'ports/create_batch.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/create_batch.php', $replacements);
         foreach ($ports as $port) {
             self::assertInstanceOf(Port::class, $port);
             $port->delete();
         }
 
         /** @var $port \OpenStack\Networking\v2\Models\Port */
-        $path = $this->sampleFile($replacements, 'ports/list.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/list.php', $replacements);
 
         /** @var $port \OpenStack\Networking\v2\Models\Port */
-        $path = $this->sampleFile($replacements, 'ports/get.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/get.php', $replacements);
         self::assertInstanceOf(Port::class, $port);
 
         /** @var $port \OpenStack\Networking\v2\Models\Port */
-        $path = $this->sampleFile($replacements, 'ports/update.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/update.php', $replacements);
         self::assertInstanceOf(Port::class, $port);
 
-        $path = $this->sampleFile($replacements, 'ports/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/delete.php', $replacements);
 
-        $path = $this->sampleFile($replacements, 'networks/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/delete.php', $replacements);
 
         $this->createPortWithFixedIps();
     }
@@ -326,34 +299,28 @@ private function createPortWithFixedIps()
         $this->logStep('Test port with fixed IP');
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile(['{networkName}' => $this->randomStr()], 'networks/create.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/create.php', ['{networkName}' => $this->randomStr()]);
         $this->logStep('Created network {id}', ['{id}' => $network->id]);
 
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile(['{subnetName}' => $this->randomStr(), '{networkId}' => $network->id], 'subnets/create.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/create.php', ['{subnetName}' => $this->randomStr(), '{networkId}' => $network->id]);
         $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
 
         /** @var $port \OpenStack\Networking\v2\Models\Port */
-        $path = $this->sampleFile(['{networkId}' => $network->id], 'ports/create_with_fixed_ips.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/create_with_fixed_ips.php', ['{networkId}' => $network->id]);
         $this->logStep('Created port {id}', ['{id}' => $port->id]);
 
-        $path = $this->sampleFile(['{portId}' => $port->id], 'ports/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('ports/delete.php', ['{portId}' => $port->id]);
 
         $this->logStep('Deleted port {id}', ['{id}' => $port->id]);
 
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        $path = $this->sampleFile(['{subnetId}' => $subnet->id], 'subnets/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('subnets/delete.php', ['{subnetId}' => $subnet->id]);
         $this->logStep('Deleted subnet {id}', ['{id}' => $subnet->id]);
 
         /** @var $network \OpenStack\Networking\v2\Models\Network */
-        $path = $this->sampleFile(['{networkId}' => $network->id], 'networks/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('networks/delete.php', ['{networkId}' => $network->id]);
         $this->logStep('Deleted network {id}', ['{id}' => $network->id]);
     }
 }
diff --git a/tests/integration/Networking/v2/Layer3Test.php b/tests/integration/Networking/v2/Layer3Test.php
index 71bc67e6..2360cf9d 100644
--- a/tests/integration/Networking/v2/Layer3Test.php
+++ b/tests/integration/Networking/v2/Layer3Test.php
@@ -115,31 +115,26 @@ public function floatingIps()
 
         $this->logStep('Create floating IP');
         /** @var FloatingIp $ip */
-        $path = $this->sampleFile($replacements, 'floatingIPs/create.php');
-        require_once $path;
+        require_once $this->sampleFile('floatingIPs/create.php', $replacements);
         self::assertInstanceOf(FloatingIp::class, $ip);
         self::assertEquals($externalNetwork->id, $ip->floatingNetworkId);
         self::assertEquals($port1->id, $ip->portId);
 
         $this->logStep('List floating IPs');
-        $path = $this->sampleFile($replacements, 'floatingIPs/list.php');
-        require_once $path;
+        require_once $this->sampleFile('floatingIPs/list.php', $replacements);
 
         $this->logStep('Get floating IP');
         $replacements['{id}'] = $ip->id;
-        $path = $this->sampleFile($replacements, 'floatingIPs/get.php');
-        require_once $path;
+        require_once $this->sampleFile('floatingIPs/get.php', $replacements);
         self::assertInstanceOf(FloatingIp::class, $ip);
 
         $this->logStep('Update floating IP');
         $port2 = $this->createPort($internalNetwork);
         $replacements['{newPortId}'] = $port2->id;
-        $path = $this->sampleFile($replacements, 'floatingIPs/update.php');
-        require_once $path;
+        require_once $this->sampleFile('floatingIPs/update.php', $replacements);
 
         $this->logStep('Delete floating IP');
-        $path = $this->sampleFile($replacements, 'floatingIPs/delete.php');
-        require_once $path;
+        require_once $this->sampleFile('floatingIPs/delete.php', $replacements);
 
         $router->removeInterface(['subnetId' => $subnet->id]);
         $router->delete();
diff --git a/tests/integration/ObjectStore/v1/CoreTest.php b/tests/integration/ObjectStore/v1/CoreTest.php
index f2889341..2919c4e2 100644
--- a/tests/integration/ObjectStore/v1/CoreTest.php
+++ b/tests/integration/ObjectStore/v1/CoreTest.php
@@ -46,11 +46,11 @@ public function accountMetadata()
         ];
 
         $this->logStep('Setting account metadata');
-        require_once $this->sampleFile($replacements, 'account/merge_metadata.php');
+        require_once $this->sampleFile('account/merge_metadata.php', $replacements);
 
         $this->logStep('Getting account metadata');
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'account/get_metadata.php');
+        require_once $this->sampleFile('account/get_metadata.php', $replacements);
         self::assertArraySubset([
             'Foo' => $replacements['{val_1}'],
             'Bar' => $replacements['{val_2}'],
@@ -63,11 +63,11 @@ public function accountMetadata()
             '{val_1}' => $this->randomStr(),
             '{val_2}' => $this->randomStr(),
         ];
-        require_once $this->sampleFile($replacements, 'account/reset_metadata.php');
+        require_once $this->sampleFile('account/reset_metadata.php', $replacements);
 
         $this->logStep('Checking account metadata was reset properly');
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'account/get_metadata.php');
+        require_once $this->sampleFile('account/get_metadata.php', $replacements);
         self::assertEquals([
             'Foo1' => $replacements['{val_1}'],
             'Bar1' => $replacements['{val_2}'],
@@ -80,13 +80,13 @@ public function containers()
         $replacements = ['{containerName}' => $containerName];
 
         $this->logStep('Create container');
-        require_once $this->sampleFile($replacements, 'containers/create.php');
+        require_once $this->sampleFile('containers/create.php', $replacements);
 
         $this->logStep('Get container');
-        require_once $this->sampleFile($replacements, 'containers/get.php');
+        require_once $this->sampleFile('containers/get.php', $replacements);
 
         $this->logStep('Listing containers');
-        require_once $this->sampleFile($replacements, 'containers/list.php');
+        require_once $this->sampleFile('containers/list.php', $replacements);
 
         $this->logStep('Merging metadata');
         $replacements += [
@@ -95,11 +95,11 @@ public function containers()
             '{val_1}' => $this->randomStr(),
             '{val_2}' => $this->randomStr(),
         ];
-        require_once $this->sampleFile($replacements, 'containers/merge_metadata.php');
+        require_once $this->sampleFile('containers/merge_metadata.php', $replacements);
 
         $this->logStep('Getting metadata');
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'containers/get_metadata.php');
+        require_once $this->sampleFile('containers/get_metadata.php', $replacements);
         self::assertEquals([
             'Foo' => $replacements['{val_1}'],
             'Bar' => $replacements['{val_2}'],
@@ -110,9 +110,9 @@ public function containers()
         $replacements['{key_2}'] = 'Bar1';
 
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'containers/reset_metadata.php');
+        require_once $this->sampleFile('containers/reset_metadata.php', $replacements);
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'containers/get_metadata.php');
+        require_once $this->sampleFile('containers/get_metadata.php', $replacements);
         self::assertEquals([
             'Foo1' => $replacements['{val_1}'],
             'Bar1' => $replacements['{val_2}'],
@@ -120,7 +120,7 @@ public function containers()
 
         $this->logStep('Delete container');
         $replacements = ['{containerName}' => $containerName];
-        require_once $this->sampleFile($replacements, 'containers/delete.php');
+        require_once $this->sampleFile('containers/delete.php', $replacements);
     }
 
     public function objects()
@@ -135,27 +135,27 @@ public function objects()
 
         $this->logStep('Create object');
         $replacements['{objectContent}'] = str_repeat('A', 1000);
-        require_once $this->sampleFile($replacements, 'objects/create.php');
+        require_once $this->sampleFile('objects/create.php', $replacements);
 
         $this->logStep('Copy object');
         $newName = $this->randomStr();
         $replacements += ['{newContainerName}' => $containerName, '{newObjectName}' => $newName];
-        require_once $this->sampleFile($replacements, 'objects/copy.php');
+        require_once $this->sampleFile('objects/copy.php', $replacements);
 
         $this->logStep('Check that new object exists');
         /** @var bool $exists */
-        require_once $this->sampleFile(['{containerName}' => $containerName, '{objectName}' => $newName], 'objects/check_exists.php');
+        require_once $this->sampleFile('objects/check_exists.php', ['{containerName}' => $containerName, '{objectName}' => $newName]);
         self::assertTrue($exists);
 
         $this->logStep('Downloading object');
         /** @var StreamInterface $stream */
-        require_once $this->sampleFile($replacements, 'objects/download.php');
+        require_once $this->sampleFile('objects/download.php', $replacements);
         self::assertInstanceOf(StreamInterface::class, $stream);
         self::assertEquals(1000, $stream->getSize());
 
         $this->logStep('Downloading object using streaming');
         /** @var StreamInterface $stream */
-        require_once $this->sampleFile($replacements, 'objects/download_stream.php');
+        require_once $this->sampleFile('objects/download_stream.php', $replacements);
         self::assertInstanceOf(StreamInterface::class, $stream);
 
         $body = '';
@@ -165,10 +165,10 @@ public function objects()
         self::assertEquals(1000, strlen($body));
 
         $this->logStep('Get object');
-        require_once $this->sampleFile($replacements, 'objects/get.php');
+        require_once $this->sampleFile('objects/get.php', $replacements);
 
         $this->logStep('Listing objects');
-        require_once $this->sampleFile($replacements, 'objects/list.php');
+        require_once $this->sampleFile('objects/list.php', $replacements);
 
         $this->logStep('Merging metadata');
         $replacements += [
@@ -177,11 +177,11 @@ public function objects()
             '{val_1}' => $this->randomStr(),
             '{val_2}' => $this->randomStr(),
         ];
-        require_once $this->sampleFile($replacements, 'objects/merge_metadata.php');
+        require_once $this->sampleFile('objects/merge_metadata.php', $replacements);
 
         $this->logStep('Getting metadata');
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'objects/get_metadata.php');
+        require_once $this->sampleFile('objects/get_metadata.php', $replacements);
         self::assertEquals([
             'Foo' => $replacements['{val_1}'],
             'Bar' => $replacements['{val_2}'],
@@ -192,16 +192,16 @@ public function objects()
         $replacements['{key_2}'] = 'Bar1';
 
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'objects/reset_metadata.php');
+        require_once $this->sampleFile('objects/reset_metadata.php', $replacements);
         /** @var array $metadata */
-        require_once $this->sampleFile($replacements, 'objects/get_metadata.php');
+        require_once $this->sampleFile('objects/get_metadata.php', $replacements);
         self::assertEquals([
             'Foo1' => $replacements['{val_1}'],
             'Bar1' => $replacements['{val_2}'],
         ], $metadata);
 
         $this->logStep('Delete object');
-        require_once $this->sampleFile($replacements, 'objects/delete.php');
+        require_once $this->sampleFile('objects/delete.php', $replacements);
         $container->getObject($replacements['{newObjectName}'])->delete();
 
         $this->logStep('Delete container');
diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php
index cfa0075d..6701e2a6 100644
--- a/tests/integration/TestCase.php
+++ b/tests/integration/TestCase.php
@@ -15,6 +15,8 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase implements TestInter
 
     public function __construct(LoggerInterface $logger, SampleManagerInterface $sampleManager)
     {
+        parent::__construct();
+
         $this->logger = $logger;
         $this->sampleManager = $sampleManager;
     }
@@ -110,7 +112,7 @@ protected function outputTimeTaken()
         $this->logger->info('Finished all tests! Time taken: {output}.', ['{output}' => $output]);
     }
 
-    protected function sampleFile(array $replacements, $path)
+    protected function sampleFile($path, array $replacements = [])
     {
         return $this->sampleManager->write($path, $replacements);
     }

From 2335c75e59b5bc6817b169c63bf74d9d7f8fc04d Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 17 Jan 2024 14:02:12 +0100
Subject: [PATCH 069/102] Move integration tests to phpunit (#387)

* moved integration tests to phpunit
* updated integration tests description in CONTRIBUTING.md
* added `name` parameter to `patchUser` so the sample file works properly
* added `Retrievable` interface to `VolumeType`
* added `HasWaiterTrait` to `Compute::Image`
* added `Token::validate()` function to check if Identity token is valid

---------

Co-authored-by: k0ka <k0ka@users.noreply.github.com>
---
 .gitattributes                                |   5 +-
 .github/workflows/integration_tests.yml       |  18 +-
 .travis.yml                                   |  40 -
 CONTRIBUTING.md                               |  80 +-
 composer.json                                 |   1 +
 doc/services/compute/v2/servers.rst           |   4 +-
 env_test.sh.dist                              |  21 +-
 phpunit.sample.xml.dist                       |  23 +
 phpunit.xml.dist                              |  23 +-
 samples/BlockStorage/v3/snapshots/list.php    |   2 +-
 .../BlockStorage/v3/snapshots/list_sorted.php |   2 +-
 samples/BlockStorage/v3/volume_types/list.php |   2 +-
 samples/BlockStorage/v3/volumes/list.php      |   2 +-
 samples/BlockStorage/v3/volumes/update.php    |   4 +-
 samples/Compute/v2/flavors/list_flavors.php   |   1 +
 .../get_hypervisors_statistics.php            |   1 -
 .../v2/hypervisors/list_hypervisors.php       |   4 +-
 .../v2/images/delete_image_metadata_item.php  |   2 +-
 samples/Compute/v2/images/list_images.php     |   1 +
 .../v2/images/merge_image_metadata.php        |  21 +
 .../v2/images/reset_image_metadata.php        |   2 +-
 .../v2/images/retrieve_image_metadata.php     |   4 +-
 samples/Compute/v2/keypairs/get_keypair.php   |   1 -
 samples/Compute/v2/keypairs/list_keypairs.php |   4 +-
 samples/Compute/v2/limits/get_limits.php      |   1 -
 .../Compute/v2/servers/add_security_group.php |   5 +-
 .../v2/servers/attach_volume_attachment.php   |   2 -
 .../v2/servers/change_server_password.php     |   4 +-
 .../servers/create_interface_attachment.php   |   5 +-
 samples/Compute/v2/servers/create_server.php  |   1 -
 samples/Compute/v2/servers/delete_server.php  |   1 -
 .../servers/delete_server_metadata_item.php   |   2 +-
 .../v2/servers/get_server_console_output.php  |   1 -
 .../v2/servers/get_server_vnc_console.php     |   1 -
 .../v2/servers/list_security_groups.php       |  10 +-
 .../v2/servers/list_volume_attachments.php    |  10 +-
 .../v2/servers/merge_server_metadata.php      |   2 +-
 samples/Compute/v2/servers/reboot_server.php  |   6 +-
 samples/Compute/v2/servers/rebuild_server.php |   4 +-
 samples/Compute/v2/servers/rescue_server.php  |   4 +-
 .../v2/servers/reset_server_metadata.php      |  10 +-
 .../v2/servers/revert_server_resize.php       |   1 +
 .../Compute/v2/servers/unrescue_server.php    |   4 +-
 samples/Identity/v3/domains/list_domains.php  |   1 +
 .../Identity/v3/domains/list_group_roles.php  |   1 +
 .../Identity/v3/domains/list_user_roles.php   |   1 +
 .../Identity/v3/endpoints/list_endpoints.php  |   1 +
 samples/Identity/v3/groups/list_groups.php    |   1 +
 samples/Identity/v3/groups/list_users.php     |   1 +
 samples/Identity/v3/groups/update_group.php   |   4 +-
 .../Identity/v3/projects/list_group_roles.php |   1 +
 .../Identity/v3/projects/list_user_roles.php  |   1 +
 .../Identity/v3/roles/list_assignments.php    |   1 +
 samples/Identity/v3/roles/list_roles.php      |   1 +
 samples/Identity/v3/services/get_service.php  |   1 +
 .../Identity/v3/services/list_services.php    |   1 +
 samples/Identity/v3/users/list_groups.php     |   1 +
 samples/Identity/v3/users/list_projects.php   |   1 +
 samples/Identity/v3/users/list_users.php      |   1 +
 samples/Images/v2/images/get.php              |   1 +
 samples/Images/v2/members/add.php             |   6 +-
 samples/Networking/v2/floatingIPs/create.php  |   3 +-
 samples/Networking/v2/floatingIPs/delete.php  |   8 +-
 samples/Networking/v2/floatingIPs/get.php     |   9 +-
 samples/Networking/v2/floatingIPs/list.php    |   6 +-
 samples/Networking/v2/floatingIPs/update.php  |   6 +-
 samples/Networking/v2/ports/create.php        |   2 +-
 samples/Networking/v2/ports/create_batch.php  |   8 +-
 .../v2/ports/create_with_fixed_ips.php        |   2 +-
 samples/Networking/v2/ports/list.php          |   1 +
 samples/Networking/v2/ports/update.php        |   2 +-
 .../v2/subnets/create_with_gateway_ip.php     |   2 +-
 .../v2/subnets/create_with_host_routes.php    |   2 +-
 samples/ObjectStore/v1/containers/get.php     |   7 +-
 samples/ObjectStore/v1/containers/list.php    |   2 +-
 .../ObjectStore/v1/objects/check_exists.php   |   9 +-
 samples/ObjectStore/v1/objects/copy.php       |  14 +-
 samples/ObjectStore/v1/objects/create.php     |  16 +-
 samples/ObjectStore/v1/objects/delete.php     |  10 +-
 samples/ObjectStore/v1/objects/download.php   |  11 +-
 .../v1/objects/download_stream.php            |  11 +-
 samples/ObjectStore/v1/objects/get.php        |   9 +-
 .../ObjectStore/v1/objects/get_metadata.php   |  11 +-
 samples/ObjectStore/v1/objects/list.php       |   6 +-
 src/BlockStorage/v2/Models/VolumeType.php     |   9 +-
 src/Compute/v2/Models/Image.php               |   3 +
 src/Compute/v2/Models/Keypair.php             |   6 +-
 src/Compute/v2/Models/Server.php              |   4 +-
 src/Compute/v2/Service.php                    |   4 +-
 src/Identity/v3/Api.php                       |   1 +
 src/Identity/v3/Models/Token.php              |  17 +
 .../integration/BlockStorage/v2/CoreTest.php  |  29 -
 .../BlockStorage/v3/CoreV2Test.php            | 252 ------
 tests/integration/Compute/v2/CoreTest.php     | 757 ------------------
 tests/integration/Identity/v2/CoreTest.php    |  12 -
 .../v3/ApplicationCredentialsTest.php         |  97 ---
 tests/integration/Identity/v3/CoreTest.php    | 392 ---------
 tests/integration/Images/v2/CoreTest.php      | 165 ----
 tests/integration/Networking/v2/CoreTest.php  | 326 --------
 .../integration/Networking/v2/Layer3Test.php  | 152 ----
 .../Networking/v2/SecGroupTest.php            |  12 -
 tests/integration/ObjectStore/v1/CoreTest.php | 210 -----
 tests/integration/Runner.php                  | 162 ----
 tests/integration/SampleManagerInterface.php  |  10 -
 tests/integration/TestCase.php                | 136 ----
 tests/integration/TestInterface.php           |  16 -
 tests/integration/Utils.php                   |  65 --
 tests/integration/run.php                     |  12 -
 tests/integration/script/compute_v2           |   3 -
 tests/integration/script/identity_v3          |   3 -
 tests/integration/script/networking_v2        |   3 -
 tests/integration/script/objectstore_v2       |   3 -
 .../sample/BlockStorage/v2/ConvertFromV3.php  |  33 +
 tests/sample/BlockStorage/v2/SnapshotTest.php |   8 +
 tests/sample/BlockStorage/v2/VolumeTest.php   |  15 +
 .../sample/BlockStorage/v2/VolumeTypeTest.php |   8 +
 tests/sample/BlockStorage/v3/SnapshotTest.php | 271 +++++++
 tests/sample/BlockStorage/v3/TestCase.php     |  17 +
 tests/sample/BlockStorage/v3/VolumeTest.php   | 117 +++
 .../sample/BlockStorage/v3/VolumeTypeTest.php |  94 +++
 tests/sample/Compute/v2/FlavorTest.php        |  72 ++
 tests/sample/Compute/v2/HypervisorTest.php    |  40 +
 tests/sample/Compute/v2/ImageTest.php         | 171 ++++
 .../Compute/v2/InterfaceAttachmentTest.php    |  43 +
 tests/sample/Compute/v2/KeypairTest.php       |  80 ++
 tests/sample/Compute/v2/LimitTest.php         |  16 +
 tests/sample/Compute/v2/SecurityGroupTest.php |  82 ++
 tests/sample/Compute/v2/ServerTest.php        | 365 +++++++++
 tests/sample/Compute/v2/TestCase.php          | 111 +++
 .../Compute/v2/VolumeAttachmentTest.php       |  85 ++
 .../{integration => sample}/DefaultLogger.php |   2 +-
 .../Identity/v3/ApplicationCredentialTest.php |  90 +++
 tests/sample/Identity/v3/DomainTest.php       | 278 +++++++
 tests/sample/Identity/v3/EndpointTest.php     |  94 +++
 tests/sample/Identity/v3/GroupTest.php        | 225 ++++++
 tests/sample/Identity/v3/ProjectTest.php      | 251 ++++++
 tests/sample/Identity/v3/RoleTest.php         |  66 ++
 tests/sample/Identity/v3/ServiceTest.php      | 108 +++
 tests/sample/Identity/v3/TestCase.php         |  18 +
 tests/sample/Identity/v3/TokenTest.php        |  76 ++
 tests/sample/Identity/v3/UserTest.php         | 165 ++++
 tests/sample/Images/v2/ImageTest.php          | 192 +++++
 tests/sample/Images/v2/MemberTest.php         |  68 ++
 tests/sample/Images/v2/TestCase.php           |  19 +
 tests/sample/Networking/v2/FloatingIpData.php |  29 +
 tests/sample/Networking/v2/FloatingIpTest.php | 186 +++++
 tests/sample/Networking/v2/NetworkTest.php    |  82 ++
 tests/sample/Networking/v2/PortTest.php       | 155 ++++
 tests/sample/Networking/v2/SubnetTest.php     | 133 +++
 tests/sample/Networking/v2/TestCase.php       |  25 +
 tests/sample/ObjectStore/v1/AccountTest.php   |  57 ++
 tests/sample/ObjectStore/v1/ContainerTest.php | 134 ++++
 tests/sample/ObjectStore/v1/ObjectTest.php    | 227 ++++++
 tests/sample/ObjectStore/v1/TestCase.php      |  19 +
 .../{integration => sample}/SampleManager.php |  33 +-
 tests/sample/TestCase.php                     | 129 +++
 156 files changed, 4751 insertions(+), 3124 deletions(-)
 delete mode 100644 .travis.yml
 create mode 100644 phpunit.sample.xml.dist
 create mode 100644 samples/Compute/v2/images/merge_image_metadata.php
 delete mode 100644 tests/integration/BlockStorage/v2/CoreTest.php
 delete mode 100644 tests/integration/BlockStorage/v3/CoreV2Test.php
 delete mode 100644 tests/integration/Compute/v2/CoreTest.php
 delete mode 100644 tests/integration/Identity/v2/CoreTest.php
 delete mode 100644 tests/integration/Identity/v3/ApplicationCredentialsTest.php
 delete mode 100644 tests/integration/Identity/v3/CoreTest.php
 delete mode 100644 tests/integration/Images/v2/CoreTest.php
 delete mode 100644 tests/integration/Networking/v2/CoreTest.php
 delete mode 100644 tests/integration/Networking/v2/Layer3Test.php
 delete mode 100644 tests/integration/Networking/v2/SecGroupTest.php
 delete mode 100644 tests/integration/ObjectStore/v1/CoreTest.php
 delete mode 100644 tests/integration/Runner.php
 delete mode 100644 tests/integration/SampleManagerInterface.php
 delete mode 100644 tests/integration/TestCase.php
 delete mode 100644 tests/integration/TestInterface.php
 delete mode 100644 tests/integration/Utils.php
 delete mode 100644 tests/integration/run.php
 delete mode 100755 tests/integration/script/compute_v2
 delete mode 100755 tests/integration/script/identity_v3
 delete mode 100755 tests/integration/script/networking_v2
 delete mode 100755 tests/integration/script/objectstore_v2
 create mode 100644 tests/sample/BlockStorage/v2/ConvertFromV3.php
 create mode 100644 tests/sample/BlockStorage/v2/SnapshotTest.php
 create mode 100644 tests/sample/BlockStorage/v2/VolumeTest.php
 create mode 100644 tests/sample/BlockStorage/v2/VolumeTypeTest.php
 create mode 100644 tests/sample/BlockStorage/v3/SnapshotTest.php
 create mode 100644 tests/sample/BlockStorage/v3/TestCase.php
 create mode 100644 tests/sample/BlockStorage/v3/VolumeTest.php
 create mode 100644 tests/sample/BlockStorage/v3/VolumeTypeTest.php
 create mode 100644 tests/sample/Compute/v2/FlavorTest.php
 create mode 100644 tests/sample/Compute/v2/HypervisorTest.php
 create mode 100644 tests/sample/Compute/v2/ImageTest.php
 create mode 100644 tests/sample/Compute/v2/InterfaceAttachmentTest.php
 create mode 100644 tests/sample/Compute/v2/KeypairTest.php
 create mode 100644 tests/sample/Compute/v2/LimitTest.php
 create mode 100644 tests/sample/Compute/v2/SecurityGroupTest.php
 create mode 100644 tests/sample/Compute/v2/ServerTest.php
 create mode 100644 tests/sample/Compute/v2/TestCase.php
 create mode 100644 tests/sample/Compute/v2/VolumeAttachmentTest.php
 rename tests/{integration => sample}/DefaultLogger.php (92%)
 create mode 100644 tests/sample/Identity/v3/ApplicationCredentialTest.php
 create mode 100644 tests/sample/Identity/v3/DomainTest.php
 create mode 100644 tests/sample/Identity/v3/EndpointTest.php
 create mode 100644 tests/sample/Identity/v3/GroupTest.php
 create mode 100644 tests/sample/Identity/v3/ProjectTest.php
 create mode 100644 tests/sample/Identity/v3/RoleTest.php
 create mode 100644 tests/sample/Identity/v3/ServiceTest.php
 create mode 100644 tests/sample/Identity/v3/TestCase.php
 create mode 100644 tests/sample/Identity/v3/TokenTest.php
 create mode 100644 tests/sample/Identity/v3/UserTest.php
 create mode 100644 tests/sample/Images/v2/ImageTest.php
 create mode 100644 tests/sample/Images/v2/MemberTest.php
 create mode 100644 tests/sample/Images/v2/TestCase.php
 create mode 100644 tests/sample/Networking/v2/FloatingIpData.php
 create mode 100644 tests/sample/Networking/v2/FloatingIpTest.php
 create mode 100644 tests/sample/Networking/v2/NetworkTest.php
 create mode 100644 tests/sample/Networking/v2/PortTest.php
 create mode 100644 tests/sample/Networking/v2/SubnetTest.php
 create mode 100644 tests/sample/Networking/v2/TestCase.php
 create mode 100644 tests/sample/ObjectStore/v1/AccountTest.php
 create mode 100644 tests/sample/ObjectStore/v1/ContainerTest.php
 create mode 100644 tests/sample/ObjectStore/v1/ObjectTest.php
 create mode 100644 tests/sample/ObjectStore/v1/TestCase.php
 rename tests/{integration => sample}/SampleManager.php (75%)
 create mode 100644 tests/sample/TestCase.php

diff --git a/.gitattributes b/.gitattributes
index 5041178c..8146c84c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,8 @@
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs.dist export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/.readthedocs.yaml export-ignore
 /.scrutinizer.yml export-ignore
-/.travis.yml export-ignore
+/phpunit.sample.xml.dist export-ignore
 /phpunit.xml.dist export-ignore
\ No newline at end of file
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index b94f8184..f00c019f 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -96,19 +96,9 @@ jobs:
             echo OS_FLAVOR=1
             echo OS_DOMAIN_ID=default
           } >> "$GITHUB_ENV"
-      - name: Execute Block Storage v2 tests
+      - name: Check if Block Storage API v2 must be tested
         if: matrix.block_storage_v2 == true
-        run: php ./tests/integration/run.php -s=BlockStorage -v=v2
-      - name: Execute Block Storage v3 tests
-        run: php ./tests/integration/run.php -s=BlockStorage -v=v3
-      - name: Execute Compute tests
-        run: php ./tests/integration/run.php -s=Compute
-      - name: Execute Identity tests
-        run: php ./tests/integration/run.php -s=Identity
-      - name: Execute Images tests
-        run: php ./tests/integration/run.php -s=Images
-      - name: Execute Networking tests
-        run: php ./tests/integration/run.php -s=Networking
-      - name: Execute Object Storage tests
-        run: php ./tests/integration/run.php -s=ObjectStore
+        run: echo "OS_BLOCK_STORAGE_V2=1" >> "$GITHUB_ENV"
+      - name: Execute Integration tests via PhpUnit
+        run: vendor/bin/phpunit --configuration ./phpunit.sample.xml.dist
 
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 91f83d70..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-language: php
-
-dist: bionic
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-matrix:
-  include:
-    - php: 7.2
-    - php: 7.3
-    - php: 7.4
-    - php: 8.0
-    - php: nightly
-  allow_failures:
-    - php: nightly
-  fast_finish: true
-
-before_install:
-  - cat $HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/etc/conf.d/xdebug.ini > ./xdebug.ini
-  - phpenv config-rm xdebug.ini || true
-  - composer self-update
-  - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-
-before_script:
-  - composer install --prefer-source
-  - vendor/bin/parallel-lint --exclude vendor .
-  - vendor/bin/php-cs-fixer fix --dry-run --diff
-  - phpenv config-add ./xdebug.ini
-
-after_script:
-  - php vendor/bin/coveralls -v
-
-after_success:
-  - travis_retry php vendor/bin/php-coveralls -v
-
-notifications:
-  email:
-    - thanhha.work@gmail.com
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8661ec7e..a7705d30 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -185,7 +185,7 @@ The second argument to `setupMockResponse` is an external file, storing a string
 We use phpunit, so you run this at the project root:
 
 ```bash
-phpunit
+vendor/bin/phpunit
 ```
 
 ### Integration tests
@@ -203,29 +203,46 @@ service charges from your provider. Although most tests handle their own
 teardown procedures, it is always worth manually checking that resources are
 deleted after the test suite finishes.
 
+It is recommended to run integration test in a separate OpenStack project, so that you can easily clean up all resources.
+
 We use all of our sample files as live integration tests, achieving the dual aim of reducing code duplication and 
 ensuring that our samples actually work.
 
+### Setting up dev environment
+
+In order to run integration tests, you need to have a working OpenStack environment. 
+You can use [DevStack](http://docs.openstack.org/developer/devstack/) to set up a local OpenStack environment.
+DevStack will make substantial changes to your system during installation. Only run DevStack on servers or
+virtual machines that are dedicated to this purpose.
+
+Installation is pretty straightforward. You can use guide on their [website](http://docs.openstack.org/developer/devstack/).
+
+Here is currently used `local.conf` for DevStack:
+
+```ini
+[[local|localrc]]
+ADMIN_PASSWORD=secret
+DATABASE_PASSWORD=root
+RABBIT_PASSWORD=secret
+SERVICE_PASSWORD=secret
+SWIFT_HASH=1234123412341234
+LOGFILE=/tmp/devstack-logs/devstack.log
+USE_PYTHON3=True
+INSTALL_TEMPEST=False
+GIT_BASE=https://github.com
+ENABLED_SERVICES+=,-horizon,-dstat,-tempest,s-account,s-container,s-object,s-proxy,s-bak
+SWIFT_ENABLE_TEMPURLS=True
+SWIFT_TEMPURL_KEY=secretkey
+
+[[post-config|$SWIFT_CONFIG_PROXY_SERVER]]
+[filter:versioned_writes]
+allow_object_versioning = true
+```
+
 ### Setting up environment variables
 
 Rename `env_test.sh.dist` as `env_test.sh` and replace values according to your OpenStack instance configuration.
-Completed file may look as following.
-
-
-```bash
-#!/usr/bin/env bash
-export OS_AUTH_URL="http://1.2.3.4:5000/v3"       
-export OS_REGION="RegionOne"
-export OS_REGION_NAME="RegionOne"
-export OS_USER_ID="536068bcb1b946ff8e2f10eff6543f9c"
-export OS_USERNAME="admin"
-export OS_PASSWORD="2251639ecaea442b"
-export OS_PROJECT_ID="b62b3bebf9e84e4eb11aafcd8c58db3f"
-export OS_PROJECT_NAME="admin"
-export OS_RESIZE_FLAVOR=2                                 #Must be a valid flavor ID
-export OS_FLAVOR=1                                        #Must be a valid flavor ID
-export OS_DOMAIN_ID="default"
-```
+If you are using DevStack with config file above, the values would be filled automatically.
 
 To export environment variables, run
  ```bash
@@ -236,23 +253,12 @@ Additionally, integration tests require image called `cirros` exists.
 
 ### Running integration tests
 
-You interact with integration tests through a runner script:
+We use phpunit, so you run this at the project root:
 
 ```bash
-php ./tests/integration/run.php [-s=BlockStorage|Compute|Identity|Images|Networking|ObjectStore] [--debug=1|2]
+vendor/bin/phpunit --configuration ./phpunit.sample.xml.dist
 ```
 
-It supports these command-line flags:
-
-| Flag | Description | Example |
-| ---- | ----------- | ------- |
-| `-s` `--service` | Allows you to refine tests by a particular service. A service corresponds to top-level directories in the `./integration` directory, meaning that `compute` and `identity` are services because they exist as sub-directories there. If omitted, all services are run.|Run compute service: `php ./tests/integration/run.php -s compute` Run all tests: `php ./tests/integration/run.php`|
-| `-v` `--version` | Allows you to refine by a particular service version. A version corresponds to the sub-directories inside a service directory, meaning that `v2` is a supported version of `compute` because it exists as a sub-directory inside the `compute` directory. If omitted, all versions are run.|Run v2 Compute tests: `php ./tests/integration/run.php -s compute -v v2` Run all compute tests: `php ./tests/integration/run.php -s compute`|
-| `-t` `--test` | Allows you to refine by a particular test. Tests are defined in classes like `integration\OpenStack\Compute\v2`. Each test method manually references a sample file. To refine which tests are run, list the name of the method in this class. If omitted, all tests are run.|Run create server test: `php ./tests/integration/run.php -s compute -v v2 -t createServer` Run all compute v2 tests: `php ./tests/integration/run.php -s compute -v v2`|
-| `--debug` |||
-| `--help` | A help screen is returned and no tests run | `php ./tests/integration/run.php --help`
-
-
 ## Style guide
 
 We follow [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) for our 
@@ -281,14 +287,11 @@ required to adhere to:
 
 ### 1. Providing feedback
 
-On of the easiest ways to get readily involved in our project is to let us know
+One of the easiest ways to get readily involved in our project is to let us know
 about your experiences using our SDK. Feedback like this is incredibly useful
 to us, because it allows us to refine and change features based on what our
-users want and expect of us. There are a bunch of ways to get in contact! You
-can [ping us](https://developer.rackspace.com/support/) via e-mail, talk to us on irc
-(#rackspace-dev on freenode), [tweet us](https://twitter.com/rackspace), or
-submit an issue on our [bug tracker](/issues). Things you might like to tell us
-are:
+users want and expect of us.  You can submit an issue on our [bug tracker](/issues).
+Things you might like to tell us are:
 
 * how easy was it to start using our SDK?
 * did it meet your expectations? If not, why not?
@@ -309,8 +312,7 @@ breakthroughs on it so far.
 We have three forms of documentation:
 
 * short README documents that briefly introduce a topic
-* reference documentation
-* user documentation on http://docs.php-opencloud.com that includes
+* user documentation on https://php-openstack-sdk.readthedocs.io that includes
 getting started guides, installation guides and code samples
 
 If you feel that a certain section could be improved - whether it's to clarify
diff --git a/composer.json b/composer.json
index 6d460aad..d0e78e25 100644
--- a/composer.json
+++ b/composer.json
@@ -50,6 +50,7 @@
     "autoload-dev": {
         "psr-4": {
             "OpenStack\\Integration\\": "tests/integration/",
+            "OpenStack\\Sample\\": "tests/sample/",
             "OpenStack\\Test\\": "tests/unit/"
         }
     },
diff --git a/doc/services/compute/v2/servers.rst b/doc/services/compute/v2/servers.rst
index a80fc4b9..eb6ed7ea 100644
--- a/doc/services/compute/v2/servers.rst
+++ b/doc/services/compute/v2/servers.rst
@@ -229,8 +229,8 @@ This operation will reset the state of the server.
 Reboot server
 -------------
 
-This operation will reboot a server. Please be aware that you must specify whether you want to initiate a HARD or
-SOFT reboot (you specify this as a string argument).
+This operation will reboot a server. You can specify HARD reboot by passing argument Enum::REBOOT_HARD to the function.
+Otherwise, the default is a SOFT reboot.
 
 .. sample:: Compute/v2/servers/reboot_server.php
 .. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_reboot
diff --git a/env_test.sh.dist b/env_test.sh.dist
index 1abaec35..e9fcb762 100644
--- a/env_test.sh.dist
+++ b/env_test.sh.dist
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
-export OS_AUTH_URL=""
-export OS_REGION=""
-export OS_REGION_NAME=""
-export OS_USER_ID=""
-export OS_USERNAME=""
-export OS_PASSWORD=""
-export OS_PROJECT_ID=""
-export OS_PROJECT_NAME=""
-export OS_RESIZE_FLAVOR=""
-export OS_FLAVOR=""
+
+export OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
+export OS_REGION="RegionOne"
+export OS_REGION_NAME="RegionOne"
+export OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
+export OS_USERNAME="admin"
+export OS_PASSWORD="secret"
+export OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
+export OS_PROJECT_NAME="admin"
+export OS_RESIZE_FLAVOR="c1"
+export OS_FLAVOR=1
 export OS_DOMAIN_ID="default"
diff --git a/phpunit.sample.xml.dist b/phpunit.sample.xml.dist
new file mode 100644
index 00000000..d2048c5f
--- /dev/null
+++ b/phpunit.sample.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+        bootstrap="./vendor/autoload.php"
+        colors="true"
+        beStrictAboutOutputDuringTests="true"
+        stopOnError="true"
+        stopOnFailure="true"
+        printerClass="\PHPUnit\Util\TestDox\CliTestDoxPrinter"
+        verbose="true"
+>
+    <testsuites>
+        <testsuite name="Sample">
+            <directory>tests/sample</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <ini name="error_reporting" value=""/>
+        <ini name="display_errors" value="On"/>
+        <ini name="display_startup_errors" value="On"/>
+    </php>
+</phpunit>
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 22694ff4..e77fdd4c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true" beStrictAboutOutputDuringTests="true">
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+        bootstrap="./vendor/autoload.php"
+        colors="true"
+        beStrictAboutOutputDuringTests="true"
+>
     <testsuites>
-        <testsuite name="OpenStack">
+        <testsuite name="Unit">
             <directory>tests/unit</directory>
         </testsuite>
     </testsuites>
@@ -13,14 +16,4 @@
         <ini name="display_errors" value="On"/>
         <ini name="display_startup_errors" value="On"/>
     </php>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <directory suffix="Interface.php">./src</directory>
-                <directory suffix="Api.php">./src</directory>
-                <directory suffix="Params.php">./src</directory>
-            </exclude>
-        </whitelist>
-    </filter>
 </phpunit>
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/snapshots/list.php b/samples/BlockStorage/v3/snapshots/list.php
index 5d58bda9..fdf3f66d 100644
--- a/samples/BlockStorage/v3/snapshots/list.php
+++ b/samples/BlockStorage/v3/snapshots/list.php
@@ -14,5 +14,5 @@
 $snapshots = $service->listSnapshots();
 
 foreach ($snapshots as $snapshot) {
-    /** @var $snapshot \OpenStack\BlockStorage\v2\Models\Snapshot */
+    /** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */
 }
diff --git a/samples/BlockStorage/v3/snapshots/list_sorted.php b/samples/BlockStorage/v3/snapshots/list_sorted.php
index 1f01301d..ce9a50bf 100644
--- a/samples/BlockStorage/v3/snapshots/list_sorted.php
+++ b/samples/BlockStorage/v3/snapshots/list_sorted.php
@@ -14,5 +14,5 @@
 $snapshots = $service->listSnapshots(false, ['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
 
 foreach ($snapshots as $snapshot) {
-    /** @var $snapshot \OpenStack\BlockStorage\v2\Models\Snapshot */
+    /** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */
 }
diff --git a/samples/BlockStorage/v3/volume_types/list.php b/samples/BlockStorage/v3/volume_types/list.php
index 3c6d3bf8..288a183e 100644
--- a/samples/BlockStorage/v3/volume_types/list.php
+++ b/samples/BlockStorage/v3/volume_types/list.php
@@ -14,5 +14,5 @@
 $volumeTypes = $service->listVolumeTypes();
 
 foreach ($volumeTypes as $volumeType) {
-    /** @var $volumeType \OpenStack\BlockStorage\v2\VolumeType */
+    /** @var \OpenStack\BlockStorage\v2\Models\VolumeType $volumeType */
 }
diff --git a/samples/BlockStorage/v3/volumes/list.php b/samples/BlockStorage/v3/volumes/list.php
index 0b1d5c83..a067b304 100644
--- a/samples/BlockStorage/v3/volumes/list.php
+++ b/samples/BlockStorage/v3/volumes/list.php
@@ -14,5 +14,5 @@
 $volumes = $service->listVolumes();
 
 foreach ($volumes as $volume) {
-    /** @var $volume \OpenStack\BlockStorage\v2\Models\Volume */
+    /** @var \OpenStack\BlockStorage\v2\Models\Volume $volume */
 }
diff --git a/samples/BlockStorage/v3/volumes/update.php b/samples/BlockStorage/v3/volumes/update.php
index d9de1d53..371d12e8 100644
--- a/samples/BlockStorage/v3/volumes/update.php
+++ b/samples/BlockStorage/v3/volumes/update.php
@@ -6,14 +6,14 @@
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
     'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $service = $openstack->blockStorageV3();
 
 $volume = $service->getVolume('{volumeId}');
 
-$volume->name        = '{newName}';
+$volume->name = '{newName}';
 $volume->description = '{newDescription}';
 
 $volume->update();
diff --git a/samples/Compute/v2/flavors/list_flavors.php b/samples/Compute/v2/flavors/list_flavors.php
index 570af2d0..b14eaaee 100644
--- a/samples/Compute/v2/flavors/list_flavors.php
+++ b/samples/Compute/v2/flavors/list_flavors.php
@@ -17,4 +17,5 @@
 $flavors = $compute->listFlavors();
 
 foreach ($flavors as $flavor) {
+    /** @var \OpenStack\Compute\v2\Models\Flavor $flavor */
 }
diff --git a/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php b/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php
index c4e78e35..b702b4d5 100644
--- a/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php
+++ b/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php
@@ -16,5 +16,4 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-/** @var HypervisorStatistic $hypervisorStatistics */
 $hypervisorStatistics = $compute->getHypervisorStatistics();
diff --git a/samples/Compute/v2/hypervisors/list_hypervisors.php b/samples/Compute/v2/hypervisors/list_hypervisors.php
index dee1eaf9..4dd7b384 100644
--- a/samples/Compute/v2/hypervisors/list_hypervisors.php
+++ b/samples/Compute/v2/hypervisors/list_hypervisors.php
@@ -1,7 +1,5 @@
 <?php
 
-use OpenStack\Compute\v2\Models\Hypervisor;
-
 require 'vendor/autoload.php';
 
 $openstack = new OpenStack\OpenStack([
@@ -19,5 +17,5 @@
 $hypervisors = $compute->listHypervisors();
 
 foreach ($hypervisors as $hypervisor) {
-    /**@var Hypervisor $hypervisor*/
+    /** @var \OpenStack\Compute\v2\Models\Hypervisor $hypervisor */
 }
diff --git a/samples/Compute/v2/images/delete_image_metadata_item.php b/samples/Compute/v2/images/delete_image_metadata_item.php
index 31e89e0d..442fd320 100644
--- a/samples/Compute/v2/images/delete_image_metadata_item.php
+++ b/samples/Compute/v2/images/delete_image_metadata_item.php
@@ -16,4 +16,4 @@
 
 $image = $compute->getImage(['id' => '{imageId}']);
 
-$image->deleteMetadataItem('key');
+$image->deleteMetadataItem('{key}');
diff --git a/samples/Compute/v2/images/list_images.php b/samples/Compute/v2/images/list_images.php
index 0c7f5638..d0353c8d 100644
--- a/samples/Compute/v2/images/list_images.php
+++ b/samples/Compute/v2/images/list_images.php
@@ -17,4 +17,5 @@
 $images = $compute->listImages(['status' => 'ACTIVE']);
 
 foreach ($images as $image) {
+    /** @var \OpenStack\Compute\v2\Models\Image $image */
 }
diff --git a/samples/Compute/v2/images/merge_image_metadata.php b/samples/Compute/v2/images/merge_image_metadata.php
new file mode 100644
index 00000000..c2b9151b
--- /dev/null
+++ b/samples/Compute/v2/images/merge_image_metadata.php
@@ -0,0 +1,21 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$compute = $openstack->computeV2(['region' => '{region}']);
+
+$image = $compute->getImage(['id' => '{imageId}']);
+
+$image->mergeMetadata([
+    '{key}' => '{value}',
+]);
diff --git a/samples/Compute/v2/images/reset_image_metadata.php b/samples/Compute/v2/images/reset_image_metadata.php
index 790f8e5a..176dc948 100644
--- a/samples/Compute/v2/images/reset_image_metadata.php
+++ b/samples/Compute/v2/images/reset_image_metadata.php
@@ -17,5 +17,5 @@
 $image = $compute->getImage(['id' => '{imageId}']);
 
 $image->resetMetadata([
-    'key' => 'value',
+    '{key}' => '{value}',
 ]);
diff --git a/samples/Compute/v2/images/retrieve_image_metadata.php b/samples/Compute/v2/images/retrieve_image_metadata.php
index 44600436..e2316f68 100644
--- a/samples/Compute/v2/images/retrieve_image_metadata.php
+++ b/samples/Compute/v2/images/retrieve_image_metadata.php
@@ -16,6 +16,4 @@
 
 $image = $compute->getImage(['id' => '{imageId}']);
 
-$metadata = $image->getMetadata([
-    'key' => 'value'
-]);
+$metadata = $image->getMetadata();
diff --git a/samples/Compute/v2/keypairs/get_keypair.php b/samples/Compute/v2/keypairs/get_keypair.php
index 9ed0fb5e..bbfc0ba1 100644
--- a/samples/Compute/v2/keypairs/get_keypair.php
+++ b/samples/Compute/v2/keypairs/get_keypair.php
@@ -14,7 +14,6 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-/** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
 $keypair = $compute->getKeypair(['name' => '{name}']);
 
 $keypair->retrieve();
diff --git a/samples/Compute/v2/keypairs/list_keypairs.php b/samples/Compute/v2/keypairs/list_keypairs.php
index c1b88ae6..dedf9bbe 100644
--- a/samples/Compute/v2/keypairs/list_keypairs.php
+++ b/samples/Compute/v2/keypairs/list_keypairs.php
@@ -1,7 +1,5 @@
 <?php
 
-use OpenStack\Compute\v2\Models\Keypair;
-
 require 'vendor/autoload.php';
 
 $openstack = new OpenStack\OpenStack([
@@ -19,5 +17,5 @@
 $keypairs = $compute->listKeypairs();
 
 foreach ($keypairs as $keypair) {
-    /**@var Keypair $keypair */
+    /** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
 }
diff --git a/samples/Compute/v2/limits/get_limits.php b/samples/Compute/v2/limits/get_limits.php
index 15aa6e16..2123995f 100644
--- a/samples/Compute/v2/limits/get_limits.php
+++ b/samples/Compute/v2/limits/get_limits.php
@@ -14,5 +14,4 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-/** @var \OpenStack\Compute\v2\Models\Limit $limit */
 $limit = $compute->getLimits();
diff --git a/samples/Compute/v2/servers/add_security_group.php b/samples/Compute/v2/servers/add_security_group.php
index 429d5207..1b471306 100644
--- a/samples/Compute/v2/servers/add_security_group.php
+++ b/samples/Compute/v2/servers/add_security_group.php
@@ -14,9 +14,6 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-/**@var OpenStack\Compute\v2\Models\Server $server */
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
 $server->addSecurityGroup(['name' => '{secGroupName}']);
diff --git a/samples/Compute/v2/servers/attach_volume_attachment.php b/samples/Compute/v2/servers/attach_volume_attachment.php
index fb803c6a..e072d332 100644
--- a/samples/Compute/v2/servers/attach_volume_attachment.php
+++ b/samples/Compute/v2/servers/attach_volume_attachment.php
@@ -18,8 +18,6 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-/**@var OpenStack\Compute\v2\Models\Server $server */
 $server = $compute->getServer(['id' => '{serverId}']);
 
-/**@var VolumeAttachment $volumeAttachment*/
 $volumeAttachment = $server->attachVolume('{volumeId}');
diff --git a/samples/Compute/v2/servers/change_server_password.php b/samples/Compute/v2/servers/change_server_password.php
index c2330a2e..f3f22ed3 100644
--- a/samples/Compute/v2/servers/change_server_password.php
+++ b/samples/Compute/v2/servers/change_server_password.php
@@ -14,8 +14,6 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
 $server->changePassword('{newPassword}');
diff --git a/samples/Compute/v2/servers/create_interface_attachment.php b/samples/Compute/v2/servers/create_interface_attachment.php
index f87d9929..430e0cc7 100644
--- a/samples/Compute/v2/servers/create_interface_attachment.php
+++ b/samples/Compute/v2/servers/create_interface_attachment.php
@@ -16,7 +16,4 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
-/**@var OpenStack\Networking\v2\Models\InterfaceAttachment $interface */
-$interface = $server->createInterfaceAttachment([
-    'networkId' => '{networkId}',
-]);
+$interfaceAttachment = $server->createInterfaceAttachment(['networkId' => '{networkId}']);
diff --git a/samples/Compute/v2/servers/create_server.php b/samples/Compute/v2/servers/create_server.php
index 41190f5d..73a9fc06 100644
--- a/samples/Compute/v2/servers/create_server.php
+++ b/samples/Compute/v2/servers/create_server.php
@@ -31,5 +31,4 @@
 ];
 
 // Create the server
-/**@var OpenStack\Compute\v2\Models\Server $server */
 $server = $compute->createServer($options);
diff --git a/samples/Compute/v2/servers/delete_server.php b/samples/Compute/v2/servers/delete_server.php
index 650ae209..48bf850f 100644
--- a/samples/Compute/v2/servers/delete_server.php
+++ b/samples/Compute/v2/servers/delete_server.php
@@ -14,7 +14,6 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-/**@var OpenStack\Compute\v2\Models\Server $server */
 $server = $compute->getServer(['id' => '{serverId}']);
 
 $server->delete();
diff --git a/samples/Compute/v2/servers/delete_server_metadata_item.php b/samples/Compute/v2/servers/delete_server_metadata_item.php
index 318f1d32..2b51dd63 100644
--- a/samples/Compute/v2/servers/delete_server_metadata_item.php
+++ b/samples/Compute/v2/servers/delete_server_metadata_item.php
@@ -16,4 +16,4 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
-$server->deleteMetadataItem('key');
+$server->deleteMetadataItem('{key}');
diff --git a/samples/Compute/v2/servers/get_server_console_output.php b/samples/Compute/v2/servers/get_server_console_output.php
index e579f367..4a9118c8 100644
--- a/samples/Compute/v2/servers/get_server_console_output.php
+++ b/samples/Compute/v2/servers/get_server_console_output.php
@@ -16,5 +16,4 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
-/** @var string $consoleOutput */
 $consoleOutput = $server->getConsoleOutput();
diff --git a/samples/Compute/v2/servers/get_server_vnc_console.php b/samples/Compute/v2/servers/get_server_vnc_console.php
index fc1bcf2c..d662c481 100644
--- a/samples/Compute/v2/servers/get_server_vnc_console.php
+++ b/samples/Compute/v2/servers/get_server_vnc_console.php
@@ -16,5 +16,4 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
-/** @var array $console */
 $console = $server->getVncConsole();
diff --git a/samples/Compute/v2/servers/list_security_groups.php b/samples/Compute/v2/servers/list_security_groups.php
index f215a3e3..d7743c25 100644
--- a/samples/Compute/v2/servers/list_security_groups.php
+++ b/samples/Compute/v2/servers/list_security_groups.php
@@ -1,8 +1,5 @@
 <?php
 
-use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
-use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule;
-
 require 'vendor/autoload.php';
 
 $openstack = new OpenStack\OpenStack([
@@ -22,10 +19,5 @@
 $securityGroups = $server->listSecurityGroups();
 
 foreach ($securityGroups as $securityGroup) {
-    /**@var SecurityGroup $securityGroup */
-    $rules = $securityGroup->securityGroupRules;
-
-    foreach ($rules as $rule) {
-        /**@var SecurityGroupRule $rule */
-    }
+    /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $securityGroup */
 }
diff --git a/samples/Compute/v2/servers/list_volume_attachments.php b/samples/Compute/v2/servers/list_volume_attachments.php
index 518e9364..683e4740 100644
--- a/samples/Compute/v2/servers/list_volume_attachments.php
+++ b/samples/Compute/v2/servers/list_volume_attachments.php
@@ -1,9 +1,5 @@
 <?php
 
-use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
-use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
-use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule;
-
 require 'vendor/autoload.php';
 
 $openstack = new OpenStack\OpenStack([
@@ -11,9 +7,9 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $compute = $openstack->computeV2(['region' => '{region}']);
@@ -21,5 +17,5 @@
 $server = $compute->getServer(['id' => '{serverId}']);
 
 foreach ($server->listVolumeAttachments() as $volumeAttachment) {
-    /**@var VolumeAttachment $volumeAttachment*/
+    /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
 }
diff --git a/samples/Compute/v2/servers/merge_server_metadata.php b/samples/Compute/v2/servers/merge_server_metadata.php
index e67cf8b5..447e05fc 100644
--- a/samples/Compute/v2/servers/merge_server_metadata.php
+++ b/samples/Compute/v2/servers/merge_server_metadata.php
@@ -17,5 +17,5 @@
 $server = $compute->getServer(['id' => '{serverId}']);
 
 $server->mergeMetadata([
-    'key' => 'value'
+    '{key}' => '{value}'
 ]);
diff --git a/samples/Compute/v2/servers/reboot_server.php b/samples/Compute/v2/servers/reboot_server.php
index ac4a50ca..a341cc4f 100644
--- a/samples/Compute/v2/servers/reboot_server.php
+++ b/samples/Compute/v2/servers/reboot_server.php
@@ -14,8 +14,6 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
-$server->reboot();
+$server->reboot(\OpenStack\Compute\v2\Enum::REBOOT_HARD);
diff --git a/samples/Compute/v2/servers/rebuild_server.php b/samples/Compute/v2/servers/rebuild_server.php
index 0867abdb..26f8ba19 100644
--- a/samples/Compute/v2/servers/rebuild_server.php
+++ b/samples/Compute/v2/servers/rebuild_server.php
@@ -14,9 +14,7 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
 $server->rebuild([
     'imageId'   => '{imageId}',
diff --git a/samples/Compute/v2/servers/rescue_server.php b/samples/Compute/v2/servers/rescue_server.php
index d4c6516a..38a28abd 100644
--- a/samples/Compute/v2/servers/rescue_server.php
+++ b/samples/Compute/v2/servers/rescue_server.php
@@ -14,9 +14,7 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
 $server->rescue([
     'imageId'   => '{imageId}',
diff --git a/samples/Compute/v2/servers/reset_server_metadata.php b/samples/Compute/v2/servers/reset_server_metadata.php
index 37748a4c..0a3036e1 100644
--- a/samples/Compute/v2/servers/reset_server_metadata.php
+++ b/samples/Compute/v2/servers/reset_server_metadata.php
@@ -7,17 +7,15 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
 $server->resetMetadata([
-    'key' => 'value',
+    '{key}' => '{value}',
 ]);
diff --git a/samples/Compute/v2/servers/revert_server_resize.php b/samples/Compute/v2/servers/revert_server_resize.php
index ee116d5b..2b0390a7 100644
--- a/samples/Compute/v2/servers/revert_server_resize.php
+++ b/samples/Compute/v2/servers/revert_server_resize.php
@@ -18,4 +18,5 @@
     'id' => '{serverId}',
 ]);
 
+$server->waitUntil('VERIFY_RESIZE');
 $server->revertResize();
diff --git a/samples/Compute/v2/servers/unrescue_server.php b/samples/Compute/v2/servers/unrescue_server.php
index 4148ac9f..34f1527d 100644
--- a/samples/Compute/v2/servers/unrescue_server.php
+++ b/samples/Compute/v2/servers/unrescue_server.php
@@ -14,9 +14,7 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
 $server->waitUntil('RESCUE');
 $server->unrescue();
diff --git a/samples/Identity/v3/domains/list_domains.php b/samples/Identity/v3/domains/list_domains.php
index f971e421..d08cc1c8 100644
--- a/samples/Identity/v3/domains/list_domains.php
+++ b/samples/Identity/v3/domains/list_domains.php
@@ -19,4 +19,5 @@
 $identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listDomains() as $domain) {
+    /** @var $domain \OpenStack\Identity\v3\Models\Domain */
 }
diff --git a/samples/Identity/v3/domains/list_group_roles.php b/samples/Identity/v3/domains/list_group_roles.php
index b0ed10d8..1b7b89c3 100644
--- a/samples/Identity/v3/domains/list_group_roles.php
+++ b/samples/Identity/v3/domains/list_group_roles.php
@@ -21,4 +21,5 @@
 $domain = $identity->getDomain('{domainId}');
 
 foreach ($domain->listGroupRoles(['groupId' => '{groupId}']) as $role) {
+    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/domains/list_user_roles.php b/samples/Identity/v3/domains/list_user_roles.php
index 7d538158..d9a7cfb1 100644
--- a/samples/Identity/v3/domains/list_user_roles.php
+++ b/samples/Identity/v3/domains/list_user_roles.php
@@ -21,4 +21,5 @@
 $domain = $identity->getDomain('{domainId}');
 
 foreach ($domain->listUserRoles(['userId' => '{domainUserId}']) as $role) {
+    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/endpoints/list_endpoints.php b/samples/Identity/v3/endpoints/list_endpoints.php
index ed466970..24d39a0e 100644
--- a/samples/Identity/v3/endpoints/list_endpoints.php
+++ b/samples/Identity/v3/endpoints/list_endpoints.php
@@ -19,4 +19,5 @@
 $identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listEndpoints() as $endpoint) {
+    /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
 }
diff --git a/samples/Identity/v3/groups/list_groups.php b/samples/Identity/v3/groups/list_groups.php
index f889f3bc..cee3577e 100644
--- a/samples/Identity/v3/groups/list_groups.php
+++ b/samples/Identity/v3/groups/list_groups.php
@@ -19,4 +19,5 @@
 $identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listGroups() as $group) {
+    /** @var $group \OpenStack\Identity\v3\Models\Group */
 }
diff --git a/samples/Identity/v3/groups/list_users.php b/samples/Identity/v3/groups/list_users.php
index 0b186c22..40dc45c0 100644
--- a/samples/Identity/v3/groups/list_users.php
+++ b/samples/Identity/v3/groups/list_users.php
@@ -21,4 +21,5 @@
 $group = $identity->getGroup('{groupId}');
 
 foreach ($group->listUsers() as $user) {
+    /** @var $user \OpenStack\Identity\v3\Models\User */
 }
diff --git a/samples/Identity/v3/groups/update_group.php b/samples/Identity/v3/groups/update_group.php
index ee48d9c6..71f8234d 100644
--- a/samples/Identity/v3/groups/update_group.php
+++ b/samples/Identity/v3/groups/update_group.php
@@ -20,7 +20,7 @@
 
 $group = $identity->getGroup('{groupId}');
 
-$group->description = 'foo';
-$group->name = 'bar';
+$group->description = '{description}';
+$group->name = '{name}';
 
 $group->update();
diff --git a/samples/Identity/v3/projects/list_group_roles.php b/samples/Identity/v3/projects/list_group_roles.php
index dc1e8641..b678e0a7 100644
--- a/samples/Identity/v3/projects/list_group_roles.php
+++ b/samples/Identity/v3/projects/list_group_roles.php
@@ -21,4 +21,5 @@
 $project = $identity->getProject('{id}');
 
 foreach ($project->listGroupRoles(['groupId' => '{groupId}']) as $role) {
+    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/projects/list_user_roles.php b/samples/Identity/v3/projects/list_user_roles.php
index 93efacaa..11d96f49 100644
--- a/samples/Identity/v3/projects/list_user_roles.php
+++ b/samples/Identity/v3/projects/list_user_roles.php
@@ -21,4 +21,5 @@
 $project = $identity->getProject('{id}');
 
 foreach ($project->listUserRoles(['userId' => '{projectUserId}']) as $role) {
+    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/roles/list_assignments.php b/samples/Identity/v3/roles/list_assignments.php
index 74279e6b..b39543b0 100644
--- a/samples/Identity/v3/roles/list_assignments.php
+++ b/samples/Identity/v3/roles/list_assignments.php
@@ -19,4 +19,5 @@
 $identity = $openstack->identityV3();
 
 foreach ($identity->listRoleAssignments() as $assignment) {
+    /** @var $assignment \OpenStack\Identity\v3\Models\Assignment */
 }
diff --git a/samples/Identity/v3/roles/list_roles.php b/samples/Identity/v3/roles/list_roles.php
index 4036c270..a5388a36 100644
--- a/samples/Identity/v3/roles/list_roles.php
+++ b/samples/Identity/v3/roles/list_roles.php
@@ -19,4 +19,5 @@
 $identity = $openstack->identityV3();
 
 foreach ($identity->listRoles() as $role) {
+    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/services/get_service.php b/samples/Identity/v3/services/get_service.php
index 1b8991a6..f8cf1949 100644
--- a/samples/Identity/v3/services/get_service.php
+++ b/samples/Identity/v3/services/get_service.php
@@ -19,3 +19,4 @@
 $identity = $openstack->identityV3(['region' => '{region}']);
 
 $service = $identity->getService('{serviceId}');
+$service->retrieve();
diff --git a/samples/Identity/v3/services/list_services.php b/samples/Identity/v3/services/list_services.php
index f72c22cf..8b501e1a 100644
--- a/samples/Identity/v3/services/list_services.php
+++ b/samples/Identity/v3/services/list_services.php
@@ -19,4 +19,5 @@
 $identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listServices() as $service) {
+    /** @var $service \OpenStack\Identity\v3\Models\Service */
 }
diff --git a/samples/Identity/v3/users/list_groups.php b/samples/Identity/v3/users/list_groups.php
index 5ec919ed..af554436 100644
--- a/samples/Identity/v3/users/list_groups.php
+++ b/samples/Identity/v3/users/list_groups.php
@@ -21,4 +21,5 @@
 $user = $identity->getUser('{id}');
 
 foreach ($user->listGroups() as $group) {
+    /** @var $group \OpenStack\Identity\v3\Models\Group */
 }
diff --git a/samples/Identity/v3/users/list_projects.php b/samples/Identity/v3/users/list_projects.php
index 7f665325..9e36f21e 100644
--- a/samples/Identity/v3/users/list_projects.php
+++ b/samples/Identity/v3/users/list_projects.php
@@ -21,4 +21,5 @@
 $user = $identity->getUser('{id}');
 
 foreach ($user->listProjects() as $project) {
+    /** @var $project \OpenStack\Identity\v3\Models\Project */
 }
diff --git a/samples/Identity/v3/users/list_users.php b/samples/Identity/v3/users/list_users.php
index 340255db..b03b3a73 100644
--- a/samples/Identity/v3/users/list_users.php
+++ b/samples/Identity/v3/users/list_users.php
@@ -19,4 +19,5 @@
 $identity = $openstack->identityV3();
 
 foreach ($identity->listUsers() as $user) {
+    /** @var $user \OpenStack\Identity\v3\Models\User */
 }
diff --git a/samples/Images/v2/images/get.php b/samples/Images/v2/images/get.php
index 98c95671..680dc80b 100644
--- a/samples/Images/v2/images/get.php
+++ b/samples/Images/v2/images/get.php
@@ -12,3 +12,4 @@
 $service = $openstack->imagesV2();
 
 $image = $service->getImage('{imageId}');
+$image->retrieve();
diff --git a/samples/Images/v2/members/add.php b/samples/Images/v2/members/add.php
index e62f1239..092fdbba 100644
--- a/samples/Images/v2/members/add.php
+++ b/samples/Images/v2/members/add.php
@@ -6,9 +6,9 @@
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
     'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $member = $openstack->imagesV2()
-                    ->getImage('{imageId}')
-                    ->addMember('{projectId}');
+    ->getImage('{imageId}')
+    ->addMember('{projectId}');
diff --git a/samples/Networking/v2/floatingIPs/create.php b/samples/Networking/v2/floatingIPs/create.php
index 1ec2628c..0880fbdf 100644
--- a/samples/Networking/v2/floatingIPs/create.php
+++ b/samples/Networking/v2/floatingIPs/create.php
@@ -14,8 +14,7 @@
 
 $networking = $openstack->networkingV2ExtLayer3();
 
-/** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $ip */
-$ip = $networking->createFloatingIp([
+$floatingIp = $networking->createFloatingIp([
     "floatingNetworkId" => "{networkId}",
     "portId"            => "{portId}",
     'fixedIpAddress'    => '{fixedIpAddress}',
diff --git a/samples/Networking/v2/floatingIPs/delete.php b/samples/Networking/v2/floatingIPs/delete.php
index 6accb015..9bbe8d0a 100644
--- a/samples/Networking/v2/floatingIPs/delete.php
+++ b/samples/Networking/v2/floatingIPs/delete.php
@@ -7,11 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $openstack->networkingV2ExtLayer3()
-          ->getFloatingIp('{id}')
-          ->delete();
+    ->getFloatingIp('{id}')
+    ->delete();
diff --git a/samples/Networking/v2/floatingIPs/get.php b/samples/Networking/v2/floatingIPs/get.php
index 54ff62ca..759a3318 100644
--- a/samples/Networking/v2/floatingIPs/get.php
+++ b/samples/Networking/v2/floatingIPs/get.php
@@ -7,11 +7,10 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-/** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $ip */
-$ip = $openstack->networkingV2ExtLayer3()
-                ->getFloatingIp('{id}');
+$floatingIp = $openstack->networkingV2ExtLayer3()
+    ->getFloatingIp('{id}');
diff --git a/samples/Networking/v2/floatingIPs/list.php b/samples/Networking/v2/floatingIPs/list.php
index da87c819..82065d95 100644
--- a/samples/Networking/v2/floatingIPs/list.php
+++ b/samples/Networking/v2/floatingIPs/list.php
@@ -7,13 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $floatingIps = $openstack->networkingV2ExtLayer3()
-                         ->listFloatingIps();
+    ->listFloatingIps();
 
 foreach ($floatingIps as $floatingIp) {
     /** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $floatingIp */
diff --git a/samples/Networking/v2/floatingIPs/update.php b/samples/Networking/v2/floatingIPs/update.php
index 9698d30d..4813006e 100644
--- a/samples/Networking/v2/floatingIPs/update.php
+++ b/samples/Networking/v2/floatingIPs/update.php
@@ -7,13 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $floatingIp = $openstack->networkingV2ExtLayer3()
-                        ->getFloatingIp('{id}');
+    ->getFloatingIp('{id}');
 
 $floatingIp->portId = '{newPortId}';
 $floatingIp->update();
diff --git a/samples/Networking/v2/ports/create.php b/samples/Networking/v2/ports/create.php
index 69635ed1..285ed652 100644
--- a/samples/Networking/v2/ports/create.php
+++ b/samples/Networking/v2/ports/create.php
@@ -12,7 +12,7 @@
 $networking = $openstack->networkingV2();
 
 $port = $networking->createPort([
-    'name'         => 'portName',
+    'name'         => '{portName}',
     'networkId'    => '{networkId}',
     'adminStateUp' => true
 ]);
diff --git a/samples/Networking/v2/ports/create_batch.php b/samples/Networking/v2/ports/create_batch.php
index 66970388..f5206a1e 100644
--- a/samples/Networking/v2/ports/create_batch.php
+++ b/samples/Networking/v2/ports/create_batch.php
@@ -13,13 +13,13 @@
 
 $ports = $networking->createPorts([
     [
-        'name'         => 'port1',
-        'networkId'    => '{networkId}',
+        'name'         => '{name1}',
+        'networkId'    => '{networkId1}',
         'adminStateUp' => true
     ],
     [
-        'name'         => 'port2',
-        'networkId'    => '{networkId}',
+        'name'         => '{name2}',
+        'networkId'    => '{networkId2}',
         'adminStateUp' => true
     ],
 ]);
diff --git a/samples/Networking/v2/ports/create_with_fixed_ips.php b/samples/Networking/v2/ports/create_with_fixed_ips.php
index 921bf1b6..ae28661a 100644
--- a/samples/Networking/v2/ports/create_with_fixed_ips.php
+++ b/samples/Networking/v2/ports/create_with_fixed_ips.php
@@ -12,7 +12,7 @@
 $networking = $openstack->networkingV2();
 
 $port = $networking->createPort([
-    'name'         => 'portName',
+    'name'         => '{portName}',
     'networkId'    => '{networkId}',
     'adminStateUp' => true,
     'fixedIps' => [
diff --git a/samples/Networking/v2/ports/list.php b/samples/Networking/v2/ports/list.php
index 2ab4bc53..0442d566 100644
--- a/samples/Networking/v2/ports/list.php
+++ b/samples/Networking/v2/ports/list.php
@@ -12,4 +12,5 @@
 $networking = $openstack->networkingV2();
 
 foreach ($networking->listPorts() as $port) {
+    /** @var \OpenStack\Networking\v2\Models\Port $port */
 }
diff --git a/samples/Networking/v2/ports/update.php b/samples/Networking/v2/ports/update.php
index 170b9b63..a8f39e65 100644
--- a/samples/Networking/v2/ports/update.php
+++ b/samples/Networking/v2/ports/update.php
@@ -12,5 +12,5 @@
 $networking = $openstack->networkingV2();
 
 $port = $networking->getPort('{portId}');
-$port->name = 'newName';
+$port->name = '{newName}';
 $port->update();
diff --git a/samples/Networking/v2/subnets/create_with_gateway_ip.php b/samples/Networking/v2/subnets/create_with_gateway_ip.php
index 769b214c..168837f3 100644
--- a/samples/Networking/v2/subnets/create_with_gateway_ip.php
+++ b/samples/Networking/v2/subnets/create_with_gateway_ip.php
@@ -19,7 +19,7 @@
 $networking = $openstack->networkingV2();
 
 $options = [
-    'name'      => 'My subnet',
+    'name'      => '{subnetName}',
     'networkId' => '{networkId}',
     'ipVersion' => 4,
     'cidr'      => '192.168.199.0/25',
diff --git a/samples/Networking/v2/subnets/create_with_host_routes.php b/samples/Networking/v2/subnets/create_with_host_routes.php
index ffca710b..a58ed79a 100644
--- a/samples/Networking/v2/subnets/create_with_host_routes.php
+++ b/samples/Networking/v2/subnets/create_with_host_routes.php
@@ -19,7 +19,7 @@
 $networking = $openstack->networkingV2();
 
 $options = [
-    'name'       => 'My subnet',
+    'name'       => '{subnetName}',
     'networkId'  => '{networkId}',
     'ipVersion'  => 4,
     'cidr'       => '192.168.199.0/24',
diff --git a/samples/ObjectStore/v1/containers/get.php b/samples/ObjectStore/v1/containers/get.php
index fe056e91..8d764cd5 100644
--- a/samples/ObjectStore/v1/containers/get.php
+++ b/samples/ObjectStore/v1/containers/get.php
@@ -7,10 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $container = $openstack->objectStoreV1()
-                       ->getContainer('{containerName}');
+    ->getContainer('{containerName}');
+$container->retrieve();
diff --git a/samples/ObjectStore/v1/containers/list.php b/samples/ObjectStore/v1/containers/list.php
index c0c05c8d..2cf9d401 100644
--- a/samples/ObjectStore/v1/containers/list.php
+++ b/samples/ObjectStore/v1/containers/list.php
@@ -15,5 +15,5 @@
 $service = $openstack->objectStoreV1();
 
 foreach ($service->listContainers() as $container) {
-    /** @var $container \OpenStack\ObjectStore\v1\Models\Container */
+    /** @var \OpenStack\ObjectStore\v1\Models\Container $container */
 }
diff --git a/samples/ObjectStore/v1/objects/check_exists.php b/samples/ObjectStore/v1/objects/check_exists.php
index 48a9f060..50b3b65e 100644
--- a/samples/ObjectStore/v1/objects/check_exists.php
+++ b/samples/ObjectStore/v1/objects/check_exists.php
@@ -7,12 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-/** @var bool $exists */
 $exists = $openstack->objectStoreV1()
-                    ->getContainer('{containerName}')
-                    ->objectExists('{objectName}');
+    ->getContainer('{containerName}')
+    ->objectExists('{objectName}');
diff --git a/samples/ObjectStore/v1/objects/copy.php b/samples/ObjectStore/v1/objects/copy.php
index 15a08f52..0790be82 100644
--- a/samples/ObjectStore/v1/objects/copy.php
+++ b/samples/ObjectStore/v1/objects/copy.php
@@ -7,14 +7,14 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $openstack->objectStoreV1()
-          ->getContainer('{containerName}')
-          ->getObject('{objectName}')
-          ->copy([
-              'destination' => '{newContainerName}/{newObjectName}'
-          ]);
+    ->getContainer('{containerName}')
+    ->getObject('{objectName}')
+    ->copy([
+        'destination' => '{newContainerName}/{newObjectName}',
+    ]);
diff --git a/samples/ObjectStore/v1/objects/create.php b/samples/ObjectStore/v1/objects/create.php
index 1541c22c..65be7f88 100644
--- a/samples/ObjectStore/v1/objects/create.php
+++ b/samples/ObjectStore/v1/objects/create.php
@@ -7,17 +7,15 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$options = [
-    'name'    => '{objectName}',
-    'content' => '{objectContent}',
-];
-
 /** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
 $object = $openstack->objectStoreV1()
-                    ->getContainer('{containerName}')
-                    ->createObject($options);
+    ->getContainer('{containerName}')
+    ->createObject([
+        'name'    => '{objectName}',
+        'content' => '{objectContent}',
+    ]);
diff --git a/samples/ObjectStore/v1/objects/delete.php b/samples/ObjectStore/v1/objects/delete.php
index d66d5b7b..548e53bd 100644
--- a/samples/ObjectStore/v1/objects/delete.php
+++ b/samples/ObjectStore/v1/objects/delete.php
@@ -7,12 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $openstack->objectStoreV1()
-          ->getContainer('{containerName}')
-          ->getObject('{objectName}')
-          ->delete();
+    ->getContainer('{containerName}')
+    ->getObject('{objectName}')
+    ->delete();
diff --git a/samples/ObjectStore/v1/objects/download.php b/samples/ObjectStore/v1/objects/download.php
index 6129f635..158c096a 100644
--- a/samples/ObjectStore/v1/objects/download.php
+++ b/samples/ObjectStore/v1/objects/download.php
@@ -7,13 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-/** @var \GuzzleHttp\Stream\Stream $stream */
 $stream = $openstack->objectStoreV1()
-                    ->getContainer('{containerName}')
-                    ->getObject('{objectName}')
-                    ->download();
+    ->getContainer('{containerName}')
+    ->getObject('{objectName}')
+    ->download();
diff --git a/samples/ObjectStore/v1/objects/download_stream.php b/samples/ObjectStore/v1/objects/download_stream.php
index 8280b16c..3d235b24 100644
--- a/samples/ObjectStore/v1/objects/download_stream.php
+++ b/samples/ObjectStore/v1/objects/download_stream.php
@@ -7,13 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-/** @var \GuzzleHttp\Stream\Stream $stream */
 $stream = $openstack->objectStoreV1()
-                    ->getContainer('{containerName}')
-                    ->getObject('{objectName}')
-                    ->download(['requestOptions' => ['stream' => true]]);
+    ->getContainer('{containerName}')
+    ->getObject('{objectName}')
+    ->download(['requestOptions' => ['stream' => true]]);
diff --git a/samples/ObjectStore/v1/objects/get.php b/samples/ObjectStore/v1/objects/get.php
index b7b42f3a..aeae0ad7 100644
--- a/samples/ObjectStore/v1/objects/get.php
+++ b/samples/ObjectStore/v1/objects/get.php
@@ -7,12 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
 $object = $openstack->objectStoreV1()
-                    ->getContainer('{containerName}')
-                    ->getObject('{objectName}');
+    ->getContainer('{containerName}')
+    ->getObject('{objectName}');
diff --git a/samples/ObjectStore/v1/objects/get_metadata.php b/samples/ObjectStore/v1/objects/get_metadata.php
index 0e09b71f..dbb871a5 100644
--- a/samples/ObjectStore/v1/objects/get_metadata.php
+++ b/samples/ObjectStore/v1/objects/get_metadata.php
@@ -7,13 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-/** @var array $metadata */
 $metadata = $openstack->objectStoreV1()
-                      ->getContainer('{containerName}')
-                      ->getObject('{objectName}')
-                      ->getMetadata();
+    ->getContainer('{containerName}')
+    ->getObject('{objectName}')
+    ->getMetadata();
diff --git a/samples/ObjectStore/v1/objects/list.php b/samples/ObjectStore/v1/objects/list.php
index 8d08cf0d..713cacec 100644
--- a/samples/ObjectStore/v1/objects/list.php
+++ b/samples/ObjectStore/v1/objects/list.php
@@ -7,13 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
 $container = $openstack->objectStoreV1()
-                       ->getContainer('{containerName}');
+    ->getContainer('{containerName}');
 
 foreach ($container->listObjects() as $object) {
     /** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
diff --git a/src/BlockStorage/v2/Models/VolumeType.php b/src/BlockStorage/v2/Models/VolumeType.php
index c54425e2..120cfa73 100644
--- a/src/BlockStorage/v2/Models/VolumeType.php
+++ b/src/BlockStorage/v2/Models/VolumeType.php
@@ -8,12 +8,13 @@
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\Listable;
 use OpenStack\Common\Resource\OperatorResource;
+use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
 
 /**
  * @property \OpenStack\BlockStorage\v2\Api $api
  */
-class VolumeType extends OperatorResource implements Listable, Creatable, Updateable, Deletable
+class VolumeType extends OperatorResource implements Listable, Creatable, Updateable, Deletable, Retrievable
 {
     /** @var string */
     public $id;
@@ -34,6 +35,12 @@ public function create(array $userOptions): Creatable
         return $this->populateFromResponse($response);
     }
 
+    public function retrieve()
+    {
+        $response = $this->executeWithState($this->api->getType());
+        $this->populateFromResponse($response);
+    }
+
     public function update()
     {
         $this->executeWithState($this->api->putType());
diff --git a/src/Compute/v2/Models/Image.php b/src/Compute/v2/Models/Image.php
index e4614cdd..55fd3e58 100644
--- a/src/Compute/v2/Models/Image.php
+++ b/src/Compute/v2/Models/Image.php
@@ -7,6 +7,7 @@
 use OpenStack\Common\Resource\Alias;
 use OpenStack\Common\Resource\Deletable;
 use OpenStack\Common\Resource\HasMetadata;
+use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
 use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
@@ -20,6 +21,8 @@
  */
 class Image extends OperatorResource implements Listable, Retrievable, Deletable, HasMetadata
 {
+    use HasWaiterTrait;
+
     /** @var string */
     public $id;
 
diff --git a/src/Compute/v2/Models/Keypair.php b/src/Compute/v2/Models/Keypair.php
index f5c37c76..8584be84 100644
--- a/src/Compute/v2/Models/Keypair.php
+++ b/src/Compute/v2/Models/Keypair.php
@@ -40,7 +40,11 @@ class Keypair extends OperatorResource implements Listable, Retrievable, Deletab
     /** @var string */
     public $type;
 
-    /** @var string */
+    /**
+     * @var string
+     *
+     * @deprecated Left for backward compatibility only. It is not retrieved from the API.
+     */
     public $id;
 
     /** @var \DateTimeImmutable */
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index 96a88b12..a9e25cbd 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -185,7 +185,7 @@ public function resetState()
      */
     public function reboot(string $type = Enum::REBOOT_SOFT)
     {
-        if (!in_array($type, ['SOFT', 'HARD'])) {
+        if (!in_array($type, [Enum::REBOOT_SOFT, Enum::REBOOT_HARD])) {
             throw new \RuntimeException('Reboot type must either be SOFT or HARD');
         }
 
@@ -458,8 +458,6 @@ public function resetMetadata(array $metadata)
      * existing keys will remain unaffected.
      *
      * @param array $metadata {@see \OpenStack\Compute\v2\Api::postServerMetadata}
-     *
-     * @return array
      */
     public function mergeMetadata(array $metadata)
     {
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index 05e7149e..8090d8d0 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -114,8 +114,8 @@ public function createFlavor(array $options = []): Flavor
     /**
      * List images.
      *
-     * @param array    $options {@see \OpenStack\Compute\v2\Api::getImages}
-     * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @param array         $options {@see \OpenStack\Compute\v2\Api::getImages}
+     * @param callable|null $mapFn   a callable function that will be invoked on every iteration of the list
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Image>
      */
diff --git a/src/Identity/v3/Api.php b/src/Identity/v3/Api.php
index cd664668..8f07da58 100644
--- a/src/Identity/v3/Api.php
+++ b/src/Identity/v3/Api.php
@@ -555,6 +555,7 @@ public function patchUser(): array
                 'description'      => $this->params->desc('user'),
                 'email'            => $this->params->email(),
                 'enabled'          => $this->params->enabled('user'),
+                'name'             => $this->params->name('user'),
                 'password'         => $this->params->password(),
             ],
         ];
diff --git a/src/Identity/v3/Models/Token.php b/src/Identity/v3/Models/Token.php
index 6794b7f8..7a7c23f2 100644
--- a/src/Identity/v3/Models/Token.php
+++ b/src/Identity/v3/Models/Token.php
@@ -5,6 +5,7 @@
 namespace OpenStack\Identity\v3\Models;
 
 use InvalidArgumentException;
+use OpenStack\Common\Error\BadResponseError;
 use OpenStack\Common\Resource\Alias;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\OperatorResource;
@@ -130,4 +131,20 @@ public function export(): array
     {
         return $this->cachedToken;
     }
+
+    /**
+     * Checks if the token is valid.
+     *
+     * @return bool TRUE if the token is valid; FALSE otherwise
+     */
+    public function validate(): bool
+    {
+        try {
+            $this->execute($this->api->headTokens(), ['tokenId' => $this->id]);
+
+            return true;
+        } catch (BadResponseError $e) {
+            return false;
+        }
+    }
 }
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
deleted file mode 100644
index 41b47a81..00000000
--- a/tests/integration/BlockStorage/v2/CoreTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\BlockStorage\v2;
-
-use OpenStack\BlockStorage\v2\Service;
-use OpenStack\Integration\BlockStorage\v3\CoreV2Test;
-use OpenStack\Integration\Utils;
-
-class CoreTest extends CoreV2Test
-{
-    protected function getService() : Service
-    {
-        if (null === $this->service) {
-            $this->service = Utils::getOpenStack()->blockStorageV2();
-        }
-
-        return $this->service;
-    }
-
-    protected function sampleFile($path, array $replacements = [])
-    {
-        return parent::sampleFile(
-            '../v3/' . $path,
-            array_merge(
-                $replacements,
-                ['$openstack->blockStorageV3()' => '$openstack->blockStorageV2()']
-            ));
-    }
-}
diff --git a/tests/integration/BlockStorage/v3/CoreV2Test.php b/tests/integration/BlockStorage/v3/CoreV2Test.php
deleted file mode 100644
index a60884ee..00000000
--- a/tests/integration/BlockStorage/v3/CoreV2Test.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\BlockStorage\v3;
-
-use OpenStack\BlockStorage\v2\Models\Snapshot;
-use OpenStack\BlockStorage\v2\Models\Volume;
-use OpenStack\BlockStorage\v2\Models\VolumeType;
-use OpenStack\BlockStorage\v2\Service;
-use OpenStack\Integration\TestCase;
-use OpenStack\Integration\Utils;
-
-class CoreV2Test extends TestCase
-{
-    protected $service;
-
-    protected function getService() : Service
-    {
-        if (null === $this->service) {
-            $this->service = Utils::getOpenStack()->blockStorageV3();
-        }
-
-        return $this->service;
-    }
-
-    public function runTests()
-    {
-        $this->startTimer();
-
-        $this->logger->info('-> Volumes');
-        $this->volumes();
-        $this->logger->info('-> Volume Types');
-        $this->volumeTypes();
-        $this->logger->info('-> Snapshots');
-        $this->snapshots();
-        $this->logger->info('-> Snapshot list');
-        $this->snapshotList();
-
-        $this->outputTimeTaken();
-    }
-
-    public function volumes()
-    {
-        $this->logStep('Creating volume type');
-        $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
-
-        $replacements = [
-            '{description}' => $this->randomStr(),
-            "'{size}'" => 1,
-            '{name}' => $this->randomStr(),
-            '{volumeType}' => $volumeType->id,
-            '{key1}' => $this->randomStr(),
-            '{val1}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Creating volume');
-        /** @var Volume $volume */
-        require_once $this->sampleFile('volumes/create.php', $replacements);
-        self::assertInstanceOf(Volume::class, $volume);
-        self::assertEquals($replacements['{name}'], $volume->name);
-        self::assertEquals(1, $volume->size);
-        self::assertEquals($volumeType->name, $volume->volumeTypeName);
-
-        $volumeId = $volume->id;
-        $replacements = ['{volumeId}' => $volumeId];
-
-        $this->logStep('Getting volume');
-        /** @var Volume $volume */
-        require_once $this->sampleFile('volumes/get.php', $replacements);
-        self::assertInstanceOf(Volume::class, $volume);
-
-        $replacements += [
-            '{newName}' => $this->randomStr(),
-            '{newDescription}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Updating volume');
-        /** @var Volume $volume */
-        require_once $this->sampleFile('volumes/update.php', $replacements);
-        self::assertInstanceOf(Volume::class, $volume);
-
-        $this->logStep('Listing volumes');
-        /** @var \Generator $volumes */
-        require_once $this->sampleFile('volumes/list.php', $replacements);
-
-        $volume = $this->getService()->getVolume($volumeId);
-        $volume->waitUntil('available');
-
-        $this->logStep('Deleting volume');
-        require_once $this->sampleFile('volumes/delete.php', $replacements);
-
-        $volume = $this->getService()->getVolume($volumeId);
-        $volume->waitUntilDeleted();
-
-        $this->logStep('Deleting volume type');
-        $volumeType->delete();
-    }
-
-    public function volumeTypes()
-    {
-        $replacements = [
-            '{name}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Creating volume type');
-        /** @var VolumeType $volumeType */
-        require_once $this->sampleFile('volume_types/create.php', $replacements);
-        self::assertInstanceOf(VolumeType::class, $volumeType);
-        self::assertEquals($replacements['{name}'], $volumeType->name);
-
-        $replacements = ['{volumeTypeId}' => $volumeType->id];
-
-        $this->logStep('Getting volume type');
-        /** @var VolumeType $volumeType */
-        require_once $this->sampleFile('volume_types/get.php', $replacements);
-        self::assertInstanceOf(VolumeType::class, $volumeType);
-
-        $replacements += ['{newName}' => $this->randomStr()];
-
-        $this->logStep('Updating volume type');
-        /** @var VolumeType $volumeType */
-        require_once $this->sampleFile('volume_types/update.php', $replacements);
-        self::assertInstanceOf(VolumeType::class, $volumeType);
-
-        $this->logStep('Listing volume types');
-        /** @var \Generator $volumeTypes */
-        require_once $this->sampleFile('volume_types/list.php', $replacements);
-
-        $this->logStep('Deleting volume type');
-        require_once $this->sampleFile('volume_types/delete.php', $replacements);
-    }
-
-    public function snapshots()
-    {
-        $this->logStep('Creating volume');
-        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
-        $volume->waitUntil('available', 60);
-
-        $replacements = [
-            '{volumeId}' => $volume->id,
-            '{name}' => $this->randomStr(),
-            '{description}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Creating snapshot');
-        /** @var Snapshot $snapshot */
-        require_once $this->sampleFile('snapshots/create.php', $replacements);
-        self::assertInstanceOf(Snapshot::class, $snapshot);
-        self::assertEquals($replacements['{name}'], $snapshot->name);
-        $volume->waitUntil('available', 60);
-
-        $snapshotId = $snapshot->id;
-        $replacements = ['{snapshotId}' => $snapshotId];
-
-        $this->logStep('Getting snapshot');
-        /** @var Snapshot $snapshot */
-        require_once $this->sampleFile('snapshots/get.php', $replacements);
-        self::assertInstanceOf(Snapshot::class, $snapshot);
-
-        $this->getService()
-            ->getSnapshot($snapshot->id)
-            ->mergeMetadata(['key1' => 'val1']);
-
-        $replacements += ['{key}' => 'key2', '{val}' => 'val2'];
-        $this->logStep('Adding metadata');
-        require_once $this->sampleFile('snapshots/merge_metadata.php', $replacements);
-
-        $this->logStep('Retrieving metadata');
-        /** @var array $metadata */
-        require_once $this->sampleFile('snapshots/get_metadata.php', $replacements);
-        self::assertEquals(['key1' => 'val1', 'key2' => 'val2'], $metadata);
-
-        $replacements = ['{snapshotId}' => $snapshot->id, '{key}' => 'key3', '{val}' => 'val3'];
-        $this->logStep('Resetting metadata');
-        require_once $this->sampleFile('snapshots/reset_metadata.php', $replacements);
-
-        $this->logStep('Retrieving metadata');
-        /** @var array $metadata */
-        require_once $this->sampleFile('snapshots/get_metadata.php', $replacements);
-        self::assertEquals(['key3' => 'val3'], $metadata);
-
-        $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
-        $this->logStep('Updating snapshot');
-        require_once $this->sampleFile('snapshots/update.php', $replacements);
-
-        $snapshot->waitUntil('available', 60);
-
-        $this->logStep('Listing snapshots');
-        require_once $this->sampleFile('snapshots/list.php', $replacements);
-
-        $this->logStep('Deleting snapshot');
-        require_once $this->sampleFile('snapshots/delete.php', $replacements);
-        $snapshot->waitUntilDeleted();
-
-        $this->logStep('Deleting volume');
-        $volume->delete();
-    }
-
-    public function snapshotList()
-    {
-        $this->logStep('Creating volume');
-        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
-        $volume->waitUntil('available', 60);
-
-        $names = ['b' . $this->randomStr(), 'a' . $this->randomStr(), 'd' . $this->randomStr(), 'c' . $this->randomStr()];
-        $createdSnapshots = [];
-        foreach ($names as $name) {
-            $this->logStep('Creating snapshot ' . $name);
-            $snapshot = $this->getService()->createSnapshot([
-                'volumeId' => $volume->id,
-                'name' => $name,
-            ]);
-
-            self::assertInstanceOf(Snapshot::class, $snapshot);
-
-            $createdSnapshots[] = $snapshot;
-            $snapshot->waitUntil('available', 60);
-        }
-
-        try {
-            $replacements = [
-                '{sortKey}' => 'display_name',
-                '{sortDir}' => 'asc',
-            ];
-
-            $this->logStep('Listing snapshots');
-            require_once $this->sampleFile('snapshots/list.php', $replacements);
-
-            $this->logStep('Listing snapshots sorted asc');
-            /** @var Snapshot $snapshot */
-            require_once $this->sampleFile('snapshots/list_sorted.php', $replacements);
-            self::assertInstanceOf(Snapshot::class, $snapshot);
-            self::assertEquals($names[2], $snapshot->name);
-
-            $this->logStep('Listing snapshots sorted desc');
-            $replacements['{sortDir}'] = 'desc';
-            /** @var Snapshot $snapshot */
-            require_once $this->sampleFile('snapshots/list_sorted.php', $replacements);
-            self::assertInstanceOf(Snapshot::class, $snapshot);
-            self::assertEquals($names[1], $snapshot->name);
-        } finally {
-            foreach ($createdSnapshots as $snapshot) {
-                $this->logStep('Deleting snapshot ' . $snapshot->name);
-                $snapshot->delete();
-                $snapshot->waitUntilDeleted();
-            }
-
-            $this->logStep('Deleting volume');
-            $volume->delete();
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
deleted file mode 100644
index 4bb035fd..00000000
--- a/tests/integration/Compute/v2/CoreTest.php
+++ /dev/null
@@ -1,757 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Compute\v2;
-
-use OpenStack\BlockStorage\v2\Models\Volume;
-use OpenStack\Compute\v2\Models\Flavor;
-use OpenStack\Compute\v2\Models\HypervisorStatistic;
-use OpenStack\Compute\v2\Models\Hypervisor;
-use OpenStack\Compute\v2\Models\Image;
-use OpenStack\Compute\v2\Models\Keypair;
-use OpenStack\Compute\v2\Models\Limit;
-use OpenStack\Compute\v2\Models\Server;
-use OpenStack\Integration\TestCase;
-use OpenStack\Integration\Utils;
-use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
-use OpenStack\Networking\v2\Models\Network;
-use OpenStack\Networking\v2\Models\Subnet;
-use OpenStack\Networking\v2\Service as NetworkService;
-use OpenStack\BlockStorage\v2\Service as BlockStorageService;
-use OpenStack\Networking\v2\Extensions\SecurityGroups\Service as SecurityGroupService;
-use RuntimeException;
-
-class CoreTest extends TestCase
-{
-    // Test environment constants
-    const NETWORK = 'phptest_network';
-    const SUBNET = 'phptest_subnet';
-    const VOLUME = 'phptest_volume';
-
-    const SECGROUP = 'phptest_secgroup';
-
-    const IMAGE = 'cirros';
-
-    /** @var NetworkService */
-    private $networkService;
-
-    /** @var BlockStorageService */
-    private $blockStorageService;
-
-    /** @var SecurityGroupService */
-    private $secgroupService;
-
-    /** @var  Network */
-    private $network;
-
-    /** @var  Subnet */
-    private $subnet;
-
-    /** @var  Volume */
-    private $volume;
-
-    /** @var SecurityGroup */
-    private $secgroup;
-
-    // Core test
-    private $service;
-    private $serverId;
-    private $adminPass;
-    private $imageId;
-    private $flavorId;
-    private $keypairName;
-    private $volumeAttachmentId;
-
-    private function getService() : \OpenStack\Compute\v2\Service
-    {
-        if (null === $this->service) {
-            $this->service = Utils::getOpenStack()->computeV2();
-        }
-
-        return $this->service;
-    }
-
-    private function getNetworkService() : \OpenStack\Networking\v2\Service
-    {
-        if (!$this->networkService) {
-            $this->networkService = Utils::getOpenStack()->networkingV2();
-        }
-
-        return $this->networkService;
-    }
-
-    private function getSecurityGroupService(): SecurityGroupService
-    {
-        $this->secgroupService = $this->secgroupService ?? Utils::getOpenStack()->networkingV2ExtSecGroups();
-        return $this->secgroupService;
-    }
-
-    private function getBlockStorageService()
-    {
-        if (!$this->blockStorageService) {
-            $this->blockStorageService = Utils::getOpenStack()->blockStorageV3();
-        }
-
-        return $this->blockStorageService;
-    }
-
-    private function searchImages($name)
-    {
-        foreach ($this->getService()->listImages() as $image) {
-            if (strpos($image->name, $name) !== false) {
-                $this->imageId = $image->id;
-                break;
-            }
-        }
-
-        if (!$this->imageId) {
-            throw new RuntimeException(sprintf('Unable to find image "%s". Make sure this image is available for integration test.', $name));
-        }
-    }
-
-    protected function setUp(): void
-    {
-        $this->network = $this->getNetworkService()->createNetwork(
-            [
-                'name'         => self::NETWORK,
-                'adminStateUp' => true,
-            ]
-        );
-
-        $this->logStep('Created network {name} with {id}', ['name' => $this->network->name, 'id' => $this->network->id]);
-
-        $this->subnet = $this->getNetworkService()->createSubnet(
-            [
-                'name'      => self::SUBNET,
-                'networkId' => $this->network->id,
-                'ipVersion' => 4,
-                'cidr'      => '10.20.30.0/24',
-            ]
-        );
-
-        $this->logStep('Created subnet {name} with {id}', ['name' => $this->subnet->name, 'id' => $this->subnet->id]);
-
-        $this->volume = $this->getBlockStorageService()->createVolume(
-            [
-                'name' => self::VOLUME,
-                'description' => '',
-                'size' => 1
-            ]
-        );
-
-        $this->logStep('Created volume {name} with {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]);
-
-        $this->secgroup = $this->getSecurityGroupService()->createSecurityGroup(['name' => self::SECGROUP]);
-
-        $this->logStep('Created security group {secgroup}', ['secgroup' => self::SECGROUP]);
-    }
-
-    public function runTests()
-    {
-        $this->startTimer();
-
-        // Manually trigger setUp
-        $this->setUp();
-
-        $this->searchImages(self::IMAGE);
-
-        // Servers
-        $this->createServer();
-
-        try {
-            $this->updateServer();
-            $this->retrieveServer();
-            $this->serverMetadata();
-
-            // Server actions
-            //$this->changeServerPassword();
-            $this->stopServer();
-            $this->startServer();
-            $this->resizeServer();
-            $this->confirmServerResize();
-            $this->rebuildServer();
-            $this->rescueServer();
-            $this->createServerImage();
-            $this->rebootServer();
-
-            // Security groups
-            $this->addSecurityGroupToServer();
-            $this->listServerSecurityGroups();
-            $this->removeServerSecurityGroup();
-
-            // Volume attachments
-            $this->attachVolumeToServer();
-            $this->listVolumeAttachmentsForServer();
-            $this->detachVolumeFromServer();
-
-            // Flavors
-            $this->createFlavor();
-            $this->listFlavors();
-            $this->getFlavor();
-
-            // Images
-            $this->listImages();
-            $this->getImage();
-            $this->imageMetadata();
-            $this->deleteServerImage();
-
-            // Keypairs
-            $this->listKeypairs();
-            $this->createKeypair();
-            $this->getKeypair();
-            $this->deleteKeypair();
-
-            // Limits
-            $this->getLimits();
-
-            // Hypervisors
-            $this->listHypervisors();
-            $this->getHypervisorsStatistics();
-            $this->getHypervisor();
-
-            // Console
-            $this->getVncConsole();
-
-            // Interface attachments
-            $this->createInterfaceAttachment();
-        } finally {
-            $this->logger->info('Tearing down');
-            // Teardown
-            $this->deleteServer();
-            $this->deleteFlavor();
-            $this->subnet->delete();
-            $this->network->delete();
-            $this->volume->delete();
-            $this->secgroup->delete();
-        }
-
-        $this->outputTimeTaken();
-    }
-
-    private function createServer()
-    {
-        $flavorId = getenv('OS_FLAVOR');
-
-        if (!$flavorId) {
-            throw new RuntimeException('OS_FLAVOR env var must be set');
-        }
-
-        $replacements = [
-            '{serverName}' => $this->randomStr(),
-            '{imageId}'    => $this->imageId,
-            '{flavorId}'   => $flavorId,
-            '{networkId}'  => $this->network->id
-        ];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/create_server.php', $replacements);
-
-        $server->waitUntilActive();
-
-        self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
-        self::assertNotEmpty($server->id);
-        self::assertNotEmpty($server->adminPass);
-
-        $this->serverId = $server->id;
-        $this->adminPass = $server->adminPass;
-
-        $this->logStep('Created server {id}', ['{id}' => $server->id]);
-    }
-
-    private function updateServer()
-    {
-        $name = $this->randomStr();
-
-        $replacements = [
-            '{serverId}' => $this->serverId,
-            '{newName}'  => $name,
-        ];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/update_server.php', $replacements);
-
-        self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
-        self::assertEquals($name, $server->name);
-
-        $server->waitUntilActive(false);
-
-        $this->logStep('Updated server ID to use this name: NAME', ['ID' => $this->serverId, 'NAME' => $name]);
-    }
-
-    private function deleteServer()
-    {
-        $replacements = ['{serverId}' => $this->serverId];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/delete_server.php', $replacements);
-
-        // Needed so that subnet and network can be removed
-        $server->waitUntilDeleted();
-        $this->logStep('Deleted server ID', ['ID' => $this->serverId]);
-    }
-
-    private function retrieveServer()
-    {
-        $replacements = ['{serverId}' => $this->serverId];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/get_server.php', $replacements);
-
-        self::assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
-        self::assertEquals($this->serverId, $server->id);
-        self::assertNotNull($server->created);
-        self::assertNotNull($server->updated);
-        self::assertNotNull($server->name);
-        self::assertNotNull($server->ipv4);
-        self::assertNotNull($server->status);
-        self::assertInstanceOf(Image::class, $server->image);
-        self::assertInstanceOf(Flavor::class, $server->flavor);
-
-        $this->logStep('Retrieved the details of server ID', ['ID' => $this->serverId]);
-    }
-
-    private function serverMetadata()
-    {
-        $replacements = ['{serverId}' => $this->serverId];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/reset_server_metadata.php', $replacements);
-        $this->logStep('Reset metadata of server {serverId}', $replacements);
-
-        require_once $this->sampleFile('servers/get_server_metadata.php', $replacements);
-        $this->logStep('Retrieved metadata of server {serverId}', $replacements);
-
-        require_once $this->sampleFile('servers/delete_server_metadata_item.php', $replacements);
-        $this->logStep('Deleted metadata key of server {serverId}', $replacements);
-    }
-
-    private function changeServerPassword()
-    {
-        $this->adminPass = $this->randomStr();
-
-        $replacements = [
-            '{serverId}'    => $this->serverId,
-            '{newPassword}' => $this->adminPass,
-        ];
-
-        require_once $this->sampleFile('servers/change_server_password.php', $replacements);
-
-        $this->logStep('Changed root password of server {serverId} to {newPassword}', $replacements);
-    }
-
-    private function resizeServer()
-    {
-        $resizeFlavorId = getenv('OS_RESIZE_FLAVOR');
-        if (!$resizeFlavorId) {
-            throw new RuntimeException('OS_RESIZE_FLAVOR env var must be set');
-        }
-
-        $replacements = [
-            '{serverId}' => $this->serverId,
-            '{flavorId}' => $resizeFlavorId,
-        ];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/resize_server.php', $replacements);
-
-        $server->waitUntil('VERIFY_RESIZE');
-
-        $this->logStep('Resized server {serverId} to flavor {flavorId}', $replacements);
-    }
-
-    private function confirmServerResize()
-    {
-        $this->logger->info('Waiting for status VERIFY_RESIZE');
-        $replacements = ['{serverId}' => $this->serverId];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/confirm_server_resize.php', $replacements);
-
-        $server->waitUntilActive();
-
-        $this->logStep('Confirmed resize of server {serverId}', $replacements);
-    }
-
-    private function rebuildServer()
-    {
-        $replacements = [
-            '{serverId}'  => $this->serverId,
-            '{imageId}'   => $this->imageId,
-            '{adminPass}' => $this->adminPass,
-        ];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/rebuild_server.php', $replacements);
-
-        $server->waitUntilActive();
-
-        $this->logStep('Rebuilt server {serverId}', $replacements);
-    }
-
-    private function rescueServer()
-    {
-        $replacements = [
-            '{serverId}'  => $this->serverId,
-            '{imageId}'   => $this->imageId,
-            '{adminPass}' => $this->adminPass,
-        ];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/rescue_server.php', $replacements);
-
-        $server->waitUntil('RESCUE');
-
-        require_once $this->sampleFile('servers/unrescue_server.php', $replacements);
-
-        $server->waitUntilActive();
-
-        $this->logStep('Rescued server {serverId}', $replacements);
-    }
-
-    private function rebootServer()
-    {
-        $replacements = ['{serverId}' => $this->serverId];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/reboot_server.php', $replacements);
-
-        $server->waitUntilActive();
-
-        $this->logStep('Rebooted server {serverId}', $replacements);
-    }
-
-    private function stopServer()
-    {
-        $replacements = ['{serverId}' => $this->serverId];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/stop_server.php', $replacements);
-
-        $server->waitUntil('SHUTOFF', false);
-
-        $this->logStep('Stopped server {serverId}', $replacements);
-    }
-
-    private function startServer()
-    {
-        $replacements = ['{serverId}' => $this->serverId];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/start_server.php', $replacements);
-
-        $server->waitUntilActive();
-
-        $this->logStep('Started server {serverId}', $replacements);
-    }
-
-    private function createFlavor()
-    {
-        $replacements = [
-            '{flavorName}' => $this->randomStr()
-        ];
-
-        /** @var $flavor \OpenStack\Compute\v2\Models\Flavor */
-        require_once $this->sampleFile('flavors/create_flavor.php', $replacements);
-
-        self::assertInstanceOf('\OpenStack\Compute\v2\Models\Flavor', $flavor);
-
-        $this->flavorId = $flavor->id;
-        $this->logStep('Created flavor {id}', ['{id}' => $flavor->id]);
-    }
-
-    private function deleteFlavor()
-    {
-        $replacements = ['{flavorId}' => $this->flavorId];
-
-        require_once $this->sampleFile('flavors/delete_flavor.php', $replacements);
-
-        $this->logStep('Deleted flavor ID', ['ID' => $this->flavorId]);
-    }
-
-    private function listFlavors()
-    {
-        require_once $this->sampleFile('flavors/list_flavors.php', []);
-
-        $this->logStep('Listed all available flavors');
-    }
-
-    private function getFlavor()
-    {
-        $replacements = ['{flavorId}' => 1];
-
-        require_once $this->sampleFile('flavors/get_flavor.php', $replacements);
-
-        $this->logStep('Retrieved details for flavor {flavorId}', $replacements);
-    }
-
-    private function createServerImage()
-    {
-        $name = $this->randomStr();
-
-        $replacements = [
-            '{serverId}'  => $this->serverId,
-            '{imageName}' => $name,
-        ];
-
-        /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('images/create_server_image.php', $replacements);
-
-        $server->waitWithCallback(function (Server $server) {
-            return !$server->taskState;
-        }, false);
-
-        $this->searchImages($name);
-
-        $this->logStep('Created an image for server {serverId} with name {imageName}', $replacements);
-    }
-
-    private function listImages()
-    {
-        require_once $this->sampleFile('images/list_images.php', []);
-
-        $this->logStep('Listed all available images');
-    }
-
-    private function getImage()
-    {
-        $replacements = ['{imageId}' => $this->imageId];
-
-        require_once $this->sampleFile('images/get_image.php', $replacements);
-
-        $this->logStep('Retrieved details for image {imageId}', $replacements);
-    }
-
-    private function imageMetadata()
-    {
-        $replacements = ['{imageId}' => $this->imageId];
-
-        /** @var $image \OpenStack\Compute\v2\Models\Image */
-        require_once $this->sampleFile('images/reset_image_metadata.php', $replacements);
-        $this->logStep('Reset metadata of image {imageId}', $replacements);
-
-        require_once $this->sampleFile('images/retrieve_image_metadata.php', $replacements);
-        $this->logStep('Retrieved metadata of image {imageId}', $replacements);
-
-        require_once $this->sampleFile('images/delete_image_metadata_item.php', $replacements + ['{metadataKey}']);
-        $this->logStep('Deleted metadata key of image {imageId}', $replacements);
-    }
-
-    private function deleteServerImage()
-    {
-        $replacements = ['{imageId}' => $this->imageId];
-        require_once $this->sampleFile('images/delete_image.php', $replacements);
-        $this->logStep('Deleted image {imageId}', $replacements);
-    }
-
-    private function listKeypairs()
-    {
-        /** @var $keypairs \Generator */
-        require_once $this->sampleFile('keypairs/list_keypairs.php', []);
-
-        self::assertInstanceOf(\Generator::class, $keypairs);
-
-        $this->logStep('Listed all keypairs');
-    }
-
-    private function createKeypair()
-    {
-        $replacements = [
-            '{name}'      => $this->randomStr(),
-            '{publicKey}' => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp4H/vDGnLi0QgWgMsQkv//FEz0xgv/mujVX+XCh6fHXxc/PbaASY+MsoI2Xr238cG9eaeAAUvbpJuEuHQ0M9WX97bvsWaWzLQ9F6hzLAwUBGxcG8cSh1nB3Ah7alR2nbIZ1N94yE72hXLb1AGogJ97NBVIph438BCXUNejqoOBsXL8UBP3RGdPnTHJ/6XSMaNTQAJruQMoQwecyGFQmuS2IEy2mBOmSldD6JZirHpj7PTCKJY4CS89QChGpKIeOymKn4tEQQVVtNFUyULEMdin88H1yMftPfq7QqH+ULFT2X2XvP3CI+sESq84lrIcVu7LjJCRIwlKsnMu2ESYCdz foo@bar.com'
-        ];
-
-        require_once $this->sampleFile('keypairs/create_keypair.php', $replacements);
-        /**@var Keypair $keypair */
-
-        self::assertInstanceOf(Keypair::class, $keypair);
-        self::assertEquals($replacements['{name}'], $keypair->name);
-        self::assertEquals($replacements['{publicKey}'], $keypair->publicKey);
-
-        $this->keypairName = $keypair->name;
-        $this->logStep('Created keypair name {name}', ['{name}' => $keypair->name]);
-    }
-
-    private function getKeypair()
-    {
-        $replacements = [
-            '{name}' => $this->keypairName,
-        ];
-
-        require_once $this->sampleFile('keypairs/get_keypair.php', $replacements);
-
-        /**@var Keypair $keypair */
-        self::assertInstanceOf(Keypair::class, $keypair);
-
-        self::assertEquals($replacements['{name}'], $keypair->name);
-
-        $this->logStep('Retrieved details for keypair {name}', $replacements);
-    }
-
-    private function deleteKeypair()
-    {
-        $replacements = [
-            '{name}' => $this->keypairName,
-        ];
-
-        require_once $this->sampleFile('keypairs/delete_keypair.php', $replacements);
-        $this->logStep('Deleted keypair name {name}', ['{name}' => $this->keypairName]);
-    }
-
-    private function listHypervisors()
-    {
-        require_once $this->sampleFile('hypervisors/list_hypervisors.php', []);
-
-        $this->logStep('Listed all available hypervisors');
-    }
-
-    private function getHypervisor()
-    {
-        $replacements = [
-            '{hypervisorId}' => '1',
-        ];
-
-        require_once $this->sampleFile('hypervisors/get_hypervisor.php', $replacements);
-
-        /**@var Hypervisor $hypervisor */
-        self::assertInstanceOf(Hypervisor::class, $hypervisor);
-        self::assertEquals($replacements['{hypervisorId}'], $hypervisor->id);
-
-        $this->logStep('Retrieved details for hypervisor id {hypervisorId}', $replacements);
-    }
-
-    private function getHypervisorsStatistics()
-    {
-        require_once $this->sampleFile('hypervisors/get_hypervisors_statistics.php', []);
-
-        /**@var HypervisorStatistic $hypervisorStatistics */
-        self::assertInstanceOf(HypervisorStatistic::class, $hypervisorStatistics);
-
-        $this->logStep('Retrieved hypervisors statistics');
-    }
-
-    private function getLimits()
-    {
-        require_once $this->sampleFile('limits/get_limits.php', []);
-
-        /**@var Limit $limit */
-        self::assertInstanceOf(Limit::class, $limit);
-
-        $this->logStep('Retrieved tenant limit');
-    }
-
-    private function addSecurityGroupToServer()
-    {
-        $replacements = [
-            '{serverId}'     => $this->serverId,
-            '{secGroupName}' => self::SECGROUP,
-        ];
-
-        require_once $this->sampleFile('servers/add_security_group.php', $replacements);
-
-        /**@var Server $server*/
-        $this->logStep('Added security group {secGroupName} to server {serverId}', $replacements);
-    }
-
-    private function listServerSecurityGroups()
-    {
-        $replacements = [
-            '{serverId}' => $this->serverId
-        ];
-
-        require_once $this->sampleFile('servers/list_security_groups.php', $replacements);
-
-        /**@var \Generator $securityGroups */
-        self::assertInstanceOf(\Generator::class, $securityGroups);
-
-        $this->logStep('Listed all security groups attached to server {serverId}', $replacements);
-    }
-
-    private function removeServerSecurityGroup()
-    {
-        $replacements = [
-            '{serverId}'     => $this->serverId,
-            '{secGroupName}' => self::SECGROUP,
-        ];
-
-        require_once $this->sampleFile('servers/remove_security_group.php', $replacements);
-
-        $this->logStep(/** @lang text */ 'Delete security group {secGroupName} from server {serverId}', $replacements);
-    }
-
-    private function attachVolumeToServer()
-    {
-        $replacements = [
-            '{serverId}' => $this->serverId,
-            '{volumeId}' => $this->volume->id
-        ];
-
-        require_once $this->sampleFile('servers/attach_volume_attachment.php', $replacements);
-        /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
-        $this->volumeAttachmentId = $volumeAttachment->id;
-
-        $this->volume->waitUntil('in-use');
-
-        $this->logStep(
-            'Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',
-            array_merge($replacements, ['{volumeAttachmentId}' => $volumeAttachment->id])
-        );
-    }
-
-    private function listVolumeAttachmentsForServer()
-    {
-        $replacements = [
-            '{serverId}' => $this->serverId
-        ];
-
-        require_once $this->sampleFile('servers/list_volume_attachments.php', $replacements);
-
-        $this->logStep('Retrieved volume attachments for server {serverId}', $replacements);
-    }
-
-    private function detachVolumeFromServer()
-    {
-        $replacements = [
-            '{serverId}'           => $this->serverId,
-            '{volumeAttachmentId}' => $this->volumeAttachmentId,
-        ];
-
-        require_once $this->sampleFile('servers/detach_volume_attachment.php', $replacements);
-
-        $this->volume->waitUntil('available');
-
-        $this->logStep('Detached volume attachments for server {serverId}', $replacements);
-    }
-
-    private function getVncConsole()
-    {
-        $replacements = [
-            '{serverId}' => $this->serverId
-        ];
-
-        require_once $this->sampleFile('servers/get_server_vnc_console.php', $replacements);
-
-        $this->logStep('Get VNC console for server {serverId}', $replacements);
-    }
-
-    private function createInterfaceAttachment()
-    {
-        $replacements = [
-            '{serverId}' => $this->serverId,
-            '{networkId}' => $this->network->id
-        ];
-
-        require_once $this->sampleFile('servers/create_interface_attachment.php', $replacements);
-
-        $this->logStep('Create interface attachment for server {serverId}', $replacements);
-    }
-
-    private function getConsoleOutput()
-    {
-        $replacements = [
-            '{serverId}' => $this->serverId
-        ];
-
-        require_once $this->sampleFile('servers/get_server_console_output.php', $replacements);
-
-        $this->logStep('Get console output for server {serverId}', $replacements);
-    }
-}
diff --git a/tests/integration/Identity/v2/CoreTest.php b/tests/integration/Identity/v2/CoreTest.php
deleted file mode 100644
index 39045dad..00000000
--- a/tests/integration/Identity/v2/CoreTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Identity\v2;
-
-use OpenStack\Integration\TestCase;
-
-class CoreTest extends TestCase
-{
-    public function runTests()
-    {
-    }
-}
diff --git a/tests/integration/Identity/v3/ApplicationCredentialsTest.php b/tests/integration/Identity/v3/ApplicationCredentialsTest.php
deleted file mode 100644
index 3bb057d9..00000000
--- a/tests/integration/Identity/v3/ApplicationCredentialsTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Identity\v3;
-
-use OpenStack\Identity\v3\Models;
-use OpenStack\Integration\TestCase;
-use OpenStack\Integration\Utils;
-
-class ApplicationCredentialsTest extends TestCase
-{
-    private $service;
-
-    /**
-     * @return \OpenStack\Identity\v3\Service
-     */
-    private function getService()
-    {
-        if (null === $this->service) {
-            $this->service = Utils::getOpenStack()->identityV3();
-        }
-
-        return $this->service;
-    }
-
-    public function runTests()
-    {
-        $this->startTimer();
-
-        $this->logger->info('-> Generate token');
-        $this->token();
-
-        $this->outputTimeTaken();
-    }
-
-    public function token()
-    {
-        $this->logStep('Create application credential');
-
-        $name = $this->randomStr();
-        $description = $this->randomStr();
-
-        /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
-        require_once $this->sampleFile(
-            'application_credentials/add_application_credential.php',
-            [
-                '{name}'        => $name,
-                '{description}' => $description,
-            ]
-        );
-        self::assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
-        self::assertEquals($name, $applicationCredential->name);
-        self::assertEquals($description, $applicationCredential->description);
-
-        $this->logStep('Create token with id');
-
-        /** @var $token \OpenStack\Identity\v3\Models\Token */
-        require_once $this->sampleFile(
-            'tokens/generate_token_with_application_credential_id.php',
-            [
-                '{applicationCredentialId}' => $applicationCredential->id,
-                '{secret}'                  => $applicationCredential->secret
-            ]
-        );
-        self::assertInstanceOf(Models\Token::class, $token);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertTrue($result);
-
-
-        $this->logStep('Retrieve application credential');
-        $applicationCredentialId = $applicationCredential->id;
-        $applicationCredential = null;
-
-        /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
-        require_once $this->sampleFile(
-            'application_credentials/show_application_credential.php',
-            ['{applicationCredentialId}' => $applicationCredentialId]
-        );
-        self::assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
-        self::assertEquals($name, $applicationCredential->name);
-        self::assertEquals($description, $applicationCredential->description);
-
-
-        $this->logStep('Delete application credential');
-        require_once $this->sampleFile(
-            'application_credentials/delete_application_credential.php',
-            [
-                '{applicationCredentialId}' => $applicationCredential->id,
-            ]
-        );
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertFalse($result);
-    }
-}
\ No newline at end of file
diff --git a/tests/integration/Identity/v3/CoreTest.php b/tests/integration/Identity/v3/CoreTest.php
deleted file mode 100644
index 1e92c45b..00000000
--- a/tests/integration/Identity/v3/CoreTest.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Identity\v3;
-
-use OpenStack\Identity\v3\Models;
-use OpenStack\Integration\TestCase;
-use OpenStack\Integration\Utils;
-
-class CoreTest extends TestCase
-{
-    private $service;
-
-    /**
-     * @return \OpenStack\Identity\v3\Service
-     */
-    private function getService()
-    {
-        if (null === $this->service) {
-            $this->service = Utils::getOpenStack()->identityV3();
-        }
-
-        return $this->service;
-    }
-
-    public function runTests()
-    {
-        $this->startTimer();
-
-        $this->logger->info('-> Tokens');
-        $this->tokens();
-
-        $this->logger->info('-> Domains');
-        $this->domains();
-
-        $this->logger->info('-> Endpoints');
-        $this->endpoints();
-
-        $this->logger->info('-> Services');
-        $this->services();
-
-        $this->logger->info('-> Groups');
-        $this->groups();
-
-        $this->logger->info('-> Projects');
-        $this->projects();
-
-        $this->logger->info('-> Roles');
-        $this->roles();
-
-        $this->logger->info('-> Users');
-        $this->users();
-
-        $this->outputTimeTaken();
-    }
-
-    public function tokens()
-    {
-        $this->logStep('Generate token with user name');
-
-        /** @var $token \OpenStack\Identity\v3\Models\Token */
-        require_once $this->sampleFile('tokens/generate_token_with_username.php');
-        self::assertInstanceOf(Models\Token::class, $token);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertTrue($result);
-
-
-        $this->logStep('Generate token with user id');
-
-        /** @var $token \OpenStack\Identity\v3\Models\Token */
-        require_once $this->sampleFile('tokens/generate_token_with_user_id.php');
-        self::assertInstanceOf(Models\Token::class, $token);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertTrue($result);
-
-
-        $this->logStep('Generate token scoped to project id');
-        /** @var $token \OpenStack\Identity\v3\Models\Token */
-        require_once $this->sampleFile('tokens/generate_token_scoped_to_project_id.php');
-        self::assertInstanceOf(Models\Token::class, $token);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertTrue($result);
-
-
-        $this->logStep('Generate token scoped to project name');
-
-        /** @var $token \OpenStack\Identity\v3\Models\Token */
-        require_once $this->sampleFile('tokens/generate_token_scoped_to_project_name.php');
-        self::assertInstanceOf(Models\Token::class, $token);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertTrue($result);
-
-
-        $this->logStep('Generate token from id');
-        /** @var $token \OpenStack\Identity\v3\Models\Token */
-        require_once $this->sampleFile('tokens/generate_token_from_id.php', ['{tokenId}' => $token->id]);
-        self::assertInstanceOf(Models\Token::class, $token);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertTrue($result);
-
-
-        $this->logStep('Revoke token');
-
-        require_once $this->sampleFile('tokens/revoke_token.php', ['{tokenId}' => $token->id]);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('tokens/validate_token.php', ['{tokenId}' => $token->id]);
-        self::assertFalse($result);
-    }
-
-    public function domains()
-    {
-        $this->logStep('Create domain');
-
-        $replacements = [
-            '{name}'        => $this->randomStr(),
-            '{description}' => $this->randomStr(),
-        ];
-
-        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
-        require_once $this->sampleFile('domains/add_domain.php', $replacements);
-        self::assertInstanceOf(Models\Domain::class, $domain);
-
-
-        $this->logStep('List domains');
-
-        $replacements['{domainId}'] = $domain->id;
-
-        require_once $this->sampleFile('domains/list_domains.php', []);
-
-
-        $this->logStep('Show domain');
-
-        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
-        require_once $this->sampleFile('domains/show_domain.php', $replacements);
-        self::assertInstanceOf(Models\Domain::class, $domain);
-
-
-        $this->logStep('Grant and revoke group role');
-
-        $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
-        $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
-
-        require_once $this->sampleFile('domains/grant_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('domains/check_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
-        self::assertTrue($result);
-
-        require_once $this->sampleFile('domains/list_group_roles.php', $replacements + ['{groupId}' => $group->id]);
-
-        require_once $this->sampleFile('domains/revoke_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
-
-        $group->delete();
-
-
-        $this->logStep('Grant and revoke user role');
-
-        $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
-
-        require_once $this->sampleFile('domains/grant_user_role.php', $replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id]);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('domains/check_user_role.php', $replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id]);
-        self::assertTrue($result);
-
-        require_once $this->sampleFile('domains/list_user_roles.php', $replacements + ['{domainUserId}' => $user->id]);
-
-        require_once $this->sampleFile('domains/revoke_user_role.php', $replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id]);
-
-        $user->delete();
-        $parentRole->delete();
-
-
-        $this->logStep('Update domain');
-
-        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
-        require_once $this->sampleFile('domains/update_domain.php', $replacements);
-        self::assertInstanceOf(Models\Domain::class, $domain);
-
-
-        $this->logStep('Delete domain');
-
-        require_once $this->sampleFile('domains/delete_domain.php', $replacements);
-    }
-
-    public function endpoints()
-    {
-        $service = $this->getService()->createService(['name' => $this->randomStr(), 'type' => 'volume', 'description' => $this->randomStr()]);
-
-        $replacements = [
-            '{endpointName}' => $this->randomStr(),
-            '{serviceId}' => $service->id,
-            '{endpointUrl}' => getenv('OS_AUTH_URL'),
-            '{region}' => 'RegionOne',
-        ];
-
-        /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
-        require_once $this->sampleFile('endpoints/add_endpoint.php', $replacements);
-        self::assertInstanceOf(Models\Endpoint::class, $endpoint);
-
-        $replacements['{endpointId}'] = $endpoint->id;
-
-        require_once $this->sampleFile('endpoints/list_endpoints.php', $replacements);
-
-        /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
-        require_once $this->sampleFile('endpoints/update_endpoint.php', $replacements);
-
-        require_once $this->sampleFile('endpoints/delete_endpoint.php', $replacements);
-
-        $service->delete();
-    }
-
-    public function services()
-    {
-        $replacements = [
-            '{serviceName}' => $this->randomStr(),
-            '{serviceType}' => $this->randomStr(),
-        ];
-
-        /** @var $service \OpenStack\Identity\v3\Models\Service */
-        require_once $this->sampleFile('services/add_service.php', $replacements);
-        self::assertInstanceOf(Models\Service::class, $service);
-
-        $replacements['{serviceId}'] = $service->id;
-
-        require_once $this->sampleFile('services/list_services.php', $replacements);
-
-        /** @var $service \OpenStack\Identity\v3\Models\Service */
-        require_once $this->sampleFile('services/update_service.php', $replacements);
-        self::assertInstanceOf(Models\Service::class, $service);
-
-        /** @var $service \OpenStack\Identity\v3\Models\Service */
-        require_once $this->sampleFile('services/get_service.php', $replacements);
-        self::assertInstanceOf(Models\Service::class, $service);
-
-        require_once $this->sampleFile('services/delete_service.php', $replacements);
-    }
-
-    public function groups()
-    {
-        $groupUser = $this->getService()->createUser(['name' => $this->randomStr()]);
-
-        /** @var $group \OpenStack\Identity\v3\Models\Group */
-        require_once $this->sampleFile('groups/add_group.php', ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
-        self::assertInstanceOf(Models\Group::class, $group);
-
-        $replacements = ['{groupId}' => $group->id];
-
-        require_once $this->sampleFile('groups/add_user.php', $replacements + ['{groupUserId}' => $groupUser->id]);
-
-        /** @var $group \OpenStack\Identity\v3\Models\Group */
-        require_once $this->sampleFile('groups/get_group.php', $replacements);
-        self::assertInstanceOf(Models\Group::class, $group);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('groups/check_user_membership.php', $replacements + ['{groupUserId}' => $groupUser->id]);
-        self::assertTrue($result);
-
-        require_once $this->sampleFile('groups/list_users.php', $replacements);
-
-        require_once $this->sampleFile('groups/remove_user.php', $replacements + ['{groupUserId}' => $groupUser->id]);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('groups/check_user_membership.php', $replacements + ['{groupUserId}' => $groupUser->id]);
-        self::assertFalse($result);
-
-        require_once $this->sampleFile('groups/update_group.php', $replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
-
-        require_once $this->sampleFile('groups/list_groups.php', $replacements);
-
-        require_once $this->sampleFile('groups/delete_group.php', $replacements);
-
-        $groupUser->delete();
-    }
-
-    public function projects()
-    {
-        /** @var $project \OpenStack\Identity\v3\Models\Project */
-        require_once $this->sampleFile('projects/add_project.php', ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
-        self::assertInstanceOf(Models\Project::class, $project);
-
-        $replacements = ['{id}' => $project->id];
-
-        /** @var $project \OpenStack\Identity\v3\Models\Project */
-        require_once $this->sampleFile('projects/get_project.php', $replacements);
-        self::assertInstanceOf(Models\Project::class, $project);
-
-        $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
-        $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
-        $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
-
-        require_once $this->sampleFile('projects/grant_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('projects/check_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
-        self::assertTrue($result);
-
-        require_once $this->sampleFile('projects/list_group_roles.php', $replacements + ['{groupId}' => $group->id]);
-
-        require_once $this->sampleFile('projects/revoke_group_role.php', $replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id]);
-
-        $group->delete();
-
-        $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
-
-        require_once $this->sampleFile('projects/grant_user_role.php', $replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id]);
-
-        /** @var $result bool */
-        require_once $this->sampleFile('projects/check_user_role.php', $replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id]);
-        self::assertTrue($result);
-
-        require_once $this->sampleFile('projects/list_user_roles.php', $replacements + ['{projectUserId}' => $user->id]);
-
-        require_once $this->sampleFile('projects/revoke_user_role.php', $replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id]);
-
-        require_once $this->sampleFile('projects/update_project.php', $replacements);
-
-        require_once $this->sampleFile('projects/delete_project.php', $replacements);
-
-        $user->delete();
-        $parentRole->delete();
-
-        $domain->enabled = false;
-        $domain->update();
-        $domain->delete();
-    }
-
-    public function roles()
-    {
-        /** @var $role \OpenStack\Identity\v3\Models\Role */
-        require_once $this->sampleFile('roles/add_role.php', ['{name}' => $this->randomStr()]);
-        self::assertInstanceOf(Models\Role::class, $role);
-
-        require_once $this->sampleFile('roles/list_roles.php', []);
-
-        require_once $this->sampleFile('roles/list_assignments.php', []);
-    }
-
-    public function users()
-    {
-        $parentDomain  = $this->getService()->createDomain(['name' => $this->randomStr()]);
-        $parentProject = $this->getService()->createProject(['name' => $this->randomStr(), 'domainId' => $parentDomain->id]);
-
-        $replacements = [
-            '{defaultProjectId}' => $parentProject->id,
-            '{description}'      => $this->randomStr(),
-            '{domainId}'         => $parentDomain->id,
-            '{email}'            => 'foo@bar.com',
-            '{enabled}'          => true,
-            '{name}'             => $this->randomStr(),
-            '{userPass}'         => $this->randomStr(),
-        ];
-
-        /** @var $user \OpenStack\Identity\v3\Models\User */
-        require_once $this->sampleFile('users/add_user.php', $replacements);
-        self::assertInstanceOf(Models\User::class, $user);
-
-        $replacements = ['{id}' => $user->id];
-
-        /** @var $user \OpenStack\Identity\v3\Models\User */
-        require_once $this->sampleFile('users/get_user.php', $replacements);
-        self::assertInstanceOf(Models\User::class, $user);
-
-        require_once $this->sampleFile('users/list_users.php', []);
-
-        require_once $this->sampleFile('users/list_groups.php', $replacements);
-
-        require_once $this->sampleFile('users/list_projects.php', $replacements);
-
-        /** @var $user \OpenStack\Identity\v3\Models\User */
-        require_once $this->sampleFile('users/update_user.php', $replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]);
-        self::assertInstanceOf(Models\User::class, $user);
-
-        require_once $this->sampleFile('users/delete_user.php', $replacements);
-
-        $parentProject->delete();
-
-        $parentDomain->enabled = false;
-        $parentDomain->update();
-        $parentDomain->delete();
-    }
-}
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
deleted file mode 100644
index 9eec5e7f..00000000
--- a/tests/integration/Images/v2/CoreTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Images\v2;
-
-use OpenStack\BlockStorage\v2\Models\Snapshot;
-use OpenStack\Images\v2\Models\Image;
-use OpenStack\Images\v2\Models\Member;
-use OpenStack\Integration\TestCase;
-use OpenStack\Integration\Utils;
-
-class CoreTest extends TestCase
-{
-    private $service;
-
-    private function getService(): \OpenStack\Images\v2\Service
-    {
-        if (null === $this->service) {
-            $this->service = Utils::getOpenStack()->imagesV2();
-        }
-
-        return $this->service;
-    }
-
-    public function runTests()
-    {
-        $this->startTimer();
-
-        $this->logger->info('-> Images');
-        $this->images();
-
-        $this->logger->info('-> Members');
-        $this->members();
-
-        $this->logger->info('-> Image list');
-        $this->imageList();
-
-        $this->outputTimeTaken();
-    }
-
-    public function images()
-    {
-        $replacements = [
-            '{name}'            => 'Ubuntu 12.10',
-            '{tag1}'            => 'ubuntu',
-            '{tag2}'            => 'quantal',
-            '{containerFormat}' => 'bare',
-            '{diskFormat}'      => 'qcow2',
-            '{visibility}'      => 'private',
-        ];
-
-        $this->logStep('Creating image');
-        /** @var Image $image */
-        require_once $this->sampleFile('images/create.php', $replacements);
-        self::assertInstanceOf(Image::class, $image);
-
-        $replacements = ['{imageId}' => $image->id];
-
-        $this->logStep('Listing images');
-        /** @var \Generator $images */
-        require_once $this->sampleFile('images/list.php', $replacements);
-
-        $this->logStep('Getting image');
-        /** @var Image $image */
-        require_once $this->sampleFile('images/get.php', $replacements);
-        self::assertInstanceOf(Image::class, $image);
-
-        $replacements += [
-            '{name}'       => 'newName',
-            '{visibility}' => 'private',
-        ];
-
-        $this->logStep('Updating image');
-        /** @var Image $image */
-        require_once $this->sampleFile('images/update.php', $replacements);
-
-        $this->logStep('Deleting image');
-        /** @var Image $image */
-        require_once $this->sampleFile('images/delete.php', $replacements);
-    }
-
-    public function members()
-    {
-        $replacements = [
-            '{name}'            => 'Ubuntu 12.10',
-            '{tag1}'            => 'ubuntu',
-            '{tag2}'            => 'quantal',
-            '{containerFormat}' => 'bare',
-            '{diskFormat}'      => 'qcow2',
-            '{visibility}'      => 'shared',
-            'true'              => 'false',
-        ];
-
-        $this->logStep('Creating image');
-        /** @var Image $image */
-        require_once $this->sampleFile('images/create.php', $replacements);
-
-        $this->logStep(sprintf('Image created with id=%s', $image->id));
-
-        $this->logStep('Adding member');
-        $replacements += ['{imageId}' => $image->id];
-        /** @var Member $member */
-        require_once $this->sampleFile('members/add.php', ['{imageId}' => $image->id,]);
-        self::assertInstanceOf(Member::class, $member);
-
-        $replacements += ['status' => Member::STATUS_REJECTED];
-        $this->logStep('Updating member status');
-        /** @var Member $member */
-        require_once $this->sampleFile('members/update_status.php', $replacements);
-        self::assertInstanceOf(Member::class, $member);
-
-        $this->logStep('Deleting member');
-        /** @var Member $member */
-        require_once $this->sampleFile('members/delete.php', $replacements);
-
-        $this->logStep('Deleting image');
-        /** @var Image $image */
-        require_once $this->sampleFile('images/delete.php', $replacements);
-    }
-
-    public function imageList()
-    {
-        $this->logStep('Creating image');
-
-        $postfix = $this->randomStr();
-        $names = ['b' . $postfix, 'a' . $postfix, 'd' . $postfix, 'c' . $postfix];
-        $createdImages = [];
-        foreach ($names as $name) {
-            $this->logStep("Creating image $name");
-            $image = $this->getService()->createImage([
-                'name' => $name,
-            ]);
-
-            self::assertInstanceOf(Image::class, $image);
-            $createdImages[] = $image;
-        }
-
-
-        $this->logStep('Listing images sorted asc');
-
-        $replacements = [
-            '{sortKey}' => 'name',
-            '{sortDir}' => 'asc',
-        ];
-
-        /** @var \OpenStack\Images\v2\Models\Image $image */
-        require_once $this->sampleFile('images/list_sorted.php', $replacements);
-        self::assertInstanceOf(Image::class, $image);
-        self::assertEquals($names[2], $image->name);
-
-
-        $this->logStep('Listing images sorted desc');
-
-        $replacements['{sortDir}'] = 'desc';
-        /** @var \OpenStack\Images\v2\Models\Image $image */
-        require_once $this->sampleFile('images/list_sorted.php', $replacements);
-        self::assertInstanceOf(Image::class, $image);
-        self::assertEquals($names[1], $image->name);
-
-        foreach ($createdImages as $image) {
-            $this->logStep("Deleting image $image->name");
-            $image->delete();
-        }
-    }
-
-}
diff --git a/tests/integration/Networking/v2/CoreTest.php b/tests/integration/Networking/v2/CoreTest.php
deleted file mode 100644
index 08a2266a..00000000
--- a/tests/integration/Networking/v2/CoreTest.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Networking\v2;
-
-use OpenStack\Networking\v2\Models\Network;
-use OpenStack\Networking\v2\Models\Port;
-use OpenStack\Networking\v2\Models\Subnet;
-use OpenStack\Integration\TestCase;
-
-class CoreTest extends TestCase
-{
-    public function runTests()
-    {
-        $this->startTimer();
-
-        $this->networks();
-        $this->subnets();
-        $this->ports();
-
-        $this->outputTimeTaken();
-    }
-
-    public function subnets()
-    {
-        $this->createSubnetsAndDelete();
-        $this->createSubnetWithHostRoutes();
-
-        [$subnetId, $networkId] = $this->createSubnet();
-
-        $this->updateSubnet($subnetId);
-        $this->retrieveSubnet($subnetId);
-        $this->deleteSubnet($subnetId);
-        $this->deleteNetwork($networkId);
-    }
-
-    public function networks()
-    {
-        $this->createNetworksAndDelete();
-
-        $networkId = $this->createNetwork();
-        $this->updateNetwork($networkId);
-        $this->retrieveNetwork($networkId);
-        $this->deleteNetwork($networkId);
-    }
-
-    private function createNetworksAndDelete()
-    {
-        $replacements = [
-            '{networkName1}' => $this->randomStr(),
-            '{networkName2}' => $this->randomStr()
-        ];
-
-        /** @var $networks array */
-        require_once $this->sampleFile('networks/create_batch.php', $replacements);
-
-        foreach ($networks as $network) {
-            self::assertInstanceOf(Network::class, $network);
-            self::assertNotEmpty($network->id);
-
-            $this->networkId = $network->id;
-            $this->logStep('Created network {id}', ['{id}' => $this->networkId]);
-
-            $this->deleteNetwork($network->id);
-        }
-    }
-
-    private function createNetwork()
-    {
-        $replacements = [
-            '{networkName}' => $this->randomStr(),
-        ];
-
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/create.php', $replacements);
-
-        self::assertInstanceOf(Network::class, $network);
-        self::assertNotEmpty($network->id);
-
-        $this->logStep('Created network {id}', ['{id}' => $this->networkId]);
-
-        return $network->id;
-    }
-
-    private function updateNetwork($networkId)
-    {
-        $name = $this->randomStr();
-
-        $replacements = [
-            '{networkId}' => $networkId,
-            '{newName}'   => $name,
-        ];
-
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/update.php', $replacements);
-
-        self::assertInstanceOf(Network::class, $network);
-        self::assertEquals($name, $network->name);
-
-        $this->logStep('Updated network ID to use this name: NAME', ['ID' => $networkId, 'NAME' => $name]);
-    }
-
-    private function retrieveNetwork($networkId)
-    {
-        $replacements = ['{networkId}' => $networkId];
-
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/get.php', $replacements);
-
-        self::assertInstanceOf(Network::class, $network);
-
-        $this->logStep('Retrieved the details of network ID', ['ID' => $networkId]);
-    }
-
-    private function deleteNetwork($networkId)
-    {
-        $replacements = ['{networkId}' => $networkId];
-
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/delete.php', $replacements);
-
-        $this->logStep('Deleted network ID', ['ID' => $networkId]);
-    }
-
-    private function createSubnetsAndDelete()
-    {
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
-
-        $replacements = [
-            '{subnetName1}' => $this->randomStr(),
-            '{subnetName2}' => $this->randomStr(),
-            '{networkId1}'  => $network->id,
-            '{networkId2}'  => $network->id,
-        ];
-
-        /** @var $subnets array */
-        require_once $this->sampleFile('subnets/create_batch.php', $replacements);
-
-        foreach ($subnets as $subnet) {
-            self::assertInstanceOf(Subnet::class, $subnet);
-            self::assertNotEmpty($subnet->id);
-
-            $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
-
-            $this->deleteSubnet($subnet->id);
-        }
-
-        require_once $this->sampleFile('networks/delete.php', ['{networkId}' => $network->id]);
-    }
-
-    private function createSubnet()
-    {
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
-
-        $replacements = [
-            '{subnetName}' => $this->randomStr(),
-            '{networkId}'  => $network->id,
-        ];
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/create.php', $replacements);
-
-        self::assertInstanceOf(Subnet::class, $subnet);
-        self::assertNotEmpty($subnet->id);
-
-        $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
-
-        return [$subnet->id, $network->id];
-    }
-
-    private function createSubnetWithGatewayIp()
-    {
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
-
-        $replacements = [
-            '{networkId}' => $network->id,
-        ];
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/create_with_gateway_ip.php', $replacements);
-
-        self::assertInstanceOf(Subnet::class, $subnet);
-        self::assertNotEmpty($subnet->id);
-
-        $this->subnetId = $subnet->id;
-
-        $this->logStep('Created subnet {id} with gateway ip', ['{id}' => $this->subnetId]);
-
-        require_once $this->sampleFile('networks/delete.php', $replacements);
-    }
-
-    private function createSubnetWithHostRoutes()
-    {
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/create.php', ['{newName}' => $this->randomStr()]);
-
-        $replacements = [
-            '{networkId}' => $network->id,
-        ];
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/create_with_host_routes.php', $replacements);
-
-        self::assertInstanceOf(Subnet::class, $subnet);
-        self::assertNotEmpty($subnet->id);
-
-        $this->logStep('Created subnet {id} with host routes', ['{id}' => $subnet->id]);
-
-        require_once $this->sampleFile('networks/delete.php', $replacements);
-    }
-
-    private function updateSubnet($subnetId)
-    {
-        $name = $this->randomStr();
-
-        $replacements = [
-            '{subnetId}' => $subnetId,
-            '{newName}'  => $name,
-        ];
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/update.php', $replacements);
-
-        self::assertInstanceOf(Subnet::class, $subnet);
-        self::assertEquals($name, $subnet->name);
-
-        $this->logStep('Updated subnet ID to use this name: NAME', ['ID' => $subnetId, 'NAME' => $name]);
-    }
-
-
-    private function retrieveSubnet($subnetId)
-    {
-        $replacements = ['{subnetId}' => $subnetId];
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/get.php', $replacements);
-
-        self::assertInstanceOf(Subnet::class, $subnet);
-
-        $this->logStep('Retrieved the details of subnet ID', ['ID' => $subnetId]);
-    }
-
-    private function deleteSubnet($subnetId)
-    {
-        $replacements = ['{subnetId}' => $subnetId];
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/delete.php', $replacements);
-
-        $this->logStep('Deleted subnet ID', ['ID' => $subnetId]);
-    }
-
-    public function ports()
-    {
-        $this->logStep('Test port');
-
-        $replacements = ['{newName}' => $this->randomStr()];
-
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/create.php', $replacements);
-
-        $replacements = ['{networkId}' => $network->id];
-
-        /** @var $port \OpenStack\Networking\v2\Models\Port */
-        require_once $this->sampleFile('ports/create.php', $replacements);
-
-        $replacements['{portId}'] = $port->id;
-        $port->networkId = $network->id;
-
-        /** @var $ports array */
-        require_once $this->sampleFile('ports/create_batch.php', $replacements);
-        foreach ($ports as $port) {
-            self::assertInstanceOf(Port::class, $port);
-            $port->delete();
-        }
-
-        /** @var $port \OpenStack\Networking\v2\Models\Port */
-        require_once $this->sampleFile('ports/list.php', $replacements);
-
-        /** @var $port \OpenStack\Networking\v2\Models\Port */
-        require_once $this->sampleFile('ports/get.php', $replacements);
-        self::assertInstanceOf(Port::class, $port);
-
-        /** @var $port \OpenStack\Networking\v2\Models\Port */
-        require_once $this->sampleFile('ports/update.php', $replacements);
-        self::assertInstanceOf(Port::class, $port);
-
-        require_once $this->sampleFile('ports/delete.php', $replacements);
-
-        require_once $this->sampleFile('networks/delete.php', $replacements);
-
-        $this->createPortWithFixedIps();
-    }
-
-    private function createPortWithFixedIps()
-    {
-        $this->logStep('Test port with fixed IP');
-
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/create.php', ['{networkName}' => $this->randomStr()]);
-        $this->logStep('Created network {id}', ['{id}' => $network->id]);
-
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/create.php', ['{subnetName}' => $this->randomStr(), '{networkId}' => $network->id]);
-        $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
-
-        /** @var $port \OpenStack\Networking\v2\Models\Port */
-        require_once $this->sampleFile('ports/create_with_fixed_ips.php', ['{networkId}' => $network->id]);
-        $this->logStep('Created port {id}', ['{id}' => $port->id]);
-
-        require_once $this->sampleFile('ports/delete.php', ['{portId}' => $port->id]);
-
-        $this->logStep('Deleted port {id}', ['{id}' => $port->id]);
-
-        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/delete.php', ['{subnetId}' => $subnet->id]);
-        $this->logStep('Deleted subnet {id}', ['{id}' => $subnet->id]);
-
-        /** @var $network \OpenStack\Networking\v2\Models\Network */
-        require_once $this->sampleFile('networks/delete.php', ['{networkId}' => $network->id]);
-        $this->logStep('Deleted network {id}', ['{id}' => $network->id]);
-    }
-}
diff --git a/tests/integration/Networking/v2/Layer3Test.php b/tests/integration/Networking/v2/Layer3Test.php
deleted file mode 100644
index 2360cf9d..00000000
--- a/tests/integration/Networking/v2/Layer3Test.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Networking\v2;
-
-use OpenStack\Integration\TestCase;
-use OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp;
-use OpenStack\Networking\v2\Models\Network;
-use OpenStack\Networking\v2\Models\Port;
-use OpenStack\Networking\v2\Models\Subnet;
-
-class Layer3Test extends TestCase
-{
-    public function getService(): \OpenStack\Networking\v2\Extensions\Layer3\Service
-    {
-        return $this->getBaseClient()->networkingV2ExtLayer3();
-    }
-
-    private function getV2Service(): \OpenStack\Networking\v2\Service
-    {
-        return $this->getBaseClient()->networkingV2();
-    }
-
-    public function runTests()
-    {
-        $this->startTimer();
-        $this->floatingIps();
-        $this->outputTimeTaken();
-    }
-
-    public function teardown(): void
-    {
-        parent::teardown();
-
-        $this->deleteItems($this->getV2Service()->listPorts());
-        $this->deleteItems($this->getV2Service()->listNetworks());
-        $this->deleteItems($this->getService()->listFloatingIps());
-    }
-
-    private function createNetwork(bool $routerAccessible = true): Network
-    {
-        $network = $this->getV2Service()->createNetwork([
-            'name'             => $this->randomStr(),
-            'routerAccessible' => $routerAccessible,
-        ]);
-        $network->waitUntilActive();
-        return $network;
-    }
-
-    private function createSubnet(Network $network, string $cidr = '192.168.199.0/24'): Subnet
-    {
-        return $this->getV2Service()->createSubnet([
-            'networkId' => $network->id,
-            'name'      => $this->randomStr(),
-            'ipVersion' => 4,
-            'cidr'      => $cidr,
-        ]);
-    }
-
-    private function createPort(Network $network): Port
-    {
-        return $this->getV2Service()->createPort([
-            'networkId' => $network->id,
-            'name'      => $this->randomStr(),
-        ]);
-    }
-
-    private function findSubnetIp(Port $port, Subnet $subnet): string
-    {
-        foreach ($port->fixedIps as $fixedIp) {
-            if ($fixedIp['subnet_id'] == $subnet->id) {
-                return $fixedIp['ip_address'];
-            }
-        }
-
-        return '';
-    }
-
-    public function floatingIps()
-    {
-        $this->logStep('Creating external network');
-        $externalNetwork = $this->createNetwork();
-
-        $this->logStep('Creating subnet for external network %id%', ['%id%' => $externalNetwork->id]);
-        $this->createSubnet($externalNetwork, '10.0.0.0/24');
-
-        $this->logStep('Creating internal network');
-        $internalNetwork = $this->createNetwork(false);
-
-        $this->logStep('Creating subnet for internal network %id%', ['%id%' => $internalNetwork->id]);
-        $subnet = $this->createSubnet($internalNetwork);
-
-        $this->logStep('Creating router for external network %id%', ['%id%' => $externalNetwork->id]);
-        $router = $this->getService()->createRouter([
-            'name'                => $this->randomStr(),
-            'externalGatewayInfo' => [
-                'networkId'  => $externalNetwork->id,
-                'enableSnat' => true,
-            ],
-        ]);
-
-        $this->logStep('Create interface for subnet %subnet% and router %router%', [
-            '%subnet%' => $subnet->id, '%router%' => $router->id,
-        ]);
-        $router->addInterface(['subnetId' => $subnet->id]);
-
-        $this->logStep('Creating port for internal network %id%', ['%id%' => $internalNetwork->id]);
-        $port1 = $this->createPort($internalNetwork);
-        $fixedIp = $this->findSubnetIp($port1, $subnet);
-
-        $replacements = [
-            '{networkId}'      => $externalNetwork->id,
-            '{portId}'         => $port1->id,
-            '{fixedIpAddress}' => $fixedIp,
-        ];
-
-        $this->logStep('Create floating IP');
-        /** @var FloatingIp $ip */
-        require_once $this->sampleFile('floatingIPs/create.php', $replacements);
-        self::assertInstanceOf(FloatingIp::class, $ip);
-        self::assertEquals($externalNetwork->id, $ip->floatingNetworkId);
-        self::assertEquals($port1->id, $ip->portId);
-
-        $this->logStep('List floating IPs');
-        require_once $this->sampleFile('floatingIPs/list.php', $replacements);
-
-        $this->logStep('Get floating IP');
-        $replacements['{id}'] = $ip->id;
-        require_once $this->sampleFile('floatingIPs/get.php', $replacements);
-        self::assertInstanceOf(FloatingIp::class, $ip);
-
-        $this->logStep('Update floating IP');
-        $port2 = $this->createPort($internalNetwork);
-        $replacements['{newPortId}'] = $port2->id;
-        require_once $this->sampleFile('floatingIPs/update.php', $replacements);
-
-        $this->logStep('Delete floating IP');
-        require_once $this->sampleFile('floatingIPs/delete.php', $replacements);
-
-        $router->removeInterface(['subnetId' => $subnet->id]);
-        $router->delete();
-        $router->waitUntilDeleted();
-
-        $port1->delete();
-        $port2->delete();
-
-        $internalNetwork->delete();
-        $internalNetwork->waitUntilDeleted();
-
-        $externalNetwork->delete();
-        $externalNetwork->waitUntilDeleted();
-    }
-}
diff --git a/tests/integration/Networking/v2/SecGroupTest.php b/tests/integration/Networking/v2/SecGroupTest.php
deleted file mode 100644
index 6b82dd98..00000000
--- a/tests/integration/Networking/v2/SecGroupTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\Networking\v2;
-
-use OpenStack\Integration\TestCase;
-
-class SecGroupTest extends TestCase
-{
-    public function runTests()
-    {
-    }
-}
diff --git a/tests/integration/ObjectStore/v1/CoreTest.php b/tests/integration/ObjectStore/v1/CoreTest.php
deleted file mode 100644
index 2919c4e2..00000000
--- a/tests/integration/ObjectStore/v1/CoreTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-namespace OpenStack\Integration\ObjectStore\v1;
-
-use OpenStack\Integration\TestCase;
-use OpenStack\Integration\Utils;
-use Psr\Http\Message\StreamInterface;
-
-class CoreTest extends TestCase
-{
-    private $service;
-
-    /**
-     * @return \OpenStack\ObjectStore\v1\Service
-     */
-    protected function getService()
-    {
-        if (null === $this->service) {
-            $this->service = Utils::getOpenStack()->objectStoreV1();
-        }
-
-        return $this->service;
-    }
-
-    public function runTests()
-    {
-        $this->startTimer();
-
-        $this->accountMetadata();
-        $this->containers();
-        $this->objects();
-
-        $this->outputTimeTaken();
-    }
-
-    public function accountMetadata()
-    {
-        $this->logStep('Ensure all metadata is wiped');
-        $this->getService()->getAccount()->resetMetadata([]);
-
-        $replacements = [
-            '{key_1}' => 'Foo',
-            '{key_2}' => 'Bar',
-            '{val_1}' => $this->randomStr(),
-            '{val_2}' => $this->randomStr(),
-        ];
-
-        $this->logStep('Setting account metadata');
-        require_once $this->sampleFile('account/merge_metadata.php', $replacements);
-
-        $this->logStep('Getting account metadata');
-        /** @var array $metadata */
-        require_once $this->sampleFile('account/get_metadata.php', $replacements);
-        self::assertArraySubset([
-            'Foo' => $replacements['{val_1}'],
-            'Bar' => $replacements['{val_2}'],
-        ], $metadata);
-
-        $this->logStep('Resetting account metadata');
-        $replacements = [
-            '{key_1}' => 'Foo1',
-            '{key_2}' => 'Bar1',
-            '{val_1}' => $this->randomStr(),
-            '{val_2}' => $this->randomStr(),
-        ];
-        require_once $this->sampleFile('account/reset_metadata.php', $replacements);
-
-        $this->logStep('Checking account metadata was reset properly');
-        /** @var array $metadata */
-        require_once $this->sampleFile('account/get_metadata.php', $replacements);
-        self::assertEquals([
-            'Foo1' => $replacements['{val_1}'],
-            'Bar1' => $replacements['{val_2}'],
-        ], $metadata);
-    }
-
-    public function containers()
-    {
-        $containerName = $this->randomStr();
-        $replacements = ['{containerName}' => $containerName];
-
-        $this->logStep('Create container');
-        require_once $this->sampleFile('containers/create.php', $replacements);
-
-        $this->logStep('Get container');
-        require_once $this->sampleFile('containers/get.php', $replacements);
-
-        $this->logStep('Listing containers');
-        require_once $this->sampleFile('containers/list.php', $replacements);
-
-        $this->logStep('Merging metadata');
-        $replacements += [
-            '{key_1}' => 'Foo',
-            '{key_2}' => 'Bar',
-            '{val_1}' => $this->randomStr(),
-            '{val_2}' => $this->randomStr(),
-        ];
-        require_once $this->sampleFile('containers/merge_metadata.php', $replacements);
-
-        $this->logStep('Getting metadata');
-        /** @var array $metadata */
-        require_once $this->sampleFile('containers/get_metadata.php', $replacements);
-        self::assertEquals([
-            'Foo' => $replacements['{val_1}'],
-            'Bar' => $replacements['{val_2}'],
-        ], $metadata);
-
-        $this->logStep('Resetting metadata');
-        $replacements['{key_1}'] = 'Foo1';
-        $replacements['{key_2}'] = 'Bar1';
-
-        /** @var array $metadata */
-        require_once $this->sampleFile('containers/reset_metadata.php', $replacements);
-        /** @var array $metadata */
-        require_once $this->sampleFile('containers/get_metadata.php', $replacements);
-        self::assertEquals([
-            'Foo1' => $replacements['{val_1}'],
-            'Bar1' => $replacements['{val_2}'],
-        ], $metadata);
-
-        $this->logStep('Delete container');
-        $replacements = ['{containerName}' => $containerName];
-        require_once $this->sampleFile('containers/delete.php', $replacements);
-    }
-
-    public function objects()
-    {
-        $containerName = $this->randomStr();
-
-        $this->logStep('Create container named {name}', ['{name}' => $containerName]);
-        $container = $this->getService()->createContainer(['name' => $containerName]);
-
-        $objectName = $this->randomStr();
-        $replacements = ['{containerName}' => $container->name, '{objectName}' => $objectName];
-
-        $this->logStep('Create object');
-        $replacements['{objectContent}'] = str_repeat('A', 1000);
-        require_once $this->sampleFile('objects/create.php', $replacements);
-
-        $this->logStep('Copy object');
-        $newName = $this->randomStr();
-        $replacements += ['{newContainerName}' => $containerName, '{newObjectName}' => $newName];
-        require_once $this->sampleFile('objects/copy.php', $replacements);
-
-        $this->logStep('Check that new object exists');
-        /** @var bool $exists */
-        require_once $this->sampleFile('objects/check_exists.php', ['{containerName}' => $containerName, '{objectName}' => $newName]);
-        self::assertTrue($exists);
-
-        $this->logStep('Downloading object');
-        /** @var StreamInterface $stream */
-        require_once $this->sampleFile('objects/download.php', $replacements);
-        self::assertInstanceOf(StreamInterface::class, $stream);
-        self::assertEquals(1000, $stream->getSize());
-
-        $this->logStep('Downloading object using streaming');
-        /** @var StreamInterface $stream */
-        require_once $this->sampleFile('objects/download_stream.php', $replacements);
-        self::assertInstanceOf(StreamInterface::class, $stream);
-
-        $body = '';
-        while (!$stream->eof()) {
-            $body .= $stream->read(64);
-        }
-        self::assertEquals(1000, strlen($body));
-
-        $this->logStep('Get object');
-        require_once $this->sampleFile('objects/get.php', $replacements);
-
-        $this->logStep('Listing objects');
-        require_once $this->sampleFile('objects/list.php', $replacements);
-
-        $this->logStep('Merging metadata');
-        $replacements += [
-            '{key_1}' => 'Foo',
-            '{key_2}' => 'Bar',
-            '{val_1}' => $this->randomStr(),
-            '{val_2}' => $this->randomStr(),
-        ];
-        require_once $this->sampleFile('objects/merge_metadata.php', $replacements);
-
-        $this->logStep('Getting metadata');
-        /** @var array $metadata */
-        require_once $this->sampleFile('objects/get_metadata.php', $replacements);
-        self::assertEquals([
-            'Foo' => $replacements['{val_1}'],
-            'Bar' => $replacements['{val_2}'],
-        ], $metadata);
-
-        $this->logStep('Resetting metadata');
-        $replacements['{key_1}'] = 'Foo1';
-        $replacements['{key_2}'] = 'Bar1';
-
-        /** @var array $metadata */
-        require_once $this->sampleFile('objects/reset_metadata.php', $replacements);
-        /** @var array $metadata */
-        require_once $this->sampleFile('objects/get_metadata.php', $replacements);
-        self::assertEquals([
-            'Foo1' => $replacements['{val_1}'],
-            'Bar1' => $replacements['{val_2}'],
-        ], $metadata);
-
-        $this->logStep('Delete object');
-        require_once $this->sampleFile('objects/delete.php', $replacements);
-        $container->getObject($replacements['{newObjectName}'])->delete();
-
-        $this->logStep('Delete container');
-        $container->delete();
-    }
-}
diff --git a/tests/integration/Runner.php b/tests/integration/Runner.php
deleted file mode 100644
index dc377638..00000000
--- a/tests/integration/Runner.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-namespace OpenStack\Integration;
-
-class Runner
-{
-    private $testsDir;
-    private $samplesDir;
-    private $logger;
-    private $tests;
-    private $namespace;
-
-    public function __construct($samplesDir, $testsDir, $testNamespace)
-    {
-        $this->samplesDir = $samplesDir;
-        $this->testsDir = $testsDir;
-        $this->namespace = $testNamespace;
-
-        $this->logger = new DefaultLogger();
-        $this->assembleTestFiles();
-    }
-
-    private function traverse(string $path): \DirectoryIterator
-    {
-        return new \DirectoryIterator($path);
-    }
-
-    private function assembleTestFiles()
-    {
-        foreach ($this->traverse($this->testsDir) as $servicePath) {
-            if ($servicePath->isDir()) {
-                $serviceBn = $servicePath->getBasename();
-                foreach ($this->traverse($servicePath->getPathname()) as $versionPath) {
-                    $versionBn = $versionPath->getBasename();
-                    if ($servicePath->isDir() && $versionBn[0] == 'v') {
-                        foreach ($this->traverse($versionPath->getPathname()) as $testPath) {
-                            if (strpos($testPath->getFilename(), 'Test.php')) {
-                                $testBn = substr($testPath->getBasename(), 0, -8);
-                                $this->tests[$serviceBn][strtolower($versionBn)][] = $testBn;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private function getOpts()
-    {
-        $opts = getopt('s:v:m:t:', ['service:', 'version:', 'module::', 'test::', 'debug::', 'help::']);
-
-        $getOpt = function (array $keys, $default) use ($opts) {
-            $value = $default;
-            foreach ($keys as $key) {
-                if (isset($opts[$key])) {
-                    $value = $opts[$key];
-                    break;
-                }
-            }
-            return $value;
-        };
-
-        return [
-            $getOpt(['s', 'service'], 'all'),
-            $getOpt(['v', 'version'], 'all'),
-            $getOpt(['m', 'module'], 'core'),
-            $getOpt(['t', 'test'], ''),
-            isset($opts['debug']) ? (int)$opts['debug'] : 0,
-        ];
-    }
-
-    private function getRunnableServices($service, $version, $module)
-    {
-        $tests = $this->tests;
-
-        if ($service != 'all') {
-            if (!isset($tests[$service])) {
-                $this->logger->critical(sprintf("%s is not a valid service", $service));
-                exit(1);
-            }
-
-            $serviceArray = $tests[$service];
-            $tests = [$service => $serviceArray];
-
-            if ($version != 'all') {
-                if (!isset($serviceArray[$version])) {
-                    $this->logger->critical(sprintf("%s is not a valid version for the %s service", $version, $service));
-                    exit(1);
-                }
-
-                $versionArray = $serviceArray[$version];
-                if ($module != 'core') {
-                    if (!in_array($module, $serviceArray[$version])) {
-                        $this->logger->critical(sprintf("%s is not a valid test class for the %s %s service", $module, $version, $service));
-                        exit(1);
-                    }
-                    $versionArray = [$module];
-                }
-
-                $tests = [$service => [$version => $versionArray]];
-            }
-        }
-
-        return $tests;
-    }
-
-    /**
-     * @return TestInterface
-     */
-    private function getTest($service, $version, $test, $verbosity)
-    {
-        $className = sprintf("%s\\%s\\%s\\%sTest", $this->namespace, Utils::toCamelCase($service), $version, ucfirst($test));
-
-        if (!class_exists($className)) {
-            throw new \RuntimeException(sprintf("%s does not exist", $className));
-        }
-
-        $basePath = $this->samplesDir . DIRECTORY_SEPARATOR . $service . DIRECTORY_SEPARATOR . $version;
-        $smClass  = sprintf("%s\\SampleManager", $this->namespace);
-        $class = new $className($this->logger, new $smClass($basePath, $verbosity), $verbosity);
-
-        if (!($class instanceof TestInterface)) {
-            throw new \RuntimeException(sprintf("%s does not implement TestInterface", $className));
-        }
-
-        return $class;
-    }
-
-    public function runServices()
-    {
-        list($serviceOpt, $versionOpt, $moduleOpt, $testMethodOpt, $verbosityOpt) = $this->getOpts();
-
-        foreach ($this->getRunnableServices($serviceOpt, $versionOpt, $moduleOpt) as $serviceName => $serviceArray) {
-            foreach ($serviceArray as $versionName => $versionArray) {
-                foreach ($versionArray as $testName) {
-                    $this->logger->info(str_repeat('=', 49));
-                    $this->logger->info("Starting %s %v %m integration test(s)", [
-                        '%s' => $serviceName,
-                        '%v' => $versionName,
-                        '%m' => $moduleOpt,
-                    ]);
-                    $this->logger->info(str_repeat('=', 49));
-
-                    $testRunner = $this->getTest($serviceName, $versionName, $testName, $verbosityOpt);
-
-                    try {
-                        if ($testMethodOpt) {
-                            $testRunner->runOneTest($testMethodOpt);
-                        } else {
-                            $testRunner->runTests();
-                        }
-                    } finally {
-                        $this->logger->info(str_repeat('=', 11));
-                        $this->logger->info('Cleaning up');
-                        $this->logger->info(str_repeat('=', 11));
-                        $testRunner->teardown();
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests/integration/SampleManagerInterface.php b/tests/integration/SampleManagerInterface.php
deleted file mode 100644
index 108f7684..00000000
--- a/tests/integration/SampleManagerInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace OpenStack\Integration;
-
-interface SampleManagerInterface
-{
-    public function write($path, array $replacements);
-
-    public function deletePaths();
-}
diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php
deleted file mode 100644
index 6701e2a6..00000000
--- a/tests/integration/TestCase.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace OpenStack\Integration;
-
-use OpenStack\Common\Resource\Deletable;
-use Psr\Log\LoggerInterface;
-
-abstract class TestCase extends \PHPUnit\Framework\TestCase implements TestInterface
-{
-    protected $logger;
-    private $startPoint;
-    private $lastPoint;
-    protected $sampleManager;
-    private $namePrefix = 'phptest_';
-
-    public function __construct(LoggerInterface $logger, SampleManagerInterface $sampleManager)
-    {
-        parent::__construct();
-
-        $this->logger = $logger;
-        $this->sampleManager = $sampleManager;
-    }
-
-    public function teardown(): void
-    {
-        $this->sampleManager->deletePaths();
-    }
-
-    public function runOneTest($name)
-    {
-        if (!method_exists($this, $name)) {
-            throw new \InvalidArgumentException(sprintf("%s method does not exist", $name));
-        }
-
-        $this->startTimer();
-        $this->$name();
-        $this->outputTimeTaken();
-    }
-
-    protected function startTimer()
-    {
-        $this->startPoint = $this->lastPoint = microtime(true);
-    }
-
-    private function wrapColor($message, $colorPrefix)
-    {
-        return sprintf("%s%s", $colorPrefix, $message) . "\033[0m\033[1;0m";
-    }
-
-    protected function logStep($message, array $context = [])
-    {
-        $duration = microtime(true) - $this->lastPoint;
-
-        $stepTimeTaken = sprintf('(%s)', $this->formatSecDifference($duration));
-
-        if ($duration >= 10) {
-            $color = "\033[0m\033[1;31m"; // red
-        } elseif ($duration >= 2) {
-            $color = "\033[0m\033[1;33m"; // yellow
-        } else {
-            $color = "\033[0m\033[1;32m"; // green
-        }
-
-        $message = '{timeTaken} ' . $message;
-        $context['{timeTaken}'] = $this->wrapColor($stepTimeTaken, $color);
-
-        $this->logger->info($message, $context);
-
-        $this->lastPoint = microtime(true);
-    }
-
-    protected function randomStr($length = 5)
-    {
-        $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-        $charsLen = strlen($chars);
-
-        $randomString = '';
-        for ($i = 0; $i < $length; $i++) {
-            $randomString .= $chars[rand(0, $charsLen - 1)];
-        }
-
-        return $this->namePrefix . $randomString;
-    }
-
-    private function formatMinDifference($duration)
-    {
-        $output = '';
-
-        if (($minutes = floor($duration / 60)) > 0) {
-            $output .= $minutes . 'min' . (($minutes > 1) ? 's' : '');
-        }
-
-        if (($seconds = number_format(fmod($duration, 60), 2)) > 0) {
-            if ($minutes > 0) {
-                $output .= ' ';
-            }
-            $output .= $seconds . 's';
-        }
-
-        return $output;
-    }
-
-    private function formatSecDifference($duration)
-    {
-        return number_format($duration, 2) . 's';
-    }
-
-    protected function outputTimeTaken()
-    {
-        $output = $this->formatMinDifference(microtime(true) - $this->startPoint);
-
-        $this->logger->info('Finished all tests! Time taken: {output}.', ['{output}' => $output]);
-    }
-
-    protected function sampleFile($path, array $replacements = [])
-    {
-        return $this->sampleManager->write($path, $replacements);
-    }
-
-    protected function getBaseClient()
-    {
-        return eval($this->sampleManager->getConnectionStr());
-    }
-
-    protected function deleteItems(\Generator $items)
-    {
-        foreach ($items as $item) {
-            if ($item instanceof Deletable
-                && property_exists($item, 'name')
-                && strpos($item->name, $this->namePrefix) === 0
-            ) {
-                $item->delete();
-            }
-        }
-    }
-}
diff --git a/tests/integration/TestInterface.php b/tests/integration/TestInterface.php
deleted file mode 100644
index abac45f9..00000000
--- a/tests/integration/TestInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace OpenStack\Integration;
-
-use Psr\Log\LoggerInterface;
-
-interface TestInterface
-{
-    public function __construct(LoggerInterface $logger, SampleManagerInterface $sampleManager);
-
-    public function runTests();
-
-    public function runOneTest($name);
-
-    public function teardown();
-}
diff --git a/tests/integration/Utils.php b/tests/integration/Utils.php
deleted file mode 100644
index 7f3b8c1f..00000000
--- a/tests/integration/Utils.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace OpenStack\Integration;
-
-use GuzzleHttp\Client;
-use GuzzleHttp\HandlerStack;
-use OpenStack\Identity\v2\Service;
-use OpenStack\Common\Transport\Utils as TransportUtils;
-use OpenStack\OpenStack;
-
-class Utils
-{
-    public static function getOpenStack(): OpenStack
-    {
-        return new OpenStack(self::getAuthOpts());
-    }
-
-    public static function getAuthOptsV3()
-    {
-        return [
-            'authUrl' => getenv('OS_AUTH_URL'),
-            'region'  => getenv('OS_REGION_NAME'),
-            'user'    => [
-                'id'       => getenv('OS_USER_ID'),
-                'password' => getenv('OS_PASSWORD'),
-            ],
-            'scope'   => [
-                'project' => [
-                    'id' => getenv('OS_PROJECT_ID'),
-                ]
-            ]
-        ];
-    }
-
-    public static function getAuthOptsV2()
-    {
-        $httpClient = new Client([
-            'base_uri' => TransportUtils::normalizeUrl(getenv('OS_AUTH_URL')),
-            'handler'  => HandlerStack::create(),
-        ]);
-
-        return [
-            'authUrl'         => getenv('OS_AUTH_URL'),
-            'region'          => getenv('OS_REGION_NAME'),
-            'username'        => getenv('OS_USERNAME'),
-            'password'        => getenv('OS_PASSWORD'),
-            'tenantName'      => getenv('OS_TENANT_NAME'),
-            'identityService' => Service::factory($httpClient),
-        ];
-    }
-
-    public static function getAuthOpts(array $options = [])
-    {
-        $authOptions = getenv('OS_IDENTITY_API_VERSION') == '2.0'
-            ? self::getAuthOptsV2()
-            : self::getAuthOptsV3();
-
-        return array_merge($authOptions, $options);
-    }
-
-    public static function toCamelCase($word, $separator = '_')
-    {
-        return str_replace($separator, '', ucwords($word, $separator));
-    }
-}
diff --git a/tests/integration/run.php b/tests/integration/run.php
deleted file mode 100644
index 959cb117..00000000
--- a/tests/integration/run.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-ini_set('display_errors', 1);
-error_reporting(E_ALL);
-
-$rootDir = dirname(dirname(__DIR__));
-
-require_once $rootDir . '/vendor/autoload.php';
-
-$sampleDir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'samples';
-
-$runner = new \OpenStack\Integration\Runner($sampleDir, __DIR__, 'OpenStack\\Integration');
-$runner->runServices();
diff --git a/tests/integration/script/compute_v2 b/tests/integration/script/compute_v2
deleted file mode 100755
index 762523eb..00000000
--- a/tests/integration/script/compute_v2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-php tests/integration/run.php -s compute -v v2
diff --git a/tests/integration/script/identity_v3 b/tests/integration/script/identity_v3
deleted file mode 100755
index 233bc108..00000000
--- a/tests/integration/script/identity_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-php tests/integration/run.php -s identity -v v3
diff --git a/tests/integration/script/networking_v2 b/tests/integration/script/networking_v2
deleted file mode 100755
index be95d37b..00000000
--- a/tests/integration/script/networking_v2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-php tests/integration/run.php -s networking -v v2
diff --git a/tests/integration/script/objectstore_v2 b/tests/integration/script/objectstore_v2
deleted file mode 100755
index 4bd97a35..00000000
--- a/tests/integration/script/objectstore_v2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-php tests/integration/run.php -s objectstore -v v2
diff --git a/tests/sample/BlockStorage/v2/ConvertFromV3.php b/tests/sample/BlockStorage/v2/ConvertFromV3.php
new file mode 100644
index 00000000..1b24c55c
--- /dev/null
+++ b/tests/sample/BlockStorage/v2/ConvertFromV3.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v2;
+
+use OpenStack\BlockStorage\v2\Service;
+
+trait ConvertFromV3
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (!getenv('OS_BLOCK_STORAGE_V2')) {
+            $this->markTestSkipped('Block Storage v2 API is not available');
+        }
+    }
+
+    protected function getService(): Service
+    {
+        return $this->getCachedService(Service::class);
+    }
+
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return parent::sampleFile(
+            $path,
+            array_merge(
+                $replacements,
+                ['$openstack->blockStorageV3()' => '$openstack->blockStorageV2()']
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/BlockStorage/v2/SnapshotTest.php b/tests/sample/BlockStorage/v2/SnapshotTest.php
new file mode 100644
index 00000000..1edb8d2e
--- /dev/null
+++ b/tests/sample/BlockStorage/v2/SnapshotTest.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v2;
+
+class SnapshotTest extends \OpenStack\Sample\BlockStorage\v3\SnapshotTest
+{
+    use ConvertFromV3;
+}
\ No newline at end of file
diff --git a/tests/sample/BlockStorage/v2/VolumeTest.php b/tests/sample/BlockStorage/v2/VolumeTest.php
new file mode 100644
index 00000000..0d082a9d
--- /dev/null
+++ b/tests/sample/BlockStorage/v2/VolumeTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v2;
+
+use OpenStack\BlockStorage\v3\Service;
+
+class VolumeTest extends \OpenStack\Sample\BlockStorage\v3\VolumeTest
+{
+    use ConvertFromV3;
+
+    public function testUsingV2()
+    {
+        $this->assertNotInstanceOf(Service::class, $this->getService());
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/BlockStorage/v2/VolumeTypeTest.php b/tests/sample/BlockStorage/v2/VolumeTypeTest.php
new file mode 100644
index 00000000..e9d5ba0a
--- /dev/null
+++ b/tests/sample/BlockStorage/v2/VolumeTypeTest.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v2;
+
+class VolumeTypeTest extends \OpenStack\Sample\BlockStorage\v3\VolumeTypeTest
+{
+    use ConvertFromV3;
+}
\ No newline at end of file
diff --git a/tests/sample/BlockStorage/v3/SnapshotTest.php b/tests/sample/BlockStorage/v3/SnapshotTest.php
new file mode 100644
index 00000000..f2a6ead3
--- /dev/null
+++ b/tests/sample/BlockStorage/v3/SnapshotTest.php
@@ -0,0 +1,271 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v3;
+
+use OpenStack\BlockStorage\v2\Models\Snapshot;
+use OpenStack\Common\Error\BadResponseError;
+
+class SnapshotTest extends TestCase
+{
+    public function testCreate(): Snapshot
+    {
+        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
+        $volume->waitUntil('available');
+
+        $name = $this->randomStr();
+        $description = $this->randomStr();
+
+        /** @var Snapshot $snapshot */
+        require_once $this->sampleFile('snapshots/create.php', [
+            '{volumeId}'    => $volume->id,
+            '{name}'        => $name,
+            '{description}' => $description,
+        ]);
+
+        $this->assertInstanceOf(Snapshot::class, $snapshot);
+        $this->assertEquals($name, $snapshot->name);
+        $this->assertEquals($description, $snapshot->description);
+
+        $snapshot->waitUntil('available');
+
+        return $snapshot;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Snapshot $createdSnapshot)
+    {
+        /** @var Snapshot $snapshot */
+        require_once $this->sampleFile('snapshots/get.php', ['{snapshotId}' => $createdSnapshot->id]);
+
+        $this->assertInstanceOf(Snapshot::class, $snapshot);
+        $this->assertEquals($createdSnapshot->id, $snapshot->id);
+        $this->assertNull($snapshot->name);
+
+        $snapshot->retrieve();
+        $this->assertEquals($createdSnapshot->name, $snapshot->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testMergeMetadata(Snapshot $createdSnapshot)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+
+        $createdSnapshot->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'snapshots/merge_metadata.php',
+            [
+                '{snapshotId}' => $createdSnapshot->id,
+                '{key}'        => 'Foo',
+                '{val}'        => $fooVal,
+            ]
+        );
+
+        $metadata = $createdSnapshot->getMetadata();
+        $this->assertEquals($initVal, $metadata['Init']);
+        $this->assertEquals($fooVal, $metadata['Foo']);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testMergeMetadata
+     */
+    public function testGetMetadata(Snapshot $createdSnapshot)
+    {
+        /** @var array $metadata */
+        require_once $this->sampleFile('snapshots/get_metadata.php', ['{snapshotId}' => $createdSnapshot->id]);
+
+        $this->assertArrayHasKey('Init', $metadata);
+        $this->assertArrayHasKey('Foo', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testResetMetadata(Snapshot $createdSnapshot)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+
+        $createdSnapshot->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'snapshots/reset_metadata.php',
+            [
+                '{snapshotId}' => $createdSnapshot->id,
+                '{key}'        => 'Foo',
+                '{val}'        => $fooVal,
+            ]
+        );
+
+        $metadata = $createdSnapshot->getMetadata();
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertArrayNotHasKey('Init', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Snapshot $createdSnapshot)
+    {
+        $newName = $this->randomStr();
+        $newDescription = $this->randomStr();
+
+        require_once $this->sampleFile('snapshots/update.php', [
+            '{snapshotId}' => $createdSnapshot->id,
+            '{newName}' => $newName,
+            '{newDescription}' => $newDescription,
+        ]);
+
+        $createdSnapshot->retrieve();
+        $this->assertEquals($newName, $createdSnapshot->name);
+        $this->assertEquals($newDescription, $createdSnapshot->description);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Snapshot $createdSnapshot)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'snapshots/list.php',
+            [
+                '/** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */' => <<<'PHP'
+/** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */
+if ($snapshot->id === $createdSnapshot->id) {
+    $found = true;
+}
+PHP
+            ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Snapshot $createdSnapshot)
+    {
+        $volume = $this->getService()->getVolume($createdSnapshot->volumeId);
+        require_once $this->sampleFile('snapshots/delete.php', ['{snapshotId}' => $createdSnapshot->id]);
+        $createdSnapshot->waitUntilDeleted();
+
+        $volume->delete();
+        $volume->waitUntilDeleted();
+
+        $this->expectException(BadResponseError::class);
+        $createdSnapshot->retrieve();
+    }
+
+    public function testListAsc()
+    {
+        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
+        $volume->waitUntil('available');
+
+        $postfix = $this->randomStr();
+        $names = ['b' . $postfix, 'a' . $postfix, 'c' . $postfix];
+        $createdSnapshots = [];
+        foreach ($names as $name) {
+            $snapshot = $this->getService()->createSnapshot([
+                'volumeId' => $volume->id,
+                'name' => $name,
+            ]);
+
+            $this->assertInstanceOf(Snapshot::class, $snapshot);
+
+            $createdSnapshots[] = $snapshot;
+        }
+
+        foreach ($createdSnapshots as $snapshot) {
+            $snapshot->waitUntil('available');
+        }
+
+        try {
+            $rightOrder = ['a' . $postfix, 'b' . $postfix, 'c' . $postfix];
+            $i = 0;
+            require_once $this->sampleFile('snapshots/list_sorted.php', [
+                '{sortKey}' => 'display_name',
+                '{sortDir}' => 'asc',
+                '/** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */' => <<<'PHP'
+/** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */
+if ($snapshot->name === $rightOrder[$i]) {
+    $i++;
+}
+PHP
+                ,
+            ]);
+            $this->assertEquals(3, $i);
+        } finally {
+            foreach ($createdSnapshots as $snapshot) {
+                $snapshot->delete();
+            }
+
+            foreach ($createdSnapshots as $snapshot) {
+                $snapshot->waitUntilDeleted();
+            }
+
+            $volume->delete();
+            $volume->waitUntilDeleted();
+        }
+    }
+
+    public function testListDesc()
+    {
+        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
+        $volume->waitUntil('available');
+
+        $postfix = $this->randomStr();
+        $names = ['b' . $postfix, 'a' . $postfix, 'c' . $postfix];
+        $createdSnapshots = [];
+        foreach ($names as $name) {
+            $snapshot = $this->getService()->createSnapshot([
+                'volumeId' => $volume->id,
+                'name' => $name,
+            ]);
+
+            $this->assertInstanceOf(Snapshot::class, $snapshot);
+
+            $createdSnapshots[] = $snapshot;
+        }
+
+        foreach ($createdSnapshots as $snapshot) {
+            $snapshot->waitUntil('available');
+        }
+
+        try {
+            $rightOrder = ['c' . $postfix, 'b' . $postfix, 'a' . $postfix];
+            $i = 0;
+            require_once $this->sampleFile('snapshots/list_sorted.php', [
+                '{sortKey}' => 'display_name',
+                '{sortDir}' => 'desc',
+                '/** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */' => <<<'PHP'
+/** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */
+if ($snapshot->name === $rightOrder[$i]) {
+    $i++;
+}
+PHP
+                ,
+            ]);
+            $this->assertEquals(3, $i);
+        } finally {
+            foreach ($createdSnapshots as $snapshot) {
+                $snapshot->delete();
+            }
+
+            foreach ($createdSnapshots as $snapshot) {
+                $snapshot->waitUntilDeleted();
+            }
+
+            $volume->delete();
+            $volume->waitUntilDeleted();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/BlockStorage/v3/TestCase.php b/tests/sample/BlockStorage/v3/TestCase.php
new file mode 100644
index 00000000..6796f7ab
--- /dev/null
+++ b/tests/sample/BlockStorage/v3/TestCase.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v3;
+
+
+abstract class TestCase extends \OpenStack\Sample\TestCase
+{
+    protected function getService(): \OpenStack\BlockStorage\v2\Service
+    {
+        return $this->getCachedService(\OpenStack\BlockStorage\v3\Service::class);
+    }
+
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return parent::sampleFile("BlockStorage/v3/$path", $replacements);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/BlockStorage/v3/VolumeTest.php b/tests/sample/BlockStorage/v3/VolumeTest.php
new file mode 100644
index 00000000..d598c26c
--- /dev/null
+++ b/tests/sample/BlockStorage/v3/VolumeTest.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v3;
+
+use OpenStack\BlockStorage\v2\Models\Volume;
+
+class VolumeTest extends TestCase
+{
+    public function testCreate(): Volume
+    {
+        $name = $this->randomStr();
+
+        $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
+
+        /** @var Volume $volume */
+        require_once $this->sampleFile('volumes/create.php', [
+            '{description}' => $this->randomStr(),
+            "'{size}'"      => 1,
+            '{name}'        => $name,
+            '{volumeType}'  => $volumeType->id,
+            '{key1}'        => $this->randomStr(),
+            '{val1}'        => $this->randomStr(),
+        ]);
+
+        $this->assertInstanceOf(Volume::class, $volume);
+        $this->assertEquals($name, $volume->name);
+        $this->assertEquals(1, $volume->size);
+        $this->assertEquals($volumeType->name, $volume->volumeTypeName);
+
+        $volume->waitUntil('available');
+
+        return $volume;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Volume $createdVolume)
+    {
+        /** @var Volume $volume */
+        require_once $this->sampleFile('volumes/get.php', [
+            '{volumeId}' => $createdVolume->id,
+        ]);
+
+        $this->assertInstanceOf(Volume::class, $volume);
+        $this->assertEquals($createdVolume->id, $volume->id);
+        $this->assertNull($volume->description);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Volume $createdVolume)
+    {
+        $newName = $this->randomStr();
+        $newDescription = $this->randomStr();
+
+        require_once $this->sampleFile('volumes/update.php', [
+            '{volumeId}'       => $createdVolume->id,
+            '{newName}'        => $newName,
+            '{newDescription}' => $newDescription,
+        ]);
+
+        $createdVolume->retrieve();
+        $this->assertEquals($newName, $createdVolume->name);
+        $this->assertEquals($newDescription, $createdVolume->description);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Volume $createdVolume)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'volumes/list.php',
+            [
+                '/** @var \OpenStack\BlockStorage\v2\Models\Volume $volume */' => <<<'PHP'
+/** @var \OpenStack\BlockStorage\v2\Models\Volume $volume */
+if ($volume->id === $createdVolume->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Volume $createdVolume)
+    {
+        $volumeTypeName = $createdVolume->volumeTypeName;
+
+        require_once $this->sampleFile('volumes/delete.php', [
+            '{volumeId}' => $createdVolume->id,
+        ]);
+        $createdVolume->waitUntilDeleted();
+
+        $found = false;
+        foreach ($this->getService()->listVolumes() as $volume) {
+            if ($volume->id === $createdVolume->id) {
+                $found = true;
+            }
+        }
+        $this->assertFalse($found);
+
+        foreach ($this->getService()->listVolumeTypes() as $volumeType) {
+            if ($volumeType->name === $volumeTypeName) {
+                $volumeType->delete();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/BlockStorage/v3/VolumeTypeTest.php b/tests/sample/BlockStorage/v3/VolumeTypeTest.php
new file mode 100644
index 00000000..94f8f4ab
--- /dev/null
+++ b/tests/sample/BlockStorage/v3/VolumeTypeTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace OpenStack\Sample\BlockStorage\v3;
+
+use OpenStack\BlockStorage\v2\Models\Snapshot;
+use OpenStack\BlockStorage\v2\Models\VolumeType;
+use OpenStack\Common\Error\BadResponseError;
+
+class VolumeTypeTest extends TestCase
+{
+    public function testCreate(): VolumeType
+    {
+        $name = $this->randomStr();
+
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile('volume_types/create.php', ['{name}' => $name]);
+
+        $this->assertInstanceOf(VolumeType::class, $volumeType);
+        $this->assertEquals($name, $volumeType->name);
+
+        return $volumeType;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(VolumeType $createdVolumeType)
+    {
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile('volume_types/get.php', ['{volumeTypeId}' => $createdVolumeType->id]);
+
+        $this->assertInstanceOf(VolumeType::class, $volumeType);
+        $this->assertEquals($createdVolumeType->id, $volumeType->id);
+        $this->assertNull($volumeType->name);
+
+        $volumeType->retrieve();
+        $this->assertEquals($createdVolumeType->name, $volumeType->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(VolumeType $createdVolumeType)
+    {
+        $newName = $this->randomStr();
+
+        require_once $this->sampleFile('volume_types/update.php', [
+            '{volumeTypeId}' => $createdVolumeType->id,
+            '{newName}'      => $newName,
+        ]);
+
+        $createdVolumeType->retrieve();
+        $this->assertEquals($newName, $createdVolumeType->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(VolumeType $createdVolumeType)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'volume_types/list.php',
+            [
+                '/** @var \OpenStack\BlockStorage\v2\Models\VolumeType $volumeType */' => <<<'PHP'
+/** @var \OpenStack\BlockStorage\v2\Models\VolumeType $volumeType */
+if ($volumeType->id === $createdVolumeType->id) {
+    $found = true;
+}   
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(VolumeType $createdVolumeType)
+    {
+        require_once $this->sampleFile('volume_types/delete.php', ['{volumeTypeId}' => $createdVolumeType->id]);
+
+        foreach ($this->getService()->listVolumeTypes() as $volumeType) {
+            if ($volumeType->id === $createdVolumeType->id) {
+                $this->fail('Volume type still exists');
+            }
+        }
+
+        $this->expectException(BadResponseError::class);
+        $createdVolumeType->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/FlavorTest.php b/tests/sample/Compute/v2/FlavorTest.php
new file mode 100644
index 00000000..61a4708b
--- /dev/null
+++ b/tests/sample/Compute/v2/FlavorTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Compute\v2\Models\Flavor;
+
+class FlavorTest extends TestCase
+{
+    public function testCreate(): Flavor
+    {
+        $name = $this->randomStr();
+
+        /** @var $flavor \OpenStack\Compute\v2\Models\Flavor */
+        require_once $this->sampleFile('flavors/create_flavor.php', ['{flavorName}' => $name]);
+
+        $this->assertInstanceOf(Flavor::class, $flavor);
+        $this->assertEquals($name, $flavor->name);
+
+        return $flavor;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Flavor $createdFlavor)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'flavors/list_flavors.php',
+            [
+                '/** @var \OpenStack\Compute\v2\Models\Flavor $flavor */' => <<<'PHP'
+/** @var \OpenStack\Compute\v2\Models\Flavor $flavor */
+if ($flavor->id === $createdFlavor->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Flavor $createdFlavor)
+    {
+        /** @var \OpenStack\Compute\v2\Models\Flavor $flavor */
+        require_once $this->sampleFile('flavors/get_flavor.php', ['{flavorId}' => $createdFlavor->id]);
+
+        $this->assertInstanceOf(Flavor::class, $flavor);
+        $this->assertEquals($createdFlavor->id, $flavor->id);
+        $this->assertEquals($createdFlavor->name, $flavor->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Flavor $createdFlavor)
+    {
+        require_once $this->sampleFile('flavors/delete_flavor.php', ['{flavorId}' => $createdFlavor->id]);
+
+        foreach ($this->getService()->listFlavors() as $flavor) {
+            $this->assertNotEquals($createdFlavor->id, $flavor->id);
+        }
+
+        $this->expectException(BadResponseError::class);
+        $createdFlavor->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/HypervisorTest.php b/tests/sample/Compute/v2/HypervisorTest.php
new file mode 100644
index 00000000..acdcba46
--- /dev/null
+++ b/tests/sample/Compute/v2/HypervisorTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Compute\v2\Models\Hypervisor;
+use OpenStack\Compute\v2\Models\HypervisorStatistic;
+
+class HypervisorTest extends TestCase
+{
+    public function testList()
+    {
+        require_once $this->sampleFile(
+            'hypervisors/list_hypervisors.php',
+            [
+                '/** @var \OpenStack\Compute\v2\Models\Hypervisor $hypervisor */' => <<<'PHP'
+/** @var \OpenStack\Compute\v2\Models\Hypervisor $hypervisor */
+$this->assertInstanceOf(\OpenStack\Compute\v2\Models\Hypervisor::class, $hypervisor);
+PHP
+                ,
+            ]
+        );
+    }
+
+    public function testGet()
+    {
+        /** @var \OpenStack\Compute\v2\Models\Hypervisor $hypervisor */
+        require_once $this->sampleFile('hypervisors/get_hypervisor.php', ['{hypervisorId}' => '1']);
+
+        $this->assertInstanceOf(Hypervisor::class, $hypervisor);
+        $this->assertEquals(1, $hypervisor->id);
+    }
+
+    public function testGetStatistics()
+    {
+        /** @var \OpenStack\Compute\v2\Models\HypervisorStatistic $hypervisorStatistics */
+        require_once $this->sampleFile('hypervisors/get_hypervisors_statistics.php', []);
+
+        $this->assertInstanceOf(HypervisorStatistic::class, $hypervisorStatistics);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/ImageTest.php b/tests/sample/Compute/v2/ImageTest.php
new file mode 100644
index 00000000..b80fbd08
--- /dev/null
+++ b/tests/sample/Compute/v2/ImageTest.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Compute\v2\Models\Image;
+use OpenStack\Compute\v2\Models\Server;
+
+class ImageTest extends TestCase
+{
+    public function testCreate(): Image
+    {
+        $createdServer = $this->createServer();
+
+        $name = $this->randomStr();
+        $replacements = [
+            '{serverId}'  => $createdServer->id,
+            '{imageName}' => $name,
+        ];
+
+        require_once $this->sampleFile('images/create_server_image.php', $replacements);
+
+        $createdImage = null;
+        foreach ($this->getService()->listImages() as $image) {
+            if ($image->name === $name) {
+                $createdImage = $image;
+                break;
+            }
+        }
+
+        $this->assertNotNull($createdImage);
+        $createdImage->retrieve();
+
+        $createdImage->waitUntil('ACTIVE');
+        $this->assertEquals('ACTIVE', $createdImage->status);
+
+        $this->deleteServer($createdServer);
+        return $createdImage;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Image $createdImage)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'images/list_images.php',
+            [
+                '/** @var \OpenStack\Compute\v2\Models\Image $image */' => <<<'PHP'
+/** @var \OpenStack\Compute\v2\Models\Image $image */
+if ($image->id === $createdImage->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Image $createdImage)
+    {
+        /** @var \OpenStack\Compute\v2\Models\Image $image */
+        require_once $this->sampleFile('images/get_image.php', ['{imageId}' => $createdImage->id]);
+
+        $this->assertInstanceOf(Image::class, $image);
+        $this->assertEquals($createdImage->id, $image->id);
+        $this->assertEquals($createdImage->name, $image->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testMergeMetadata(Image $createdImage)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+
+        $createdImage->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'images/merge_image_metadata.php',
+            [
+                '{imageId}' => $createdImage->id,
+                '{key}'     => 'Foo',
+                '{value}'   => $fooVal,
+            ]
+        );
+
+        $metadata = $createdImage->getMetadata();
+        $this->assertEquals($initVal, $metadata['Init']);
+        $this->assertEquals($fooVal, $metadata['Foo']);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testMergeMetadata
+     */
+    public function testGetMetadata(Image $createdImage)
+    {
+        /** @var array $metadata */
+        require_once $this->sampleFile('images/retrieve_image_metadata.php', ['{imageId}' => $createdImage->id]);
+
+        $this->assertArrayHasKey('Init', $metadata);
+        $this->assertArrayHasKey('Foo', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testResetMetadata(Image $createdImage)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+
+        $createdImage->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'images/reset_image_metadata.php',
+            [
+                '{imageId}' => $createdImage->id,
+                '{key}'     => 'Foo',
+                '{value}'   => $fooVal,
+            ]
+        );
+
+        $metadata = $createdImage->getMetadata();
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertArrayNotHasKey('Init', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDeleteMetadata(Image $createdImage)
+    {
+        $createdImage->mergeMetadata(['Init' => $this->randomStr(), 'Init2' => $this->randomStr()]);
+
+        require_once $this->sampleFile(
+            'images/delete_image_metadata_item.php',
+            [
+                '{imageId}' => $createdImage->id,
+                '{key}'     => 'Init',
+            ]
+        );
+
+        $metadata = $createdImage->getMetadata();
+        $this->assertArrayNotHasKey('Init', $metadata);
+        $this->assertArrayHasKey('Init2', $metadata);
+    }
+
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Image $createdImage)
+    {
+        require_once $this->sampleFile('images/delete_image.php', ['{imageId}' => $createdImage->id]);
+
+        foreach ($this->getService()->listImages() as $image) {
+            $this->assertNotEquals($createdImage->id, $image->id);
+        }
+
+        $this->expectException(BadResponseError::class);
+        $createdImage->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/InterfaceAttachmentTest.php b/tests/sample/Compute/v2/InterfaceAttachmentTest.php
new file mode 100644
index 00000000..f635bd7b
--- /dev/null
+++ b/tests/sample/Compute/v2/InterfaceAttachmentTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Networking\v2\Models\InterfaceAttachment;
+
+class InterfaceAttachmentTest extends TestCase
+{
+    public function testCreate()
+    {
+        $server = $this->createServer();
+        $network = $this->getServiceNetwork()->createNetwork(['name' => $this->randomStr()]);
+        $this->getServiceNetwork()->createSubnet(
+            [
+                'name'      => $this->randomStr(),
+                'networkId' => $network->id,
+                'ipVersion' => 4,
+                'cidr'      => '10.20.40.0/24',
+            ]
+        );
+
+
+        $replacements = [
+            '{serverId}' => $server->id,
+            '{networkId}' => $network->id,
+        ];
+
+        /** @var \OpenStack\Networking\v2\Models\InterfaceAttachment $interfaceAttachment */
+        require_once $this->sampleFile('servers/create_interface_attachment.php', $replacements);
+
+        $this->assertInstanceOf(InterfaceAttachment::class, $interfaceAttachment);
+        $this->assertEquals($network->id, $interfaceAttachment->netId);
+
+        $port = $this->getServiceNetwork()->getPort($interfaceAttachment->portId);
+        $port->retrieve();
+
+        $server->detachInterface($interfaceAttachment->portId);
+        $port->waitUntilDeleted();
+
+        $this->deleteNetwork($network);
+        $this->deleteServer($server);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/KeypairTest.php b/tests/sample/Compute/v2/KeypairTest.php
new file mode 100644
index 00000000..a084e7ef
--- /dev/null
+++ b/tests/sample/Compute/v2/KeypairTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Compute\v2\Models\Keypair;
+
+class KeypairTest extends TestCase
+{
+    public function testCreate(): Keypair
+    {
+        $name = $this->randomStr();
+        $publicKey = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp4H/vDGnLi0QgWgMsQkv//FEz0xgv/mujVX+XCh6fHXxc/PbaASY+MsoI2Xr238cG9eaeAAUvbpJuEuHQ0M9WX97bvsWaWzLQ9F6hzLAwUBGxcG8cSh1nB3Ah7alR2nbIZ1N94yE72hXLb1AGogJ97NBVIph438BCXUNejqoOBsXL8UBP3RGdPnTHJ/6XSMaNTQAJruQMoQwecyGFQmuS2IEy2mBOmSldD6JZirHpj7PTCKJY4CS89QChGpKIeOymKn4tEQQVVtNFUyULEMdin88H1yMftPfq7QqH+ULFT2X2XvP3CI+sESq84lrIcVu7LjJCRIwlKsnMu2ESYCdz foo@bar.com';
+
+        /** @var Keypair $keypair */
+        require_once $this->sampleFile(
+            'keypairs/create_keypair.php',
+            [
+                '{name}'      => $name,
+                '{publicKey}' => $publicKey,
+            ]
+        );
+
+        $this->assertInstanceOf(Keypair::class, $keypair);
+        $this->assertEquals($name, $keypair->name);
+        $this->assertEquals($publicKey, $keypair->publicKey);
+
+        return $keypair;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Keypair $createdKeypair)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'keypairs/list_keypairs.php',
+            [
+                '/** @var \OpenStack\Compute\v2\Models\Keypair $keypair */' => <<<'PHP'
+/** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
+if ($keypair->id === $createdKeypair->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Keypair $createdKeypair)
+    {
+        /** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
+        require_once $this->sampleFile('keypairs/get_keypair.php', ['{name}' => $createdKeypair->name]);
+
+        $this->assertInstanceOf(Keypair::class, $keypair);
+        $this->assertEquals($createdKeypair->name, $keypair->name);
+    }
+
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Keypair $createdKeypair)
+    {
+        require_once $this->sampleFile('keypairs/delete_keypair.php', ['{name}' => $createdKeypair->name]);
+
+        foreach ($this->getService()->listKeypairs() as $keypair) {
+            $this->assertNotEquals($createdKeypair->name, $keypair->name);
+        }
+
+        $this->expectException(BadResponseError::class);
+        $createdKeypair->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/LimitTest.php b/tests/sample/Compute/v2/LimitTest.php
new file mode 100644
index 00000000..92ef30a9
--- /dev/null
+++ b/tests/sample/Compute/v2/LimitTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Compute\v2\Models\Limit;
+
+class LimitTest extends TestCase
+{
+    public function testGet()
+    {
+        /** @var \OpenStack\Compute\v2\Models\Limit $limit */
+        require_once $this->sampleFile('limits/get_limits.php', []);
+
+        $this->assertInstanceOf(Limit::class, $limit);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/SecurityGroupTest.php b/tests/sample/Compute/v2/SecurityGroupTest.php
new file mode 100644
index 00000000..13fc26f4
--- /dev/null
+++ b/tests/sample/Compute/v2/SecurityGroupTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Service;
+
+class SecurityGroupTest extends TestCase
+{
+    /**
+     * @return array{0: \OpenStack\Compute\v2\Models\Server, 1: \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup}
+     */
+    public function testAdd(): array
+    {
+        $createdServer = $this->createServer();
+        $createdSecurityGroup = $this->getCachedService(Service::class)
+            ->createSecurityGroup(['name' => $this->randomStr()]);
+
+        $replacements = [
+            '{serverId}'     => $createdServer->id,
+            '{secGroupName}' => $createdSecurityGroup->name,
+        ];
+
+        require_once $this->sampleFile('servers/add_security_group.php', $replacements);
+
+        $found = false;
+        foreach ($createdServer->listSecurityGroups() as $securityGroup) {
+            if ($securityGroup->name === $createdSecurityGroup->name) {
+                $found = true;
+            }
+        }
+        $this->assertTrue($found);
+
+        return [$createdServer, $createdSecurityGroup];
+    }
+
+
+    /**
+     * @depends testAdd
+     */
+    public function testList(array $data)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'servers/list_security_groups.php',
+            [
+                '{serverId}' => $data[0]->id,
+                '/** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $securityGroup */' => <<<'PHP'
+/** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $securityGroup */
+if($securityGroup->name === $data[1]->name) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testRemove(array $data)
+    {
+        require_once $this->sampleFile('servers/remove_security_group.php', [
+            '{serverId}'     => $data[0]->id,
+            '{secGroupName}' => $data[1]->name,
+        ]);
+
+        $found = false;
+        foreach ($data[0]->listSecurityGroups() as $securityGroup) {
+            if ($securityGroup->name === $data[1]->name) {
+                $found = true;
+            }
+        }
+        $this->assertFalse($found);
+
+        $data[1]->delete();
+        $data[0]->delete();
+    }
+
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/ServerTest.php b/tests/sample/Compute/v2/ServerTest.php
new file mode 100644
index 00000000..e1f1c7a4
--- /dev/null
+++ b/tests/sample/Compute/v2/ServerTest.php
@@ -0,0 +1,365 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Compute\v2\Models\Flavor;
+use OpenStack\Compute\v2\Models\Image;
+use OpenStack\Compute\v2\Models\Server;
+use RuntimeException;
+
+class ServerTest extends TestCase
+{
+
+    public function testCreate(): Server
+    {
+        $flavorId = getenv('OS_FLAVOR');
+
+        if (!$flavorId) {
+            throw new RuntimeException('OS_FLAVOR env var must be set');
+        }
+
+        $network = $this->getServiceNetwork()->createNetwork(['name' => $this->randomStr()]);
+        $this->getServiceNetwork()->createSubnet(
+            [
+                'name'      => $this->randomStr(),
+                'networkId' => $network->id,
+                'ipVersion' => 4,
+                'cidr'      => '10.20.30.0/24',
+            ]
+        );
+
+        $replacements = [
+            '{serverName}' => $this->randomStr(),
+            '{imageId}'    => $this->searchImageId(),
+            '{flavorId}'   => $flavorId,
+            '{networkId}'  => $network->id,
+        ];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile('servers/create_server.php', $replacements);
+
+        $server->waitUntilActive();
+
+        $this->assertInstanceOf(Server::class, $server);
+        $this->assertNotEmpty($server->id);
+        $this->assertNotEmpty($server->adminPass);
+
+        return $server;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Server $createdServer)
+    {
+        $newName = $this->randomStr();
+
+        require_once $this->sampleFile('servers/update_server.php', [
+            '{serverId}' => $createdServer->id,
+            '{newName}'  => $newName,
+        ]);
+
+        $createdServer->waitUntilActive(60);
+        $createdServer->retrieve();
+
+        $this->assertEquals($newName, $createdServer->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Server $createdServer)
+    {
+        /** @var \OpenStack\Compute\v2\Models\Server $server */
+        require_once $this->sampleFile('servers/get_server.php', ['{serverId}' => $createdServer->id]);
+
+        $this->assertInstanceOf(Server::class, $server);
+        $this->assertEquals($createdServer->id, $server->id);
+        $this->assertEquals($createdServer->name, $server->name);
+        $this->assertNotNull($server->created);
+        $this->assertNotNull($server->updated);
+        $this->assertNotNull($server->name);
+        $this->assertNotNull($server->ipv4);
+        $this->assertNotNull($server->status);
+        $this->assertInstanceOf(Image::class, $server->image);
+        $this->assertInstanceOf(Flavor::class, $server->flavor);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testMergeMetadata(Server $createdServer)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+
+        $createdServer->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'servers/merge_server_metadata.php',
+            [
+                '{serverId}' => $createdServer->id,
+                '{key}'      => 'Foo',
+                '{value}'    => $fooVal,
+            ]
+        );
+
+        $metadata = $createdServer->getMetadata();
+        $this->assertEquals($initVal, $metadata['Init']);
+        $this->assertEquals($fooVal, $metadata['Foo']);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testMergeMetadata
+     */
+    public function testGetMetadata(Server $createdServer)
+    {
+        /** @var array $metadata */
+        require_once $this->sampleFile('servers/get_server_metadata.php', ['{serverId}' => $createdServer->id]);
+
+        $this->assertArrayHasKey('Init', $metadata);
+        $this->assertArrayHasKey('Foo', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testResetMetadata(Server $createdServer)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+
+        $createdServer->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'servers/reset_server_metadata.php',
+            [
+                '{serverId}' => $createdServer->id,
+                '{key}'      => 'Foo',
+                '{value}'    => $fooVal,
+            ]
+        );
+
+        $metadata = $createdServer->getMetadata();
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertArrayNotHasKey('Init', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDeleteMetadata(Server $createdServer)
+    {
+        $createdServer->mergeMetadata(['Init' => $this->randomStr(), 'Init2' => $this->randomStr()]);
+
+        require_once $this->sampleFile(
+            'servers/delete_server_metadata_item.php',
+            [
+                '{serverId}' => $createdServer->id,
+                '{key}'      => 'Init',
+            ]
+        );
+
+        $metadata = $createdServer->getMetadata();
+        $this->assertArrayNotHasKey('Init', $metadata);
+        $this->assertArrayHasKey('Init2', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testStop(Server $createdServer)
+    {
+        require_once $this->sampleFile('servers/stop_server.php', ['{serverId}' => $createdServer->id]);
+
+        $createdServer->waitUntil('SHUTOFF');
+        $this->assertEquals('SHUTOFF', $createdServer->status);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testStop
+     */
+    public function testStart(Server $createdServer)
+    {
+        require_once $this->sampleFile('servers/start_server.php', ['{serverId}' => $createdServer->id]);
+
+        $createdServer->waitUntil('ACTIVE');
+        $this->assertEquals('ACTIVE', $createdServer->status);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testRevertResize(Server $createdServer)
+    {
+        $flavorId = getenv('OS_RESIZE_FLAVOR');
+
+        if (!$flavorId) {
+            throw new RuntimeException('OS_RESIZE_FLAVOR env var must be set');
+        }
+
+        $createdServer->resize($flavorId);
+        $createdServer->waitUntil('VERIFY_RESIZE');
+
+        require_once $this->sampleFile('servers/revert_server_resize.php', ['{serverId}' => $createdServer->id]);
+
+        $createdServer->waitUntil('ACTIVE');
+        $this->assertEquals('ACTIVE', $createdServer->status);
+        $this->assertEquals($createdServer->flavor->id, getenv('OS_FLAVOR'));
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testResize(Server $createdServer)
+    {
+        $flavorId = getenv('OS_RESIZE_FLAVOR');
+
+        if (!$flavorId) {
+            throw new RuntimeException('OS_RESIZE_FLAVOR env var must be set');
+        }
+
+        require_once $this->sampleFile(
+            'servers/resize_server.php',
+            [
+                '{serverId}' => $createdServer->id,
+                '{flavorId}' => $flavorId,
+            ]
+        );
+
+        $createdServer->waitUntil('VERIFY_RESIZE');
+        $this->assertEquals('VERIFY_RESIZE', $createdServer->status);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testResize
+     */
+    public function testConfirmResize(Server $createdServer)
+    {
+        require_once $this->sampleFile('servers/confirm_server_resize.php', ['{serverId}' => $createdServer->id]);
+
+        $createdServer->waitUntil('ACTIVE');
+        $this->assertEquals('ACTIVE', $createdServer->status);
+        $this->assertEquals($createdServer->flavor->id, getenv('OS_RESIZE_FLAVOR'));
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testRebuild(Server $createdServer)
+    {
+        $newName = $this->randomStr();
+
+        require_once $this->sampleFile(
+            'servers/rebuild_server.php',
+            [
+                '{serverId}'   => $createdServer->id,
+                '{imageId}'    => $this->searchImageId(),
+                '{newName}'    => $newName,
+                '{adminPass}'  => $this->randomStr(),
+            ]
+        );
+
+        $createdServer->waitUntilActive(60);
+        $this->assertEquals($newName, $createdServer->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testRescue(Server $createdServer)
+    {
+        require_once $this->sampleFile(
+            'servers/rescue_server.php',
+            [
+                '{serverId}'   => $createdServer->id,
+                '{imageId}'    => $this->searchImageId(),
+                '{adminPass}'  => $this->randomStr(),
+            ]
+        );
+
+        $createdServer->waitUntil('RESCUE');
+        $this->assertEquals('RESCUE', $createdServer->status);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testRescue
+     */
+    public function testUnrescue(Server $createdServer)
+    {
+        require_once $this->sampleFile('servers/unrescue_server.php', ['{serverId}' => $createdServer->id]);
+
+        $createdServer->waitUntil('ACTIVE');
+        $this->assertEquals('ACTIVE', $createdServer->status);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testReboot(Server $createdServer)
+    {
+        require_once $this->sampleFile('servers/reboot_server.php', ['{serverId}' => $createdServer->id]);
+
+        $createdServer->retrieve();
+        $this->assertEquals('HARD_REBOOT', $createdServer->status);
+
+        $createdServer->waitUntil('ACTIVE', 240);
+        $this->assertEquals('ACTIVE', $createdServer->status);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGetVncConsole(Server $createdServer)
+    {
+        /** @var array $console */
+        require_once $this->sampleFile('servers/get_server_vnc_console.php', [
+            '{serverId}' => $createdServer->id
+        ]);
+
+        $this->assertIsArray($console);
+        $this->assertArrayHasKey('url', $console);
+        $this->assertArrayHasKey('type', $console);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGetConsoleOutput(Server $createdServer)
+    {
+        /** @var string $consoleOutput */
+        require_once $this->sampleFile('servers/get_server_console_output.php', ['{serverId}' => $createdServer->id]);
+
+        $this->assertIsString($consoleOutput);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Server $createdServer)
+    {
+        require_once $this->sampleFile('servers/delete_server.php', ['{serverId}' => $createdServer->id]);
+
+        // Needed so that subnet and network can be removed
+        $createdServer->waitUntilDeleted();
+
+        foreach ($this->getService()->listServers() as $server) {
+            if ($server->id === $createdServer->id) {
+                $this->fail('Server was not deleted');
+            }
+        }
+
+        foreach (array_keys($createdServer->addresses) as $networkName) {
+            $network = $this->getServiceNetwork()->listNetworks(['name' => $networkName])->current();
+            $this->deleteNetwork($network);
+        }
+
+        $this->expectException(BadResponseError::class);
+        $createdServer->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/TestCase.php b/tests/sample/Compute/v2/TestCase.php
new file mode 100644
index 00000000..914b939c
--- /dev/null
+++ b/tests/sample/Compute/v2/TestCase.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+
+use OpenStack\Compute\v2\Models\Server;
+use OpenStack\Compute\v2\Service;
+use OpenStack\Networking\v2\Models\Network;
+use RuntimeException;
+
+abstract class TestCase extends \OpenStack\Sample\TestCase
+{
+    protected function getService(): Service
+    {
+        return $this->getCachedService(Service::class);
+    }
+
+    protected function getServiceNetwork(): \OpenStack\Networking\v2\Service
+    {
+        return $this->getCachedService(\OpenStack\Networking\v2\Service::class);
+    }
+
+    protected function searchImageId(): string
+    {
+        foreach ($this->getService()->listImages() as $image) {
+            if (str_starts_with($image->name, 'cirros')) {
+                return $image->id;
+            }
+        }
+
+        throw new RuntimeException('Unable to find image "cirros". Make sure this image is available for integration test.');
+    }
+
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return parent::sampleFile("Compute/v2/$path", $replacements);
+    }
+
+    /**
+     * Creates a server and all dependencies for testing
+     */
+    protected function createServer(): Server
+    {
+        $flavorId = getenv('OS_FLAVOR');
+
+        if (!$flavorId) {
+            throw new RuntimeException('OS_FLAVOR env var must be set');
+        }
+
+        $network = $this->getServiceNetwork()->createNetwork(['name' => $this->randomStr()]);
+        $this->getServiceNetwork()->createSubnet(
+            [
+                'name'      => $this->randomStr(),
+                'networkId' => $network->id,
+                'ipVersion' => 4,
+                'cidr'      => '10.20.30.0/24',
+            ]
+        );
+
+        $server = $this->getService()->createServer(
+            [
+                'name'      => $this->randomStr(),
+                'imageId'   => $this->searchImageId(),
+                'flavorId'  => $flavorId,
+                'networks'  => [
+                    ['uuid' => $network->id],
+                ],
+            ]
+        );
+
+        $server->waitUntilActive(60);
+
+        return $server;
+    }
+
+    /**
+     * Deletes server and all dependencies
+     */
+    protected function deleteServer(Server $server): void
+    {
+        $server->delete();
+        $server->waitUntilDeleted();
+
+        foreach (array_keys($server->addresses) as $networkName) {
+            $network = $this->getServiceNetwork()->listNetworks(['name' => $networkName])->current();
+            $this->deleteNetwork($network);
+        }
+    }
+
+    /**
+     * Deletes network and all dependencies
+     */
+    protected function deleteNetwork(Network $network): void
+    {
+        foreach ($network->subnets as $subnetId) {
+            $subnet = $this->getServiceNetwork()->getSubnet($subnetId);
+            $subnet->delete();
+        }
+
+        foreach ($this->getServiceNetwork()->listPorts(['networkId' => $network->id]) as $port) {
+            if ($port->deviceOwner) {
+                continue;
+            }
+
+            $port->delete();
+            $port->waitUntilDeleted();
+        }
+
+        $network->delete();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
new file mode 100644
index 00000000..1f11190f
--- /dev/null
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace OpenStack\Sample\Compute\v2;
+
+use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
+use OpenStack\BlockStorage\v3\Service;
+
+class VolumeAttachmentTest extends TestCase
+{
+    public function testAttach(): VolumeAttachment
+    {
+        $server = $this->createServer();
+
+        $volume = $this->getCachedService(Service::class)->createVolume(
+            [
+                'name'        => $this->randomStr(),
+                'description' => '',
+                'size'        => 1,
+            ]
+        );
+        $volume->waitUntil('available');
+        $this->assertEquals('available', $volume->status);
+
+        /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
+        require_once $this->sampleFile('servers/attach_volume_attachment.php', [
+            '{serverId}' => $server->id,
+            '{volumeId}' => $volume->id,
+        ]);
+
+        $this->assertInstanceOf(VolumeAttachment::class, $volumeAttachment);
+
+        $volume->waitUntil('in-use');
+        $this->assertEquals('in-use', $volume->status);
+
+        return $volumeAttachment;
+    }
+
+    /**
+     * @depends testAttach
+     */
+    public function testList(VolumeAttachment $createdVolumeAttachment)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'servers/list_volume_attachments.php',
+            [
+                '{serverId}'                                                                       => $createdVolumeAttachment->serverId,
+                '/** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */' => <<<'PHP'
+/** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
+if ($volumeAttachment->id === $createdVolumeAttachment->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAttach
+     */
+    public function testDetach(VolumeAttachment $createdVolumeAttachment)
+    {
+        require_once $this->sampleFile(
+            'servers/detach_volume_attachment.php',
+            [
+                '{serverId}'           => $createdVolumeAttachment->serverId,
+                '{volumeAttachmentId}' => $createdVolumeAttachment->id,
+            ]
+        );
+
+        $volume = $this->getCachedService(Service::class)->getVolume($createdVolumeAttachment->volumeId);
+        $volume->waitUntil('available');
+        $this->assertEquals('available', $volume->status);
+
+        $server = $this->getService()->getServer(['id' => $createdVolumeAttachment->serverId]);
+        foreach ($server->listVolumeAttachments() as $volumeAttachment) {
+            $this->assertNotEquals($createdVolumeAttachment->id, $volumeAttachment->id);
+        }
+
+        $volume->delete();
+        $this->deleteServer($server);
+    }
+}
\ No newline at end of file
diff --git a/tests/integration/DefaultLogger.php b/tests/sample/DefaultLogger.php
similarity index 92%
rename from tests/integration/DefaultLogger.php
rename to tests/sample/DefaultLogger.php
index aa3e1a2c..b7b87c1c 100644
--- a/tests/integration/DefaultLogger.php
+++ b/tests/sample/DefaultLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OpenStack\Integration;
+namespace OpenStack\Sample;
 
 use Psr\Log\AbstractLogger;
 
diff --git a/tests/sample/Identity/v3/ApplicationCredentialTest.php b/tests/sample/Identity/v3/ApplicationCredentialTest.php
new file mode 100644
index 00000000..42be5d25
--- /dev/null
+++ b/tests/sample/Identity/v3/ApplicationCredentialTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Identity\v3\Models;
+use OpenStack\Identity\v3\Models\ApplicationCredential;
+
+class ApplicationCredentialTest extends TestCase
+{
+
+    public function testAdd(): ApplicationCredential
+    {
+        $name = $this->randomStr();
+        $description = $this->randomStr();
+
+        /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
+        require_once $this->sampleFile(
+            'application_credentials/add_application_credential.php',
+            [
+                '{name}'        => $name,
+                '{description}' => $description,
+            ]
+        );
+
+        $this->assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
+        $this->assertEquals($name, $applicationCredential->name);
+        $this->assertEquals($description, $applicationCredential->description);
+
+        return $applicationCredential;
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testGenerateToken(ApplicationCredential $applicationCredential)
+    {
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        require_once $this->sampleFile(
+            'tokens/generate_token_with_application_credential_id.php',
+            [
+                '{applicationCredentialId}' => $applicationCredential->id,
+                '{secret}'                  => $applicationCredential->secret,
+            ]
+        );
+
+        $this->assertInstanceOf(Models\Token::class, $token);
+        $this->assertTrue($token->validate());
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testRetrieve(ApplicationCredential $originalApplicationCredential)
+    {
+        /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
+        require_once $this->sampleFile(
+            'application_credentials/show_application_credential.php',
+            ['{applicationCredentialId}' => $originalApplicationCredential->id]
+        );
+
+        $this->assertInstanceOf(Models\ApplicationCredential::class, $applicationCredential);
+        $this->assertEquals($originalApplicationCredential->name, $applicationCredential->name);
+        $this->assertEquals($originalApplicationCredential->description, $applicationCredential->description);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testDelete(ApplicationCredential $applicationCredential)
+    {
+        $token = $this->getService()->generateToken([
+            'application_credential' => [
+                'id'     => $applicationCredential->id,
+                'secret' => $applicationCredential->secret,
+            ]
+        ]);
+
+        $this->assertTrue($token->validate());
+
+        require_once $this->sampleFile(
+            'application_credentials/delete_application_credential.php',
+            [
+                '{applicationCredentialId}' => $applicationCredential->id,
+            ]
+        );
+
+        $this->assertFalse($token->validate());
+    }
+
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/DomainTest.php b/tests/sample/Identity/v3/DomainTest.php
new file mode 100644
index 00000000..d852f2ad
--- /dev/null
+++ b/tests/sample/Identity/v3/DomainTest.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Identity\v3\Models\Domain;
+
+class DomainTest extends TestCase
+{
+    public function testCreate(): Domain
+    {
+        $name = $this->randomStr();
+        $description = $this->randomStr();
+
+        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
+        require_once $this->sampleFile(
+            'domains/add_domain.php',
+            [
+                '{name}'        => $name,
+                '{description}' => $description,
+            ]
+        );
+        $this->assertInstanceOf(Domain::class, $domain);
+        $this->assertEquals($name, $domain->name);
+        $this->assertEquals($description, $domain->description);
+
+        return $domain;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Domain $createdDomain)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'domains/list_domains.php',
+            [
+                '/** @var $domain \OpenStack\Identity\v3\Models\Domain */' => <<<'PHP'
+/** @var $domain \OpenStack\Identity\v3\Models\Domain */
+if ($domain->id === $createdDomain->id) {
+    $found = true;
+}
+PHP,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testShow(Domain $createdDomain)
+    {
+        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
+        require_once $this->sampleFile('domains/show_domain.php', ['{domainId}' => $createdDomain->id]);
+        $this->assertInstanceOf(Domain::class, $domain);
+        $this->assertEquals($createdDomain->id, $domain->id);
+        $this->assertEquals($createdDomain->name, $domain->name);
+        $this->assertEquals($createdDomain->description, $domain->description);
+    }
+
+
+    /**
+     * @depends testCreate
+     */
+    public function testGrantGroupRole(Domain $createdDomain): array
+    {
+        $createdRole = $this->getService()->createRole(['name' => $this->randomStr()]);
+        $createdGroup = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $createdDomain->id]);
+
+        $this->assertFalse($createdDomain->checkGroupRole(['groupId' => $createdGroup->id, 'roleId' => $createdRole->id]));
+
+        require_once $this->sampleFile(
+            'domains/grant_group_role.php',
+            [
+                '{domainId}' => $createdDomain->id,
+                '{roleId}'   => $createdRole->id,
+                '{groupId}'  => $createdGroup->id,
+            ]
+        );
+
+        $this->assertTrue($createdDomain->checkGroupRole(['groupId' => $createdGroup->id, 'roleId' => $createdRole->id]));
+
+        return [$createdRole, $createdGroup];
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testGrantGroupRole
+     */
+    public function testCheckGroupRole(Domain $createdDomain, array $createdRoleAndGroup)
+    {
+        [$createdRole, $createdGroup] = $createdRoleAndGroup;
+
+        /** @var $result bool */
+        require_once $this->sampleFile(
+            'domains/check_group_role.php',
+            [
+                '{domainId}' => $createdDomain->id,
+                '{roleId}'   => $createdRole->id,
+                '{groupId}'  => $createdGroup->id,
+            ]
+        );
+        self::assertTrue($result);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testGrantGroupRole
+     */
+    public function testListGroupRole(Domain $createdDomain, array $createdRoleAndGroup)
+    {
+        [$createdRole, $createdGroup] = $createdRoleAndGroup;
+
+        $found = false;
+        require_once $this->sampleFile(
+            'domains/list_group_roles.php',
+            [
+                '{domainId}'                                           => $createdDomain->id,
+                '{groupId}'                                            => $createdGroup->id,
+                '/** @var $role \OpenStack\Identity\v3\Models\Role */' => <<<'PHP'
+/** @var $role \OpenStack\Identity\v3\Models\Role */
+if ($role->id === $createdRole->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testGrantGroupRole
+     */
+    public function testRevokeGroupRole(Domain $createdDomain, array $createdRoleAndGroup)
+    {
+        [$createdRole, $createdGroup] = $createdRoleAndGroup;
+
+        $this->assertTrue($createdDomain->checkGroupRole(['groupId' => $createdGroup->id, 'roleId' => $createdRole->id]));
+
+        require_once $this->sampleFile(
+            'domains/revoke_group_role.php',
+            [
+                '{domainId}' => $createdDomain->id,
+                '{roleId}'   => $createdRole->id,
+                '{groupId}'  => $createdGroup->id,
+            ]
+        );
+
+        $this->assertFalse($createdDomain->checkGroupRole(['groupId' => $createdGroup->id, 'roleId' => $createdRole->id]));
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGrantUserRole(Domain $createdDomain): array
+    {
+        $createdRole = $this->getService()->createRole(['name' => $this->randomStr()]);
+        $createdUser = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $createdDomain->id]);
+
+        $this->assertFalse($createdDomain->checkUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]));
+
+        require_once $this->sampleFile(
+            'domains/grant_user_role.php',
+            [
+                '{domainId}'     => $createdDomain->id,
+                '{roleId}'       => $createdRole->id,
+                '{domainUserId}' => $createdUser->id,
+            ]
+        );
+
+        $this->assertTrue($createdDomain->checkUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]));
+        return [$createdRole, $createdUser];
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testGrantUserRole
+     */
+    public function testCheckUserRole(Domain $createdDomain, array $createdRoleAndUser)
+    {
+        [$createdRole, $createdUser] = $createdRoleAndUser;
+
+        /** @var $result bool */
+        require_once $this->sampleFile(
+            'domains/check_user_role.php',
+            [
+                '{domainId}'     => $createdDomain->id,
+                '{roleId}'       => $createdRole->id,
+                '{domainUserId}' => $createdUser->id,
+            ]
+        );
+        self::assertTrue($result);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testGrantUserRole
+     */
+    public function testListUserRole(Domain $createdDomain, array $createdRoleAndUser)
+    {
+        [$createdRole, $createdUser] = $createdRoleAndUser;
+
+        $found = false;
+        require_once $this->sampleFile(
+            'domains/list_user_roles.php',
+            [
+                '{domainId}'                                           => $createdDomain->id,
+                '{domainUserId}'                                       => $createdUser->id,
+                '/** @var $role \OpenStack\Identity\v3\Models\Role */' => <<<'PHP'
+/** @var $role \OpenStack\Identity\v3\Models\Role */
+if ($role->id === $createdRole->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testGrantUserRole
+     */
+    public function testRevokeUserRole(Domain $createdDomain, array $createdRoleAndUser)
+    {
+        [$createdRole, $createdUser] = $createdRoleAndUser;
+
+        $this->assertTrue($createdDomain->checkUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]));
+
+        require_once $this->sampleFile(
+            'domains/revoke_user_role.php',
+            [
+                '{domainId}'     => $createdDomain->id,
+                '{roleId}'       => $createdRole->id,
+                '{domainUserId}' => $createdUser->id,
+            ]
+        );
+
+        $this->assertFalse($createdDomain->checkUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]));
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Domain $createdDomain)
+    {
+        $this->assertTrue($createdDomain->enabled);
+        require_once $this->sampleFile('domains/update_domain.php', ['{domainId}' => $createdDomain->id]);
+        $createdDomain->retrieve();
+        $this->assertFalse($createdDomain->enabled);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Domain $createdDomain)
+    {
+        require_once $this->sampleFile('domains/delete_domain.php', ['{domainId}' => $createdDomain->id]);
+        $found = false;
+        foreach ($this->getService()->listDomains() as $domain) {
+            if ($domain->id === $createdDomain->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+
+        $this->expectException(BadResponseError::class);
+        $createdDomain->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/EndpointTest.php b/tests/sample/Identity/v3/EndpointTest.php
new file mode 100644
index 00000000..e9bc4e68
--- /dev/null
+++ b/tests/sample/Identity/v3/EndpointTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Identity\v3\Enum;
+use OpenStack\Identity\v3\Models\Endpoint;
+
+class EndpointTest extends TestCase
+{
+    public function testAdd(): Endpoint
+    {
+        $service = $this->getService()->createService(['name' => $this->randomStr(), 'type' => 'volume', 'description' => $this->randomStr()]);
+
+        /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
+        require_once $this->sampleFile(
+            'endpoints/add_endpoint.php',
+            [
+                '{endpointName}' => $this->randomStr(),
+                '{serviceId}'    => $service->id,
+                '{endpointUrl}'  => getenv('OS_AUTH_URL'),
+                '{region}'       => 'RegionOne',
+            ]
+        );
+        self::assertInstanceOf(Endpoint::class, $endpoint);
+
+        return $endpoint;
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testList(Endpoint $createdEndpoint)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'endpoints/list_endpoints.php',
+            [
+                '/** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */' => <<<'PHP'
+/** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
+if ($endpoint->id === $createdEndpoint->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testUpdate(Endpoint $createdEndpoint)
+    {
+        $this->assertEquals(Enum::INTERFACE_INTERNAL, $createdEndpoint->interface);
+
+        require_once $this->sampleFile(
+            'endpoints/update_endpoint.php',
+            [
+                '{endpointId}'   => $createdEndpoint->id,
+            ]
+        );
+
+        $createdEndpoint->retrieve();
+        $this->assertEquals(Enum::INTERFACE_PUBLIC, $createdEndpoint->interface);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testDelete(Endpoint $createdEndpoint)
+    {
+        require_once $this->sampleFile(
+            'endpoints/delete_endpoint.php',
+            [
+                '{endpointId}'   => $createdEndpoint->id,
+            ]
+        );
+
+        $found = false;
+        foreach ($this->getService()->listEndpoints() as $endpoint) {
+            if ($endpoint->id === $createdEndpoint->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+
+        $this->expectException(BadResponseError::class);
+        $createdEndpoint->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/GroupTest.php b/tests/sample/Identity/v3/GroupTest.php
new file mode 100644
index 00000000..602fa7ff
--- /dev/null
+++ b/tests/sample/Identity/v3/GroupTest.php
@@ -0,0 +1,225 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Identity\v3\Models\Group;
+
+class GroupTest extends TestCase
+{
+    public function testAdd(): array
+    {
+        $name = $this->randomStr();
+        $description = $this->randomStr();
+
+        /** @var $group \OpenStack\Identity\v3\Models\Group */
+        require_once $this->sampleFile(
+            'groups/add_group.php',
+            [
+                '{name}'        => $name,
+                '{description}' => $description,
+            ]
+        );
+
+        $this->assertInstanceOf(Group::class, $group);
+        $this->assertEquals($name, $group->name);
+        $this->assertEquals($description, $group->description);
+
+        $user = $this->getService()->createUser(['name' => $this->randomStr()]);
+
+        return [$group, $user];
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testAddUser(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        /** @var $createdUser \OpenStack\Identity\v3\Models\User */
+        [$createdGroup, $createdUser] = $groupAndUser;
+
+        $this->assertFalse($createdGroup->checkMembership(['userId' => $createdUser->id]));
+
+        require_once $this->sampleFile(
+            'groups/add_user.php',
+            [
+                '{groupId}'     => $createdGroup->id,
+                '{groupUserId}' => $createdUser->id,
+            ]
+        );
+
+        $this->assertTrue($createdGroup->checkMembership(['userId' => $createdUser->id]));
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testCheckMembership(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        /** @var $createdUser \OpenStack\Identity\v3\Models\User */
+        [$createdGroup, $createdUser] = $groupAndUser;
+
+        /** @var $result bool */
+        require_once $this->sampleFile(
+            'groups/check_user_membership.php',
+            [
+                '{groupId}'     => $createdGroup->id,
+                '{groupUserId}' => $createdUser->id,
+            ]
+        );
+
+        $this->assertTrue($result);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testListUsers(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        /** @var $createdUser \OpenStack\Identity\v3\Models\User */
+        [$createdGroup, $createdUser] = $groupAndUser;
+
+        $found = false;
+        require_once $this->sampleFile(
+            'groups/list_users.php',
+            [
+                '{groupId}'                                            => $createdGroup->id,
+                '/** @var $user \OpenStack\Identity\v3\Models\User */' => <<<'PHP'
+/** @var $user \OpenStack\Identity\v3\Models\User */
+if ($user->id === $createdUser->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testRemoveUser(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        /** @var $createdUser \OpenStack\Identity\v3\Models\User */
+        [$createdGroup, $createdUser] = $groupAndUser;
+
+        $this->assertTrue($createdGroup->checkMembership(['userId' => $createdUser->id]));
+
+        require_once $this->sampleFile(
+            'groups/remove_user.php',
+            [
+                '{groupId}'     => $createdGroup->id,
+                '{groupUserId}' => $createdUser->id,
+            ]
+        );
+
+        $this->assertFalse($createdGroup->checkMembership(['userId' => $createdUser->id]));
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testGet(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        [$createdGroup] = $groupAndUser;
+
+        /** @var $group \OpenStack\Identity\v3\Models\Group */
+        require_once $this->sampleFile(
+            'groups/get_group.php',
+            [
+                '{groupId}' => $createdGroup->id,
+            ]
+        );
+
+        $this->assertEquals($createdGroup->id, $group->id);
+        $this->assertEquals($createdGroup->name, $group->name);
+        $this->assertEquals($createdGroup->description, $group->description);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testUpdate(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        [$createdGroup] = $groupAndUser;
+
+        $newName = $this->randomStr();
+        $newDescription = $this->randomStr();
+
+        require_once $this->sampleFile(
+            'groups/update_group.php',
+            [
+                '{groupId}'     => $createdGroup->id,
+                '{name}'        => $newName,
+                '{description}' => $newDescription,
+            ]
+        );
+
+        $createdGroup->retrieve();
+        $this->assertEquals($newName, $createdGroup->name);
+        $this->assertEquals($newDescription, $createdGroup->description);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testList(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        [$createdGroup] = $groupAndUser;
+
+        $found = false;
+        require_once $this->sampleFile(
+            'groups/list_groups.php',
+            [
+                '{groupId}'                                            => $createdGroup->id,
+                '/** @var $group \OpenStack\Identity\v3\Models\Group */' => <<<'PHP'
+/** @var $group \OpenStack\Identity\v3\Models\Group */
+if ($group->id === $createdGroup->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+
+    /**
+     * @depends testAdd
+     */
+    public function testDelete(array $groupAndUser): void
+    {
+        /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
+        [$createdGroup] = $groupAndUser;
+
+        require_once $this->sampleFile(
+            'groups/delete_group.php',
+            [
+                '{groupId}' => $createdGroup->id,
+            ]
+        );
+
+        $found = false;
+        foreach ($this->getService()->listGroups() as $group) {
+            if ($group->id === $createdGroup->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+
+        $this->expectException(BadResponseError::class);
+        $createdGroup->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/ProjectTest.php b/tests/sample/Identity/v3/ProjectTest.php
new file mode 100644
index 00000000..ea72d79e
--- /dev/null
+++ b/tests/sample/Identity/v3/ProjectTest.php
@@ -0,0 +1,251 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Identity\v3\Models\Project;
+
+class ProjectTest extends TestCase
+{
+    public function testAdd(): Project
+    {
+        /** @var $project \OpenStack\Identity\v3\Models\Project */
+        require_once $this->sampleFile(
+            'projects/add_project.php',
+            ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]
+        );
+        $this->assertInstanceOf(Project::class, $project);
+
+        return $project;
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testGet(Project $createdProject)
+    {
+        /** @var $project \OpenStack\Identity\v3\Models\Project */
+        require_once $this->sampleFile('projects/get_project.php', ['{id}' => $createdProject->id]);
+        $this->assertInstanceOf(Project::class, $project);
+        $this->assertEquals($createdProject->id, $project->id);
+        $this->assertEquals($createdProject->name, $project->name);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testGrantGroupRole(Project $createdProject): array
+    {
+        $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
+        $role = $this->getService()->createRole(['name' => $this->randomStr()]);
+        $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
+
+        require_once $this->sampleFile(
+            'projects/grant_group_role.php',
+            [
+                '{id}'      => $createdProject->id,
+                '{groupId}' => $group->id,
+                '{roleId}'  => $role->id,
+            ]
+        );
+
+        $this->assertTrue($createdProject->checkGroupRole(['groupId' => $group->id, 'roleId' => $role->id]));
+
+        return [$role, $group];
+    }
+
+    /**
+     * @depends testAdd
+     * @depends testGrantGroupRole
+     */
+    public function testCheckGroupRole(Project $createdProject, array $createdRoleAndGroup)
+    {
+        [$createdRole, $createdGroup] = $createdRoleAndGroup;
+
+        /** @var $result bool */
+        require_once $this->sampleFile(
+            'projects/check_group_role.php',
+            [
+                '{id}'      => $createdProject->id,
+                '{groupId}' => $createdGroup->id,
+                '{roleId}'  => $createdRole->id,
+            ]
+        );
+
+        $this->assertTrue($result);
+    }
+
+    /**
+     * @depends testAdd
+     * @depends testGrantGroupRole
+     */
+    public function testListGroupRoles(Project $createdProject, array $createdRoleAndGroup)
+    {
+        [$createdRole, $createdGroup] = $createdRoleAndGroup;
+
+        $found = false;
+        require_once $this->sampleFile(
+            'projects/list_group_roles.php',
+            [
+                '{id}'                                                 => $createdProject->id,
+                '{groupId}'                                            => $createdGroup->id,
+                '/** @var $role \OpenStack\Identity\v3\Models\Role */' => <<<'PHP'
+/** @var $role \OpenStack\Identity\v3\Models\Role */
+if ($role->id === $createdRole->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     * @depends testGrantGroupRole
+     */
+    public function testRevokeGroupRole(Project $createdProject, array $createdRoleAndGroup)
+    {
+        [$createdRole, $createdGroup] = $createdRoleAndGroup;
+
+        $this->assertTrue($createdProject->checkGroupRole(['groupId' => $createdGroup->id, 'roleId' => $createdRole->id]));
+
+        require_once $this->sampleFile(
+            'projects/revoke_group_role.php',
+            [
+                '{id}'      => $createdProject->id,
+                '{groupId}' => $createdGroup->id,
+                '{roleId}'  => $createdRole->id,
+            ]
+        );
+
+        $this->assertFalse($createdProject->checkGroupRole(['groupId' => $createdGroup->id, 'roleId' => $createdRole->id]));
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testGrantUserRole(Project $createdProject): array
+    {
+        $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
+        $role = $this->getService()->createRole(['name' => $this->randomStr()]);
+        $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
+
+        require_once $this->sampleFile(
+            'projects/grant_user_role.php',
+            [
+                '{id}'            => $createdProject->id,
+                '{projectUserId}' => $user->id,
+                '{roleId}'        => $role->id,
+            ]
+        );
+
+        $this->assertTrue($createdProject->checkUserRole(['userId' => $user->id, 'roleId' => $role->id]));
+        return [$role, $user];
+    }
+
+    /**
+     * @depends testAdd
+     * @depends testGrantUserRole
+     */
+    public function testCheckUserRole(Project $createdProject, array $createdRoleAndUser)
+    {
+        [$createdRole, $createdUser] = $createdRoleAndUser;
+
+        /** @var $result bool */
+        require_once $this->sampleFile(
+            'projects/check_user_role.php',
+            [
+                '{id}'            => $createdProject->id,
+                '{projectUserId}' => $createdUser->id,
+                '{roleId}'        => $createdRole->id,
+            ]
+        );
+
+        $this->assertTrue($result);
+    }
+
+    /**
+     * @depends testAdd
+     * @depends testGrantUserRole
+     */
+    public function testListUserRoles(Project $createdProject, array $createdRoleAndUser)
+    {
+        [$createdRole, $createdUser] = $createdRoleAndUser;
+
+        $found = false;
+        require_once $this->sampleFile(
+            'projects/list_user_roles.php',
+            [
+                '{id}'                                                 => $createdProject->id,
+                '{projectUserId}'                                      => $createdUser->id,
+                '/** @var $role \OpenStack\Identity\v3\Models\Role */' => <<<'PHP'
+/** @var $role \OpenStack\Identity\v3\Models\Role */
+if ($role->id === $createdRole->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     * @depends testGrantUserRole
+     */
+    public function testRevokeUserRole(Project $createdProject, array $createdRoleAndUser)
+    {
+        [$createdRole, $createdUser] = $createdRoleAndUser;
+
+        $this->assertTrue($createdProject->checkUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]));
+
+        require_once $this->sampleFile(
+            'projects/revoke_user_role.php',
+            [
+                '{id}'            => $createdProject->id,
+                '{projectUserId}' => $createdUser->id,
+                '{roleId}'        => $createdRole->id,
+            ]
+        );
+
+        $this->assertFalse($createdProject->checkUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]));
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testUpdate(Project $createdProject)
+    {
+        $this->assertTrue($createdProject->enabled);
+
+        require_once $this->sampleFile('projects/update_project.php', ['{id}' => $createdProject->id]);
+
+        $createdProject->retrieve();
+        $this->assertFalse($createdProject->enabled);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testDelete(Project $createdProject)
+    {
+        require_once $this->sampleFile('projects/delete_project.php', ['{id}' => $createdProject->id]);
+
+        $found = false;
+        foreach ($this->getService()->listProjects() as $project) {
+            if ($project->id === $createdProject->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+
+        $this->expectException(BadResponseError::class);
+        $createdProject->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/RoleTest.php b/tests/sample/Identity/v3/RoleTest.php
new file mode 100644
index 00000000..059a1b66
--- /dev/null
+++ b/tests/sample/Identity/v3/RoleTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Identity\v3\Models\Role;
+
+class RoleTest extends TestCase
+{
+    public function testAdd(): Role
+    {
+        /** @var $role \OpenStack\Identity\v3\Models\Role */
+        require_once $this->sampleFile('roles/add_role.php', ['{name}' => $this->randomStr()]);
+        $this->assertInstanceOf(Role::class, $role);
+
+        return $role;
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testList(Role $createdRole): void
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'roles/list_roles.php',
+            [
+                '/** @var $role \OpenStack\Identity\v3\Models\Role */' => <<<'PHP'
+/** @var $role \OpenStack\Identity\v3\Models\Role */
+if ($role->id === $createdRole->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testListAssignments(Role $createdRole): void
+    {
+        $createdDomain = $this->getService()->createDomain(['name' => $this->randomStr()]);
+        $createdUser = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $createdDomain->id]);
+
+        $createdDomain->grantUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]);
+
+        $found = false;
+        require_once $this->sampleFile(
+            'roles/list_assignments.php',
+            [
+                '/** @var $assignment \OpenStack\Identity\v3\Models\Assignment */' => <<<'PHP'
+/** @var $assignment \OpenStack\Identity\v3\Models\Assignment */
+if ($assignment->user !== null && $assignment->user->id === $createdUser->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/ServiceTest.php b/tests/sample/Identity/v3/ServiceTest.php
new file mode 100644
index 00000000..48e4d11a
--- /dev/null
+++ b/tests/sample/Identity/v3/ServiceTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Identity\v3\Service;
+
+class ServiceTest extends TestCase
+{
+    public function testAdd(): \OpenStack\Identity\v3\Models\Service
+    {
+        /** @var $service \OpenStack\Identity\v3\Models\Service */
+        require_once $this->sampleFile(
+            'services/add_service.php',
+            [
+                '{serviceName}' => $this->randomStr(),
+                '{serviceType}' => $this->randomStr(),
+            ]
+        );
+        self::assertInstanceOf(\OpenStack\Identity\v3\Models\Service::class, $service);
+
+        return $service;
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testList(\OpenStack\Identity\v3\Models\Service $createdService)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'services/list_services.php',
+            [
+                '/** @var $service \OpenStack\Identity\v3\Models\Service */' => <<<'PHP'
+/** @var $service \OpenStack\Identity\v3\Models\Service */
+if ($service->id === $createdService->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testUpdate(\OpenStack\Identity\v3\Models\Service $createdService)
+    {
+        $newDescription = $this->randomStr();
+
+        require_once $this->sampleFile(
+            'services/update_service.php',
+            [
+                '{serviceId}' => $createdService->id,
+                '{description}' => $newDescription,
+            ]
+        );
+
+        $createdService->retrieve();
+        $this->assertEquals($newDescription, $createdService->description);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testGet(\OpenStack\Identity\v3\Models\Service $createdService)
+    {
+        /** @var $service \OpenStack\Identity\v3\Models\Service */
+        require_once $this->sampleFile(
+            'services/get_service.php',
+            [
+                '{serviceId}' => $createdService->id,
+            ]
+        );
+
+        $this->assertEquals($createdService->id, $service->id);
+        $this->assertEquals($createdService->name, $service->name);
+        $this->assertEquals($createdService->description, $service->description);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testDelete(\OpenStack\Identity\v3\Models\Service $createdService)
+    {
+        require_once $this->sampleFile(
+            'services/delete_service.php',
+            [
+                '{serviceId}' => $createdService->id,
+            ]
+        );
+
+        $found = false;
+        foreach ($this->getService()->listServices() as $service) {
+            if ($service->id === $createdService->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+
+        $this->expectException(BadResponseError::class);
+        $createdService->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/TestCase.php b/tests/sample/Identity/v3/TestCase.php
new file mode 100644
index 00000000..b7c5b17e
--- /dev/null
+++ b/tests/sample/Identity/v3/TestCase.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Identity\v3\Service;
+
+abstract class TestCase extends \OpenStack\Sample\TestCase
+{
+    protected function getService(): Service
+    {
+        return $this->getCachedService(Service::class);
+    }
+
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return parent::sampleFile("Identity/v3/$path", $replacements);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/TokenTest.php b/tests/sample/Identity/v3/TokenTest.php
new file mode 100644
index 00000000..85e8ce8c
--- /dev/null
+++ b/tests/sample/Identity/v3/TokenTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Identity\v3\Models\Token;
+
+class TokenTest extends TestCase
+{
+    public function testUsername(): void
+    {
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        require_once $this->sampleFile('tokens/generate_token_with_username.php');
+        $this->assertInstanceOf(Token::class, $token);
+        $this->assertTrue($token->validate());
+    }
+
+    public function testUserId(): void
+    {
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        require_once $this->sampleFile('tokens/generate_token_with_user_id.php');
+        $this->assertInstanceOf(Token::class, $token);
+        $this->assertTrue($token->validate());
+    }
+
+    public function testScopedToProjectId(): void
+    {
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        require_once $this->sampleFile('tokens/generate_token_scoped_to_project_id.php');
+        $this->assertInstanceOf(Token::class, $token);
+        $this->assertTrue($token->validate());
+    }
+
+    public function testScopedToProjectName(): void
+    {
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        require_once $this->sampleFile('tokens/generate_token_scoped_to_project_name.php');
+        $this->assertInstanceOf(Token::class, $token);
+        $this->assertTrue($token->validate());
+    }
+
+    public function testFromId(): void
+    {
+        $tokenId = $this
+            ->getService()
+            ->generateToken([
+                'user' => [
+                    'id'       => getenv('OS_USER_ID'),
+                    'password' => getenv('OS_PASSWORD'),
+                ],
+            ])
+            ->getId();
+
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        require_once $this->sampleFile('tokens/generate_token_from_id.php', ['{tokenId}' => $tokenId]);
+        $this->assertInstanceOf(Token::class, $token);
+        $this->assertTrue($token->validate());
+
+    }
+
+    public function testRevoke(): void
+    {
+        $token = $this
+            ->getService()
+            ->generateToken([
+                'user' => [
+                    'id'       => getenv('OS_USER_ID'),
+                    'password' => getenv('OS_PASSWORD'),
+                ],
+            ]);
+
+        require_once $this->sampleFile('tokens/revoke_token.php', ['{tokenId}' => $token->id]);
+
+        $this->assertFalse($token->validate());
+    }
+
+}
\ No newline at end of file
diff --git a/tests/sample/Identity/v3/UserTest.php b/tests/sample/Identity/v3/UserTest.php
new file mode 100644
index 00000000..2fabbe46
--- /dev/null
+++ b/tests/sample/Identity/v3/UserTest.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace OpenStack\Sample\Identity\v3;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Identity\v3\Models\User;
+
+class UserTest extends TestCase
+{
+    public function testAdd(): User
+    {
+        $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
+        $project = $this->getService()->createProject(['name' => $this->randomStr(), 'domainId' => $domain->id]);
+
+        /** @var $user \OpenStack\Identity\v3\Models\User */
+        require_once $this->sampleFile(
+            'users/add_user.php',
+            [
+                '{defaultProjectId}' => $project->id,
+                '{description}'      => $this->randomStr(),
+                '{domainId}'         => $domain->id,
+                '{email}'            => 'foo@bar.com',
+                '{enabled}'          => true,
+                '{name}'             => $this->randomStr(),
+                '{userPass}'         => $this->randomStr(),
+            ]
+        );
+        $this->assertInstanceOf(User::class, $user);
+
+        return $user;
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testGet(User $createdUser): void
+    {
+        /** @var $user \OpenStack\Identity\v3\Models\User */
+        require_once $this->sampleFile('users/get_user.php', ['{id}' => $createdUser->id]);
+        $this->assertInstanceOf(User::class, $user);
+
+        $this->assertEquals($createdUser->id, $user->id);
+        $this->assertEquals($createdUser->name, $user->name);
+        $this->assertEquals($createdUser->description, $user->description);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testList(User $createdUser): void
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'users/list_users.php',
+            [
+                '/** @var $user \OpenStack\Identity\v3\Models\User */' => <<<'PHP'
+/** @var $user \OpenStack\Identity\v3\Models\User */
+if ($user->id === $createdUser->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testListGroups(User $createdUser): void
+    {
+        $createdGroup = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $createdUser->domainId]);
+        $createdGroup->addUser(['userId' => $createdUser->id]);
+
+        $found = false;
+        require_once $this->sampleFile(
+            'users/list_groups.php',
+            [
+                '{id}' => $createdUser->id,
+                '/** @var $group \OpenStack\Identity\v3\Models\Group */' => <<<'PHP'
+/** @var $group \OpenStack\Identity\v3\Models\Group */
+if ($group->id === $createdGroup->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testListProjects(User $createdUser): void
+    {
+        $createdRole = $this->getService()->createRole(['name' => $this->randomStr()]);
+
+        $createdProject = $this->getService()->createProject(['name' => $this->randomStr(), 'domainId' => $createdUser->domainId]);
+        $createdProject->grantUserRole(['userId' => $createdUser->id, 'roleId' => $createdRole->id]);
+
+        $found = false;
+        require_once $this->sampleFile(
+            'users/list_projects.php',
+            [
+                '{id}' => $createdUser->id,
+                '/** @var $project \OpenStack\Identity\v3\Models\Project */' => <<<'PHP'
+/** @var $project \OpenStack\Identity\v3\Models\Project */
+if ($project->id === $createdProject->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testUpdate(User $createdUser): void
+    {
+        $newName = $this->randomStr();
+        $newDescription = $this->randomStr();
+
+        require_once $this->sampleFile(
+            'users/update_user.php',
+            [
+                '{id}'          => $createdUser->id,
+                '{name}'        => $newName,
+                '{description}' => $newDescription,
+            ]
+        );
+
+        $createdUser->retrieve();
+
+        $this->assertEquals($newName, $createdUser->name);
+        $this->assertEquals($newDescription, $createdUser->description);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testDelete(User $createdUser): void
+    {
+        require_once $this->sampleFile('users/delete_user.php', ['{id}' => $createdUser->id]);
+
+        $found = false;
+        foreach ($this->getService()->listUsers() as $user) {
+            if ($user->id === $createdUser->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+
+        $this->expectException(BadResponseError::class);
+        $createdUser->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Images/v2/ImageTest.php b/tests/sample/Images/v2/ImageTest.php
new file mode 100644
index 00000000..f8b583eb
--- /dev/null
+++ b/tests/sample/Images/v2/ImageTest.php
@@ -0,0 +1,192 @@
+<?php
+
+namespace OpenStack\Sample\Images\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Images\v2\Models\Image;
+
+class ImageTest extends TestCase
+{
+
+    public function testCreate(): Image
+    {
+        /** @var Image $image */
+
+        require_once $this->sampleFile(
+            'images/create.php',
+            [
+                '{name}'            => $this->randomStr(),
+                '{tag1}'            => 'ubuntu',
+                '{tag2}'            => 'test',
+                '{containerFormat}' => 'bare',
+                '{diskFormat}'      => 'qcow2',
+                '{visibility}'      => 'private',
+            ]
+        );
+        $this->assertInstanceOf(Image::class, $image);
+
+        return $image;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Image $createdImage)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'images/list.php',
+            [
+                '{imageId}'                                            => $createdImage->id,
+                '/** @var \OpenStack\Images\v2\Models\Image $image */' => <<<'PHP'
+/** @var \OpenStack\Images\v2\Models\Image $image */
+if ($image->id === $createdImage->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Image $createdImage)
+    {
+        /** @var Image $image */
+        require_once $this->sampleFile(
+            'images/get.php',
+            [
+                '{imageId}' => $createdImage->id,
+            ]
+        );
+        $this->assertInstanceOf(Image::class, $image);
+        $this->assertEquals($createdImage->id, $image->id);
+        $this->assertEquals($createdImage->name, $image->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Image $createdImage)
+    {
+        $newName = $this->randomStr();
+
+        /** @var Image $image */
+        require_once $this->sampleFile(
+            'images/update.php',
+            [
+                '{imageId}'    => $createdImage->id,
+                '{name}'       => $newName,
+                '{visibility}' => 'private',
+            ]
+        );
+        $this->assertInstanceOf(Image::class, $image);
+        $this->assertEquals($newName, $image->name);
+        $this->assertEquals('private', $image->visibility);
+
+        $createdImage->retrieve();
+        $this->assertEquals($newName, $createdImage->name);
+        $this->assertEquals('private', $createdImage->visibility);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Image $createdImage)
+    {
+        require_once $this->sampleFile(
+            'images/delete.php',
+            [
+                '{imageId}' => $createdImage->id,
+            ]
+        );
+
+        $found = false;
+        foreach ($this->getService()->listImages() as $image) {
+            if ($image->id === $createdImage->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+
+        $this->expectException(BadResponseError::class);
+        $createdImage->retrieve();
+    }
+
+    public function testSortedAsc()
+    {
+        $postfix = $this->randomStr();
+        $names = ['b' . $postfix, 'a' . $postfix, 'c' . $postfix];
+        $createdImages = [];
+        foreach ($names as $name) {
+            $image = $this->getService()->createImage([
+                'name' => $name,
+            ]);
+
+            $createdImages[] = $image;
+        }
+
+        $rightOrder = ['a' . $postfix, 'b' . $postfix, 'c' . $postfix];
+        $i = 0;
+        require_once $this->sampleFile(
+            'images/list_sorted.php',
+            [
+                '{sortKey}' => 'name',
+                '{sortDir}' => 'asc',
+                '/** @var \OpenStack\Images\v2\Models\Image $image */' => <<<'PHP'
+/** @var \OpenStack\Images\v2\Models\Image $image */
+if ($image->name === $rightOrder[$i]) {
+    $i++;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertEquals(3, $i);
+        foreach ($createdImages as $image) {
+            $image->delete();
+        }
+    }
+
+    public function testSortedDesc()
+    {
+        $postfix = $this->randomStr();
+        $names = ['b' . $postfix, 'a' . $postfix, 'c' . $postfix];
+        $createdImages = [];
+        foreach ($names as $name) {
+            $image = $this->getService()->createImage([
+                'name' => $name,
+            ]);
+
+            $createdImages[] = $image;
+        }
+
+        $rightOrder = ['c' . $postfix, 'b' . $postfix, 'a' . $postfix];
+        $i = 0;
+        require_once $this->sampleFile(
+            'images/list_sorted.php',
+            [
+                '{sortKey}' => 'name',
+                '{sortDir}' => 'desc',
+                '/** @var \OpenStack\Images\v2\Models\Image $image */' => <<<'PHP'
+/** @var \OpenStack\Images\v2\Models\Image $image */
+if ($image->name === $rightOrder[$i]) {
+    $i++;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertEquals(3, $i);
+        foreach ($createdImages as $image) {
+            $image->delete();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Images/v2/MemberTest.php b/tests/sample/Images/v2/MemberTest.php
new file mode 100644
index 00000000..0ebd10f6
--- /dev/null
+++ b/tests/sample/Images/v2/MemberTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace OpenStack\Sample\Images\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Images\v2\Models\Image;
+use OpenStack\Images\v2\Models\Member;
+
+class MemberTest extends TestCase
+{
+    public function testAdd(): Member
+    {
+        $image = $this->getService()->createImage([
+            'name'            => $this->randomStr(),
+            'containerFormat' => 'bare',
+            'diskFormat'      => 'qcow2',
+            'visibility'      => 'shared',
+        ]);
+
+        /** @var Member $member */
+        require_once $this->sampleFile('members/add.php', ['{imageId}' => $image->id,]);
+        $this->assertInstanceOf(Member::class, $member);
+
+        return $member;
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testUpdateStatus(Member $createdMember)
+    {
+        $this->assertEquals(Member::STATUS_PENDING, $createdMember->status);
+
+        require_once $this->sampleFile('members/update_status.php', [
+            '{imageId}' => $createdMember->imageId,
+            '{memberId}' => $createdMember->id,
+        ]);
+
+        $createdMember->retrieve();
+        $this->assertEquals(Member::STATUS_ACCEPTED, $createdMember->status);
+    }
+
+    /**
+     * @depends testAdd
+     */
+    public function testDelete(Member $createdMember)
+    {
+        $image = $this->getService()->getImage($createdMember->imageId);
+
+        require_once $this->sampleFile('members/delete.php', [
+            '{imageId}' => $createdMember->imageId,
+            '{memberId}' => $createdMember->id,
+        ]);
+
+        $found = false;
+        foreach ($image->listMembers() as $member) {
+            if ($member->id === $createdMember->id) {
+                $found = true;
+            }
+        }
+
+        $this->assertFalse($found);
+        $image->delete();
+
+        $this->expectException(BadResponseError::class);
+        $createdMember->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Images/v2/TestCase.php b/tests/sample/Images/v2/TestCase.php
new file mode 100644
index 00000000..e9915a81
--- /dev/null
+++ b/tests/sample/Images/v2/TestCase.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace OpenStack\Sample\Images\v2;
+
+
+use OpenStack\Images\v2\Service;
+
+abstract class TestCase extends \OpenStack\Sample\TestCase
+{
+    protected function getService(): Service
+    {
+        return $this->getCachedService(Service::class);
+    }
+
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return parent::sampleFile("Images/v2/$path", $replacements);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Networking/v2/FloatingIpData.php b/tests/sample/Networking/v2/FloatingIpData.php
new file mode 100644
index 00000000..fd1a5d0a
--- /dev/null
+++ b/tests/sample/Networking/v2/FloatingIpData.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace OpenStack\Sample\Networking\v2;
+
+use OpenStack\Networking\v2\Service;
+
+class FloatingIpData
+{
+    /** @var \OpenStack\Networking\v2\Models\Network */
+    public $externalNetwork;
+
+    /** @var \OpenStack\Networking\v2\Models\Subnet */
+    public $externalSubnet;
+
+    /** @var \OpenStack\Networking\v2\Models\Network */
+    public $internalNetwork;
+
+    /** @var \OpenStack\Networking\v2\Models\Subnet */
+    public $internalSubnet;
+
+    /** @var \OpenStack\Networking\v2\Models\Port */
+    public $port;
+
+    /** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\Router */
+    public $router;
+
+    /** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp */
+    public $floatingIp;
+}
\ No newline at end of file
diff --git a/tests/sample/Networking/v2/FloatingIpTest.php b/tests/sample/Networking/v2/FloatingIpTest.php
new file mode 100644
index 00000000..74084635
--- /dev/null
+++ b/tests/sample/Networking/v2/FloatingIpTest.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace OpenStack\Sample\Networking\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp;
+use OpenStack\Networking\v2\Models\Port;
+use OpenStack\Networking\v2\Models\Subnet;
+
+class FloatingIpTest extends TestCase
+{
+    private function findSubnetIp(Port $port, Subnet $subnet): string
+    {
+        foreach ($port->fixedIps as $fixedIp) {
+            if ($fixedIp['subnet_id'] == $subnet->id) {
+                return $fixedIp['ip_address'];
+            }
+        }
+
+        throw new \RuntimeException("Unable to find IP address for port {$port->id} on subnet {$subnet->id}");
+    }
+
+    public function testCreate(): FloatingIpData
+    {
+        $data = new FloatingIpData();
+        $data->externalNetwork = $this->getService()->createNetwork([
+            'name'             => $this->randomStr(),
+            'routerAccessible' => true,
+        ]);
+        $data->externalSubnet = $this->getService()->createSubnet([
+            'networkId' => $data->externalNetwork->id,
+            'name'      => $this->randomStr(),
+            'ipVersion' => 4,
+            'cidr'      => '10.0.0.0/24',
+        ]);
+
+        $data->internalNetwork = $this->getService()->createNetwork([
+            'name'             => $this->randomStr(),
+            'routerAccessible' => false,
+        ]);
+        $data->internalSubnet = $this->getService()->createSubnet([
+            'networkId' => $data->internalNetwork->id,
+            'name'      => $this->randomStr(),
+            'ipVersion' => 4,
+            'cidr'      => '192.168.199.0/24',
+        ]);
+
+
+        $data->externalNetwork->waitUntilActive();
+        $data->internalNetwork->waitUntilActive();
+
+        $data->router = $this->getServiceLayer3()->createRouter([
+            'name'                => $this->randomStr(),
+            'externalGatewayInfo' => [
+                'networkId'  => $data->externalNetwork->id,
+                'enableSnat' => true,
+            ],
+        ]);
+        $data->router->addInterface(['subnetId' => $data->internalSubnet->id]);
+
+        $data->port = $this->getService()->createPort([
+            'networkId' => $data->internalNetwork->id,
+            'name'      => $this->randomStr(),
+        ]);
+        $fixedIp = $this->findSubnetIp($data->port, $data->internalSubnet);
+
+        /** @var FloatingIp $floatingIp */
+        require_once $this->sampleFile('floatingIPs/create.php', [
+            '{networkId}'      => $data->externalNetwork->id,
+            '{portId}'         => $data->port->id,
+            '{fixedIpAddress}' => $fixedIp,
+        ]);
+        $this->assertInstanceOf(FloatingIp::class, $floatingIp);
+        $this->assertEquals($data->externalNetwork->id, $floatingIp->floatingNetworkId);
+        $this->assertEquals($data->port->id, $floatingIp->portId);
+
+        $data->floatingIp = $floatingIp;
+
+        /*
+        $port->delete();
+        $router->delete();
+        $internalSubnet->delete();
+        $internalNetwork->delete();
+        $externalSubnet->delete();
+        $externalNetwork->delete();
+        */
+
+        return $data;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(FloatingIpData $data)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'floatingIPs/list.php',
+            [
+                '/** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $floatingIp */' => <<<'PHP'
+/** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $floatingIp */
+if ($floatingIp->id == $data->floatingIp->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(FloatingIpData $data)
+    {
+        /** @var FloatingIp $floatingIp */
+        require_once $this->sampleFile('floatingIPs/get.php', [
+            '{id}' => $data->floatingIp->id,
+        ]);
+        $this->assertInstanceOf(FloatingIp::class, $floatingIp);
+        $this->assertEquals($data->floatingIp->id, $floatingIp->id);
+        $this->assertEmpty($floatingIp->portId);
+
+        $floatingIp->retrieve();
+        $this->assertEquals($data->floatingIp->portId, $floatingIp->portId);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(FloatingIpData $data)
+    {
+        $newPort = $this->getService()->createPort([
+            'networkId' => $data->internalNetwork->id,
+            'name'      => $this->randomStr(),
+        ]);
+
+        $this->assertNotEquals($newPort->id, $data->port->id);
+
+        require_once $this->sampleFile('floatingIPs/update.php', [
+            '{id}'            => $data->floatingIp->id,
+            '{newPortId}'     => $newPort->id,
+        ]);
+
+        $data->floatingIp->retrieve();
+        $this->assertEquals($newPort->id, $data->floatingIp->portId);
+
+        $data->port->delete();
+        $data->port = $newPort;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(FloatingIpData $data)
+    {
+        require_once $this->sampleFile('floatingIPs/delete.php', [
+            '{id}' => $data->floatingIp->id,
+        ]);
+
+        foreach ($this->getServiceLayer3()->listFloatingIps() as $floatingIp) {
+            if ($floatingIp->id == $data->floatingIp->id) {
+                $this->fail('Floating IP still exists');
+            }
+        }
+
+        $data->router->removeInterface(['subnetId' => $data->internalSubnet->id]);
+        $data->router->delete();
+        $data->router->waitUntilDeleted();
+
+        $data->port->delete();
+        $data->internalSubnet->delete();
+        $data->internalNetwork->delete();
+        $data->externalSubnet->delete();
+        $data->externalNetwork->delete();
+
+        $this->expectException(BadResponseError::class);
+        $data->floatingIp->retrieve();
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/tests/sample/Networking/v2/NetworkTest.php b/tests/sample/Networking/v2/NetworkTest.php
new file mode 100644
index 00000000..5b360f0d
--- /dev/null
+++ b/tests/sample/Networking/v2/NetworkTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace OpenStack\Sample\Networking\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Networking\v2\Models\Network;
+
+class NetworkTest extends TestCase
+{
+    public function testCreateBatch()
+    {
+        /** @var Network[] $networks */
+        require_once $this->sampleFile('networks/create_batch.php', [
+            '{networkName1}' => $this->randomStr(),
+            '{networkName2}' => $this->randomStr(),
+        ]);
+
+        foreach ($networks as $network) {
+            $this->assertInstanceOf(Network::class, $network);
+            $this->assertNotEmpty($network->id);
+
+            $this->getService()->getNetwork($network->id)->delete();
+        }
+    }
+
+    public function testCreate(): Network
+    {
+        /** @var \OpenStack\Networking\v2\Models\Network $network */
+        require_once $this->sampleFile('networks/create.php', ['{networkName}' => $this->randomStr()]);
+
+        $this->assertInstanceOf(Network::class, $network);
+        $this->assertNotEmpty($network->id);
+
+        return $network;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Network $createdNetwork)
+    {
+        $newName = $this->randomStr();
+
+        require_once $this->sampleFile('networks/update.php', [
+            '{networkId}' => $createdNetwork->id,
+            '{newName}' => $newName,
+        ]);
+
+        $createdNetwork->retrieve();
+        $this->assertEquals($newName, $createdNetwork->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testRetrieve(Network $createdNetwork)
+    {
+        /** @var \OpenStack\Networking\v2\Models\Network $network */
+        require_once $this->sampleFile('networks/get.php', ['{networkId}' => $createdNetwork->id]);
+
+        $this->assertInstanceOf(Network::class, $network);
+        $this->assertEquals($createdNetwork->id, $network->id);
+        $this->assertEquals($createdNetwork->name, $network->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Network $createdNetwork)
+    {
+        require_once $this->sampleFile('networks/delete.php', ['{networkId}' => $createdNetwork->id]);
+
+        foreach ($this->getService()->listNetworks() as $network) {
+            if ($network->id == $createdNetwork->id) {
+                $this->fail('The network was not deleted');
+            }
+        }
+
+        $this->expectException(BadResponseError::class);
+        $this->getService()->getNetwork($createdNetwork->id)->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Networking/v2/PortTest.php b/tests/sample/Networking/v2/PortTest.php
new file mode 100644
index 00000000..040c4879
--- /dev/null
+++ b/tests/sample/Networking/v2/PortTest.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace OpenStack\Sample\Networking\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Networking\v2\Models\Port;
+
+class PortTest extends TestCase
+{
+    public function testCreateBatch()
+    {
+        $network = $this->getService()->createNetwork(['name' => $this->randomStr()]);
+
+        /** @var Port[] $ports */
+        require_once $this->sampleFile('ports/create_batch.php', [
+            '{name1}'      => $this->randomStr(),
+            '{name2}'      => $this->randomStr(),
+            '{networkId1}' => $network->id,
+            '{networkId2}' => $network->id,
+        ]);
+
+        $this->assertCount(2, $ports);
+        foreach ($ports as $port) {
+            $this->assertInstanceOf(Port::class, $port);
+            $this->assertNotEmpty($port->id);
+
+            $port->delete();
+        }
+        $network->delete();
+    }
+
+    public function testCreatePortWithFixedIps()
+    {
+        $network = $this->getService()->createNetwork(['name' => $this->randomStr()]);
+        $subnet = $this->getService()->createSubnet([
+            'name'      => $this->randomStr(),
+            'networkId' => $network->id,
+            'ipVersion' => 4,
+            'cidr'      => '192.168.199.0/24',
+        ]);
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        require_once $this->sampleFile('ports/create_with_fixed_ips.php', ['{networkId}' => $network->id]);
+
+        $this->assertInstanceOf(Port::class, $port);
+        $this->assertCount(2, $port->fixedIps);
+        $this->assertEquals($subnet->id, $port->fixedIps[0]['subnet_id']);
+        $this->assertEquals('192.168.199.100', $port->fixedIps[0]['ip_address']);
+        $this->assertEquals($subnet->id, $port->fixedIps[1]['subnet_id']);
+        $this->assertEquals('192.168.199.200', $port->fixedIps[1]['ip_address']);
+
+        $port->delete();
+        $subnet->delete();
+        $network->delete();
+    }
+
+    public function testCreate(): Port
+    {
+        $network = $this->getService()->createNetwork(['name' => $this->randomStr()]);
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        require_once $this->sampleFile(
+            'ports/create.php',
+            [
+                '{name}'      => $this->randomStr(),
+                '{networkId}' => $network->id,
+            ]);
+
+        $this->assertInstanceOf(Port::class, $port);
+        $this->assertNotEmpty($port->id);
+
+        return $port;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Port $createdPort)
+    {
+        $found = false;
+        require_once $this->sampleFile(
+            'ports/list.php',
+            [
+                '/** @var \OpenStack\Networking\v2\Models\Port $port */' => <<<'PHP'
+/** @var \OpenStack\Networking\v2\Models\Port $port */
+if ($port->id === $createdPort->id) {
+    $found = true;
+}
+PHP
+                ,
+            ]
+        );
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Port $createdPort)
+    {
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        require_once $this->sampleFile(
+            'ports/get.php',
+            [
+                '{portId}' => $createdPort->id,
+            ]);
+
+        $this->assertInstanceOf(Port::class, $port);
+        $this->assertNotEmpty($port->id);
+        $this->assertEmpty($port->name);
+
+        $port->retrieve();
+        $this->assertNotEmpty($port->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Port $createdPort)
+    {
+        $newName = $this->randomStr();
+
+        require_once $this->sampleFile('ports/update.php', [
+            '{portId}'  => $createdPort->id,
+            '{newName}' => $newName,
+        ]);
+
+        $createdPort->retrieve();
+        $this->assertEquals($newName, $createdPort->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Port $createdPort)
+    {
+        $network = $this->getService()->getNetwork($createdPort->networkId);
+
+        require_once $this->sampleFile('ports/delete.php', [
+            '{portId}' => $createdPort->id,
+        ]);
+
+        foreach ($this->getService()->listPorts() as $port) {
+            if ($port->id === $createdPort->id) {
+                $this->fail('The port was not deleted');
+            }
+        }
+
+        $network->delete();
+
+        $this->expectException(BadResponseError::class);
+        $this->getService()->getSubnet($createdPort->id)->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Networking/v2/SubnetTest.php b/tests/sample/Networking/v2/SubnetTest.php
new file mode 100644
index 00000000..05b55b82
--- /dev/null
+++ b/tests/sample/Networking/v2/SubnetTest.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace OpenStack\Sample\Networking\v2;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Networking\v2\Models\Subnet;
+
+class SubnetTest extends TestCase
+{
+    public function testCreateBatch()
+    {
+        $network = $this->getService()->createNetwork(['name' => $this->randomStr()]);
+
+        /** @var Subnet[] $subnets */
+        require_once $this->sampleFile('subnets/create_batch.php', [
+            '{subnetName1}' => $this->randomStr(),
+            '{subnetName2}' => $this->randomStr(),
+            '{networkId1}'  => $network->id,
+            '{networkId2}'  => $network->id,
+        ]);
+
+        foreach ($subnets as $subnet) {
+            $this->assertInstanceOf(Subnet::class, $subnet);
+            $this->assertNotEmpty($subnet->id);
+
+            $subnet->delete();
+        }
+        $network->delete();
+    }
+
+    public function testCreateWithHostRoute()
+    {
+        $network = $this->getService()->createNetwork(['name' => $this->randomStr()]);
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        require_once $this->sampleFile('subnets/create_with_host_routes.php', [
+            '{subnetName}' => $this->randomStr(),
+            '{networkId}'  => $network->id,
+        ]);
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertNotEmpty($subnet->id);
+
+        $network->delete();
+    }
+
+    public function testCreateWithGatewayIp()
+    {
+        $network = $this->getService()->createNetwork(['name' => $this->randomStr()]);
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        require_once $this->sampleFile('subnets/create_with_gateway_ip.php', [
+            '{subnetName}' => $this->randomStr(),
+            '{networkId}'  => $network->id,
+        ]);
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertNotEmpty($subnet->id);
+        $this->assertEquals('192.168.199.128', $subnet->gatewayIp);
+
+        $subnet->delete();
+        $network->delete();
+    }
+
+    public function testCreate(): Subnet
+    {
+        $network = $this->getService()->createNetwork(['name' => $this->randomStr()]);
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        require_once $this->sampleFile(
+            'subnets/create.php',
+            [
+                '{subnetName}' => $this->randomStr(),
+                '{networkId}'  => $network->id,
+            ]
+        );
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertNotEmpty($subnet->id);
+
+        return $subnet;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testUpdate(Subnet $createdSubnet)
+    {
+        $newName = $this->randomStr();
+
+        require_once $this->sampleFile('subnets/update.php', [
+            '{subnetId}' => $createdSubnet->id,
+            '{newName}'  => $newName,
+        ]);
+
+        $createdSubnet->retrieve();
+        $this->assertEquals($newName, $createdSubnet->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testRetrieve(Subnet $createdSubnet)
+    {
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        require_once $this->sampleFile('subnets/get.php', ['{subnetId}' => $createdSubnet->id]);
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertEquals($subnet->id, $subnet->id);
+        $this->assertEquals($subnet->name, $subnet->name);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Subnet $createdSubnet)
+    {
+        $network = $this->getService()->getNetwork($createdSubnet->networkId);
+
+        require_once $this->sampleFile('subnets/delete.php', ['{subnetId}' => $createdSubnet->id]);
+
+        foreach ($this->getService()->listSubnets() as $subnet) {
+            if ($subnet->id == $createdSubnet->id) {
+                $this->fail('The deleted subnet still exists');
+            }
+        }
+
+        $network->delete();
+
+        $this->expectException(BadResponseError::class);
+        $this->getService()->getSubnet($createdSubnet->id)->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/Networking/v2/TestCase.php b/tests/sample/Networking/v2/TestCase.php
new file mode 100644
index 00000000..2ac889b3
--- /dev/null
+++ b/tests/sample/Networking/v2/TestCase.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace OpenStack\Sample\Networking\v2;
+
+
+
+use OpenStack\Networking\v2\Service;
+
+abstract class TestCase extends \OpenStack\Sample\TestCase
+{
+    protected function getService(): Service
+    {
+        return $this->getCachedService(Service::class);
+    }
+
+    protected function getServiceLayer3(): \OpenStack\Networking\v2\Extensions\Layer3\Service
+    {
+        return $this->getCachedService(\OpenStack\Networking\v2\Extensions\Layer3\Service::class);
+    }
+
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return parent::sampleFile("Networking/v2/$path", $replacements);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/ObjectStore/v1/AccountTest.php b/tests/sample/ObjectStore/v1/AccountTest.php
new file mode 100644
index 00000000..39eb58aa
--- /dev/null
+++ b/tests/sample/ObjectStore/v1/AccountTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace OpenStack\Sample\ObjectStore\v1;
+
+class AccountTest extends TestCase
+{
+    public function testMergeMetadata()
+    {
+        $fooVal = $this->randomStr();
+        $barVal = $this->randomStr();
+
+        require_once $this->sampleFile('account/merge_metadata.php', [
+            '{key_1}' => 'Foo',
+            '{key_2}' => 'Bar',
+            '{val_1}' => $fooVal,
+            '{val_2}' => $barVal,
+        ]);
+
+        $metadata = $this->getService()->getAccount()->getMetadata();
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertEquals($barVal, $metadata['Bar']);
+    }
+
+    /**
+     * @depends testMergeMetadata
+     */
+    public function testGetMetadata()
+    {
+        /** @var array $metadata */
+        require_once $this->sampleFile('account/get_metadata.php');
+
+        $this->assertArrayHasKey('Foo', $metadata);
+        $this->assertArrayHasKey('Bar', $metadata);
+    }
+
+    /**
+     * @depends testMergeMetadata
+     */
+    public function testResetMetadata()
+    {
+        $fooVal = $this->randomStr();
+        $barVal = $this->randomStr();
+
+        require_once $this->sampleFile('account/reset_metadata.php', [
+            '{key_1}' => 'Foo1',
+            '{key_2}' => 'Bar1',
+            '{val_1}' => $fooVal,
+            '{val_2}' => $barVal,
+        ]);
+
+        $metadata = $this->getService()->getAccount()->getMetadata();
+        $this->assertEquals($fooVal, $metadata['Foo1']);
+        $this->assertEquals($barVal, $metadata['Bar1']);
+        $this->assertArrayNotHasKey('Foo', $metadata);
+        $this->assertArrayNotHasKey('Bar', $metadata);
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/ObjectStore/v1/ContainerTest.php b/tests/sample/ObjectStore/v1/ContainerTest.php
new file mode 100644
index 00000000..426ae3ca
--- /dev/null
+++ b/tests/sample/ObjectStore/v1/ContainerTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace OpenStack\Sample\ObjectStore\v1;
+
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\ObjectStore\v1\Models\Container;
+
+class ContainerTest extends TestCase
+{
+    public function testCreate(): Container
+    {
+        $containerName = $this->randomStr();
+
+        /** @var \OpenStack\ObjectStore\v1\Models\Container $container */
+        require_once $this->sampleFile('containers/create.php', ['{containerName}' => $containerName]);
+
+        $this->assertInstanceOf(Container::class, $container);
+
+        return $container;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(Container $createdContainer)
+    {
+        /** @var \OpenStack\ObjectStore\v1\Models\Container $container */
+        require_once $this->sampleFile('containers/get.php', ['{containerName}' => $createdContainer->name]);
+
+        $this->assertInstanceOf(Container::class, $container);
+        $this->assertEquals($createdContainer->name, $container->name);
+        $this->assertEquals([], $container->metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(Container $createdContainer)
+    {
+        $found = false;
+        require_once $this->sampleFile('containers/list.php', [
+            '/** @var \OpenStack\ObjectStore\v1\Models\Container $container */' => <<<'PHP'
+/** @var \OpenStack\ObjectStore\v1\Models\Container $container */
+if ($container->name === $createdContainer->name) {
+    $found = true;
+}
+PHP
+            ,
+        ]);
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testMergeMetadata(Container $createdContainer)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+        $barVal = $this->randomStr();
+
+        $createdContainer->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile('containers/merge_metadata.php', [
+            '{key_1}' => 'Foo',
+            '{key_2}' => 'Bar',
+            '{val_1}' => $fooVal,
+            '{val_2}' => $barVal,
+            '{containerName}' => $createdContainer->name,
+        ]);
+
+        $metadata = $createdContainer->getMetadata();
+        $this->assertEquals($initVal, $metadata['Init']);
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertEquals($barVal, $metadata['Bar']);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testMergeMetadata
+     */
+    public function testGetMetadata(Container $createdContainer)
+    {
+        /** @var array $metadata */
+        require_once $this->sampleFile('containers/get_metadata.php', ['{containerName}' => $createdContainer->name]);
+
+        $this->assertArrayHasKey('Init', $metadata);
+        $this->assertArrayHasKey('Foo', $metadata);
+        $this->assertArrayHasKey('Bar', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testResetMetadata(Container $createdContainer)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+        $barVal = $this->randomStr();
+
+        $createdContainer->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile('containers/reset_metadata.php', [
+            '{key_1}' => 'Foo',
+            '{key_2}' => 'Bar',
+            '{val_1}' => $fooVal,
+            '{val_2}' => $barVal,
+            '{containerName}' => $createdContainer->name,
+        ]);
+
+        $metadata = $createdContainer->getMetadata();
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertEquals($barVal, $metadata['Bar']);
+        $this->assertArrayNotHasKey('Init', $metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(Container $createdContainer)
+    {
+        require_once $this->sampleFile('containers/delete.php', ['{containerName}' => $createdContainer->name]);
+
+        foreach ($this->getService()->listContainers() as $container) {
+            if ($container->name === $createdContainer->name) {
+                $this->fail('Container still exists');
+            }
+        }
+
+        $this->expectException(BadResponseError::class);
+        $createdContainer->retrieve();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/ObjectStore/v1/ObjectTest.php b/tests/sample/ObjectStore/v1/ObjectTest.php
new file mode 100644
index 00000000..731490af
--- /dev/null
+++ b/tests/sample/ObjectStore/v1/ObjectTest.php
@@ -0,0 +1,227 @@
+<?php
+
+namespace OpenStack\Sample\ObjectStore\v1;
+
+use OpenStack\ObjectStore\v1\Models\StorageObject;
+use Psr\Http\Message\StreamInterface;
+
+class ObjectTest extends TestCase
+{
+    public function testCreate(): StorageObject
+    {
+        $containerName = $this->randomStr();
+        $objectName = $this->randomStr();
+
+        $this->getService()->createContainer(['name' => $containerName]);
+
+        /** @var StorageObject $object */
+        require_once $this->sampleFile('objects/create.php', [
+            '{containerName}' => $containerName,
+            '{objectName}' => $objectName,
+            '{objectContent}' => str_repeat('A', 1000),
+        ]);
+
+        $this->assertInstanceOf(StorageObject::class, $object);
+
+        return $object;
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testCheckExists(StorageObject $createdObject)
+    {
+        /** @var bool $exists */
+        require_once $this->sampleFile('objects/check_exists.php', [
+            '{containerName}' => $createdObject->containerName,
+            '{objectName}' => $createdObject->name,
+        ]);
+
+        $this->assertTrue($exists);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testCopy(StorageObject $createdObject)
+    {
+        $newName = $this->randomStr();
+        $container = $this->getService()->getContainer($createdObject->containerName);
+
+        $this->assertFalse($container->objectExists($newName));
+
+        require_once $this->sampleFile('objects/copy.php', [
+            '{containerName}' => $container->name,
+            '{objectName}' => $createdObject->name,
+            '{newContainerName}' => $container->name,
+            '{newObjectName}' => $newName,
+        ]);
+
+        $this->assertTrue($container->objectExists($newName));
+        $container->getObject($newName)->delete();
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDownload(StorageObject $createdObject)
+    {
+        /** @var StreamInterface $stream */
+        require_once $this->sampleFile('objects/download.php', [
+            '{containerName}' => $createdObject->containerName,
+            '{objectName}' => $createdObject->name,
+        ]);
+        $this->assertInstanceOf(StreamInterface::class, $stream);
+        $this->assertEquals(1000, $stream->getSize());
+        $this->assertEquals(str_repeat('A', 1000), $stream->getContents());
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDownloadStream(StorageObject $createdObject)
+    {
+        /** @var StreamInterface $stream */
+        require_once $this->sampleFile('objects/download_stream.php', [
+            '{containerName}' => $createdObject->containerName,
+            '{objectName}' => $createdObject->name,
+        ]);
+        $this->assertInstanceOf(StreamInterface::class, $stream);
+        $this->assertNull($stream->getSize());
+
+        $body = '';
+        while (!$stream->eof()) {
+            $body .= $stream->read(64);
+        }
+        $this->assertEquals(str_repeat('A', 1000), $body);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testGet(StorageObject $createdObject)
+    {
+        /** @var StorageObject $object */
+        require_once $this->sampleFile('objects/get.php', [
+            '{containerName}' => $createdObject->containerName,
+            '{objectName}' => $createdObject->name,
+        ]);
+
+        $this->assertInstanceOf(StorageObject::class, $object);
+        $this->assertEquals($createdObject->name, $object->name);
+        $this->assertEquals(null, $object->metadata);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testList(StorageObject $createdObject)
+    {
+        $found = false;
+        require_once $this->sampleFile('objects/list.php', [
+            '/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */' => <<<'PHP'
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
+if ($object->name === $createdObject->name) {
+    $found = true;
+}
+PHP
+            ,
+            '{containerName}' => $createdObject->containerName,
+        ]);
+
+        $this->assertTrue($found);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testMergeMetadata(StorageObject $createdObject)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+        $barVal = $this->randomStr();
+
+        $createdObject->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'objects/merge_metadata.php',
+            [
+                '{containerName}' => $createdObject->containerName,
+                '{objectName}' => $createdObject->name,
+                '{key_1}' => 'Foo',
+                '{val_1}' => $fooVal,
+                '{key_2}' => 'Bar',
+                '{val_2}' => $barVal,
+            ]
+        );
+
+        $metadata = $createdObject->getMetadata();
+        $this->assertEquals($initVal, $metadata['Init']);
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertEquals($barVal, $metadata['Bar']);
+    }
+
+    /**
+     * @depends testCreate
+     * @depends testMergeMetadata
+     */
+    public function testGetMetadata(StorageObject $createdObject)
+    {
+        /** @var array $metadata */
+        require_once $this->sampleFile('objects/get_metadata.php', [
+            '{containerName}' => $createdObject->containerName,
+            '{objectName}' => $createdObject->name,
+        ]);
+
+        $createdObject->retrieve();
+
+        $this->assertEquals($createdObject->metadata['Init'], $metadata['Init']);
+        $this->assertEquals($createdObject->metadata['Foo'], $metadata['Foo']);
+        $this->assertEquals($createdObject->metadata['Bar'], $metadata['Bar']);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testResetMetadata(StorageObject $createdObject)
+    {
+        $initVal = $this->randomStr();
+        $fooVal = $this->randomStr();
+        $barVal = $this->randomStr();
+
+        $createdObject->mergeMetadata(['Init' => $initVal]);
+
+        require_once $this->sampleFile(
+            'objects/reset_metadata.php',
+            [
+                '{containerName}' => $createdObject->containerName,
+                '{objectName}' => $createdObject->name,
+                '{key_1}' => 'Foo',
+                '{val_1}' => $fooVal,
+                '{key_2}' => 'Bar',
+                '{val_2}' => $barVal,
+            ]
+        );
+
+        $metadata = $createdObject->getMetadata();
+        $this->assertArrayNotHasKey('Init', $metadata);
+        $this->assertEquals($fooVal, $metadata['Foo']);
+        $this->assertEquals($barVal, $metadata['Bar']);
+    }
+
+    /**
+     * @depends testCreate
+     */
+    public function testDelete(StorageObject $createdObject)
+    {
+        $container = $this->getService()->getContainer($createdObject->containerName);
+
+        require_once $this->sampleFile('objects/delete.php', [
+            '{containerName}' => $createdObject->containerName,
+            '{objectName}' => $createdObject->name,
+        ]);
+
+        $this->assertFalse($container->objectExists($createdObject->name));
+        $container->delete();
+    }
+}
\ No newline at end of file
diff --git a/tests/sample/ObjectStore/v1/TestCase.php b/tests/sample/ObjectStore/v1/TestCase.php
new file mode 100644
index 00000000..52312b84
--- /dev/null
+++ b/tests/sample/ObjectStore/v1/TestCase.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace OpenStack\Sample\ObjectStore\v1;
+
+
+use OpenStack\ObjectStore\v1\Service;
+
+abstract class TestCase extends \OpenStack\Sample\TestCase
+{
+    protected function getService(): Service
+    {
+        return $this->getCachedService(Service::class);
+    }
+
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return parent::sampleFile("ObjectStore/v1/$path", $replacements);
+    }
+}
\ No newline at end of file
diff --git a/tests/integration/SampleManager.php b/tests/sample/SampleManager.php
similarity index 75%
rename from tests/integration/SampleManager.php
rename to tests/sample/SampleManager.php
index 14998109..585c84b0 100644
--- a/tests/integration/SampleManager.php
+++ b/tests/sample/SampleManager.php
@@ -1,8 +1,11 @@
 <?php
 
-namespace OpenStack\Integration;
+namespace OpenStack\Sample;
 
-class SampleManager implements SampleManagerInterface
+use OpenStack\Integration\SampleManagerInterface;
+use RuntimeException;
+
+class SampleManager
 {
     protected $basePath;
     protected $paths = [];
@@ -14,7 +17,7 @@ public function __construct($basePath, $verbosity)
         $this->verbosity = $verbosity;
     }
 
-    public function deletePaths()
+    public function deletePaths(): void
     {
         if (!empty($this->paths)) {
             foreach ($this->paths as $path) {
@@ -23,7 +26,7 @@ public function deletePaths()
         }
     }
 
-    protected function getGlobalReplacements()
+    protected function getGlobalReplacements(): array
     {
         return [
             '{userId}'      => getenv('OS_USER_ID'),
@@ -38,17 +41,16 @@ protected function getGlobalReplacements()
         ];
     }
 
-    public function getConnectionStr()
+    public function getConnectionStr(): string
     {
         return str_replace('$openstack =', 'return', $this->getConnectionTemplate());
     }
 
-    protected function getConnectionTemplate()
+    protected function getConnectionTemplate(): string
     {
         if ($this->verbosity === 1) {
             $subst = <<<'EOL'
-use OpenStack\Integration\DefaultLogger;
-use OpenStack\Integration\Utils;
+use OpenStack\Sample\DefaultLogger;
 use GuzzleHttp\MessageFormatter;
 
 $options = [
@@ -56,12 +58,11 @@ protected function getConnectionTemplate()
     'logger'           => new DefaultLogger(),
     'messageFormatter' => new MessageFormatter(),
 ];
-$openstack = new OpenStack\OpenStack(Utils::getAuthOpts($options));
+$openstack = $this->getOpenStack($options);
 EOL;
         } elseif ($this->verbosity === 2) {
             $subst = <<<'EOL'
-use OpenStack\Integration\DefaultLogger;
-use OpenStack\Integration\Utils;
+use OpenStack\Sample\DefaultLogger;
 use GuzzleHttp\MessageFormatter;
 
 $options = [
@@ -69,31 +70,31 @@ protected function getConnectionTemplate()
     'logger'           => new DefaultLogger(),
     'messageFormatter' => new MessageFormatter(MessageFormatter::DEBUG),
 ];
-$openstack = new OpenStack\OpenStack(Utils::getAuthOpts($options));
+$openstack = $this->getOpenStack($options);
 EOL;
         } else {
             $subst = <<<'EOL'
 use OpenStack\Integration\Utils;
 
-$openstack = new OpenStack\OpenStack(Utils::getAuthOpts());
+$openstack = $this->getOpenStack();
 EOL;
         }
 
         return $subst;
     }
 
-    public function write($path, array $replacements)
+    public function write(string $path, array $replacements): string
     {
         $replacements = array_merge($this->getGlobalReplacements(), $replacements);
 
         $sampleFile = rtrim($this->basePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $path;
 
         if (!file_exists($sampleFile)) {
-            throw new \RuntimeException(sprintf("%s does not exist", $sampleFile));
+            throw new RuntimeException(sprintf("%s does not exist", $sampleFile));
         }
 
         if(!is_readable($sampleFile)) {
-            throw new \RuntimeException(sprintf("%s is not readable", $sampleFile));
+            throw new RuntimeException(sprintf("%s is not readable", $sampleFile));
         }
 
         $content = strtr(file_get_contents($sampleFile), $replacements);
diff --git a/tests/sample/TestCase.php b/tests/sample/TestCase.php
new file mode 100644
index 00000000..19d49479
--- /dev/null
+++ b/tests/sample/TestCase.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace OpenStack\Sample;
+
+use InvalidArgumentException;
+use OpenStack\Common\Service\AbstractService;
+use OpenStack\OpenStack;
+
+abstract class TestCase extends \PHPUnit\Framework\TestCase
+{
+    private $namePrefix = 'phptest_';
+
+    /** @var \OpenStack\Sample\SampleManager  */
+    protected $sampleManager;
+
+    /** @var array<string, \OpenStack\Common\Service\AbstractService> */
+    protected $cachedServices = [];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->sampleManager = new SampleManager(
+            __DIR__ . '/../../samples',
+            intval(getenv('SAMPLE_VERBOSITY'))
+        );
+    }
+
+    protected function getOpenStack(array $options = []): OpenStack
+    {
+        return new OpenStack($this->getAuthOpts($options));
+    }
+
+    /**
+     * @param class-string<T> $serviceType
+     * @return T
+     * @template T of \OpenStack\Common\Service\AbstractService
+     *
+     * @noinspection PhpFullyQualifiedNameUsageInspection
+     */
+    protected function getCachedService(string $serviceType): AbstractService
+    {
+        if (isset($this->cachedServices[$serviceType])) {
+            return $this->cachedServices[$serviceType];
+        }
+
+        switch ($serviceType) {
+            case \OpenStack\BlockStorage\v2\Service::class:
+                $service = $this->getOpenStack()->blockStorageV2();
+                break;
+            case \OpenStack\BlockStorage\v3\Service::class:
+                $service = $this->getOpenStack()->blockStorageV3();
+                break;
+            case \OpenStack\Compute\v2\Service::class:
+                $service = $this->getOpenStack()->computeV2();
+                break;
+            case \OpenStack\Identity\v2\Service::class:
+                $service = $this->getOpenStack()->identityV2();
+                break;
+            case \OpenStack\Identity\v3\Service::class:
+                $service = $this->getOpenStack()->identityV3();
+                break;
+            case \OpenStack\Images\v2\Service::class:
+                $service = $this->getOpenStack()->imagesV2();
+                break;
+            case \OpenStack\Networking\v2\Service::class:
+                $service = $this->getOpenStack()->networkingV2();
+                break;
+            case \OpenStack\Networking\v2\Extensions\Layer3\Service::class:
+                $service = $this->getOpenStack()->networkingV2ExtLayer3();
+                break;
+            case \OpenStack\Networking\v2\Extensions\SecurityGroups\Service::class:
+                $service = $this->getOpenStack()->networkingV2ExtSecGroups();
+                break;
+            case \OpenStack\ObjectStore\v1\Service::class:
+                $service = $this->getOpenStack()->objectStoreV1();
+                break;
+            default:
+                throw new InvalidArgumentException("Unknown service type: $serviceType");
+        }
+
+        $this->cachedServices[$serviceType] = $service;
+
+        return $this->cachedServices[$serviceType];
+    }
+
+    protected function getAuthOpts(array $options = []): array
+    {
+        return array_merge(
+            [
+                'authUrl' => getenv('OS_AUTH_URL'),
+                'region'  => getenv('OS_REGION_NAME'),
+                'user'    => [
+                    'id'       => getenv('OS_USER_ID'),
+                    'password' => getenv('OS_PASSWORD'),
+                ],
+                'scope'   => [
+                    'project' => [
+                        'id' => getenv('OS_PROJECT_ID'),
+                    ],
+                ],
+            ],
+            $options
+        );
+    }
+
+    /**
+     * Creates random string
+     */
+    protected function randomStr($length = 5): string
+    {
+        $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $charsLen = strlen($chars);
+
+        $randomString = '';
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $chars[rand(0, $charsLen - 1)];
+        }
+
+        return $this->namePrefix . $randomString;
+    }
+
+    /**
+     * Creates a sample file from a template. It must be included to be executed.
+     */
+    protected function sampleFile(string $path, array $replacements = []): string
+    {
+        return $this->sampleManager->write($path, $replacements);
+    }
+}
\ No newline at end of file

From f5ca4e9d30d2d6dc4511dcf7d3025c88082b5b39 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 17 Jan 2024 14:29:44 +0100
Subject: [PATCH 070/102] License: add full text, remove rackspace (#388)

---
 LICENSE | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 190 insertions(+), 5 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5ddbb84c..f8ff464b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,192 @@
-   Copyright 2012-2016 Rackspace US, Inc.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2016-2023 PHP OpenCloud Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -10,7 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
-
-   All contributions to this repository are covered under the same license,
-   terms, and conditions.
+   limitations under the License.
\ No newline at end of file

From e3515542e573ad036e82d7c44f3c69174ec3796b Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 17 Jan 2024 15:22:34 +0100
Subject: [PATCH 071/102] added bigger rescue timeouts (#390)

---
 tests/sample/Compute/v2/ServerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/sample/Compute/v2/ServerTest.php b/tests/sample/Compute/v2/ServerTest.php
index e1f1c7a4..721e46df 100644
--- a/tests/sample/Compute/v2/ServerTest.php
+++ b/tests/sample/Compute/v2/ServerTest.php
@@ -282,7 +282,7 @@ public function testRescue(Server $createdServer)
             ]
         );
 
-        $createdServer->waitUntil('RESCUE');
+        $createdServer->waitUntil('RESCUE', 120);
         $this->assertEquals('RESCUE', $createdServer->status);
     }
 
@@ -294,7 +294,7 @@ public function testUnrescue(Server $createdServer)
     {
         require_once $this->sampleFile('servers/unrescue_server.php', ['{serverId}' => $createdServer->id]);
 
-        $createdServer->waitUntil('ACTIVE');
+        $createdServer->waitUntil('ACTIVE', 120);
         $this->assertEquals('ACTIVE', $createdServer->status);
     }
 

From f3b3c6f7f9ff5259661e06385390bbd3eb2e5cac Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Thu, 18 Jan 2024 15:23:28 +0100
Subject: [PATCH 072/102] return HandlerStack for BC (#391)

* return HandlerStack for Backward Compatibility - https://github.com/php-opencloud/openstack/pull/382
---
 src/Common/Transport/HandlerStack.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/Common/Transport/HandlerStack.php

diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStack.php
new file mode 100644
index 00000000..da28157b
--- /dev/null
+++ b/src/Common/Transport/HandlerStack.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace OpenStack\Common\Transport;
+
+/**
+ * @deprecated use \OpenStack\Common\Transport\HandlerStackFactory instead
+ */
+class HandlerStack
+{
+    public static function create(callable $handler = null): \GuzzleHttp\HandlerStack
+    {
+        return HandlerStackFactory::create($handler);
+    }
+}

From b5d1fc62cdc3db7bbeac9ce24efdfff24f422b07 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sat, 27 Jan 2024 16:53:11 +0100
Subject: [PATCH 073/102] Merge network services (#392)

* Merge all network service extensions into main one using traits
* Add unit test error_reporting
* Increase volume attachment test timeout
---
 phpunit.sample.xml.dist                       |   2 +-
 phpunit.xml.dist                              |   2 +-
 samples/Networking/v2/floatingIPs/create.php  |   2 +-
 samples/Networking/v2/floatingIPs/delete.php  |   7 +-
 samples/Networking/v2/floatingIPs/get.php     |   2 +-
 samples/Networking/v2/floatingIPs/list.php    |   2 +-
 samples/Networking/v2/floatingIPs/update.php  |   2 +-
 .../v2/securityGroupRules/create.php          |   2 +-
 .../v2/securityGroupRules/delete.php          |   2 +-
 .../Networking/v2/securityGroupRules/get.php  |   2 +-
 .../Networking/v2/securityGroupRules/list.php |   7 +-
 .../Networking/v2/securityGroups/create.php   |   2 +-
 .../Networking/v2/securityGroups/delete.php   |   2 +-
 samples/Networking/v2/securityGroups/get.php  |   2 +-
 samples/Networking/v2/securityGroups/list.php |   2 +-
 src/Common/Service/Builder.php                |   2 -
 src/Networking/v2/Api.php                     |   5 +
 src/Networking/v2/Extensions/Layer3/Api.php   |   5 +
 .../v2/Extensions/Layer3/ApiTrait.php         | 172 ++++++++++++++++++
 .../Extensions/Layer3/Models/FloatingIp.php   |   3 +
 .../v2/Extensions/Layer3/Models/Router.php    |   3 +
 .../v2/Extensions/Layer3/Params.php           |  15 +-
 .../v2/Extensions/Layer3/ParamsTrait.php      | 112 ++++++++++++
 .../v2/Extensions/Layer3/Service.php          |   2 +
 .../v2/Extensions/Layer3/ServiceTrait.php     |  62 +++++++
 .../v2/Extensions/SecurityGroups/Api.php      |   5 +
 .../v2/Extensions/SecurityGroups/ApiTrait.php | 158 ++++++++++++++++
 .../SecurityGroups/Models/SecurityGroup.php   |   3 +
 .../Models/SecurityGroupRule.php              |   3 +
 .../v2/Extensions/SecurityGroups/Params.php   |  25 ++-
 .../Extensions/SecurityGroups/ParamsTrait.php |  97 ++++++++++
 .../v2/Extensions/SecurityGroups/Service.php  |   4 +
 .../SecurityGroups/ServiceTrait.php           |  62 +++++++
 src/Networking/v2/Params.php                  |  14 ++
 src/Networking/v2/Service.php                 |   6 +-
 src/OpenStack.php                             |   4 +
 .../Compute/v2/InterfaceAttachmentTest.php    |   6 +-
 tests/sample/Compute/v2/SecurityGroupTest.php |   2 +-
 tests/sample/Compute/v2/ServerTest.php        |   6 +-
 tests/sample/Compute/v2/TestCase.php          |  12 +-
 .../Compute/v2/VolumeAttachmentTest.php       |   2 +-
 tests/sample/Networking/v2/FloatingIpTest.php |   4 +-
 tests/sample/Networking/v2/TestCase.php       |   5 -
 tests/sample/TestCase.php                     |   6 -
 44 files changed, 780 insertions(+), 65 deletions(-)
 create mode 100644 src/Networking/v2/Extensions/Layer3/ApiTrait.php
 create mode 100644 src/Networking/v2/Extensions/Layer3/ParamsTrait.php
 create mode 100644 src/Networking/v2/Extensions/Layer3/ServiceTrait.php
 create mode 100644 src/Networking/v2/Extensions/SecurityGroups/ApiTrait.php
 create mode 100644 src/Networking/v2/Extensions/SecurityGroups/ParamsTrait.php
 create mode 100644 src/Networking/v2/Extensions/SecurityGroups/ServiceTrait.php

diff --git a/phpunit.sample.xml.dist b/phpunit.sample.xml.dist
index d2048c5f..66bcaecd 100644
--- a/phpunit.sample.xml.dist
+++ b/phpunit.sample.xml.dist
@@ -16,7 +16,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <ini name="error_reporting" value=""/>
+        <ini name="error_reporting" value="-1"/>
         <ini name="display_errors" value="On"/>
         <ini name="display_startup_errors" value="On"/>
     </php>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e77fdd4c..858afeee 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <ini name="error_reporting" value=""/>
+        <ini name="error_reporting" value="-1"/>
         <ini name="display_errors" value="On"/>
         <ini name="display_startup_errors" value="On"/>
     </php>
diff --git a/samples/Networking/v2/floatingIPs/create.php b/samples/Networking/v2/floatingIPs/create.php
index 0880fbdf..0e7aea99 100644
--- a/samples/Networking/v2/floatingIPs/create.php
+++ b/samples/Networking/v2/floatingIPs/create.php
@@ -12,7 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$networking = $openstack->networkingV2ExtLayer3();
+$networking = $openstack->networkingV2();
 
 $floatingIp = $networking->createFloatingIp([
     "floatingNetworkId" => "{networkId}",
diff --git a/samples/Networking/v2/floatingIPs/delete.php b/samples/Networking/v2/floatingIPs/delete.php
index 9bbe8d0a..b3fe53b8 100644
--- a/samples/Networking/v2/floatingIPs/delete.php
+++ b/samples/Networking/v2/floatingIPs/delete.php
@@ -12,6 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$openstack->networkingV2ExtLayer3()
-    ->getFloatingIp('{id}')
-    ->delete();
+$networking = $openstack->networkingV2();
+$floatIp = $networking->getFloatingIp('{id}');
+
+$floatIp->delete();
diff --git a/samples/Networking/v2/floatingIPs/get.php b/samples/Networking/v2/floatingIPs/get.php
index 759a3318..d9c52ed2 100644
--- a/samples/Networking/v2/floatingIPs/get.php
+++ b/samples/Networking/v2/floatingIPs/get.php
@@ -12,5 +12,5 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$floatingIp = $openstack->networkingV2ExtLayer3()
+$floatingIp = $openstack->networkingV2()
     ->getFloatingIp('{id}');
diff --git a/samples/Networking/v2/floatingIPs/list.php b/samples/Networking/v2/floatingIPs/list.php
index 82065d95..498d064a 100644
--- a/samples/Networking/v2/floatingIPs/list.php
+++ b/samples/Networking/v2/floatingIPs/list.php
@@ -12,7 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$floatingIps = $openstack->networkingV2ExtLayer3()
+$floatingIps = $openstack->networkingV2()
     ->listFloatingIps();
 
 foreach ($floatingIps as $floatingIp) {
diff --git a/samples/Networking/v2/floatingIPs/update.php b/samples/Networking/v2/floatingIPs/update.php
index 4813006e..e7bba62e 100644
--- a/samples/Networking/v2/floatingIPs/update.php
+++ b/samples/Networking/v2/floatingIPs/update.php
@@ -12,7 +12,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$floatingIp = $openstack->networkingV2ExtLayer3()
+$floatingIp = $openstack->networkingV2()
     ->getFloatingIp('{id}');
 
 $floatingIp->portId = '{newPortId}';
diff --git a/samples/Networking/v2/securityGroupRules/create.php b/samples/Networking/v2/securityGroupRules/create.php
index 70ac6094..751c0351 100644
--- a/samples/Networking/v2/securityGroupRules/create.php
+++ b/samples/Networking/v2/securityGroupRules/create.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2ExtSecGroups();
+$networking = $openstack->networkingV2();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
 $rule = $networking->createSecurityGroupRule([
diff --git a/samples/Networking/v2/securityGroupRules/delete.php b/samples/Networking/v2/securityGroupRules/delete.php
index 52b56e5f..99521d39 100644
--- a/samples/Networking/v2/securityGroupRules/delete.php
+++ b/samples/Networking/v2/securityGroupRules/delete.php
@@ -13,7 +13,7 @@
 ]);
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
-$rule = $openstack->networkingV2ExtSecGroups()
+$rule = $openstack->networkingV2()
     ->getSecurityGroupRule('{id}');
 
 $rule->delete();
diff --git a/samples/Networking/v2/securityGroupRules/get.php b/samples/Networking/v2/securityGroupRules/get.php
index 085e5acf..8827700d 100644
--- a/samples/Networking/v2/securityGroupRules/get.php
+++ b/samples/Networking/v2/securityGroupRules/get.php
@@ -13,5 +13,5 @@
 ]);
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
-$rule = $openstack->networkingV2ExtSecGroups()
+$rule = $openstack->networkingV2()
     ->getSecurityGroupRule('{id}');
diff --git a/samples/Networking/v2/securityGroupRules/list.php b/samples/Networking/v2/securityGroupRules/list.php
index 1e9cb034..8c574319 100644
--- a/samples/Networking/v2/securityGroupRules/list.php
+++ b/samples/Networking/v2/securityGroupRules/list.php
@@ -16,16 +16,15 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-/** @var Service $networkingExtSecGroup */
-$networkingExtSecGroup = $openstack->networkingV2ExtSecGroups();
+$networking = $openstack->networkingV2();
 
 //List all security group rules
-foreach ($networkingExtSecGroup->listSecurityGroupRules() as $rule) {
+foreach ($networking->listSecurityGroupRules() as $rule) {
     /** @var SecurityGroupRule $rule */
 }
 
 /** @var SecurityGroup $securityGroup */
-$securityGroup = $networkingExtSecGroup->getSecurityGroup(['id' => '{uuid}']);
+$securityGroup = $networking->getSecurityGroup('{uuid}');
 
 //List rules belong to a security group
 foreach ($securityGroup->securityGroupRules as $rule) {
diff --git a/samples/Networking/v2/securityGroups/create.php b/samples/Networking/v2/securityGroups/create.php
index 32ddb0f7..572626d5 100644
--- a/samples/Networking/v2/securityGroups/create.php
+++ b/samples/Networking/v2/securityGroups/create.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2ExtSecGroups();
+$networking = $openstack->networkingV2();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $secGroup */
 $secGroup = $networking->createSecurityGroup([
diff --git a/samples/Networking/v2/securityGroups/delete.php b/samples/Networking/v2/securityGroups/delete.php
index 69bb2ba7..992d813f 100644
--- a/samples/Networking/v2/securityGroups/delete.php
+++ b/samples/Networking/v2/securityGroups/delete.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2ExtSecGroups();
+$networking = $openstack->networkingV2();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $secGroup */
 $secGroup = $networking->getSecurityGroup('{id}');
diff --git a/samples/Networking/v2/securityGroups/get.php b/samples/Networking/v2/securityGroups/get.php
index 26f46278..87c7f51c 100644
--- a/samples/Networking/v2/securityGroups/get.php
+++ b/samples/Networking/v2/securityGroups/get.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2ExtSecGroups();
+$networking = $openstack->networkingV2();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $secGroup */
 $secGroup = $networking->getSecurityGroup('{id}');
diff --git a/samples/Networking/v2/securityGroups/list.php b/samples/Networking/v2/securityGroups/list.php
index 2a423f36..4be1deba 100644
--- a/samples/Networking/v2/securityGroups/list.php
+++ b/samples/Networking/v2/securityGroups/list.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2ExtSecGroups();
+$networking = $openstack->networkingV2();
 
 $secGroups = $networking->listSecurityGroups();
 
diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index b9fe72c1..55fb92bf 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -70,8 +70,6 @@ private function getClasses($namespace)
      *
      * @param string $namespace      The namespace of the service
      * @param array  $serviceOptions The service-specific options to use
-     *
-     * @throws \Exception
      */
     public function createService(string $namespace, array $serviceOptions = []): ServiceInterface
     {
diff --git a/src/Networking/v2/Api.php b/src/Networking/v2/Api.php
index d4cc0e39..e9bfc27b 100644
--- a/src/Networking/v2/Api.php
+++ b/src/Networking/v2/Api.php
@@ -5,6 +5,8 @@
 namespace OpenStack\Networking\v2;
 
 use OpenStack\Common\Api\AbstractApi;
+use OpenStack\Networking\v2\Extensions\Layer3\ApiTrait as Layer3;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\ApiTrait as SecurityGroup;
 
 /**
  * A representation of the Neutron (Nova) v2 REST API.
@@ -13,6 +15,9 @@
  */
 class Api extends AbstractApi
 {
+    use Layer3;
+    use SecurityGroup;
+
     private $pathPrefix = 'v2.0';
 
     public function __construct()
diff --git a/src/Networking/v2/Extensions/Layer3/Api.php b/src/Networking/v2/Extensions/Layer3/Api.php
index b9ab4517..faab09ac 100644
--- a/src/Networking/v2/Extensions/Layer3/Api.php
+++ b/src/Networking/v2/Extensions/Layer3/Api.php
@@ -4,6 +4,11 @@
 
 use OpenStack\Common\Api\AbstractApi;
 
+/**
+ * @deprecated Use Networking\v2\Api instead
+ *
+ * @internal
+ */
 class Api extends AbstractApi
 {
     private $pathPrefix = 'v2.0';
diff --git a/src/Networking/v2/Extensions/Layer3/ApiTrait.php b/src/Networking/v2/Extensions/Layer3/ApiTrait.php
new file mode 100644
index 00000000..5d7c757a
--- /dev/null
+++ b/src/Networking/v2/Extensions/Layer3/ApiTrait.php
@@ -0,0 +1,172 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenStack\Networking\v2\Extensions\Layer3;
+
+/**
+ * @property \OpenStack\Networking\v2\Params $params
+ * @property string                          $pathPrefix
+ *
+ * @internal
+ */
+trait ApiTrait
+{
+    public function postFloatingIps(): array
+    {
+        return [
+            'method'  => 'POST',
+            'path'    => $this->pathPrefix.'/floatingips',
+            'jsonKey' => 'floatingip',
+            'params'  => [
+                'tenantId'          => $this->params->tenantIdJson(),
+                'floatingNetworkId' => $this->params->floatingNetworkIdJson(),
+                'fixedIpAddress'    => $this->params->fixedIpAddressJson(),
+                'floatingIpAddress' => $this->params->floatingIpAddressJson(),
+                'portId'            => $this->params->portIdJson(),
+            ],
+        ];
+    }
+
+    public function getFloatingIps(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/floatingips',
+            'params' => [
+                'tenantId' => $this->params->queryTenantId(),
+            ],
+        ];
+    }
+
+    public function putFloatingIp(): array
+    {
+        return [
+            'method'  => 'PUT',
+            'path'    => $this->pathPrefix.'/floatingips/{id}',
+            'jsonKey' => 'floatingip',
+            'params'  => [
+                'id'                => $this->params->idPath(),
+                'floatingNetworkId' => $this->notRequired($this->params->floatingNetworkIdJson()),
+                'fixedIpAddress'    => $this->params->fixedIpAddressJson(),
+                'floatingIpAddress' => $this->params->floatingIpAddressJson(),
+                'portId'            => $this->params->portIdJson(),
+            ],
+        ];
+    }
+
+    public function getFloatingIp(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/floatingips/{id}',
+            'params' => [
+                'id'     => $this->params->idPath(),
+                'portId' => $this->params->portIdJson(),
+            ],
+        ];
+    }
+
+    public function deleteFloatingIp(): array
+    {
+        return [
+            'method' => 'DELETE',
+            'path'   => $this->pathPrefix.'/floatingips/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
+        ];
+    }
+
+    public function postRouters(): array
+    {
+        return [
+            'method'  => 'POST',
+            'path'    => $this->pathPrefix.'/routers',
+            'jsonKey' => 'router',
+            'params'  => [
+                'name'                => $this->params->nameJson(),
+                'externalGatewayInfo' => $this->params->externalGatewayInfo(),
+                'adminStateUp'        => $this->params->adminStateUp(),
+                'tenantId'            => $this->params->tenantId(),
+                'distributed'         => $this->params->distributedJson(),
+                'ha'                  => $this->params->haJson(),
+            ],
+        ];
+    }
+
+    public function getRouters(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/routers',
+            'params' => [
+                'name'     => $this->params->queryName(),
+                'tenantId' => $this->params->queryTenantId(),
+            ],
+        ];
+    }
+
+    public function putRouter(): array
+    {
+        return [
+            'method'  => 'PUT',
+            'path'    => $this->pathPrefix.'/routers/{id}',
+            'jsonKey' => 'router',
+            'params'  => [
+                'id'                  => $this->params->idPath(),
+                'name'                => $this->params->nameJson(),
+                'externalGatewayInfo' => $this->params->externalGatewayInfo(),
+                'adminStateUp'        => $this->params->adminStateUp(),
+            ],
+        ];
+    }
+
+    public function getRouter(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/routers/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
+        ];
+    }
+
+    public function deleteRouter(): array
+    {
+        return [
+            'method' => 'DELETE',
+            'path'   => $this->pathPrefix.'/routers/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
+        ];
+    }
+
+    public function putAddInterface(): array
+    {
+        return [
+            'method' => 'PUT',
+            'path'   => $this->pathPrefix.'/routers/{id}/add_router_interface',
+            'params' => [
+                'id'       => $this->params->idPath(),
+                'subnetId' => $this->params->subnetId(),
+                'portId'   => $this->params->portIdJson(),
+            ],
+        ];
+    }
+
+    public function putRemoveInterface(): array
+    {
+        return [
+            'method' => 'PUT',
+            'path'   => $this->pathPrefix.'/routers/{id}/remove_router_interface',
+            'params' => [
+                'id'       => $this->params->idPath(),
+                'subnetId' => $this->params->subnetId(),
+                'portId'   => $this->params->portIdJson(),
+            ],
+        ];
+    }
+}
diff --git a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
index 07dc0ddb..048b942b 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
@@ -51,6 +51,9 @@ class FloatingIp extends OperatorResource implements Listable, Creatable, Retrie
     protected $resourceKey  = 'floatingip';
     protected $resourcesKey = 'floatingips';
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postFloatingIps(), $userOptions);
diff --git a/src/Networking/v2/Extensions/Layer3/Models/Router.php b/src/Networking/v2/Extensions/Layer3/Models/Router.php
index 883c46e8..6fcb9a26 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/Router.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/Router.php
@@ -54,6 +54,9 @@ protected function getAliases(): array
         ];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postRouters(), $userOptions);
diff --git a/src/Networking/v2/Extensions/Layer3/Params.php b/src/Networking/v2/Extensions/Layer3/Params.php
index b94abd7e..d502f61c 100644
--- a/src/Networking/v2/Extensions/Layer3/Params.php
+++ b/src/Networking/v2/Extensions/Layer3/Params.php
@@ -2,9 +2,14 @@
 
 namespace OpenStack\Networking\v2\Extensions\Layer3;
 
+/**
+ * @deprecated Use Networking\v2\Params instead
+ *
+ * @internal
+ */
 class Params extends \OpenStack\Networking\v2\Params
 {
-    public function tenantIdJson()
+    public function tenantIdJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -13,7 +18,7 @@ public function tenantIdJson()
         ];
     }
 
-    public function floatingNetworkIdJson()
+    public function floatingNetworkIdJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -23,7 +28,7 @@ public function floatingNetworkIdJson()
         ];
     }
 
-    public function fixedIpAddressJson()
+    public function fixedIpAddressJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -32,7 +37,7 @@ public function fixedIpAddressJson()
         ];
     }
 
-    public function floatingIpAddressJson()
+    public function floatingIpAddressJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -41,7 +46,7 @@ public function floatingIpAddressJson()
         ];
     }
 
-    public function portIdJson()
+    public function portIdJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
diff --git a/src/Networking/v2/Extensions/Layer3/ParamsTrait.php b/src/Networking/v2/Extensions/Layer3/ParamsTrait.php
new file mode 100644
index 00000000..c201a82e
--- /dev/null
+++ b/src/Networking/v2/Extensions/Layer3/ParamsTrait.php
@@ -0,0 +1,112 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenStack\Networking\v2\Extensions\Layer3;
+
+/**
+ * @internal
+ */
+trait ParamsTrait
+{
+    public function floatingNetworkIdJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The UUID of the network associated with the floating IP.',
+            'sentAs'      => 'floating_network_id',
+            'required'    => true,
+        ];
+    }
+
+    public function fixedIpAddressJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The fixed IP address that is associated with the floating IP. To associate the floating IP with a fixed IP at creation time, you must specify the identifier of the internal port. If an internal port has multiple associated IP addresses, the service chooses the first IP address unless you explicitly define a fixed IP address in the fixed_ip_address parameter.',
+            'sentAs'      => 'fixed_ip_address',
+        ];
+    }
+
+    public function floatingIpAddressJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The floating IP address.',
+            'sentAs'      => 'floating_ip_address',
+        ];
+    }
+
+    public function portIdJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The UUID of the port.',
+            'sentAs'      => 'port_id',
+        ];
+    }
+
+    public function enableSnatJson(): array
+    {
+        return [
+            'type'        => self::BOOL_TYPE,
+            'description' => 'Enable Source NAT (SNAT) attribute, a part of ext-gw-mode extension. When a gateway is attached to a router using an L3 extension, Network Address Translation (NAT) is enabled for traffic generated by subnets attached to the router.',
+            'location'    => self::JSON,
+            'sentAs'      => 'enable_snat',
+        ];
+    }
+
+    public function ipJson(): array
+    {
+        return [
+            'type' => self::STRING_TYPE,
+        ];
+    }
+
+    public function externalFixedIpsJson(): array
+    {
+        return [
+            'type'     => self::ARRAY_TYPE,
+            'location' => self::JSON,
+            'sentAs'   => 'external_fixed_ips',
+            'items'    => [
+                'type'       => self::OBJECT_TYPE,
+                'properties' => [
+                    'subnetId' => $this->subnetId(),
+                    'ip'       => $this->ipJson(),
+                ],
+            ],
+        ];
+    }
+
+    public function externalGatewayInfo(): array
+    {
+        return [
+            'type'       => self::OBJECT_TYPE,
+            'sentAs'     => 'external_gateway_info',
+            'properties' => [
+                'networkId'  => $this->networkId(),
+                'enableSnat' => $this->enableSnatJson(),
+                'fixedIps'   => $this->externalFixedIpsJson(),
+            ],
+        ];
+    }
+
+    public function distributedJson(): array
+    {
+        return [
+            'type'        => self::BOOL_TYPE,
+            'location'    => self::JSON,
+            'description' => 'If true, indicates a distributed router.',
+        ];
+    }
+
+    public function haJson(): array
+    {
+        return [
+            'type'        => self::BOOL_TYPE,
+            'location'    => self::JSON,
+            'description' => 'If true, indicates a highly-available router.',
+        ];
+    }
+}
diff --git a/src/Networking/v2/Extensions/Layer3/Service.php b/src/Networking/v2/Extensions/Layer3/Service.php
index c033c4b7..6d545809 100644
--- a/src/Networking/v2/Extensions/Layer3/Service.php
+++ b/src/Networking/v2/Extensions/Layer3/Service.php
@@ -8,6 +8,8 @@
 
 /**
  * @property Api $api
+ *
+ * @deprecated Use Networking\v2\Service instead
  */
 class Service extends AbstractService
 {
diff --git a/src/Networking/v2/Extensions/Layer3/ServiceTrait.php b/src/Networking/v2/Extensions/Layer3/ServiceTrait.php
new file mode 100644
index 00000000..785fca67
--- /dev/null
+++ b/src/Networking/v2/Extensions/Layer3/ServiceTrait.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenStack\Networking\v2\Extensions\Layer3;
+
+use OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp;
+use OpenStack\Networking\v2\Extensions\Layer3\Models\Router;
+
+/**
+ * @property \OpenStack\Networking\v2\Api $api
+ *
+ * @internal please use the Networking\v2\Service instead of this one
+ */
+trait ServiceTrait
+{
+    private function floatingIp(array $info = []): FloatingIp
+    {
+        return $this->model(FloatingIp::class, $info);
+    }
+
+    private function router(array $info = []): Router
+    {
+        return $this->model(Router::class, $info);
+    }
+
+    public function createFloatingIp(array $options): FloatingIp
+    {
+        return $this->floatingIp()->create($options);
+    }
+
+    public function getFloatingIp($id): FloatingIp
+    {
+        return $this->floatingIp(['id' => $id]);
+    }
+
+    /**
+     * @return \Generator<mixed, FloatingIp>
+     */
+    public function listFloatingIps(array $options = []): \Generator
+    {
+        return $this->floatingIp()->enumerate($this->api->getFloatingIps(), $options);
+    }
+
+    public function createRouter(array $options): Router
+    {
+        return $this->router()->create($options);
+    }
+
+    public function getRouter($id): Router
+    {
+        return $this->router(['id' => $id]);
+    }
+
+    /**
+     * @return \Generator<mixed, Router>
+     */
+    public function listRouters(array $options = []): \Generator
+    {
+        return $this->router()->enumerate($this->api->getRouters(), $options);
+    }
+}
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Api.php b/src/Networking/v2/Extensions/SecurityGroups/Api.php
index e30ddc24..9f2597f9 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Api.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Api.php
@@ -4,6 +4,11 @@
 
 use OpenStack\Common\Api\AbstractApi;
 
+/**
+ * @deprecated Use Networking\v2\Api instead
+ *
+ * @internal
+ */
 class Api extends AbstractApi
 {
     private $pathPrefix = 'v2.0';
diff --git a/src/Networking/v2/Extensions/SecurityGroups/ApiTrait.php b/src/Networking/v2/Extensions/SecurityGroups/ApiTrait.php
new file mode 100644
index 00000000..6c734041
--- /dev/null
+++ b/src/Networking/v2/Extensions/SecurityGroups/ApiTrait.php
@@ -0,0 +1,158 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenStack\Networking\v2\Extensions\SecurityGroups;
+
+/**
+ * @property \OpenStack\Networking\v2\Params $params
+ * @property string                          $pathPrefix
+ *
+ * @internal
+ */
+trait ApiTrait
+{
+    /**
+     * Returns information about GET security-groups/{security_group_id} HTTP
+     * operation.
+     */
+    public function getSecurityGroups(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/security-groups',
+            'params' => [
+                'tenantId' => $this->params->queryTenantId(),
+                'name'     => $this->params->filterName(),
+            ],
+        ];
+    }
+
+    /**
+     * Returns information about POST security-groups HTTP operation.
+     */
+    public function postSecurityGroups(): array
+    {
+        return [
+            'method'  => 'POST',
+            'path'    => $this->pathPrefix.'/security-groups',
+            'jsonKey' => 'security_group',
+            'params'  => [
+                'description' => $this->params->descriptionJson(),
+                'name'        => $this->params->nameJson(),
+            ],
+        ];
+    }
+
+    /**
+     * Returns information about PUT security-groups HTTP operation.
+     */
+    public function putSecurityGroups(): array
+    {
+        return [
+            'method'  => 'PUT',
+            'path'    => $this->pathPrefix.'/security-groups/{id}',
+            'jsonKey' => 'security_group',
+            'params'  => [
+                'id'          => $this->params->idPath(),
+                'description' => $this->params->descriptionJson(),
+                'name'        => $this->params->nameJson(),
+            ],
+        ];
+    }
+
+    /**
+     * Returns information about GET security-groups/{security_group_id} HTTP
+     * operation.
+     */
+    public function getSecurityGroup(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/security-groups/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
+        ];
+    }
+
+    /**
+     * Returns information about DELETE security-groups/{security_group_id} HTTP
+     * operation.
+     */
+    public function deleteSecurityGroup(): array
+    {
+        return [
+            'method' => 'DELETE',
+            'path'   => $this->pathPrefix.'/security-groups/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
+        ];
+    }
+
+    /**
+     * Returns information about GET security-group-rules HTTP operation.
+     */
+    public function getSecurityRules(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/security-group-rules',
+            'params' => [],
+        ];
+    }
+
+    /**
+     * Returns information about POST security-group-rules HTTP operation.
+     */
+    public function postSecurityRules(): array
+    {
+        return [
+            'method'  => 'POST',
+            'path'    => $this->pathPrefix.'/security-group-rules',
+            'jsonKey' => 'security_group_rule',
+            'params'  => [
+                'direction'       => $this->params->directionJson(),
+                'ethertype'       => $this->params->ethertypeJson(),
+                'securityGroupId' => $this->params->securityGroupIdJson(),
+                'portRangeMin'    => $this->params->portRangeMinJson(),
+                'portRangeMax'    => $this->params->portRangeMaxJson(),
+                'protocol'        => $this->params->protocolJson(),
+                'remoteGroupId'   => $this->params->remoteGroupIdJson(),
+                'remoteIpPrefix'  => $this->params->remoteIpPrefixJson(),
+                'tenantId'        => $this->params->tenantIdJson(),
+            ],
+        ];
+    }
+
+    /**
+     * Returns information about DELETE
+     * security-group-rules/{rules-security-groups-id} HTTP operation.
+     */
+    public function deleteSecurityRule(): array
+    {
+        return [
+            'method' => 'DELETE',
+            'path'   => $this->pathPrefix.'/security-group-rules/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
+        ];
+    }
+
+    /**
+     * Returns information about GET
+     * security-group-rules/{rules-security-groups-id} HTTP operation.
+     */
+    public function getSecurityRule(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix.'/security-group-rules/{id}',
+            'params' => [
+                'id' => $this->params->idPath(),
+            ],
+        ];
+    }
+}
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
index 215fad49..1b09a2e4 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroup.php
@@ -59,6 +59,9 @@ protected function getAliases(): array
         ];
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postSecurityGroups(), $userOptions);
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
index 825a2f51..4d0319dc 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRule.php
@@ -80,6 +80,9 @@ class SecurityGroupRule extends OperatorResource implements Creatable, Listable,
 
     protected $resourcesKey = 'security_group_rules';
 
+    /**
+     * {@inheritdoc}
+     */
     public function create(array $userOptions): Creatable
     {
         $response = $this->execute($this->api->postSecurityRules(), $userOptions);
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Params.php b/src/Networking/v2/Extensions/SecurityGroups/Params.php
index 88325a73..ea700511 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Params.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Params.php
@@ -2,9 +2,14 @@
 
 namespace OpenStack\Networking\v2\Extensions\SecurityGroups;
 
+/**
+ * @deprecated Use Networking\v2\Params instead
+ *
+ * @internal
+ */
 class Params extends \OpenStack\Networking\v2\Params
 {
-    public function directionJson()
+    public function directionJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -12,7 +17,7 @@ public function directionJson()
         ];
     }
 
-    public function ethertypeJson()
+    public function ethertypeJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -20,7 +25,7 @@ public function ethertypeJson()
         ];
     }
 
-    public function idJson()
+    public function idJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -28,7 +33,7 @@ public function idJson()
         ];
     }
 
-    public function portRangeMaxJson()
+    public function portRangeMaxJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -37,7 +42,7 @@ public function portRangeMaxJson()
         ];
     }
 
-    public function portRangeMinJson()
+    public function portRangeMinJson(): array
     {
         return [
             'sentAs'      => 'port_range_min',
@@ -46,7 +51,7 @@ public function portRangeMinJson()
         ];
     }
 
-    public function protocolJson()
+    public function protocolJson(): array
     {
         return [
             'type'        => self::STRING_TYPE,
@@ -54,7 +59,7 @@ public function protocolJson()
         ];
     }
 
-    public function remoteGroupIdJson()
+    public function remoteGroupIdJson(): array
     {
         return [
             'sentAs'      => 'remote_group_id',
@@ -63,7 +68,7 @@ public function remoteGroupIdJson()
         ];
     }
 
-    public function remoteIpPrefixJson()
+    public function remoteIpPrefixJson(): array
     {
         return [
             'sentAs'      => 'remote_ip_prefix',
@@ -72,7 +77,7 @@ public function remoteIpPrefixJson()
         ];
     }
 
-    public function securityGroupIdJson()
+    public function securityGroupIdJson(): array
     {
         return [
             'sentAs'      => 'security_group_id',
@@ -81,7 +86,7 @@ public function securityGroupIdJson()
         ];
     }
 
-    public function tenantIdJson()
+    public function tenantIdJson(): array
     {
         return [
             'sentAs'      => 'tenant_id',
diff --git a/src/Networking/v2/Extensions/SecurityGroups/ParamsTrait.php b/src/Networking/v2/Extensions/SecurityGroups/ParamsTrait.php
new file mode 100644
index 00000000..90225a41
--- /dev/null
+++ b/src/Networking/v2/Extensions/SecurityGroups/ParamsTrait.php
@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenStack\Networking\v2\Extensions\SecurityGroups;
+
+/**
+ * @internal
+ */
+trait ParamsTrait
+{
+    public function directionJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'Ingress or egress: the direction in which the security group rule is applied. For a compute instance, an ingress security group rule is applied to incoming (ingress) traffic for that instance. An egress rule is applied to traffic leaving the instance.',
+        ];
+    }
+
+    public function ethertypeJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'Must be IPv4 or IPv6, and addresses represented in CIDR must match the ingress or egress rules.',
+        ];
+    }
+
+    public function idJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The UUID of the security group rule.',
+        ];
+    }
+
+    public function portRangeMaxJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'sentAs'      => 'port_range_max',
+            'description' => 'The maximum port number in the range that is matched by the security group rule. The port_range_min attribute constrains the port_range_max attribute. If the protocol is ICMP, this value must be an ICMP type.',
+        ];
+    }
+
+    public function portRangeMinJson(): array
+    {
+        return [
+            'sentAs'      => 'port_range_min',
+            'type'        => self::STRING_TYPE,
+            'description' => 'The minimum port number in the range that is matched by the security group rule. If the protocol is TCP or UDP, this value must be less than or equal to the port_range_max attribute value. If the protocol is ICMP, this value must be an ICMP type.',
+        ];
+    }
+
+    public function protocolJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The protocol that is matched by the security group rule. Value is null, icmp, icmpv6, tcp, or udp.',
+        ];
+    }
+
+    public function remoteGroupIdJson(): array
+    {
+        return [
+            'sentAs'      => 'remote_group_id',
+            'type'        => self::STRING_TYPE,
+            'description' => 'The remote group UUID to associate with this security group rule. You can specify either the remote_group_id or remote_ip_prefix attribute in the request body.',
+        ];
+    }
+
+    public function remoteIpPrefixJson(): array
+    {
+        return [
+            'sentAs'      => 'remote_ip_prefix',
+            'type'        => self::STRING_TYPE,
+            'description' => 'The remote IP prefix to associate with this security group rule. You can specify either the remote_group_id or remote_ip_prefix attribute in the request body. This attribute value matches the IP prefix as the source IP address of the IP packet.',
+        ];
+    }
+
+    public function securityGroupIdJson(): array
+    {
+        return [
+            'sentAs'      => 'security_group_id',
+            'type'        => self::STRING_TYPE,
+            'description' => 'The UUID of the security group.',
+        ];
+    }
+
+    public function filterName(): array
+    {
+        return [
+            'description' => 'Filter the list result by the human-readable name of the resource',
+            'type'        => self::STRING_TYPE,
+            'location'    => self::QUERY,
+        ];
+    }
+}
diff --git a/src/Networking/v2/Extensions/SecurityGroups/Service.php b/src/Networking/v2/Extensions/SecurityGroups/Service.php
index 4cc69d66..4a1b70b6 100644
--- a/src/Networking/v2/Extensions/SecurityGroups/Service.php
+++ b/src/Networking/v2/Extensions/SecurityGroups/Service.php
@@ -8,6 +8,10 @@
 
 /**
  * @property Api $api
+ *
+ * @deprecated Use Networking\v2\Service instead
+ *
+ * @internal
  */
 class Service extends AbstractService
 {
diff --git a/src/Networking/v2/Extensions/SecurityGroups/ServiceTrait.php b/src/Networking/v2/Extensions/SecurityGroups/ServiceTrait.php
new file mode 100644
index 00000000..0e0bd940
--- /dev/null
+++ b/src/Networking/v2/Extensions/SecurityGroups/ServiceTrait.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenStack\Networking\v2\Extensions\SecurityGroups;
+
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule;
+
+/**
+ * @property \OpenStack\Networking\v2\Api $api
+ *
+ * @internal please use the Networking\v2\Service instead of this one
+ */
+trait ServiceTrait
+{
+    private function securityGroup(array $info = []): SecurityGroup
+    {
+        return $this->model(SecurityGroup::class, $info);
+    }
+
+    private function securityGroupRule(array $info = []): SecurityGroupRule
+    {
+        return $this->model(SecurityGroupRule::class, $info);
+    }
+
+    /**
+     * @return \Generator<mixed, SecurityGroup>
+     */
+    public function listSecurityGroups(array $options = []): \Generator
+    {
+        return $this->securityGroup()->enumerate($this->api->getSecurityGroups(), $options);
+    }
+
+    public function createSecurityGroup(array $options): SecurityGroup
+    {
+        return $this->securityGroup()->create($options);
+    }
+
+    public function getSecurityGroup(string $id): SecurityGroup
+    {
+        return $this->securityGroup(['id' => $id]);
+    }
+
+    /**
+     * @return \Generator<mixed, SecurityGroupRule>
+     */
+    public function listSecurityGroupRules(): \Generator
+    {
+        return $this->securityGroupRule()->enumerate($this->api->getSecurityRules());
+    }
+
+    public function createSecurityGroupRule(array $options): SecurityGroupRule
+    {
+        return $this->securityGroupRule()->create($options);
+    }
+
+    public function getSecurityGroupRule(string $id): SecurityGroupRule
+    {
+        return $this->securityGroupRule(['id' => $id]);
+    }
+}
diff --git a/src/Networking/v2/Params.php b/src/Networking/v2/Params.php
index ea093823..2e68a505 100644
--- a/src/Networking/v2/Params.php
+++ b/src/Networking/v2/Params.php
@@ -5,9 +5,14 @@
 namespace OpenStack\Networking\v2;
 
 use OpenStack\Common\Api\AbstractParams;
+use OpenStack\Networking\v2\Extensions\Layer3\ParamsTrait as Layer3;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\ParamsTrait as SecurityGroups;
 
 class Params extends AbstractParams
 {
+    use Layer3;
+    use SecurityGroups;
+
     /**
      * Returns information about description parameter.
      */
@@ -719,4 +724,13 @@ public function type(): array
             'description' => 'The type of health monitor. Must be one of TCP, HTTP, HTTPS',
         ];
     }
+
+    public function tenantIdJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The UUID of the tenant. Only administrative users can specify a tenant UUID other than their own.',
+            'sentAs'      => 'tenant_id',
+        ];
+    }
 }
diff --git a/src/Networking/v2/Service.php b/src/Networking/v2/Service.php
index b66c63be..03ec9c73 100644
--- a/src/Networking/v2/Service.php
+++ b/src/Networking/v2/Service.php
@@ -5,13 +5,14 @@
 namespace OpenStack\Networking\v2;
 
 use OpenStack\Common\Service\AbstractService;
+use OpenStack\Networking\v2\Extensions\Layer3\ServiceTrait as Layer3;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\ServiceTrait as SecurityGroups;
 use OpenStack\Networking\v2\Models\LoadBalancer;
 use OpenStack\Networking\v2\Models\LoadBalancerHealthMonitor;
 use OpenStack\Networking\v2\Models\LoadBalancerListener;
 use OpenStack\Networking\v2\Models\LoadBalancerMember;
 use OpenStack\Networking\v2\Models\LoadBalancerPool;
 use OpenStack\Networking\v2\Models\Network;
-use OpenStack\Networking\v2\Models\Pool;
 use OpenStack\Networking\v2\Models\Port;
 use OpenStack\Networking\v2\Models\Quota;
 use OpenStack\Networking\v2\Models\Subnet;
@@ -23,6 +24,9 @@
  */
 class Service extends AbstractService
 {
+    use Layer3;
+    use SecurityGroups;
+
     /**
      * Create a new network resource.
      *
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 01da51fa..05ba65ac 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -99,6 +99,8 @@ public function networkingV2(array $options = []): Networking\v2\Service
      * Creates a new Networking v2 Layer 3 service.
      *
      * @param array $options options that will be used in configuring the service
+     *
+     * @deprecated Use networkingV2 instead
      */
     public function networkingV2ExtLayer3(array $options = []): Networking\v2\Extensions\Layer3\Service
     {
@@ -111,6 +113,8 @@ public function networkingV2ExtLayer3(array $options = []): Networking\v2\Extens
      * Creates a new Networking v2 Layer 3 service.
      *
      * @param array $options options that will be used in configuring the service
+     *
+     * @deprecated Use networkingV2 instead
      */
     public function networkingV2ExtSecGroups(array $options = []): Networking\v2\Extensions\SecurityGroups\Service
     {
diff --git a/tests/sample/Compute/v2/InterfaceAttachmentTest.php b/tests/sample/Compute/v2/InterfaceAttachmentTest.php
index f635bd7b..15e4b008 100644
--- a/tests/sample/Compute/v2/InterfaceAttachmentTest.php
+++ b/tests/sample/Compute/v2/InterfaceAttachmentTest.php
@@ -9,8 +9,8 @@ class InterfaceAttachmentTest extends TestCase
     public function testCreate()
     {
         $server = $this->createServer();
-        $network = $this->getServiceNetwork()->createNetwork(['name' => $this->randomStr()]);
-        $this->getServiceNetwork()->createSubnet(
+        $network = $this->getNetworkService()->createNetwork(['name' => $this->randomStr()]);
+        $this->getNetworkService()->createSubnet(
             [
                 'name'      => $this->randomStr(),
                 'networkId' => $network->id,
@@ -31,7 +31,7 @@ public function testCreate()
         $this->assertInstanceOf(InterfaceAttachment::class, $interfaceAttachment);
         $this->assertEquals($network->id, $interfaceAttachment->netId);
 
-        $port = $this->getServiceNetwork()->getPort($interfaceAttachment->portId);
+        $port = $this->getNetworkService()->getPort($interfaceAttachment->portId);
         $port->retrieve();
 
         $server->detachInterface($interfaceAttachment->portId);
diff --git a/tests/sample/Compute/v2/SecurityGroupTest.php b/tests/sample/Compute/v2/SecurityGroupTest.php
index 13fc26f4..b53d4e01 100644
--- a/tests/sample/Compute/v2/SecurityGroupTest.php
+++ b/tests/sample/Compute/v2/SecurityGroupTest.php
@@ -12,7 +12,7 @@ class SecurityGroupTest extends TestCase
     public function testAdd(): array
     {
         $createdServer = $this->createServer();
-        $createdSecurityGroup = $this->getCachedService(Service::class)
+        $createdSecurityGroup = $this->getNetworkService()
             ->createSecurityGroup(['name' => $this->randomStr()]);
 
         $replacements = [
diff --git a/tests/sample/Compute/v2/ServerTest.php b/tests/sample/Compute/v2/ServerTest.php
index 721e46df..c92ef611 100644
--- a/tests/sample/Compute/v2/ServerTest.php
+++ b/tests/sample/Compute/v2/ServerTest.php
@@ -19,8 +19,8 @@ public function testCreate(): Server
             throw new RuntimeException('OS_FLAVOR env var must be set');
         }
 
-        $network = $this->getServiceNetwork()->createNetwork(['name' => $this->randomStr()]);
-        $this->getServiceNetwork()->createSubnet(
+        $network = $this->getNetworkService()->createNetwork(['name' => $this->randomStr()]);
+        $this->getNetworkService()->createSubnet(
             [
                 'name'      => $this->randomStr(),
                 'networkId' => $network->id,
@@ -355,7 +355,7 @@ public function testDelete(Server $createdServer)
         }
 
         foreach (array_keys($createdServer->addresses) as $networkName) {
-            $network = $this->getServiceNetwork()->listNetworks(['name' => $networkName])->current();
+            $network = $this->getNetworkService()->listNetworks(['name' => $networkName])->current();
             $this->deleteNetwork($network);
         }
 
diff --git a/tests/sample/Compute/v2/TestCase.php b/tests/sample/Compute/v2/TestCase.php
index 914b939c..b24e6231 100644
--- a/tests/sample/Compute/v2/TestCase.php
+++ b/tests/sample/Compute/v2/TestCase.php
@@ -15,7 +15,7 @@ protected function getService(): Service
         return $this->getCachedService(Service::class);
     }
 
-    protected function getServiceNetwork(): \OpenStack\Networking\v2\Service
+    protected function getNetworkService(): \OpenStack\Networking\v2\Service
     {
         return $this->getCachedService(\OpenStack\Networking\v2\Service::class);
     }
@@ -47,8 +47,8 @@ protected function createServer(): Server
             throw new RuntimeException('OS_FLAVOR env var must be set');
         }
 
-        $network = $this->getServiceNetwork()->createNetwork(['name' => $this->randomStr()]);
-        $this->getServiceNetwork()->createSubnet(
+        $network = $this->getNetworkService()->createNetwork(['name' => $this->randomStr()]);
+        $this->getNetworkService()->createSubnet(
             [
                 'name'      => $this->randomStr(),
                 'networkId' => $network->id,
@@ -82,7 +82,7 @@ protected function deleteServer(Server $server): void
         $server->waitUntilDeleted();
 
         foreach (array_keys($server->addresses) as $networkName) {
-            $network = $this->getServiceNetwork()->listNetworks(['name' => $networkName])->current();
+            $network = $this->getNetworkService()->listNetworks(['name' => $networkName])->current();
             $this->deleteNetwork($network);
         }
     }
@@ -93,11 +93,11 @@ protected function deleteServer(Server $server): void
     protected function deleteNetwork(Network $network): void
     {
         foreach ($network->subnets as $subnetId) {
-            $subnet = $this->getServiceNetwork()->getSubnet($subnetId);
+            $subnet = $this->getNetworkService()->getSubnet($subnetId);
             $subnet->delete();
         }
 
-        foreach ($this->getServiceNetwork()->listPorts(['networkId' => $network->id]) as $port) {
+        foreach ($this->getNetworkService()->listPorts(['networkId' => $network->id]) as $port) {
             if ($port->deviceOwner) {
                 continue;
             }
diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
index 1f11190f..e1eb73dc 100644
--- a/tests/sample/Compute/v2/VolumeAttachmentTest.php
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -71,7 +71,7 @@ public function testDetach(VolumeAttachment $createdVolumeAttachment)
         );
 
         $volume = $this->getCachedService(Service::class)->getVolume($createdVolumeAttachment->volumeId);
-        $volume->waitUntil('available');
+        $volume->waitUntil('available', 240);
         $this->assertEquals('available', $volume->status);
 
         $server = $this->getService()->getServer(['id' => $createdVolumeAttachment->serverId]);
diff --git a/tests/sample/Networking/v2/FloatingIpTest.php b/tests/sample/Networking/v2/FloatingIpTest.php
index 74084635..196f0edc 100644
--- a/tests/sample/Networking/v2/FloatingIpTest.php
+++ b/tests/sample/Networking/v2/FloatingIpTest.php
@@ -49,7 +49,7 @@ public function testCreate(): FloatingIpData
         $data->externalNetwork->waitUntilActive();
         $data->internalNetwork->waitUntilActive();
 
-        $data->router = $this->getServiceLayer3()->createRouter([
+        $data->router = $this->getService()->createRouter([
             'name'                => $this->randomStr(),
             'externalGatewayInfo' => [
                 'networkId'  => $data->externalNetwork->id,
@@ -161,7 +161,7 @@ public function testDelete(FloatingIpData $data)
             '{id}' => $data->floatingIp->id,
         ]);
 
-        foreach ($this->getServiceLayer3()->listFloatingIps() as $floatingIp) {
+        foreach ($this->getService()->listFloatingIps() as $floatingIp) {
             if ($floatingIp->id == $data->floatingIp->id) {
                 $this->fail('Floating IP still exists');
             }
diff --git a/tests/sample/Networking/v2/TestCase.php b/tests/sample/Networking/v2/TestCase.php
index 2ac889b3..a78c69d6 100644
--- a/tests/sample/Networking/v2/TestCase.php
+++ b/tests/sample/Networking/v2/TestCase.php
@@ -13,11 +13,6 @@ protected function getService(): Service
         return $this->getCachedService(Service::class);
     }
 
-    protected function getServiceLayer3(): \OpenStack\Networking\v2\Extensions\Layer3\Service
-    {
-        return $this->getCachedService(\OpenStack\Networking\v2\Extensions\Layer3\Service::class);
-    }
-
     protected function sampleFile(string $path, array $replacements = []): string
     {
         return parent::sampleFile("Networking/v2/$path", $replacements);
diff --git a/tests/sample/TestCase.php b/tests/sample/TestCase.php
index 19d49479..79ef2313 100644
--- a/tests/sample/TestCase.php
+++ b/tests/sample/TestCase.php
@@ -65,12 +65,6 @@ protected function getCachedService(string $serviceType): AbstractService
             case \OpenStack\Networking\v2\Service::class:
                 $service = $this->getOpenStack()->networkingV2();
                 break;
-            case \OpenStack\Networking\v2\Extensions\Layer3\Service::class:
-                $service = $this->getOpenStack()->networkingV2ExtLayer3();
-                break;
-            case \OpenStack\Networking\v2\Extensions\SecurityGroups\Service::class:
-                $service = $this->getOpenStack()->networkingV2ExtSecGroups();
-                break;
             case \OpenStack\ObjectStore\v1\Service::class:
                 $service = $this->getOpenStack()->objectStoreV1();
                 break;

From 857fcc82a0eaffff11044bca6d39c0c21eeb1c97 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Tue, 30 Jan 2024 14:00:18 +0100
Subject: [PATCH 074/102] Clarify docs (#389)

* Rewrite most of documentation.
* Make creating the `$openstack` object more clear.
* Rename and rearrange main operations as CRUDL (Create, Read, Update, Delete, List)
---
 doc/_exts/osdoc.py                            |  31 +++++
 doc/_exts/samples.py                          |  46 ++++----
 doc/_static/css/custom.css                    |   4 +
 doc/common/create-service.rst                 |  18 +++
 doc/common/service.rst                        |   1 +
 doc/conf.py                                   |  20 +++-
 doc/index.rst                                 |  40 ++-----
 doc/install.rst                               |  35 ++++++
 doc/requirements.txt                          |   4 +-
 doc/services/block-storage/v2/index.rst       |   4 +-
 doc/services/block-storage/v3/create.rst      |   3 +
 doc/services/block-storage/v3/index.rst       |  14 ++-
 doc/services/block-storage/v3/snapshots.rst   |  18 ++-
 .../block-storage/v3/volume-types.rst         |  58 ++++------
 doc/services/block-storage/v3/volumes.rst     |  75 ++++++------
 doc/services/compute/v2/create.rst            |   3 +
 doc/services/compute/v2/flavors.rst           |  46 +++-----
 doc/services/compute/v2/images.rst            |  18 +--
 doc/services/compute/v2/index.rst             |   6 +
 doc/services/compute/v2/servers.rst           |  75 ++++--------
 doc/services/compute/v2/states.rst            |   2 +-
 doc/services/identity/v2/authentication.rst   |  12 --
 doc/services/identity/v2/index.rst            |   8 +-
 .../identity/v3/application-credentials.rst   |  31 +++--
 doc/services/identity/v3/create.rst           |   3 +
 doc/services/identity/v3/credentials.rst      |  49 ++++----
 doc/services/identity/v3/domains.rst          |  51 ++++-----
 doc/services/identity/v3/endpoints.rst        |  47 ++++----
 doc/services/identity/v3/groups.rst           |  44 +++----
 doc/services/identity/v3/index.rst            |   5 +
 doc/services/identity/v3/policies.rst         |  27 +----
 doc/services/identity/v3/projects.rst         |  46 ++++----
 doc/services/identity/v3/roles.rst            |  26 +++--
 doc/services/identity/v3/services.rst         |  41 ++++---
 doc/services/identity/v3/tokens.rst           |  20 +++-
 doc/services/identity/v3/users.rst            |  46 ++++----
 doc/services/images/v2/create.rst             |   3 +
 doc/services/images/v2/images.rst             |  67 +++++------
 doc/services/images/v2/index.rst              |   6 +
 doc/services/images/v2/members.rst            |  41 +++----
 doc/services/networking/v2/create.rst         |   3 +
 doc/services/networking/v2/index.rst          |   6 +
 .../v2/loadbalancer-healthmonitors.rst        |  40 ++++---
 .../networking/v2/loadbalancer-listeners.rst  |  39 ++++---
 .../networking/v2/loadbalancer-pools.rst      |  37 +++---
 doc/services/networking/v2/loadbalancers.rst  |  59 +++++-----
 doc/services/networking/v2/networks.rst       |  36 +++---
 doc/services/networking/v2/ports.rst          |  38 ++++---
 doc/services/networking/v2/subnets.rst        |  38 ++++---
 doc/services/object-store/v1/account.rst      |  19 +++-
 doc/services/object-store/v1/containers.rst   |  47 ++++----
 doc/services/object-store/v1/create.rst       |   3 +
 doc/services/object-store/v1/index.rst        |  14 ++-
 doc/services/object-store/v1/objects.rst      | 107 ++++++++----------
 doc/setup.rst                                 |  43 +++++++
 .../get.php => BlockStorage/v2/create.php}    |   5 +-
 samples/BlockStorage/v2/create_service.php    |  12 --
 .../BlockStorage/v3/volume_types/create.php   |   6 +-
 .../BlockStorage/v3/volume_types/delete.php   |   6 +-
 samples/BlockStorage/v3/volume_types/list.php |   6 +-
 .../v3/volume_types/{get.php => read.php}     |   7 +-
 .../BlockStorage/v3/volume_types/update.php   |   6 +-
 samples/BlockStorage/v3/volumes/create.php    |  16 +--
 .../v3/volumes/create_from_image.php          |  14 ++-
 .../v3/volumes/create_from_snapshot.php       |   6 +-
 .../v3/volumes/create_from_source_volume.php  |  19 ----
 .../v3/volumes/create_from_volume.php         |  21 ++++
 samples/BlockStorage/v3/volumes/delete.php    |   6 +-
 samples/BlockStorage/v3/volumes/list.php      |   6 +-
 .../BlockStorage/v3/volumes/list_detail.php   |   6 +-
 .../v3/volumes/{get.php => read.php}          |   7 +-
 samples/BlockStorage/v3/volumes/update.php    |   6 +-
 .../flavors/{create_flavor.php => create.php} |   5 +-
 .../flavors/{delete_flavor.php => delete.php} |   4 +-
 samples/Compute/v2/flavors/get_flavor.php     |  24 ----
 .../v2/flavors/{list_flavors.php => list.php} |   5 +-
 .../get.php => Compute/v2/flavors/read.php}   |   7 +-
 .../servers/{create_server.php => create.php} |   3 +-
 .../servers/{delete_server.php => delete.php} |   3 +-
 samples/Compute/v2/servers/get_server.php     |  24 ----
 .../v2/servers/{list_servers.php => list.php} |   5 +-
 .../get.php => Compute/v2/servers/read.php}   |   8 +-
 .../servers/{update_server.php => update.php} |   9 +-
 samples/Identity/v2/authentication.php        |   2 -
 ..._application_credential.php => create.php} |   7 +-
 ..._application_credential.php => delete.php} |   7 +-
 ...ow_application_credential.php => read.php} |   7 +-
 .../credentials/{add_cred.php => create.php}  |   3 +-
 .../{delete_cred.php => delete.php}           |   3 +-
 samples/Identity/v3/credentials/get_cred.php  |  18 ---
 .../credentials/{list_creds.php => list.php}  |   3 +-
 samples/Identity/v3/credentials/read.php      |  17 +++
 samples/Identity/v3/credentials/update.php    |  21 ++++
 .../Identity/v3/credentials/update_cred.php   |  22 ----
 .../Identity/v3/domains/check_group_role.php  |   7 +-
 .../Identity/v3/domains/check_user_role.php   |   7 +-
 .../v3/domains/{add_domain.php => create.php} |   7 +-
 .../domains/{delete_domain.php => delete.php} |   7 +-
 .../Identity/v3/domains/grant_group_role.php  |   7 +-
 .../Identity/v3/domains/grant_user_role.php   |   7 +-
 .../v3/domains/{list_domains.php => list.php} |   7 +-
 .../Identity/v3/domains/list_group_roles.php  |   7 +-
 .../Identity/v3/domains/list_user_roles.php   |   7 +-
 .../v3/domains/{show_domain.php => read.php}  |   7 +-
 .../Identity/v3/domains/revoke_group_role.php |   7 +-
 .../Identity/v3/domains/revoke_user_role.php  |   7 +-
 .../domains/{update_domain.php => update.php} |   7 +-
 .../{add_endpoint.php => create.php}          |   7 +-
 .../{delete_endpoint.php => delete.php}       |   7 +-
 .../{list_endpoints.php => list.php}          |   7 +-
 .../endpoints/{get_endpoint.php => read.php}  |   8 +-
 .../{update_endpoint.php => update.php}       |   7 +-
 samples/Identity/v3/groups/add_user.php       |   7 +-
 .../v3/groups/check_user_membership.php       |  12 +-
 .../v3/groups/{add_group.php => create.php}   |   7 +-
 .../groups/{delete_group.php => delete.php}   |   7 +-
 .../v3/groups/{list_groups.php => list.php}   |   7 +-
 samples/Identity/v3/groups/list_users.php     |   7 +-
 .../v3/groups/{get_group.php => read.php}     |   7 +-
 samples/Identity/v3/groups/remove_user.php    |   7 +-
 .../groups/{update_group.php => update.php}   |   7 +-
 .../Identity/v3/projects/check_group_role.php |   7 +-
 .../Identity/v3/projects/check_user_role.php  |   7 +-
 .../projects/{add_project.php => create.php}  |   7 +-
 .../{delete_project.php => delete.php}        |   7 +-
 .../Identity/v3/projects/grant_group_role.php |   7 +-
 .../Identity/v3/projects/grant_user_role.php  |   7 +-
 .../projects/{list_projects.php => list.php}  |   7 +-
 .../Identity/v3/projects/list_group_roles.php |   7 +-
 .../Identity/v3/projects/list_user_roles.php  |   7 +-
 .../v3/projects/{get_project.php => read.php} |   7 +-
 .../v3/projects/revoke_group_role.php         |   7 +-
 .../Identity/v3/projects/revoke_user_role.php |   7 +-
 .../{update_project.php => update.php}        |   7 +-
 .../v3/roles/{add_role.php => create.php}     |   5 -
 .../v3/roles/{list_roles.php => list.php}     |   5 -
 .../Identity/v3/roles/list_assignments.php    |   5 -
 .../services/{add_service.php => create.php}  |   7 +-
 .../{delete_service.php => delete.php}        |   7 +-
 .../services/{list_services.php => list.php}  |   7 +-
 .../v3/services/{get_service.php => read.php} |   7 +-
 .../{update_service.php => update.php}        |   7 +-
 .../v3/tokens/export_authentication_token.php |   3 -
 .../v3/tokens/generate_token_from_id.php      |   5 -
 .../generate_token_scoped_to_project_id.php   |   3 -
 .../generate_token_scoped_to_project_name.php |   7 --
 ...e_token_with_application_credential_id.php |   3 -
 .../v3/tokens/generate_token_with_user_id.php |   3 -
 .../tokens/generate_token_with_username.php   |   6 -
 samples/Identity/v3/tokens/revoke_token.php   |   5 +-
 .../use_cached_authentication_token.php       |   3 -
 samples/Identity/v3/tokens/validate_token.php |   5 +-
 .../v3/users/{add_user.php => create.php}     |   1 -
 .../v3/users/{delete_user.php => delete.php}  |   5 -
 .../v3/users/{list_users.php => list.php}     |   5 -
 samples/Identity/v3/users/list_groups.php     |   5 -
 samples/Identity/v3/users/list_projects.php   |   5 -
 .../v3/users/{get_user.php => read.php}       |   5 -
 .../v3/users/{update_user.php => update.php}  |   5 -
 samples/Images/v2/create.php                  |  14 +++
 samples/Images/v2/create_with_region.php      |  13 +++
 samples/Images/v2/images/create.php           |   6 +-
 samples/Images/v2/images/deactivate.php       |   6 +-
 samples/Images/v2/images/delete.php           |  13 ++-
 .../Images/v2/images/download_binary_data.php |   7 +-
 samples/Images/v2/images/list.php             |  11 +-
 samples/Images/v2/images/list_sorted.php      |  10 +-
 samples/Images/v2/images/reactivate.php       |   6 +-
 .../Images/v2/images/{get.php => read.php}    |   6 +-
 samples/Images/v2/images/update.php           |   6 +-
 .../Images/v2/images/upload_binary_data.php   |   6 +-
 samples/Images/v2/members/add.php             |  14 ---
 samples/Images/v2/members/create.php          |  16 +++
 samples/Images/v2/members/delete.php          |  14 ++-
 samples/Images/v2/members/get.php             |  14 ---
 samples/Images/v2/members/list.php            |  10 +-
 samples/Images/v2/members/read.php            |  17 +++
 samples/Images/v2/members/update_status.php   |  15 ++-
 .../v2/lbaas/healthmonitors/get.php           |  23 ----
 .../v2/lbaas/healthmonitors/read.php          |  17 +++
 samples/Networking/v2/lbaas/listeners/get.php |  23 ----
 .../Networking/v2/lbaas/listeners/read.php    |  17 +++
 .../v2/lbaas/loadbalancers/get_statuses.php   |   3 +-
 .../lbaas/loadbalancers/{get.php => read.php} |   0
 .../v2/lbaas/pools/{get.php => read.php}      |   9 +-
 samples/Networking/v2/networks/create.php     |  17 +--
 .../Networking/v2/networks/create_batch.php   |  20 +---
 samples/Networking/v2/networks/delete.php     |  10 +-
 samples/Networking/v2/networks/get.php        |  28 -----
 samples/Networking/v2/networks/read.php       |  17 +++
 samples/Networking/v2/networks/update.php     |  10 +-
 samples/Networking/v2/ports/create.php        |  12 +-
 samples/Networking/v2/ports/create_batch.php  |  14 ++-
 .../v2/ports/create_with_fixed_ips.php        |  10 +-
 samples/Networking/v2/ports/delete.php        |  10 +-
 samples/Networking/v2/ports/list.php          |  10 +-
 .../Networking/v2/ports/{get.php => read.php} |   9 +-
 samples/Networking/v2/ports/update.php        |  10 +-
 .../Networking/v2/securityGroups/create.php   |   3 +-
 .../Networking/v2/subnets/create_batch.php    |  31 ++---
 .../v2/subnets/create_with_gateway_ip.php     |  18 +--
 .../v2/subnets/create_with_host_routes.php    |  14 +--
 samples/Networking/v2/subnets/delete.php      |  10 +-
 samples/Networking/v2/subnets/get.php         |  28 -----
 samples/Networking/v2/subnets/read.php        |  17 +++
 samples/Networking/v2/subnets/update.php      |  12 +-
 .../ObjectStore/v1/account/get_metadata.php   |   1 -
 .../ObjectStore/v1/account/merge_metadata.php |   1 -
 samples/ObjectStore/v1/account/read.php       |  17 +++
 .../ObjectStore/v1/account/reset_metadata.php |   2 -
 samples/ObjectStore/v1/containers/create.php  |   5 +-
 samples/ObjectStore/v1/containers/delete.php  |  10 +-
 .../v1/containers/get_metadata.php            |   9 +-
 samples/ObjectStore/v1/containers/list.php    |   1 -
 .../v1/containers/merge_metadata.php          |   1 -
 samples/ObjectStore/v1/containers/read.php    |  17 +++
 .../v1/containers/reset_metadata.php          |   2 -
 .../ObjectStore/v1/objects/check_exists.php   |   8 +-
 samples/ObjectStore/v1/objects/copy.php       |  15 +--
 samples/ObjectStore/v1/objects/create.php     |  14 +--
 .../v1/objects/create_from_stream.php         |  18 ++-
 .../v1/objects/create_large_object.php        |  27 ++---
 samples/ObjectStore/v1/objects/delete.php     |  10 +-
 samples/ObjectStore/v1/objects/download.php   |  10 +-
 .../v1/objects/download_stream.php            |  10 +-
 .../ObjectStore/v1/objects/get_metadata.php   |  10 +-
 samples/ObjectStore/v1/objects/list.php       |   5 +-
 .../ObjectStore/v1/objects/merge_metadata.php |  18 +--
 samples/ObjectStore/v1/objects/read.php       |  18 +++
 .../ObjectStore/v1/objects/reset_metadata.php |  18 +--
 samples/Setup/application_credential_id.php   |  12 ++
 samples/Setup/token_id.php                    |   9 ++
 samples/Setup/user_id.php                     |  12 ++
 samples/Setup/username.php                    |  15 +++
 src/Compute/v2/Service.php                    |   8 +-
 src/ObjectStore/v1/Models/Container.php       |   2 +
 tests/sample/BlockStorage/v3/VolumeTest.php   |   8 +-
 .../sample/BlockStorage/v3/VolumeTypeTest.php |   8 +-
 tests/sample/Compute/v2/FlavorTest.php        |  10 +-
 tests/sample/Compute/v2/ServerTest.php        |   9 +-
 .../Identity/v3/ApplicationCredentialTest.php |  16 +--
 tests/sample/Identity/v3/DomainTest.php       |  12 +-
 tests/sample/Identity/v3/EndpointTest.php     |  16 +--
 tests/sample/Identity/v3/GroupTest.php        |  34 +++---
 tests/sample/Identity/v3/ProjectTest.php      |  34 +++---
 tests/sample/Identity/v3/RoleTest.php         |  10 +-
 tests/sample/Identity/v3/ServiceTest.php      |  20 ++--
 tests/sample/Identity/v3/UserTest.php         |  26 ++---
 tests/sample/Images/v2/ImageTest.php          |   5 +-
 tests/sample/Images/v2/MemberTest.php         |   8 +-
 tests/sample/Networking/v2/NetworkTest.php    |   4 +-
 tests/sample/Networking/v2/PortTest.php       |   7 +-
 tests/sample/Networking/v2/SubnetTest.php     |   4 +-
 tests/sample/ObjectStore/v1/ContainerTest.php |   5 +-
 tests/sample/ObjectStore/v1/ObjectTest.php    |  11 +-
 tests/sample/SampleManager.php                |   3 +-
 256 files changed, 1709 insertions(+), 1847 deletions(-)
 create mode 100644 doc/_exts/osdoc.py
 create mode 100644 doc/_static/css/custom.css
 create mode 100644 doc/common/create-service.rst
 create mode 100644 doc/common/service.rst
 create mode 100644 doc/install.rst
 create mode 100644 doc/services/block-storage/v3/create.rst
 create mode 100644 doc/services/compute/v2/create.rst
 delete mode 100644 doc/services/identity/v2/authentication.rst
 create mode 100644 doc/services/identity/v3/create.rst
 create mode 100644 doc/services/images/v2/create.rst
 create mode 100644 doc/services/networking/v2/create.rst
 create mode 100644 doc/services/object-store/v1/create.rst
 create mode 100644 doc/setup.rst
 rename samples/{ObjectStore/v1/containers/get.php => BlockStorage/v2/create.php} (59%)
 delete mode 100644 samples/BlockStorage/v2/create_service.php
 rename samples/BlockStorage/v3/volume_types/{get.php => read.php} (66%)
 delete mode 100644 samples/BlockStorage/v3/volumes/create_from_source_volume.php
 create mode 100644 samples/BlockStorage/v3/volumes/create_from_volume.php
 rename samples/BlockStorage/v3/volumes/{get.php => read.php} (65%)
 rename samples/Compute/v2/flavors/{create_flavor.php => create.php} (69%)
 rename samples/Compute/v2/flavors/{delete_flavor.php => delete.php} (78%)
 delete mode 100644 samples/Compute/v2/flavors/get_flavor.php
 rename samples/Compute/v2/flavors/{list_flavors.php => list.php} (68%)
 rename samples/{ObjectStore/v1/account/get.php => Compute/v2/flavors/read.php} (64%)
 rename samples/Compute/v2/servers/{create_server.php => create.php} (85%)
 rename samples/Compute/v2/servers/{delete_server.php => delete.php} (72%)
 delete mode 100644 samples/Compute/v2/servers/get_server.php
 rename samples/Compute/v2/servers/{list_servers.php => list.php} (60%)
 rename samples/{ObjectStore/v1/objects/get.php => Compute/v2/servers/read.php} (58%)
 rename samples/Compute/v2/servers/{update_server.php => update.php} (54%)
 rename samples/Identity/v3/application_credentials/{add_application_credential.php => create.php} (73%)
 rename samples/Identity/v3/application_credentials/{delete_application_credential.php => delete.php} (72%)
 rename samples/Identity/v3/application_credentials/{show_application_credential.php => read.php} (72%)
 rename samples/Identity/v3/credentials/{add_cred.php => create.php} (77%)
 rename samples/Identity/v3/credentials/{delete_cred.php => delete.php} (72%)
 delete mode 100644 samples/Identity/v3/credentials/get_cred.php
 rename samples/Identity/v3/credentials/{list_creds.php => list.php} (75%)
 create mode 100644 samples/Identity/v3/credentials/read.php
 create mode 100644 samples/Identity/v3/credentials/update.php
 delete mode 100644 samples/Identity/v3/credentials/update_cred.php
 rename samples/Identity/v3/domains/{add_domain.php => create.php} (71%)
 rename samples/Identity/v3/domains/{delete_domain.php => delete.php} (66%)
 rename samples/Identity/v3/domains/{list_domains.php => list.php} (69%)
 rename samples/Identity/v3/domains/{show_domain.php => read.php} (66%)
 rename samples/Identity/v3/domains/{update_domain.php => update.php} (68%)
 rename samples/Identity/v3/endpoints/{add_endpoint.php => create.php} (76%)
 rename samples/Identity/v3/endpoints/{delete_endpoint.php => delete.php} (67%)
 rename samples/Identity/v3/endpoints/{list_endpoints.php => list.php} (70%)
 rename samples/Identity/v3/endpoints/{get_endpoint.php => read.php} (65%)
 rename samples/Identity/v3/endpoints/{update_endpoint.php => update.php} (71%)
 rename samples/Identity/v3/groups/{add_group.php => create.php} (69%)
 rename samples/Identity/v3/groups/{delete_group.php => delete.php} (66%)
 rename samples/Identity/v3/groups/{list_groups.php => list.php} (69%)
 rename samples/Identity/v3/groups/{get_group.php => read.php} (66%)
 rename samples/Identity/v3/groups/{update_group.php => update.php} (70%)
 rename samples/Identity/v3/projects/{add_project.php => create.php} (71%)
 rename samples/Identity/v3/projects/{delete_project.php => delete.php} (66%)
 rename samples/Identity/v3/projects/{list_projects.php => list.php} (65%)
 rename samples/Identity/v3/projects/{get_project.php => read.php} (66%)
 rename samples/Identity/v3/projects/{update_project.php => update.php} (68%)
 rename samples/Identity/v3/roles/{add_role.php => create.php} (78%)
 rename samples/Identity/v3/roles/{list_roles.php => list.php} (80%)
 rename samples/Identity/v3/services/{add_service.php => create.php} (69%)
 rename samples/Identity/v3/services/{delete_service.php => delete.php} (66%)
 rename samples/Identity/v3/services/{list_services.php => list.php} (69%)
 rename samples/Identity/v3/services/{get_service.php => read.php} (67%)
 rename samples/Identity/v3/services/{update_service.php => update.php} (69%)
 rename samples/Identity/v3/users/{add_user.php => create.php} (91%)
 rename samples/Identity/v3/users/{delete_user.php => delete.php} (78%)
 rename samples/Identity/v3/users/{list_users.php => list.php} (80%)
 rename samples/Identity/v3/users/{get_user.php => read.php} (78%)
 rename samples/Identity/v3/users/{update_user.php => update.php} (81%)
 create mode 100644 samples/Images/v2/create.php
 create mode 100644 samples/Images/v2/create_with_region.php
 rename samples/Images/v2/images/{get.php => read.php} (66%)
 delete mode 100644 samples/Images/v2/members/add.php
 create mode 100644 samples/Images/v2/members/create.php
 delete mode 100644 samples/Images/v2/members/get.php
 create mode 100644 samples/Images/v2/members/read.php
 delete mode 100644 samples/Networking/v2/lbaas/healthmonitors/get.php
 create mode 100644 samples/Networking/v2/lbaas/healthmonitors/read.php
 delete mode 100644 samples/Networking/v2/lbaas/listeners/get.php
 create mode 100644 samples/Networking/v2/lbaas/listeners/read.php
 rename samples/Networking/v2/lbaas/loadbalancers/{get.php => read.php} (100%)
 rename samples/Networking/v2/lbaas/pools/{get.php => read.php} (59%)
 delete mode 100644 samples/Networking/v2/networks/get.php
 create mode 100644 samples/Networking/v2/networks/read.php
 rename samples/Networking/v2/ports/{get.php => read.php} (64%)
 delete mode 100644 samples/Networking/v2/subnets/get.php
 create mode 100644 samples/Networking/v2/subnets/read.php
 create mode 100644 samples/ObjectStore/v1/account/read.php
 create mode 100644 samples/ObjectStore/v1/containers/read.php
 create mode 100644 samples/ObjectStore/v1/objects/read.php
 create mode 100644 samples/Setup/application_credential_id.php
 create mode 100644 samples/Setup/token_id.php
 create mode 100644 samples/Setup/user_id.php
 create mode 100644 samples/Setup/username.php

diff --git a/doc/_exts/osdoc.py b/doc/_exts/osdoc.py
new file mode 100644
index 00000000..73d7f88c
--- /dev/null
+++ b/doc/_exts/osdoc.py
@@ -0,0 +1,31 @@
+from docutils.parsers.rst import Directive
+from docutils import nodes
+
+
+class OsDoc(Directive):
+    required_arguments = 1
+    has_content = True
+
+    def run(self):
+        full_url = self.arguments[0]
+        title = 'official documentation'
+
+        text = []
+        text.extend([
+            nodes.Text('More information can be found in the '),
+            nodes.reference(title, title, internal=False, refuri=self.arguments[0]),
+            nodes.Text('.')
+        ])
+
+        return [nodes.paragraph(
+            '',
+            '',
+            nodes.Text('More information can be found in the '),
+            nodes.reference(title, title, internal=False, refuri=full_url),
+            nodes.Text('.')
+        )]
+
+
+def setup(app):
+    app.add_directive('osdoc', OsDoc)
+    return {'version': '0.1'}
diff --git a/doc/_exts/samples.py b/doc/_exts/samples.py
index bb11d3eb..7c3910a0 100644
--- a/doc/_exts/samples.py
+++ b/doc/_exts/samples.py
@@ -1,33 +1,41 @@
 from docutils import nodes
-from sphinx.addnodes import download_reference
+from docutils.parsers.rst import directives
 from sphinx.directives.code import LiteralInclude
 import re
 
+from sphinx.util.typing import OptionSpec
+
+
 class Sample(LiteralInclude):
+    option_spec: OptionSpec = {
+        'full': directives.flag,
+    }
+
+    def run(self):
+        self.arguments[0] = "/../samples/" + self.arguments[0]
+        self.options['language'] = 'php'
 
-  def run(self):
-    self.arguments[0] = "/../samples/" + self.arguments[0]
-    self.options['language'] = 'php'
+        pattern = r"[\s+]?(\<\?php.*?]\);)"
 
-    pattern = r"[\s+]?(\<\?php.*?]\);)"
+        code_block = super(Sample, self).run()[0]
+        if 'full' in self.options:
+            return [code_block]
 
-    code_block = super(Sample, self).run()[0]
-    string = str(code_block[0])
+        string = str(code_block[0])
 
-    match = re.match(pattern, string, re.S)
-    if match is None:
-      return [code_block]
+        match = re.match(pattern, string, re.S)
+        if match is None:
+            return [code_block]
 
-    auth_str = match.group(1).strip()
-    main_str = re.sub(pattern, "", string, 0, re.S).strip()
+        main_str = re.sub(pattern, "", string, 0, re.S).strip()
+        if main_str == '':
+            return [code_block]
 
-    show_hide_btn = download_reference(reftarget=self.arguments[0])
+        return [
+            nodes.literal_block(main_str, main_str, language="php")
+        ]
 
-    return [
-        show_hide_btn, 
-        nodes.literal_block(auth_str, auth_str, language="php"), 
-        nodes.literal_block(main_str, main_str, language="php")]
 
 def setup(app):
-  app.add_directive('sample', Sample)
-  return {'version': '0.1'}
+    app.add_directive('sample', Sample)
+    return {'version': '0.1'}
diff --git a/doc/_static/css/custom.css b/doc/_static/css/custom.css
new file mode 100644
index 00000000..33e75d96
--- /dev/null
+++ b/doc/_static/css/custom.css
@@ -0,0 +1,4 @@
+summary {
+    margin-bottom: 1rem;
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/doc/common/create-service.rst b/doc/common/create-service.rst
new file mode 100644
index 00000000..799043dd
--- /dev/null
+++ b/doc/common/create-service.rst
@@ -0,0 +1,18 @@
+Create Service
+==============
+
+In order to work with the service you have to :doc:`setup the client </setup>` first.
+
+Service can be created via :substitution-code:`|method|()` method of the ``OpenStack`` object.
+
+.. code-block:: php
+    :substitutions:
+
+    $service = $openstack->|method|();
+
+A list of additional options can be passed to the method. For example, to change the region:
+
+.. code-block:: php
+    :substitutions:
+
+    $service = $openstack->|method|(['region' => '{region}']);
diff --git a/doc/common/service.rst b/doc/common/service.rst
new file mode 100644
index 00000000..ce86944a
--- /dev/null
+++ b/doc/common/service.rst
@@ -0,0 +1 @@
+In order to work with |models| you have to :doc:`create the service <create>` first.
\ No newline at end of file
diff --git a/doc/conf.py b/doc/conf.py
index 16f6c857..14803257 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -23,14 +23,23 @@
 lexers['php-annotations'] = PhpLexer(startinline=True, linenos=1)
 primary_domain = 'php'
 
-extensions = ['samples', 'refdoc', 'sphinx.ext.autodoc', 'sphinx.ext.autosummary', 'sphinxcontrib.phpdomain']
+extensions = [
+    'samples',
+    'refdoc',
+    'osdoc',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    'sphinxcontrib.phpdomain',
+    'sphinx_toolbox.collapse',
+    'sphinx_substitution_extensions',
+]
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'php-opencloud'
 copyright = u'2015-2023, PHP OpenCloud & contributors'
 version = '1.12'
 release = '1.12.1'
-exclude_patterns = ['_build']
+exclude_patterns = ['_build', 'common']
 pygments_style = 'sphinx'
 
 html_theme = 'sphinx_rtd_theme'
@@ -39,6 +48,13 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'php-openclouddoc'
 
+# These folders are copied to the documentation's HTML output
+html_static_path = ['_static']
+
+html_css_files = [
+    'css/custom.css',
+]
+
 latex_documents = [
   ('index', 'php-opencloud.tex', u'php-opencloud Documentation',
    u'Jamie Hannaford', 'manual'),
diff --git a/doc/index.rst b/doc/index.rst
index 0feb0b93..ae2b0009 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -1,40 +1,23 @@
 Welcome to the OpenStack SDK for PHP!
 =====================================
 
-Requirements
-------------
-
-* PHP >= 7, < 9
-* cURL extension
-
-Installation
-------------
-
-You must install this library through Composer:
-
-.. code-block:: bash
+About
+-----
 
-    composer require php-opencloud/openstack
+OpenStack SDK allows PHP developers to easily connect to OpenStack APIs in a simple and idiomatic way.
+This binding is specifically designed for OpenStack APIs, but other provider SDKs are available.
+Multiple OpenStack services, and versions of services, are supported.
 
-If you do not have Composer installed, please read the `Composer installation instructions`_.
-
-Once you have installed the SDK as a dependency of your project, you will need to load Composer’s autoloader
-(which registers all the required namespaces). To do this, place the following line of PHP code at the top of your
-application’s PHP files:
-
-.. code-block:: php
-
-    require 'vendor/autoload.php';
-
-This assumes your application's PHP files are located in the same folder as ``vendor/``. If your files are located
-elsewhere, please supply the path to vendor/autoload.php in the require statement above.
+.. toctree::
+    install
+    setup
 
 Supported services
 ------------------
 
 .. toctree::
     :glob:
-    :maxdepth: 1
+    :maxdepth: 0
 
     services/**/index
 
@@ -49,6 +32,5 @@ Contributing
 If you'd like to contribute to the project, or require help running the unit/integration tests, please view the
 `contributing guidelines`_.
 
-.. _Composer installation instructions: `https://getcomposer.org/doc/00-intro.md`
-.. _Github repo: `https://github.com/php-opencloud/openstack`
-.. _contributing guidelines: `https://github.com/php-opencloud/openstack/blob/master/CONTRIBUTING.md`
+.. _Github repo: https://github.com/php-opencloud/openstack
+.. _contributing guidelines: https://github.com/php-opencloud/openstack/blob/master/CONTRIBUTING.md
diff --git a/doc/install.rst b/doc/install.rst
new file mode 100644
index 00000000..fa2868e8
--- /dev/null
+++ b/doc/install.rst
@@ -0,0 +1,35 @@
+Installation
+============
+
+Requirements
+------------
+
+* PHP >= 7, < 9
+* cURL extension
+
+Install via composer
+--------------------
+
+You must install this library through Composer:
+
+.. code-block:: bash
+
+    composer require php-opencloud/openstack
+
+If you do not have Composer installed, please read the `Composer installation instructions`_.
+
+Include autoloader
+------------------
+
+Once you have installed the SDK as a dependency of your project, you will need to load Composer’s autoloader
+(which registers all the required namespaces). To do this, place the following line of PHP code at the top of your
+application’s PHP files:
+
+.. code-block:: php
+
+    require 'vendor/autoload.php';
+
+This assumes your application's PHP files are located in the same folder as ``vendor/``. If your files are located
+elsewhere, please supply the path to vendor/autoload.php in the require statement above.
+
+.. _Composer installation instructions: https://getcomposer.org/doc/00-intro.md
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 6c439f25..505737dd 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,2 +1,4 @@
 sphinxcontrib-phpdomain>=0.11.0
-sphinx-rtd-theme>=0.5.1
\ No newline at end of file
+sphinx-rtd-theme>=0.5.1
+sphinx-toolbox>=3.5.0
+sphinx-substitution-extensions
\ No newline at end of file
diff --git a/doc/services/block-storage/v2/index.rst b/doc/services/block-storage/v2/index.rst
index 9e046e31..e67c6a42 100644
--- a/doc/services/block-storage/v2/index.rst
+++ b/doc/services/block-storage/v2/index.rst
@@ -3,7 +3,7 @@ Block Storage v2
 
 Block Storage v2 API is deprecated since Pike release and was removed in the Xena release.
 It is recommended to use Block Storage v3 API instead. However most of endpoints are identical, so if you still need
-to use Block Storage v2 API, you can use the change `$openstack->blockStorageV3()` to `$openstack->blockStorageV2()` in examples.
+to use Block Storage v2 API, you can use the change ``$openstack->blockStorageV3()`` to ``$openstack->blockStorageV2()`` in examples.
 In most cases it will work without any other changes.
 
-.. sample:: BlockStorage/v2/create_service.php
+.. sample:: BlockStorage/v2/create.php
diff --git a/doc/services/block-storage/v3/create.rst b/doc/services/block-storage/v3/create.rst
new file mode 100644
index 00000000..80998dcc
--- /dev/null
+++ b/doc/services/block-storage/v3/create.rst
@@ -0,0 +1,3 @@
+.. |method| replace:: blockStorageV3
+
+.. include:: /common/create-service.rst
\ No newline at end of file
diff --git a/doc/services/block-storage/v3/index.rst b/doc/services/block-storage/v3/index.rst
index d012ed56..7c8acfbd 100644
--- a/doc/services/block-storage/v3/index.rst
+++ b/doc/services/block-storage/v3/index.rst
@@ -1,9 +1,15 @@
 Block Storage v3
 ================
 
+OpenStack Block Storage API v3 (Cinder). Cinder is the OpenStack Block Storage service for providing volumes
+to Nova virtual machines, Ironic bare metal hosts, containers and more.
+
+.. osdoc:: https://docs.openstack.org/api-ref/block-storage/v3/
+
 .. toctree::
-   :maxdepth: 3
+    :maxdepth: 3
 
-   volumes
-   volume-types
-   snapshots
+    create
+    volumes
+    volume-types
+    snapshots
diff --git a/doc/services/block-storage/v3/snapshots.rst b/doc/services/block-storage/v3/snapshots.rst
index e3aea5f5..c2cfa83d 100644
--- a/doc/services/block-storage/v3/snapshots.rst
+++ b/doc/services/block-storage/v3/snapshots.rst
@@ -1,18 +1,26 @@
 Snapshots
 =========
 
-List volumes
-------------
+A snapshot is read-only point in time copy of a volume. The snapshot can be created from a volume that is currently in use
+or in an available state. The snapshot can then be used to create a new volume.
+
+.. osdoc:: https://docs.openstack.org/api-ref/block-storage/v3/#volume-snapshots-snapshots
+
+.. |models| replace:: snapshots
+
+.. include:: /common/service.rst
+
+List
+----
 
 .. sample:: BlockStorage/v3/snapshots/list.php
-.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listSnapshots
 
 Each iteration will return a php:class:`Snapshot` instance <OpenStack/BlockStorage/v2/Models/Snapshot.html>.
 
 .. include:: /common/generators.rst
 
-List volumes sorted
-~~~~~~~~~~~~~~~~~~~
+List sorted
+~~~~~~~~~~~
 
 Possible values for sort_key are:
 
diff --git a/doc/services/block-storage/v3/volume-types.rst b/doc/services/block-storage/v3/volume-types.rst
index b89d0222..e052e010 100644
--- a/doc/services/block-storage/v3/volume-types.rst
+++ b/doc/services/block-storage/v3/volume-types.rst
@@ -1,59 +1,45 @@
 Volume Types
 ============
 
-Listing volume types
---------------------
-.. sample:: BlockStorage/v3/volume_types/list.php
-.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumeTypes
+Volume type is a group of volume policies. They can be used to specify which driver must be used on volume creation.
 
-Each iteration will return a :php:class:`VolumeType` instance <OpenStack/BlockStorage/v2/Models/VolumeType.html>.
+.. osdoc:: https://docs.openstack.org/api-ref/block-storage/v3/#volumes-volumes
 
-.. include:: /common/generators.rst
+.. |models| replace:: volume types
 
+.. include:: /common/service.rst
 
-Create volume type
-------------------
+Create
+------
 
-The only attributes that are required when creating a volume are a name. The simplest example
-would therefore be this:
+The only attributes that are required when creating a volume are a name.
 
 .. sample:: BlockStorage/v3/volume_types/create.php
-.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_createVolumeType
-
-
-Retrieve details of a volume type
----------------------------------
-
-When retrieving a volume type, sometimes you only want to operate on it - say to update or delete it. If this is the
-case, then there is no need to perform an initial GET request to the API:
-
-.. sample:: BlockStorage/v3/volume_types/get.php
-
-If, however, you *do* want to retrieve all the details of a remote volume type from the API, you just call:
 
-.. code-block:: php
 
-    $volumeType->retrieve();
+Read
+----
 
-which will update the state of the local object. This gives you an element of control over your app's performance.
+.. sample:: BlockStorage/v3/volume_types/read.php
 
-.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_getVolumeType
 
-
-Update a volume type
---------------------
-
-The first step when updating a volume type is modifying the attributes you want updated. By default, only a volume
-type's name can be edited.
+Update
+------
 
 .. sample:: BlockStorage/v3/volume_types/update.php
-.. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_update
 
 
-Delete volume type
-------------------
+Delete
+------
 
 To permanently delete a volume type:
 
 .. sample:: BlockStorage/v3/volume_types/delete.php
-.. refdoc:: OpenStack/BlockStorage/v2/Models/VolumeType.html#method_delete
\ No newline at end of file
+
+List
+----
+.. sample:: BlockStorage/v3/volume_types/list.php
+
+Each iteration will return a :php:class:`VolumeType` instance <OpenStack/BlockStorage/v2/Models/VolumeType.html>.
+
+.. include:: /common/generators.rst
diff --git a/doc/services/block-storage/v3/volumes.rst b/doc/services/block-storage/v3/volumes.rst
index 82843b6c..9805616f 100644
--- a/doc/services/block-storage/v3/volumes.rst
+++ b/doc/services/block-storage/v3/volumes.rst
@@ -1,26 +1,17 @@
 Volumes
 =======
 
-List volumes
-------------
+A volume is a detachable block storage device similar to a USB hard drive. You can attach a volume to an instance, and
+if the volume is of an appropriate volume type, a volume can be attached to multiple instances.
 
-.. sample:: BlockStorage/v3/volumes/list.php
-.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_listVolumes
-
-Each iteration will return a php:class:`Volume` instance <OpenStack/BlockStorage/v2/Models/Volume.html>.
-
-.. include:: /common/generators.rst
-
-Detailed information
-~~~~~~~~~~~~~~~~~~~~
+.. osdoc:: https://docs.openstack.org/api-ref/block-storage/v3/#volumes-volumes
 
-By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information
-for a flavor, you must enable detailed information, like so:
+.. |models| replace:: volumes
 
-.. sample:: BlockStorage/v3/volumes/list_detail.php
+.. include:: /common/service.rst
 
-Create volume
--------------
+Create
+------
 
 The only attributes that are required when creating a volume are a size in GiB. The simplest example
 would therefore be this:
@@ -30,8 +21,6 @@ would therefore be this:
 You can further configure your new volume, however, by following the below sections, which instruct you how to add
 specific functionality.
 
-.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_createVolume
-
 Create from image
 ~~~~~~~~~~~~~~~~~
 
@@ -42,44 +31,46 @@ Create from snapshot
 
 .. sample:: BlockStorage/v3/volumes/create_from_snapshot.php
 
-Create from source volume
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Create from volume
+~~~~~~~~~~~~~~~~~~
 
-.. sample:: BlockStorage/v3/volumes/create_from_source_volume.php
+.. sample:: BlockStorage/v3/volumes/create_from_volume.php
 
 
-Retrieve volume details
------------------------
+Read
+----
 
-When retrieving a volume, sometimes you only want to operate on it - say to update or delete it. If this is the case,
-then there is no need to perform an initial GET request to the API:
+.. sample:: BlockStorage/v3/volumes/read.php
 
-.. sample:: BlockStorage/v3/volumes/get.php
 
-If, however, you *do* want to retrieve all the details of a remote volume from the API, you just call:
+Update
+------
 
-.. code-block:: php
+The first step when updating a volume is modifying the attributes you want updated. Only a volume's name
+and description can be edited.
 
-    $volume->retrieve();
+.. sample:: BlockStorage/v3/volumes/update.php
 
-which will update the state of the local object. This gives you an element of control over your app's performance.
+Delete
+------
 
-.. refdoc:: OpenStack/BlockStorage/v2/Service.html#method_getVolume
+To permanently delete a volume:
 
+.. sample:: BlockStorage/v3/volumes/delete.php
 
-Update volume
--------------
+List
+----
 
-The first step when updating a volume is modifying the attributes you want updated. By default, only a volume's name
-and description can be edited.
+.. sample:: BlockStorage/v3/volumes/list.php
 
-.. sample:: BlockStorage/v3/volumes/update.php
-.. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_update
+Each iteration will return a php:class:`Volume` instance <OpenStack/BlockStorage/v2/Models/Volume.html>.
 
-Delete volume
--------------
+.. include:: /common/generators.rst
 
-To permanently delete a volume:
+Detailed information
+~~~~~~~~~~~~~~~~~~~~
 
-.. sample:: BlockStorage/v3/volumes/delete.php
-.. refdoc:: OpenStack/BlockStorage/v2/Models/Volume.html#method_delete
\ No newline at end of file
+By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information
+for a flavor, you must enable detailed information:
+
+.. sample:: BlockStorage/v3/volumes/list_detail.php
diff --git a/doc/services/compute/v2/create.rst b/doc/services/compute/v2/create.rst
new file mode 100644
index 00000000..07800c76
--- /dev/null
+++ b/doc/services/compute/v2/create.rst
@@ -0,0 +1,3 @@
+.. |method| replace:: objectStoreV1
+
+.. include:: /common/create-service.rst
diff --git a/doc/services/compute/v2/flavors.rst b/doc/services/compute/v2/flavors.rst
index 6d71b734..7fb2409a 100644
--- a/doc/services/compute/v2/flavors.rst
+++ b/doc/services/compute/v2/flavors.rst
@@ -1,46 +1,36 @@
 Flavors
 =======
 
-List flavors
-------------
+Flavors define the compute, memory, and storage capacity of nova computing instances. To put it simply, a flavor is
+an available hardware configuration for a server. It defines the size of a virtual server that can be launched.
 
-.. sample:: Compute/v2/flavors/list_flavors.php
-.. refdoc:: OpenStack/Compute/v2/Service.html#method_listFlavors
+.. osdoc:: https://docs.openstack.org/nova/latest/user/flavors.html
 
-Each iteration will return a :php:class:`Flavor` instance <OpenStack/Compute/v2/Models/Flavor.html>.
-
-.. include:: /common/generators.rst
-
-Detailed information
-~~~~~~~~~~~~~~~~~~~~
+.. |models| replace:: flavors
 
-By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information
-for a flavor, you must pass ``true`` as the last parameter, like so:
+.. include:: /common/service.rst
 
-.. code-block:: php
+Read
+----
 
-    $flavors = $service->listFlavors([], function ($flavor) {
-        return $flavor;
-    }, true);
+.. sample:: Compute/v2/flavors/read.php
 
-Retrieve a flavor
------------------
+List
+----
 
-.. sample:: Compute/v2/flavors/get_flavor.php
-.. refdoc:: OpenStack/Compute/v2/Service.html#method_getFlavor
+.. sample:: Compute/v2/flavors/list.php
 
-When retrieving a flavor, sometimes you only want to operate on it. If this is the case,
-then there is no need to perform an initial ``GET`` request to the server:
+Each iteration will return a :php:class:`Flavor` instance <OpenStack/Compute/v2/Models/Flavor.html>.
 
-.. code-block:: php
+.. include:: /common/generators.rst
 
-    // Get an unpopulated object
-    $flavor = $service->getFlavor(['id' => '{flavorId}']);
+Detailed information
+~~~~~~~~~~~~~~~~~~~~
 
-If, however, you *do* want to retrieve all the details of a remote flavor from the API, you just call:
+By default, only the ``id``, ``links`` and ``name`` attributes are returned. To return *all* information
+for a flavor, you must pass ``true`` as the last parameter, like so:
 
 .. code-block:: php
 
-    $flavor->retrieve();
+    $flavors = $service->listFlavors([], null, true);
 
-which will update the state of the local object. This gives you an element of control over your app's performance.
diff --git a/doc/services/compute/v2/images.rst b/doc/services/compute/v2/images.rst
index 6a2ce6e7..9ca8e4b7 100644
--- a/doc/services/compute/v2/images.rst
+++ b/doc/services/compute/v2/images.rst
@@ -1,6 +1,12 @@
 Images
 ======
 
+.. warning::
+    These APIs are proxy calls to the :doc:`/services/images/v2/index` Image service.
+    Nova has deprecated all the proxy APIs and users should use the native APIs instead.
+
+.. osdoc:: https://docs.openstack.org/api-ref/compute/#images-deprecated
+
 List images
 -----------
 
@@ -9,7 +15,6 @@ List images
 Each iteration will return an :apiref:Image instance <OpenStack/Compute/v2/Models/Image.html>_.
 
 .. include:: /common/generators.rst
-.. refdoc:: OpenStack/Compute/v2/Service.html#method_listImages
 
 Detailed information
 ~~~~~~~~~~~~~~~~~~~~
@@ -28,7 +33,6 @@ When retrieving an image, sometimes you only want to operate on it - say to upda
 then there is no need to perform an initial GET request to the server:
 
 .. sample:: Compute/v2/images/get_image.php
-.. refdoc:: OpenStack/Compute/v2/Service.html#method_getImage
 
 If, however, you *do* want to retrieve all the details of a remote image from the API, you just call:
 
@@ -42,7 +46,6 @@ Delete an image
 ---------------
 
 .. sample:: Compute/v2/images/delete_image.php
-.. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_delete
 
 Retrieve metadata
 -----------------
@@ -53,8 +56,6 @@ This operation will retrieve the existing metadata for an image:
 
     $metadata = $image->getMetadata();
 
-.. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_getMetadata
-
 Reset metadata
 --------------
 
@@ -63,8 +64,6 @@ Reset metadata
 This operation will _replace_ all existing metadata with whatever is provided in the request. Any existing metadata
 not specified in the request will be deleted.
 
-.. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_resetMetadata
-
 Merge metadata
 --------------
 
@@ -77,8 +76,6 @@ will be added. Any existing keys that are not specified in the request will rema
         'foo' => 'bar',
     ]);
 
-.. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_mergeMetadata
-
 Retrieve image metadata item
 ----------------------------
 
@@ -88,12 +85,9 @@ This operation allows you to retrieve the value for a specific metadata item:
 
     $itemValue = $image->getMetadataItem('key');
 
-.. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_getMetadataItem
-
 Delete image metadata item
 --------------------------
 
 This operation allows you to remove a specific metadata item:
 
 .. sample:: Compute/v2/images/delete_image_metadata_item.php
-.. refdoc:: OpenStack/Compute/v2/Models/Image.html#method_deleteMetadataItem
\ No newline at end of file
diff --git a/doc/services/compute/v2/index.rst b/doc/services/compute/v2/index.rst
index cd9b4fd4..26190cda 100644
--- a/doc/services/compute/v2/index.rst
+++ b/doc/services/compute/v2/index.rst
@@ -1,9 +1,15 @@
 Compute v2
 ==========
 
+OpenStack Compute (Nova) API Version 2. Nova is the OpenStack project that provides a way to provision compute instances
+(aka virtual servers).
+
+.. osdoc:: https://docs.openstack.org/api-ref/compute/
+
 .. toctree::
     :maxdepth: 3
 
+    create
     servers
     flavors
     images
diff --git a/doc/services/compute/v2/servers.rst b/doc/services/compute/v2/servers.rst
index eb6ed7ea..4865771d 100644
--- a/doc/services/compute/v2/servers.rst
+++ b/doc/services/compute/v2/servers.rst
@@ -1,17 +1,24 @@
 Servers
 =======
 
-Listing servers
----------------
+Server is the main resource in the Compute API. It represents a virtual machine.
+
+.. osdoc:: https://docs.openstack.org/api-ref/compute/#servers-servers
+
+.. |models| replace:: servers
+
+.. include:: /common/service.rst
+
+List
+----
 
 To list a collection of servers, you run:
 
-.. sample:: Compute/v2/servers/list_servers.php
+.. sample:: Compute/v2/servers/list.php
 
 Each iteration will return a :apiref:Server instance <OpenStack/Compute/v2/Models/Server.html>.
 
 .. include:: /common/generators.rst
-.. refdoc:: OpenStack/Compute/v2/Service.html#method_listServers
 
 Detailed information
 ~~~~~~~~~~~~~~~~~~~~
@@ -38,19 +45,17 @@ parameters which are documented in the reference documentation.
         'flavorId'     => 'performance1-1',
     ]);
 
-Create a server
----------------
+Create
+------
 
 The only attributes that are required when creating a server are a name, flavor ID and image ID. The simplest example
 would therefore be this:
 
-.. sample:: Compute/v2/servers/create_server.php
+.. sample:: Compute/v2/servers/create.php
 
 You can further configure your new server, however, by following the below sections, which instruct you how to add
 specific functionality. They are interoperable and can work together.
 
-.. refdoc:: OpenStack/Compute/v2/Service.html#method_createServer
-
 Security groups
 ~~~~~~~~~~~~~~~
 
@@ -133,40 +138,25 @@ when the server is launched, use this option:
         'baz' => 'bar',
     ];
 
-Retrieve a server
------------------
-
-When retrieving a server, sometimes you only want to operate on it - say to update or delete it. If this is the case,
-then there is no need to perform an initial GET request to the server:
-
-.. sample:: Compute/v2/servers/get_server.php
+Read
+----
 
-If, however, you *do* want to retrieve all the details of a remote server from the API, you just call:
+.. sample:: Compute/v2/servers/read.php
 
-.. code-block:: php
-
-    $server->retrieve();
-
-which will update the state of the local object. This gives you an element of control over your app's performance.
-
-.. refdoc:: OpenStack/Compute/v2/Service.html#method_getServer
-
-Update a server
----------------
+Update
+------
 
 The first step when updating a server is modifying the attributes you want updated. By default, only a server's name,
 IPv4 and IPv6 IPs, and its auto disk config attributes can be edited.
 
-.. sample:: Compute/v2/servers/update_server.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_update
+.. sample:: Compute/v2/servers/update.php
 
-Delete a server
+Delete
 ---------------
 
 To permanently delete a server:
 
-.. sample:: Compute/v2/servers/delete_server.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_delete
+.. sample:: Compute/v2/servers/delete.php
 
 Retrieve metadata
 -----------------
@@ -174,7 +164,6 @@ Retrieve metadata
 This operation will retrieve the existing metadata for a server:
 
 .. sample:: Compute/v2/servers/get_server_metadata.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_getMetadata
 
 Reset metadata
 --------------
@@ -183,7 +172,6 @@ This operation will _replace_ all existing metadata with whatever is provided in
 not specified in the request will be deleted.
 
 .. sample:: Compute/v2/servers/reset_server_metadata.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resetMetadata
 
 Merge metadata
 --------------
@@ -192,7 +180,6 @@ This operation will _merge_ specified metadata with what already exists. Existin
 will be added. Any existing keys that are not specified in the request will remain unaffected.
 
 .. sample:: Compute/v2/servers/merge_server_metadata.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_mergeMetadata
 
 Retrieve metadata item
 ----------------------
@@ -200,7 +187,6 @@ Retrieve metadata item
 This operation allows you to retrieve the value for a specific metadata item:
 
 .. sample:: Compute/v2/servers/get_server_metadata_item.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_getMetadataItem
 
 Delete metadata item
 --------------------
@@ -208,7 +194,6 @@ Delete metadata item
 This operation allows you to remove a specific metadata item:
 
 .. sample:: Compute/v2/servers/delete_server_metadata_item.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_deleteMetadataItem
 
 Change root password
 --------------------
@@ -216,7 +201,6 @@ Change root password
 This operation will replace the root password for a server.
 
 .. sample:: Compute/v2/servers/change_server_password.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_changePassword
 
 Reset server state
 ------------------
@@ -224,7 +208,6 @@ Reset server state
 This operation will reset the state of the server.
 
 .. sample:: Compute/v2/servers/reset_server_state.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resetState
 
 Reboot server
 -------------
@@ -233,7 +216,6 @@ This operation will reboot a server. You can specify HARD reboot by passing argu
 Otherwise, the default is a SOFT reboot.
 
 .. sample:: Compute/v2/servers/reboot_server.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_reboot
 
 Rebuild server
 --------------
@@ -243,7 +225,6 @@ system. It will shutdown, re-image and then reboot your instance. Any data saved
 the rebuild is performed.
 
 .. sample:: Compute/v2/servers/rebuild_server.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_rebuild
 
 Resize server
 -------------
@@ -253,7 +234,6 @@ transition to a VERIFY_RESIZE state and a VM status of RESIZED. You will either
 resize in order to continue.
 
 .. sample:: Compute/v2/servers/resize_server.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_resize
 
 Confirm server resize
 ---------------------
@@ -263,7 +243,6 @@ VERIFY_RESIZE and a VM status of RESIZED. Once this operation completes, the ser
 ACTIVE state and a migration status of confirmed.
 
 .. sample:: Compute/v2/servers/confirm_server_resize.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_confirmResize
 
 Revert server resize
 --------------------
@@ -273,7 +252,6 @@ VERIFY_RESIZE and a VM status of RESIZED. Once this operation completes, the ser
 ACTIVE state and a migration status of reverted.
 
 .. sample:: Compute/v2/servers/revert_server_resize.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_revertResize
 
 Create server image
 -------------------
@@ -282,7 +260,6 @@ This operation will create a new server image. The only required option is the n
 additional metadata:
 
 .. sample:: Compute/v2/images/create_server_image.php
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_createImage
 
 List server IP addresses
 ------------------------
@@ -303,11 +280,3 @@ You can also refine by network label:
     $ipAddresses = $server->listAddresses([
         'networkLabel' => '{networkLabel}',
     ]);
-
-.. refdoc:: OpenStack/Compute/v2/Models/Server.html#method_listAddresses
-
-Further links
--------------
-
-* Reference docs for Server class
-* API docs
diff --git a/doc/services/compute/v2/states.rst b/doc/services/compute/v2/states.rst
index 5a1106f0..ac75810c 100644
--- a/doc/services/compute/v2/states.rst
+++ b/doc/services/compute/v2/states.rst
@@ -1,5 +1,5 @@
 Server states
--------------
+=============
 
 Servers contain a status attribute that indicates the current server state. You can filter on the server status when
 you complete a list servers request. The server status is returned in the response body. The server status is one of
diff --git a/doc/services/identity/v2/authentication.rst b/doc/services/identity/v2/authentication.rst
deleted file mode 100644
index 6f5d515f..00000000
--- a/doc/services/identity/v2/authentication.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-Authentication
-==============
-
-Identity v2.0
--------------
-
-We recommend users to use identity v3 when possible.
-
-RackSpace cloud and OVH cloud, however, are still using Keystone v2.0. This following code will work for such providers.
-
-
-.. sample:: Identity/v2/authentication.php
diff --git a/doc/services/identity/v2/index.rst b/doc/services/identity/v2/index.rst
index d4f39ac1..b0000411 100644
--- a/doc/services/identity/v2/index.rst
+++ b/doc/services/identity/v2/index.rst
@@ -1,7 +1,9 @@
 Identity v2
 ===========
 
-.. toctree::
-    :maxdepth: 3
+We recommend users to use Identity v3 when possible.
 
-    authentication
\ No newline at end of file
+Some public clouds, however, might still use Keystone v2. This following code will work for such providers.
+
+.. sample:: Identity/v2/authentication.php
+    :full:
diff --git a/doc/services/identity/v3/application-credentials.rst b/doc/services/identity/v3/application-credentials.rst
index c45b393f..ad8009fd 100644
--- a/doc/services/identity/v3/application-credentials.rst
+++ b/doc/services/identity/v3/application-credentials.rst
@@ -1,17 +1,30 @@
 Application Credentials
 =======================
 
-Add application credential
---------------------------
+Application credentials provide a way to delegate a user’s authorization to an application without sharing the user’s
+password authentication. This is a useful security measure, especially for situations where the user’s identification
+is provided by an external source, such as LDAP or a single-sign-on service. Instead of storing user passwords in
+config files, a user creates an application credential for a specific project, with all or a subset of the role assignments
+they have on that project, and then stores the application credential identifier and secret in the config file.
 
-.. sample:: Identity/v3/application_credentials/add_application_credential.php
+.. osdoc:: https://docs.openstack.org/keystone/latest/user/application_credentials.html
 
-Show application credential details
------------------------------------
+.. |models| replace:: application credentials
 
-.. sample:: Identity/v3/application_credentials/show_application_credential.php
+.. include:: /common/service.rst
 
-Delete application credential
------------------------------
+Create
+------
+
+.. sample:: Identity/v3/application_credentials/create.php
+
+Read
+----
+
+.. sample:: Identity/v3/application_credentials/read.php
+
+Delete
+------
+
+.. sample:: Identity/v3/application_credentials/delete.php
 
-.. sample:: Identity/v3/application_credentials/delete_application_credential.php
diff --git a/doc/services/identity/v3/create.rst b/doc/services/identity/v3/create.rst
new file mode 100644
index 00000000..9f0c6d3a
--- /dev/null
+++ b/doc/services/identity/v3/create.rst
@@ -0,0 +1,3 @@
+.. |method| replace:: identityV3
+
+.. include:: /common/create-service.rst
diff --git a/doc/services/identity/v3/credentials.rst b/doc/services/identity/v3/credentials.rst
index 56a1e55e..23a753c6 100644
--- a/doc/services/identity/v3/credentials.rst
+++ b/doc/services/identity/v3/credentials.rst
@@ -1,41 +1,44 @@
 Credentials
 ===========
 
-Add credential
---------------
+In exchange for a set of authentication credentials that the user submits, the Identity service generates and returns
+a token. A token represents the authenticated identity of a user and, optionally, grants authorization on a specific
+project or domain.
 
-Create a secret/access pair for use with ec2 style auth. This operation will generates a new set of credentials that
-map the user/tenant pair.
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#credentials
 
-.. sample:: Identity/v3/credentials/add_cred.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createCredential
+.. |models| replace:: credentials
 
-List credentials
-----------------
+.. include:: /common/service.rst
 
-List all credentials for a given user.
+Create
+------
 
-.. sample:: Identity/v3/credentials/list_creds.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listCredentials
+Create a secret/access pair for use with ec2 style auth. This operation will generates a new set of credentials that
+map the user/tenant pair.
 
-Show credential details
------------------------
+.. sample:: Identity/v3/credentials/create.php
+
+Read
+----
 
 Retrieve a user's access/secret pair by the access key.
 
-.. sample:: Identity/v3/credentials/get_cred.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getCredential
+.. sample:: Identity/v3/credentials/read.php
 
-Update credential
------------------
+Update
+------
 
-.. sample:: Identity/v3/credentials/update_cred.php
-.. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_update
+.. sample:: Identity/v3/credentials/update.php
 
-Delete credential
------------------
+Delete
+------
 
 Delete a user's access/secret pair.
 
-.. sample:: Identity/v3/credentials/delete_cred.php
-.. refdoc:: OpenStack/Identity/v3/Models/Credential.html#method_delete
+.. sample:: Identity/v3/credentials/delete.php
+
+List
+----
+
+.. sample:: Identity/v3/credentials/list.php
diff --git a/doc/services/identity/v3/domains.rst b/doc/services/identity/v3/domains.rst
index 409059d9..c5ddb653 100644
--- a/doc/services/identity/v3/domains.rst
+++ b/doc/services/identity/v3/domains.rst
@@ -1,80 +1,75 @@
 Domains
 =======
 
-Add domain
-----------
+A domain is a collection of users, groups, and projects. Each group and project is owned by exactly one domain.
 
-.. sample:: Identity/v3/domains/add_domain.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createDomain
+.. osdoc:: https://docs.openstack.org/keystone/latest/getting-started/architecture.html#domains
 
-List domains
-------------
+.. |models| replace:: domains
 
-.. sample:: Identity/v3/domains/list_domains.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listDomains
+.. include:: /common/service.rst
 
-Show domain details
--------------------
+Create
+------
 
-.. sample:: Identity/v3/domains/show_domain.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getDomain
+.. sample:: Identity/v3/domains/create.php
 
-Update domain
--------------
+Read
+----
 
-.. sample:: Identity/v3/domains/update_domain.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_update
+.. sample:: Identity/v3/domains/read.php
 
-Delete domain
--------------
+Update
+------
 
-.. sample:: Identity/v3/domains/delete_domain.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_delete
+.. sample:: Identity/v3/domains/update.php
+
+Delete
+------
+
+.. sample:: Identity/v3/domains/delete.php
+
+List
+----
+
+.. sample:: Identity/v3/domains/list.php
 
 List roles for domain user
 --------------------------
 
 .. sample:: Identity/v3/domains/list_user_roles.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listUserRoles
 
 Grant role to domain user
 -------------------------
 
 .. sample:: Identity/v3/domains/grant_user_role.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantUserRole
 
 Check role for domain user
 --------------------------
 
 .. sample:: Identity/v3/domains/check_user_role.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkUserRole
 
 Revoke role for domain user
 ---------------------------
 
 .. sample:: Identity/v3/domains/revoke_user_role.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeUserRole
 
 List roles for domain group
 ---------------------------
 
 .. sample:: Identity/v3/domains/list_group_roles.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_listGroupRoles
 
 Grant role to domain group
 --------------------------
 
 .. sample:: Identity/v3/domains/grant_group_role.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_grantGroupRole
 
 Check role for domain group
 ---------------------------
 
 .. sample:: Identity/v3/domains/check_group_role.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_checkGroupRole
 
 Revoke role for domain group
 ----------------------------
 
 .. sample:: Identity/v3/domains/revoke_group_role.php
-.. refdoc:: OpenStack/Identity/v3/Models/Domain.html#method_revokeGroupRole
diff --git a/doc/services/identity/v3/endpoints.rst b/doc/services/identity/v3/endpoints.rst
index d5d99e6a..252b0771 100644
--- a/doc/services/identity/v3/endpoints.rst
+++ b/doc/services/identity/v3/endpoints.rst
@@ -1,32 +1,39 @@
 Endpoints
 =========
 
-Add endpoints
--------------
+Each service should have one or more related endpoints. An endpoint is essentially a base URL for
+an API, along with some metadata about the endpoint itself and represents a set of URL endpoints for
+OpenStack web services.
 
-.. sample:: Identity/v3/endpoints/add_endpoint.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createEndpoint
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#service-catalog-and-endpoints
 
-Get endpoint
-------------
+.. |models| replace:: endpoints
 
-.. sample:: Identity/v3/endpoints/get_endpoint.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getEndpoint
+.. include:: /common/service.rst
 
-List endpoints
---------------
 
-.. sample:: Identity/v3/endpoints/list_endpoints.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listEndpoints
+Create
+------
+
+.. sample:: Identity/v3/endpoints/create.php
+
+Read
+----
+
+.. sample:: Identity/v3/endpoints/read.php
 
-Update endpoint
----------------
 
-.. sample:: Identity/v3/endpoints/update_endpoint.php
-.. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_update
+Update
+------
 
-Delete endpoint
----------------
+.. sample:: Identity/v3/endpoints/update.php
+
+Delete
+------
+
+.. sample:: Identity/v3/endpoints/delete.php
+
+List
+--------------
 
-.. sample:: Identity/v3/endpoints/delete_endpoint.php
-.. refdoc:: OpenStack/Identity/v3/Models/Endpoint.html#method_delete
+.. sample:: Identity/v3/endpoints/list.php
diff --git a/doc/services/identity/v3/groups.rst b/doc/services/identity/v3/groups.rst
index 4fc03775..62cb75f0 100644
--- a/doc/services/identity/v3/groups.rst
+++ b/doc/services/identity/v3/groups.rst
@@ -1,35 +1,39 @@
 Groups
 ======
 
-Add group
----------
+Groups are a container representing a collection of users. A group itself must be owned by a specific domain,
+and hence all group names are not globally unique, but only unique to their domain.
 
-.. sample:: Identity/v3/groups/add_group.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createGroup
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#groups
 
-List groups
------------
+.. |models| replace:: groups
 
-.. sample:: Identity/v3/groups/list_groups.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listGroups
+.. include:: /common/service.rst
 
-Show group details
-------------------
+Create
+------
 
-.. sample:: Identity/v3/groups/get_group.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getGroup
+.. sample:: Identity/v3/groups/create.php
 
-Update group
-------------
+Read
+----
 
-.. sample:: Identity/v3/groups/update_group.php
-.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_update
+.. sample:: Identity/v3/groups/read.php
 
-Delete group
-------------
+Update
+------
 
-.. sample:: Identity/v3/groups/delete_group.php
-.. refdoc:: OpenStack/Identity/v3/Models/Group.html#method_delete
+.. sample:: Identity/v3/groups/update.php
+
+Delete
+------
+
+.. sample:: Identity/v3/groups/delete.php
+
+List
+----
+
+.. sample:: Identity/v3/groups/list.php
 
 List users in a group
 ---------------------
diff --git a/doc/services/identity/v3/index.rst b/doc/services/identity/v3/index.rst
index 6520cc7b..be1cebdf 100644
--- a/doc/services/identity/v3/index.rst
+++ b/doc/services/identity/v3/index.rst
@@ -1,9 +1,14 @@
 Identity v3
 ===========
 
+OpenStack Identity API v3. It is used to manage the `OpenStack Keystone service <https://docs.openstack.org/keystone/latest/index.html>`_.
+
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html
+
 .. toctree::
   :maxdepth: 3
 
+  create
   application-credentials
   credentials
   domains
diff --git a/doc/services/identity/v3/policies.rst b/doc/services/identity/v3/policies.rst
index 6900ff01..4202951b 100644
--- a/doc/services/identity/v3/policies.rst
+++ b/doc/services/identity/v3/policies.rst
@@ -1,29 +1,6 @@
 Policies
 ========
 
-.. warning:: Due to lack of information in upstream documentation, we are unable to offer code samples for this resource yet.
+.. warning:: The policies API is deprecated. Keystone is not a policy management service. Do not use this.
 
-Add policy
-----------
-
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createPolicy
-
-List policies
--------------
-
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listPolicies
-
-Show policy details
--------------------
-
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getPolicy
-
-Update policy
--------------
-
-.. refdoc:: OpenStack/Identity/v3/Models/Policy.html#method_update
-
-Delete policy
--------------
-
-.. refdoc:: OpenStack/Identity/v3/Models/Policy.html#method_delete
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#policies
diff --git a/doc/services/identity/v3/projects.rst b/doc/services/identity/v3/projects.rst
index 1de4f2ab..5e25bbdf 100644
--- a/doc/services/identity/v3/projects.rst
+++ b/doc/services/identity/v3/projects.rst
@@ -1,35 +1,41 @@
 Projects
 ========
 
-Add project
------------
+Projects represent the base unit of ownership in OpenStack, in that all resources in OpenStack should be owned
+by a specific project. A project itself must be owned by a specific domain, and hence all project names
+are not globally unique, but unique to their domain. If the domain for a project is not specified, then it is added
+to the default domain.
 
-.. sample:: Identity/v3/projects/add_project.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createProject
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#projects
 
-List projects
--------------
+.. |models| replace:: projects
 
-.. sample:: Identity/v3/projects/list_projects.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listProjects
+.. include:: /common/service.rst
 
-Show project details
---------------------
+Create
+------
 
-.. sample:: Identity/v3/projects/get_project.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getProject
+.. sample:: Identity/v3/projects/create.php
 
-Update project
---------------
+Read
+----
 
-.. sample:: Identity/v3/projects/update_project.php
-.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_update
+.. sample:: Identity/v3/projects/read.php
 
-Delete project
---------------
+Update
+------
 
-.. sample:: Identity/v3/projects/delete_project.php
-.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_delete
+.. sample:: Identity/v3/projects/update.php
+
+Delete
+------
+
+.. sample:: Identity/v3/projects/delete.php
+
+List
+----
+
+.. sample:: Identity/v3/projects/list.php
 
 List roles for project user
 ---------------------------
diff --git a/doc/services/identity/v3/roles.rst b/doc/services/identity/v3/roles.rst
index 143dabee..2a60f1f4 100644
--- a/doc/services/identity/v3/roles.rst
+++ b/doc/services/identity/v3/roles.rst
@@ -1,20 +1,28 @@
 Roles
 =====
 
-Add role
---------
+OpenStack services typically determine whether a user’s API request should be allowed using Role Based Access Control (RBAC).
+For OpenStack this means the service compares the roles that user has on the project (as indicated by the roles in the token),
+against the roles required for the API in question (as defined in the service’s policy file). A user obtains roles
+on a project by having these assigned to them via the Identity service API.
 
-.. sample:: Identity/v3/roles/add_role.php
-.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_createRole
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#roles
 
-List roles
-----------
+.. |models| replace:: roles
 
-.. sample:: Identity/v3/roles/list_roles.php
-.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoles
+.. include:: /common/service.rst
+
+Create
+------
+
+.. sample:: Identity/v3/roles/create.php
+
+List
+----
+
+.. sample:: Identity/v3/roles/list.php
 
 List role assignments
 ---------------------
 
 .. sample:: Identity/v3/roles/list_assignments.php
-.. refdoc:: OpenStack/Identity/v3/Models/Project.html#method_listRoleAssignments
diff --git a/doc/services/identity/v3/services.rst b/doc/services/identity/v3/services.rst
index 39276162..338ce18f 100644
--- a/doc/services/identity/v3/services.rst
+++ b/doc/services/identity/v3/services.rst
@@ -1,26 +1,35 @@
 Services
 ========
 
-Add service
------------
+A service is an OpenStack web service that you can access through a URL, i.e. an endpoint.
 
-.. sample:: Identity/v3/services/add_service.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createService
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#roles
 
-List services
--------------
+.. |models| replace:: services
 
-.. sample:: Identity/v3/services/list_services.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listServices
+.. include:: /common/service.rst
 
-Show service details
---------------------
+Create
+------
 
-.. sample:: Identity/v3/services/get_service.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getService
+.. sample:: Identity/v3/services/create.php
 
-Delete service
---------------
+Read
+----
 
-.. sample:: Identity/v3/services/delete_service.php
-.. refdoc:: OpenStack/Identity/v3/Models/Service.html#method_delete
\ No newline at end of file
+.. sample:: Identity/v3/services/read.php
+
+Update
+------
+
+.. sample:: Identity/v3/services/update.php
+
+Delete
+------
+
+.. sample:: Identity/v3/services/delete.php
+
+List
+----
+
+.. sample:: Identity/v3/services/list.php
diff --git a/doc/services/identity/v3/tokens.rst b/doc/services/identity/v3/tokens.rst
index 4802065a..26cde921 100644
--- a/doc/services/identity/v3/tokens.rst
+++ b/doc/services/identity/v3/tokens.rst
@@ -1,11 +1,15 @@
 Tokens
 ======
 
-Authenticate (generate) token
------------------------------
+Tokens are used to authenticate and authorize your interactions with OpenStack APIs. Tokens come in many scopes,
+representing various authorization and sources of identity.
 
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createService
+.. osdoc:: https://docs.openstack.org/keystone/latest/admin/tokens-overview.html
 
+Generate token
+--------------
+
+Token is generated when you create the ``OpenStack`` object. You can also generate another token using the following methods.
 
 Generate token with user ID
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -15,6 +19,9 @@ Generate token with user ID
 Generate token with username
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Since usernames will not be unique across an entire OpenStack installation, when authenticating with them,
+you must also provide your domain ID. You do not have to do this if you authenticate with a user ID.
+
 .. sample:: Identity/v3/tokens/generate_token_with_username.php
 
 Generate token with application credential ID
@@ -36,19 +43,20 @@ Generate token scoped to project ID
 Generate token scoped to project name
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Since project names will not be unique across an entire OpenStack installation, when authenticating with them you must
+also provide your domain ID. You do not have to do this if you authenticate with a project ID.
+
 .. sample:: Identity/v3/tokens/generate_token_scoped_to_project_name.php
 
 Validate token
 --------------
 
 .. sample:: Identity/v3/tokens/validate_token.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_validateToken
 
 Revoke token
 ------------
 
 .. sample:: Identity/v3/tokens/revoke_token.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_revokeToken
 
 Cache authentication token
 --------------------------
@@ -73,6 +81,7 @@ Generate token and persist to file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. sample:: Identity/v3/tokens/export_authentication_token.php
+    :full:
 
 
 For scalability, it is recommended that cached tokens are stored in persistent storage such as memcache or redis instead
@@ -82,3 +91,4 @@ Initialize Open Stack using cached authentication token
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. sample:: Identity/v3/tokens/use_cached_authentication_token.php
+    :full:
diff --git a/doc/services/identity/v3/users.rst b/doc/services/identity/v3/users.rst
index 3453c3dc..c11f7ee3 100644
--- a/doc/services/identity/v3/users.rst
+++ b/doc/services/identity/v3/users.rst
@@ -1,44 +1,46 @@
 Users
 =====
 
-Add user
---------
+A user is an individual API consumer that is owned by a domain. A role explicitly associates a user with projects
+or domains. A user with no assigned roles has no access to OpenStack resources.
 
-.. sample:: Identity/v3/users/add_user.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_createUser
+.. osdoc:: https://docs.openstack.org/api-ref/identity/v3/index.html#users
 
-List users
-----------
+.. |models| replace:: users
 
-.. sample:: Identity/v3/users/list_users.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_listUsers
+.. include:: /common/service.rst
 
-Show user details
------------------
+Create
+------
 
-.. sample:: Identity/v3/users/get_user.php
-.. refdoc:: OpenStack/Identity/v3/Service.html#method_getUser
+.. sample:: Identity/v3/users/create.php
 
-Update user
------------
+Read
+----
 
-.. sample:: Identity/v3/users/update_user.php
-.. refdoc:: OpenStack/Identity/v3/Models/User.html#method_update
+.. sample:: Identity/v3/users/read.php
 
-Delete user
------------
+Update
+------
 
-.. sample:: Identity/v3/users/delete_user.php
-.. refdoc:: OpenStack/Identity/v3/Models/User.html#method_delete
+.. sample:: Identity/v3/users/update.php
+
+Delete
+------
+
+.. sample:: Identity/v3/users/delete.php
+
+List
+----
+
+.. sample:: Identity/v3/users/list.php
 
 List groups for user
 --------------------
 
 .. sample:: Identity/v3/users/list_groups.php
-.. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listGroups
 
 List projects for user
 ----------------------
 
 .. sample:: Identity/v3/users/list_projects.php
-.. refdoc:: OpenStack/Identity/v3/Models/User.html#method_listProjects
diff --git a/doc/services/images/v2/create.rst b/doc/services/images/v2/create.rst
new file mode 100644
index 00000000..b5415107
--- /dev/null
+++ b/doc/services/images/v2/create.rst
@@ -0,0 +1,3 @@
+.. |method| replace:: imagesV2
+
+.. include:: /common/create-service.rst
diff --git a/doc/services/images/v2/images.rst b/doc/services/images/v2/images.rst
index d01af019..746f44fa 100644
--- a/doc/services/images/v2/images.rst
+++ b/doc/services/images/v2/images.rst
@@ -1,24 +1,47 @@
 Images
 ======
 
-Create image
-------------
+A collection of files for a specific operating system (OS) that you use to create or rebuild a server.
+OpenStack provides pre-built images. You can also create custom images, or snapshots, from servers
+that you have launched. Custom images can be used for data backups or as “gold” images for additional servers.
+
+.. osdoc:: https://docs.openstack.org/api-ref/image/v2/index.html#images
+
+.. |models| replace:: images
+
+.. include:: /common/service.rst
+
+Create
+------
 
 The only required attribute when creating a new image is ``name``.
 
 .. sample:: Images/v2/images/create.php
-.. refdoc:: OpenStack/Images/v2/Service.html#method_createImage
 
-List images
------------
+Read
+----
+
+.. sample:: Images/v2/images/read.php
+
+Update
+------
+
+.. sample:: Images/v2/images/update.php
+
+Delete
+------
+
+.. sample:: Images/v2/images/delete.php
+
+List
+----
 
 .. sample:: Images/v2/images/list.php
-.. refdoc:: OpenStack/Images/v2/Service.html#method_listImages
 
 .. include:: /common/generators.rst
 
 List images sorted
------------
+~~~~~~~~~~~~~~~~~~
 
 Possible values for sort_key are:
 
@@ -31,37 +54,17 @@ Possible values for sort_dir are:
 
 .. sample:: Images/v2/images/list_sorted.php
 
-Show image details
-------------------
-
-.. sample:: Images/v2/images/get.php
-.. refdoc:: OpenStack/Images/v2/Service.html#method_getImage
-
-Update image
-------------
-
-.. sample:: Images/v2/images/update.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_update
-
-Delete image
-------------
-
-.. sample:: Images/v2/images/delete.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_delete
-
-Reactivate image
-----------------
+Reactivate
+----------
 
 .. sample:: Images/v2/images/reactivate.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_reactivate
 
-Deactivate image
-----------------
+Deactivate
+----------
 
 If you try to download a deactivated image, a Forbidden error is returned.
 
 .. sample:: Images/v2/images/deactivate.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_deactivate
 
 Upload binary data
 ------------------
@@ -76,10 +79,8 @@ Before you can store binary image data, you must meet the following precondition
 The size of the data that you want to store must not exceed the size that the Image service allows.
 
 .. sample:: Images/v2/images/upload_binary_data.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_uploadData
 
 Download binary data
 --------------------
 
 .. sample:: Images/v2/images/download_binary_data.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_downloadData
\ No newline at end of file
diff --git a/doc/services/images/v2/index.rst b/doc/services/images/v2/index.rst
index de7b3284..ef059e98 100644
--- a/doc/services/images/v2/index.rst
+++ b/doc/services/images/v2/index.rst
@@ -1,8 +1,14 @@
 Images v2
 =========
 
+OpenStack Image (Glance) API Version 2. The project provides a service where users can upload and discover
+data assets that are meant to be used with other services.
+
+.. osdoc:: https://docs.openstack.org/api-ref/image/v2/index.html
+
 .. toctree::
     :maxdepth: 3
 
+    create
     images
     members
\ No newline at end of file
diff --git a/doc/services/images/v2/members.rst b/doc/services/images/v2/members.rst
index 08abc547..87f8f2f0 100644
--- a/doc/services/images/v2/members.rst
+++ b/doc/services/images/v2/members.rst
@@ -1,34 +1,37 @@
 Image Members
 =============
 
-Add member to image
--------------------
+Image member is a project which can access a given VM image within Image service.
 
-.. sample:: Images/v2/members/add.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_addMember
+.. osdoc:: https://docs.openstack.org/api-ref/image/v2/index.html#sharing
 
-List image members
-------------------
+.. |models| replace:: image members
 
-.. sample:: Images/v2/members/list.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_listMembers
+.. include:: /common/service.rst
 
-.. include:: /common/generators.rst
+Create
+------
 
-Show member details
--------------------
+.. sample:: Images/v2/members/create.php
 
-.. sample:: Images/v2/members/get.php
-.. refdoc:: OpenStack/Images/v2/Models/Image.html#method_getMember
+Read
+----
 
-Remove member from image
-------------------------
+.. sample:: Images/v2/members/read.php
+
+Delete
+------
 
 .. sample:: Images/v2/members/delete.php
-.. refdoc:: OpenStack/Images/v2/Models/Member.html#method_delete
 
-Update status of image member
------------------------------
+List
+----
+
+.. sample:: Images/v2/members/list.php
+
+.. include:: /common/generators.rst
+
+Update Status
+-------------
 
 .. sample:: Images/v2/members/update_status.php
-.. refdoc:: OpenStack/Images/v2/Models/Member.html#method_updateStatus
\ No newline at end of file
diff --git a/doc/services/networking/v2/create.rst b/doc/services/networking/v2/create.rst
new file mode 100644
index 00000000..05f45843
--- /dev/null
+++ b/doc/services/networking/v2/create.rst
@@ -0,0 +1,3 @@
+.. |method| replace:: networkingV2
+
+.. include:: /common/create-service.rst
diff --git a/doc/services/networking/v2/index.rst b/doc/services/networking/v2/index.rst
index 2b545644..0eafffd9 100644
--- a/doc/services/networking/v2/index.rst
+++ b/doc/services/networking/v2/index.rst
@@ -1,9 +1,15 @@
 Networking v2
 =============
 
+OpenStack Networking (Neutron) API Version 2. The project provides “network connectivity as a service” between
+interface devices (e.g., vNICs) managed by other OpenStack services (e.g., nova).
+
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html
+
 .. toctree::
     :maxdepth: 3
 
+    create
     networks
     subnets
     ports
diff --git a/doc/services/networking/v2/loadbalancer-healthmonitors.rst b/doc/services/networking/v2/loadbalancer-healthmonitors.rst
index e383a2ff..c177f6f4 100644
--- a/doc/services/networking/v2/loadbalancer-healthmonitors.rst
+++ b/doc/services/networking/v2/loadbalancer-healthmonitors.rst
@@ -1,32 +1,36 @@
 LoadBalancer HealthMonitors
 ===========================
 
-Create HealthMonitor
---------------------
+.. warning::
+    Load balancing functions accessed via the neutron endpoint are deprecated and will be removed in a future release.
+    Users are strongly encouraged to migrate to using the octavia endpoint.
+    This library does not support the octavia endpoint yet.
+    Consider `helping <https://github.com/php-opencloud/openstack/pulls>`_ us to implement it .
 
-.. sample:: Networking/v2/lbaas/healthmonitors/create.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerHealthMonitor
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html#load-balancer-as-a-service-2-0-deprecated
 
-Get HealthMonitor
------------------
+Create
+------
 
-.. sample:: Networking/v2/lbaas/healthmonitors/get.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerHealthMonitor
+.. sample:: Networking/v2/lbaas/healthmonitors/create.php
 
-List HealthMonitors
--------------------
+Read
+----
 
-.. sample:: Networking/v2/lbaas/healthmonitors/list.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerHealthMonitors
+.. sample:: Networking/v2/lbaas/healthmonitors/read.php
 
-Update HealthMonitor
---------------------
+Update
+------
 
 .. sample:: Networking/v2/lbaas/healthmonitors/update.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_update
 
-Delete HealthMonitor
---------------------
+Delete
+------
 
 .. sample:: Networking/v2/lbaas/healthmonitors/delete.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerHealthMonitor.html#method_delete
+
+List
+----
+
+.. sample:: Networking/v2/lbaas/healthmonitors/list.php
+
diff --git a/doc/services/networking/v2/loadbalancer-listeners.rst b/doc/services/networking/v2/loadbalancer-listeners.rst
index a99a1df5..1cc5624f 100644
--- a/doc/services/networking/v2/loadbalancer-listeners.rst
+++ b/doc/services/networking/v2/loadbalancer-listeners.rst
@@ -1,32 +1,35 @@
 LoadBalancer Listeners
 ======================
 
-Create Listener
----------------
+.. warning::
+    Load balancing functions accessed via the neutron endpoint are deprecated and will be removed in a future release.
+    Users are strongly encouraged to migrate to using the octavia endpoint.
+    This library does not support the octavia endpoint yet.
+    Consider `helping <https://github.com/php-opencloud/openstack/pulls>`_ us to implement it .
 
-.. sample:: Networking/v2/lbaas/listeners/create.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerListener
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html#load-balancer-as-a-service-2-0-deprecated
 
-Get Listener
-------------
+Create
+------
 
-.. sample:: Networking/v2/lbaas/listeners/get.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerListener
+.. sample:: Networking/v2/lbaas/listeners/create.php
 
-List Listeners
---------------
+Read
+----
 
-.. sample:: Networking/v2/lbaas/listeners/list.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerListeners
+.. sample:: Networking/v2/lbaas/listeners/read.php
 
-Update Listener
----------------
+Update
+------
 
 .. sample:: Networking/v2/lbaas/listeners/update.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerListener.html#method_update
 
-Delete Listener
----------------
+Delete
+------
 
 .. sample:: Networking/v2/lbaas/listeners/delete.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerListener.html#method_delete
+
+List
+----
+
+.. sample:: Networking/v2/lbaas/listeners/list.php
diff --git a/doc/services/networking/v2/loadbalancer-pools.rst b/doc/services/networking/v2/loadbalancer-pools.rst
index 891b487d..7100b55e 100644
--- a/doc/services/networking/v2/loadbalancer-pools.rst
+++ b/doc/services/networking/v2/loadbalancer-pools.rst
@@ -1,56 +1,55 @@
 LoadBalancer Pools
 ==================
 
-Create Pool
------------
+.. warning::
+    Load balancing functions accessed via the neutron endpoint are deprecated and will be removed in a future release.
+    Users are strongly encouraged to migrate to using the octavia endpoint.
+    This library does not support the octavia endpoint yet.
+    Consider `helping <https://github.com/php-opencloud/openstack/pulls>`_ us to implement it .
+
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html#load-balancer-as-a-service-2-0-deprecated
+
+Create
+------
 
 .. sample:: Networking/v2/lbaas/pools/create.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancerPool
 
-Get Pool
---------
+Read
+----
 
-.. sample:: Networking/v2/lbaas/pools/get.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancerPool
+.. sample:: Networking/v2/lbaas/pools/read.php
 
-List Pools
-----------
+List
+----
 
 .. sample:: Networking/v2/lbaas/pools/list.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancerPools
 
-Update Pool
+Update
 -----------
 
 .. sample:: Networking/v2/lbaas/pools/update.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_update
 
-Delete Pool
------------
+Delete
+------
 
 .. sample:: Networking/v2/lbaas/pools/delete.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_delete
 
 Add Member
 ----------
 
 .. sample:: Networking/v2/lbaas/pools/add-member.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_addMember
 
 Get Member
 ----------
 
 .. sample:: Networking/v2/lbaas/pools/get-member.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_getMember
 
 Delete Member
 -------------
 
 .. sample:: Networking/v2/lbaas/pools/delete-member.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_deleteMember
 
 Add Health Monitor
 ------------------
 
 .. sample:: Networking/v2/lbaas/pools/add-healthmonitor.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancerPool.html#method_addHealthMonitor
diff --git a/doc/services/networking/v2/loadbalancers.rst b/doc/services/networking/v2/loadbalancers.rst
index a04ae815..7185b39f 100644
--- a/doc/services/networking/v2/loadbalancers.rst
+++ b/doc/services/networking/v2/loadbalancers.rst
@@ -1,47 +1,54 @@
 LoadBalancers
 =============
 
-Create LoadBalancer
--------------------
+.. warning::
+    Load balancing functions accessed via the neutron endpoint are deprecated and will be removed in a future release.
+    Users are strongly encouraged to migrate to using the octavia endpoint.
+    This library does not support the octavia endpoint yet.
+    Consider `helping <https://github.com/php-opencloud/openstack/pulls>`_ us to implement it .
 
-.. sample:: Networking/v2/lbaas/loadbalancers/create.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_createLoadBalancer
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html#load-balancer-as-a-service-2-0-deprecated
 
-Get LoadBalancer
-----------------
+.. |models| replace:: load balancers
 
-.. sample:: Networking/v2/lbaas/loadbalancers/get.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_getLoadBalancer
+.. include:: /common/service.rst
 
-List LoadBalancers
-------------------
+Create
+------
 
-.. sample:: Networking/v2/lbaas/loadbalancers/list.php
-.. refdoc:: OpenStack/Networking/v2/Service.html#method_listLoadBalancers
+.. sample:: Networking/v2/lbaas/loadbalancers/create.php
 
-Update LoadBalancer
--------------------
+Read
+----
+
+.. sample:: Networking/v2/lbaas/loadbalancers/read.php
+
+Update
+------
 
 .. sample:: Networking/v2/lbaas/loadbalancers/update.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_update
 
-Delete LoadBalancer
--------------------
+Delete
+------
 
 .. sample:: Networking/v2/lbaas/loadbalancers/delete.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_delete
 
-Add Listener to LoadBalancer
-----------------------------
+List
+----
+
+.. sample:: Networking/v2/lbaas/loadbalancers/list.php
+
+Add Listener
+------------
+
 .. sample:: Networking/v2/lbaas/loadbalancers/add_listener.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_addListener
 
-Get Stats for LoadBalancer
---------------------------
+Get Stats
+---------
+
 .. sample:: Networking/v2/lbaas/loadbalancers/get_stats.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_getStats
 
-Get Status Tree for LoadBalancer
+Get Status Tree
 --------------------------------
+
 .. sample:: Networking/v2/lbaas/loadbalancers/get_statuses.php
-.. refdoc:: OpenStack/Networking/v2/Models/LoadBalancer.html#method_getStatuses
diff --git a/doc/services/networking/v2/networks.rst b/doc/services/networking/v2/networks.rst
index 27719c39..f066427a 100644
--- a/doc/services/networking/v2/networks.rst
+++ b/doc/services/networking/v2/networks.rst
@@ -1,32 +1,38 @@
 Networks
 ========
 
-Create network
+Network represents an isolated Layer-2 networking segment within the cloud. It can be shared across tenants,
+or isolated to a single tenant.
+
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html#layer-2-networking
+
+.. |models| replace:: networks
+
+.. include:: /common/service.rst
+
+Create
 --------------
 
 .. sample:: Networking/v2/networks/create.php
-.. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_createNetwork
 
-Create networks
----------------
+Batch
+~~~~~
+
+To create multiple networks in a single request, use the following code:
 
 .. sample:: Networking/v2/networks/create_batch.php
-.. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_createNetworks
 
-Get network
------------
+Read
+----
 
-.. sample:: Networking/v2/networks/get.php
-.. refdoc:: OpenStack/Networking/v2/networks/Service.html#method_getNetwork
+.. sample:: Networking/v2/networks/read.php
 
-Update network
---------------
+Update
+------
 
 .. sample:: Networking/v2/networks/update.php
-.. refdoc:: OpenStack/Networking/v2/networks/Models/Network.html#method_update
 
-Delete network
---------------
+Delete
+------
 
 .. sample:: Networking/v2/networks/delete.php
-.. refdoc:: OpenStack/Networking/v2/networks/Models/Network.html#method_delete
\ No newline at end of file
diff --git a/doc/services/networking/v2/ports.rst b/doc/services/networking/v2/ports.rst
index 7efc7e90..34011301 100644
--- a/doc/services/networking/v2/ports.rst
+++ b/doc/services/networking/v2/ports.rst
@@ -1,32 +1,38 @@
 Ports
 =====
 
-Create port
------------
+A port is a connection point for attaching a single device, such as the NIC of a virtual server, to a virtual network.
+The port also describes the associated network configuration, such as the MAC and IP addresses to be used on that port.
+
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html#ports
+
+.. |models| replace:: ports
+
+.. include:: /common/service.rst
+
+Create
+------
 
 .. sample:: Networking/v2/ports/create.php
-.. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_createPort
 
-Create ports
-------------
+Batch
+~~~~~
+
+To create multiple ports in a single request, use the following code:
 
 .. sample:: Networking/v2/ports/create_batch.php
-.. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_createPorts
 
-Get port
---------
+Read
+----
 
-.. sample:: Networking/v2/ports/get.php
-.. refdoc:: OpenStack/Networking/v2/ports/Service.html#method_getPort
+.. sample:: Networking/v2/ports/read.php
 
-Update port
------------
+Update
+------
 
 .. sample:: Networking/v2/ports/update.php
-.. refdoc:: OpenStack/Networking/v2/ports/Models/Port.html#method_update
 
-Delete port
------------
+Delete
+------
 
 .. sample:: Networking/v2/ports/delete.php
-.. refdoc:: OpenStack/Networking/v2/ports/Models/Port.html#method_delete
\ No newline at end of file
diff --git a/doc/services/networking/v2/subnets.rst b/doc/services/networking/v2/subnets.rst
index 39b50901..bbd92196 100644
--- a/doc/services/networking/v2/subnets.rst
+++ b/doc/services/networking/v2/subnets.rst
@@ -1,34 +1,42 @@
 Subnets
 =======
 
-Create subnet
--------------
+A block of IP addresses and associated configuration state. This is also known as the native IPAM (IP Address Management)
+provided by the networking service for both project and provider networks. Subnets are used to allocate IP addresses
+when new ports are created on a network.
+
+.. osdoc:: https://docs.openstack.org/api-ref/network/v2/index.html#subnets
+
+.. |models| replace:: subnets
+
+.. include:: /common/service.rst
+
+Create
+------
 
 .. sample:: Networking/v2/subnets/create.php
-.. refdoc:: OpenStack/Networking/v2/subnets/Service.html#method_createSubnet
 
-To create a subnet with gateway IP:
+With gateway IP
+~~~~~~~~~~~~~~~
 
 .. sample:: Networking/v2/subnets/create_with_gateway_ip.php
 
-To create a subnet with host routes:
+With host routes
+~~~~~~~~~~~~~~~~
 
 .. sample:: Networking/v2/subnets/create_with_host_routes.php
 
-Get subnet
-----------
+Read
+----
 
-.. sample:: Networking/v2/subnets/get.php
-.. refdoc:: OpenStack/Networking/v2/subnets/Service.html#method_getSubnet
+.. sample:: Networking/v2/subnets/read.php
 
-Update subnet
--------------
+Update
+------
 
 .. sample:: Networking/v2/subnets/update.php
-.. refdoc:: OpenStack/Networking/v2/subnets/Models/Subnet.html#method_update
 
-Delete subnet
--------------
+Delete
+------
 
 .. sample:: Networking/v2/subnets/delete.php
-.. refdoc:: OpenStack/Networking/v2/subnets/Models/Subnet.html#method_delete
\ No newline at end of file
diff --git a/doc/services/object-store/v1/account.rst b/doc/services/object-store/v1/account.rst
index 12a4a31e..bf33c1ce 100644
--- a/doc/services/object-store/v1/account.rst
+++ b/doc/services/object-store/v1/account.rst
@@ -1,19 +1,27 @@
 Account
 =======
 
-Show account details
---------------------
+Account represents the top-level of the hierarchy. Your service provider creates your account and you own all resources
+in that account. The account defines a namespace for containers. In the OpenStack environment, account is synonymous
+with a project or tenant.
+
+.. osdoc:: https://docs.openstack.org/api-ref/object-store/#accounts
+
+.. |models| replace:: accounts
+
+.. include:: /common/service.rst
+
+Read
+----
 
 To work with an Object Store account, you must first retrieve an account object like so:
 
-.. sample:: ObjectStore/v1/account/get.php
-.. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getAccount
+.. sample:: ObjectStore/v1/account/read.php
 
 Get account metadata
 --------------------
 
 .. sample:: ObjectStore/v1/account/get_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_getMetadata
 
 Replace all metadata with new values
 ------------------------------------
@@ -76,4 +84,3 @@ the metadata of the account will now be:
 To reset metadata, you must run:
 
 .. sample:: ObjectStore/v1/account/merge_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_mergeMetadata
\ No newline at end of file
diff --git a/doc/services/object-store/v1/containers.rst b/doc/services/object-store/v1/containers.rst
index 18b2d656..a1dbb384 100644
--- a/doc/services/object-store/v1/containers.rst
+++ b/doc/services/object-store/v1/containers.rst
@@ -1,32 +1,39 @@
 Containers
 ==========
 
-Show details for a container
-----------------------------
+Container defines a namespace for objects. An object with the same name in two different containers represents
+two different objects.
 
-.. sample:: ObjectStore/v1/containers/get.php
-.. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getContainer
+.. osdoc:: https://docs.openstack.org/api-ref/object-store/#containers
 
-At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
-container from the API. This is in accordance with one of the SDK's general policies of not assuming too much at the
-expense of performance.
+.. |models| replace:: containers
 
-To synchronize the local object's state with the remote API, you can run:
+.. include:: /common/service.rst
 
-.. code-block:: php
+Read
+----
+
+.. sample:: ObjectStore/v1/containers/read.php
 
-    $container->retrieve();
+You can read the content of a container:
+
+.. code-block:: php
 
     printf("%s container has %d objects and %d bytes",
         $container->name, $container->objectCount, $container->bytesUsed);
 
-and all of the local properties will match those of the remote resource.
+Delete
+------
 
-List containers
----------------
+.. sample:: ObjectStore/v1/containers/delete.php
+
+The API will only accept DELETE requests on containers when they are empty. If you have a container with any objects
+inside, the operation will fail.
+
+List
+----
 
 .. sample:: ObjectStore/v1/containers/list.php
-.. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_listContainers
 
 When listing containers, you must be aware that not *all* information about a container is returned in a collection.
 Very often only the object count, bytes used and container name will be exposed. If you would like to
@@ -43,20 +50,10 @@ container.
 
 .. include:: /common/generators.rst
 
-Delete container
-----------------
-
-.. sample:: ObjectStore/v1/containers/delete.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_delete
-
-The API will only accept DELETE requests on containers when they are empty. If you have a container with any objects
-inside, the operation will fail.
-
 Get metadata
 ------------
 
 .. sample:: ObjectStore/v1/containers/get_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
 correspond to the values set either when the container was created, or when a previous ``mergeMetadata`` or
@@ -66,7 +63,6 @@ Replace all metadata with new values
 ------------------------------------
 
 .. sample:: ObjectStore/v1/containers/reset_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
 items which not specified in the new set will be removed. For example, say an account has the following metadata
@@ -96,7 +92,6 @@ Merge new metadata values with existing
 ---------------------------------------
 
 .. sample:: ObjectStore/v1/containers/merge_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing
 metadata items which are not specified in the new set will be preserved. For example, say an account has the following
diff --git a/doc/services/object-store/v1/create.rst b/doc/services/object-store/v1/create.rst
new file mode 100644
index 00000000..07800c76
--- /dev/null
+++ b/doc/services/object-store/v1/create.rst
@@ -0,0 +1,3 @@
+.. |method| replace:: objectStoreV1
+
+.. include:: /common/create-service.rst
diff --git a/doc/services/object-store/v1/index.rst b/doc/services/object-store/v1/index.rst
index a6637dbc..5d699059 100644
--- a/doc/services/object-store/v1/index.rst
+++ b/doc/services/object-store/v1/index.rst
@@ -1,9 +1,15 @@
 Object Store v1
 ===============
 
+Object store (Swift) API Version 1. Swift is a highly available, distributed, eventually consistent object/blob store.
+Organizations can use Swift to store lots of data efficiently, safely, and cheaply.
+
+.. osdoc:: https://docs.openstack.org/api-ref/object-store/
+
 .. toctree::
-   :maxdepth: 3
+    :maxdepth: 3
 
-   account
-   containers
-   objects
\ No newline at end of file
+    create
+    account
+    containers
+    objects
\ No newline at end of file
diff --git a/doc/services/object-store/v1/objects.rst b/doc/services/object-store/v1/objects.rst
index 7b326b15..69686955 100644
--- a/doc/services/object-store/v1/objects.rst
+++ b/doc/services/object-store/v1/objects.rst
@@ -1,48 +1,61 @@
 Objects
 =======
 
-Show details for an object
---------------------------
+Object stores data content, such as documents, images, and so on. You can also store custom metadata with an object.
 
-.. sample:: ObjectStore/v1/objects/get.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getObject
+.. osdoc:: https://docs.openstack.org/api-ref/object-store/#objects
 
-At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
-container from the API. This is in accordance with one of the SDK's general policies of not assuming too much at the
-expense of performance.
+.. |models| replace:: objects
 
-To synchronize the local object's state with the remote API, you can run:
+.. include:: /common/service.rst
 
-.. code-block:: php
+Create
+------
 
-    $object->retrieve();
+When creating an object, you can upload its content according to a string representation:
 
-    printf("%s/%s is %d bytes long and was last modified on %s",
-        $object->containerName, $object->name, $object->contentLength, $object->lastModified);
+.. sample:: ObjectStore/v1/objects/create.php
 
-and all of the local properties will match those of the remote resource. The ``retrieve`` call, although fetching all
-of the object's metadata, will not download the object's content. To do this, see the next section.
+If that is not optimal or convenient, you can use a stream instead. Any instance of ``\Psr\Http\Message\StreamInterface``
+is acceptable. For example, to use a normal Guzzle stream:
 
-Download an object
-------------------
+.. sample:: ObjectStore/v1/objects/create_from_stream.php
 
-.. sample:: ObjectStore/v1/objects/download.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_download
+Create a large object (over 5GB)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
-consult `Guzzle's docs`_.
+For large objects (those over 5GB), you will need to use a concept in Swift called Dynamic Large Objects (DLO). When
+uploading, this is what happens under the hood:
 
-By default, the whole body of the object is fetched before the function returns, set the ``'requestOptions'`` key of
-parameter ``$data`` to ``['stream' => true]`` to get the stream before the end of download.
+1. The large file is separated into smaller segments
+2. Each segment is uploaded
+3. A manifest file is created which, when requested by clients, will concatenate all the segments as a single file
 
-.. _Stream: https://github.com/guzzle/streams/blob/master/src/Stream.php
-.. _Guzzle's docs: https://guzzle.readthedocs.org/en/5.3/streams.html
+To upload a DLO, you need to call:
 
-List objects
-------------
+.. sample:: ObjectStore/v1/objects/create_large_object.php
+
+Read
+----
+
+.. sample:: ObjectStore/v1/objects/read.php
+
+You can read properties of an object:
+
+.. code-block:: php
+
+    printf("%s/%s is %d bytes long and was last modified on %s",
+        $object->containerName, $object->name, $object->contentLength, $object->lastModified);
+
+Delete
+------
+
+.. sample:: ObjectStore/v1/objects/delete.php
+
+List
+----
 
 .. sample:: ObjectStore/v1/objects/list.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_listObjects
 
 When listing objects, you must be aware that not *all* information about a container is returned in a collection.
 Very often only the MD5 hash, last modified date, bytes used, content type and object name will be
@@ -59,51 +72,29 @@ If you have a large collection of $object, this will slow things down because yo
 
 .. include:: /common/generators.rst
 
-Create an object
-----------------
-
-When creating an object, you can upload its content according to a string representation:
-
-.. sample:: ObjectStore/v1/objects/create.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createObject
-
-If that is not optimal or convenient, you can use a stream instead. Any instance of ``\Psr\Http\Message\StreamInterface``
-is acceptable. For example, to use a normal Guzzle stream:
-
-.. sample:: ObjectStore/v1/objects/create_from_stream.php
-
-Create a large object (over 5GB)
---------------------------------
+Download an object
+------------------
 
-For large objects (those over 5GB), you will need to use a concept in Swift called Dynamic Large Objects (DLO). When
-uploading, this is what happens under the hood:
+.. sample:: ObjectStore/v1/objects/download.php
 
-1. The large file is separated into smaller segments
-2. Each segment is uploaded
-3. A manifest file is created which, when requested by clients, will concatenate all the segments as a single file
+As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
+consult `Guzzle's docs`_.
 
-To upload a DLO, you need to call:
+By default, the whole body of the object is fetched before the function returns, set the ``'requestOptions'`` key of
+parameter ``$data`` to ``['stream' => true]`` to get the stream before the end of download.
 
-.. sample:: ObjectStore/v1/objects/create_large_object.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createLargeObject
+.. _Stream: https://github.com/guzzle/streams/blob/master/src/Stream.php
+.. _Guzzle's docs: https://guzzle.readthedocs.org/en/5.3/streams.html
 
 Copy object
 -----------
 
 .. sample:: ObjectStore/v1/objects/copy.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_copy
-
-Delete object
--------------
-
-.. sample:: ObjectStore/v1/objects/delete.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_delete
 
 Get metadata
 ------------
 
 .. sample:: ObjectStore/v1/objects/get_metadata.php
-.. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
 correspond to the values set either when the object was created, or when a previous ``mergeMetadata`` or
diff --git a/doc/setup.rst b/doc/setup.rst
new file mode 100644
index 00000000..96fa2957
--- /dev/null
+++ b/doc/setup.rst
@@ -0,0 +1,43 @@
+Setup
+=====
+
+In order to access services you have to create the client object. To do it, you will need to provide the
+following information:
+
+* The identity service URL (``authUrl``)
+* The region in which you want to operate (``region``)
+* The credentials of the user you want to authenticate: ``user``, ``tokenId``, ``cachedToken``
+  or ``application_credential``
+
+Only the ``authUrl`` is mandatory to create the client. But you will have to provide the ``region`` and user
+credentials to each service you create. So it is recommended to provide them when creating the client which
+would propagate these options to each service.
+
+There are different ways to provide the authentication credentials. See the :doc:`services/identity/v3/tokens`
+section for the full list of options. You should provide credentials to the ``OpenStack`` constructor as an array
+the same way you provide options to ``generateToken`` method of the ``Identity`` service.
+
+Authenticate with username
+--------------------------
+
+The most common way to authenticate is using the username and password of the user. You should also provide the Domain ID
+as usernames will not be unique across an entire OpenStack installation
+
+.. sample:: Setup/username.php
+
+Authenticate with user ID
+-------------------------
+
+.. sample:: Setup/user_id.php
+
+Authenticate application credential ID
+--------------------------------------
+
+.. sample:: Setup/application_credential_id.php
+
+Authenticate using token ID
+---------------------------
+
+If you already have a valid token, you can use it to authenticate.
+
+.. sample:: Setup/token_id.php
diff --git a/samples/ObjectStore/v1/containers/get.php b/samples/BlockStorage/v2/create.php
similarity index 59%
rename from samples/ObjectStore/v1/containers/get.php
rename to samples/BlockStorage/v2/create.php
index 8d764cd5..eab4bfb9 100644
--- a/samples/ObjectStore/v1/containers/get.php
+++ b/samples/BlockStorage/v2/create.php
@@ -9,9 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$container = $openstack->objectStoreV1()
-    ->getContainer('{containerName}');
-$container->retrieve();
+$service = $openstack->blockStorageV2();
diff --git a/samples/BlockStorage/v2/create_service.php b/samples/BlockStorage/v2/create_service.php
deleted file mode 100644
index fbed17dc..00000000
--- a/samples/BlockStorage/v2/create_service.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volume_types/create.php b/samples/BlockStorage/v3/volume_types/create.php
index 92a8eb45..abed4941 100644
--- a/samples/BlockStorage/v3/volume_types/create.php
+++ b/samples/BlockStorage/v3/volume_types/create.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}']
+    ,
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volume_types/delete.php b/samples/BlockStorage/v3/volume_types/delete.php
index c8a68b75..f0e9a2f7 100644
--- a/samples/BlockStorage/v3/volume_types/delete.php
+++ b/samples/BlockStorage/v3/volume_types/delete.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}']
+    ,
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volume_types/list.php b/samples/BlockStorage/v3/volume_types/list.php
index 288a183e..23857289 100644
--- a/samples/BlockStorage/v3/volume_types/list.php
+++ b/samples/BlockStorage/v3/volume_types/list.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}']
+    ,
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volume_types/get.php b/samples/BlockStorage/v3/volume_types/read.php
similarity index 66%
rename from samples/BlockStorage/v3/volume_types/get.php
rename to samples/BlockStorage/v3/volume_types/read.php
index fc86ab57..b254c8ea 100644
--- a/samples/BlockStorage/v3/volume_types/get.php
+++ b/samples/BlockStorage/v3/volume_types/read.php
@@ -5,10 +5,13 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}']
+    ,
 ]);
 
 $service = $openstack->blockStorageV3();
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
+$volumeType->retrieve();
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/volume_types/update.php b/samples/BlockStorage/v3/volume_types/update.php
index edcd9dec..bdd08ab5 100644
--- a/samples/BlockStorage/v3/volume_types/update.php
+++ b/samples/BlockStorage/v3/volume_types/update.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}']
+    ,
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volumes/create.php b/samples/BlockStorage/v3/volumes/create.php
index b8fd9308..0af2293b 100644
--- a/samples/BlockStorage/v3/volumes/create.php
+++ b/samples/BlockStorage/v3/volumes/create.php
@@ -5,16 +5,18 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
 
 $volume = $service->createVolume([
-    'description'      => '{description}',
-    'size'             => '{size}',
-    'name'             => '{name}',
-    'volumeType'       => '{volumeType}',
-    'metadata'         => ['{key1}' => '{val1}'],
+    'description' => '{description}',
+    'size'        => '{size}',
+    'name'        => '{name}',
+    'volumeType'  => '{volumeType}',
+    'metadata'    => ['{key1}' => '{val1}'],
 ]);
diff --git a/samples/BlockStorage/v3/volumes/create_from_image.php b/samples/BlockStorage/v3/volumes/create_from_image.php
index 81d36d9e..b561c353 100644
--- a/samples/BlockStorage/v3/volumes/create_from_image.php
+++ b/samples/BlockStorage/v3/volumes/create_from_image.php
@@ -5,15 +5,17 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
 
 $volume = $service->createVolume([
-    'description'    => '{description}',
-    'size'           => '{size}',
-    'name'           => '{name}',
-    'sourceVolumeId' => '{snapshotId}',
+    'description' => '{description}',
+    'size'        => '{size}',
+    'name'        => '{name}',
+    'imageId'     => '{imageId}',
 ]);
diff --git a/samples/BlockStorage/v3/volumes/create_from_snapshot.php b/samples/BlockStorage/v3/volumes/create_from_snapshot.php
index a88c2d44..2c9de9c8 100644
--- a/samples/BlockStorage/v3/volumes/create_from_snapshot.php
+++ b/samples/BlockStorage/v3/volumes/create_from_snapshot.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volumes/create_from_source_volume.php b/samples/BlockStorage/v3/volumes/create_from_source_volume.php
deleted file mode 100644
index 571e1231..00000000
--- a/samples/BlockStorage/v3/volumes/create_from_source_volume.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$service = $openstack->blockStorageV3();
-
-$volume = $service->createVolume([
-    'description' => '{description}',
-    'size'        => '{size}',
-    'name'        => '{name}',
-    'imageId'     => '{snapshotId}',
-]);
diff --git a/samples/BlockStorage/v3/volumes/create_from_volume.php b/samples/BlockStorage/v3/volumes/create_from_volume.php
new file mode 100644
index 00000000..a72ed00c
--- /dev/null
+++ b/samples/BlockStorage/v3/volumes/create_from_volume.php
@@ -0,0 +1,21 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->blockStorageV3();
+
+$volume = $service->createVolume([
+    'description'    => '{description}',
+    'size'           => '{size}',
+    'name'           => '{name}',
+    'sourceVolumeId' => '{volumeId}',
+]);
diff --git a/samples/BlockStorage/v3/volumes/delete.php b/samples/BlockStorage/v3/volumes/delete.php
index 1821ca9e..8776244f 100644
--- a/samples/BlockStorage/v3/volumes/delete.php
+++ b/samples/BlockStorage/v3/volumes/delete.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volumes/list.php b/samples/BlockStorage/v3/volumes/list.php
index a067b304..5f88fa84 100644
--- a/samples/BlockStorage/v3/volumes/list.php
+++ b/samples/BlockStorage/v3/volumes/list.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volumes/list_detail.php b/samples/BlockStorage/v3/volumes/list_detail.php
index e495fbc3..2029d32c 100644
--- a/samples/BlockStorage/v3/volumes/list_detail.php
+++ b/samples/BlockStorage/v3/volumes/list_detail.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/BlockStorage/v3/volumes/get.php b/samples/BlockStorage/v3/volumes/read.php
similarity index 65%
rename from samples/BlockStorage/v3/volumes/get.php
rename to samples/BlockStorage/v3/volumes/read.php
index 184c02af..d1de298e 100644
--- a/samples/BlockStorage/v3/volumes/get.php
+++ b/samples/BlockStorage/v3/volumes/read.php
@@ -5,10 +5,13 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
 
 $volume = $service->getVolume('{volumeId}');
+$volume->retrieve();
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/volumes/update.php b/samples/BlockStorage/v3/volumes/update.php
index 371d12e8..d2ead417 100644
--- a/samples/BlockStorage/v3/volumes/update.php
+++ b/samples/BlockStorage/v3/volumes/update.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']],
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->blockStorageV3();
diff --git a/samples/Compute/v2/flavors/create_flavor.php b/samples/Compute/v2/flavors/create.php
similarity index 69%
rename from samples/Compute/v2/flavors/create_flavor.php
rename to samples/Compute/v2/flavors/create.php
index ee88ba57..0dc5ff19 100644
--- a/samples/Compute/v2/flavors/create_flavor.php
+++ b/samples/Compute/v2/flavors/create.php
@@ -7,12 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
+$compute = $openstack->computeV2();
 
 $flavor = $compute->createFlavor([
     'name'  => '{flavorName}',
diff --git a/samples/Compute/v2/flavors/delete_flavor.php b/samples/Compute/v2/flavors/delete.php
similarity index 78%
rename from samples/Compute/v2/flavors/delete_flavor.php
rename to samples/Compute/v2/flavors/delete.php
index 53d20117..91828cde 100644
--- a/samples/Compute/v2/flavors/delete_flavor.php
+++ b/samples/Compute/v2/flavors/delete.php
@@ -7,13 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-
 $flavor = $compute->getFlavor(['id' => '{flavorId}']);
 $flavor->delete();
diff --git a/samples/Compute/v2/flavors/get_flavor.php b/samples/Compute/v2/flavors/get_flavor.php
deleted file mode 100644
index acaa4dc2..00000000
--- a/samples/Compute/v2/flavors/get_flavor.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$compute = $openstack->computeV2(['region' => '{region}']);
-
-$flavor = $compute->getFlavor(['id' => '{flavorId}']);
-
-// By default, this will return an empty Flavor object and NOT hit the API.
-// This is convenient for when you want to use the object for operations
-// that do not require an initial GET request. To retrieve the flavor's details,
-// run the following, which *will* call the API with a GET request:
-
-$flavor->retrieve();
diff --git a/samples/Compute/v2/flavors/list_flavors.php b/samples/Compute/v2/flavors/list.php
similarity index 68%
rename from samples/Compute/v2/flavors/list_flavors.php
rename to samples/Compute/v2/flavors/list.php
index b14eaaee..7b7730fa 100644
--- a/samples/Compute/v2/flavors/list_flavors.php
+++ b/samples/Compute/v2/flavors/list.php
@@ -7,12 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
+$compute = $openstack->computeV2();
 
 $flavors = $compute->listFlavors();
 
diff --git a/samples/ObjectStore/v1/account/get.php b/samples/Compute/v2/flavors/read.php
similarity index 64%
rename from samples/ObjectStore/v1/account/get.php
rename to samples/Compute/v2/flavors/read.php
index 0c4a1d68..9ce8edbd 100644
--- a/samples/ObjectStore/v1/account/get.php
+++ b/samples/Compute/v2/flavors/read.php
@@ -9,8 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$account = $openstack->objectStoreV1()
-                     ->getAccount();
+$compute = $openstack->computeV2();
+
+$flavor = $compute->getFlavor(['id' => '{flavorId}']);
+$flavor->retrieve();
diff --git a/samples/Compute/v2/servers/create_server.php b/samples/Compute/v2/servers/create.php
similarity index 85%
rename from samples/Compute/v2/servers/create_server.php
rename to samples/Compute/v2/servers/create.php
index 73a9fc06..e99355e0 100644
--- a/samples/Compute/v2/servers/create_server.php
+++ b/samples/Compute/v2/servers/create.php
@@ -9,10 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
+$compute = $openstack->computeV2();
 
 $options = [
     // Required
diff --git a/samples/Compute/v2/servers/delete_server.php b/samples/Compute/v2/servers/delete.php
similarity index 72%
rename from samples/Compute/v2/servers/delete_server.php
rename to samples/Compute/v2/servers/delete.php
index 48bf850f..58cd4a3a 100644
--- a/samples/Compute/v2/servers/delete_server.php
+++ b/samples/Compute/v2/servers/delete.php
@@ -9,10 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
+$compute = $openstack->computeV2();
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
diff --git a/samples/Compute/v2/servers/get_server.php b/samples/Compute/v2/servers/get_server.php
deleted file mode 100644
index 7ba12d3c..00000000
--- a/samples/Compute/v2/servers/get_server.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$compute = $openstack->computeV2(['region' => '{region}']);
-
-$server = $compute->getServer(['id' => '{serverId}']);
-
-// By default, this will return an empty Server object and NOT hit the API.
-// This is convenient for when you want to use the object for operations
-// that do not require an initial GET request. To retrieve the server's details,
-// run the following, which *will* call the API with a GET request:
-
-$server->retrieve();
diff --git a/samples/Compute/v2/servers/list_servers.php b/samples/Compute/v2/servers/list.php
similarity index 60%
rename from samples/Compute/v2/servers/list_servers.php
rename to samples/Compute/v2/servers/list.php
index f853af64..f96bd4a4 100644
--- a/samples/Compute/v2/servers/list_servers.php
+++ b/samples/Compute/v2/servers/list.php
@@ -9,12 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
+$compute = $openstack->computeV2();
 
-$servers = $compute->listServers(['imageId' => '{imageId}']);
+$servers = $compute->listServers();
 
 foreach ($servers as $server) {
 }
diff --git a/samples/ObjectStore/v1/objects/get.php b/samples/Compute/v2/servers/read.php
similarity index 58%
rename from samples/ObjectStore/v1/objects/get.php
rename to samples/Compute/v2/servers/read.php
index aeae0ad7..442086c6 100644
--- a/samples/ObjectStore/v1/objects/get.php
+++ b/samples/Compute/v2/servers/read.php
@@ -9,9 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$object = $openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->getObject('{objectName}');
+$compute = $openstack->computeV2();
+
+$server = $compute->getServer(['id' => '{serverId}']);
+$server->retrieve();
diff --git a/samples/Compute/v2/servers/update_server.php b/samples/Compute/v2/servers/update.php
similarity index 54%
rename from samples/Compute/v2/servers/update_server.php
rename to samples/Compute/v2/servers/update.php
index 088d586f..1ee83ed7 100644
--- a/samples/Compute/v2/servers/update_server.php
+++ b/samples/Compute/v2/servers/update.php
@@ -7,16 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
+$compute = $openstack->computeV2();
 
-$server = $compute->getServer([
-    'id' => '{serverId}',
-]);
+$server = $compute->getServer(['id' => '{serverId}']);
 
 $server->name = '{newName}';
 $server->update();
diff --git a/samples/Identity/v2/authentication.php b/samples/Identity/v2/authentication.php
index 89cd14d1..eb03c73d 100644
--- a/samples/Identity/v2/authentication.php
+++ b/samples/Identity/v2/authentication.php
@@ -24,8 +24,6 @@
     'identityService' => Service::factory($httpClient),
 ];
 
-/** @var OpenStack $openstack */
 $openstack = new OpenStack($options);
 
-/** @var \OpenStack\Compute\v2\Models\Server[] $servers */
 $servers = $openstack->computeV2()->listServers();
diff --git a/samples/Identity/v3/application_credentials/add_application_credential.php b/samples/Identity/v3/application_credentials/create.php
similarity index 73%
rename from samples/Identity/v3/application_credentials/add_application_credential.php
rename to samples/Identity/v3/application_credentials/create.php
index ae92e376..be71f042 100644
--- a/samples/Identity/v3/application_credentials/add_application_credential.php
+++ b/samples/Identity/v3/application_credentials/create.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $user = $identity->getUser('{userId}');
 $applicationCredential = $user->createApplicationCredential([
diff --git a/samples/Identity/v3/application_credentials/delete_application_credential.php b/samples/Identity/v3/application_credentials/delete.php
similarity index 72%
rename from samples/Identity/v3/application_credentials/delete_application_credential.php
rename to samples/Identity/v3/application_credentials/delete.php
index 23619cce..5ce70855 100644
--- a/samples/Identity/v3/application_credentials/delete_application_credential.php
+++ b/samples/Identity/v3/application_credentials/delete.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $user = $identity->getUser('{userId}');
 $applicationCredential = $user->getApplicationCredential('{applicationCredentialId}');
diff --git a/samples/Identity/v3/application_credentials/show_application_credential.php b/samples/Identity/v3/application_credentials/read.php
similarity index 72%
rename from samples/Identity/v3/application_credentials/show_application_credential.php
rename to samples/Identity/v3/application_credentials/read.php
index 704c63d3..a7db5f80 100644
--- a/samples/Identity/v3/application_credentials/show_application_credential.php
+++ b/samples/Identity/v3/application_credentials/read.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $user = $identity->getUser('{userId}');
 $applicationCredential = $user->getApplicationCredential('{applicationCredentialId}');
diff --git a/samples/Identity/v3/credentials/add_cred.php b/samples/Identity/v3/credentials/create.php
similarity index 77%
rename from samples/Identity/v3/credentials/add_cred.php
rename to samples/Identity/v3/credentials/create.php
index 76563879..339f5d8b 100644
--- a/samples/Identity/v3/credentials/add_cred.php
+++ b/samples/Identity/v3/credentials/create.php
@@ -9,10 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $credential = $identity->createCredential([
     'blob'      => '{blob}',
diff --git a/samples/Identity/v3/credentials/delete_cred.php b/samples/Identity/v3/credentials/delete.php
similarity index 72%
rename from samples/Identity/v3/credentials/delete_cred.php
rename to samples/Identity/v3/credentials/delete.php
index 6b5bfef3..09b6fe43 100644
--- a/samples/Identity/v3/credentials/delete_cred.php
+++ b/samples/Identity/v3/credentials/delete.php
@@ -9,10 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $credential = $identity->getCredential('credentialId');
 $credential->delete();
diff --git a/samples/Identity/v3/credentials/get_cred.php b/samples/Identity/v3/credentials/get_cred.php
deleted file mode 100644
index b06ba11c..00000000
--- a/samples/Identity/v3/credentials/get_cred.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$identity = $openstack->identityV3(['region' => '{region}']);
-
-$credential = $identity->getCredential('credentialId');
-$credential->retrieve();
diff --git a/samples/Identity/v3/credentials/list_creds.php b/samples/Identity/v3/credentials/list.php
similarity index 75%
rename from samples/Identity/v3/credentials/list_creds.php
rename to samples/Identity/v3/credentials/list.php
index 6ed4a38e..8f8041f9 100644
--- a/samples/Identity/v3/credentials/list_creds.php
+++ b/samples/Identity/v3/credentials/list.php
@@ -9,10 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 foreach ($identity->listCredentials() as $credential) {
     /** @var $credential \OpenStack\Identity\v3\Models\Credential */
diff --git a/samples/Identity/v3/credentials/read.php b/samples/Identity/v3/credentials/read.php
new file mode 100644
index 00000000..c03e8de0
--- /dev/null
+++ b/samples/Identity/v3/credentials/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+]);
+
+$identity = $openstack->identityV3();
+
+$credential = $identity->getCredential('{credentialId}');
+$credential->retrieve();
diff --git a/samples/Identity/v3/credentials/update.php b/samples/Identity/v3/credentials/update.php
new file mode 100644
index 00000000..c0b603f4
--- /dev/null
+++ b/samples/Identity/v3/credentials/update.php
@@ -0,0 +1,21 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+]);
+
+$identity = $openstack->identityV3();
+
+$credential = $identity->getCredential('{credentialId}');
+
+$credential->type = '{type}';
+$credential->blob = '{blob}';
+
+$credential->update();
diff --git a/samples/Identity/v3/credentials/update_cred.php b/samples/Identity/v3/credentials/update_cred.php
deleted file mode 100644
index e8fa51b3..00000000
--- a/samples/Identity/v3/credentials/update_cred.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$identity = $openstack->identityV3(['region' => '{region}']);
-
-$credential = $identity->getCredential('credentialId');
-
-$credential->type = 'foo';
-$credential->blob = 'bar';
-
-$credential->update();
diff --git a/samples/Identity/v3/domains/check_group_role.php b/samples/Identity/v3/domains/check_group_role.php
index 1c96160d..50ca6dd6 100644
--- a/samples/Identity/v3/domains/check_group_role.php
+++ b/samples/Identity/v3/domains/check_group_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/check_user_role.php b/samples/Identity/v3/domains/check_user_role.php
index 4f4b3152..e2bf4200 100644
--- a/samples/Identity/v3/domains/check_user_role.php
+++ b/samples/Identity/v3/domains/check_user_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/add_domain.php b/samples/Identity/v3/domains/create.php
similarity index 71%
rename from samples/Identity/v3/domains/add_domain.php
rename to samples/Identity/v3/domains/create.php
index bd8b5239..4ff25cfe 100644
--- a/samples/Identity/v3/domains/add_domain.php
+++ b/samples/Identity/v3/domains/create.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->createDomain([
     'description' => '{description}',
diff --git a/samples/Identity/v3/domains/delete_domain.php b/samples/Identity/v3/domains/delete.php
similarity index 66%
rename from samples/Identity/v3/domains/delete_domain.php
rename to samples/Identity/v3/domains/delete.php
index 590aa36d..fd99463b 100644
--- a/samples/Identity/v3/domains/delete_domain.php
+++ b/samples/Identity/v3/domains/delete.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 $domain->delete();
diff --git a/samples/Identity/v3/domains/grant_group_role.php b/samples/Identity/v3/domains/grant_group_role.php
index af1bc176..24f0e6b9 100644
--- a/samples/Identity/v3/domains/grant_group_role.php
+++ b/samples/Identity/v3/domains/grant_group_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/grant_user_role.php b/samples/Identity/v3/domains/grant_user_role.php
index c305759e..65592911 100644
--- a/samples/Identity/v3/domains/grant_user_role.php
+++ b/samples/Identity/v3/domains/grant_user_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/list_domains.php b/samples/Identity/v3/domains/list.php
similarity index 69%
rename from samples/Identity/v3/domains/list_domains.php
rename to samples/Identity/v3/domains/list.php
index d08cc1c8..817c6b26 100644
--- a/samples/Identity/v3/domains/list_domains.php
+++ b/samples/Identity/v3/domains/list.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 foreach ($identity->listDomains() as $domain) {
     /** @var $domain \OpenStack\Identity\v3\Models\Domain */
diff --git a/samples/Identity/v3/domains/list_group_roles.php b/samples/Identity/v3/domains/list_group_roles.php
index 1b7b89c3..58a360ca 100644
--- a/samples/Identity/v3/domains/list_group_roles.php
+++ b/samples/Identity/v3/domains/list_group_roles.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/list_user_roles.php b/samples/Identity/v3/domains/list_user_roles.php
index d9a7cfb1..c19d61f7 100644
--- a/samples/Identity/v3/domains/list_user_roles.php
+++ b/samples/Identity/v3/domains/list_user_roles.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/show_domain.php b/samples/Identity/v3/domains/read.php
similarity index 66%
rename from samples/Identity/v3/domains/show_domain.php
rename to samples/Identity/v3/domains/read.php
index c84b29d5..ebd9431e 100644
--- a/samples/Identity/v3/domains/show_domain.php
+++ b/samples/Identity/v3/domains/read.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 $domain->retrieve();
diff --git a/samples/Identity/v3/domains/revoke_group_role.php b/samples/Identity/v3/domains/revoke_group_role.php
index decb28fb..394834a2 100644
--- a/samples/Identity/v3/domains/revoke_group_role.php
+++ b/samples/Identity/v3/domains/revoke_group_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/revoke_user_role.php b/samples/Identity/v3/domains/revoke_user_role.php
index fcc6ca93..c109927a 100644
--- a/samples/Identity/v3/domains/revoke_user_role.php
+++ b/samples/Identity/v3/domains/revoke_user_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/update_domain.php b/samples/Identity/v3/domains/update.php
similarity index 68%
rename from samples/Identity/v3/domains/update_domain.php
rename to samples/Identity/v3/domains/update.php
index 97208e19..b3633d9b 100644
--- a/samples/Identity/v3/domains/update_domain.php
+++ b/samples/Identity/v3/domains/update.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/endpoints/add_endpoint.php b/samples/Identity/v3/endpoints/create.php
similarity index 76%
rename from samples/Identity/v3/endpoints/add_endpoint.php
rename to samples/Identity/v3/endpoints/create.php
index b123bf3f..1e774e62 100644
--- a/samples/Identity/v3/endpoints/add_endpoint.php
+++ b/samples/Identity/v3/endpoints/create.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $endpoint = $identity->createEndpoint([
     'interface' => \OpenStack\Identity\v3\Enum::INTERFACE_INTERNAL,
diff --git a/samples/Identity/v3/endpoints/delete_endpoint.php b/samples/Identity/v3/endpoints/delete.php
similarity index 67%
rename from samples/Identity/v3/endpoints/delete_endpoint.php
rename to samples/Identity/v3/endpoints/delete.php
index 56cafda7..b25e469d 100644
--- a/samples/Identity/v3/endpoints/delete_endpoint.php
+++ b/samples/Identity/v3/endpoints/delete.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $endpoint = $identity->getEndpoint('{endpointId}');
 $endpoint->delete();
diff --git a/samples/Identity/v3/endpoints/list_endpoints.php b/samples/Identity/v3/endpoints/list.php
similarity index 70%
rename from samples/Identity/v3/endpoints/list_endpoints.php
rename to samples/Identity/v3/endpoints/list.php
index 24d39a0e..f53612eb 100644
--- a/samples/Identity/v3/endpoints/list_endpoints.php
+++ b/samples/Identity/v3/endpoints/list.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 foreach ($identity->listEndpoints() as $endpoint) {
     /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
diff --git a/samples/Identity/v3/endpoints/get_endpoint.php b/samples/Identity/v3/endpoints/read.php
similarity index 65%
rename from samples/Identity/v3/endpoints/get_endpoint.php
rename to samples/Identity/v3/endpoints/read.php
index 9d869360..05bbc236 100644
--- a/samples/Identity/v3/endpoints/get_endpoint.php
+++ b/samples/Identity/v3/endpoints/read.php
@@ -9,13 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $endpoint = $identity->getEndpoint('{endpointId}');
+$endpoint->retrieve();
diff --git a/samples/Identity/v3/endpoints/update_endpoint.php b/samples/Identity/v3/endpoints/update.php
similarity index 71%
rename from samples/Identity/v3/endpoints/update_endpoint.php
rename to samples/Identity/v3/endpoints/update.php
index c77a0d8a..e2fdf73a 100644
--- a/samples/Identity/v3/endpoints/update_endpoint.php
+++ b/samples/Identity/v3/endpoints/update.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $endpoint = $identity->getEndpoint('{endpointId}');
 
diff --git a/samples/Identity/v3/groups/add_user.php b/samples/Identity/v3/groups/add_user.php
index 01c28c71..3d8edabb 100644
--- a/samples/Identity/v3/groups/add_user.php
+++ b/samples/Identity/v3/groups/add_user.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/groups/check_user_membership.php b/samples/Identity/v3/groups/check_user_membership.php
index 64caabab..ba6d76a2 100644
--- a/samples/Identity/v3/groups/check_user_membership.php
+++ b/samples/Identity/v3/groups/check_user_membership.php
@@ -9,18 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->getGroup('{groupId}');
 
-$result = $group->checkMembership(['userId' => '{groupUserId}']);
-
-if (true === $result) {
-}
+$hasMembership = $group->checkMembership(['userId' => '{groupUserId}']);
diff --git a/samples/Identity/v3/groups/add_group.php b/samples/Identity/v3/groups/create.php
similarity index 69%
rename from samples/Identity/v3/groups/add_group.php
rename to samples/Identity/v3/groups/create.php
index b389a5b6..66455bdb 100644
--- a/samples/Identity/v3/groups/add_group.php
+++ b/samples/Identity/v3/groups/create.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->createGroup([
     'description' => '{description}',
diff --git a/samples/Identity/v3/groups/delete_group.php b/samples/Identity/v3/groups/delete.php
similarity index 66%
rename from samples/Identity/v3/groups/delete_group.php
rename to samples/Identity/v3/groups/delete.php
index be29565c..d29e2012 100644
--- a/samples/Identity/v3/groups/delete_group.php
+++ b/samples/Identity/v3/groups/delete.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/groups/list_groups.php b/samples/Identity/v3/groups/list.php
similarity index 69%
rename from samples/Identity/v3/groups/list_groups.php
rename to samples/Identity/v3/groups/list.php
index cee3577e..5d1e038f 100644
--- a/samples/Identity/v3/groups/list_groups.php
+++ b/samples/Identity/v3/groups/list.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 foreach ($identity->listGroups() as $group) {
     /** @var $group \OpenStack\Identity\v3\Models\Group */
diff --git a/samples/Identity/v3/groups/list_users.php b/samples/Identity/v3/groups/list_users.php
index 40dc45c0..d1652b2b 100644
--- a/samples/Identity/v3/groups/list_users.php
+++ b/samples/Identity/v3/groups/list_users.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/groups/get_group.php b/samples/Identity/v3/groups/read.php
similarity index 66%
rename from samples/Identity/v3/groups/get_group.php
rename to samples/Identity/v3/groups/read.php
index da4d8f0f..b2b3c653 100644
--- a/samples/Identity/v3/groups/get_group.php
+++ b/samples/Identity/v3/groups/read.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->getGroup('{groupId}');
 $group->retrieve();
diff --git a/samples/Identity/v3/groups/remove_user.php b/samples/Identity/v3/groups/remove_user.php
index 7a975c0c..b7210ba9 100644
--- a/samples/Identity/v3/groups/remove_user.php
+++ b/samples/Identity/v3/groups/remove_user.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/groups/update_group.php b/samples/Identity/v3/groups/update.php
similarity index 70%
rename from samples/Identity/v3/groups/update_group.php
rename to samples/Identity/v3/groups/update.php
index 71f8234d..9cfabdfe 100644
--- a/samples/Identity/v3/groups/update_group.php
+++ b/samples/Identity/v3/groups/update.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/projects/check_group_role.php b/samples/Identity/v3/projects/check_group_role.php
index 0fc01cd4..1f38cd3b 100644
--- a/samples/Identity/v3/projects/check_group_role.php
+++ b/samples/Identity/v3/projects/check_group_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/check_user_role.php b/samples/Identity/v3/projects/check_user_role.php
index 2704b406..2d5736ae 100644
--- a/samples/Identity/v3/projects/check_user_role.php
+++ b/samples/Identity/v3/projects/check_user_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/add_project.php b/samples/Identity/v3/projects/create.php
similarity index 71%
rename from samples/Identity/v3/projects/add_project.php
rename to samples/Identity/v3/projects/create.php
index 0dcd0d25..f6debd3f 100644
--- a/samples/Identity/v3/projects/add_project.php
+++ b/samples/Identity/v3/projects/create.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->createProject([
     'description' => '{description}',
diff --git a/samples/Identity/v3/projects/delete_project.php b/samples/Identity/v3/projects/delete.php
similarity index 66%
rename from samples/Identity/v3/projects/delete_project.php
rename to samples/Identity/v3/projects/delete.php
index 2ce0c387..1401a242 100644
--- a/samples/Identity/v3/projects/delete_project.php
+++ b/samples/Identity/v3/projects/delete.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/grant_group_role.php b/samples/Identity/v3/projects/grant_group_role.php
index 8bec285c..8fd69fde 100644
--- a/samples/Identity/v3/projects/grant_group_role.php
+++ b/samples/Identity/v3/projects/grant_group_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/grant_user_role.php b/samples/Identity/v3/projects/grant_user_role.php
index 6acb4b74..be3721f0 100644
--- a/samples/Identity/v3/projects/grant_user_role.php
+++ b/samples/Identity/v3/projects/grant_user_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/list_projects.php b/samples/Identity/v3/projects/list.php
similarity index 65%
rename from samples/Identity/v3/projects/list_projects.php
rename to samples/Identity/v3/projects/list.php
index 07890bdf..3fc190bf 100644
--- a/samples/Identity/v3/projects/list_projects.php
+++ b/samples/Identity/v3/projects/list.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 foreach ($identity->listProjects() as $project) {
 }
diff --git a/samples/Identity/v3/projects/list_group_roles.php b/samples/Identity/v3/projects/list_group_roles.php
index b678e0a7..ef64004d 100644
--- a/samples/Identity/v3/projects/list_group_roles.php
+++ b/samples/Identity/v3/projects/list_group_roles.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/list_user_roles.php b/samples/Identity/v3/projects/list_user_roles.php
index 11d96f49..d943d978 100644
--- a/samples/Identity/v3/projects/list_user_roles.php
+++ b/samples/Identity/v3/projects/list_user_roles.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/get_project.php b/samples/Identity/v3/projects/read.php
similarity index 66%
rename from samples/Identity/v3/projects/get_project.php
rename to samples/Identity/v3/projects/read.php
index 8e548ade..50d993ea 100644
--- a/samples/Identity/v3/projects/get_project.php
+++ b/samples/Identity/v3/projects/read.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 $project->retrieve();
diff --git a/samples/Identity/v3/projects/revoke_group_role.php b/samples/Identity/v3/projects/revoke_group_role.php
index 8011a3e5..85e13597 100644
--- a/samples/Identity/v3/projects/revoke_group_role.php
+++ b/samples/Identity/v3/projects/revoke_group_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/revoke_user_role.php b/samples/Identity/v3/projects/revoke_user_role.php
index cd910562..b8d4c390 100644
--- a/samples/Identity/v3/projects/revoke_user_role.php
+++ b/samples/Identity/v3/projects/revoke_user_role.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/update_project.php b/samples/Identity/v3/projects/update.php
similarity index 68%
rename from samples/Identity/v3/projects/update_project.php
rename to samples/Identity/v3/projects/update.php
index 862185bb..d35b9de6 100644
--- a/samples/Identity/v3/projects/update_project.php
+++ b/samples/Identity/v3/projects/update.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/roles/add_role.php b/samples/Identity/v3/roles/create.php
similarity index 78%
rename from samples/Identity/v3/roles/add_role.php
rename to samples/Identity/v3/roles/create.php
index 41a759d1..bf82ec08 100644
--- a/samples/Identity/v3/roles/add_role.php
+++ b/samples/Identity/v3/roles/create.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/roles/list_roles.php b/samples/Identity/v3/roles/list.php
similarity index 80%
rename from samples/Identity/v3/roles/list_roles.php
rename to samples/Identity/v3/roles/list.php
index a5388a36..22e650c8 100644
--- a/samples/Identity/v3/roles/list_roles.php
+++ b/samples/Identity/v3/roles/list.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/roles/list_assignments.php b/samples/Identity/v3/roles/list_assignments.php
index b39543b0..9b929804 100644
--- a/samples/Identity/v3/roles/list_assignments.php
+++ b/samples/Identity/v3/roles/list_assignments.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/services/add_service.php b/samples/Identity/v3/services/create.php
similarity index 69%
rename from samples/Identity/v3/services/add_service.php
rename to samples/Identity/v3/services/create.php
index ac4a5c36..f4d24a69 100644
--- a/samples/Identity/v3/services/add_service.php
+++ b/samples/Identity/v3/services/create.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $service = $identity->createService([
     'name' => '{serviceName}',
diff --git a/samples/Identity/v3/services/delete_service.php b/samples/Identity/v3/services/delete.php
similarity index 66%
rename from samples/Identity/v3/services/delete_service.php
rename to samples/Identity/v3/services/delete.php
index cdd62f45..d5c01a1d 100644
--- a/samples/Identity/v3/services/delete_service.php
+++ b/samples/Identity/v3/services/delete.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $service = $identity->getService('{serviceId}');
 $service->delete();
diff --git a/samples/Identity/v3/services/list_services.php b/samples/Identity/v3/services/list.php
similarity index 69%
rename from samples/Identity/v3/services/list_services.php
rename to samples/Identity/v3/services/list.php
index 8b501e1a..e506411f 100644
--- a/samples/Identity/v3/services/list_services.php
+++ b/samples/Identity/v3/services/list.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 foreach ($identity->listServices() as $service) {
     /** @var $service \OpenStack\Identity\v3\Models\Service */
diff --git a/samples/Identity/v3/services/get_service.php b/samples/Identity/v3/services/read.php
similarity index 67%
rename from samples/Identity/v3/services/get_service.php
rename to samples/Identity/v3/services/read.php
index f8cf1949..65d59493 100644
--- a/samples/Identity/v3/services/get_service.php
+++ b/samples/Identity/v3/services/read.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $service = $identity->getService('{serviceId}');
 $service->retrieve();
diff --git a/samples/Identity/v3/services/update_service.php b/samples/Identity/v3/services/update.php
similarity index 69%
rename from samples/Identity/v3/services/update_service.php
rename to samples/Identity/v3/services/update.php
index 600c80fd..26af68f0 100644
--- a/samples/Identity/v3/services/update_service.php
+++ b/samples/Identity/v3/services/update.php
@@ -9,14 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $service = $identity->getService('{serviceId}');
 
diff --git a/samples/Identity/v3/tokens/export_authentication_token.php b/samples/Identity/v3/tokens/export_authentication_token.php
index 995a6430..818152ed 100644
--- a/samples/Identity/v3/tokens/export_authentication_token.php
+++ b/samples/Identity/v3/tokens/export_authentication_token.php
@@ -10,9 +10,6 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ];
 
 $openstack = new OpenStack\OpenStack($params);
diff --git a/samples/Identity/v3/tokens/generate_token_from_id.php b/samples/Identity/v3/tokens/generate_token_from_id.php
index 38821c68..b25096f2 100644
--- a/samples/Identity/v3/tokens/generate_token_from_id.php
+++ b/samples/Identity/v3/tokens/generate_token_from_id.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php b/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php
index 7cfed1d2..15960c8a 100644
--- a/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php
+++ b/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php
@@ -9,9 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php b/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php
index 5b84a1b1..78476941 100644
--- a/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php
+++ b/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php
@@ -9,17 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ]);
 
 $identity = $openstack->identityV3();
 
-// Since project names will not be unique across an entire OpenStack installation,
-// when authenticating with them you must also provide your domain ID. You do
-// not have to do this if you authenticate with a project ID.
-
 $token = $identity->generateToken([
     'user' => [
         'id'       => '{userId}',
diff --git a/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php b/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
index b64e8a28..408dba47 100644
--- a/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
+++ b/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
@@ -9,9 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/tokens/generate_token_with_user_id.php b/samples/Identity/v3/tokens/generate_token_with_user_id.php
index 0a0b475c..71969741 100644
--- a/samples/Identity/v3/tokens/generate_token_with_user_id.php
+++ b/samples/Identity/v3/tokens/generate_token_with_user_id.php
@@ -9,9 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/tokens/generate_token_with_username.php b/samples/Identity/v3/tokens/generate_token_with_username.php
index 632de736..ceb07143 100644
--- a/samples/Identity/v3/tokens/generate_token_with_username.php
+++ b/samples/Identity/v3/tokens/generate_token_with_username.php
@@ -10,16 +10,10 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ]);
 
 $identity = $openstack->identityV3();
 
-// Since usernames will not be unique across an entire OpenStack installation,
-// when authenticating with them, you must also provide your domain ID. You do
-// not have to do this if you authenticate with a user ID.
 $token = $identity->generateToken([
     'user' => [
         'name'     => '{username}',
diff --git a/samples/Identity/v3/tokens/revoke_token.php b/samples/Identity/v3/tokens/revoke_token.php
index e25882c9..de8f9675 100644
--- a/samples/Identity/v3/tokens/revoke_token.php
+++ b/samples/Identity/v3/tokens/revoke_token.php
@@ -10,11 +10,8 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $identity->revokeToken('{tokenId}');
diff --git a/samples/Identity/v3/tokens/use_cached_authentication_token.php b/samples/Identity/v3/tokens/use_cached_authentication_token.php
index ddc40a73..464d476d 100644
--- a/samples/Identity/v3/tokens/use_cached_authentication_token.php
+++ b/samples/Identity/v3/tokens/use_cached_authentication_token.php
@@ -10,9 +10,6 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ];
 
 $token = json_decode(file_get_contents('token.json'), true);
diff --git a/samples/Identity/v3/tokens/validate_token.php b/samples/Identity/v3/tokens/validate_token.php
index 7302d965..ef9dcb59 100644
--- a/samples/Identity/v3/tokens/validate_token.php
+++ b/samples/Identity/v3/tokens/validate_token.php
@@ -10,12 +10,9 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
-    'scope' => [
-        'project' => ['id' => '{projectId}']
-    ]
 ]);
 
-$identity = $openstack->identityV3(['region' => '{region}']);
+$identity = $openstack->identityV3();
 
 $result = $identity->validateToken('{tokenId}');
 
diff --git a/samples/Identity/v3/users/add_user.php b/samples/Identity/v3/users/create.php
similarity index 91%
rename from samples/Identity/v3/users/add_user.php
rename to samples/Identity/v3/users/create.php
index 892e67c7..38a066e0 100644
--- a/samples/Identity/v3/users/add_user.php
+++ b/samples/Identity/v3/users/create.php
@@ -9,7 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/delete_user.php b/samples/Identity/v3/users/delete.php
similarity index 78%
rename from samples/Identity/v3/users/delete_user.php
rename to samples/Identity/v3/users/delete.php
index 3dc90d20..715a7a09 100644
--- a/samples/Identity/v3/users/delete_user.php
+++ b/samples/Identity/v3/users/delete.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/list_users.php b/samples/Identity/v3/users/list.php
similarity index 80%
rename from samples/Identity/v3/users/list_users.php
rename to samples/Identity/v3/users/list.php
index b03b3a73..a52becd9 100644
--- a/samples/Identity/v3/users/list_users.php
+++ b/samples/Identity/v3/users/list.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/list_groups.php b/samples/Identity/v3/users/list_groups.php
index af554436..f2156d8e 100644
--- a/samples/Identity/v3/users/list_groups.php
+++ b/samples/Identity/v3/users/list_groups.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/list_projects.php b/samples/Identity/v3/users/list_projects.php
index 9e36f21e..edae2e9d 100644
--- a/samples/Identity/v3/users/list_projects.php
+++ b/samples/Identity/v3/users/list_projects.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/get_user.php b/samples/Identity/v3/users/read.php
similarity index 78%
rename from samples/Identity/v3/users/get_user.php
rename to samples/Identity/v3/users/read.php
index df4924b4..432da367 100644
--- a/samples/Identity/v3/users/get_user.php
+++ b/samples/Identity/v3/users/read.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/update_user.php b/samples/Identity/v3/users/update.php
similarity index 81%
rename from samples/Identity/v3/users/update_user.php
rename to samples/Identity/v3/users/update.php
index 2c4dc2b5..0bb3af76 100644
--- a/samples/Identity/v3/users/update_user.php
+++ b/samples/Identity/v3/users/update.php
@@ -9,11 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Images/v2/create.php b/samples/Images/v2/create.php
new file mode 100644
index 00000000..b0a98a8c
--- /dev/null
+++ b/samples/Images/v2/create.php
@@ -0,0 +1,14 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->imagesV2();
diff --git a/samples/Images/v2/create_with_region.php b/samples/Images/v2/create_with_region.php
new file mode 100644
index 00000000..91c5e21b
--- /dev/null
+++ b/samples/Images/v2/create_with_region.php
@@ -0,0 +1,13 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+]);
+
+$service = $openstack->imagesV2(['region' => '{region}']);
\ No newline at end of file
diff --git a/samples/Images/v2/images/create.php b/samples/Images/v2/images/create.php
index e2fec9bd..501760a1 100644
--- a/samples/Images/v2/images/create.php
+++ b/samples/Images/v2/images/create.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/Images/v2/images/deactivate.php b/samples/Images/v2/images/deactivate.php
index fd604d64..6b973551 100644
--- a/samples/Images/v2/images/deactivate.php
+++ b/samples/Images/v2/images/deactivate.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/Images/v2/images/delete.php b/samples/Images/v2/images/delete.php
index 69b48eb6..8a2f31c8 100644
--- a/samples/Images/v2/images/delete.php
+++ b/samples/Images/v2/images/delete.php
@@ -5,10 +5,13 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$openstack->imagesV2()
-    ->getImage('{imageId}')
-    ->delete();
+$service = $openstack->imagesV2();
+
+$image = $service->getImage('{imageId}');
+$image->delete();
diff --git a/samples/Images/v2/images/download_binary_data.php b/samples/Images/v2/images/download_binary_data.php
index 74f434ef..20a4a69d 100644
--- a/samples/Images/v2/images/download_binary_data.php
+++ b/samples/Images/v2/images/download_binary_data.php
@@ -5,13 +5,14 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->imagesV2();
 
 $image  = $service->getImage('{imageId}');
 
-/** @var \GuzzleHttp\Psr7\Stream $stream */
 $stream = $image->downloadData();
diff --git a/samples/Images/v2/images/list.php b/samples/Images/v2/images/list.php
index 42a714c6..8574678b 100644
--- a/samples/Images/v2/images/list.php
+++ b/samples/Images/v2/images/list.php
@@ -5,12 +5,15 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$images = $openstack->imagesV2()
-                    ->listImages();
+$service = $openstack->imagesV2();
+
+$images = $service->listImages();
 
 foreach ($images as $image) {
     /** @var \OpenStack\Images\v2\Models\Image $image */
diff --git a/samples/Images/v2/images/list_sorted.php b/samples/Images/v2/images/list_sorted.php
index 07f85f62..2b0f8044 100644
--- a/samples/Images/v2/images/list_sorted.php
+++ b/samples/Images/v2/images/list_sorted.php
@@ -5,11 +5,15 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$images = $openstack->imagesV2()->listImages(['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
+$service = $openstack->imagesV2();
+
+$images = $service->listImages(['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
 
 foreach ($images as $image) {
     /** @var \OpenStack\Images\v2\Models\Image $image */
diff --git a/samples/Images/v2/images/reactivate.php b/samples/Images/v2/images/reactivate.php
index 3b7730c1..f37c3e93 100644
--- a/samples/Images/v2/images/reactivate.php
+++ b/samples/Images/v2/images/reactivate.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/Images/v2/images/get.php b/samples/Images/v2/images/read.php
similarity index 66%
rename from samples/Images/v2/images/get.php
rename to samples/Images/v2/images/read.php
index 680dc80b..83c7240a 100644
--- a/samples/Images/v2/images/get.php
+++ b/samples/Images/v2/images/read.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/Images/v2/images/update.php b/samples/Images/v2/images/update.php
index 0778bcae..dcb86537 100644
--- a/samples/Images/v2/images/update.php
+++ b/samples/Images/v2/images/update.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/Images/v2/images/upload_binary_data.php b/samples/Images/v2/images/upload_binary_data.php
index 152f55a0..ef5018a1 100644
--- a/samples/Images/v2/images/upload_binary_data.php
+++ b/samples/Images/v2/images/upload_binary_data.php
@@ -5,8 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/Images/v2/members/add.php b/samples/Images/v2/members/add.php
deleted file mode 100644
index 092fdbba..00000000
--- a/samples/Images/v2/members/add.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']],
-]);
-
-$member = $openstack->imagesV2()
-    ->getImage('{imageId}')
-    ->addMember('{projectId}');
diff --git a/samples/Images/v2/members/create.php b/samples/Images/v2/members/create.php
new file mode 100644
index 00000000..dc387eeb
--- /dev/null
+++ b/samples/Images/v2/members/create.php
@@ -0,0 +1,16 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->imagesV2();
+$image = $service->getImage('{imageId}');
+$member = $image->addMember('{projectId}');
diff --git a/samples/Images/v2/members/delete.php b/samples/Images/v2/members/delete.php
index 6040895a..4f3fcfa7 100644
--- a/samples/Images/v2/members/delete.php
+++ b/samples/Images/v2/members/delete.php
@@ -5,11 +5,13 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$openstack->imagesV2()
-          ->getImage('{imageId}')
-          ->getMember('{projectId}')
-          ->delete();
+$service = $openstack->imagesV2();
+$image = $service->getImage('{imageId}');
+$member = $image->getMember('{projectId}');
+$member->delete();
diff --git a/samples/Images/v2/members/get.php b/samples/Images/v2/members/get.php
deleted file mode 100644
index f824ead0..00000000
--- a/samples/Images/v2/members/get.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$member = $openstack->imagesV2()
-                    ->getImage('{imageId}')
-                    ->getMember('{tenantId}');
diff --git a/samples/Images/v2/members/list.php b/samples/Images/v2/members/list.php
index fb14aa8e..4e19cef1 100644
--- a/samples/Images/v2/members/list.php
+++ b/samples/Images/v2/members/list.php
@@ -5,12 +5,14 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$image = $openstack->imagesV2()
-                   ->getImage('{imageId}');
+$service = $openstack->imagesV2();
+$image = $service->getImage('{imageId}');
 
 foreach ($image->listMembers() as $member) {
 }
diff --git a/samples/Images/v2/members/read.php b/samples/Images/v2/members/read.php
new file mode 100644
index 00000000..33456add
--- /dev/null
+++ b/samples/Images/v2/members/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->imagesV2();
+$image = $service->getImage('{imageId}');
+$member = $image->getMember('{projectId}');
+$member->retrieve();
diff --git a/samples/Images/v2/members/update_status.php b/samples/Images/v2/members/update_status.php
index 30f33e93..cb830df8 100644
--- a/samples/Images/v2/members/update_status.php
+++ b/samples/Images/v2/members/update_status.php
@@ -7,11 +7,14 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$openstack->imagesV2()
-    ->getImage('{imageId}')
-    ->getMember('{projectId}')
-    ->updateStatus(Member::STATUS_ACCEPTED);
+$service = $openstack->imagesV2();
+
+$image = $service->getImage('{imageId}');
+$member = $image->getMember('{projectId}');
+$member->updateStatus(Member::STATUS_ACCEPTED);
diff --git a/samples/Networking/v2/lbaas/healthmonitors/get.php b/samples/Networking/v2/lbaas/healthmonitors/get.php
deleted file mode 100644
index 1b848062..00000000
--- a/samples/Networking/v2/lbaas/healthmonitors/get.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope'   => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
-]);
-
-$networking = $openstack->networkingV2();
-
-// Get the health monitor
-$healthmonitor = $networking->getLoadBalancerHealthMonitor('{healthmonitorId}');
-$healthmonitor->retrieve();
diff --git a/samples/Networking/v2/lbaas/healthmonitors/read.php b/samples/Networking/v2/lbaas/healthmonitors/read.php
new file mode 100644
index 00000000..58ce8108
--- /dev/null
+++ b/samples/Networking/v2/lbaas/healthmonitors/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+]);
+
+$service = $openstack->networkingV2();
+$healthMonitor = $service->getLoadBalancerHealthMonitor('{healthMonitorId}');
+
+$healthMonitor->retrieve();
diff --git a/samples/Networking/v2/lbaas/listeners/get.php b/samples/Networking/v2/lbaas/listeners/get.php
deleted file mode 100644
index 7c9b4305..00000000
--- a/samples/Networking/v2/lbaas/listeners/get.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope'   => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
-]);
-
-$networking = $openstack->networkingV2();
-
-// Get the listener
-$listener = $networking->getLoadBalancerListener('{listenerId}');
-$listener->retrieve();
diff --git a/samples/Networking/v2/lbaas/listeners/read.php b/samples/Networking/v2/lbaas/listeners/read.php
new file mode 100644
index 00000000..cba83f94
--- /dev/null
+++ b/samples/Networking/v2/lbaas/listeners/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+]);
+
+$service = $openstack->networkingV2();
+$listener = $service->getLoadBalancerListener('{listenerId}');
+
+$listener->retrieve();
diff --git a/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php b/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php
index cd4c165d..40e3132e 100644
--- a/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php
+++ b/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php
@@ -18,7 +18,6 @@
 
 $networking = $openstack->networkingV2();
 
-// Get the loadbalancer
 $lb = $networking->getLoadBalancer('{loadbalancerId}');
 
-$stats = $lb->getStats();
+$status = $lb->getStatuses();
diff --git a/samples/Networking/v2/lbaas/loadbalancers/get.php b/samples/Networking/v2/lbaas/loadbalancers/read.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/get.php
rename to samples/Networking/v2/lbaas/loadbalancers/read.php
diff --git a/samples/Networking/v2/lbaas/pools/get.php b/samples/Networking/v2/lbaas/pools/read.php
similarity index 59%
rename from samples/Networking/v2/lbaas/pools/get.php
rename to samples/Networking/v2/lbaas/pools/read.php
index 734336a8..8c48db7f 100644
--- a/samples/Networking/v2/lbaas/pools/get.php
+++ b/samples/Networking/v2/lbaas/pools/read.php
@@ -9,15 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
+$read = $openstack->networkingV2();
 
 // Get the pool
-$pool = $networking->getLoadBalancerPool('{poolId}');
+$pool = $read->getLoadBalancerPool('{poolId}');
 $pool->retrieve();
diff --git a/samples/Networking/v2/networks/create.php b/samples/Networking/v2/networks/create.php
index 5b794822..e6632053 100644
--- a/samples/Networking/v2/networks/create.php
+++ b/samples/Networking/v2/networks/create.php
@@ -7,21 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
-
-$options = [
+$service = $openstack->networkingV2();
+$network = $service->createNetwork([
     'name'         => '{networkName}',
     'adminStateUp' => true,
-];
-
-// Create the network
-$network = $networking->createNetwork($options);
+]);
diff --git a/samples/Networking/v2/networks/create_batch.php b/samples/Networking/v2/networks/create_batch.php
index 4f499f8b..07395cdd 100644
--- a/samples/Networking/v2/networks/create_batch.php
+++ b/samples/Networking/v2/networks/create_batch.php
@@ -7,24 +7,16 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
-
-$options = [
+$service = $openstack->networkingV2();
+$networks = $service->createNetworks([
     [
-      'name' => '{networkName1}'
+        'name' => '{networkName1}',
     ],
     [
-      'name' => '{networkName2}'
+        'name' => '{networkName2}',
     ],
-];
-
-$networks = $networking->createNetworks($options);
+]);
diff --git a/samples/Networking/v2/networks/delete.php b/samples/Networking/v2/networks/delete.php
index 87325d91..3965aa15 100644
--- a/samples/Networking/v2/networks/delete.php
+++ b/samples/Networking/v2/networks/delete.php
@@ -9,15 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
-
-$network = $networking->getNetwork('{networkId}');
+$service = $openstack->networkingV2();
+$network = $service->getNetwork('{networkId}');
 
 $network->delete();
diff --git a/samples/Networking/v2/networks/get.php b/samples/Networking/v2/networks/get.php
deleted file mode 100644
index bda39d2d..00000000
--- a/samples/Networking/v2/networks/get.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
-]);
-
-$networking = $openstack->networkingV2();
-
-$network = $networking->getNetwork('{networkId}');
-
-// By default, this will return an empty Network object and NOT hit the API.
-// This is convenient for when you want to use the object for operations
-// that do not require an initial GET request. To retrieve the network's details,
-// run the following, which *will* call the API with a GET request:
-
-$network->retrieve();
diff --git a/samples/Networking/v2/networks/read.php b/samples/Networking/v2/networks/read.php
new file mode 100644
index 00000000..4b9dcee5
--- /dev/null
+++ b/samples/Networking/v2/networks/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+]);
+
+$service = $openstack->networkingV2();
+$network = $service->getNetwork('{networkId}');
+
+$network->retrieve();
diff --git a/samples/Networking/v2/networks/update.php b/samples/Networking/v2/networks/update.php
index 01e9422c..06c03cbb 100644
--- a/samples/Networking/v2/networks/update.php
+++ b/samples/Networking/v2/networks/update.php
@@ -9,16 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
-
-$network = $networking->getNetwork('{networkId}');
+$service = $openstack->networkingV2();
+$network = $service->getNetwork('{networkId}');
 
 $network->name = '{newName}';
 $network->update();
diff --git a/samples/Networking/v2/ports/create.php b/samples/Networking/v2/ports/create.php
index 285ed652..9312d3f2 100644
--- a/samples/Networking/v2/ports/create.php
+++ b/samples/Networking/v2/ports/create.php
@@ -5,14 +5,16 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
 
-$port = $networking->createPort([
+$port = $service->createPort([
     'name'         => '{portName}',
     'networkId'    => '{networkId}',
-    'adminStateUp' => true
+    'adminStateUp' => true,
 ]);
diff --git a/samples/Networking/v2/ports/create_batch.php b/samples/Networking/v2/ports/create_batch.php
index f5206a1e..7c32b811 100644
--- a/samples/Networking/v2/ports/create_batch.php
+++ b/samples/Networking/v2/ports/create_batch.php
@@ -5,21 +5,23 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
 
-$ports = $networking->createPorts([
+$ports = $service->createPorts([
     [
         'name'         => '{name1}',
         'networkId'    => '{networkId1}',
-        'adminStateUp' => true
+        'adminStateUp' => true,
     ],
     [
         'name'         => '{name2}',
         'networkId'    => '{networkId2}',
-        'adminStateUp' => true
+        'adminStateUp' => true,
     ],
 ]);
diff --git a/samples/Networking/v2/ports/create_with_fixed_ips.php b/samples/Networking/v2/ports/create_with_fixed_ips.php
index ae28661a..4d96884f 100644
--- a/samples/Networking/v2/ports/create_with_fixed_ips.php
+++ b/samples/Networking/v2/ports/create_with_fixed_ips.php
@@ -5,13 +5,15 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id' => '{userId}',
+        'password' => '{password}'
+    ],
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
 
-$port = $networking->createPort([
+$port = $service->createPort([
     'name'         => '{portName}',
     'networkId'    => '{networkId}',
     'adminStateUp' => true,
diff --git a/samples/Networking/v2/ports/delete.php b/samples/Networking/v2/ports/delete.php
index 5c8f338d..2c6a8884 100644
--- a/samples/Networking/v2/ports/delete.php
+++ b/samples/Networking/v2/ports/delete.php
@@ -5,11 +5,13 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
+$port = $service->getPort('{portId}');
 
-$port = $networking->getPort('{portId}');
 $port->delete();
diff --git a/samples/Networking/v2/ports/list.php b/samples/Networking/v2/ports/list.php
index 0442d566..19b8039c 100644
--- a/samples/Networking/v2/ports/list.php
+++ b/samples/Networking/v2/ports/list.php
@@ -5,12 +5,14 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
 
-foreach ($networking->listPorts() as $port) {
+foreach ($service->listPorts() as $port) {
     /** @var \OpenStack\Networking\v2\Models\Port $port */
 }
diff --git a/samples/Networking/v2/ports/get.php b/samples/Networking/v2/ports/read.php
similarity index 64%
rename from samples/Networking/v2/ports/get.php
rename to samples/Networking/v2/ports/read.php
index 7e0d960c..3e00a29e 100644
--- a/samples/Networking/v2/ports/get.php
+++ b/samples/Networking/v2/ports/read.php
@@ -5,10 +5,13 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
 $networking = $openstack->networkingV2();
-
 $port = $networking->getPort('{portId}');
+
+$port->retrieve();
diff --git a/samples/Networking/v2/ports/update.php b/samples/Networking/v2/ports/update.php
index a8f39e65..4d2682e3 100644
--- a/samples/Networking/v2/ports/update.php
+++ b/samples/Networking/v2/ports/update.php
@@ -5,12 +5,14 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
+$port = $service->getPort('{portId}');
 
-$port = $networking->getPort('{portId}');
 $port->name = '{newName}';
 $port->update();
diff --git a/samples/Networking/v2/securityGroups/create.php b/samples/Networking/v2/securityGroups/create.php
index 572626d5..9da8dce0 100644
--- a/samples/Networking/v2/securityGroups/create.php
+++ b/samples/Networking/v2/securityGroups/create.php
@@ -7,9 +7,8 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
 $networking = $openstack->networkingV2();
diff --git a/samples/Networking/v2/subnets/create_batch.php b/samples/Networking/v2/subnets/create_batch.php
index 79c60aab..5d4599c4 100644
--- a/samples/Networking/v2/subnets/create_batch.php
+++ b/samples/Networking/v2/subnets/create_batch.php
@@ -7,30 +7,23 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
 
-$options = [
+$subnets = $service->createSubnets([
     [
-      'name'        => '{subnetName1}',
-      'networkId'   => '{networkId1}',
-      'ipVersion'   => 4,
-      'cidr'        => '192.168.199.0/24',
+        'name'      => '{subnetName1}',
+        'networkId' => '{networkId1}',
+        'ipVersion' => 4,
+        'cidr'      => '192.168.199.0/24',
     ],
     [
-      'name'        => '{subnetName2}',
-      'networkId'   => '{networkId2}',
-      'ipVersion'   => 4,
-      'cidr'        => '10.56.4.0/22',
+        'name'      => '{subnetName2}',
+        'networkId' => '{networkId2}',
+        'ipVersion' => 4,
+        'cidr'      => '10.56.4.0/22',
     ],
-];
-
-$subnets = $networking->createSubnets($options);
+]);
diff --git a/samples/Networking/v2/subnets/create_with_gateway_ip.php b/samples/Networking/v2/subnets/create_with_gateway_ip.php
index 168837f3..8c07deeb 100644
--- a/samples/Networking/v2/subnets/create_with_gateway_ip.php
+++ b/samples/Networking/v2/subnets/create_with_gateway_ip.php
@@ -7,24 +7,16 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
 
-$options = [
+$subnet = $service->createSubnet([
     'name'      => '{subnetName}',
     'networkId' => '{networkId}',
     'ipVersion' => 4,
     'cidr'      => '192.168.199.0/25',
-    'gatewayIp' => '192.168.199.128'
-];
-
-// Create the subnet
-$subnet = $networking->createSubnet($options);
+    'gatewayIp' => '192.168.199.128',
+]);
diff --git a/samples/Networking/v2/subnets/create_with_host_routes.php b/samples/Networking/v2/subnets/create_with_host_routes.php
index a58ed79a..5b4d53c1 100644
--- a/samples/Networking/v2/subnets/create_with_host_routes.php
+++ b/samples/Networking/v2/subnets/create_with_host_routes.php
@@ -9,16 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
+$service = $openstack->networkingV2();
 
-$options = [
+$subnet = $service->createSubnet([
     'name'       => '{subnetName}',
     'networkId'  => '{networkId}',
     'ipVersion'  => 4,
@@ -27,7 +22,4 @@
         'destination' => '1.1.1.0/24',
         'nexthop'     => '192.168.19.20'
     ]]
-];
-
-// Create the subnet
-$subnet = $networking->createSubnet($options);
+]);
diff --git a/samples/Networking/v2/subnets/delete.php b/samples/Networking/v2/subnets/delete.php
index ffc13f6c..4d00eac7 100644
--- a/samples/Networking/v2/subnets/delete.php
+++ b/samples/Networking/v2/subnets/delete.php
@@ -9,15 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
-
-$subnet = $networking->getSubnet('{subnetId}');
+$service = $openstack->networkingV2();
+$subnet = $service->getSubnet('{subnetId}');
 
 $subnet->delete();
diff --git a/samples/Networking/v2/subnets/get.php b/samples/Networking/v2/subnets/get.php
deleted file mode 100644
index b519abce..00000000
--- a/samples/Networking/v2/subnets/get.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-    'scope' => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
-]);
-
-$networking = $openstack->networkingV2();
-
-$subnet = $networking->getSubnet('{subnetId}');
-
-// By default, this will return an empty Subnet object and NOT hit the API.
-// This is convenient for when you want to use the object for operations
-// that do not require an initial GET request. To retrieve the subnet's details,
-// run the following, which *will* call the API with a GET request:
-
-$subnet->retrieve();
diff --git a/samples/Networking/v2/subnets/read.php b/samples/Networking/v2/subnets/read.php
new file mode 100644
index 00000000..4cc15fc9
--- /dev/null
+++ b/samples/Networking/v2/subnets/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->networkingV2();
+$subnet = $service->getSubnet('{subnetId}');
+
+$subnet->retrieve();
diff --git a/samples/Networking/v2/subnets/update.php b/samples/Networking/v2/subnets/update.php
index cbff505f..e0d35f10 100644
--- a/samples/Networking/v2/subnets/update.php
+++ b/samples/Networking/v2/subnets/update.php
@@ -7,18 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => [
-        'project' => [
-            'id' => '{projectId}'
-        ]
-    ]
 ]);
 
-$networking = $openstack->networkingV2();
-
-$subnet = $networking->getSubnet('{subnetId}');
+$service = $openstack->networkingV2();
+$subnet = $service->getSubnet('{subnetId}');
 
 $subnet->name = '{newName}';
 $subnet->update();
diff --git a/samples/ObjectStore/v1/account/get_metadata.php b/samples/ObjectStore/v1/account/get_metadata.php
index af9e63c9..196a0358 100644
--- a/samples/ObjectStore/v1/account/get_metadata.php
+++ b/samples/ObjectStore/v1/account/get_metadata.php
@@ -9,7 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
diff --git a/samples/ObjectStore/v1/account/merge_metadata.php b/samples/ObjectStore/v1/account/merge_metadata.php
index 77e77d16..e77a9e74 100644
--- a/samples/ObjectStore/v1/account/merge_metadata.php
+++ b/samples/ObjectStore/v1/account/merge_metadata.php
@@ -9,7 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
diff --git a/samples/ObjectStore/v1/account/read.php b/samples/ObjectStore/v1/account/read.php
new file mode 100644
index 00000000..82490797
--- /dev/null
+++ b/samples/ObjectStore/v1/account/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+]);
+
+$service = $openstack->objectStoreV1();
+$account = $service->getAccount();
+
+$account->retrieve();
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/account/reset_metadata.php b/samples/ObjectStore/v1/account/reset_metadata.php
index 9d79c4b4..33ae3520 100644
--- a/samples/ObjectStore/v1/account/reset_metadata.php
+++ b/samples/ObjectStore/v1/account/reset_metadata.php
@@ -9,11 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
-
 $account = $service->getAccount();
 
 $account->resetMetadata([
diff --git a/samples/ObjectStore/v1/containers/create.php b/samples/ObjectStore/v1/containers/create.php
index 8e867604..98435ce5 100644
--- a/samples/ObjectStore/v1/containers/create.php
+++ b/samples/ObjectStore/v1/containers/create.php
@@ -7,13 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
 
 $container = $service->createContainer([
-    'name' => '{containerName}'
+    'name' => '{containerName}',
 ]);
diff --git a/samples/ObjectStore/v1/containers/delete.php b/samples/ObjectStore/v1/containers/delete.php
index 25ae38df..da5c06ed 100644
--- a/samples/ObjectStore/v1/containers/delete.php
+++ b/samples/ObjectStore/v1/containers/delete.php
@@ -7,11 +7,11 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$openstack->objectStoreV1()
-          ->getContainer('{containerName}')
-          ->delete();
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+
+$container->delete();
diff --git a/samples/ObjectStore/v1/containers/get_metadata.php b/samples/ObjectStore/v1/containers/get_metadata.php
index aded49ae..7d75d2fd 100644
--- a/samples/ObjectStore/v1/containers/get_metadata.php
+++ b/samples/ObjectStore/v1/containers/get_metadata.php
@@ -9,10 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-/** @var array $metadata */
-$metadata = $openstack->objectStoreV1()
-                      ->getContainer('{containerName}')
-                      ->getMetadata();
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+
+$metadata = $container->getMetadata();
diff --git a/samples/ObjectStore/v1/containers/list.php b/samples/ObjectStore/v1/containers/list.php
index 2cf9d401..2723be81 100644
--- a/samples/ObjectStore/v1/containers/list.php
+++ b/samples/ObjectStore/v1/containers/list.php
@@ -9,7 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
diff --git a/samples/ObjectStore/v1/containers/merge_metadata.php b/samples/ObjectStore/v1/containers/merge_metadata.php
index accf9923..d2a6e504 100644
--- a/samples/ObjectStore/v1/containers/merge_metadata.php
+++ b/samples/ObjectStore/v1/containers/merge_metadata.php
@@ -9,7 +9,6 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
diff --git a/samples/ObjectStore/v1/containers/read.php b/samples/ObjectStore/v1/containers/read.php
new file mode 100644
index 00000000..4f7b4206
--- /dev/null
+++ b/samples/ObjectStore/v1/containers/read.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+
+$container->retrieve();
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/containers/reset_metadata.php b/samples/ObjectStore/v1/containers/reset_metadata.php
index 7c1e056d..60329ce7 100644
--- a/samples/ObjectStore/v1/containers/reset_metadata.php
+++ b/samples/ObjectStore/v1/containers/reset_metadata.php
@@ -9,11 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
-
 $container = $service->getContainer('{containerName}');
 
 $container->resetMetadata([
diff --git a/samples/ObjectStore/v1/objects/check_exists.php b/samples/ObjectStore/v1/objects/check_exists.php
index 50b3b65e..0d6e72de 100644
--- a/samples/ObjectStore/v1/objects/check_exists.php
+++ b/samples/ObjectStore/v1/objects/check_exists.php
@@ -9,9 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$exists = $openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->objectExists('{objectName}');
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+
+$exists = $container->objectExists('{objectName}');
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/objects/copy.php b/samples/ObjectStore/v1/objects/copy.php
index 0790be82..80bd233a 100644
--- a/samples/ObjectStore/v1/objects/copy.php
+++ b/samples/ObjectStore/v1/objects/copy.php
@@ -9,12 +9,13 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->getObject('{objectName}')
-    ->copy([
-        'destination' => '{newContainerName}/{newObjectName}',
-    ]);
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$object->copy([
+    'destination' => '{newContainerName}/{newObjectName}',
+]);
+
diff --git a/samples/ObjectStore/v1/objects/create.php b/samples/ObjectStore/v1/objects/create.php
index 65be7f88..12d955ab 100644
--- a/samples/ObjectStore/v1/objects/create.php
+++ b/samples/ObjectStore/v1/objects/create.php
@@ -9,13 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
-$object = $openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->createObject([
-        'name'    => '{objectName}',
-        'content' => '{objectContent}',
-    ]);
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->createObject([
+    'name'    => '{objectName}',
+    'content' => '{objectContent}',
+]);
diff --git a/samples/ObjectStore/v1/objects/create_from_stream.php b/samples/ObjectStore/v1/objects/create_from_stream.php
index eed9fa20..461d4b20 100644
--- a/samples/ObjectStore/v1/objects/create_from_stream.php
+++ b/samples/ObjectStore/v1/objects/create_from_stream.php
@@ -2,27 +2,23 @@
 
 require 'vendor/autoload.php';
 
-use GuzzleHttp\Psr7\Stream;
-
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 // You can use any instance of \Psr\Http\Message\StreamInterface
-$stream = new Stream(fopen('/path/to/object.txt', 'r'));
+$stream = new \GuzzleHttp\Psr7\Stream(fopen('/path/to/object.txt', 'r'));
+
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
 
-$options = [
+$object = $container->createObject([
     'name'   => '{objectName}',
     'stream' => $stream,
-];
+]);
 
-/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
-$object = $openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->createObject($options);
diff --git a/samples/ObjectStore/v1/objects/create_large_object.php b/samples/ObjectStore/v1/objects/create_large_object.php
index 52f03b3f..8b99ca3b 100644
--- a/samples/ObjectStore/v1/objects/create_large_object.php
+++ b/samples/ObjectStore/v1/objects/create_large_object.php
@@ -2,32 +2,29 @@
 
 require 'vendor/autoload.php';
 
-use Guzzle\Stream\Stream;
-
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $options = [
-    'name'   => 'object_name.txt',
-    'stream' => new Stream(fopen('/path/to/large_object.mov', 'r')),
 ];
 
-// optional: specify the size of each segment in bytes
-$options['segmentSize'] = 1073741824;
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
 
-// optional: specify the container where the segments live. This does not necessarily have to be the
-// same as the container which holds the manifest file
-$options['segmentContainer'] = 'test_segments';
+$object = $container->createObject([
+    'name'             => '{objectName}',
+    'stream'           => new \GuzzleHttp\Psr7\Stream(fopen('/path/to/large_object.mov', 'r')),
 
+    // optional: specify the size of each segment in bytes
+    'segmentSize'      => 1073741824,
 
-/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
-$object = $openstack->objectStoreV1()
-                    ->getContainer('test')
-                    ->createLargeObject($options);
+    // optional: specify the container where the segments live. This does not necessarily have to be the
+    // same as the container which holds the manifest file
+    'segmentContainer' => 'test_segments',
+]);
diff --git a/samples/ObjectStore/v1/objects/delete.php b/samples/ObjectStore/v1/objects/delete.php
index 548e53bd..6392b4aa 100644
--- a/samples/ObjectStore/v1/objects/delete.php
+++ b/samples/ObjectStore/v1/objects/delete.php
@@ -9,10 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->getObject('{objectName}')
-    ->delete();
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$object->delete();
diff --git a/samples/ObjectStore/v1/objects/download.php b/samples/ObjectStore/v1/objects/download.php
index 158c096a..97d033f9 100644
--- a/samples/ObjectStore/v1/objects/download.php
+++ b/samples/ObjectStore/v1/objects/download.php
@@ -9,10 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$stream = $openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->getObject('{objectName}')
-    ->download();
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$stream = $object->download();
diff --git a/samples/ObjectStore/v1/objects/download_stream.php b/samples/ObjectStore/v1/objects/download_stream.php
index 3d235b24..9d63366d 100644
--- a/samples/ObjectStore/v1/objects/download_stream.php
+++ b/samples/ObjectStore/v1/objects/download_stream.php
@@ -9,10 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$stream = $openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->getObject('{objectName}')
-    ->download(['requestOptions' => ['stream' => true]]);
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$stream = $object->download(['requestOptions' => ['stream' => true]]);
diff --git a/samples/ObjectStore/v1/objects/get_metadata.php b/samples/ObjectStore/v1/objects/get_metadata.php
index dbb871a5..51d49c87 100644
--- a/samples/ObjectStore/v1/objects/get_metadata.php
+++ b/samples/ObjectStore/v1/objects/get_metadata.php
@@ -9,10 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$metadata = $openstack->objectStoreV1()
-    ->getContainer('{containerName}')
-    ->getObject('{objectName}')
-    ->getMetadata();
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$metadata = $object->getMetadata();
diff --git a/samples/ObjectStore/v1/objects/list.php b/samples/ObjectStore/v1/objects/list.php
index 713cacec..54475db0 100644
--- a/samples/ObjectStore/v1/objects/list.php
+++ b/samples/ObjectStore/v1/objects/list.php
@@ -9,11 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$container = $openstack->objectStoreV1()
-    ->getContainer('{containerName}');
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
 
 foreach ($container->listObjects() as $object) {
     /** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
diff --git a/samples/ObjectStore/v1/objects/merge_metadata.php b/samples/ObjectStore/v1/objects/merge_metadata.php
index 04c6c793..f6c3b500 100644
--- a/samples/ObjectStore/v1/objects/merge_metadata.php
+++ b/samples/ObjectStore/v1/objects/merge_metadata.php
@@ -7,15 +7,15 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$openstack->objectStoreV1()
-          ->getContainer('{containerName}')
-          ->getObject('{objectName}')
-          ->mergeMetadata([
-              '{key_1}' => '{val_1}',
-              '{key_2}' => '{val_2}',
-          ]);
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$object->mergeMetadata([
+    '{key_1}' => '{val_1}',
+    '{key_2}' => '{val_2}',
+]);
diff --git a/samples/ObjectStore/v1/objects/read.php b/samples/ObjectStore/v1/objects/read.php
new file mode 100644
index 00000000..21c11a5a
--- /dev/null
+++ b/samples/ObjectStore/v1/objects/read.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$object->retrieve();
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/objects/reset_metadata.php b/samples/ObjectStore/v1/objects/reset_metadata.php
index 6c83e647..407298eb 100644
--- a/samples/ObjectStore/v1/objects/reset_metadata.php
+++ b/samples/ObjectStore/v1/objects/reset_metadata.php
@@ -7,15 +7,15 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}'
+        'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$openstack->objectStoreV1()
-          ->getContainer('{containerName}')
-          ->getObject('{objectName}')
-          ->resetMetadata([
-              '{key_1}' => '{val_1}',
-              '{key_2}' => '{val_2}',
-          ]);
+$service = $openstack->objectStoreV1();
+$container = $service->getContainer('{containerName}');
+$object = $container->getObject('{objectName}');
+
+$object->resetMetadata([
+    '{key_1}' => '{val_1}',
+    '{key_2}' => '{val_2}',
+]);
diff --git a/samples/Setup/application_credential_id.php b/samples/Setup/application_credential_id.php
new file mode 100644
index 00000000..64a6cd84
--- /dev/null
+++ b/samples/Setup/application_credential_id.php
@@ -0,0 +1,12 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl'                => '{authUrl}',
+    'region'                 => '{region}',
+    'application_credential' => [
+        'id'     => '{applicationCredentialId}',
+        'secret' => '{secret}',
+    ],
+]);
\ No newline at end of file
diff --git a/samples/Setup/token_id.php b/samples/Setup/token_id.php
new file mode 100644
index 00000000..8727447f
--- /dev/null
+++ b/samples/Setup/token_id.php
@@ -0,0 +1,9 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'tokenId' => '{tokenId}',
+]);
diff --git a/samples/Setup/user_id.php b/samples/Setup/user_id.php
new file mode 100644
index 00000000..53948b51
--- /dev/null
+++ b/samples/Setup/user_id.php
@@ -0,0 +1,12 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user' => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ]
+]);
\ No newline at end of file
diff --git a/samples/Setup/username.php b/samples/Setup/username.php
new file mode 100644
index 00000000..83458a00
--- /dev/null
+++ b/samples/Setup/username.php
@@ -0,0 +1,15 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user' => [
+        'name'     => '{username}',
+        'password' => '{password}',
+        'domain'   => [
+            'id' => '{domainId}'
+        ]
+    ]
+]);
\ No newline at end of file
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index 8090d8d0..3dc1fd4c 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -37,10 +37,10 @@ public function createServer(array $options): Server
     /**
      * List servers.
      *
-     * @param bool     $detailed Determines whether detailed information will be returned. If FALSE is specified, only
-     *                           the ID, name and links attributes are returned, saving bandwidth.
-     * @param array    $options  {@see \OpenStack\Compute\v2\Api::getServers}
-     * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
+     * @param bool          $detailed Determines whether detailed information will be returned. If FALSE is specified, only
+     *                                the ID, name and links attributes are returned, saving bandwidth.
+     * @param array         $options  {@see \OpenStack\Compute\v2\Api::getServers}
+     * @param callable|null $mapFn    a callable function that will be invoked on every iteration of the list
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Server>
      */
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index 6448694e..fa935026 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -79,6 +79,8 @@ public function retrieve()
 
     /**
      * @param array $userOptions {@see \OpenStack\ObjectStore\v1\Api::putContainer}
+     *
+     * @return self
      */
     public function create(array $userOptions): Creatable
     {
diff --git a/tests/sample/BlockStorage/v3/VolumeTest.php b/tests/sample/BlockStorage/v3/VolumeTest.php
index d598c26c..1f48a017 100644
--- a/tests/sample/BlockStorage/v3/VolumeTest.php
+++ b/tests/sample/BlockStorage/v3/VolumeTest.php
@@ -35,16 +35,18 @@ public function testCreate(): Volume
     /**
      * @depends testCreate
      */
-    public function testGet(Volume $createdVolume)
+    public function testRead(Volume $createdVolume)
     {
         /** @var Volume $volume */
-        require_once $this->sampleFile('volumes/get.php', [
+        require_once $this->sampleFile('volumes/read.php', [
             '{volumeId}' => $createdVolume->id,
         ]);
 
         $this->assertInstanceOf(Volume::class, $volume);
         $this->assertEquals($createdVolume->id, $volume->id);
-        $this->assertNull($volume->description);
+        $this->assertEquals($createdVolume->name, $volume->name);
+        $this->assertEquals($createdVolume->size, $volume->size);
+        $this->assertEquals($createdVolume->description, $volume->description);
     }
 
     /**
diff --git a/tests/sample/BlockStorage/v3/VolumeTypeTest.php b/tests/sample/BlockStorage/v3/VolumeTypeTest.php
index 94f8f4ab..05aa6b51 100644
--- a/tests/sample/BlockStorage/v3/VolumeTypeTest.php
+++ b/tests/sample/BlockStorage/v3/VolumeTypeTest.php
@@ -2,7 +2,6 @@
 
 namespace OpenStack\Sample\BlockStorage\v3;
 
-use OpenStack\BlockStorage\v2\Models\Snapshot;
 use OpenStack\BlockStorage\v2\Models\VolumeType;
 use OpenStack\Common\Error\BadResponseError;
 
@@ -24,16 +23,13 @@ public function testCreate(): VolumeType
     /**
      * @depends testCreate
      */
-    public function testGet(VolumeType $createdVolumeType)
+    public function testRead(VolumeType $createdVolumeType)
     {
         /** @var VolumeType $volumeType */
-        require_once $this->sampleFile('volume_types/get.php', ['{volumeTypeId}' => $createdVolumeType->id]);
+        require_once $this->sampleFile('volume_types/read.php', ['{volumeTypeId}' => $createdVolumeType->id]);
 
         $this->assertInstanceOf(VolumeType::class, $volumeType);
         $this->assertEquals($createdVolumeType->id, $volumeType->id);
-        $this->assertNull($volumeType->name);
-
-        $volumeType->retrieve();
         $this->assertEquals($createdVolumeType->name, $volumeType->name);
     }
 
diff --git a/tests/sample/Compute/v2/FlavorTest.php b/tests/sample/Compute/v2/FlavorTest.php
index 61a4708b..540e93c2 100644
--- a/tests/sample/Compute/v2/FlavorTest.php
+++ b/tests/sample/Compute/v2/FlavorTest.php
@@ -12,7 +12,7 @@ public function testCreate(): Flavor
         $name = $this->randomStr();
 
         /** @var $flavor \OpenStack\Compute\v2\Models\Flavor */
-        require_once $this->sampleFile('flavors/create_flavor.php', ['{flavorName}' => $name]);
+        require_once $this->sampleFile('flavors/create.php', ['{flavorName}' => $name]);
 
         $this->assertInstanceOf(Flavor::class, $flavor);
         $this->assertEquals($name, $flavor->name);
@@ -27,7 +27,7 @@ public function testList(Flavor $createdFlavor)
     {
         $found = false;
         require_once $this->sampleFile(
-            'flavors/list_flavors.php',
+            'flavors/list.php',
             [
                 '/** @var \OpenStack\Compute\v2\Models\Flavor $flavor */' => <<<'PHP'
 /** @var \OpenStack\Compute\v2\Models\Flavor $flavor */
@@ -45,10 +45,10 @@ public function testList(Flavor $createdFlavor)
     /**
      * @depends testCreate
      */
-    public function testGet(Flavor $createdFlavor)
+    public function testRead(Flavor $createdFlavor)
     {
         /** @var \OpenStack\Compute\v2\Models\Flavor $flavor */
-        require_once $this->sampleFile('flavors/get_flavor.php', ['{flavorId}' => $createdFlavor->id]);
+        require_once $this->sampleFile('flavors/read.php', ['{flavorId}' => $createdFlavor->id]);
 
         $this->assertInstanceOf(Flavor::class, $flavor);
         $this->assertEquals($createdFlavor->id, $flavor->id);
@@ -60,7 +60,7 @@ public function testGet(Flavor $createdFlavor)
      */
     public function testDelete(Flavor $createdFlavor)
     {
-        require_once $this->sampleFile('flavors/delete_flavor.php', ['{flavorId}' => $createdFlavor->id]);
+        require_once $this->sampleFile('flavors/delete.php', ['{flavorId}' => $createdFlavor->id]);
 
         foreach ($this->getService()->listFlavors() as $flavor) {
             $this->assertNotEquals($createdFlavor->id, $flavor->id);
diff --git a/tests/sample/Compute/v2/ServerTest.php b/tests/sample/Compute/v2/ServerTest.php
index c92ef611..0d3b5495 100644
--- a/tests/sample/Compute/v2/ServerTest.php
+++ b/tests/sample/Compute/v2/ServerTest.php
@@ -10,7 +10,6 @@
 
 class ServerTest extends TestCase
 {
-
     public function testCreate(): Server
     {
         $flavorId = getenv('OS_FLAVOR');
@@ -37,7 +36,7 @@ public function testCreate(): Server
         ];
 
         /** @var $server \OpenStack\Compute\v2\Models\Server */
-        require_once $this->sampleFile('servers/create_server.php', $replacements);
+        require_once $this->sampleFile('servers/create.php', $replacements);
 
         $server->waitUntilActive();
 
@@ -55,7 +54,7 @@ public function testUpdate(Server $createdServer)
     {
         $newName = $this->randomStr();
 
-        require_once $this->sampleFile('servers/update_server.php', [
+        require_once $this->sampleFile('servers/update.php', [
             '{serverId}' => $createdServer->id,
             '{newName}'  => $newName,
         ]);
@@ -72,7 +71,7 @@ public function testUpdate(Server $createdServer)
     public function testGet(Server $createdServer)
     {
         /** @var \OpenStack\Compute\v2\Models\Server $server */
-        require_once $this->sampleFile('servers/get_server.php', ['{serverId}' => $createdServer->id]);
+        require_once $this->sampleFile('servers/read.php', ['{serverId}' => $createdServer->id]);
 
         $this->assertInstanceOf(Server::class, $server);
         $this->assertEquals($createdServer->id, $server->id);
@@ -343,7 +342,7 @@ public function testGetConsoleOutput(Server $createdServer)
      */
     public function testDelete(Server $createdServer)
     {
-        require_once $this->sampleFile('servers/delete_server.php', ['{serverId}' => $createdServer->id]);
+        require_once $this->sampleFile('servers/delete.php', ['{serverId}' => $createdServer->id]);
 
         // Needed so that subnet and network can be removed
         $createdServer->waitUntilDeleted();
diff --git a/tests/sample/Identity/v3/ApplicationCredentialTest.php b/tests/sample/Identity/v3/ApplicationCredentialTest.php
index 42be5d25..a93f715a 100644
--- a/tests/sample/Identity/v3/ApplicationCredentialTest.php
+++ b/tests/sample/Identity/v3/ApplicationCredentialTest.php
@@ -8,14 +8,14 @@
 class ApplicationCredentialTest extends TestCase
 {
 
-    public function testAdd(): ApplicationCredential
+    public function testCreate(): ApplicationCredential
     {
         $name = $this->randomStr();
         $description = $this->randomStr();
 
         /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
         require_once $this->sampleFile(
-            'application_credentials/add_application_credential.php',
+            'application_credentials/create.php',
             [
                 '{name}'        => $name,
                 '{description}' => $description,
@@ -30,7 +30,7 @@ public function testAdd(): ApplicationCredential
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testGenerateToken(ApplicationCredential $applicationCredential)
     {
@@ -48,13 +48,13 @@ public function testGenerateToken(ApplicationCredential $applicationCredential)
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
-    public function testRetrieve(ApplicationCredential $originalApplicationCredential)
+    public function testRead(ApplicationCredential $originalApplicationCredential)
     {
         /** @var $applicationCredential \OpenStack\Identity\v3\Models\ApplicationCredential */
         require_once $this->sampleFile(
-            'application_credentials/show_application_credential.php',
+            'application_credentials/read.php',
             ['{applicationCredentialId}' => $originalApplicationCredential->id]
         );
 
@@ -64,7 +64,7 @@ public function testRetrieve(ApplicationCredential $originalApplicationCredentia
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testDelete(ApplicationCredential $applicationCredential)
     {
@@ -78,7 +78,7 @@ public function testDelete(ApplicationCredential $applicationCredential)
         $this->assertTrue($token->validate());
 
         require_once $this->sampleFile(
-            'application_credentials/delete_application_credential.php',
+            'application_credentials/delete.php',
             [
                 '{applicationCredentialId}' => $applicationCredential->id,
             ]
diff --git a/tests/sample/Identity/v3/DomainTest.php b/tests/sample/Identity/v3/DomainTest.php
index d852f2ad..2c6b4dd6 100644
--- a/tests/sample/Identity/v3/DomainTest.php
+++ b/tests/sample/Identity/v3/DomainTest.php
@@ -14,7 +14,7 @@ public function testCreate(): Domain
 
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
         require_once $this->sampleFile(
-            'domains/add_domain.php',
+            'domains/create.php',
             [
                 '{name}'        => $name,
                 '{description}' => $description,
@@ -34,7 +34,7 @@ public function testList(Domain $createdDomain)
     {
         $found = false;
         require_once $this->sampleFile(
-            'domains/list_domains.php',
+            'domains/list.php',
             [
                 '/** @var $domain \OpenStack\Identity\v3\Models\Domain */' => <<<'PHP'
 /** @var $domain \OpenStack\Identity\v3\Models\Domain */
@@ -51,10 +51,10 @@ public function testList(Domain $createdDomain)
     /**
      * @depends testCreate
      */
-    public function testShow(Domain $createdDomain)
+    public function testRead(Domain $createdDomain)
     {
         /** @var $domain \OpenStack\Identity\v3\Models\Domain */
-        require_once $this->sampleFile('domains/show_domain.php', ['{domainId}' => $createdDomain->id]);
+        require_once $this->sampleFile('domains/read.php', ['{domainId}' => $createdDomain->id]);
         $this->assertInstanceOf(Domain::class, $domain);
         $this->assertEquals($createdDomain->id, $domain->id);
         $this->assertEquals($createdDomain->name, $domain->name);
@@ -252,7 +252,7 @@ public function testRevokeUserRole(Domain $createdDomain, array $createdRoleAndU
     public function testUpdate(Domain $createdDomain)
     {
         $this->assertTrue($createdDomain->enabled);
-        require_once $this->sampleFile('domains/update_domain.php', ['{domainId}' => $createdDomain->id]);
+        require_once $this->sampleFile('domains/update.php', ['{domainId}' => $createdDomain->id]);
         $createdDomain->retrieve();
         $this->assertFalse($createdDomain->enabled);
     }
@@ -262,7 +262,7 @@ public function testUpdate(Domain $createdDomain)
      */
     public function testDelete(Domain $createdDomain)
     {
-        require_once $this->sampleFile('domains/delete_domain.php', ['{domainId}' => $createdDomain->id]);
+        require_once $this->sampleFile('domains/delete.php', ['{domainId}' => $createdDomain->id]);
         $found = false;
         foreach ($this->getService()->listDomains() as $domain) {
             if ($domain->id === $createdDomain->id) {
diff --git a/tests/sample/Identity/v3/EndpointTest.php b/tests/sample/Identity/v3/EndpointTest.php
index e9bc4e68..4aec0854 100644
--- a/tests/sample/Identity/v3/EndpointTest.php
+++ b/tests/sample/Identity/v3/EndpointTest.php
@@ -8,13 +8,13 @@
 
 class EndpointTest extends TestCase
 {
-    public function testAdd(): Endpoint
+    public function testCreate(): Endpoint
     {
         $service = $this->getService()->createService(['name' => $this->randomStr(), 'type' => 'volume', 'description' => $this->randomStr()]);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
         require_once $this->sampleFile(
-            'endpoints/add_endpoint.php',
+            'endpoints/create.php',
             [
                 '{endpointName}' => $this->randomStr(),
                 '{serviceId}'    => $service->id,
@@ -28,13 +28,13 @@ public function testAdd(): Endpoint
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testList(Endpoint $createdEndpoint)
     {
         $found = false;
         require_once $this->sampleFile(
-            'endpoints/list_endpoints.php',
+            'endpoints/list.php',
             [
                 '/** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */' => <<<'PHP'
 /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
@@ -50,14 +50,14 @@ public function testList(Endpoint $createdEndpoint)
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testUpdate(Endpoint $createdEndpoint)
     {
         $this->assertEquals(Enum::INTERFACE_INTERNAL, $createdEndpoint->interface);
 
         require_once $this->sampleFile(
-            'endpoints/update_endpoint.php',
+            'endpoints/update.php',
             [
                 '{endpointId}'   => $createdEndpoint->id,
             ]
@@ -68,12 +68,12 @@ public function testUpdate(Endpoint $createdEndpoint)
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testDelete(Endpoint $createdEndpoint)
     {
         require_once $this->sampleFile(
-            'endpoints/delete_endpoint.php',
+            'endpoints/delete.php',
             [
                 '{endpointId}'   => $createdEndpoint->id,
             ]
diff --git a/tests/sample/Identity/v3/GroupTest.php b/tests/sample/Identity/v3/GroupTest.php
index 602fa7ff..e910e2de 100644
--- a/tests/sample/Identity/v3/GroupTest.php
+++ b/tests/sample/Identity/v3/GroupTest.php
@@ -7,14 +7,14 @@
 
 class GroupTest extends TestCase
 {
-    public function testAdd(): array
+    public function testCreate(): array
     {
         $name = $this->randomStr();
         $description = $this->randomStr();
 
         /** @var $group \OpenStack\Identity\v3\Models\Group */
         require_once $this->sampleFile(
-            'groups/add_group.php',
+            'groups/create.php',
             [
                 '{name}'        => $name,
                 '{description}' => $description,
@@ -31,7 +31,7 @@ public function testAdd(): array
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testAddUser(array $groupAndUser): void
     {
@@ -53,7 +53,7 @@ public function testAddUser(array $groupAndUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testCheckMembership(array $groupAndUser): void
     {
@@ -61,7 +61,7 @@ public function testCheckMembership(array $groupAndUser): void
         /** @var $createdUser \OpenStack\Identity\v3\Models\User */
         [$createdGroup, $createdUser] = $groupAndUser;
 
-        /** @var $result bool */
+        /** @var $hasMembership bool */
         require_once $this->sampleFile(
             'groups/check_user_membership.php',
             [
@@ -70,11 +70,11 @@ public function testCheckMembership(array $groupAndUser): void
             ]
         );
 
-        $this->assertTrue($result);
+        $this->assertTrue($hasMembership);
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testListUsers(array $groupAndUser): void
     {
@@ -101,7 +101,7 @@ public function testListUsers(array $groupAndUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testRemoveUser(array $groupAndUser): void
     {
@@ -123,16 +123,16 @@ public function testRemoveUser(array $groupAndUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
-    public function testGet(array $groupAndUser): void
+    public function testRead(array $groupAndUser): void
     {
         /** @var $createdGroup \OpenStack\Identity\v3\Models\Group */
         [$createdGroup] = $groupAndUser;
 
         /** @var $group \OpenStack\Identity\v3\Models\Group */
         require_once $this->sampleFile(
-            'groups/get_group.php',
+            'groups/read.php',
             [
                 '{groupId}' => $createdGroup->id,
             ]
@@ -144,7 +144,7 @@ public function testGet(array $groupAndUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testUpdate(array $groupAndUser): void
     {
@@ -155,7 +155,7 @@ public function testUpdate(array $groupAndUser): void
         $newDescription = $this->randomStr();
 
         require_once $this->sampleFile(
-            'groups/update_group.php',
+            'groups/update.php',
             [
                 '{groupId}'     => $createdGroup->id,
                 '{name}'        => $newName,
@@ -169,7 +169,7 @@ public function testUpdate(array $groupAndUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testList(array $groupAndUser): void
     {
@@ -178,7 +178,7 @@ public function testList(array $groupAndUser): void
 
         $found = false;
         require_once $this->sampleFile(
-            'groups/list_groups.php',
+            'groups/list.php',
             [
                 '{groupId}'                                            => $createdGroup->id,
                 '/** @var $group \OpenStack\Identity\v3\Models\Group */' => <<<'PHP'
@@ -196,7 +196,7 @@ public function testList(array $groupAndUser): void
 
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testDelete(array $groupAndUser): void
     {
@@ -204,7 +204,7 @@ public function testDelete(array $groupAndUser): void
         [$createdGroup] = $groupAndUser;
 
         require_once $this->sampleFile(
-            'groups/delete_group.php',
+            'groups/delete.php',
             [
                 '{groupId}' => $createdGroup->id,
             ]
diff --git a/tests/sample/Identity/v3/ProjectTest.php b/tests/sample/Identity/v3/ProjectTest.php
index ea72d79e..5e54a05a 100644
--- a/tests/sample/Identity/v3/ProjectTest.php
+++ b/tests/sample/Identity/v3/ProjectTest.php
@@ -7,11 +7,11 @@
 
 class ProjectTest extends TestCase
 {
-    public function testAdd(): Project
+    public function testCreate(): Project
     {
         /** @var $project \OpenStack\Identity\v3\Models\Project */
         require_once $this->sampleFile(
-            'projects/add_project.php',
+            'projects/create.php',
             ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()]
         );
         $this->assertInstanceOf(Project::class, $project);
@@ -20,19 +20,19 @@ public function testAdd(): Project
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
-    public function testGet(Project $createdProject)
+    public function testRead(Project $createdProject)
     {
         /** @var $project \OpenStack\Identity\v3\Models\Project */
-        require_once $this->sampleFile('projects/get_project.php', ['{id}' => $createdProject->id]);
+        require_once $this->sampleFile('projects/read.php', ['{id}' => $createdProject->id]);
         $this->assertInstanceOf(Project::class, $project);
         $this->assertEquals($createdProject->id, $project->id);
         $this->assertEquals($createdProject->name, $project->name);
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testGrantGroupRole(Project $createdProject): array
     {
@@ -55,7 +55,7 @@ public function testGrantGroupRole(Project $createdProject): array
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      * @depends testGrantGroupRole
      */
     public function testCheckGroupRole(Project $createdProject, array $createdRoleAndGroup)
@@ -76,7 +76,7 @@ public function testCheckGroupRole(Project $createdProject, array $createdRoleAn
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      * @depends testGrantGroupRole
      */
     public function testListGroupRoles(Project $createdProject, array $createdRoleAndGroup)
@@ -103,7 +103,7 @@ public function testListGroupRoles(Project $createdProject, array $createdRoleAn
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      * @depends testGrantGroupRole
      */
     public function testRevokeGroupRole(Project $createdProject, array $createdRoleAndGroup)
@@ -125,7 +125,7 @@ public function testRevokeGroupRole(Project $createdProject, array $createdRoleA
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testGrantUserRole(Project $createdProject): array
     {
@@ -147,7 +147,7 @@ public function testGrantUserRole(Project $createdProject): array
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      * @depends testGrantUserRole
      */
     public function testCheckUserRole(Project $createdProject, array $createdRoleAndUser)
@@ -168,7 +168,7 @@ public function testCheckUserRole(Project $createdProject, array $createdRoleAnd
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      * @depends testGrantUserRole
      */
     public function testListUserRoles(Project $createdProject, array $createdRoleAndUser)
@@ -195,7 +195,7 @@ public function testListUserRoles(Project $createdProject, array $createdRoleAnd
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      * @depends testGrantUserRole
      */
     public function testRevokeUserRole(Project $createdProject, array $createdRoleAndUser)
@@ -217,24 +217,24 @@ public function testRevokeUserRole(Project $createdProject, array $createdRoleAn
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testUpdate(Project $createdProject)
     {
         $this->assertTrue($createdProject->enabled);
 
-        require_once $this->sampleFile('projects/update_project.php', ['{id}' => $createdProject->id]);
+        require_once $this->sampleFile('projects/update.php', ['{id}' => $createdProject->id]);
 
         $createdProject->retrieve();
         $this->assertFalse($createdProject->enabled);
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testDelete(Project $createdProject)
     {
-        require_once $this->sampleFile('projects/delete_project.php', ['{id}' => $createdProject->id]);
+        require_once $this->sampleFile('projects/delete.php', ['{id}' => $createdProject->id]);
 
         $found = false;
         foreach ($this->getService()->listProjects() as $project) {
diff --git a/tests/sample/Identity/v3/RoleTest.php b/tests/sample/Identity/v3/RoleTest.php
index 059a1b66..77648be6 100644
--- a/tests/sample/Identity/v3/RoleTest.php
+++ b/tests/sample/Identity/v3/RoleTest.php
@@ -6,23 +6,23 @@
 
 class RoleTest extends TestCase
 {
-    public function testAdd(): Role
+    public function testCeate(): Role
     {
         /** @var $role \OpenStack\Identity\v3\Models\Role */
-        require_once $this->sampleFile('roles/add_role.php', ['{name}' => $this->randomStr()]);
+        require_once $this->sampleFile('roles/create.php', ['{name}' => $this->randomStr()]);
         $this->assertInstanceOf(Role::class, $role);
 
         return $role;
     }
 
     /**
-     * @depends testAdd
+     * @depends testCeate
      */
     public function testList(Role $createdRole): void
     {
         $found = false;
         require_once $this->sampleFile(
-            'roles/list_roles.php',
+            'roles/list.php',
             [
                 '/** @var $role \OpenStack\Identity\v3\Models\Role */' => <<<'PHP'
 /** @var $role \OpenStack\Identity\v3\Models\Role */
@@ -38,7 +38,7 @@ public function testList(Role $createdRole): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCeate
      */
     public function testListAssignments(Role $createdRole): void
     {
diff --git a/tests/sample/Identity/v3/ServiceTest.php b/tests/sample/Identity/v3/ServiceTest.php
index 48e4d11a..a93148d5 100644
--- a/tests/sample/Identity/v3/ServiceTest.php
+++ b/tests/sample/Identity/v3/ServiceTest.php
@@ -7,11 +7,11 @@
 
 class ServiceTest extends TestCase
 {
-    public function testAdd(): \OpenStack\Identity\v3\Models\Service
+    public function testCreate(): \OpenStack\Identity\v3\Models\Service
     {
         /** @var $service \OpenStack\Identity\v3\Models\Service */
         require_once $this->sampleFile(
-            'services/add_service.php',
+            'services/create.php',
             [
                 '{serviceName}' => $this->randomStr(),
                 '{serviceType}' => $this->randomStr(),
@@ -23,13 +23,13 @@ public function testAdd(): \OpenStack\Identity\v3\Models\Service
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testList(\OpenStack\Identity\v3\Models\Service $createdService)
     {
         $found = false;
         require_once $this->sampleFile(
-            'services/list_services.php',
+            'services/list.php',
             [
                 '/** @var $service \OpenStack\Identity\v3\Models\Service */' => <<<'PHP'
 /** @var $service \OpenStack\Identity\v3\Models\Service */
@@ -45,14 +45,14 @@ public function testList(\OpenStack\Identity\v3\Models\Service $createdService)
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testUpdate(\OpenStack\Identity\v3\Models\Service $createdService)
     {
         $newDescription = $this->randomStr();
 
         require_once $this->sampleFile(
-            'services/update_service.php',
+            'services/update.php',
             [
                 '{serviceId}' => $createdService->id,
                 '{description}' => $newDescription,
@@ -64,13 +64,13 @@ public function testUpdate(\OpenStack\Identity\v3\Models\Service $createdService
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testGet(\OpenStack\Identity\v3\Models\Service $createdService)
     {
         /** @var $service \OpenStack\Identity\v3\Models\Service */
         require_once $this->sampleFile(
-            'services/get_service.php',
+            'services/read.php',
             [
                 '{serviceId}' => $createdService->id,
             ]
@@ -82,12 +82,12 @@ public function testGet(\OpenStack\Identity\v3\Models\Service $createdService)
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testDelete(\OpenStack\Identity\v3\Models\Service $createdService)
     {
         require_once $this->sampleFile(
-            'services/delete_service.php',
+            'services/delete.php',
             [
                 '{serviceId}' => $createdService->id,
             ]
diff --git a/tests/sample/Identity/v3/UserTest.php b/tests/sample/Identity/v3/UserTest.php
index 2fabbe46..313cbc50 100644
--- a/tests/sample/Identity/v3/UserTest.php
+++ b/tests/sample/Identity/v3/UserTest.php
@@ -7,14 +7,14 @@
 
 class UserTest extends TestCase
 {
-    public function testAdd(): User
+    public function testCreate(): User
     {
         $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
         $project = $this->getService()->createProject(['name' => $this->randomStr(), 'domainId' => $domain->id]);
 
         /** @var $user \OpenStack\Identity\v3\Models\User */
         require_once $this->sampleFile(
-            'users/add_user.php',
+            'users/create.php',
             [
                 '{defaultProjectId}' => $project->id,
                 '{description}'      => $this->randomStr(),
@@ -31,12 +31,12 @@ public function testAdd(): User
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
-    public function testGet(User $createdUser): void
+    public function testRead(User $createdUser): void
     {
         /** @var $user \OpenStack\Identity\v3\Models\User */
-        require_once $this->sampleFile('users/get_user.php', ['{id}' => $createdUser->id]);
+        require_once $this->sampleFile('users/read.php', ['{id}' => $createdUser->id]);
         $this->assertInstanceOf(User::class, $user);
 
         $this->assertEquals($createdUser->id, $user->id);
@@ -45,13 +45,13 @@ public function testGet(User $createdUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testList(User $createdUser): void
     {
         $found = false;
         require_once $this->sampleFile(
-            'users/list_users.php',
+            'users/list.php',
             [
                 '/** @var $user \OpenStack\Identity\v3\Models\User */' => <<<'PHP'
 /** @var $user \OpenStack\Identity\v3\Models\User */
@@ -67,7 +67,7 @@ public function testList(User $createdUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testListGroups(User $createdUser): void
     {
@@ -93,7 +93,7 @@ public function testListGroups(User $createdUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testListProjects(User $createdUser): void
     {
@@ -121,7 +121,7 @@ public function testListProjects(User $createdUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testUpdate(User $createdUser): void
     {
@@ -129,7 +129,7 @@ public function testUpdate(User $createdUser): void
         $newDescription = $this->randomStr();
 
         require_once $this->sampleFile(
-            'users/update_user.php',
+            'users/update.php',
             [
                 '{id}'          => $createdUser->id,
                 '{name}'        => $newName,
@@ -144,11 +144,11 @@ public function testUpdate(User $createdUser): void
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testDelete(User $createdUser): void
     {
-        require_once $this->sampleFile('users/delete_user.php', ['{id}' => $createdUser->id]);
+        require_once $this->sampleFile('users/delete.php', ['{id}' => $createdUser->id]);
 
         $found = false;
         foreach ($this->getService()->listUsers() as $user) {
diff --git a/tests/sample/Images/v2/ImageTest.php b/tests/sample/Images/v2/ImageTest.php
index f8b583eb..af524d3f 100644
--- a/tests/sample/Images/v2/ImageTest.php
+++ b/tests/sample/Images/v2/ImageTest.php
@@ -7,7 +7,6 @@
 
 class ImageTest extends TestCase
 {
-
     public function testCreate(): Image
     {
         /** @var Image $image */
@@ -54,11 +53,11 @@ public function testList(Image $createdImage)
     /**
      * @depends testCreate
      */
-    public function testGet(Image $createdImage)
+    public function testRead(Image $createdImage)
     {
         /** @var Image $image */
         require_once $this->sampleFile(
-            'images/get.php',
+            'images/read.php',
             [
                 '{imageId}' => $createdImage->id,
             ]
diff --git a/tests/sample/Images/v2/MemberTest.php b/tests/sample/Images/v2/MemberTest.php
index 0ebd10f6..df3893b1 100644
--- a/tests/sample/Images/v2/MemberTest.php
+++ b/tests/sample/Images/v2/MemberTest.php
@@ -8,7 +8,7 @@
 
 class MemberTest extends TestCase
 {
-    public function testAdd(): Member
+    public function testCreate(): Member
     {
         $image = $this->getService()->createImage([
             'name'            => $this->randomStr(),
@@ -18,14 +18,14 @@ public function testAdd(): Member
         ]);
 
         /** @var Member $member */
-        require_once $this->sampleFile('members/add.php', ['{imageId}' => $image->id,]);
+        require_once $this->sampleFile('members/create.php', ['{imageId}' => $image->id,]);
         $this->assertInstanceOf(Member::class, $member);
 
         return $member;
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testUpdateStatus(Member $createdMember)
     {
@@ -41,7 +41,7 @@ public function testUpdateStatus(Member $createdMember)
     }
 
     /**
-     * @depends testAdd
+     * @depends testCreate
      */
     public function testDelete(Member $createdMember)
     {
diff --git a/tests/sample/Networking/v2/NetworkTest.php b/tests/sample/Networking/v2/NetworkTest.php
index 5b360f0d..df6a6532 100644
--- a/tests/sample/Networking/v2/NetworkTest.php
+++ b/tests/sample/Networking/v2/NetworkTest.php
@@ -53,10 +53,10 @@ public function testUpdate(Network $createdNetwork)
     /**
      * @depends testCreate
      */
-    public function testRetrieve(Network $createdNetwork)
+    public function testRead(Network $createdNetwork)
     {
         /** @var \OpenStack\Networking\v2\Models\Network $network */
-        require_once $this->sampleFile('networks/get.php', ['{networkId}' => $createdNetwork->id]);
+        require_once $this->sampleFile('networks/read.php', ['{networkId}' => $createdNetwork->id]);
 
         $this->assertInstanceOf(Network::class, $network);
         $this->assertEquals($createdNetwork->id, $network->id);
diff --git a/tests/sample/Networking/v2/PortTest.php b/tests/sample/Networking/v2/PortTest.php
index 040c4879..05e08b5f 100644
--- a/tests/sample/Networking/v2/PortTest.php
+++ b/tests/sample/Networking/v2/PortTest.php
@@ -97,20 +97,17 @@ public function testList(Port $createdPort)
     /**
      * @depends testCreate
      */
-    public function testGet(Port $createdPort)
+    public function testRead(Port $createdPort)
     {
         /** @var $port \OpenStack\Networking\v2\Models\Port */
         require_once $this->sampleFile(
-            'ports/get.php',
+            'ports/read.php',
             [
                 '{portId}' => $createdPort->id,
             ]);
 
         $this->assertInstanceOf(Port::class, $port);
         $this->assertNotEmpty($port->id);
-        $this->assertEmpty($port->name);
-
-        $port->retrieve();
         $this->assertNotEmpty($port->name);
     }
 
diff --git a/tests/sample/Networking/v2/SubnetTest.php b/tests/sample/Networking/v2/SubnetTest.php
index 05b55b82..0beb40f7 100644
--- a/tests/sample/Networking/v2/SubnetTest.php
+++ b/tests/sample/Networking/v2/SubnetTest.php
@@ -100,10 +100,10 @@ public function testUpdate(Subnet $createdSubnet)
     /**
      * @depends testCreate
      */
-    public function testRetrieve(Subnet $createdSubnet)
+    public function testRead(Subnet $createdSubnet)
     {
         /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
-        require_once $this->sampleFile('subnets/get.php', ['{subnetId}' => $createdSubnet->id]);
+        require_once $this->sampleFile('subnets/read.php', ['{subnetId}' => $createdSubnet->id]);
 
         $this->assertInstanceOf(Subnet::class, $subnet);
         $this->assertEquals($subnet->id, $subnet->id);
diff --git a/tests/sample/ObjectStore/v1/ContainerTest.php b/tests/sample/ObjectStore/v1/ContainerTest.php
index 426ae3ca..a24999db 100644
--- a/tests/sample/ObjectStore/v1/ContainerTest.php
+++ b/tests/sample/ObjectStore/v1/ContainerTest.php
@@ -22,13 +22,14 @@ public function testCreate(): Container
     /**
      * @depends testCreate
      */
-    public function testGet(Container $createdContainer)
+    public function testRead(Container $createdContainer)
     {
         /** @var \OpenStack\ObjectStore\v1\Models\Container $container */
-        require_once $this->sampleFile('containers/get.php', ['{containerName}' => $createdContainer->name]);
+        require_once $this->sampleFile('containers/read.php', ['{containerName}' => $createdContainer->name]);
 
         $this->assertInstanceOf(Container::class, $container);
         $this->assertEquals($createdContainer->name, $container->name);
+        $this->assertEquals(0, $container->objectCount);
         $this->assertEquals([], $container->metadata);
     }
 
diff --git a/tests/sample/ObjectStore/v1/ObjectTest.php b/tests/sample/ObjectStore/v1/ObjectTest.php
index 731490af..9ba1181e 100644
--- a/tests/sample/ObjectStore/v1/ObjectTest.php
+++ b/tests/sample/ObjectStore/v1/ObjectTest.php
@@ -99,17 +99,22 @@ public function testDownloadStream(StorageObject $createdObject)
     /**
      * @depends testCreate
      */
-    public function testGet(StorageObject $createdObject)
+    public function testRead(StorageObject $createdObject)
     {
+        $createdObject->retrieve();
+
         /** @var StorageObject $object */
-        require_once $this->sampleFile('objects/get.php', [
+        require_once $this->sampleFile('objects/read.php', [
             '{containerName}' => $createdObject->containerName,
             '{objectName}' => $createdObject->name,
         ]);
 
         $this->assertInstanceOf(StorageObject::class, $object);
         $this->assertEquals($createdObject->name, $object->name);
-        $this->assertEquals(null, $object->metadata);
+        $this->assertEquals($createdObject->containerName, $object->containerName);
+        $this->assertEquals($createdObject->contentLength, $object->contentLength);
+        $this->assertEquals($createdObject->hash, $object->hash);
+        $this->assertEquals([], $object->metadata);
     }
 
     /**
diff --git a/tests/sample/SampleManager.php b/tests/sample/SampleManager.php
index 585c84b0..cda017d9 100644
--- a/tests/sample/SampleManager.php
+++ b/tests/sample/SampleManager.php
@@ -2,7 +2,6 @@
 
 namespace OpenStack\Sample;
 
-use OpenStack\Integration\SampleManagerInterface;
 use RuntimeException;
 
 class SampleManager
@@ -98,7 +97,7 @@ public function write(string $path, array $replacements): string
         }
 
         $content = strtr(file_get_contents($sampleFile), $replacements);
-        $content = str_replace("'vendor/'", "'" . dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . "vendor'", $content);
+        $content = str_replace("'vendor/'", "'" . dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . "vendor'", $content);
 
         $subst = $this->getConnectionTemplate();
         $content = preg_replace('/\([^)]+\)/', '', $content, 1);

From b0e560db7c2f85383822cc48face8abb4cda5521 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Tue, 30 Jan 2024 18:12:05 +0100
Subject: [PATCH 075/102] Resume suspend server (#394)

* Implement resuming and suspending of servers

---------

Co-authored-by: Martin Zurowietz <martin@zurowietz.de>
---
 .github/workflows/integration_tests.yml       | 21 ++++++++++++
 doc/services/compute/v2/servers.rst           | 11 +++++++
 samples/Compute/v2/servers/resume.php         | 17 ++++++++++
 samples/Compute/v2/servers/suspend.php        | 17 ++++++++++
 src/Compute/v2/Api.php                        | 24 ++++++++++++++
 src/Compute/v2/Models/Server.php              | 22 +++++++++++++
 tests/sample/Compute/v2/ServerTest.php        | 32 ++++++++++++++++++-
 .../Compute/v2/VolumeAttachmentTest.php       |  5 +++
 tests/unit/Compute/v2/Models/ServerTest.php   | 18 +++++++++++
 9 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 samples/Compute/v2/servers/resume.php
 create mode 100644 samples/Compute/v2/servers/suspend.php

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index f00c019f..9a722ed3 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -42,10 +42,12 @@ jobs:
     name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
     steps:
       - uses: actions/checkout@v2
+
       - name: get cache directory
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
+
       - uses: actions/cache@v3
         with:
           path: |
@@ -54,13 +56,16 @@ jobs:
           key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-${{ matrix.php_version }}-
+
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php_version }}
           extensions: curl
           tools: composer:v2
           coverage: none
+
       - run: composer install --prefer-dist --no-interaction --no-progress
+
       - name: Restore devstack cache
         uses: actions/cache@v3
         with:
@@ -69,6 +74,7 @@ jobs:
             !/opt/stack/data
             ~/devstack/
           key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
+
       - name: Deploy devstack
         uses: EmilienM/devstack-action@v0.11
         with:
@@ -81,6 +87,7 @@ jobs:
             [filter:versioned_writes]
             allow_object_versioning = true
           enabled_services: 's-account,s-container,s-object,s-proxy,s-bak'
+
       - name: Set env variables
         run: |
           {
@@ -96,9 +103,23 @@ jobs:
             echo OS_FLAVOR=1
             echo OS_DOMAIN_ID=default
           } >> "$GITHUB_ENV"
+
       - name: Check if Block Storage API v2 must be tested
         if: matrix.block_storage_v2 == true
         run: echo "OS_BLOCK_STORAGE_V2=1" >> "$GITHUB_ENV"
+
       - name: Execute Integration tests via PhpUnit
         run: vendor/bin/phpunit --configuration ./phpunit.sample.xml.dist
 
+      - name: Collect logs
+        if: ${{ failure() }}
+        run: |
+          set -x
+          journalctl >failure-logs
+
+      - name: Save logs
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: failure-logs
+          path: failure-logs
diff --git a/doc/services/compute/v2/servers.rst b/doc/services/compute/v2/servers.rst
index 4865771d..31343244 100644
--- a/doc/services/compute/v2/servers.rst
+++ b/doc/services/compute/v2/servers.rst
@@ -280,3 +280,14 @@ You can also refine by network label:
     $ipAddresses = $server->listAddresses([
         'networkLabel' => '{networkLabel}',
     ]);
+
+Suspend
+-------
+
+.. sample:: Compute/v2/images/suspend.php
+
+Resume
+------
+
+.. sample:: Compute/v2/images/resume.php
+
diff --git a/samples/Compute/v2/servers/resume.php b/samples/Compute/v2/servers/resume.php
new file mode 100644
index 00000000..e3347623
--- /dev/null
+++ b/samples/Compute/v2/servers/resume.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->computeV2();
+$server = $service->getServer(['id' => '{serverId}']);
+
+$server->resume();
diff --git a/samples/Compute/v2/servers/suspend.php b/samples/Compute/v2/servers/suspend.php
new file mode 100644
index 00000000..d53e1f1c
--- /dev/null
+++ b/samples/Compute/v2/servers/suspend.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}',
+    ],
+]);
+
+$service = $openstack->computeV2();
+$server = $service->getServer(['id' => '{serverId}']);
+
+$server->suspend();
diff --git a/src/Compute/v2/Api.php b/src/Compute/v2/Api.php
index 2a8dde1a..ee4adfa0 100644
--- a/src/Compute/v2/Api.php
+++ b/src/Compute/v2/Api.php
@@ -332,6 +332,30 @@ public function stopServer(): array
         ];
     }
 
+    public function resumeServer(): array
+    {
+        return [
+            'method' => 'POST',
+            'path'   => 'servers/{id}/action',
+            'params' => [
+                'id'     => $this->params->urlId('server'),
+                'resume' => $this->params->nullAction(),
+            ],
+        ];
+    }
+
+    public function suspendServer(): array
+    {
+        return [
+            'method' => 'POST',
+            'path'   => 'servers/{id}/action',
+            'params' => [
+                'id'      => $this->params->urlId('server'),
+                'suspend' => $this->params->nullAction(),
+            ],
+        ];
+    }
+
     public function rebuildServer(): array
     {
         return [
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index a9e25cbd..bb7e73ae 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -217,6 +217,28 @@ public function stop()
         ]);
     }
 
+    /**
+     * Resumes server.
+     */
+    public function resume(): void
+    {
+        $this->execute($this->api->resumeServer(), [
+            'id'     => $this->id,
+            'resume' => null,
+        ]);
+    }
+
+    /**
+     * Suspends server.
+     */
+    public function suspend(): void
+    {
+        $this->execute($this->api->suspendServer(), [
+            'id'      => $this->id,
+            'suspend' => null,
+        ]);
+    }
+
     /**
      * Rebuilds the server.
      *
diff --git a/tests/sample/Compute/v2/ServerTest.php b/tests/sample/Compute/v2/ServerTest.php
index 0d3b5495..18c8f5a3 100644
--- a/tests/sample/Compute/v2/ServerTest.php
+++ b/tests/sample/Compute/v2/ServerTest.php
@@ -318,7 +318,7 @@ public function testGetVncConsole(Server $createdServer)
     {
         /** @var array $console */
         require_once $this->sampleFile('servers/get_server_vnc_console.php', [
-            '{serverId}' => $createdServer->id
+            '{serverId}' => $createdServer->id,
         ]);
 
         $this->assertIsArray($console);
@@ -331,6 +331,9 @@ public function testGetVncConsole(Server $createdServer)
      */
     public function testGetConsoleOutput(Server $createdServer)
     {
+        // wait for the server to be ready
+        sleep(5);
+
         /** @var string $consoleOutput */
         require_once $this->sampleFile('servers/get_server_console_output.php', ['{serverId}' => $createdServer->id]);
 
@@ -361,4 +364,31 @@ public function testDelete(Server $createdServer)
         $this->expectException(BadResponseError::class);
         $createdServer->retrieve();
     }
+
+    public function testSuspend()
+    {
+        $server = $this->createServer();
+
+        require_once $this->sampleFile('servers/suspend.php', ['{serverId}' => $server->id]);
+
+        $server->waitUntil('SUSPENDED');
+        $this->assertEquals('SUSPENDED', $server->status);
+
+        return $server;
+    }
+
+    /**
+     * @depends testSuspend
+     */
+    public function testResume(Server $server)
+    {
+        $this->assertEquals('SUSPENDED', $server->status);
+
+        require_once $this->sampleFile('servers/resume.php', ['{serverId}' => $server->id]);
+
+        $server->waitUntil('ACTIVE', 300);
+        $this->assertEquals('ACTIVE', $server->status);
+
+        $this->deleteServer($server);
+    }
 }
\ No newline at end of file
diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
index e1eb73dc..5236a647 100644
--- a/tests/sample/Compute/v2/VolumeAttachmentTest.php
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -11,6 +11,11 @@ public function testAttach(): VolumeAttachment
     {
         $server = $this->createServer();
 
+        // let's wait for the server to be completely up
+        // https://bugs.launchpad.net/nova/+bug/1998148
+        // https://bugs.launchpad.net/nova/+bug/1960346
+        sleep(10);
+
         $volume = $this->getCachedService(Service::class)->createVolume(
             [
                 'name'        => $this->randomStr(),
diff --git a/tests/unit/Compute/v2/Models/ServerTest.php b/tests/unit/Compute/v2/Models/ServerTest.php
index 5b637e12..a5e48e3d 100644
--- a/tests/unit/Compute/v2/Models/ServerTest.php
+++ b/tests/unit/Compute/v2/Models/ServerTest.php
@@ -211,6 +211,24 @@ public function test_it_stops()
         self::assertNull($this->server->stop());
     }
 
+    public function test_it_resumes()
+    {
+        $expectedJson = ['resume' => null];
+
+        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+
+        $this->assertNull($this->server->resume());
+    }
+
+    public function test_it_suspends()
+    {
+        $expectedJson = ['suspend' => null];
+
+        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+
+        $this->assertNull($this->server->suspend());
+    }
+
     public function test_it_resizes()
     {
         $expectedJson = ['resize' => ['flavorRef' => 'flavorId']];

From 9f817df9407a7f59579f001c00daba0a8f00de59 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Tue, 30 Jan 2024 18:31:57 +0100
Subject: [PATCH 076/102] fix resume/suspend doc (#395)

---
 doc/services/compute/v2/servers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/services/compute/v2/servers.rst b/doc/services/compute/v2/servers.rst
index 31343244..6ba05e48 100644
--- a/doc/services/compute/v2/servers.rst
+++ b/doc/services/compute/v2/servers.rst
@@ -284,10 +284,10 @@ You can also refine by network label:
 Suspend
 -------
 
-.. sample:: Compute/v2/images/suspend.php
+.. sample:: Compute/v2/servers/suspend.php
 
 Resume
 ------
 
-.. sample:: Compute/v2/images/resume.php
+.. sample:: Compute/v2/servers/resume.php
 

From ba44841cd81a14cedd4e4be73e8d7a4b68bb7682 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Thu, 1 Feb 2024 12:20:18 +0100
Subject: [PATCH 077/102] refactor unit tests: use `mockRequest` for all
 requests  (#397)

---
 composer.json                                 |   2 +-
 .../Compute/v2/VolumeAttachmentTest.php       |   7 +-
 .../BlockStorage/v2/Models/QuotaSetTest.php   |   6 +-
 .../BlockStorage/v2/Models/SnapshotTest.php   |  14 +-
 .../BlockStorage/v2/Models/VolumeTest.php     |  18 +-
 .../BlockStorage/v2/Models/VolumeTypeTest.php |   4 +-
 tests/unit/BlockStorage/v2/ServiceTest.php    |  50 ++---
 .../Common/Resource/OperatorResourceTest.php  |  43 ++--
 tests/unit/Compute/v2/Models/FlavorTest.php   |   6 +-
 tests/unit/Compute/v2/Models/HostTest.php     |   2 +-
 .../unit/Compute/v2/Models/HypervisorTest.php |   2 +-
 tests/unit/Compute/v2/Models/ImageTest.php    |  16 +-
 tests/unit/Compute/v2/Models/KeypairTest.php  |  16 +-
 tests/unit/Compute/v2/Models/QuotaSetTest.php |   6 +-
 tests/unit/Compute/v2/Models/ServerTest.php   | 194 +++++++++---------
 tests/unit/Compute/v2/ServiceTest.php         |  56 ++---
 tests/unit/Identity/v2/ServiceTest.php        |   6 +-
 .../v3/Models/ApplicationCredentialTest.php   |   4 +-
 .../Identity/v3/Models/CredentialTest.php     |   6 +-
 tests/unit/Identity/v3/Models/DomainTest.php  |  32 ++-
 .../unit/Identity/v3/Models/EndpointTest.php  |   6 +-
 tests/unit/Identity/v3/Models/GroupTest.php   |  19 +-
 tests/unit/Identity/v3/Models/PolicyTest.php  |   8 +-
 tests/unit/Identity/v3/Models/ProjectTest.php |  28 +--
 tests/unit/Identity/v3/Models/RoleTest.php    |   2 +-
 tests/unit/Identity/v3/Models/ServiceTest.php |   6 +-
 tests/unit/Identity/v3/Models/UserTest.php    |   8 +-
 tests/unit/Identity/v3/ServiceTest.php        |  45 ++--
 tests/unit/Images/v2/Models/ImageTest.php     |  29 ++-
 tests/unit/Images/v2/Models/MemberTest.php    |   6 +-
 tests/unit/Images/v2/ServiceTest.php          |   7 +-
 .../Metric/v1/Gnocchi/Models/MetricTest.php   |   2 +-
 .../Metric/v1/Gnocchi/Models/ResourceTest.php |   8 +-
 tests/unit/Metric/v1/Gnocchi/ServiceTest.php  |  38 ++--
 .../Layer3/Models/FloatingIpTest.php          |   8 +-
 .../Extensions/Layer3/Models/RouterTest.php   |  10 +-
 .../v2/Extensions/Layer3/ServiceTest.php      |  14 +-
 .../Models/SecurityGroupRuleTest.php          |   4 +-
 .../Models/SecurityGroupTest.php              |   8 +-
 .../Extensions/SecurityGroups/ServiceTest.php |  14 +-
 .../Models/LoadBalancerHealthMonitorTest.php  |   8 +-
 .../v2/Models/LoadBalancerListenerTest.php    |   8 +-
 .../v2/Models/LoadBalancerMemberTest.php      |   8 +-
 .../v2/Models/LoadBalancerPoolTest.php        |  14 +-
 .../v2/Models/LoadBalancerStatTest.php        |   2 +-
 .../v2/Models/LoadBalancerStatusTest.php      |   2 +-
 .../Networking/v2/Models/LoadBalancerTest.php |  14 +-
 .../unit/Networking/v2/Models/NetworkTest.php |  10 +-
 tests/unit/Networking/v2/Models/PortTest.php  |   8 +-
 tests/unit/Networking/v2/Models/QuotaTest.php |   6 +-
 .../unit/Networking/v2/Models/SubnetTest.php  |  10 +-
 tests/unit/Networking/v2/ServiceTest.php      |  42 ++--
 .../ObjectStore/v1/Models/AccountTest.php     |  10 +-
 .../ObjectStore/v1/Models/ContainerTest.php   |  48 ++---
 .../unit/ObjectStore/v1/Models/ObjectTest.php |  18 +-
 tests/unit/ObjectStore/v1/ServiceTest.php     |  20 +-
 tests/unit/TestCase.php                       |  44 +++-
 57 files changed, 470 insertions(+), 562 deletions(-)

diff --git a/composer.json b/composer.json
index d0e78e25..defad050 100644
--- a/composer.json
+++ b/composer.json
@@ -34,6 +34,7 @@
         "justinrainbow/json-schema": "^5.2"
     },
     "require-dev": {
+        "ext-json": "*",
         "ergebnis/composer-normalize": "^2.0",
         "friendsofphp/php-cs-fixer": "^3",
         "php-coveralls/php-coveralls": "^2.0",
@@ -49,7 +50,6 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "OpenStack\\Integration\\": "tests/integration/",
             "OpenStack\\Sample\\": "tests/sample/",
             "OpenStack\\Test\\": "tests/unit/"
         }
diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
index 5236a647..4399a449 100644
--- a/tests/sample/Compute/v2/VolumeAttachmentTest.php
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -14,7 +14,7 @@ public function testAttach(): VolumeAttachment
         // let's wait for the server to be completely up
         // https://bugs.launchpad.net/nova/+bug/1998148
         // https://bugs.launchpad.net/nova/+bug/1960346
-        sleep(10);
+        sleep(15);
 
         $volume = $this->getCachedService(Service::class)->createVolume(
             [
@@ -67,6 +67,11 @@ public function testList(VolumeAttachment $createdVolumeAttachment)
      */
     public function testDetach(VolumeAttachment $createdVolumeAttachment)
     {
+        // let's wait for the server to be completely up
+        // https://bugs.launchpad.net/nova/+bug/1998148
+        // https://bugs.launchpad.net/nova/+bug/1960346
+        sleep(15);
+
         require_once $this->sampleFile(
             'servers/detach_volume_attachment.php',
             [
diff --git a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
index 71d888f4..f328696a 100644
--- a/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
+++ b/tests/unit/BlockStorage/v2/Models/QuotaSetTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'os-quota-sets/tenant-foo', [], [], 'GET_quota_set');
+        $this->mockRequest('GET', 'os-quota-sets/tenant-foo', 'GET_quota_set', [], []);
 
         $this->quotaSet->retrieve();
         self::assertEquals(1, $this->quotaSet->gigabytes);
@@ -41,7 +41,7 @@ public function test_it_updates()
             ],
         ];
 
-        $this->setupMock('PUT', 'os-quota-sets/tenant-foo', $expectedJson, [], 'GET_type');
+        $this->mockRequest('PUT', 'os-quota-sets/tenant-foo', 'GET_type', $expectedJson, []);
 
         $this->quotaSet->volumes = 1111;
         $this->quotaSet->snapshots = 2222;
@@ -50,7 +50,7 @@ public function test_it_updates()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'os-quota-sets/tenant-foo', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'os-quota-sets/tenant-foo', new Response(204), null, []);
 
         $this->quotaSet->delete();
     }
diff --git a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
index fdc23eac..3802385f 100644
--- a/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
+++ b/tests/unit/BlockStorage/v2/Models/SnapshotTest.php
@@ -28,21 +28,21 @@ public function test_it_updates()
         $this->snapshot->description = 'bar';
 
         $expectedJson = ['snapshot' => ['name' => 'foo', 'description' => 'bar']];
-        $this->setupMock('PUT', 'snapshots/1', $expectedJson, [], 'GET_snapshot');
+        $this->mockRequest('PUT', 'snapshots/1', 'GET_snapshot', $expectedJson, []);
 
         $this->snapshot->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'snapshots/1', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'snapshots/1', new Response(204), null, []);
 
         $this->snapshot->delete();
     }
 
     public function test_it_gets_metadata()
     {
-        $this->setupMock('GET', 'snapshots/1/metadata', null, [], 'GET_metadata');
+        $this->mockRequest('GET', 'snapshots/1/metadata', 'GET_metadata', null, []);
 
         $expected = [
             'foo' => '1',
@@ -54,14 +54,14 @@ public function test_it_gets_metadata()
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'snapshots/1', null, [], 'GET_snapshot');
+        $this->mockRequest('GET', 'snapshots/1', 'GET_snapshot', null, []);
 
         $this->snapshot->retrieve();
     }
 
     public function test_it_merges_metadata()
     {
-        $this->setupMock('GET', 'snapshots/1/metadata', null, [], 'GET_metadata');
+        $this->mockRequest('GET', 'snapshots/1/metadata', 'GET_metadata', null, []);
 
         $expectedJson = ['metadata' => [
             'foo' => 'newFoo',
@@ -69,7 +69,7 @@ public function test_it_merges_metadata()
             'baz' => 'bazVal',
         ]];
 
-        $this->setupMock('PUT', 'snapshots/1/metadata', $expectedJson, [], 'GET_metadata');
+        $this->mockRequest('PUT', 'snapshots/1/metadata', 'GET_metadata', $expectedJson, []);
 
         $this->snapshot->mergeMetadata(['foo' => 'newFoo', 'baz' => 'bazVal']);
     }
@@ -78,7 +78,7 @@ public function test_it_resets_metadata()
     {
         $expectedJson = ['metadata' => ['key1' => 'val1']];
 
-        $this->setupMock('PUT', 'snapshots/1/metadata', $expectedJson, [], 'GET_metadata');
+        $this->mockRequest('PUT', 'snapshots/1/metadata', 'GET_metadata', $expectedJson, []);
 
         $this->snapshot->resetMetadata(['key1' => 'val1']);
     }
diff --git a/tests/unit/BlockStorage/v2/Models/VolumeTest.php b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
index c29dba35..b6a50633 100644
--- a/tests/unit/BlockStorage/v2/Models/VolumeTest.php
+++ b/tests/unit/BlockStorage/v2/Models/VolumeTest.php
@@ -28,21 +28,21 @@ public function test_it_updates()
         $this->volume->description = 'bar';
 
         $expectedJson = ['volume' => ['name' => 'foo', 'description' => 'bar']];
-        $this->setupMock('PUT', 'volumes/1', $expectedJson, [], 'GET_volume');
+        $this->mockRequest('PUT', 'volumes/1', 'GET_volume', $expectedJson, []);
 
         $this->volume->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'volumes/1', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'volumes/1', new Response(204), null, []);
 
         $this->volume->delete();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'volumes/1', null, [], 'GET_volume');
+        $this->mockRequest('GET', 'volumes/1', 'GET_volume', null, []);
 
         $this->volume->retrieve();
 
@@ -67,7 +67,7 @@ public function test_it_retrieves()
 
     public function test_it_merges_metadata()
     {
-        $this->setupMock('GET', 'volumes/1/metadata', null, [], 'GET_metadata');
+        $this->mockRequest('GET', 'volumes/1/metadata', 'GET_metadata', null, []);
 
         $expectedJson = ['metadata' => [
             'foo' => 'newFoo',
@@ -75,7 +75,7 @@ public function test_it_merges_metadata()
             'baz' => 'bazVal',
         ]];
 
-        $this->setupMock('PUT', 'volumes/1/metadata', $expectedJson, [], 'GET_metadata');
+        $this->mockRequest('PUT', 'volumes/1/metadata', 'GET_metadata', $expectedJson, []);
 
         $this->volume->mergeMetadata(['foo' => 'newFoo', 'baz' => 'bazVal']);
     }
@@ -84,14 +84,14 @@ public function test_it_resets_metadata()
     {
         $expectedJson = ['metadata' => ['key1' => 'val1']];
 
-        $this->setupMock('PUT', 'volumes/1/metadata', $expectedJson, [], 'GET_metadata');
+        $this->mockRequest('PUT', 'volumes/1/metadata', 'GET_metadata', $expectedJson, []);
 
         $this->volume->resetMetadata(['key1' => 'val1']);
     }
 
     public function test_it_sets_volume_bootable()
     {
-        $this->setupMock('POST', 'volumes/1/action', ['os-set_bootable' => ['bootable' => 'True']], [], new Response(200));
+        $this->mockRequest('POST', 'volumes/1/action', new Response(200), ['os-set_bootable' => ['bootable' => 'True']], []);
 
         $this->volume->setBootable(true);
     }
@@ -107,7 +107,7 @@ public function test_it_sets_image_meta_data()
             ],
         ];
 
-        $this->setupMock('POST', 'volumes/1/action', $expectedJson, [], new Response(200));
+        $this->mockRequest('POST', 'volumes/1/action', new Response(200), $expectedJson, []);
         $this->volume->setImageMetadata([
             'attr_foo' => 'foofoo',
             'attr_bar' => 'barbar',
@@ -118,7 +118,7 @@ public function test_it_resets_status()
     {
         $expectedJson = ['os-reset_status' => ['status' => 'available', 'attach_status' => 'detached', 'migration_status' => 'migrating']];
 
-        $this->setupMock('POST', 'volumes/1/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'volumes/1/action', new Response(202), $expectedJson, []);
 
         $this->volume->resetStatus(
             [
diff --git a/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php b/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
index 7f760d15..a728e82c 100644
--- a/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
+++ b/tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php
@@ -26,7 +26,7 @@ public function test_it_updates()
     {
         $expectedJson = ['volume_type' => ['name' => 'foo']];
 
-        $this->setupMock('PUT', 'types/1', $expectedJson, [], 'GET_type');
+        $this->mockRequest('PUT', 'types/1', 'GET_type', $expectedJson, []);
 
         $this->volumeType->name = 'foo';
         $this->volumeType->update();
@@ -34,7 +34,7 @@ public function test_it_updates()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'types/1', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'types/1', new Response(204), null, []);
 
         $this->volumeType->delete();
     }
diff --git a/tests/unit/BlockStorage/v2/ServiceTest.php b/tests/unit/BlockStorage/v2/ServiceTest.php
index f51ff714..4287e99e 100644
--- a/tests/unit/BlockStorage/v2/ServiceTest.php
+++ b/tests/unit/BlockStorage/v2/ServiceTest.php
@@ -58,22 +58,21 @@ public function test_it_creates_volumes()
             ],
         ];
 
-        $this->setupMock('POST', 'volumes', $expectedJson, [], 'GET_volume');
+        $this->mockRequest('POST', 'volumes', 'GET_volume', $expectedJson, []);
 
         self::assertInstanceOf(Volume::class, $this->service->createVolume($opts));
     }
 
     public function test_it_lists_volumes()
     {
-        $this->client
-            ->request('GET', 'volumes', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_volumes'));
-
-        $this->client
-            ->request('GET', 'volumes', ['query' => ['marker' => '5aa119a8-d25b-45a7-8d1b-88e127885635'], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn(new Response(204));
+        $this->mockRequest('GET', 'volumes', 'GET_volumes', null, []);
+        $this->mockRequest(
+            'GET',
+            ['path' => 'volumes', 'query' => ['marker' => '5aa119a8-d25b-45a7-8d1b-88e127885635']],
+            new Response(204),
+            null,
+            []
+        );
 
         $count = 0;
 
@@ -99,17 +98,14 @@ public function test_it_creates_volume_types()
 
         $expectedJson = ['volume_type' => $opts];
 
-        $this->setupMock('POST', 'types', $expectedJson, [], 'GET_type');
+        $this->mockRequest('POST', 'types', 'GET_type', $expectedJson, []);
 
         self::assertInstanceOf(VolumeType::class, $this->service->createVolumeType($opts));
     }
 
     public function test_it_lists_volume_types()
     {
-        $this->client
-            ->request('GET', 'types', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_types'));
+        $this->mockRequest('GET', 'types', 'GET_types', null, []);
 
         $count = 0;
 
@@ -145,22 +141,21 @@ public function test_it_creates_snapshots()
             'force'       => $opts['force'],
         ]];
 
-        $this->setupMock('POST', 'snapshots', $expectedJson, [], 'GET_snapshot');
+        $this->mockRequest('POST', 'snapshots', 'GET_snapshot', $expectedJson, []);
 
         self::assertInstanceOf(Snapshot::class, $this->service->createSnapshot($opts));
     }
 
     public function test_it_lists_snapshots()
     {
-        $this->client
-            ->request('GET', 'snapshots', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_snapshots'));
-
-        $this->client
-            ->request('GET', 'snapshots', ['query' => ['marker' => 'e820db06-58b5-439d-bac6-c01faa3f6499'], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn(new Response(204));
+        $this->mockRequest('GET', 'snapshots', 'GET_snapshots', null, []);
+        $this->mockRequest(
+            'GET',
+            ['path' => 'snapshots', 'query' => ['marker' => 'e820db06-58b5-439d-bac6-c01faa3f6499']],
+            new Response(204),
+            null,
+            []
+        );
 
         $count = 0;
 
@@ -182,10 +177,7 @@ public function test_it_gets_a_snapshot()
 
     public function test_it_gets_quota_set()
     {
-        $this->client
-            ->request('GET', 'os-quota-sets/tenant-id-1234', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_quota_set'));
+        $this->mockRequest('GET', 'os-quota-sets/tenant-id-1234', 'GET_quota_set', null, []);
 
         $quotaSet = $this->service->getQuotaSet('tenant-id-1234');
 
diff --git a/tests/unit/Common/Resource/OperatorResourceTest.php b/tests/unit/Common/Resource/OperatorResourceTest.php
index 51f55e51..f90841a1 100644
--- a/tests/unit/Common/Resource/OperatorResourceTest.php
+++ b/tests/unit/Common/Resource/OperatorResourceTest.php
@@ -41,27 +41,20 @@ public function test_it_retrieves_base_http_url()
 
     public function test_it_executes_with_state()
     {
-        $this->resource->id  = 'foo';
+        $this->resource->id = 'foo';
         $this->resource->bar = 'bar';
 
         $expectedJson = ['id' => 'foo', 'bar' => 'bar'];
 
-        $this->setupMock('GET', 'foo', $expectedJson, [], new Response(204));
+        $this->mockRequest('GET', 'foo', new Response(204), $expectedJson);
 
         $this->resource->executeWithState((new ComputeV2Api())->test());
     }
 
     public function test_it_executes_operations_until_a_204_is_received()
     {
-        $this->client
-            ->request('GET', 'servers', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('servers-page1'));
-
-        $this->client
-            ->request('GET', 'servers', ['query' => ['marker' => '5'], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn(new Response(204));
+        $this->mockRequest('GET', 'servers', 'servers-page1');
+        $this->mockRequest('GET', ['path' => 'servers', 'query' => ['marker' => '5']], new Response(204));
 
         $count = 0;
 
@@ -77,15 +70,8 @@ public function test_it_executes_operations_until_a_204_is_received()
 
     public function test_it_invokes_function_if_provided()
     {
-        $this->client
-            ->request('GET', 'servers', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('servers-page1'));
-
-        $this->client
-            ->request('GET', 'servers', ['query' => ['marker' => '5'], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn(new Response(204));
+        $this->mockRequest('GET', 'servers', 'servers-page1');
+        $this->mockRequest('GET', ['path' => 'servers', 'query' => ['marker' => '5']], new Response(204));
 
         $api = new ComputeV2Api();
 
@@ -96,6 +82,7 @@ public function test_it_invokes_function_if_provided()
         };
 
         foreach ($this->resource->enumerate($api->getServers(), [], $fn) as $item) {
+            // empty
         }
 
         self::assertEquals(5, $count);
@@ -103,10 +90,7 @@ public function test_it_invokes_function_if_provided()
 
     public function test_it_halts_when_user_provided_limit_is_reached()
     {
-        $this->client
-            ->request('GET', 'servers', ['query' => ['limit' => 2], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('servers-page1'));
+        $this->mockRequest('GET', ['path' => 'servers', 'query' => ['limit' => 2]], 'servers-page1');
 
         $count = 0;
 
@@ -121,14 +105,11 @@ public function test_it_halts_when_user_provided_limit_is_reached()
 
     public function test_it_predicts_resources_key_without_explicit_property()
     {
-        $this->client
-            ->request('GET', 'servers', ['query' => ['limit' => 2], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('servers-page1'));
+        $this->mockRequest('GET', ['path' => 'servers', 'query' => ['limit' => 2]], 'servers-page1');
 
         $count = 0;
 
-        $api      = new ComputeV2Api();
+        $api = new ComputeV2Api();
         $resource = new Server($this->client->reveal(), new $api());
 
         foreach ($resource->enumerate($api->getServers(), ['limit' => 2]) as $item) {
@@ -184,9 +165,9 @@ public function test_it_populates_models_from_arrays()
 
 class TestOperatorResource extends OperatorResource
 {
-    protected $resourceKey  = 'foo';
+    protected $resourceKey = 'foo';
     protected $resourcesKey = 'servers';
-    protected $markerKey    = 'id';
+    protected $markerKey = 'id';
 
     /** @var string */
     public $bar;
diff --git a/tests/unit/Compute/v2/Models/FlavorTest.php b/tests/unit/Compute/v2/Models/FlavorTest.php
index 296c9b3a..9364b581 100644
--- a/tests/unit/Compute/v2/Models/FlavorTest.php
+++ b/tests/unit/Compute/v2/Models/FlavorTest.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
     public function test_it_retrieves_details()
     {
-        $this->setupMock('GET', 'flavors/1', null, [], 'flavor-get');
+        $this->mockRequest('GET', 'flavors/1', 'flavor-get', null, []);
 
         $this->flavor->retrieve();
 
@@ -50,14 +50,14 @@ public function test_it_creates()
             'disk'  => $opts['disk'],
         ]];
 
-        $this->setupMock('POST', 'flavors', $expectedJson, [], 'flavor-post');
+        $this->mockRequest('POST', 'flavors', 'flavor-post', $expectedJson, []);
 
         self::assertInstanceOf(Flavor::class, $this->flavor->create($opts));
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'flavors/1', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'flavors/1', new Response(204), null, []);
 
         $this->flavor->delete();
     }
diff --git a/tests/unit/Compute/v2/Models/HostTest.php b/tests/unit/Compute/v2/Models/HostTest.php
index b8bfb7b6..8bbe7eff 100644
--- a/tests/unit/Compute/v2/Models/HostTest.php
+++ b/tests/unit/Compute/v2/Models/HostTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'os-hosts/b6e4adbc193d428ea923899d07fb001e', null, [], 'host-get');
+        $this->mockRequest('GET', 'os-hosts/b6e4adbc193d428ea923899d07fb001e', 'host-get', null, []);
 
         $this->host->retrieve();
 
diff --git a/tests/unit/Compute/v2/Models/HypervisorTest.php b/tests/unit/Compute/v2/Models/HypervisorTest.php
index 454a0fc6..0e99caa1 100644
--- a/tests/unit/Compute/v2/Models/HypervisorTest.php
+++ b/tests/unit/Compute/v2/Models/HypervisorTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'os-hypervisors/' . self::ID, null, [], 'hypervisor-get');
+        $this->mockRequest('GET', 'os-hypervisors/' . self::ID, 'hypervisor-get', null, []);
 
         $this->hypervisor->retrieve();
 
diff --git a/tests/unit/Compute/v2/Models/ImageTest.php b/tests/unit/Compute/v2/Models/ImageTest.php
index 6a069e3f..df73cc57 100644
--- a/tests/unit/Compute/v2/Models/ImageTest.php
+++ b/tests/unit/Compute/v2/Models/ImageTest.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'images/imageId', null, [], 'image-get');
+        $this->mockRequest('GET', 'images/imageId', 'image-get');
 
         $this->image->retrieve();
 
@@ -46,14 +46,14 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'images/imageId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'images/imageId', new Response(204));
 
         $this->image->delete();
     }
 
     public function test_it_retrieves_metadata()
     {
-        $this->setupMock('GET', 'images/imageId/metadata', null, [], 'server-metadata-get');
+        $this->mockRequest('GET', 'images/imageId/metadata', 'server-metadata-get');
 
         $metadata = $this->image->getMetadata();
 
@@ -70,7 +70,7 @@ public function test_it_sets_metadata()
         $expectedJson = ['metadata' => $metadata];
 
         $response = $this->createResponse(200, [], $expectedJson);
-        $this->setupMock('PUT', 'images/imageId/metadata', $expectedJson, [], $response);
+        $this->mockRequest('PUT', 'images/imageId/metadata', $response, $expectedJson);
 
         $this->image->resetMetadata($metadata);
 
@@ -84,7 +84,7 @@ public function test_it_updates_metadata()
         $expectedJson = ['metadata' => $metadata];
 
         $response = $this->createResponse(200, [], array_merge_recursive($expectedJson, ['metadata' => ['bar' => '2']]));
-        $this->setupMock('POST', 'images/imageId/metadata', $expectedJson, [], $response);
+        $this->mockRequest('POST', 'images/imageId/metadata', $response, $expectedJson);
 
         $this->image->mergeMetadata($metadata);
 
@@ -95,7 +95,7 @@ public function test_it_updates_metadata()
     public function test_it_retrieves_a_metadata_item()
     {
         $response = $this->createResponse(200, [], ['metadata' => ['fooKey' => 'bar']]);
-        $this->setupMock('GET', 'images/imageId/metadata/fooKey', null, [], $response);
+        $this->mockRequest('GET', 'images/imageId/metadata/fooKey', $response);
 
         $value = $this->image->getMetadataItem('fooKey');
 
@@ -104,8 +104,8 @@ public function test_it_retrieves_a_metadata_item()
 
     public function test_it_deletes_a_metadata_item()
     {
-        $this->setupMock('DELETE', 'images/imageId/metadata/fooKey', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'images/imageId/metadata/fooKey', new Response(204));
 
-        self::assertNull($this->image->deleteMetadataItem('fooKey'));
+        $this->image->deleteMetadataItem('fooKey');
     }
 }
diff --git a/tests/unit/Compute/v2/Models/KeypairTest.php b/tests/unit/Compute/v2/Models/KeypairTest.php
index eb3ad871..86beeba2 100644
--- a/tests/unit/Compute/v2/Models/KeypairTest.php
+++ b/tests/unit/Compute/v2/Models/KeypairTest.php
@@ -37,14 +37,14 @@ public function test_it_creates()
             'public_key' => $opts['publicKey'],
         ]], JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('POST', 'os-keypairs', $expectedJson, ['Content-Type' => 'application/json'], 'keypair-post');
+        $this->mockRequest('POST', 'os-keypairs', 'keypair-post', $expectedJson, ['Content-Type' => 'application/json']);
 
         self::assertInstanceOf(Keypair::class, $this->keypair->create($opts));
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'os-keypairs/' . self::KEYPAIR_NAME, null, [], 'keypair-get');
+        $this->mockRequest('GET', 'os-keypairs/' . self::KEYPAIR_NAME, 'keypair-get', null, []);
 
         $this->keypair->retrieve();
 
@@ -61,11 +61,11 @@ public function test_it_retrieves()
 
     public function test_it_retrieves_by_user_id()
     {
-        $this->client
-            ->request('GET', 'os-keypairs/' . self::KEYPAIR_NAME, ['headers' => [], 'query' => ['user_id' => 'fake']])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('keypair-get'));
-
+        $this->mockRequest(
+            'GET',
+            ['path' => 'os-keypairs/' . self::KEYPAIR_NAME, 'query' => ['user_id' => 'fake']],
+            'keypair-get'
+        );
 
         $this->keypair->userId = 'fake';
         $this->keypair->retrieve();
@@ -83,7 +83,7 @@ public function test_it_retrieves_by_user_id()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'os-keypairs/' . self::KEYPAIR_NAME, null, [], new Response(204));
+        $this->mockRequest('DELETE', 'os-keypairs/' . self::KEYPAIR_NAME, new Response(204), null, []);
         $this->keypair->delete();
     }
 }
diff --git a/tests/unit/Compute/v2/Models/QuotaSetTest.php b/tests/unit/Compute/v2/Models/QuotaSetTest.php
index e6193773..cbd6833a 100644
--- a/tests/unit/Compute/v2/Models/QuotaSetTest.php
+++ b/tests/unit/Compute/v2/Models/QuotaSetTest.php
@@ -26,7 +26,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'os-quota-sets/fake-tenant-id', null, [], 'quota-sets-get');
+        $this->mockRequest('GET', 'os-quota-sets/fake-tenant-id', 'quota-sets-get', null, []);
 
         $this->quotaSet->retrieve();
 
@@ -50,14 +50,14 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'os-quota-sets/fake-tenant-id', null, [], new Response(202));
+        $this->mockRequest('DELETE', 'os-quota-sets/fake-tenant-id', new Response(202), null, []);
 
         $this->quotaSet->delete();
     }
 
     public function test_it_updates()
     {
-        $this->setupMock('PUT', 'os-quota-sets/fake-tenant-id', null, [], 'quota-sets-get');
+        $this->mockRequest('PUT', 'os-quota-sets/fake-tenant-id', 'quota-sets-get', null, []);
 
         $this->quotaSet->update();
     }
diff --git a/tests/unit/Compute/v2/Models/ServerTest.php b/tests/unit/Compute/v2/Models/ServerTest.php
index a5e48e3d..ba732b14 100644
--- a/tests/unit/Compute/v2/Models/ServerTest.php
+++ b/tests/unit/Compute/v2/Models/ServerTest.php
@@ -34,41 +34,43 @@ public function test_it_creates()
             'flavorId' => 'baz',
         ];
 
-        $expectedJson = ['server' => [
-            'name'      => $opts['name'],
-            'imageRef'  => $opts['imageId'],
-            'flavorRef' => $opts['flavorId'],
-        ]];
+        $expectedJson = [
+            'server' => [
+                'name'      => $opts['name'],
+                'imageRef'  => $opts['imageId'],
+                'flavorRef' => $opts['flavorId'],
+            ]];
 
-        $this->setupMock('POST', 'servers', $expectedJson, [], 'server-post');
+        $this->mockRequest('POST', 'servers', 'server-post', $expectedJson);
         self::assertInstanceOf(Server::class, $this->server->create($opts));
     }
 
     public function test_it_creates_with_boot_from_volume()
     {
         $opts = [
-            'name'     => 'foo',
-            'flavorId' => 'baz',
-            'blockDeviceMapping' => [['uuid' => 'aaaa-ddddd-bbbb-ccccc']]
+            'name'               => 'foo',
+            'flavorId'           => 'baz',
+            'blockDeviceMapping' => [['uuid' => 'aaaa-ddddd-bbbb-ccccc']],
         ];
 
-        $expectedJson = ['server' => [
-            'name' => $opts['name'],
-            'flavorRef' => $opts['flavorId'],
-            'block_device_mapping_v2' => $opts['blockDeviceMapping']
-        ]];
+        $expectedJson = [
+            'server' => [
+                'name'                    => $opts['name'],
+                'flavorRef'               => $opts['flavorId'],
+                'block_device_mapping_v2' => $opts['blockDeviceMapping'],
+            ]];
 
-        $this->setupMock('POST', 'servers', $expectedJson, [], 'server-post');
+        $this->mockRequest('POST', 'servers', 'server-post', $expectedJson);
         self::assertInstanceOf(Server::class, $this->server->create($opts));
     }
 
     public function test_it_requires_image_id_or_volume_id_to_create_servers()
     {
-		$this->expectException(\RuntimeException::class);
-		$this->expectExceptionMessage('imageId or blockDeviceMapping.uuid must be set.');
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('imageId or blockDeviceMapping.uuid must be set.');
         $this->server->create([
-            'name' => 'some-server-name',
-            'flavorId' => 'apple'
+            'name'     => 'some-server-name',
+            'flavorId' => 'apple',
         ]);
     }
 
@@ -79,27 +81,28 @@ public function test_it_updates()
         $this->server->ipv4 = '0.0.0.0';
         $this->server->ipv6 = '0:0:0:0:0:ffff:0:0';
 
-        $expectedJson = ['server' => [
-            'name'       => 'foo',
-            'accessIPv4' => '0.0.0.0',
-            'accessIPv6' => '0:0:0:0:0:ffff:0:0',
-        ]];
+        $expectedJson = [
+            'server' => [
+                'name'       => 'foo',
+                'accessIPv4' => '0.0.0.0',
+                'accessIPv6' => '0:0:0:0:0:ffff:0:0',
+            ]];
 
-        $this->setupMock('PUT', 'servers/serverId', $expectedJson, [], 'server-put');
+        $this->mockRequest('PUT', 'servers/serverId', 'server-put', $expectedJson);
 
         $this->server->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'servers/serverId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'servers/serverId', new Response(204));
 
-        self::assertNull($this->server->delete());
+        $this->server->delete();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'servers/serverId', null, [], 'server-get');
+        $this->mockRequest('GET', 'servers/serverId', 'server-get');
 
         $this->server->retrieve();
 
@@ -110,22 +113,22 @@ public function test_it_retrieves()
     public function test_it_changes_password()
     {
         $expectedJson = ['changePassword' => ['adminPass' => 'foo']];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->changePassword('foo'));
+        $this->server->changePassword('foo');
     }
 
     public function test_it_reboots()
     {
         $expectedJson = ["reboot" => ["type" => "SOFT"]];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->reboot());
+        $this->server->reboot();
     }
 
     public function test_an_exception_is_thrown_when_rebooting_with_an_invalid_type()
     {
-		$this->expectException(\Exception::class);
+        $this->expectException(\Exception::class);
         $this->server->reboot('foo');
     }
 
@@ -142,20 +145,21 @@ public function test_it_rebuilds()
                 [
                     'path'     => '/etc/banner.txt',
                     'contents' => base64_encode('Hi there!'),
-                ]
+                ],
             ],
             'adminPass'   => 'foo',
         ];
 
-        $expectedJson = json_encode(['rebuild' => [
-            'imageRef'    => $userOptions['imageId'],
-            'name'        => $userOptions['name'],
-            'metadata'    => $userOptions['metadata'],
-            'personality' => $userOptions['personality'],
-            'adminPass'   => $userOptions['adminPass']
-        ]], JSON_UNESCAPED_SLASHES);
+        $expectedJson = json_encode([
+            'rebuild' => [
+                'imageRef'    => $userOptions['imageId'],
+                'name'        => $userOptions['name'],
+                'metadata'    => $userOptions['metadata'],
+                'personality' => $userOptions['personality'],
+                'adminPass'   => $userOptions['adminPass'],
+            ]], JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, ['Content-Type' => 'application/json'], 'server-rebuild');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-rebuild', $expectedJson, ['Content-Type' => 'application/json']);
 
         $this->server->rebuild($userOptions);
 
@@ -166,18 +170,18 @@ public function test_it_rebuilds()
     public function test_it_rescues()
     {
         $userOptions = [
-            'imageId'     => 'newImage',
-            'adminPass'   => 'foo',
+            'imageId'   => 'newImage',
+            'adminPass' => 'foo',
         ];
 
         $expectedJson = [
             'rescue' => [
                 'rescue_image_ref' => $userOptions['imageId'],
-                'adminPass'        => $userOptions['adminPass']
-            ]
+                'adminPass'        => $userOptions['adminPass'],
+            ],
         ];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-rescue');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-rescue', $expectedJson);
 
         $adminPass = $this->server->rescue($userOptions);
 
@@ -188,75 +192,75 @@ public function test_it_unrescues()
     {
         $expectedJson = ['unrescue' => null];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-unrescue');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-unrescue', $expectedJson);
 
-        self::assertNull($this->server->unrescue());
+        $this->server->unrescue();
     }
 
     public function test_it_starts()
     {
         $expectedJson = ['os-start' => null];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->start());
+        $this->server->start();
     }
 
     public function test_it_stops()
     {
         $expectedJson = ['os-stop' => null];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->stop());
+        $this->server->stop();
     }
 
     public function test_it_resumes()
     {
         $expectedJson = ['resume' => null];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        $this->assertNull($this->server->resume());
+        $this->server->resume();
     }
 
     public function test_it_suspends()
     {
         $expectedJson = ['suspend' => null];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        $this->assertNull($this->server->suspend());
+        $this->server->suspend();
     }
 
     public function test_it_resizes()
     {
         $expectedJson = ['resize' => ['flavorRef' => 'flavorId']];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->resize('flavorId'));
+        $this->server->resize('flavorId');
     }
 
     public function test_it_confirms_resizes()
     {
         $expectedJson = ['confirmResize' => null];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->confirmResize());
+        $this->server->confirmResize();
     }
 
     public function test_it_reverts_resizes()
     {
         $expectedJson = ['revertResize' => null];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->revertResize());
+        $this->server->revertResize();
     }
 
     public function test_it_gets_console_output()
     {
         $expectedJson = ["os-getConsoleOutput" => ["length" => 3]];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-output');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-get-console-output', $expectedJson);
 
         self::assertEquals("FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE", $this->server->getConsoleOutput(3));
     }
@@ -264,7 +268,7 @@ public function test_it_gets_console_output()
     public function test_it_gets_all_console_output()
     {
         $expectedJson = ["os-getConsoleOutput" => new \stdClass()];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-output');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-get-console-output', $expectedJson);
 
         self::assertEquals("FAKE CONSOLE OUTPUT\nANOTHER\nLAST LINE", $this->server->getConsoleOutput());
     }
@@ -274,7 +278,7 @@ public function test_it_gets_vnc_console()
         $type = 'novnc';
         $expectedJson = ['os-getVNCConsole' => ['type' => $type]];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-vnc');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-get-console-vnc', $expectedJson);
 
         $response = $this->server->getVncConsole();
 
@@ -288,7 +292,7 @@ public function test_it_gets_rdp_console()
         $type = 'rdp-html5';
         $expectedJson = ['os-getRDPConsole' => ['type' => $type]];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-rdp');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-get-console-rdp', $expectedJson);
 
         $response = $this->server->getRDPConsole();
 
@@ -302,7 +306,7 @@ public function test_it_gets_spice_console()
         $type = 'spice-html5';
         $expectedJson = ['os-getSPICEConsole' => ['type' => $type]];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-spice');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-get-console-spice', $expectedJson);
 
         $response = $this->server->getSpiceConsole();
 
@@ -316,7 +320,7 @@ public function test_it_gets_serial_console()
         $type = 'serial';
         $expectedJson = ['os-getSerialConsole' => ['type' => $type]];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], 'server-get-console-serial');
+        $this->mockRequest('POST', 'servers/serverId/action', 'server-get-console-serial', $expectedJson);
 
         $response = $this->server->getSerialConsole();
 
@@ -330,14 +334,14 @@ public function test_it_creates_images()
         $userData = ['name' => 'newImage', 'metadata' => ['foo' => 'bar']];
 
         $expectedJson = ['createImage' => $userData];
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
-        self::assertNull($this->server->createImage($userData));
+        $this->server->createImage($userData);
     }
 
     public function test_it_gets_ip_addresses()
     {
-        $this->setupMock('GET', 'servers/serverId/ips', null, [], 'server-ips');
+        $this->mockRequest('GET', 'servers/serverId/ips', 'server-ips');
 
         $ips = $this->server->listAddresses();
 
@@ -348,7 +352,7 @@ public function test_it_gets_ip_addresses()
 
     public function test_it_gets_ip_addresses_by_network_label()
     {
-        $this->setupMock('GET', 'servers/serverId/ips/foo', null, [], 'server-ips');
+        $this->mockRequest('GET', 'servers/serverId/ips/foo', 'server-ips');
 
         $ips = $this->server->listAddresses(['networkLabel' => 'foo']);
 
@@ -359,7 +363,7 @@ public function test_it_gets_ip_addresses_by_network_label()
 
     public function test_it_retrieves_metadata()
     {
-        $this->setupMock('GET', 'servers/serverId/metadata', null, [], 'server-metadata-get');
+        $this->mockRequest('GET', 'servers/serverId/metadata', 'server-metadata-get');
 
         $metadata = $this->server->getMetadata();
 
@@ -375,7 +379,7 @@ public function test_it_sets_metadata()
 
         $expectedJson = ['metadata' => $metadata];
         $response = $this->createResponse(200, [], $expectedJson);
-        $this->setupMock('PUT', 'servers/serverId/metadata', $expectedJson, [], $response);
+        $this->mockRequest('PUT', 'servers/serverId/metadata', $response, $expectedJson);
 
         $this->server->resetMetadata($metadata);
 
@@ -388,7 +392,7 @@ public function test_it_updates_metadata()
 
         $expectedJson = ['metadata' => $metadata];
         $response = $this->createResponse(200, [], array_merge_recursive($expectedJson, ['metadata' => ['bar' => '2']]));
-        $this->setupMock('POST', 'servers/serverId/metadata', $expectedJson, [], $response);
+        $this->mockRequest('POST', 'servers/serverId/metadata', $response, $expectedJson, []);
 
         $this->server->mergeMetadata($metadata);
 
@@ -399,7 +403,7 @@ public function test_it_updates_metadata()
     public function test_it_retrieves_a_metadata_item()
     {
         $response = $this->createResponse(200, [], ['metadata' => ['fooKey' => 'bar']]);
-        $this->setupMock('GET', 'servers/serverId/metadata/fooKey', null, [], $response);
+        $this->mockRequest('GET', 'servers/serverId/metadata/fooKey', $response);
 
         $value = $this->server->getMetadataItem('fooKey');
 
@@ -408,14 +412,14 @@ public function test_it_retrieves_a_metadata_item()
 
     public function test_it_deletes_a_metadata_item()
     {
-        $this->setupMock('DELETE', 'servers/serverId/metadata/fooKey', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'servers/serverId/metadata/fooKey', new Response(204));
 
-        self::assertNull($this->server->deleteMetadataItem('fooKey'));
+        $this->server->deleteMetadataItem('fooKey');
     }
 
     public function test_it_lists_security_groups()
     {
-        $this->setupMock('GET', 'servers/serverId/os-security-groups', null, [], 'server-security-groups-get');
+        $this->mockRequest('GET', 'servers/serverId/os-security-groups', 'server-security-groups-get');
 
         $securityGroups = iterator_to_array($this->server->listSecurityGroups());
 
@@ -424,7 +428,7 @@ public function test_it_lists_security_groups()
 
     public function test_it_lists_volume_attachments()
     {
-        $this->setupMock('GET', 'servers/serverId/os-volume_attachments', null, [], 'server-volume-attachments-get');
+        $this->mockRequest('GET', 'servers/serverId/os-volume_attachments', 'server-volume-attachments-get');
 
         $volumeAttachments = iterator_to_array($this->server->listVolumeAttachments());
 
@@ -434,14 +438,14 @@ public function test_it_lists_volume_attachments()
     public function test_it_remove_security_group()
     {
         $opt = [
-            'name' => 'secgroup_to_remove'
+            'name' => 'secgroup_to_remove',
         ];
 
         $expectedJson = [
-            'removeSecurityGroup' => $opt
+            'removeSecurityGroup' => $opt,
         ];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
         $this->server->removeSecurityGroup($opt);
     }
@@ -449,14 +453,14 @@ public function test_it_remove_security_group()
     public function test_it_add_security_group()
     {
         $opt = [
-            'name' => 'secgroup_to_add'
+            'name' => 'secgroup_to_add',
         ];
 
         $expectedJson = [
-            'addSecurityGroup' => $opt
+            'addSecurityGroup' => $opt,
         ];
 
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
+        $this->mockRequest('POST', 'servers/serverId/action', new Response(202), $expectedJson);
 
         $this->server->addSecurityGroup($opt);
     }
@@ -466,10 +470,10 @@ public function test_it_attaches_volume()
         $volumeId = 'fooooobarrrr';
 
         $expectedJson = [
-            'volumeAttachment' => ['volumeId' => $volumeId]
+            'volumeAttachment' => ['volumeId' => $volumeId],
         ];
 
-        $this->setupMock('POST', 'servers/serverId/os-volume_attachments', $expectedJson, [], 'server-volume-attach-post');
+        $this->mockRequest('POST', 'servers/serverId/os-volume_attachments', 'server-volume-attach-post', $expectedJson);
 
         $volumeAttachment = $this->server->attachVolume($volumeId);
         self::assertInstanceOf(VolumeAttachment::class, $volumeAttachment);
@@ -483,14 +487,14 @@ public function test_it_detaches_volume()
     {
         $attachmentId = 'a-dummy-attachment-id';
 
-        $this->setupMock('DELETE', 'servers/serverId/os-volume_attachments/' . $attachmentId, null, [], new Response(202));
+        $this->mockRequest('DELETE', 'servers/serverId/os-volume_attachments/' . $attachmentId, new Response(202));
 
         $this->server->detachVolume($attachmentId);
     }
 
     public function test_it_lists_interface_attachments()
     {
-        $this->setupMock('GET', 'servers/serverId/os-interface', null, [], 'server-interface-attachments-get');
+        $this->mockRequest('GET', 'servers/serverId/os-interface', 'server-interface-attachments-get');
 
         $interfaceAttachments = iterator_to_array($this->server->listInterfaceAttachments());
 
@@ -509,7 +513,7 @@ public function it_gets_interface_attachments()
     {
         $portId = 'fooooobarrrr';
 
-        $this->setupMock('GET', 'servers/serverId/os-interface/' . $portId, ['port_id' => 'fooooobarrrr'], [], 'server-interface-attachment-get');
+        $this->mockRequest('GET', 'servers/serverId/os-interface/' . $portId, 'server-interface-attachment-get', ['port_id' => 'fooooobarrrr']);
 
         $interfaceAttachment = $this->server->getInterfaceAttachment($portId);
 
@@ -527,10 +531,10 @@ public function test_it_creates_interface_attachments()
         $networkId = 'fooooobarrrr';
 
         $expectedJson = [
-            'interfaceAttachment' => ['net_id' => $networkId]
+            'interfaceAttachment' => ['net_id' => $networkId],
         ];
 
-        $this->setupMock('POST', 'servers/serverId/os-interface', $expectedJson, [], 'server-interface-attachments-post');
+        $this->mockRequest('POST', 'servers/serverId/os-interface', 'server-interface-attachments-post', $expectedJson);
 
         $interfaceAttachment = $this->server->createInterfaceAttachment(['networkId' => $networkId]);
 
@@ -542,7 +546,7 @@ public function test_it_detaches_interfaces()
     {
         $portId = 'a-dummy-port-id';
 
-        $this->setupMock('DELETE', 'servers/serverId/os-interface/' . $portId, ['port_id' => $portId], [], new Response(202));
+        $this->mockRequest('DELETE', 'servers/serverId/os-interface/' . $portId, new Response(202), ['port_id' => $portId]);
 
         $this->server->detachInterface($portId);
     }
diff --git a/tests/unit/Compute/v2/ServiceTest.php b/tests/unit/Compute/v2/ServiceTest.php
index 6609bcee..71004e76 100644
--- a/tests/unit/Compute/v2/ServiceTest.php
+++ b/tests/unit/Compute/v2/ServiceTest.php
@@ -44,17 +44,14 @@ public function test_it_creates_servers()
             'flavorRef' => $opts['flavorId'],
         ]];
 
-        $this->setupMock('POST', 'servers', $expectedJson, [], 'server-post');
+        $this->mockRequest('POST', 'servers', 'server-post', $expectedJson, []);
 
         self::assertInstanceOf(Server::class, $this->service->createServer($opts));
     }
 
     public function test_it_lists_servers()
     {
-        $this->client
-            ->request('GET', 'servers', ['query' => ['limit' => 5], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('servers-get'));
+        $this->mockRequest('GET', ['path' => 'servers', 'query' => ['limit' => 5]], 'servers-get');
 
         foreach ($this->service->listServers(false, ['limit' => 5]) as $server) {
             self::assertInstanceOf(Server::class, $server);
@@ -73,10 +70,7 @@ public function test_it_gets_a_server()
 
     public function test_it_lists_flavors()
     {
-        $this->client
-            ->request('GET', 'flavors', ['query' => ['limit' => 5], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('flavors-get'));
+        $this->mockRequest('GET', ['path' => 'flavors', 'query' => ['limit' => 5]], 'flavors-get');
 
         $count = 0;
 
@@ -100,10 +94,7 @@ public function test_it_gets_a_flavor()
 
     public function test_it_lists_images()
     {
-        $this->client
-            ->request('GET', 'images', ['query' => ['limit' => 5], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('images-get'));
+        $this->mockRequest('GET', ['path' => 'images', 'query' => ['limit' => 5]], 'images-get');
 
         foreach ($this->service->listImages(['limit' => 5]) as $image) {
             self::assertInstanceOf(Image::class, $image);
@@ -122,10 +113,7 @@ public function test_it_gets_an_image()
 
     public function test_it_lists_keypairs()
     {
-        $this->client
-            ->request('GET', 'os-keypairs', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('keypairs-get'));
+        $this->mockRequest('GET', 'os-keypairs', 'keypairs-get');
 
         foreach ($this->service->listKeypairs() as $keypair) {
             self::assertInstanceOf(Keypair::class, $keypair);
@@ -134,10 +122,7 @@ public function test_it_lists_keypairs()
 
     public function test_it_gets_hypervisor_statistics()
     {
-        $this->client
-            ->request('GET', 'os-hypervisors/statistics', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('hypervisor-statistic-get'));
+        $this->mockRequest('GET', 'os-hypervisors/statistics', 'hypervisor-statistic-get');
 
         $hypervisorStats = $this->service->getHypervisorStatistics();
 
@@ -146,10 +131,7 @@ public function test_it_gets_hypervisor_statistics()
 
     public function test_it_lists_hypervisors()
     {
-        $this->client
-            ->request('GET', 'os-hypervisors', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('hypervisors-get'));
+        $this->mockRequest('GET', 'os-hypervisors', 'hypervisors-get');
 
         foreach ($this->service->listHypervisors(false) as $hypervisor) {
             self::assertInstanceOf(Hypervisor::class, $hypervisor);
@@ -158,10 +140,7 @@ public function test_it_lists_hypervisors()
 
     public function test_it_gets_hypervisor()
     {
-        $this->client
-            ->request('GET', 'os-hypervisors/1234', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('hypervisor-get'));
+        $this->mockRequest('GET', 'os-hypervisors/1234', 'hypervisor-get');
 
         $hypervisor = $this->service->getHypervisor(['id' => 1234]);
         $hypervisor->retrieve();
@@ -171,10 +150,7 @@ public function test_it_gets_hypervisor()
 
     public function test_it_lists_hosts()
     {
-        $this->client
-            ->request('GET', 'os-hosts', ['query' => ['limit' => 5], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('hosts-get'));
+        $this->mockRequest('GET', ['path' => 'os-hosts', 'query' => ['limit' => 5]], 'hosts-get');
 
         foreach ($this->service->listHosts(['limit' => 5]) as $host) {
             self::assertInstanceOf(Host::class, $host);
@@ -183,10 +159,7 @@ public function test_it_lists_hosts()
 
     public function test_it_gets_host()
     {
-        $this->client
-            ->request('GET', 'os-hosts/b6e4adbc193d428ea923899d07fb001e', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('host-get'));
+        $this->mockRequest('GET', 'os-hosts/b6e4adbc193d428ea923899d07fb001e', 'host-get');
 
         $host = $this->service->getHost(['name' => 'b6e4adbc193d428ea923899d07fb001e']);
         $host->retrieve();
@@ -196,10 +169,11 @@ public function test_it_gets_host()
 
     public function test_it_lists_availability_zones()
     {
-        $this->client
-            ->request('GET', 'os-availability-zone/detail', ['query' => ['limit' => 5], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('availability-zones-get'));
+        $this->mockRequest(
+            'GET',
+            ['path' => 'os-availability-zone/detail', 'query' => ['limit' => 5]],
+            'availability-zones-get'
+        );
 
         foreach ($this->service->listAvailabilityZones(['limit' => 5]) as $zone) {
             self::assertInstanceOf(AvailabilityZone::class, $zone);
diff --git a/tests/unit/Identity/v2/ServiceTest.php b/tests/unit/Identity/v2/ServiceTest.php
index 766cc7b9..a72186ba 100644
--- a/tests/unit/Identity/v2/ServiceTest.php
+++ b/tests/unit/Identity/v2/ServiceTest.php
@@ -40,9 +40,9 @@ public function test_it_authenticates()
             'tenantId' => $options['tenantId'],
         ]];
 
-        $this->setupMock('POST', 'tokens', $expectedJson, [], 'token-post');
+        $this->mockRequest('POST', 'tokens', 'token-post', $expectedJson, []);
 
-        list($token, $baseUrl) = $this->service->authenticate($options);
+        [$token, $baseUrl] = $this->service->authenticate($options);
 
         self::assertInstanceOf(Token::class, $token);
         self::assertIsString($baseUrl);
@@ -64,7 +64,7 @@ public function test_it_generates_tokens()
             'tenantId' => $options['tenantId'],
         ]];
 
-        $this->setupMock('POST', 'tokens', $expectedJson, [], 'token-post');
+        $this->mockRequest('POST', 'tokens', 'token-post', $expectedJson, []);
 
         self::assertInstanceOf(Token::class, $this->service->generateToken($options));
     }
diff --git a/tests/unit/Identity/v3/Models/ApplicationCredentialTest.php b/tests/unit/Identity/v3/Models/ApplicationCredentialTest.php
index 5dd357ac..72d740af 100644
--- a/tests/unit/Identity/v3/Models/ApplicationCredentialTest.php
+++ b/tests/unit/Identity/v3/Models/ApplicationCredentialTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'users/USER_ID/application_credentials/APPLICATION_CREDENTIAL_ID', null, [], 'application_credential');
+        $this->mockRequest('GET', 'users/USER_ID/application_credentials/APPLICATION_CREDENTIAL_ID', 'application_credential', null, []);
 
         $this->applicationCredential->retrieve();
 
@@ -34,7 +34,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'users/USER_ID/application_credentials/APPLICATION_CREDENTIAL_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'users/USER_ID/application_credentials/APPLICATION_CREDENTIAL_ID', new Response(204), null, []);
 
         $this->applicationCredential->delete();
     }
diff --git a/tests/unit/Identity/v3/Models/CredentialTest.php b/tests/unit/Identity/v3/Models/CredentialTest.php
index 89ec88af..fede4523 100644
--- a/tests/unit/Identity/v3/Models/CredentialTest.php
+++ b/tests/unit/Identity/v3/Models/CredentialTest.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'credentials/CRED_ID', null, [], 'cred');
+        $this->mockRequest('GET', 'credentials/CRED_ID', 'cred', null, []);
 
         $this->credential->retrieve();
     }
@@ -38,14 +38,14 @@ public function test_it_updates()
             'project_id' => 'bar',
         ];
 
-        $this->setupMock('PATCH', 'credentials/CRED_ID', $expectedJson, [], 'cred');
+        $this->mockRequest('PATCH', 'credentials/CRED_ID', 'cred', $expectedJson, []);
 
         $this->credential->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'credentials/CRED_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'credentials/CRED_ID', new Response(204), null, []);
 
         $this->credential->delete();
     }
diff --git a/tests/unit/Identity/v3/Models/DomainTest.php b/tests/unit/Identity/v3/Models/DomainTest.php
index 35af96fd..b8c7cc76 100644
--- a/tests/unit/Identity/v3/Models/DomainTest.php
+++ b/tests/unit/Identity/v3/Models/DomainTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'domains/DOMAIN_ID', null, [], 'domain');
+        $this->mockRequest('GET', 'domains/DOMAIN_ID', 'domain', null, []);
 
         $this->domain->retrieve();
     }
@@ -42,14 +42,14 @@ public function test_it_updates()
             'enabled' => false,
         ];
 
-        $this->setupMock('PATCH', 'domains/DOMAIN_ID', ['domain' => $expectedJson], [], 'domain');
+        $this->mockRequest('PATCH', 'domains/DOMAIN_ID', 'domain', ['domain' => $expectedJson], []);
 
         $this->domain->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'domains/DOMAIN_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'domains/DOMAIN_ID', new Response(204), null, []);
 
         $this->domain->delete();
     }
@@ -62,29 +62,26 @@ public function test_it_lists_user_roles()
 
     public function test_it_grants_user_role()
     {
-        $this->setupMock('PUT', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(204));
-        self::assertNull($this->domain->grantUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
+        $this->mockRequest('PUT', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', new Response(204));
+        $this->domain->grantUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']);
     }
 
     public function test_it_checks_user_role()
     {
-        $this->setupMock('HEAD', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(200));
+        $this->mockRequest('HEAD', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', new Response(200));
         self::assertTrue($this->domain->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_user_role()
     {
-        $this->client
-            ->request('HEAD', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow(new BadResponseError());
+        $this->mockRequest('HEAD', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', new BadResponseError());
 
         self::assertFalse($this->domain->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_user_role()
     {
-        $this->setupMock('DELETE', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'domains/DOMAIN_ID/users/USER_ID/roles/ROLE_ID', new Response(204));
         $this->domain->revokeUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']);
     }
 
@@ -96,29 +93,26 @@ public function test_it_lists_group_roles()
 
     public function test_it_grants_group_role()
     {
-        $this->setupMock('PUT', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(204));
-        self::assertNull($this->domain->grantGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
+        $this->mockRequest('PUT', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', new Response(204));
+        $this->domain->grantGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']);
     }
 
     public function test_it_checks_group_role()
     {
-        $this->setupMock('HEAD', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(200));
+        $this->mockRequest('HEAD', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', new Response(200));
         self::assertTrue($this->domain->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_group_role()
     {
-        $this->client
-            ->request('HEAD', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow(new BadResponseError());
+        $this->mockRequest('HEAD', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', new BadResponseError());
 
         self::assertFalse($this->domain->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_group_role()
     {
-        $this->setupMock('DELETE', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'domains/DOMAIN_ID/groups/GROUP_ID/roles/ROLE_ID', new Response(204), null, []);
         $this->domain->revokeGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']);
     }
 }
diff --git a/tests/unit/Identity/v3/Models/EndpointTest.php b/tests/unit/Identity/v3/Models/EndpointTest.php
index 99923fe1..7e94135b 100644
--- a/tests/unit/Identity/v3/Models/EndpointTest.php
+++ b/tests/unit/Identity/v3/Models/EndpointTest.php
@@ -39,7 +39,7 @@ public function test_it_creates_endpoint()
         $userJson['service_id'] = $userOptions['serviceId'];
         unset($userJson['serviceId']);
 
-        $this->setupMock('POST', 'endpoints', ['endpoint' => $userJson], [], 'endpoint');
+        $this->mockRequest('POST', 'endpoints', 'endpoint', ['endpoint' => $userJson], []);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
         $endpoint = $this->service->createEndpoint($userOptions);
@@ -63,14 +63,14 @@ public function test_it_updates_endpoint()
             'service_id' => '12345'
         ];
 
-        $this->setupMock('PATCH', 'endpoints/ENDPOINT_ID', ['endpoint' => $userJson], [], 'endpoint');
+        $this->mockRequest('PATCH', 'endpoints/ENDPOINT_ID', 'endpoint', ['endpoint' => $userJson], []);
 
         $this->endpoint->update();
     }
 
     public function test_it_deletes_endpoint()
     {
-        $this->setupMock('DELETE', 'endpoints/ENDPOINT_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'endpoints/ENDPOINT_ID', new Response(204), null, []);
 
         $this->endpoint->delete();
     }
diff --git a/tests/unit/Identity/v3/Models/GroupTest.php b/tests/unit/Identity/v3/Models/GroupTest.php
index 4107f861..f1c839f8 100644
--- a/tests/unit/Identity/v3/Models/GroupTest.php
+++ b/tests/unit/Identity/v3/Models/GroupTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'groups/GROUP_ID', null, [], 'group');
+        $this->mockRequest('GET', 'groups/GROUP_ID', 'group', null, []);
 
         $this->group->retrieve();
     }
@@ -43,7 +43,7 @@ public function test_it_creates_group()
             'name'        => $userOptions['name']
         ];
 
-        $this->setupMock('POST', 'groups', ['group' => $userJson], [], 'group');
+        $this->mockRequest('POST', 'groups', 'group', ['group' => $userJson], []);
 
         /** @var $group \OpenStack\Identity\v3\Models\Group */
         $group = $this->group->create($userOptions);
@@ -58,14 +58,14 @@ public function test_it_updates_group()
 
         $userJson = ['description'  => 'desc', 'name' => 'name'];
 
-        $this->setupMock('PATCH', 'groups/GROUP_ID', ['group' => $userJson], [], 'endpoint');
+        $this->mockRequest('PATCH', 'groups/GROUP_ID', 'endpoint', ['group' => $userJson], []);
 
         $this->group->update();
     }
 
     public function test_it_deletes_group()
     {
-        $this->setupMock('DELETE', 'groups/GROUP_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'groups/GROUP_ID', new Response(204), null, []);
 
         $this->group->delete();
     }
@@ -78,31 +78,28 @@ public function test_it_lists_users()
 
     public function test_it_adds_users()
     {
-        $this->setupMock('PUT', 'groups/GROUP_ID/users/USER_ID', null, [], new Response(204));
+        $this->mockRequest('PUT', 'groups/GROUP_ID/users/USER_ID', new Response(204), null, []);
 
         $this->group->addUser(['userId' => 'USER_ID']);
     }
 
     public function test_it_removes_users()
     {
-        $this->setupMock('DELETE', 'groups/GROUP_ID/users/USER_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'groups/GROUP_ID/users/USER_ID', new Response(204), null, []);
 
         $this->group->removeUser(['userId' => 'USER_ID']);
     }
 
     public function test_it_checks_user_memberships()
     {
-        $this->setupMock('HEAD', 'groups/GROUP_ID/users/USER_ID', null, [], new Response(200));
+        $this->mockRequest('HEAD', 'groups/GROUP_ID/users/USER_ID', new Response(200), null, []);
 
         $this->group->checkMembership(['userId' => 'USER_ID']);
     }
 
     public function test_it_checks_nonexistent_memberships()
     {
-        $this->client
-            ->request('HEAD', 'groups/GROUP_ID/users/USER_ID', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow(new BadResponseError());
+        $this->mockRequest('HEAD', 'groups/GROUP_ID/users/USER_ID', new BadResponseError());
 
         self::assertFalse($this->group->checkMembership(['userId' => 'USER_ID']));
     }
diff --git a/tests/unit/Identity/v3/Models/PolicyTest.php b/tests/unit/Identity/v3/Models/PolicyTest.php
index 80048a93..c5eaa919 100644
--- a/tests/unit/Identity/v3/Models/PolicyTest.php
+++ b/tests/unit/Identity/v3/Models/PolicyTest.php
@@ -37,7 +37,7 @@ public function test_it_creates()
             'user_id' => 'id',
         ];
 
-        $this->setupMock('POST', 'policies', ['policy' => $userJson], [], 'policy');
+        $this->mockRequest('POST', 'policies', 'policy', ['policy' => $userJson], []);
 
         /** @var $policy \OpenStack\Identity\v3\Models\Policy */
         $policy = $this->policy->create($userOptions);
@@ -48,7 +48,7 @@ public function test_it_creates()
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'policies/POLICY_ID', null, [], 'policy');
+        $this->mockRequest('GET', 'policies/POLICY_ID', 'policy', null, []);
 
         $this->policy->retrieve();
     }
@@ -57,14 +57,14 @@ public function test_it_updates()
     {
         $this->policy->type = 'foo';
 
-        $this->setupMock('PATCH', 'policies/POLICY_ID', ['policy' => ['type' => 'foo']], [], 'policy');
+        $this->mockRequest('PATCH', 'policies/POLICY_ID', 'policy', ['policy' => ['type' => 'foo']], []);
 
         $this->policy->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'policies/POLICY_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'policies/POLICY_ID', new Response(204), null, []);
 
         $this->policy->delete();
     }
diff --git a/tests/unit/Identity/v3/Models/ProjectTest.php b/tests/unit/Identity/v3/Models/ProjectTest.php
index dae65624..77f24f29 100644
--- a/tests/unit/Identity/v3/Models/ProjectTest.php
+++ b/tests/unit/Identity/v3/Models/ProjectTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'projects/PROJECT_ID', null, [], 'project');
+        $this->mockRequest('GET', 'projects/PROJECT_ID', 'project', null, []);
 
         $this->project->retrieve();
     }
@@ -46,14 +46,14 @@ public function test_it_updates()
             'name' => 'name',
         ];
 
-        $this->setupMock('PATCH', 'projects/PROJECT_ID', ['project' => $expectedJson], [], 'project');
+        $this->mockRequest('PATCH', 'projects/PROJECT_ID', 'project', ['project' => $expectedJson], []);
 
         $this->project->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'projects/PROJECT_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'projects/PROJECT_ID', new Response(204), null, []);
 
         $this->project->delete();
     }
@@ -66,31 +66,28 @@ public function test_it_lists_user_roles()
 
     public function test_it_grants_user_role()
     {
-        $this->setupMock('PUT', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(204));
+        $this->mockRequest('PUT', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', new Response(204), null, []);
 
         $this->project->grantUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']);
     }
 
     public function test_it_checks_user_role()
     {
-        $this->setupMock('HEAD', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(200));
+        $this->mockRequest('HEAD', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', new Response(200), null, []);
 
         self::assertTrue($this->project->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_user_role()
     {
-        $this->client
-            ->request('HEAD', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow(new BadResponseError());
+        $this->mockRequest('HEAD', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', new BadResponseError());
 
         self::assertFalse($this->project->checkUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_user_role()
     {
-        $this->setupMock('DELETE', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'projects/PROJECT_ID/users/USER_ID/roles/ROLE_ID', new Response(204), null, []);
 
         $this->project->revokeUserRole(['userId' => 'USER_ID', 'roleId' => 'ROLE_ID']);
     }
@@ -103,31 +100,28 @@ public function test_it_lists_group_roles()
 
     public function test_it_grants_group_role()
     {
-        $this->setupMock('PUT', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(204));
+        $this->mockRequest('PUT', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', new Response(204), null, []);
 
         $this->project->grantGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']);
     }
 
     public function test_it_checks_group_role()
     {
-        $this->setupMock('HEAD', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(200));
+        $this->mockRequest('HEAD', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', new Response(200), null, []);
 
         self::assertTrue($this->project->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_checks_nonexistent_group_role()
     {
-        $this->client
-            ->request('HEAD', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow(new BadResponseError());
+        $this->mockRequest('HEAD', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', new BadResponseError());
 
         self::assertFalse($this->project->checkGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']));
     }
 
     public function test_it_revokes_group_role()
     {
-        $this->setupMock('DELETE', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'projects/PROJECT_ID/groups/GROUP_ID/roles/ROLE_ID', new Response(204), null, []);
 
         $this->project->revokeGroupRole(['groupId' => 'GROUP_ID', 'roleId' => 'ROLE_ID']);
     }
diff --git a/tests/unit/Identity/v3/Models/RoleTest.php b/tests/unit/Identity/v3/Models/RoleTest.php
index 0eb989fe..5a40afea 100644
--- a/tests/unit/Identity/v3/Models/RoleTest.php
+++ b/tests/unit/Identity/v3/Models/RoleTest.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'roles/ROLE_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'roles/ROLE_ID', new Response(204), null, []);
 
         $this->role->delete();
     }
diff --git a/tests/unit/Identity/v3/Models/ServiceTest.php b/tests/unit/Identity/v3/Models/ServiceTest.php
index 5b8c8e9d..c02221c2 100644
--- a/tests/unit/Identity/v3/Models/ServiceTest.php
+++ b/tests/unit/Identity/v3/Models/ServiceTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'services/SERVICE_ID', null, [], 'service');
+        $this->mockRequest('GET', 'services/SERVICE_ID', 'service', null, []);
 
         $this->service->retrieve();
     }
@@ -33,14 +33,14 @@ public function test_it_updates()
     {
         $this->service->type = 'foo';
 
-        $this->setupMock('PATCH', 'services/SERVICE_ID', ['service' => ['type' => 'foo']], [], 'service');
+        $this->mockRequest('PATCH', 'services/SERVICE_ID', 'service', ['service' => ['type' => 'foo']], []);
 
         $this->service->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'services/SERVICE_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'services/SERVICE_ID', new Response(204), null, []);
 
         $this->service->delete();
     }
diff --git a/tests/unit/Identity/v3/Models/UserTest.php b/tests/unit/Identity/v3/Models/UserTest.php
index 7a9a9c61..edea42c2 100644
--- a/tests/unit/Identity/v3/Models/UserTest.php
+++ b/tests/unit/Identity/v3/Models/UserTest.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'users/USER_ID', null, [], 'user');
+        $this->mockRequest('GET', 'users/USER_ID', 'user', null, []);
 
         $this->user->retrieve();
     }
@@ -42,14 +42,14 @@ public function test_it_updates()
             'enabled' => true,
         ];
 
-        $this->setupMock('PATCH', 'users/USER_ID', ['user' => $expectedJson], [], 'user');
+        $this->mockRequest('PATCH', 'users/USER_ID', 'user', ['user' => $expectedJson], []);
 
         $this->user->update();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'users/USER_ID', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'users/USER_ID', new Response(204), null, []);
 
         $this->user->delete();
     }
@@ -73,7 +73,7 @@ public function test_it_creates_application_credential()
             'description' => 'Application credential for monitoring.',
         ];
 
-        $this->setupMock('POST', 'users/USER_ID/application_credentials', ['application_credential' => $userOptions], [], 'application_credential');
+        $this->mockRequest('POST', 'users/USER_ID/application_credentials', 'application_credential', ['application_credential' => $userOptions], []);
 
         $applicationCredential = $this->user->createApplicationCredential($userOptions);
 
diff --git a/tests/unit/Identity/v3/ServiceTest.php b/tests/unit/Identity/v3/ServiceTest.php
index da39e671..c35636f2 100644
--- a/tests/unit/Identity/v3/ServiceTest.php
+++ b/tests/unit/Identity/v3/ServiceTest.php
@@ -58,9 +58,9 @@ public function test_it_authenticates()
             ]
         ];
 
-        $this->setupMock('POST', 'auth/tokens', ['auth' => $expectedJson], [], 'token');
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
 
-        list($token, $url) = $this->service->authenticate($userOptions);
+        [$token, $url] = $this->service->authenticate($userOptions);
 
         self::assertInstanceOf(Models\Token::class, $token);
         self::assertEquals('http://example.org:8080/v1/AUTH_e00abf65afca49609eedd163c515cf10', $url);
@@ -134,7 +134,7 @@ public function test_it_authenticates_using_cache_token()
             'cachedToken' => $cachedToken
         ];
 
-        list($token, $url) = $this->service->authenticate($userOptions);
+        [$token, $url] = $this->service->authenticate($userOptions);
 
         self::assertInstanceOf(Models\Token::class, $token);
         self::assertEquals('http://example.org:8080/v1/AUTH_e00abf65afca49609eedd163c515cf10', $url);
@@ -231,7 +231,7 @@ public function test_it_throws_exception_if_no_endpoint_found()
             ]
         ];
 
-        $this->setupMock('POST', 'auth/tokens', ['auth' => $expectedJson], [], 'token');
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
 		$this->expectException(\RuntimeException::class);
 
         $this->service->authenticate([
@@ -251,7 +251,7 @@ public function test_it_throws_exception_if_no_endpoint_found()
 
     public function test_it_gets_token()
     {
-        $this->setupMock('GET', 'auth/tokens', [], ['X-Subject-Token' => 'tokenId'], 'token-get');
+        $this->mockRequest('GET', 'auth/tokens', 'token-get', [], ['X-Subject-Token' => 'tokenId']);
 
         $token = $this->service->getToken('tokenId');
         $token->retrieve();
@@ -280,33 +280,30 @@ public function test_it_gets_token()
 
     public function test_false_is_returned_when_token_validation_returns_204()
     {
-        $this->setupMock('HEAD', 'auth/tokens', [], ['X-Subject-Token' => 'tokenId'], new Response(204));
+        $this->mockRequest('HEAD', 'auth/tokens', new Response(204), [], ['X-Subject-Token' => 'tokenId']);
 
         self::assertTrue($this->service->validateToken('tokenId'));
     }
 
     public function test_true_is_returned_when_token_validation_returns_error()
     {
-        $this->client
-            ->request('HEAD', 'auth/tokens', ['headers' => ['X-Subject-Token' => 'tokenId']])
-            ->shouldBeCalled()
-            ->willThrow(new BadResponseError());
+        $this->mockRequest('HEAD', 'auth/tokens', new BadResponseError(), [], ['X-Subject-Token' => 'tokenId']);
 
         self::assertFalse($this->service->validateToken('tokenId'));
     }
 
     public function test_it_revokes_token()
     {
-        $this->setupMock('DELETE', 'auth/tokens', [], ['X-Subject-Token' => 'tokenId'], new Response(204));
+        $this->mockRequest('DELETE', 'auth/tokens', new Response(204), [], ['X-Subject-Token' => 'tokenId']);
 
-        self::assertNull($this->service->revokeToken('tokenId'));
+        $this->service->revokeToken('tokenId');
     }
 
     public function test_it_creates_service()
     {
         $userOptions = ['name' => 'foo', 'type' => 'bar', 'description' => 'description'];
 
-        $this->setupMock('POST', 'services', ['service' => $userOptions], [], 'service');
+        $this->mockRequest('POST', 'services', 'service', ['service' => $userOptions]);
 
         $service = $this->service->createService($userOptions);
 
@@ -341,7 +338,7 @@ public function test_it_creates_endpoint()
         $expectedJson['endpoint']['service_id'] = $userOptions['serviceId'];
         $expectedJson = json_encode($expectedJson, JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('POST', 'endpoints', $expectedJson, ['Content-Type' => 'application/json'], 'endpoint');
+        $this->mockRequest('POST', 'endpoints', 'endpoint', $expectedJson, ['Content-Type' => 'application/json']);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
         $endpoint = $this->service->createEndpoint($userOptions);
@@ -363,7 +360,7 @@ public function test_it_creates_domain()
             'name'        => 'foo'
         ];
 
-        $this->setupMock('POST', 'domains', ['domain' => $userOptions], [], 'domain');
+        $this->mockRequest('POST', 'domains', 'domain', ['domain' => $userOptions]);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Domain */
         $domain = $this->service->createDomain($userOptions);
@@ -394,7 +391,7 @@ public function test_it_creates_project()
             'name'        => 'foo'
         ];
 
-        $this->setupMock('POST', 'projects', ['project' => $userOptions], [], 'project');
+        $this->mockRequest('POST', 'projects', 'project', ['project' => $userOptions]);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Project */
         $project = $this->service->createProject($userOptions);
@@ -408,7 +405,7 @@ public function test_it_creates_project()
 
     public function test_it_lists_projects()
     {
-        $this->setupMock('GET', 'projects', null, [], 'projects');
+        $this->mockRequest('GET', 'projects', 'projects');
 
         $projects = $this->service->listProjects();
 
@@ -446,7 +443,7 @@ public function test_it_creates_user()
         $userJson['domain_id'] = $userJson['domainId'];
         unset($userJson['defaultProjectId'], $userJson['domainId']);
 
-        $this->setupMock('POST', 'users', ['user' => $userJson], [], 'user');
+        $this->mockRequest('POST', 'users', 'user', ['user' => $userJson]);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\User */
         $user = $this->service->createUser($userOptions);
@@ -479,7 +476,7 @@ public function test_it_creates_group()
             'name'        => 'name',
         ];
 
-        $this->setupMock('POST', 'groups', ['group' => $userOptions], [], 'group');
+        $this->mockRequest('POST', 'groups', 'group', ['group' => $userOptions]);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Group */
         $group = $this->service->createGroup($userOptions);
@@ -518,7 +515,7 @@ public function test_it_creates_credential()
             'user_id'    => $userOptions['userId'],
         ];
 
-        $this->setupMock('POST', 'credentials', $userJson, [], 'cred');
+        $this->mockRequest('POST', 'credentials', 'cred', $userJson);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Credential */
         $cred = $this->service->createCredential($userOptions);
@@ -545,7 +542,7 @@ public function test_it_creates_role()
     {
         $userOptions = ['name' => 'a role name'];
 
-        $this->setupMock('POST', 'roles', ['role' => $userOptions], [], 'role');
+        $this->mockRequest('POST', 'roles', 'role', ['role' => $userOptions]);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Role */
         $role = $this->service->createRole($userOptions);
@@ -582,7 +579,7 @@ public function test_it_creates_policy()
             'user_id'    => $userOptions['userId'],
         ];
 
-        $this->setupMock('POST', 'policies', ['policy' => $userJson], [], 'policy');
+        $this->mockRequest('POST', 'policies', 'policy', ['policy' => $userJson]);
 
         /** @var $endpoint \OpenStack\Identity\v3\Models\Policy */
         $policy = $this->service->createPolicy($userOptions);
@@ -629,7 +626,7 @@ public function test_it_generates_tokens_with_user_creds()
             ]
         ];
 
-        $this->setupMock('POST', 'auth/tokens', ['auth' => $expectedJson], [], 'token');
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
 
         $token = $this->service->generateToken($userOptions);
         self::assertInstanceOf(Models\Token::class, $token);
@@ -654,7 +651,7 @@ public function test_it_generates_token_with_token_id()
             ]
         ];
 
-        $this->setupMock('POST', 'auth/tokens', ['auth' => $expectedJson], [], 'token');
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
 
         $token = $this->service->generateToken($userOptions);
         self::assertInstanceOf(Models\Token::class, $token);
diff --git a/tests/unit/Images/v2/Models/ImageTest.php b/tests/unit/Images/v2/Models/ImageTest.php
index f46bc820..02e0428b 100644
--- a/tests/unit/Images/v2/Models/ImageTest.php
+++ b/tests/unit/Images/v2/Models/ImageTest.php
@@ -36,7 +36,7 @@ public function test_it_retrieves()
 
         $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn($returnedUri);
 
-        $this->setupMock('GET', $this->path, null, [], 'GET_image');
+        $this->mockRequest('GET', $this->path, 'GET_image', null, []);
 
         $this->image->retrieve();
 
@@ -82,11 +82,11 @@ public function test_it_updates()
             (object) ['op' => 'replace', 'path' => '/protected', 'value' => $opts['protected']],
         ], JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('GET', $this->path, null, [], 'GET_image');
-        $this->setupMock('GET', 'v2/schemas/image', null, [], 'GET_image_schema');
+        $this->mockRequest('GET', $this->path, 'GET_image', null, []);
+        $this->mockRequest('GET', 'v2/schemas/image', 'GET_image_schema', null, []);
 
         $headers = ['Content-Type' => 'application/openstack-images-v2.1-json-patch'];
-        $this->setupMock('PATCH', $this->path, $expectedJson, $headers, 'POST_image');
+        $this->mockRequest('PATCH', $this->path, 'POST_image', $expectedJson, $headers);
 
         $this->image->update($opts);
     }
@@ -95,8 +95,8 @@ public function test_it_throws_exception_if_user_input_does_not_match_schema()
     {
         $this->client->getConfig('base_uri')->shouldBeCalled()->willReturn(new Uri);
 
-        $this->setupMock('GET', $this->path, null, [], 'GET_image');
-        $this->setupMock('GET', 'v2/schemas/image', null, [], 'GET_image_schema');
+        $this->mockRequest('GET', $this->path, 'GET_image', null, []);
+        $this->mockRequest('GET', 'v2/schemas/image', 'GET_image_schema', null, []);
         $this->expectException(\Exception::class);
 
         $this->image->update([
@@ -106,21 +106,21 @@ public function test_it_throws_exception_if_user_input_does_not_match_schema()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', $this->path, null, [], new Response(204));
+        $this->mockRequest('DELETE', $this->path, new Response(204), null, []);
 
         $this->image->delete();
     }
 
     public function test_it_reactivates()
     {
-        $this->setupMock('POST', $this->path . '/actions/reactivate', null, [], new Response(204));
+        $this->mockRequest('POST', $this->path . '/actions/reactivate', new Response(204), null, []);
 
         $this->image->reactivate();
     }
 
     public function test_it_deactivates()
     {
-        $this->setupMock('POST', $this->path . '/actions/deactivate', null, [], new Response(204));
+        $this->mockRequest('POST', $this->path . '/actions/deactivate', new Response(204), null, []);
 
         $this->image->deactivate();
     }
@@ -133,7 +133,7 @@ public function test_it_uploads_data_stream()
 
         $headers = ['Content-Type' => 'application/octet-stream'];
 
-        $this->setupMock('PUT', $this->path . '/file', $stream, $headers, new Response(204));
+        $this->mockRequest('PUT', $this->path . '/file', new Response(204), $stream, $headers);
 
         $this->image->uploadData($stream);
     }
@@ -147,7 +147,7 @@ public function test_it_downloads_data()
         $headers = ['Content-Type' => 'application/octet-stream'];
         $response = new Response(200, $headers, $stream);
 
-        $this->setupMock('GET', $this->path . '/file', null, [], $response);
+        $this->mockRequest('GET', $this->path . '/file', $response, null, []);
 
         self::assertInstanceOf(Stream::class, $this->image->downloadData());
     }
@@ -157,7 +157,7 @@ public function test_it_creates_member()
         $memberId = '8989447062e04a818baf9e073fd04fa7';
         $expectedJson = ['member' => $memberId];
 
-        $this->setupMock('POST', $this->path . '/members', $expectedJson, [], 'POST_members');
+        $this->mockRequest('POST', $this->path . '/members', 'POST_members', $expectedJson);
 
         $member = $this->image->addMember('8989447062e04a818baf9e073fd04fa7');
         self::assertInstanceOf(Member::class, $member);
@@ -165,10 +165,7 @@ public function test_it_creates_member()
 
     public function test_it_lists_members()
     {
-        $this->client
-            ->request('GET', $this->path . '/members', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_members'));
+        $this->mockRequest('GET', $this->path . '/members', 'GET_members');
 
         $count = 0;
 
diff --git a/tests/unit/Images/v2/Models/MemberTest.php b/tests/unit/Images/v2/Models/MemberTest.php
index 6224e921..d7cb3df1 100644
--- a/tests/unit/Images/v2/Models/MemberTest.php
+++ b/tests/unit/Images/v2/Models/MemberTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2/images/foo/members/bar', null, [], 'GET_member');
+        $this->mockRequest('GET', 'v2/images/foo/members/bar', 'GET_member', null, []);
 
         $this->member->retrieve();
     }
@@ -33,14 +33,14 @@ public function test_it_updates()
     {
         $expectedJson = ['status' => 'rejected'];
 
-        $this->setupMock('PUT', 'v2/images/foo/members/bar', $expectedJson, [], 'GET_member');
+        $this->mockRequest('PUT', 'v2/images/foo/members/bar', 'GET_member', $expectedJson, []);
 
         $this->member->updateStatus(Member::STATUS_REJECTED);
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2/images/foo/members/bar', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2/images/foo/members/bar', new Response(204), null, []);
 
         $this->member->delete();
     }
diff --git a/tests/unit/Images/v2/ServiceTest.php b/tests/unit/Images/v2/ServiceTest.php
index f26b7814..d3faee95 100644
--- a/tests/unit/Images/v2/ServiceTest.php
+++ b/tests/unit/Images/v2/ServiceTest.php
@@ -46,7 +46,7 @@ public function test_it_creates_image()
             "min_ram" => 0,
         ];
 
-        $this->setupMock('POST', 'v2/images', $expectedJson, [], 'GET_image');
+        $this->mockRequest('POST', 'v2/images', 'GET_image', $expectedJson, []);
 
         $this->service->createImage([
             'name' => 'Ubuntu 12.10',
@@ -71,10 +71,7 @@ public function test_it_lists_images()
             ->shouldBeCalled()
             ->willReturn($returnedUri);
 
-        $this->client
-            ->request('GET', 'v2/images', ['query' => ['limit' => 5], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_images'));
+        $this->mockRequest('GET', ['path' => 'v2/images', 'query' => ['limit' => 5]], 'GET_images');
 
         foreach ($this->service->listImages(['limit' => 5]) as $image) {
             self::assertInstanceOf(Image::class, $image);
diff --git a/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php b/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
index ef29cb3a..d536f890 100644
--- a/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/Models/MetricTest.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v1/metric/000b7bf8-0271-46dd-90aa-cfe89026a55a', null, [], 'metric-get');
+        $this->mockRequest('GET', 'v1/metric/000b7bf8-0271-46dd-90aa-cfe89026a55a', 'metric-get', null, []);
         $this->metric->retrieve();
 
         self::assertEquals('000b7bf8-0271-46dd-90aa-cfe89026a55a', $this->metric->id);
diff --git a/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php b/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
index 3c2e92cb..03778c54 100644
--- a/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v1/resource/generic/1111', null, [], 'resource-get');
+        $this->mockRequest('GET', 'v1/resource/generic/1111', 'resource-get', null, []);
         $this->resource->retrieve();
         self::assertEquals('fake-project-id', $this->resource->projectId);
         self::assertEquals('fake-created-by-user-id', $this->resource->createdByUserId);
@@ -37,7 +37,7 @@ public function test_it_retrieves()
 
     public function test_it_gets_metric()
     {
-        $this->setupMock('GET', sprintf('v1/resource/generic/1111/metric/storage.objects.outgoing.bytes'), [], [], 'metric-get');
+        $this->mockRequest('GET', sprintf('v1/resource/generic/1111/metric/storage.objects.outgoing.bytes'), 'metric-get', [], []);
 
         /** @var Metric $metric */
         $metric = $this->resource->getMetric('storage.objects.outgoing.bytes');
@@ -49,7 +49,7 @@ public function test_it_gets_metric()
 
     public function test_it_gets_metric_measures()
     {
-        $this->setupMock('GET', sprintf('v1/resource/generic/1111/metric/storage.objects.outgoing.bytes/measures'), [], [], 'resource-metric-measures-get');
+        $this->mockRequest('GET', sprintf('v1/resource/generic/1111/metric/storage.objects.outgoing.bytes/measures'), 'resource-metric-measures-get', [], []);
         $measures = $this->resource->getMetricMeasures(['metric' => 'storage.objects.outgoing.bytes']);
 
         self::assertIsArray($measures);
@@ -59,7 +59,7 @@ public function test_it_gets_metric_measures()
 
     public function test_it_lists_resource_metrics()
     {
-        $this->setupMock('GET', 'v1/resource/generic/1111/metric', [], [], 'resource-metrics-get');
+        $this->mockRequest('GET', 'v1/resource/generic/1111/metric', 'resource-metrics-get', [], []);
 
         $result = iterator_to_array($this->resource->listResourceMetrics());
 
diff --git a/tests/unit/Metric/v1/Gnocchi/ServiceTest.php b/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
index 8c2617f3..ecae9939 100644
--- a/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
+++ b/tests/unit/Metric/v1/Gnocchi/ServiceTest.php
@@ -23,10 +23,7 @@ public function setUp(): void
 
     public function test_it_lists_resource_types()
     {
-        $this->client
-            ->request('GET', 'v1/resource_type', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('resourcetypes-get'));
+        $this->mockRequest('GET', 'v1/resource_type', 'resourcetypes-get');
 
         $result = iterator_to_array($this->service->listResourceTypes());
 
@@ -36,10 +33,7 @@ public function test_it_lists_resource_types()
 
     public function test_it_lists_resources()
     {
-        $this->client
-            ->request('GET', 'v1/resource/generic', ['headers' => [], 'query' => ['limit' => 3]])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('resources-get'));
+        $this->mockRequest('GET', ['path' => 'v1/resource/generic', 'query' => ['limit' => 3]], 'resources-get');
 
         $result = iterator_to_array($this->service->listResources(['limit' => 3]));
 
@@ -57,20 +51,27 @@ public function test_it_get_resource()
 
     public function test_it_search_resources()
     {
-        $this->client
-            ->request('POST', 'v1/search/resource/generic', ['headers' => ['Content-Type' => 'application/json']])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('resources-get'));
+        $this->mockRequest(
+            'POST',
+            'v1/search/resource/generic',
+            'resources-get',
+            [],
+            ['Content-Type' => 'application/json']
+        );
+
         $result = $this->service->searchResources(['type' => 'generic']);
         self::assertContainsOnlyInstancesOf(Resource::class, $result);
     }
 
     public function test_it_search_resources_with_custom_type()
     {
-        $this->client
-            ->request('POST', 'v1/search/resource/instance', ['headers' => ['Content-Type' => 'application/json']])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('resources-get'));
+        $this->mockRequest(
+            'POST',
+            'v1/search/resource/instance',
+            'resources-get',
+            [],
+            ['Content-Type' => 'application/json']
+        );
 
         $result = $this->service->searchResources(['type' => 'instance']);
 
@@ -79,10 +80,7 @@ public function test_it_search_resources_with_custom_type()
 
     public function test_it_lists_metrics()
     {
-        $this->client
-            ->request('GET', 'v1/metric', ['headers' => [], 'query' => ['limit' => 5]])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('metrics-get'));
+        $this->mockRequest('GET', ['path' => 'v1/metric', 'query' => ['limit' => 5]], 'metrics-get');
 
         $result = $this->service->listMetrics(['limit' => 5]);
 
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
index b13a4e5d..a0446f86 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
@@ -29,7 +29,7 @@ public function test_it_updates()
             "port_id"             => "ce705c24-c1ef-408a-bda3-7bbd946164ab",
         ]];
 
-        $this->setupMock('PUT', 'v2.0/floatingips/id', $expectedJson, [], new Response(202));
+        $this->mockRequest('PUT', 'v2.0/floatingips/id', new Response(202), $expectedJson, []);
 
         $this->floatingIp->floatingNetworkId = "376da547-b977-4cfe-9cba-275c80debf57";
         $this->floatingIp->portId = "ce705c24-c1ef-408a-bda3-7bbd946164ab";
@@ -38,14 +38,14 @@ public function test_it_updates()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/floatingips/id', null, [], new Response(202));
+        $this->mockRequest('DELETE', 'v2.0/floatingips/id', new Response(202), null, []);
 
         $this->floatingIp->delete();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/floatingips/id', null, [], 'FloatingIp');
+        $this->mockRequest('GET', 'v2.0/floatingips/id', 'FloatingIp', null, []);
 
         $this->floatingIp->retrieve();
 
@@ -82,7 +82,7 @@ public function test_it_retrieves()
 
     public function test_it_associates_port()
     {
-        $this->setupMock('PUT', 'v2.0/floatingips/id', ['floatingip' => ['port_id' => 'some-port-id']], [], 'FloatingIp');
+        $this->mockRequest('PUT', 'v2.0/floatingips/id', 'FloatingIp', ['floatingip' => ['port_id' => 'some-port-id']], []);
 
         $this->floatingIp->associatePort('some-port-id');
     }
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
index 844d7e5f..1d29bbfe 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/RouterTest.php
@@ -26,7 +26,7 @@ public function setUp(): void
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/routers/id', null, [], new Response(202));
+        $this->mockRequest('DELETE', 'v2.0/routers/id', new Response(202), null, []);
 
         $this->router->delete();
     }
@@ -47,7 +47,7 @@ public function test_it_updates()
             ],
         ]];
 
-        $this->setupMock('PUT', 'v2.0/routers/id', $expectedJson, [], new Response(201));
+        $this->mockRequest('PUT', 'v2.0/routers/id', new Response(201), $expectedJson, []);
 
         $gatewayInfo = new GatewayInfo();
         $gatewayInfo->networkId = '8ca37218-28ff-41cb-9b10-039601ea7e6b';
@@ -66,7 +66,7 @@ public function test_it_updates()
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/routers/id', null, [], 'Router');
+        $this->mockRequest('GET', 'v2.0/routers/id', 'Router', null, []);
 
         $this->router->retrieve();
 
@@ -78,7 +78,7 @@ public function test_it_adds_interface()
     {
         $expectedJson = ['subnet_id' => 'a2f1f29d-571b-4533-907f-5803ab96ead1'];
 
-        $this->setupMock('PUT', 'v2.0/routers/id/add_router_interface', $expectedJson, [], new Response(201));
+        $this->mockRequest('PUT', 'v2.0/routers/id/add_router_interface', new Response(201), $expectedJson, []);
 
         $this->router->addInterface(['subnetId' => 'a2f1f29d-571b-4533-907f-5803ab96ead1']);
     }
@@ -87,7 +87,7 @@ public function test_it_remove_interface()
     {
         $expectedJson = ['subnet_id' => 'a2f1f29d-571b-4533-907f-5803ab96ead1'];
 
-        $this->setupMock('PUT', 'v2.0/routers/id/remove_router_interface', $expectedJson, [], new Response(201));
+        $this->mockRequest('PUT', 'v2.0/routers/id/remove_router_interface', new Response(201), $expectedJson, []);
 
         $this->router->removeInterface(['subnetId' => 'a2f1f29d-571b-4533-907f-5803ab96ead1']);
     }
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php b/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
index 5c223e19..427714c8 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/ServiceTest.php
@@ -25,10 +25,7 @@ public function setUp(): void
 
     public function test_it_lists_floating_ips()
     {
-        $this->client
-            ->request('GET', 'v2.0/floatingips', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('FloatingIps'));
+        $this->mockRequest('GET', 'v2.0/floatingips', 'FloatingIps');
 
         foreach ($this->service->listFloatingIps() as $ip) {
             /** @var $ip FloatingIp */
@@ -54,7 +51,7 @@ public function test_it_creates_floatingIp()
             "port_id"             => "ce705c24-c1ef-408a-bda3-7bbd946164ab",
         ]];
 
-        $this->setupMock('POST', 'v2.0/floatingips', $expectedJson, [], new Response(201));
+        $this->mockRequest('POST', 'v2.0/floatingips', new Response(201), $expectedJson, []);
 
         $ip = $this->service->createFloatingIp([
             "floatingNetworkId" => "376da547-b977-4cfe-9cba-275c80debf57",
@@ -66,10 +63,7 @@ public function test_it_creates_floatingIp()
 
     public function test_it_lists_routers()
     {
-        $this->client
-            ->request('GET', 'v2.0/routers', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('Routers'));
+        $this->mockRequest('GET', 'v2.0/routers', 'Routers');
 
         foreach ($this->service->listRouters() as $r) {
             /** @var $r Router */
@@ -105,7 +99,7 @@ public function test_it_creates_router()
             "admin_state_up"        => true,
         ]];
 
-        $this->setupMock('POST', 'v2.0/routers', $expectedJson, [], new Response(201));
+        $this->mockRequest('POST', 'v2.0/routers', new Response(201), $expectedJson, []);
 
         $r = $this->service->createRouter([
             'name'                => 'test_router',
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
index adcdbfbe..d3c56d35 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupRuleTest.php
@@ -24,14 +24,14 @@ public function setUp(): void
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/security-group-rules/id', null, [], new Response(202));
+        $this->mockRequest('DELETE', 'v2.0/security-group-rules/id', new Response(202), null, []);
 
         $this->securityGroupRule->delete();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/security-group-rules/id', null, [], 'SecurityGroupRule');
+        $this->mockRequest('GET', 'v2.0/security-group-rules/id', 'SecurityGroupRule', null, []);
 
         $this->securityGroupRule->retrieve();
     }
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
index 6607ee21..c7622835 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/Models/SecurityGroupTest.php
@@ -26,14 +26,14 @@ public function setUp(): void
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/security-groups/' . self::SECURITY_GROUP_ID, null, [], new Response(202));
+        $this->mockRequest('DELETE', 'v2.0/security-groups/' . self::SECURITY_GROUP_ID, new Response(202), null, []);
 
         $this->securityGroup->delete();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/security-groups/' . self::SECURITY_GROUP_ID, null, [], 'SecurityGroup');
+        $this->mockRequest('GET', 'v2.0/security-groups/' . self::SECURITY_GROUP_ID, 'SecurityGroup', null, []);
 
         $this->securityGroup->retrieve();
 
@@ -45,7 +45,7 @@ public function test_it_retrieves()
 
     public function test_it_updates()
     {
-        $this->setupMock('PUT', 'v2.0/security-groups/' . self::SECURITY_GROUP_ID, null, [], 'SecurityGroup');
+        $this->mockRequest('PUT', 'v2.0/security-groups/' . self::SECURITY_GROUP_ID, 'SecurityGroup', null, []);
 
         $this->securityGroup->update();
     }
@@ -64,7 +64,7 @@ public function test_it_creates()
             ],
         ];
 
-        $this->setupMock('POST', 'v2.0/security-groups', $expectedJson, [], 'SecurityGroup');
+        $this->mockRequest('POST', 'v2.0/security-groups', 'SecurityGroup', $expectedJson, []);
 
         self::assertInstanceOf(SecurityGroup::class, $this->securityGroup->create($opts));
     }
diff --git a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
index e597b3a4..06c14dcc 100644
--- a/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
+++ b/tests/unit/Networking/v2/Extensions/SecurityGroups/ServiceTest.php
@@ -25,10 +25,7 @@ public function setUp(): void
 
     public function test_it_lists_secgroups()
     {
-        $this->client
-            ->request('GET', 'v2.0/security-groups', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('SecurityGroups'));
+        $this->mockRequest('GET', 'v2.0/security-groups', 'SecurityGroups');
 
         foreach ($this->service->listSecurityGroups() as $sg) {
             /** @var $sg SecurityGroup */
@@ -50,7 +47,7 @@ public function test_it_creates_secgroup()
 
         $expectedJson = ['security_group' => $options];
 
-        $this->setupMock('POST', 'v2.0/security-groups', $expectedJson, [], new Response(201));
+        $this->mockRequest('POST', 'v2.0/security-groups', new Response(201), $expectedJson, []);
 
         $n = $this->service->createSecurityGroup($options);
         self::assertInstanceOf(SecurityGroup::class, $n);
@@ -63,10 +60,7 @@ public function test_it_gets_secgroup()
 
     public function test_it_lists_secgrouprules()
     {
-        $this->client
-            ->request('GET', 'v2.0/security-group-rules', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('SecurityGroupRules'));
+        $this->mockRequest('GET', 'v2.0/security-group-rules', 'SecurityGroupRules');
 
         foreach ($this->service->listSecurityGroupRules() as $sgr) {
             /** @var $sgr SecurityGroupRule */
@@ -102,7 +96,7 @@ public function test_it_creates_secgrouprule()
             "security_group_id" => "a7734e61-b545-452d-a3cd-0189cbd9747a",
         ]];
 
-        $this->setupMock('POST', 'v2.0/security-group-rules', $expectedJson, [], new Response(201));
+        $this->mockRequest('POST', 'v2.0/security-group-rules', new Response(201), $expectedJson, []);
 
         $n = $this->service->createSecurityGroupRule($options);
         self::assertInstanceOf(SecurityGroupRule::class, $n);
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php b/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
index 4250a9e3..5fbeaac9 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerHealthMonitorTest.php
@@ -47,7 +47,7 @@ public function test_it_creates()
             'timeout'        => $opts['timeout']
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/healthmonitors', $expectedJson, [], 'loadbalancer-healthmonitor-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/healthmonitors', 'loadbalancer-healthmonitor-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancerHealthMonitor::class, $this->healthmonitor->create($opts));
     }
@@ -73,14 +73,14 @@ public function test_it_updates()
             'admin_state_up' => true
         ]];
 
-        $this->setupMock('PUT', 'v2.0/lbaas/healthmonitors/healthmonitorId', $expectedJson, [], 'loadbalancer-healthmonitor-put');
+        $this->mockRequest('PUT', 'v2.0/lbaas/healthmonitors/healthmonitorId', 'loadbalancer-healthmonitor-put', $expectedJson, []);
 
         $this->healthmonitor->update();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/healthmonitors/healthmonitorId', null, [], 'loadbalancer-healthmonitor-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/healthmonitors/healthmonitorId', 'loadbalancer-healthmonitor-get', null, []);
 
         $this->healthmonitor->retrieve();
 
@@ -94,7 +94,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/lbaas/healthmonitors/healthmonitorId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/lbaas/healthmonitors/healthmonitorId', new Response(204), null, []);
 
         $this->healthmonitor->delete();
     }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php b/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
index 7cba4947..7e5570da 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerListenerTest.php
@@ -43,7 +43,7 @@ public function test_it_creates()
             'connection_limit' => $opts['connectionLimit']
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/listeners', $expectedJson, [], 'loadbalancer-listener-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/listeners', 'loadbalancer-listener-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancerListener::class, $this->listener->create($opts));
     }
@@ -63,14 +63,14 @@ public function test_it_updates()
             'admin_state_up'   => false
         ]];
 
-        $this->setupMock('PUT', 'v2.0/lbaas/listeners/listenerId', $expectedJson, [], 'loadbalancer-listener-put');
+        $this->mockRequest('PUT', 'v2.0/lbaas/listeners/listenerId', 'loadbalancer-listener-put', $expectedJson, []);
 
         $this->listener->update();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/listeners/listenerId', null, [], 'loadbalancer-listener-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/listeners/listenerId', 'loadbalancer-listener-get', null, []);
 
         $this->listener->retrieve();
 
@@ -81,7 +81,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/lbaas/listeners/listenerId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/lbaas/listeners/listenerId', new Response(204), null, []);
 
         $this->listener->delete();
     }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php b/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
index a49d2101..7d8b4c9d 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerMemberTest.php
@@ -40,7 +40,7 @@ public function test_it_creates()
             'admin_state_up' => $opts['adminStateUp']
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/pools/poolId/members', $expectedJson, [], 'loadbalancer-member-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/pools/poolId/members', 'loadbalancer-member-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancerMember::class, $this->member->create($opts));
     }
@@ -56,14 +56,14 @@ public function test_it_updates()
             'admin_state_up' => false
         ]];
 
-        $this->setupMock('PUT', 'v2.0/lbaas/pools/poolId/members/memberId', $expectedJson, [], 'loadbalancer-member-put');
+        $this->mockRequest('PUT', 'v2.0/lbaas/pools/poolId/members/memberId', 'loadbalancer-member-put', $expectedJson, []);
 
         $this->member->update();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/pools/poolId/members/memberId', null, [], 'loadbalancer-member-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/pools/poolId/members/memberId', 'loadbalancer-member-get', null, []);
 
         $this->member->retrieve();
 
@@ -74,7 +74,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/lbaas/pools/poolId/members/memberId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/lbaas/pools/poolId/members/memberId', new Response(204), null, []);
 
         $this->member->delete();
     }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php b/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
index 2f0dc785..bbd9d59c 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerPoolTest.php
@@ -48,7 +48,7 @@ public function test_it_creates()
             'admin_state_up'      => $opts['adminStateUp']
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/pools', $expectedJson, [], 'loadbalancer-pool-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/pools', 'loadbalancer-pool-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancerPool::class, $this->pool->create($opts));
     }
@@ -76,14 +76,14 @@ public function test_it_updates()
             'admin_state_up'      => false
         ]];
 
-        $this->setupMock('PUT', 'v2.0/lbaas/pools/poolId', $expectedJson, [], 'loadbalancer-pool-put');
+        $this->mockRequest('PUT', 'v2.0/lbaas/pools/poolId', 'loadbalancer-pool-put', $expectedJson, []);
 
         $this->pool->update();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/pools/poolId', null, [], 'loadbalancer-pool-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/pools/poolId', 'loadbalancer-pool-get', null, []);
 
         $this->pool->retrieve();
 
@@ -94,7 +94,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/lbaas/pools/poolId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/lbaas/pools/poolId', new Response(204), null, []);
 
         $this->pool->delete();
     }
@@ -117,7 +117,7 @@ public function test_add_member()
             'weight'         => $opts['weight']
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/pools/poolId/members', $expectedJson, [], 'loadbalancer-member-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/pools/poolId/members', 'loadbalancer-member-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancerMember::class, $this->pool->addMember($opts));
     }
@@ -131,7 +131,7 @@ public function test_get_member()
 
     public function test_delete_member()
     {
-        $this->setupMock('DELETE', 'v2.0/lbaas/pools/poolId/members/memberId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/lbaas/pools/poolId/members/memberId', new Response(204), null, []);
 
         $this->pool->deleteMember('memberId');
     }
@@ -163,7 +163,7 @@ public function test_add_health_monitor()
             'pool_id'        => $this->pool->id
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/healthmonitors', $expectedJson, [], 'loadbalancer-healthmonitor-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/healthmonitors', 'loadbalancer-healthmonitor-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancerHealthMonitor::class, $this->pool->addHealthMonitor($opts));
     }
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php b/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
index c0eba3ec..e6118c8b 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerStatTest.php
@@ -23,7 +23,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/stats', null, [], 'loadbalancer-stats-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/stats', 'loadbalancer-stats-get', null, []);
 
         $this->stat->retrieve();
         self::assertEquals('1234', $this->stat->bytesOut);
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php b/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
index 800cb82a..b5ed9a46 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerStatusTest.php
@@ -24,7 +24,7 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/statuses', null, [], 'loadbalancer-statuses-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/statuses', 'loadbalancer-statuses-get', null, []);
 
         $this->status->retrieve();
 
diff --git a/tests/unit/Networking/v2/Models/LoadBalancerTest.php b/tests/unit/Networking/v2/Models/LoadBalancerTest.php
index cebe4d23..127c041e 100644
--- a/tests/unit/Networking/v2/Models/LoadBalancerTest.php
+++ b/tests/unit/Networking/v2/Models/LoadBalancerTest.php
@@ -44,7 +44,7 @@ public function test_it_creates()
             'admin_state_up' => $opts['adminStateUp']
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/loadbalancers', $expectedJson, [], 'loadbalancer-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/loadbalancers', 'loadbalancer-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancer::class, $this->loadbalancer->create($opts));
     }
@@ -60,14 +60,14 @@ public function test_it_updates()
             'description' => 'bar'
         ]];
 
-        $this->setupMock('PUT', 'v2.0/lbaas/loadbalancers/loadbalancerId', $expectedJson, [], 'loadbalancer-put');
+        $this->mockRequest('PUT', 'v2.0/lbaas/loadbalancers/loadbalancerId', 'loadbalancer-put', $expectedJson, []);
 
         $this->loadbalancer->update();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId', null, [], 'loadbalancer-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId', 'loadbalancer-get', null, []);
 
         $this->loadbalancer->retrieve();
 
@@ -78,7 +78,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/lbaas/loadbalancers/loadbalancerId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/lbaas/loadbalancers/loadbalancerId', new Response(204), null, []);
 
         $this->loadbalancer->delete();
     }
@@ -106,14 +106,14 @@ public function test_add_listener()
             'loadbalancer_id'  => 'loadbalancerId'
         ]];
 
-        $this->setupMock('POST', 'v2.0/lbaas/listeners', $expectedJson, [], 'loadbalancer-listener-post');
+        $this->mockRequest('POST', 'v2.0/lbaas/listeners', 'loadbalancer-listener-post', $expectedJson, []);
 
         self::assertInstanceOf(LoadBalancerListener::class, $this->loadbalancer->addListener($opts));
     }
 
     public function test_get_stats()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/stats', null, [], 'loadbalancer-stats-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/stats', 'loadbalancer-stats-get', null, []);
 
         $stats = $this->loadbalancer->getStats();
 
@@ -127,7 +127,7 @@ public function test_get_stats()
 
     public function test_get_statuses()
     {
-        $this->setupMock('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/statuses', null, [], 'loadbalancer-statuses-get');
+        $this->mockRequest('GET', 'v2.0/lbaas/loadbalancers/loadbalancerId/statuses', 'loadbalancer-statuses-get', null, []);
 
         $status = $this->loadbalancer->getStatuses();
         self::assertEquals('loadbalancer1', $status->name);
diff --git a/tests/unit/Networking/v2/Models/NetworkTest.php b/tests/unit/Networking/v2/Models/NetworkTest.php
index 1c9d9799..3e2a6830 100644
--- a/tests/unit/Networking/v2/Models/NetworkTest.php
+++ b/tests/unit/Networking/v2/Models/NetworkTest.php
@@ -35,7 +35,7 @@ public function test_it_creates()
             'admin_state_up' => $opts['adminStateUp'],
         ]];
 
-        $this->setupMock('POST', 'v2.0/networks', $expectedJson, [], 'network-post');
+        $this->mockRequest('POST', 'v2.0/networks', 'network-post', $expectedJson, []);
 
         self::assertInstanceOf(Network::class, $this->network->create($opts));
     }
@@ -70,7 +70,7 @@ public function test_it_bulk_creates()
             ],
         ];
 
-        $this->setupMock('POST', 'v2.0/networks', $expectedJson, [], 'networks-post');
+        $this->mockRequest('POST', 'v2.0/networks', 'networks-post', $expectedJson, []);
 
         $networks = $this->network->bulkCreate($opts);
 
@@ -91,14 +91,14 @@ public function test_it_updates()
             'admin_state_up' => false,
         ]];
 
-        $this->setupMock('PUT', 'v2.0/networks/networkId', $expectedJson, [], 'network-put');
+        $this->mockRequest('PUT', 'v2.0/networks/networkId', 'network-put', $expectedJson, []);
 
         $this->network->update();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/networks/networkId', null, [], 'network-get');
+        $this->mockRequest('GET', 'v2.0/networks/networkId', 'network-get', null, []);
 
         $this->network->retrieve();
 
@@ -109,7 +109,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/networks/networkId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/networks/networkId', new Response(204), null, []);
 
         $this->network->delete();
     }
diff --git a/tests/unit/Networking/v2/Models/PortTest.php b/tests/unit/Networking/v2/Models/PortTest.php
index b00a21cf..7342765b 100644
--- a/tests/unit/Networking/v2/Models/PortTest.php
+++ b/tests/unit/Networking/v2/Models/PortTest.php
@@ -40,7 +40,7 @@ public function test_it_updates()
             'admin_state_up' => $opts['adminStateUp'],
         ]];
 
-        $this->setupMock('PUT', 'v2.0/ports/' . self::PORT_ID, $expectedJson, [], 'port_get');
+        $this->mockRequest('PUT', 'v2.0/ports/' . self::PORT_ID, 'port_get', $expectedJson, []);
 
         $this->port->adminStateUp = false;
         $this->port->name = 'newName';
@@ -49,7 +49,7 @@ public function test_it_updates()
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/ports/' . self::PORT_ID, null, [], 'port_get');
+        $this->mockRequest('GET', 'v2.0/ports/' . self::PORT_ID, 'port_get', null, []);
 
         $this->port->retrieve();
         self::assertEquals('46d4bfb9-b26e-41f3-bd2e-e6dcc1ccedb2', $this->port->id);
@@ -65,7 +65,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/ports/' . self::PORT_ID, null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/ports/' . self::PORT_ID, new Response(204), null, []);
 
         $this->port->delete();
     }
@@ -91,7 +91,7 @@ public function test_it_creates()
             ]
         ];
 
-        $this->setupMock('POST', 'v2.0/ports', $expectedJson, [], 'port_post');
+        $this->mockRequest('POST', 'v2.0/ports', 'port_post', $expectedJson, []);
 
         $this->port->create($opts);
     }
diff --git a/tests/unit/Networking/v2/Models/QuotaTest.php b/tests/unit/Networking/v2/Models/QuotaTest.php
index 898bacd4..6888e042 100644
--- a/tests/unit/Networking/v2/Models/QuotaTest.php
+++ b/tests/unit/Networking/v2/Models/QuotaTest.php
@@ -27,14 +27,14 @@ public function setUp(): void
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/quotas/' . self::TENANT_ID, null, [], 'quota-get');
+        $this->mockRequest('GET', 'v2.0/quotas/' . self::TENANT_ID, 'quota-get', null, []);
 
         $this->quota->retrieve();
     }
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/quotas/' . self::TENANT_ID, null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/quotas/' . self::TENANT_ID, new Response(204), null, []);
 
         $this->quota->delete();
     }
@@ -63,7 +63,7 @@ public function test_it_updates()
             'port'                => 99
         ]];
 
-        $this->setupMock('PUT', 'v2.0/quotas/' . self::TENANT_ID, $expectedJson, [], 'quota-get');
+        $this->mockRequest('PUT', 'v2.0/quotas/' . self::TENANT_ID, 'quota-get', $expectedJson, []);
 
         $this->quota->update();
     }
diff --git a/tests/unit/Networking/v2/Models/SubnetTest.php b/tests/unit/Networking/v2/Models/SubnetTest.php
index 18a4876f..08f6662c 100644
--- a/tests/unit/Networking/v2/Models/SubnetTest.php
+++ b/tests/unit/Networking/v2/Models/SubnetTest.php
@@ -41,7 +41,7 @@ public function test_it_creates()
             'enable_dhcp' => $opts['enableDhcp'],
         ]], JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('POST', 'v2.0/subnets', $expectedJson, ['Content-Type' => 'application/json'], 'subnet-post');
+        $this->mockRequest('POST', 'v2.0/subnets', 'subnet-post', $expectedJson, ['Content-Type' => 'application/json']);
 
         self::assertInstanceOf(Subnet::class, $this->subnet->create($opts));
     }
@@ -84,7 +84,7 @@ public function test_it_bulk_creates()
             ],
         ], JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('POST', 'v2.0/subnets', $expectedJson, ['Content-Type' => 'application/json'], 'subnets-post');
+        $this->mockRequest('POST', 'v2.0/subnets', 'subnets-post', $expectedJson, ['Content-Type' => 'application/json']);
 
         $subnets = $this->subnet->bulkCreate($opts);
 
@@ -103,14 +103,14 @@ public function test_it_updates()
             'gateway_ip' => $this->subnet->gatewayIp,
         ]];
 
-        $this->setupMock('PUT', 'v2.0/subnets/subnetId', $expectedJson, [], 'subnet-put');
+        $this->mockRequest('PUT', 'v2.0/subnets/subnetId', 'subnet-put', $expectedJson, []);
 
         $this->subnet->update();
     }
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v2.0/subnets/subnetId', null, [], 'subnet-get');
+        $this->mockRequest('GET', 'v2.0/subnets/subnetId', 'subnet-get', null, []);
 
         $this->subnet->retrieve();
 
@@ -122,7 +122,7 @@ public function test_it_retrieves()
 
     public function test_it_deletes()
     {
-        $this->setupMock('DELETE', 'v2.0/subnets/subnetId', null, [], new Response(204));
+        $this->mockRequest('DELETE', 'v2.0/subnets/subnetId', new Response(204), null, []);
 
         $this->subnet->delete();
     }
diff --git a/tests/unit/Networking/v2/ServiceTest.php b/tests/unit/Networking/v2/ServiceTest.php
index 8d533213..11a7cdaa 100644
--- a/tests/unit/Networking/v2/ServiceTest.php
+++ b/tests/unit/Networking/v2/ServiceTest.php
@@ -39,7 +39,7 @@ public function test_it_creates_an_network()
             'admin_state_up' => $opts['adminStateUp'],
         ]];
 
-        $this->setupMock('POST', 'v2.0/networks', $expectedJson, [], 'network-post');
+        $this->mockRequest('POST', 'v2.0/networks', 'network-post', $expectedJson, []);
 
         self::assertInstanceOf(Network::class, $this->service->createNetwork($opts));
     }
@@ -74,7 +74,7 @@ public function test_it_bulk_creates_networks()
             ],
         ];
 
-        $this->setupMock('POST', 'v2.0/networks', $expectedJson, [], 'networks-post');
+        $this->mockRequest('POST', 'v2.0/networks', 'networks-post', $expectedJson, []);
 
         $networks = $this->service->createNetworks($opts);
 
@@ -92,10 +92,7 @@ public function test_it_gets_an_network()
 
     public function test_it_lists_networks()
     {
-        $this->client
-            ->request('GET', 'v2.0/networks', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('networks-post'));
+        $this->mockRequest('GET', 'v2.0/networks', 'networks-post');
 
         foreach ($this->service->listNetworks() as $network) {
             self::assertInstanceOf(Network::class, $network);
@@ -120,7 +117,7 @@ public function test_it_creates_a_subnet()
             'cidr'       => $opts['cidr'],
         ]], JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('POST', 'v2.0/subnets', $expectedJson, ['Content-Type' => 'application/json'], 'subnet-post');
+        $this->mockRequest('POST', 'v2.0/subnets', 'subnet-post', $expectedJson, ['Content-Type' => 'application/json']);
 
         self::assertInstanceOf(Subnet::class, $this->service->createSubnet($opts));
     }
@@ -163,7 +160,7 @@ public function test_it_bulk_creates_subnets()
             ],
         ], JSON_UNESCAPED_SLASHES);
 
-        $this->setupMock('POST', 'v2.0/subnets', $expectedJson, ['Content-Type' => 'application/json'], 'subnets-post');
+        $this->mockRequest('POST', 'v2.0/subnets', 'subnets-post', $expectedJson, ['Content-Type' => 'application/json']);
 
         $subnets = $this->service->createSubnets($opts);
 
@@ -181,10 +178,7 @@ public function test_it_gets_an_subnet()
 
     public function test_it_lists_subnets()
     {
-        $this->client
-            ->request('GET', 'v2.0/subnets', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('subnets-post'));
+        $this->mockRequest('GET', 'v2.0/subnets', 'subnets-post');
 
         foreach ($this->service->listSubnets() as $subnet) {
             self::assertInstanceOf(Subnet::class, $subnet);
@@ -205,7 +199,7 @@ public function test_it_creates_a_port()
             'admin_state_up' => $opts['adminStateUp'],
         ]];
 
-        $this->setupMock('POST', 'v2.0/ports', $expectedJson, [], 'ports_post');
+        $this->mockRequest('POST', 'v2.0/ports', 'ports_post', $expectedJson, []);
 
         self::assertInstanceOf(Port::class, $this->service->createPort($opts));
     }
@@ -240,7 +234,7 @@ public function test_it_bulk_creates_ports()
             ],
         ];
 
-        $this->setupMock('POST', 'v2.0/ports', $expectedJson, [], 'ports_multiple_post');
+        $this->mockRequest('POST', 'v2.0/ports', 'ports_multiple_post', $expectedJson, []);
 
         $ports = $this->service->createPorts($opts);
 
@@ -258,10 +252,7 @@ public function test_it_gets_an_port()
 
     public function test_it_lists_ports()
     {
-        $this->client
-            ->request('GET', 'v2.0/ports', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('ports_get'));
+        $this->mockRequest('GET', 'v2.0/ports', 'ports_get');
 
         foreach ($this->service->listPorts() as $port) {
             self::assertInstanceOf(Port::class, $port);
@@ -270,10 +261,7 @@ public function test_it_lists_ports()
 
     public function test_it_list_quotas()
     {
-        $this->client
-            ->request('GET', 'v2.0/quotas', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('quotas-get'));
+        $this->mockRequest('GET', 'v2.0/quotas', 'quotas-get');
 
         foreach ($this->service->listQuotas() as $quota) {
             self::assertInstanceOf(Quota::class, $quota);
@@ -282,10 +270,7 @@ public function test_it_list_quotas()
 
     public function test_it_gets_quotas()
     {
-        $this->client
-            ->request('GET', 'v2.0/quotas/fake_tenant_id', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('quota-get'));
+        $this->mockRequest('GET', 'v2.0/quotas/fake_tenant_id', 'quota-get');
 
         $quota = $this->service->getQuota('fake_tenant_id');
         $quota->retrieve();
@@ -295,10 +280,7 @@ public function test_it_gets_quotas()
 
     public function test_it_gets_default_quotas()
     {
-        $this->client
-            ->request('GET', 'v2.0/quotas/fake_tenant_id/default', ['headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('quota-get'));
+        $this->mockRequest('GET', 'v2.0/quotas/fake_tenant_id/default', 'quota-get');
 
         $this->service->getDefaultQuota('fake_tenant_id');
     }
diff --git a/tests/unit/ObjectStore/v1/Models/AccountTest.php b/tests/unit/ObjectStore/v1/Models/AccountTest.php
index 18d7d295..a30ca5c0 100644
--- a/tests/unit/ObjectStore/v1/Models/AccountTest.php
+++ b/tests/unit/ObjectStore/v1/Models/AccountTest.php
@@ -33,7 +33,7 @@ public function test_Response_Populates_Model()
 
     public function test_Retrieve()
     {
-        $this->setupMock('HEAD', '', null, [], 'HEAD_Account');
+        $this->mockRequest('HEAD', '', 'HEAD_Account', null, []);
 
         $this->account->retrieve();
 
@@ -42,7 +42,7 @@ public function test_Retrieve()
 
     public function test_Get_Metadata()
     {
-        $this->setupMock('HEAD', '', null, [], 'HEAD_Account');
+        $this->mockRequest('HEAD', '', 'HEAD_Account', null, []);
         self::assertEquals(['Book' => 'MobyDick', 'Genre' => 'Fiction'], $this->account->getMetadata());
     }
 
@@ -50,14 +50,14 @@ public function test_Merge_Metadata()
     {
         $headers = ['X-Account-Meta-Subject' => 'AmericanLiterature'];
 
-        $this->setupMock('POST', '', [], $headers, 'NoContent');
+        $this->mockRequest('POST', '', 'NoContent', [], $headers);
 
         $this->account->mergeMetadata(['Subject' => 'AmericanLiterature']);
     }
 
     public function test_Reset_Metadata()
     {
-        $this->setupMock('HEAD', '', null, [], 'HEAD_Account');
+        $this->mockRequest('HEAD', '', 'HEAD_Account', null, []);
 
         $headers = [
             'X-Account-Meta-Book'         => 'Middlesex',
@@ -65,7 +65,7 @@ public function test_Reset_Metadata()
             'X-Remove-Account-Meta-Genre' => 'True',
         ];
 
-        $this->setupMock('POST', '', [], $headers, 'NoContent');
+        $this->mockRequest('POST', '', 'NoContent', [], $headers);
 
         $this->account->resetMetadata([
             'Book'   => 'Middlesex',
diff --git a/tests/unit/ObjectStore/v1/Models/ContainerTest.php b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
index be363cab..69a81890 100644
--- a/tests/unit/ObjectStore/v1/Models/ContainerTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
@@ -41,7 +41,7 @@ public function test_Populate_From_Response()
 
     public function test_Retrieve()
     {
-        $this->setupMock('HEAD', self::NAME, null, [], 'HEAD_Container');
+        $this->mockRequest('HEAD', self::NAME, 'HEAD_Container', null, []);
 
         $this->container->retrieve();
         self::assertNotEmpty($this->container->metadata);
@@ -49,7 +49,7 @@ public function test_Retrieve()
 
     public function test_Get_Metadata()
     {
-        $this->setupMock('HEAD', self::NAME, null, [], 'HEAD_Container');
+        $this->mockRequest('HEAD', self::NAME, 'HEAD_Container', null, []);
 
         self::assertEquals(['Book' => 'TomSawyer', 'Author' => 'SamuelClemens'], $this->container->getMetadata());
     }
@@ -58,21 +58,21 @@ public function test_Merge_Metadata()
     {
         $headers = ['X-Container-Meta-Subject' => 'AmericanLiterature'];
 
-        $this->setupMock('POST', self::NAME, [], $headers, 'NoContent');
+        $this->mockRequest('POST', self::NAME, 'NoContent', [], $headers);
 
         $this->container->mergeMetadata(['Subject' => 'AmericanLiterature']);
     }
 
     public function test_Reset_Metadata()
     {
-        $this->setupMock('HEAD', self::NAME, null, [], 'HEAD_Container');
+        $this->mockRequest('HEAD', self::NAME, 'HEAD_Container', null, []);
 
         $headers = [
             'X-Container-Meta-Book'          => 'Middlesex',
             'X-Remove-Container-Meta-Author' => 'True',
         ];
 
-        $this->setupMock('POST', self::NAME, [], $headers, 'NoContent');
+        $this->mockRequest('POST', self::NAME, 'NoContent', [], $headers);
 
         $this->container->resetMetadata([
             'Book' => 'Middlesex',
@@ -81,13 +81,13 @@ public function test_Reset_Metadata()
 
     public function test_It_Creates()
     {
-        $this->setupMock('PUT', self::NAME, null, [], 'Created');
+        $this->mockRequest('PUT', self::NAME, 'Created', null, []);
         $this->container->create(['name' => self::NAME]);
     }
 
     public function test_It_Deletes()
     {
-        $this->setupMock('DELETE', self::NAME, null, [], 'NoContent');
+        $this->mockRequest('DELETE', self::NAME, 'NoContent', null, []);
         $this->container->delete();
     }
 
@@ -114,7 +114,7 @@ public function test_It_Create_Objects()
 
         $content = json_encode(['foo' => 'bar']);
 
-        $this->setupMock('PUT', self::NAME . '/' . $objectName, $content, $headers, 'Created');
+        $this->mockRequest('PUT', self::NAME . '/' . $objectName, 'Created', $content, $headers);
 
         /** @var StorageObject $storageObject */
         $storageObject = $this->container->createObject([
@@ -133,10 +133,7 @@ public function test_It_Create_Objects()
 
     public function test_it_lists_objects()
     {
-        $this->client
-            ->request('GET', 'test', ['query' => ['limit' => 2, 'format' => 'json'], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_Container'));
+        $this->mockRequest('GET', ['path' => 'test', 'query' => ['limit' => 2, 'format' => 'json']], 'GET_Container');
 
         $objects = iterator_to_array($this->container->listObjects(['limit' => 2]));
 
@@ -174,7 +171,7 @@ public function test_it_lists_objects()
 
     public function test_true_is_returned_for_existing_object()
     {
-        $this->setupMock('HEAD', 'test/bar', null, [], new Response(200));
+        $this->mockRequest('HEAD', 'test/bar', new Response(200), null, []);
 
         self::assertTrue($this->container->objectExists('bar'));
     }
@@ -185,10 +182,7 @@ public function test_false_is_returned_for_non_existing_object()
         $e->setRequest(new Request('HEAD', 'test/bar'));
         $e->setResponse(new Response(404));
 
-        $this->client
-            ->request('HEAD', 'test/bar', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow($e);
+        $this->mockRequest('HEAD', 'test/bar', $e);
 
         self::assertFalse($this->container->objectExists('bar'));
     }
@@ -199,10 +193,7 @@ public function test_other_exceptions_are_thrown()
         $e->setRequest(new Request('HEAD', 'test/bar'));
         $e->setResponse(new Response(500));
 
-        $this->client
-            ->request('HEAD', 'test/bar', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow($e);
+        $this->mockRequest('HEAD', 'test/bar', $e);
 		$this->expectException(BadResponseError::class);
 
         $this->container->objectExists('bar');
@@ -236,18 +227,15 @@ public function test_it_chunks_according_to_provided_segment_size()
         $e->setRequest(new Request('HEAD', 'segments'));
         $e->setResponse(new Response(404));
 
-        $this->client
-            ->request('HEAD', 'segments', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow($e);
+        $this->mockRequest('HEAD', 'segments', $e);
 
-        $this->setupMock('PUT', 'segments', null, [], new Response(201));
+        $this->mockRequest('PUT', 'segments', new Response(201), null, []);
 
         // The stream has size 24 so we expect three segments.
-        $this->setupMock('PUT', 'segments/objectPrefix/001', $stream->read(10), [], new Response(201));
-        $this->setupMock('PUT', 'segments/objectPrefix/002', $stream->read(10), [], new Response(201));
-        $this->setupMock('PUT', 'segments/objectPrefix/003', $stream->read(10), [], new Response(201));
-        $this->setupMock('PUT', 'test/object', null, ['X-Object-Manifest' => 'segments/objectPrefix'], new Response(201));
+        $this->mockRequest('PUT', 'segments/objectPrefix/001', new Response(201), $stream->read(10), []);
+        $this->mockRequest('PUT', 'segments/objectPrefix/002', new Response(201), $stream->read(10), []);
+        $this->mockRequest('PUT', 'segments/objectPrefix/003', new Response(201), $stream->read(10), []);
+        $this->mockRequest('PUT', 'test/object', new Response(201), null, ['X-Object-Manifest' => 'segments/objectPrefix']);
 
         $stream->rewind();
 
diff --git a/tests/unit/ObjectStore/v1/Models/ObjectTest.php b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
index 56eca319..57f1e795 100644
--- a/tests/unit/ObjectStore/v1/Models/ObjectTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
@@ -41,7 +41,7 @@ public function test_It_Creates()
 
         $content = json_encode(['foo' => 'bar']);
 
-        $this->setupMock('PUT', self::CONTAINER . '/' . $objectName, $content, $headers, 'Created');
+        $this->mockRequest('PUT', self::CONTAINER . '/' . $objectName, 'Created', $content, $headers);
 
         $this->object->create([
             'name'               => $objectName,
@@ -56,7 +56,7 @@ public function test_It_Creates()
 
     public function test_Retrieve()
     {
-        $this->setupMock('HEAD', self::CONTAINER . '/' . self::NAME, null, [], 'HEAD_Object');
+        $this->mockRequest('HEAD', self::CONTAINER . '/' . self::NAME, 'HEAD_Object', null, []);
 
         $this->object->retrieve();
         self::assertNotEmpty($this->object->metadata);
@@ -64,7 +64,7 @@ public function test_Retrieve()
 
     public function test_Get_Metadata()
     {
-        $this->setupMock('HEAD', self::CONTAINER . '/' . self::NAME, null, [], 'HEAD_Object');
+        $this->mockRequest('HEAD', self::CONTAINER . '/' . self::NAME, 'HEAD_Object', null, []);
 
         self::assertEquals([
             'Book'         => 'GoodbyeColumbus',
@@ -74,7 +74,7 @@ public function test_Get_Metadata()
 
     public function test_Merge_Metadata()
     {
-        $this->setupMock('HEAD', self::CONTAINER . '/' . self::NAME, null, [], 'HEAD_Object');
+        $this->mockRequest('HEAD', self::CONTAINER . '/' . self::NAME, 'HEAD_Object', null, []);
 
         $headers = [
             'X-Object-Meta-Author'       => 'foo',
@@ -82,7 +82,7 @@ public function test_Merge_Metadata()
             'X-Object-Meta-Manufacturer' => 'Acme',
         ];
 
-        $this->setupMock('POST', self::CONTAINER . '/' . self::NAME, null, $headers, 'NoContent');
+        $this->mockRequest('POST', self::CONTAINER . '/' . self::NAME, 'NoContent', null, $headers);
 
         $this->object->mergeMetadata(['Author' => 'foo']);
     }
@@ -91,20 +91,20 @@ public function test_Reset_Metadata()
     {
         $headers = ['X-Object-Meta-Bar' => 'Foo'];
 
-        $this->setupMock('POST', self::CONTAINER . '/' . self::NAME, null, $headers, 'NoContent');
+        $this->mockRequest('POST', self::CONTAINER . '/' . self::NAME, 'NoContent', null, $headers);
 
         $this->object->resetMetadata(['Bar' => 'Foo']);
     }
 
     public function test_It_Deletes()
     {
-        $this->setupMock('DELETE', self::CONTAINER . '/' . self::NAME, null, [], 'NoContent');
+        $this->mockRequest('DELETE', self::CONTAINER . '/' . self::NAME, 'NoContent', null, []);
         $this->object->delete();
     }
 
     public function test_It_Downloads()
     {
-        $this->setupMock('GET', self::CONTAINER . '/' . self::NAME, null, [], 'GET_Object');
+        $this->mockRequest('GET', self::CONTAINER . '/' . self::NAME, 'GET_Object', null, []);
 
         $stream = $this->object->download();
 
@@ -117,7 +117,7 @@ public function test_It_Copies()
         $path = self::CONTAINER . '/' . self::NAME;
         $headers = ['Destination' => 'foo/bar'];
 
-        $this->setupMock('COPY', $path, null, $headers, 'Created');
+        $this->mockRequest('COPY', $path, 'Created', null, $headers);
 
         $this->object->copy([
             'destination' => $headers['Destination']
diff --git a/tests/unit/ObjectStore/v1/ServiceTest.php b/tests/unit/ObjectStore/v1/ServiceTest.php
index 901e10d2..c414116c 100644
--- a/tests/unit/ObjectStore/v1/ServiceTest.php
+++ b/tests/unit/ObjectStore/v1/ServiceTest.php
@@ -31,10 +31,7 @@ public function test_Account()
 
     public function test_it_lists_containers()
     {
-        $this->client
-            ->request('GET', '', ['query' => ['limit' => 2, 'format' => 'json'], 'headers' => []])
-            ->shouldBeCalled()
-            ->willReturn($this->getFixture('GET_Container'));
+        $this->mockRequest('GET', ['query' => ['limit' => 2, 'format' => 'json']], 'GET_Container');
 
         foreach ($this->service->listContainers(['limit' => 2]) as $container) {
             self::assertInstanceOf(Container::class, $container);
@@ -43,13 +40,13 @@ public function test_it_lists_containers()
 
     public function test_It_Create_Containers()
     {
-        $this->setupMock('PUT', 'foo', null, [], 'Created');
+        $this->mockRequest('PUT', 'foo', 'Created', null, []);
         $this->service->createContainer(['name' => 'foo']);
     }
 
     public function test_it_returns_true_for_existing_containers()
     {
-        $this->setupMock('HEAD', 'foo', null, [], new Response(200));
+        $this->mockRequest('HEAD', 'foo', new Response(200), null, []);
 
         self::assertTrue($this->service->containerExists('foo'));
     }
@@ -60,10 +57,7 @@ public function test_it_returns_false_if_container_does_not_exist()
         $e->setRequest(new Request('HEAD', 'foo'));
         $e->setResponse(new Response(404));
 
-        $this->client
-            ->request('HEAD', 'foo', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow($e);
+        $this->mockRequest('HEAD', 'foo', $e);
 
         self::assertFalse($this->service->containerExists('foo'));
     }
@@ -74,10 +68,8 @@ public function test_it_throws_exception_when_error()
         $e->setRequest(new Request('HEAD', 'foo'));
         $e->setResponse(new Response(500));
 
-        $this->client
-            ->request('HEAD', 'foo', ['headers' => []])
-            ->shouldBeCalled()
-            ->willThrow($e);
+        $this->mockRequest('HEAD', 'foo', $e);
+
 		$this->expectException(BadResponseError::class);
 
         $this->service->containerExists('foo');
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
index d1752fe1..5c22e885 100644
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
@@ -6,10 +6,11 @@
 use GuzzleHttp\Psr7\Message;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Utils;
+use Prophecy\Prophecy\MethodProphecy;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Prophecy\Prophecy\ObjectProphecy */
+    /** @var \Prophecy\Prophecy\ObjectProphecy<\GuzzleHttp\ClientInterface> */
     protected $client;
 
     /** @var string */
@@ -42,7 +43,18 @@ protected function getFixture($file)
         return Message::parseResponse(file_get_contents($path));
     }
 
-    protected function setupMock($method, $path, $body = null, array $headers = [], $response = null)
+    /**
+     * Mocks request
+     *
+     * @param string $method method of request: GET, POST, PUT, DELETE
+     * @param string|array $uri request path or array with path and query
+     * @param string|\GuzzleHttp\Psr7\Response|\Throwable $response the file name of the response fixture or a Response object
+     * @param string|array|null $body request body. If type is array, it will be encoded as JSON.
+     * @param array $headers request headers
+     *
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     */
+    protected function mockRequest(string $method, $uri, $response = null, $body = null, array $headers = []): MethodProphecy
     {
         $options = ['headers' => $headers];
 
@@ -50,14 +62,30 @@ protected function setupMock($method, $path, $body = null, array $headers = [],
             $options[is_array($body) ? 'json' : 'body'] = $body;
         }
 
+
+        if (is_string($uri)) {
+            $uri = ['path' => $uri];
+        }
+
+        if (isset($uri['query'])) {
+            $options['query'] = $uri['query'];
+        }
+
+        $method = $this->client
+            ->request($method, $uri['path'] ?? '', $options)
+            ->shouldBeCalled();
+
         if (is_string($response)) {
-            $response = $this->getFixture($response);
+            $method = $method->willReturn($this->getFixture($response));
+        } elseif ($response instanceof Response) {
+            $method = $method->willReturn($response);
+        } elseif ($response instanceof \Throwable) {
+            $method = $method->willThrow($response);
+        } else {
+            throw new \InvalidArgumentException('Response must be either a string, a Response object or an instance of Throwable');
         }
 
-        $this->client
-            ->request($method, $path, $options)
-            ->shouldBeCalled()
-            ->willReturn($response);
+        return $method;
     }
 
     protected function createFn($receiver, $method, $args)
@@ -72,7 +100,7 @@ protected function listTest(callable $call, $urlPath, $modelName = null, $respon
         $modelName = $modelName ?: $urlPath;
         $responseFile = $responseFile ?: $urlPath;
 
-        $this->setupMock('GET', $urlPath, null, [], $responseFile);
+        $this->mockRequest('GET', $urlPath, $responseFile, null, []);
 
         $resources = call_user_func($call);
 

From c32ab233d7e326d8118948b05d99b6119ef3a9d1 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Thu, 1 Feb 2024 15:35:51 +0100
Subject: [PATCH 078/102] Fix Swift container requests with "tokens" in its
 name (#396)

---
 src/Common/Api/Operation.php                  | 16 ++++++++--
 src/Common/Api/OperatorTrait.php              | 11 +++----
 src/Common/Auth/AuthHandler.php               |  7 ++++-
 src/Common/Service/Builder.php                |  6 ++--
 src/Identity/v2/Api.php                       | 13 ++++----
 src/Identity/v3/Api.php                       |  7 +++--
 src/Identity/v3/Models/Token.php              | 22 ++++++-------
 tests/sample/Compute/v2/TestCase.php          |  3 +-
 tests/sample/ObjectStore/v1/ContainerTest.php |  9 ++++++
 tests/unit/Common/Api/OperatorTraitTest.php   | 31 ++++++++++---------
 tests/unit/Common/Auth/AuthHandlerTest.php    |  8 +++++
 tests/unit/Identity/v2/ServiceTest.php        |  4 +--
 tests/unit/Identity/v3/ServiceTest.php        |  8 ++---
 tests/unit/TestCase.php                       |  9 ++++--
 14 files changed, 98 insertions(+), 56 deletions(-)

diff --git a/src/Common/Api/Operation.php b/src/Common/Api/Operation.php
index d42cb090..25c6eb44 100644
--- a/src/Common/Api/Operation.php
+++ b/src/Common/Api/Operation.php
@@ -27,6 +27,9 @@ class Operation
     /** @var []Parameter The parameters of this operation */
     private $params;
 
+    /** @var bool Whether this operation should skip authentication */
+    private $skipAuth;
+
     /**
      * @param array $definition The data definition (in array form) that will populate this
      *                          operation. Usually this is retrieved from an {@see ApiInterface}
@@ -41,7 +44,8 @@ public function __construct(array $definition)
             $this->jsonKey = $definition['jsonKey'];
         }
 
-        $this->params = self::toParamArray($definition['params']);
+        $this->params   = self::toParamArray($definition['params']);
+        $this->skipAuth = $definition['skipAuth'] ?? false;
     }
 
     public function getPath(): string
@@ -54,10 +58,18 @@ public function getMethod(): string
         return $this->method;
     }
 
+    /**
+     * Indicates if operation must be run without authentication. This is useful for getting authentication tokens.
+     */
+    public function getSkipAuth(): bool
+    {
+        return $this->skipAuth;
+    }
+
     /**
      * Indicates whether this operation supports a parameter.
      *
-     * @param $key The name of a parameter
+     * @param string $key The name of a parameter
      */
     public function hasParam(string $key): bool
     {
diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index 7eed4e1b..710bd8ad 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -55,8 +55,8 @@ public function __debugInfo()
      * {@see Promise} object. In order for this to happen, the called methods need to be in the
      * following format: `createAsync`, where `create` is the sequential method being wrapped.
      *
-     * @param $methodName the name of the method being invoked
-     * @param $args       the arguments to be passed to the sequential method
+     * @param string $methodName the name of the method being invoked
+     * @param array  $args       the arguments to be passed to the sequential method
      *
      * @return Promise
      *
@@ -92,9 +92,6 @@ public function getOperation(array $definition): Operation
         return new Operation($definition);
     }
 
-    /**
-     * @throws \Exception
-     */
     protected function sendRequest(Operation $operation, array $userValues = [], bool $async = false)
     {
         $operation->validate($userValues);
@@ -102,12 +99,14 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
         $options = (new RequestSerializer())->serializeOptions($operation, $userValues);
         $method  = $async ? 'requestAsync' : 'request';
 
-        $uri     = Utils::uri_template($operation->getPath(), $userValues);
+        $uri = Utils::uri_template($operation->getPath(), $userValues);
 
         if (array_key_exists('requestOptions', $userValues)) {
             $options += $userValues['requestOptions'];
         }
 
+        $options['openstack.skip_auth'] = $operation->getSkipAuth();
+
         return $this->client->$method($operation->getMethod(), $uri, $options);
     }
 
diff --git a/src/Common/Auth/AuthHandler.php b/src/Common/Auth/AuthHandler.php
index de396cc0..71a58721 100644
--- a/src/Common/Auth/AuthHandler.php
+++ b/src/Common/Auth/AuthHandler.php
@@ -43,7 +43,12 @@ public function __invoke(RequestInterface $request, array $options)
     {
         $fn = $this->nextHandler;
 
-        if ($this->shouldIgnore($request)) {
+        if (!isset($options['openstack.skip_auth'])) {
+            // Deprecated. Left for backward compatibility only.
+            if ($this->shouldIgnore($request)) {
+                return $fn($request, $options);
+            }
+        } elseif ($options['openstack.skip_auth']) {
             return $fn($request, $options);
         }
 
diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index 55fb92bf..e9cb2559 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -83,7 +83,7 @@ public function createService(string $namespace, array $serviceOptions = []): Se
         return new $serviceClass($options['httpClient'], new $apiClass());
     }
 
-    private function stockHttpClient(array &$options, string $serviceName)
+    private function stockHttpClient(array &$options, string $serviceName): void
     {
         if (!isset($options['httpClient']) || !($options['httpClient'] instanceof ClientInterface)) {
             if (false !== stripos($serviceName, 'identity')) {
@@ -105,7 +105,7 @@ private function stockHttpClient(array &$options, string $serviceName)
     /**
      * @codeCoverageIgnore
      */
-    private function addDebugMiddleware(array $options, HandlerStack &$stack)
+    private function addDebugMiddleware(array $options, HandlerStack &$stack): void
     {
         if (!empty($options['debugLog'])
             && !empty($options['logger'])
@@ -118,7 +118,7 @@ private function addDebugMiddleware(array $options, HandlerStack &$stack)
     /**
      * @codeCoverageIgnore
      */
-    private function stockAuthHandler(array &$options)
+    private function stockAuthHandler(array &$options): void
     {
         if (!isset($options['authHandler'])) {
             $options['authHandler'] = function () use ($options) {
diff --git a/src/Identity/v2/Api.php b/src/Identity/v2/Api.php
index 5024b359..f22c970d 100644
--- a/src/Identity/v2/Api.php
+++ b/src/Identity/v2/Api.php
@@ -14,20 +14,21 @@ class Api implements ApiInterface
     public function postToken(): array
     {
         return [
-            'method' => 'POST',
-            'path'   => 'tokens',
-            'params' => [
-                'username' => [
+            'method'   => 'POST',
+            'path'     => 'tokens',
+            'skipAuth' => true,
+            'params'   => [
+                'username'   => [
                     'type'     => 'string',
                     'required' => true,
                     'path'     => 'auth.passwordCredentials',
                 ],
-                'password' => [
+                'password'   => [
                     'type'     => 'string',
                     'required' => true,
                     'path'     => 'auth.passwordCredentials',
                 ],
-                'tenantId' => [
+                'tenantId'   => [
                     'type' => 'string',
                     'path' => 'auth',
                 ],
diff --git a/src/Identity/v3/Api.php b/src/Identity/v3/Api.php
index 8f07da58..418684c9 100644
--- a/src/Identity/v3/Api.php
+++ b/src/Identity/v3/Api.php
@@ -16,9 +16,10 @@ public function __construct()
     public function postTokens(): array
     {
         return [
-            'method' => 'POST',
-            'path'   => 'auth/tokens',
-            'params' => [
+            'method'   => 'POST',
+            'path'     => 'auth/tokens',
+            'skipAuth' => true,
+            'params'   => [
                 'methods'                => $this->params->methods(),
                 'user'                   => $this->params->user(),
                 'application_credential' => $this->params->applicationCredential(),
diff --git a/src/Identity/v3/Models/Token.php b/src/Identity/v3/Models/Token.php
index 7a7c23f2..d4054d7c 100644
--- a/src/Identity/v3/Models/Token.php
+++ b/src/Identity/v3/Models/Token.php
@@ -89,27 +89,27 @@ public function retrieve()
     }
 
     /**
-     * @param array $data {@see \OpenStack\Identity\v3\Api::postTokens}
+     * @param array $userOptions {@see \OpenStack\Identity\v3\Api::postTokens}
      */
-    public function create(array $data): Creatable
+    public function create(array $userOptions): Creatable
     {
-        if (isset($data['user'])) {
-            $data['methods'] = ['password'];
-            if (!isset($data['user']['id']) && empty($data['user']['domain'])) {
+        if (isset($userOptions['user'])) {
+            $userOptions['methods'] = ['password'];
+            if (!isset($userOptions['user']['id']) && empty($userOptions['user']['domain'])) {
                 throw new InvalidArgumentException('When authenticating with a username, you must also provide either the domain name '.'or domain ID to which the user belongs to. Alternatively, if you provide a user ID instead, '.'you do not need to provide domain information.');
             }
-        } elseif (isset($data['application_credential'])) {
-            $data['methods'] = ['application_credential'];
-            if (!isset($data['application_credential']['id']) || !isset($data['application_credential']['secret'])) {
+        } elseif (isset($userOptions['application_credential'])) {
+            $userOptions['methods'] = ['application_credential'];
+            if (!isset($userOptions['application_credential']['id']) || !isset($userOptions['application_credential']['secret'])) {
                 throw new InvalidArgumentException('When authenticating with a application_credential, you must provide application credential ID '.' and application credential secret.');
             }
-        } elseif (isset($data['tokenId'])) {
-            $data['methods'] = ['token'];
+        } elseif (isset($userOptions['tokenId'])) {
+            $userOptions['methods'] = ['token'];
         } else {
             throw new InvalidArgumentException('Either a user, tokenId or application_credential must be provided.');
         }
 
-        $response = $this->execute($this->api->postTokens(), $data);
+        $response = $this->execute($this->api->postTokens(), $userOptions);
         $token    = $this->populateFromResponse($response);
 
         // Cache response as an array to export if needed.
diff --git a/tests/sample/Compute/v2/TestCase.php b/tests/sample/Compute/v2/TestCase.php
index b24e6231..ee57ecaa 100644
--- a/tests/sample/Compute/v2/TestCase.php
+++ b/tests/sample/Compute/v2/TestCase.php
@@ -68,7 +68,8 @@ protected function createServer(): Server
             ]
         );
 
-        $server->waitUntilActive(60);
+        $server->waitUntilActive(120);
+        $this->assertEquals('ACTIVE', $server->status);
 
         return $server;
     }
diff --git a/tests/sample/ObjectStore/v1/ContainerTest.php b/tests/sample/ObjectStore/v1/ContainerTest.php
index a24999db..af5dee37 100644
--- a/tests/sample/ObjectStore/v1/ContainerTest.php
+++ b/tests/sample/ObjectStore/v1/ContainerTest.php
@@ -132,4 +132,13 @@ public function testDelete(Container $createdContainer)
         $this->expectException(BadResponseError::class);
         $createdContainer->retrieve();
     }
+
+    public function testTokensContainer()
+    {
+        $container = $this->getService()->createContainer(['name' => $this->randomStr() . '_tokens']);
+        $this->assertNotNull($container->name);
+
+        // this would send POST request with 'tokens' in the URL
+        $container->resetMetadata([]);
+    }
 }
\ No newline at end of file
diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
index 3af97ac0..c269b5b1 100644
--- a/tests/unit/Common/Api/OperatorTraitTest.php
+++ b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -38,26 +38,25 @@ public function test_it_returns_operations()
     {
         self::assertInstanceOf(
             Operation::class,
-            $this->operator->getOperation($this->def, [])
+            $this->operator->getOperation($this->def)
         );
     }
 
     public function test_it_sends_a_request_when_operations_are_executed()
     {
-        $this->client->request('GET', 'test', ['headers' => []])->willReturn(new Response());
+        $this->mockRequest('GET', 'test', new Response());
 
-        $this->operator->execute($this->def, []);
-
-        $this->addToAssertionCount(1);
+        $this->operator->execute($this->def);
     }
 
     public function test_it_sends_a_request_when_async_operations_are_executed()
     {
-        $this->client->requestAsync('GET', 'test', ['headers' => []])->willReturn(new Promise());
-
-        $this->operator->executeAsync($this->def, []);
+        $this->client
+            ->requestAsync('GET', 'test', ['headers' => [], 'openstack.skip_auth' => false])
+            ->shouldBeCalled()
+            ->willReturn(new Promise());
 
-        $this->addToAssertionCount(1);
+        $this->operator->executeAsync($this->def);
     }
 
     public function test_it_wraps_sequential_ops_in_promise_when_async_is_appended_to_method_name()
@@ -75,13 +74,13 @@ public function test_it_wraps_sequential_ops_in_promise_when_async_is_appended_t
 
     public function test_it_throws_exception_when_async_is_called_on_a_non_existent_method()
     {
-		$this->expectException(\RuntimeException::class);
+        $this->expectException(\RuntimeException::class);
         $this->operator->fooAsync();
     }
 
     public function test_undefined_methods_result_in_error()
     {
-		$this->expectException(\Exception::class);
+        $this->expectException(\Exception::class);
         $this->operator->foo();
     }
 
@@ -103,16 +102,18 @@ public function test_it_populates_models_from_arrays()
 
     public function test_guzzle_options_are_forwarded()
     {
-        $this->client->request('GET', 'test', ['headers' => [], 'stream' => true])->willReturn(new Response());
+        $this->client
+            ->request('GET', 'test', ['headers' => [], 'openstack.skip_auth' => false, 'stream' => true])
+            ->shouldBeCalled()
+            ->willReturn(new Response());
 
         $this->operator->execute($this->def, [
-            'requestOptions' => ['stream' => true]
+            'requestOptions' => ['stream' => true],
         ]);
-
-        $this->addToAssertionCount(1);
     }
 }
 
+
 class TestResource extends AbstractResource
 {
 }
diff --git a/tests/unit/Common/Auth/AuthHandlerTest.php b/tests/unit/Common/Auth/AuthHandlerTest.php
index 6a535489..d7301899 100644
--- a/tests/unit/Common/Auth/AuthHandlerTest.php
+++ b/tests/unit/Common/Auth/AuthHandlerTest.php
@@ -35,6 +35,14 @@ public function test_it_should_bypass_auth_http_requests()
         // Fake a Keystone request
         $request = new Request('POST', 'https://my-openstack.org:5000/v2.0/tokens');
 
+        self::assertEquals($request, call_user_func_array($this->handler, [$request, ['openstack.skip_auth' => true]]));
+    }
+
+    public function test_it_should_bypass_auth_http_requests_backward_compatibility()
+    {
+        // Fake a Keystone request
+        $request = new Request('POST', 'https://my-openstack.org:5000/v2.0/tokens');
+
         self::assertEquals($request, call_user_func_array($this->handler, [$request, []]));
     }
 
diff --git a/tests/unit/Identity/v2/ServiceTest.php b/tests/unit/Identity/v2/ServiceTest.php
index a72186ba..5da016fa 100644
--- a/tests/unit/Identity/v2/ServiceTest.php
+++ b/tests/unit/Identity/v2/ServiceTest.php
@@ -40,7 +40,7 @@ public function test_it_authenticates()
             'tenantId' => $options['tenantId'],
         ]];
 
-        $this->mockRequest('POST', 'tokens', 'token-post', $expectedJson, []);
+        $this->mockRequest('POST', 'tokens', 'token-post', $expectedJson, [], true);
 
         [$token, $baseUrl] = $this->service->authenticate($options);
 
@@ -64,7 +64,7 @@ public function test_it_generates_tokens()
             'tenantId' => $options['tenantId'],
         ]];
 
-        $this->mockRequest('POST', 'tokens', 'token-post', $expectedJson, []);
+        $this->mockRequest('POST', 'tokens', 'token-post', $expectedJson, [], true);
 
         self::assertInstanceOf(Token::class, $this->service->generateToken($options));
     }
diff --git a/tests/unit/Identity/v3/ServiceTest.php b/tests/unit/Identity/v3/ServiceTest.php
index c35636f2..0719838f 100644
--- a/tests/unit/Identity/v3/ServiceTest.php
+++ b/tests/unit/Identity/v3/ServiceTest.php
@@ -58,7 +58,7 @@ public function test_it_authenticates()
             ]
         ];
 
-        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson], [], true);
 
         [$token, $url] = $this->service->authenticate($userOptions);
 
@@ -231,7 +231,7 @@ public function test_it_throws_exception_if_no_endpoint_found()
             ]
         ];
 
-        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson], [], true);
 		$this->expectException(\RuntimeException::class);
 
         $this->service->authenticate([
@@ -626,7 +626,7 @@ public function test_it_generates_tokens_with_user_creds()
             ]
         ];
 
-        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson], [], true);
 
         $token = $this->service->generateToken($userOptions);
         self::assertInstanceOf(Models\Token::class, $token);
@@ -651,7 +651,7 @@ public function test_it_generates_token_with_token_id()
             ]
         ];
 
-        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson]);
+        $this->mockRequest('POST', 'auth/tokens', 'token', ['auth' => $expectedJson], [], true);
 
         $token = $this->service->generateToken($userOptions);
         self::assertInstanceOf(Models\Token::class, $token);
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
index 5c22e885..09485651 100644
--- a/tests/unit/TestCase.php
+++ b/tests/unit/TestCase.php
@@ -43,6 +43,7 @@ protected function getFixture($file)
         return Message::parseResponse(file_get_contents($path));
     }
 
+
     /**
      * Mocks request
      *
@@ -51,12 +52,16 @@ protected function getFixture($file)
      * @param string|\GuzzleHttp\Psr7\Response|\Throwable $response the file name of the response fixture or a Response object
      * @param string|array|null $body request body. If type is array, it will be encoded as JSON.
      * @param array $headers request headers
+     * @param bool $skipAuth true if the api call skips authentication
      *
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    protected function mockRequest(string $method, $uri, $response = null, $body = null, array $headers = []): MethodProphecy
+    protected function mockRequest(string $method, $uri, $response = null, $body = null, array $headers = [], $skipAuth = false): MethodProphecy
     {
-        $options = ['headers' => $headers];
+        $options = [
+            'headers'             => $headers,
+            'openstack.skip_auth' => $skipAuth,
+        ];
 
         if (!empty($body)) {
             $options[is_array($body) ? 'json' : 'body'] = $body;

From d823be3079c4772b2ddf16ff2d013f285113eb59 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Mon, 5 Feb 2024 10:29:20 +0100
Subject: [PATCH 079/102] add errorVerbosity (#400)

fixes #335
fixes #398
---
 doc/setup.rst                                | 32 ++++++++++++-----
 src/Common/Auth/IdentityService.php          |  2 +-
 src/Common/Error/Builder.php                 | 35 +++++++++++-------
 src/Common/Service/Builder.php               | 32 ++---------------
 src/Common/Transport/HandlerStack.php        |  3 ++
 src/Common/Transport/HandlerStackFactory.php | 38 ++++++++++++++++++++
 src/Common/Transport/Middleware.php          | 10 +++---
 src/Identity/v3/Service.php                  |  2 +-
 src/OpenStack.php                            | 14 +++-----
 tests/sample/Compute/v2/TestCase.php         |  2 +-
 tests/sample/Identity/v3/TokenTest.php       | 36 +++++++++++++++++++
 tests/unit/Common/Error/BuilderTest.php      | 23 +++++++++---
 tests/unit/Identity/v3/ServiceTest.php       |  1 -
 13 files changed, 158 insertions(+), 72 deletions(-)

diff --git a/doc/setup.rst b/doc/setup.rst
index 96fa2957..503a0c74 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -13,31 +13,47 @@ Only the ``authUrl`` is mandatory to create the client. But you will have to pro
 credentials to each service you create. So it is recommended to provide them when creating the client which
 would propagate these options to each service.
 
+Authenticate
+------------
+
 There are different ways to provide the authentication credentials. See the :doc:`services/identity/v3/tokens`
 section for the full list of options. You should provide credentials to the ``OpenStack`` constructor as an array
 the same way you provide options to ``generateToken`` method of the ``Identity`` service.
 
-Authenticate with username
---------------------------
+By username
+~~~~~~~~~~~
 
 The most common way to authenticate is using the username and password of the user. You should also provide the Domain ID
 as usernames will not be unique across an entire OpenStack installation
 
 .. sample:: Setup/username.php
 
-Authenticate with user ID
--------------------------
+By user ID
+~~~~~~~~~~
 
 .. sample:: Setup/user_id.php
 
-Authenticate application credential ID
---------------------------------------
+By application credential ID
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. sample:: Setup/application_credential_id.php
 
-Authenticate using token ID
----------------------------
+By token ID
+~~~~~~~~~~~
 
 If you already have a valid token, you can use it to authenticate.
 
 .. sample:: Setup/token_id.php
+
+Other options
+-------------
+
+For production environments it is recommended to decrease error reporting not to expose sensitive information. It can be done
+by setting the ``errorVerbosity`` key to ``0`` in the options array. It is set to 2 by default.
+
+.. code-block:: php
+
+    $openstack = new OpenStack\OpenStack([
+        'errorVerbosity' => 0,
+        // other options
+    ]);
\ No newline at end of file
diff --git a/src/Common/Auth/IdentityService.php b/src/Common/Auth/IdentityService.php
index 949b1103..c9f86849 100644
--- a/src/Common/Auth/IdentityService.php
+++ b/src/Common/Auth/IdentityService.php
@@ -9,7 +9,7 @@ interface IdentityService
     /**
      * Authenticates and retrieves back a token and catalog.
      *
-     * @return array The FIRST key is {@see Token} instance, the SECOND key is a {@see Catalog} instance
+     * @return array{0: \OpenStack\Common\Auth\Token, 1: string} The FIRST key is {@see Token} instance, the SECOND key is a URL of the service
      */
     public function authenticate(array $options): array;
 }
diff --git a/src/Common/Error/Builder.php b/src/Common/Error/Builder.php
index 796415a2..7de83710 100644
--- a/src/Common/Error/Builder.php
+++ b/src/Common/Error/Builder.php
@@ -66,30 +66,41 @@ private function linkIsValid(string $link): bool
     /**
      * @codeCoverageIgnore
      */
-    public function str(MessageInterface $message): string
+    public function str(MessageInterface $message, int $verbosity = 0): string
     {
         if ($message instanceof RequestInterface) {
-            $msg = trim($message->getMethod().' '
-                    .$message->getRequestTarget())
-                .' HTTP/'.$message->getProtocolVersion();
+            $msg = trim($message->getMethod().' '.$message->getRequestTarget());
+            $msg .= ' HTTP/'.$message->getProtocolVersion();
             if (!$message->hasHeader('host')) {
                 $msg .= "\r\nHost: ".$message->getUri()->getHost();
             }
-        } elseif ($message instanceof ResponseInterface) {
-            $msg = 'HTTP/'.$message->getProtocolVersion().' '
-                .$message->getStatusCode().' '
-                .$message->getReasonPhrase();
+        } else {
+            if ($message instanceof ResponseInterface) {
+                $msg = 'HTTP/'.$message->getProtocolVersion().' '
+                    .$message->getStatusCode().' '
+                    .$message->getReasonPhrase();
+            } else {
+                throw new \InvalidArgumentException('Unknown message type');
+            }
+        }
+
+        if ($verbosity < 1) {
+            return $msg;
         }
 
         foreach ($message->getHeaders() as $name => $values) {
             $msg .= "\r\n{$name}: ".implode(', ', $values);
         }
 
+        if ($verbosity < 2) {
+            return $msg;
+        }
+
         if (ini_get('memory_limit') < 0 || $message->getBody()->getSize() < ini_get('memory_limit')) {
             $msg .= "\r\n\r\n".$message->getBody();
         }
 
-        return $msg;
+        return trim($msg);
     }
 
     /**
@@ -98,7 +109,7 @@ public function str(MessageInterface $message): string
      * @param RequestInterface  $request  The faulty request
      * @param ResponseInterface $response The error-filled response
      */
-    public function httpError(RequestInterface $request, ResponseInterface $response): BadResponseError
+    public function httpError(RequestInterface $request, ResponseInterface $response, int $verbosity = 0): BadResponseError
     {
         $message = $this->header('HTTP Error');
 
@@ -109,10 +120,10 @@ public function httpError(RequestInterface $request, ResponseInterface $response
         );
 
         $message .= $this->header('Request');
-        $message .= trim($this->str($request)).PHP_EOL.PHP_EOL;
+        $message .= $this->str($request, $verbosity).PHP_EOL.PHP_EOL;
 
         $message .= $this->header('Response');
-        $message .= trim($this->str($response)).PHP_EOL.PHP_EOL;
+        $message .= $this->str($response, $verbosity).PHP_EOL.PHP_EOL;
 
         $message .= $this->header('Further information');
         $message .= $this->getStatusCodeMessage($response->getStatusCode());
diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index e9cb2559..f63eefc1 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -7,11 +7,8 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Middleware as GuzzleMiddleware;
 use OpenStack\Common\Auth\IdentityService;
-use OpenStack\Common\Auth\Token;
 use OpenStack\Common\Transport\HandlerStackFactory;
-use OpenStack\Common\Transport\Middleware;
 use OpenStack\Common\Transport\Utils;
 
 /**
@@ -88,33 +85,18 @@ private function stockHttpClient(array &$options, string $serviceName): void
         if (!isset($options['httpClient']) || !($options['httpClient'] instanceof ClientInterface)) {
             if (false !== stripos($serviceName, 'identity')) {
                 $baseUrl = $options['authUrl'];
-                $stack   = $this->getStack($options['authHandler']);
+                $token   = null;
             } else {
-                [$token, $baseUrl]     = $options['identityService']->authenticate($options);
-                $stack                 = $this->getStack($options['authHandler'], $token);
+                [$token, $baseUrl] = $options['identityService']->authenticate($options);
             }
 
+            $stack        = HandlerStackFactory::createWithOptions(array_merge($options, ['token' => $token]));
             $microVersion = $options['microVersion'] ?? null;
 
-            $this->addDebugMiddleware($options, $stack);
-
             $options['httpClient'] = $this->httpClient($baseUrl, $stack, $options['catalogType'], $microVersion);
         }
     }
 
-    /**
-     * @codeCoverageIgnore
-     */
-    private function addDebugMiddleware(array $options, HandlerStack &$stack): void
-    {
-        if (!empty($options['debugLog'])
-            && !empty($options['logger'])
-            && !empty($options['messageFormatter'])
-        ) {
-            $stack->push(GuzzleMiddleware::log($options['logger'], $options['messageFormatter']));
-        }
-    }
-
     /**
      * @codeCoverageIgnore
      */
@@ -127,14 +109,6 @@ private function stockAuthHandler(array &$options): void
         }
     }
 
-    private function getStack(callable $authHandler, Token $token = null): HandlerStack
-    {
-        $stack = HandlerStackFactory::create();
-        $stack->push(Middleware::authHandler($authHandler, $token));
-
-        return $stack;
-    }
-
     private function httpClient(string $baseUrl, HandlerStack $stack, string $serviceType = null, string $microVersion = null): ClientInterface
     {
         $clientOptions = [
diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStack.php
index da28157b..fd500be5 100644
--- a/src/Common/Transport/HandlerStack.php
+++ b/src/Common/Transport/HandlerStack.php
@@ -7,6 +7,9 @@
  */
 class HandlerStack
 {
+    /**
+     * @deprecated use \OpenStack\Common\Transport\HandlerStackFactory::createWithOptions instead
+     */
     public static function create(callable $handler = null): \GuzzleHttp\HandlerStack
     {
         return HandlerStackFactory::create($handler);
diff --git a/src/Common/Transport/HandlerStackFactory.php b/src/Common/Transport/HandlerStackFactory.php
index a0579a32..a2324d58 100644
--- a/src/Common/Transport/HandlerStackFactory.php
+++ b/src/Common/Transport/HandlerStackFactory.php
@@ -5,10 +5,14 @@
 namespace OpenStack\Common\Transport;
 
 use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Middleware as GuzzleMiddleware;
 use GuzzleHttp\Utils;
 
 class HandlerStackFactory
 {
+    /**
+     * @deprecated use \OpenStack\Common\Transport\HandlerStackFactory::createWithOptions instead
+     */
     public static function create(callable $handler = null): HandlerStack
     {
         $stack = new HandlerStack($handler ?: Utils::chooseHandler());
@@ -17,4 +21,38 @@ public static function create(callable $handler = null): HandlerStack
 
         return $stack;
     }
+
+    /**
+     * Creates a new HandlerStack with the given options.
+     *
+     * @param array{
+     *     handler: callable,
+     *     authHandler: callable,
+     *     token: \OpenStack\Common\Auth\Token,
+     *     errorVerbosity: int,
+     *     debugLog: bool,
+     *     logger: \Psr\Log\LoggerInterface,
+     *     messageFormatter: \GuzzleHttp\MessageFormatter
+     * } $options
+     */
+    public static function createWithOptions(array $options): HandlerStack
+    {
+        $stack = new HandlerStack($options['handler']                  ?? Utils::chooseHandler());
+        $stack->push(Middleware::httpErrors($options['errorVerbosity'] ?? 0), 'http_errors');
+        $stack->push(GuzzleMiddleware::prepareBody(), 'prepare_body');
+
+        if (!empty($options['authHandler'])) {
+            $stack->push(Middleware::authHandler($options['authHandler'], $options['token'] ?? null));
+        }
+
+        if (!empty($options['debugLog'])
+            && !empty($options['logger'])
+            && !empty($options['messageFormatter'])
+        ) {
+            $logMiddleware = GuzzleMiddleware::log($options['logger'], $options['messageFormatter']);
+            $stack->push($logMiddleware, 'logger');
+        }
+
+        return $stack;
+    }
 }
diff --git a/src/Common/Transport/Middleware.php b/src/Common/Transport/Middleware.php
index 86f701ed..d11667ef 100644
--- a/src/Common/Transport/Middleware.php
+++ b/src/Common/Transport/Middleware.php
@@ -15,16 +15,16 @@
 
 final class Middleware
 {
-    public static function httpErrors(): callable
+    public static function httpErrors(int $verbosity = 0): callable
     {
-        return function (callable $handler) {
-            return function ($request, array $options) use ($handler) {
+        return function (callable $handler) use ($verbosity) {
+            return function ($request, array $options) use ($handler, $verbosity) {
                 return $handler($request, $options)->then(
-                    function (ResponseInterface $response) use ($request) {
+                    function (ResponseInterface $response) use ($request, $verbosity) {
                         if ($response->getStatusCode() < 400) {
                             return $response;
                         }
-                        throw (new Builder())->httpError($request, $response);
+                        throw (new Builder())->httpError($request, $response, $verbosity);
                     }
                 );
             };
diff --git a/src/Identity/v3/Service.php b/src/Identity/v3/Service.php
index 1f67f28b..5760436f 100644
--- a/src/Identity/v3/Service.php
+++ b/src/Identity/v3/Service.php
@@ -45,7 +45,7 @@ public function authenticate(array $options): array
         $name      = $options['catalogName'];
         $type      = $options['catalogType'];
         $region    = $options['region'];
-        $interface = isset($options['interface']) ? $options['interface'] : Enum::INTERFACE_PUBLIC;
+        $interface = $options['interface'] ?? Enum::INTERFACE_PUBLIC;
 
         if ($baseUrl = $token->catalog->getServiceUrl($name, $type, $region, $interface)) {
             return [$token, $baseUrl];
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 05ba65ac..4eecd642 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -5,7 +5,6 @@
 namespace OpenStack;
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Middleware as GuzzleMiddleware;
 use OpenStack\Common\Service\Builder;
 use OpenStack\Common\Transport\HandlerStackFactory;
 use OpenStack\Common\Transport\Utils;
@@ -36,6 +35,9 @@ class OpenStack
      */
     public function __construct(array $options = [], Builder $builder = null)
     {
+        $defaults = ['errorVerbosity' => 2];
+        $options  = array_merge($defaults, $options);
+
         if (!isset($options['identityService'])) {
             $options['identityService'] = $this->getDefaultIdentityService($options);
         }
@@ -49,15 +51,7 @@ private function getDefaultIdentityService(array $options): Service
             throw new \InvalidArgumentException("'authUrl' is a required option");
         }
 
-        $stack = HandlerStackFactory::create();
-
-        if (!empty($options['debugLog'])
-            && !empty($options['logger'])
-            && !empty($options['messageFormatter'])
-        ) {
-            $logMiddleware = GuzzleMiddleware::log($options['logger'], $options['messageFormatter']);
-            $stack->push($logMiddleware, 'logger');
-        }
+        $stack = HandlerStackFactory::createWithOptions(array_merge($options, ['token' => null]));
 
         $clientOptions = [
             'base_uri' => Utils::normalizeUrl($options['authUrl']),
diff --git a/tests/sample/Compute/v2/TestCase.php b/tests/sample/Compute/v2/TestCase.php
index ee57ecaa..8f186918 100644
--- a/tests/sample/Compute/v2/TestCase.php
+++ b/tests/sample/Compute/v2/TestCase.php
@@ -68,7 +68,7 @@ protected function createServer(): Server
             ]
         );
 
-        $server->waitUntilActive(120);
+        $server->waitUntilActive(300);
         $this->assertEquals('ACTIVE', $server->status);
 
         return $server;
diff --git a/tests/sample/Identity/v3/TokenTest.php b/tests/sample/Identity/v3/TokenTest.php
index 85e8ce8c..692dc542 100644
--- a/tests/sample/Identity/v3/TokenTest.php
+++ b/tests/sample/Identity/v3/TokenTest.php
@@ -2,7 +2,10 @@
 
 namespace OpenStack\Sample\Identity\v3;
 
+use GuzzleHttp\Exception\ClientException;
+use OpenStack\Common\Error\BadResponseError;
 use OpenStack\Identity\v3\Models\Token;
+use OpenStack\OpenStack;
 
 class TokenTest extends TestCase
 {
@@ -73,4 +76,37 @@ public function testRevoke(): void
         $this->assertFalse($token->validate());
     }
 
+    public function testInvalidPassword()
+    {
+        $options = $this->getAuthOpts();
+        $password = $options['user']['password'] . $this->randomStr();
+        $options['user']['id'] = $password;
+        $options['user']['password'] = $password;
+
+        $openstack = new OpenStack($options);
+        $this->expectException(BadResponseError::class);
+
+        $openstack->objectStoreV1();
+    }
+
+    public function testInvalidPasswordHidesPassword()
+    {
+        $options = $this->getAuthOpts();
+
+        $password = $options['user']['password'] . $this->randomStr();
+        $options['user']['id'] = $password;
+        $options['user']['password'] = $password;
+
+        $openstack = new OpenStack(array_merge($options, ['errorVerbosity' => 0]));
+        $this->expectException(BadResponseError::class);
+
+        try {
+            $openstack->objectStoreV1();
+        } catch (BadResponseError $e) {
+            $this->assertStringNotContainsString($password, $e->getMessage());
+
+            throw $e;
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/tests/unit/Common/Error/BuilderTest.php b/tests/unit/Common/Error/BuilderTest.php
index 7d44eb82..51ce95fb 100644
--- a/tests/unit/Common/Error/BuilderTest.php
+++ b/tests/unit/Common/Error/BuilderTest.php
@@ -27,13 +27,16 @@ public function test_it_injects_client()
         self::assertInstanceOf(Builder::class, new Builder($this->client->reveal()));
     }
 
-    public function test_it_builds_http_errors()
+    /**
+     * @dataProvider verbosityProvider
+     */
+    public function test_it_builds_http_errors(int $verbosity)
     {
         $request = new Request('POST', '/servers');
         $response = new Response(400, [], Utils::streamFor('Invalid parameters'));
 
-        $requestStr = trim($this->builder->str($request));
-        $responseStr = trim($this->builder->str($response));
+        $requestStr = $this->builder->str($request, $verbosity);
+        $responseStr = $this->builder->str($response, $verbosity);
 
         $errorMessage = <<<EOT
 HTTP Error
@@ -57,7 +60,19 @@ public function test_it_builds_http_errors()
         $e->setRequest($request);
         $e->setResponse($response);
 
-        self::assertEquals($e, $this->builder->httpError($request, $response));
+        self::assertEquals($e, $this->builder->httpError($request, $response, $verbosity));
+    }
+
+    /**
+     * Provides different verbosity levels.
+     */
+    public function verbosityProvider(): array
+    {
+        return [
+            [0],
+            [1],
+            [2],
+        ];
     }
 
     public function test_it_builds_user_input_errors()
diff --git a/tests/unit/Identity/v3/ServiceTest.php b/tests/unit/Identity/v3/ServiceTest.php
index 0719838f..bf82c460 100644
--- a/tests/unit/Identity/v3/ServiceTest.php
+++ b/tests/unit/Identity/v3/ServiceTest.php
@@ -10,7 +10,6 @@
 use OpenStack\Identity\v3\Service;
 use OpenStack\Test\TestCase;
 use Prophecy\Argument;
-use Psr\Http\Message\ResponseInterface;
 
 class ServiceTest extends TestCase
 {

From cb7fcc8b7eb2690d52d15622e575410059304159 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Mon, 5 Feb 2024 11:26:49 +0100
Subject: [PATCH 080/102] add docs for volume attachement (#401)

fixes https://github.com/php-opencloud/openstack/issues/399
---
 doc/services/compute/v2/index.rst             |  1 +
 .../compute/v2/volume-attachments.rst         | 38 +++++++++++++++++++
 .../create.php}                               |  4 +-
 .../delete.php}                               |  8 +---
 .../list.php}                                 |  4 +-
 .../Compute/v2/VolumeAttachmentTest.php       | 12 +++---
 6 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 doc/services/compute/v2/volume-attachments.rst
 rename samples/Compute/v2/{servers/attach_volume_attachment.php => volume_attachments/create.php} (82%)
 rename samples/Compute/v2/{servers/detach_volume_attachment.php => volume_attachments/delete.php} (66%)
 rename samples/Compute/v2/{servers/list_volume_attachments.php => volume_attachments/list.php} (79%)

diff --git a/doc/services/compute/v2/index.rst b/doc/services/compute/v2/index.rst
index 26190cda..51259370 100644
--- a/doc/services/compute/v2/index.rst
+++ b/doc/services/compute/v2/index.rst
@@ -11,6 +11,7 @@ OpenStack Compute (Nova) API Version 2. Nova is the OpenStack project that provi
 
     create
     servers
+    volume-attachments
     flavors
     images
     states
\ No newline at end of file
diff --git a/doc/services/compute/v2/volume-attachments.rst b/doc/services/compute/v2/volume-attachments.rst
new file mode 100644
index 00000000..7bf4c8a3
--- /dev/null
+++ b/doc/services/compute/v2/volume-attachments.rst
@@ -0,0 +1,38 @@
+Volume Attachments
+==================
+
+Nova allows you to attach a volume to a server on the fly. This model represents a point of attachment between a server and a volume.
+
+.. osdoc:: https://docs.openstack.org/api-ref/compute/#servers-with-volume-attachments-servers-os-volume-attachments
+
+.. |models| replace:: volume attachments
+
+.. include:: /common/service.rst
+
+.. warning::
+
+    The server must be fully started before you can attach a volume to it. Just because the server is in the ``ACTIVE``
+    state does not mean that it is ready to accept a volume attachment. See `https://bugs.launchpad.net/nova/+bug/1960346`_
+    and `https://bugs.launchpad.net/nova/+bug/1998148`_ for more information.
+
+Create
+------
+
+To attach a volume to a server, you need to know the server ID and the volume ID.
+
+.. sample:: Compute/v2/volume_attachments/create.php
+
+
+Delete
+------
+
+To detach a volume from a server, you need to know the server ID and the volume ID.
+
+.. sample:: Compute/v2/volume_attachments/delete.php
+
+List
+----
+
+.. sample:: Compute/v2/volume_attachments/list.php
+
+.. include:: /common/generators.rst
diff --git a/samples/Compute/v2/servers/attach_volume_attachment.php b/samples/Compute/v2/volume_attachments/create.php
similarity index 82%
rename from samples/Compute/v2/servers/attach_volume_attachment.php
rename to samples/Compute/v2/volume_attachments/create.php
index e072d332..769c2cfa 100644
--- a/samples/Compute/v2/servers/attach_volume_attachment.php
+++ b/samples/Compute/v2/volume_attachments/create.php
@@ -13,11 +13,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
-
+$compute = $openstack->computeV2();
 $server = $compute->getServer(['id' => '{serverId}']);
 
 $volumeAttachment = $server->attachVolume('{volumeId}');
diff --git a/samples/Compute/v2/servers/detach_volume_attachment.php b/samples/Compute/v2/volume_attachments/delete.php
similarity index 66%
rename from samples/Compute/v2/servers/detach_volume_attachment.php
rename to samples/Compute/v2/volume_attachments/delete.php
index f08c2176..482152a1 100644
--- a/samples/Compute/v2/servers/detach_volume_attachment.php
+++ b/samples/Compute/v2/volume_attachments/delete.php
@@ -13,13 +13,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
-
-/**@var OpenStack\Compute\v2\Models\Server $server */
+$compute = $openstack->computeV2();
 $server = $compute->getServer(['id' => '{serverId}']);
 
-//Must detach by volumeAttachment id
-$server->detachVolume('{volumeAttachmentId}');
+$server->detachVolume('{volumeId}');
diff --git a/samples/Compute/v2/servers/list_volume_attachments.php b/samples/Compute/v2/volume_attachments/list.php
similarity index 79%
rename from samples/Compute/v2/servers/list_volume_attachments.php
rename to samples/Compute/v2/volume_attachments/list.php
index 683e4740..58cc6639 100644
--- a/samples/Compute/v2/servers/list_volume_attachments.php
+++ b/samples/Compute/v2/volume_attachments/list.php
@@ -9,11 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}',
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$compute = $openstack->computeV2(['region' => '{region}']);
-
+$compute = $openstack->computeV2();
 $server = $compute->getServer(['id' => '{serverId}']);
 
 foreach ($server->listVolumeAttachments() as $volumeAttachment) {
diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
index 4399a449..17361b3c 100644
--- a/tests/sample/Compute/v2/VolumeAttachmentTest.php
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -27,7 +27,7 @@ public function testAttach(): VolumeAttachment
         $this->assertEquals('available', $volume->status);
 
         /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
-        require_once $this->sampleFile('servers/attach_volume_attachment.php', [
+        require_once $this->sampleFile('volume_attachments/create.php', [
             '{serverId}' => $server->id,
             '{volumeId}' => $volume->id,
         ]);
@@ -47,12 +47,12 @@ public function testList(VolumeAttachment $createdVolumeAttachment)
     {
         $found = false;
         require_once $this->sampleFile(
-            'servers/list_volume_attachments.php',
+            'volume_attachments/list.php',
             [
                 '{serverId}'                                                                       => $createdVolumeAttachment->serverId,
                 '/** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */' => <<<'PHP'
 /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
-if ($volumeAttachment->id === $createdVolumeAttachment->id) {
+if ($volumeAttachment->volumeId === $createdVolumeAttachment->volumeId) {
     $found = true;
 }
 PHP
@@ -73,10 +73,10 @@ public function testDetach(VolumeAttachment $createdVolumeAttachment)
         sleep(15);
 
         require_once $this->sampleFile(
-            'servers/detach_volume_attachment.php',
+            'volume_attachments/delete.php',
             [
-                '{serverId}'           => $createdVolumeAttachment->serverId,
-                '{volumeAttachmentId}' => $createdVolumeAttachment->id,
+                '{serverId}' => $createdVolumeAttachment->serverId,
+                '{volumeId}' => $createdVolumeAttachment->volumeId,
             ]
         );
 

From 8f2ba03cb9a613f96e1b9d138b99f1953f2f627a Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Mon, 5 Feb 2024 11:34:51 +0100
Subject: [PATCH 081/102] fix doc links (#402)

---
 doc/services/compute/v2/volume-attachments.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/services/compute/v2/volume-attachments.rst b/doc/services/compute/v2/volume-attachments.rst
index 7bf4c8a3..7cc61687 100644
--- a/doc/services/compute/v2/volume-attachments.rst
+++ b/doc/services/compute/v2/volume-attachments.rst
@@ -12,8 +12,8 @@ Nova allows you to attach a volume to a server on the fly. This model represents
 .. warning::
 
     The server must be fully started before you can attach a volume to it. Just because the server is in the ``ACTIVE``
-    state does not mean that it is ready to accept a volume attachment. See `https://bugs.launchpad.net/nova/+bug/1960346`_
-    and `https://bugs.launchpad.net/nova/+bug/1998148`_ for more information.
+    state does not mean that it is ready to accept a volume attachment. See https://bugs.launchpad.net/nova/+bug/1960346
+    and https://bugs.launchpad.net/nova/+bug/1998148 for more information.
 
 Create
 ------

From 38a686070d3b3a25b26e21f3c445dde1ae66fd8d Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sat, 10 Feb 2024 11:49:56 +0100
Subject: [PATCH 082/102] enchance error builder: output body only for json,
 limit body to 5 Kb (#405)

fixes #403
supersedes #404
---
 src/Common/Error/Builder.php            | 11 +++-
 tests/sample/Compute/v2/ServerTest.php  |  3 +
 tests/unit/Common/Error/BuilderTest.php | 81 +++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/src/Common/Error/Builder.php b/src/Common/Error/Builder.php
index 7de83710..f2717aa1 100644
--- a/src/Common/Error/Builder.php
+++ b/src/Common/Error/Builder.php
@@ -19,6 +19,8 @@
  */
 class Builder
 {
+    public const MAX_BODY_LENGTH = 5000;
+
     /**
      * The default domain to use for further link documentation.
      *
@@ -96,8 +98,13 @@ public function str(MessageInterface $message, int $verbosity = 0): string
             return $msg;
         }
 
-        if (ini_get('memory_limit') < 0 || $message->getBody()->getSize() < ini_get('memory_limit')) {
-            $msg .= "\r\n\r\n".$message->getBody();
+        $contentType = strtolower($message->getHeaderLine('content-type'));
+        if (false !== strpos($contentType, 'application/json')) {
+            $body = $message->getBody()->read(self::MAX_BODY_LENGTH);
+            $msg .= "\r\n\r\n".$body;
+            if ('' !== $message->getBody()->read(1)) {
+                $msg .= '...';
+            }
         }
 
         return trim($msg);
diff --git a/tests/sample/Compute/v2/ServerTest.php b/tests/sample/Compute/v2/ServerTest.php
index 18c8f5a3..6d78a6cd 100644
--- a/tests/sample/Compute/v2/ServerTest.php
+++ b/tests/sample/Compute/v2/ServerTest.php
@@ -374,6 +374,9 @@ public function testSuspend()
         $server->waitUntil('SUSPENDED');
         $this->assertEquals('SUSPENDED', $server->status);
 
+        // wait for the server to be fully suspended
+        sleep(5);
+
         return $server;
     }
 
diff --git a/tests/unit/Common/Error/BuilderTest.php b/tests/unit/Common/Error/BuilderTest.php
index 51ce95fb..6f0abc7b 100644
--- a/tests/unit/Common/Error/BuilderTest.php
+++ b/tests/unit/Common/Error/BuilderTest.php
@@ -4,6 +4,8 @@
 
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Psr7\NoSeekStream;
+use GuzzleHttp\Psr7\PumpStream;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Utils;
@@ -75,6 +77,85 @@ public function verbosityProvider(): array
         ];
     }
 
+    public function test_it_outputs_body_for_json()
+    {
+        $value = 'foobar';
+
+        $request = new Request(
+            'POST',
+            '/servers',
+            ['Content-Type' => 'application/json'],
+            json_encode(['foo' => $value])
+        );
+
+        $str = $this->builder->str($request, 2);
+        $this->assertStringContainsString($value, $str);
+    }
+
+    public function test_it_skips_body_for_low_verbosity()
+    {
+        $value = 'foobar';
+
+        $request = new Request(
+            'POST',
+            '/servers',
+            ['Content-Type' => 'application/json'],
+            json_encode(['foo' => $value])
+        );
+
+        $str = $this->builder->str($request, 1);
+        $this->assertStringNotContainsString($value, $str);
+    }
+
+    public function test_it_cuts_big_body_for_json()
+    {
+        $value = str_repeat('A', Builder::MAX_BODY_LENGTH);
+
+        $request = new Request(
+            'POST',
+            '/servers',
+            ['Content-Type' => 'application/json'],
+            json_encode(['foo' => $value])
+        );
+
+        $str = $this->builder->str($request, 2);
+        $this->assertStringNotContainsString($value, $str);
+        $this->assertStringContainsString('AAAAAA...', $str);
+    }
+
+    public function test_it_did_not_read_full_body_for_json()
+    {
+        $value = str_repeat('A', Builder::MAX_BODY_LENGTH + 1);
+
+        $request = new Request(
+            'POST',
+            '/servers',
+            ['Content-Type' => 'application/json'],
+            new PumpStream(function ($size) {
+                return str_repeat('A', $size);
+            })
+        );
+
+        $str = $this->builder->str($request, 2);
+        $this->assertStringNotContainsString($value, $str);
+        $this->assertStringContainsString('AAAAAA...', $str);
+    }
+
+    public function test_it_skips_body_for_binary()
+    {
+        $value = 'foobar';
+
+        $request = new Request(
+            'POST',
+            '/servers',
+            ['Content-Type' => 'binary/octet-stream'],
+            $value
+        );
+
+        $str = $this->builder->str($request, 2);
+        $this->assertStringNotContainsString($value, $str);
+    }
+
     public function test_it_builds_user_input_errors()
     {
         $expected = 'A well-formed string';

From 2ed9c10badd8eb2645870a7d1f6e9dabe809d6aa Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Tue, 2 Apr 2024 14:17:34 +0200
Subject: [PATCH 083/102] make swift metadata header case insensitive  (#407)

* compare headers case insensitively
* drop support of unmaintained releases in CI (until they are returned in github action).
---
 .github/workflows/integration_tests.yml       | 16 +++---
 src/ObjectStore/v1/Models/MetadataTrait.php   |  2 +-
 .../v1/Fixtures/GET_Container.resp            |  2 +
 .../ObjectStore/v1/Fixtures/GET_Object.resp   |  2 +
 .../ObjectStore/v1/Fixtures/HEAD_Account.resp |  2 +
 .../v1/Fixtures/HEAD_Container.resp           |  2 +
 .../ObjectStore/v1/Fixtures/HEAD_Object.resp  |  2 +
 .../ObjectStore/v1/Models/AccountTest.php     | 28 +++++++--
 .../ObjectStore/v1/Models/ContainerTest.php   | 57 ++++++++++++-------
 .../unit/ObjectStore/v1/Models/ObjectTest.php |  6 +-
 10 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 9a722ed3..80edde1f 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openstack_version: [ "stable/wallaby", "stable/zed", "stable/2023.2" ]
+        openstack_version: [ "stable/2023.2" ]
         php_version: [ 8.1 ]
         include:
           - name: "bobcat"
@@ -31,13 +31,13 @@ jobs:
           - name: "zed"
             openstack_version: "stable/zed"
             ubuntu_version: "20.04"
-          - name: "yoga"
-            openstack_version: "stable/yoga"
-            ubuntu_version: "20.04"
-          - name: "wallaby"
-            openstack_version: "stable/wallaby"
-            ubuntu_version: "20.04"
-            block_storage_v2: true
+          #- name: "yoga"
+          #  openstack_version: "unmaintained/yoga"
+          #  ubuntu_version: "20.04"
+          #- name: "wallaby"
+          #  openstack_version: "unmaintained/wallaby"
+          #  ubuntu_version: "20.04"
+          #  block_storage_v2: true
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
     steps:
diff --git a/src/ObjectStore/v1/Models/MetadataTrait.php b/src/ObjectStore/v1/Models/MetadataTrait.php
index f4006aed..b1e2beed 100644
--- a/src/ObjectStore/v1/Models/MetadataTrait.php
+++ b/src/ObjectStore/v1/Models/MetadataTrait.php
@@ -13,7 +13,7 @@ public function parseMetadata(ResponseInterface $response): array
         $metadata = [];
 
         foreach ($response->getHeaders() as $header => $value) {
-            if (0 === strpos($header, static::METADATA_PREFIX)) {
+            if (0 === stripos($header, static::METADATA_PREFIX)) {
                 $name            = substr($header, strlen(static::METADATA_PREFIX));
                 $metadata[$name] = $response->getHeader($header)[0];
             }
diff --git a/tests/unit/ObjectStore/v1/Fixtures/GET_Container.resp b/tests/unit/ObjectStore/v1/Fixtures/GET_Container.resp
index 856af9c3..fc6d6143 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/GET_Container.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/GET_Container.resp
@@ -3,6 +3,8 @@ Content-Length: 341
 X-Container-Object-Count: 2
 Accept-Ranges: bytes
 X-Container-Meta-Book: TomSawyer
+X-CONTAINER-META-UPPERCASE: UPPERCASE
+x-container-meta-lowercase: lowercase
 X-Timestamp: 1389727543.65372
 X-Container-Bytes-Used: 26
 Content-Type: application/json; charset=utf-8
diff --git a/tests/unit/ObjectStore/v1/Fixtures/GET_Object.resp b/tests/unit/ObjectStore/v1/Fixtures/GET_Object.resp
index 08d87c1c..ef092e57 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/GET_Object.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/GET_Object.resp
@@ -5,6 +5,8 @@ Last-Modified: Wed, 15 Jan 2014 16:41:49 GMT
 Etag: 451e372e48e0f6b1114fa0724aa79fa1
 X-Timestamp: 1389804109.39027
 X-Object-Meta-Orig-Filename: goodbyeworld.txt
+X-OBJECT-META-UPPERCASE: UPPERCASE
+x-object-meta-lowercase: lowercase
 Content-Type: text/plain
 X-Trans-Id: tx8145a190241f4cf6b05f5-0052d82a34
 Date: Thu, 16 Jan 2014 18:51:32 GMT
diff --git a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp
index a622678f..62b04e8a 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Account.resp
@@ -3,6 +3,8 @@ Content-Length: 0
 X-Account-Object-Count: 1
 X-Account-Meta-Book: MobyDick
 X-Account-Meta-Genre: Fiction
+X-ACCOUNT-META-UPPERCASE: UPPERCASE
+x-account-meta-lowercase: lowercase
 X-Timestamp: 1389453423.35964
 X-Account-Bytes-Used: 14
 X-Account-Container-Count: 2
diff --git a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp
index 54dc363d..9d4369bf 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Container.resp
@@ -4,6 +4,8 @@ X-Container-Object-Count: 1
 Accept-Ranges: bytes
 X-Container-Meta-Book: TomSawyer
 X-Container-Meta-Author: SamuelClemens
+X-CONTAINER-META-UPPERCASE: UPPERCASE
+x-container-meta-lowercase: lowercase
 X-Timestamp: 1389727543.65372
 X-Container-Bytes-Used: 14
 Content-Type: text/plain; charset=utf-8
diff --git a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp
index 9f8e3c39..35cd266e 100644
--- a/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp
+++ b/tests/unit/ObjectStore/v1/Fixtures/HEAD_Object.resp
@@ -6,6 +6,8 @@ Etag: 451e372e48e0f6b1114fa0724aa79fa1
 X-Timestamp: 1389906751.73463
 X-Object-Meta-Book: GoodbyeColumbus
 X-Object-Meta-Manufacturer: Acme
+X-OBJECT-META-UPPERCASE: UPPERCASE
+x-object-meta-lowercase: lowercase
 Content-Type: application/octet-stream
 X-Trans-Id: tx37ea34dcd1ed48ca9bc7d-0052d84b6f
 Date: Thu, 16 Jan 2014 21:13:19 GMT
diff --git a/tests/unit/ObjectStore/v1/Models/AccountTest.php b/tests/unit/ObjectStore/v1/Models/AccountTest.php
index a30ca5c0..ba50cc05 100644
--- a/tests/unit/ObjectStore/v1/Models/AccountTest.php
+++ b/tests/unit/ObjectStore/v1/Models/AccountTest.php
@@ -26,7 +26,15 @@ public function test_Response_Populates_Model()
         $this->account->populateFromResponse($response);
 
         self::assertEquals(1, $this->account->objectCount);
-        self::assertEquals(['Book' => 'MobyDick', 'Genre' => 'Fiction'], $this->account->metadata);
+        self::assertEquals(
+            [
+                'Book'      => 'MobyDick',
+                'Genre'     => 'Fiction',
+                'UPPERCASE' => 'UPPERCASE',
+                'lowercase' => 'lowercase',
+            ],
+            $this->account->metadata
+        );
         self::assertEquals(14, $this->account->bytesUsed);
         self::assertEquals(2, $this->account->containerCount);
     }
@@ -43,7 +51,15 @@ public function test_Retrieve()
     public function test_Get_Metadata()
     {
         $this->mockRequest('HEAD', '', 'HEAD_Account', null, []);
-        self::assertEquals(['Book' => 'MobyDick', 'Genre' => 'Fiction'], $this->account->getMetadata());
+        self::assertEquals(
+            [
+                'Book'      => 'MobyDick',
+                'Genre'     => 'Fiction',
+                'UPPERCASE' => 'UPPERCASE',
+                'lowercase' => 'lowercase',
+            ],
+            $this->account->getMetadata()
+        );
     }
 
     public function test_Merge_Metadata()
@@ -60,9 +76,11 @@ public function test_Reset_Metadata()
         $this->mockRequest('HEAD', '', 'HEAD_Account', null, []);
 
         $headers = [
-            'X-Account-Meta-Book'         => 'Middlesex',
-            'X-Account-Meta-Author'       => 'Jeffrey Eugenides',
-            'X-Remove-Account-Meta-Genre' => 'True',
+            'X-Account-Meta-Book'             => 'Middlesex',
+            'X-Account-Meta-Author'           => 'Jeffrey Eugenides',
+            'X-Remove-Account-Meta-Genre'     => 'True',
+            'X-Remove-Account-Meta-UPPERCASE' => 'True',
+            'X-Remove-Account-Meta-lowercase' => 'True',
         ];
 
         $this->mockRequest('POST', '', 'NoContent', [], $headers);
diff --git a/tests/unit/ObjectStore/v1/Models/ContainerTest.php b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
index 69a81890..0106bdda 100644
--- a/tests/unit/ObjectStore/v1/Models/ContainerTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ContainerTest.php
@@ -35,7 +35,15 @@ public function test_Populate_From_Response()
         $this->container->populateFromResponse($response);
 
         self::assertEquals(1, $this->container->objectCount);
-        self::assertEquals(['Book' => 'TomSawyer', 'Author' => 'SamuelClemens'], $this->container->metadata);
+        self::assertEquals(
+            [
+                'Book'      => 'TomSawyer',
+                'Author'    => 'SamuelClemens',
+                'UPPERCASE' => 'UPPERCASE',
+                'lowercase' => 'lowercase',
+            ],
+            $this->container->metadata
+        );
         self::assertEquals(14, $this->container->bytesUsed);
     }
 
@@ -51,7 +59,16 @@ public function test_Get_Metadata()
     {
         $this->mockRequest('HEAD', self::NAME, 'HEAD_Container', null, []);
 
-        self::assertEquals(['Book' => 'TomSawyer', 'Author' => 'SamuelClemens'], $this->container->getMetadata());
+        self::assertEquals(
+            [
+                'Book'      => 'TomSawyer',
+                'Author'    => 'SamuelClemens',
+                'UPPERCASE' => 'UPPERCASE',
+                'lowercase' => 'lowercase',
+
+            ],
+            $this->container->getMetadata()
+        );
     }
 
     public function test_Merge_Metadata()
@@ -70,6 +87,8 @@ public function test_Reset_Metadata()
         $headers = [
             'X-Container-Meta-Book'          => 'Middlesex',
             'X-Remove-Container-Meta-Author' => 'True',
+            'X-Remove-Container-Meta-UPPERCASE' => 'True',
+            'X-Remove-Container-Meta-lowercase' => 'True',
         ];
 
         $this->mockRequest('POST', self::NAME, 'NoContent', [], $headers);
@@ -141,29 +160,27 @@ public function test_it_lists_objects()
 
         $expected = [
             [
-                'name' => 'goodbye',
+                'name'          => 'goodbye',
                 'contentLength' => '14',
-                'lastModified' => new \DateTimeImmutable('2014-01-15T16:41:49.390270'),
-                'contentType' => 'application/octet-stream',
-                'hash' => '451e372e48e0f6b1114fa0724aa79fa1'
+                'lastModified'  => new \DateTimeImmutable('2014-01-15T16:41:49.390270'),
+                'contentType'   => 'application/octet-stream',
+                'hash'          => '451e372e48e0f6b1114fa0724aa79fa1',
             ],
             [
-                'name' => 'helloworld.json',
+                'name'          => 'helloworld.json',
                 'contentLength' => '12',
-                'lastModified' => new \DateTimeImmutable('2014-01-15T16:37:43.427570'),
-                'contentType' => 'application/json',
-                'hash' => 'ed076287532e86365e841e92bfc50d8c'
+                'lastModified'  => new \DateTimeImmutable('2014-01-15T16:37:43.427570'),
+                'contentType'   => 'application/json',
+                'hash'          => 'ed076287532e86365e841e92bfc50d8c',
             ],
         ];
 
-        for ($i = 0; $i < count($objects); $i++)
-        {
+        for ($i = 0; $i < count($objects); $i++) {
             $exp = $expected[$i];
             /** @var StorageObject $obj */
             $obj = $objects[$i];
 
-            foreach ($exp as $attr => $attrVal)
-            {
+            foreach ($exp as $attr => $attrVal) {
                 self::assertEquals($attrVal, $obj->{$attr});
             }
         }
@@ -194,7 +211,7 @@ public function test_other_exceptions_are_thrown()
         $e->setResponse(new Response(500));
 
         $this->mockRequest('HEAD', 'test/bar', $e);
-		$this->expectException(BadResponseError::class);
+        $this->expectException(BadResponseError::class);
 
         $this->container->objectExists('bar');
     }
@@ -214,11 +231,11 @@ public function test_it_chunks_according_to_provided_segment_size()
             : \GuzzleHttp\Psr7\Utils::streamFor(implode('', range('A', 'X')));
 
         $data = [
-            'name' => 'object',
-            'stream'           => $stream,
-            'segmentSize'      => 10,
-            'segmentPrefix'    => 'objectPrefix',
-            'segmentContainer' => 'segments',
+            'name'               => 'object',
+            'stream'             => $stream,
+            'segmentSize'        => 10,
+            'segmentPrefix'      => 'objectPrefix',
+            'segmentContainer'   => 'segments',
             'segmentIndexFormat' => '%03d',
         ];
 
diff --git a/tests/unit/ObjectStore/v1/Models/ObjectTest.php b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
index 57f1e795..21172f61 100644
--- a/tests/unit/ObjectStore/v1/Models/ObjectTest.php
+++ b/tests/unit/ObjectStore/v1/Models/ObjectTest.php
@@ -69,6 +69,8 @@ public function test_Get_Metadata()
         self::assertEquals([
             'Book'         => 'GoodbyeColumbus',
             'Manufacturer' => 'Acme',
+            'UPPERCASE'    => 'UPPERCASE',
+            'lowercase'    => 'lowercase',
         ], $this->object->getMetadata());
     }
 
@@ -80,6 +82,8 @@ public function test_Merge_Metadata()
             'X-Object-Meta-Author'       => 'foo',
             'X-Object-Meta-Book'         => 'GoodbyeColumbus',
             'X-Object-Meta-Manufacturer' => 'Acme',
+            'X-Object-Meta-UPPERCASE'    => 'UPPERCASE',
+            'X-Object-Meta-lowercase'    => 'lowercase',
         ];
 
         $this->mockRequest('POST', self::CONTAINER . '/' . self::NAME, 'NoContent', null, $headers);
@@ -120,7 +124,7 @@ public function test_It_Copies()
         $this->mockRequest('COPY', $path, 'Created', null, $headers);
 
         $this->object->copy([
-            'destination' => $headers['Destination']
+            'destination' => $headers['Destination'],
         ]);
     }
 

From e32dcf1e5cf6a7073932bcbb73b0e190201f4ea9 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Thu, 4 Apr 2024 10:01:50 +0200
Subject: [PATCH 084/102] return unmaintaned openstack versions into ci (#408)

* override TARGET_BRANCH
---
 .github/workflows/integration_tests.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 80edde1f..7fb7f574 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -31,13 +31,13 @@ jobs:
           - name: "zed"
             openstack_version: "stable/zed"
             ubuntu_version: "20.04"
-          #- name: "yoga"
-          #  openstack_version: "unmaintained/yoga"
-          #  ubuntu_version: "20.04"
-          #- name: "wallaby"
-          #  openstack_version: "unmaintained/wallaby"
-          #  ubuntu_version: "20.04"
-          #  block_storage_v2: true
+          - name: "yoga"
+            openstack_version: "unmaintained/yoga"
+            ubuntu_version: "20.04"
+          - name: "wallaby"
+            openstack_version: "unmaintained/wallaby"
+            ubuntu_version: "20.04"
+            block_storage_v2: true
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
     steps:
@@ -76,13 +76,14 @@ jobs:
           key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
 
       - name: Deploy devstack
-        uses: EmilienM/devstack-action@v0.11
+        uses: EmilienM/devstack-action@v0.15
         with:
           branch: ${{ matrix.openstack_version }}
           conf_overrides: |
             CINDER_ISCSI_HELPER=lioadm
             SWIFT_ENABLE_TEMPURLS=True
             SWIFT_TEMPURL_KEY=secretkey
+            TARGET_BRANCH=${{ matrix.openstack_version }}
             [[post-config|\$SWIFT_CONFIG_PROXY_SERVER]]
             [filter:versioned_writes]
             allow_object_versioning = true

From a7ae9d0e39242473067f49d606b02d4ee8f314ea Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Fri, 8 Nov 2024 20:02:04 +0100
Subject: [PATCH 085/102] new openstack versions (#416)

new openstack versions:
* zed moved to unmaintained
* added caracal and dalmatian
---
 .github/workflows/integration_tests.yml | 8 +++++++-
 COVERAGE.md                             | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 7fb7f574..6edbe437 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -22,6 +22,12 @@ jobs:
         openstack_version: [ "stable/2023.2" ]
         php_version: [ 8.1 ]
         include:
+          - name: "dalmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
+          - name: "caracal"
+            openstack_version: "stable/2024.1"
+            ubuntu_version: "22.04"
           - name: "bobcat"
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
@@ -29,7 +35,7 @@ jobs:
             openstack_version: "stable/2023.1"
             ubuntu_version: "22.04"
           - name: "zed"
-            openstack_version: "stable/zed"
+            openstack_version: "unmaintained/zed"
             ubuntu_version: "20.04"
           - name: "yoga"
             openstack_version: "unmaintained/yoga"
diff --git a/COVERAGE.md b/COVERAGE.md
index c743bfcb..3fee51a6 100644
--- a/COVERAGE.md
+++ b/COVERAGE.md
@@ -1,6 +1,8 @@
 # OpenStack versions coverage
 
 While we strive to support all versions of OpenStack, we can only test limited number of versions. The current set:
+* 2024.2 Dalmatian
+* 2024.1 Caracal
 * 2023.2 Bobcat
 * 2023.1 Antelope
 * Zed

From 989f5ed4985927a234d3d437f673513af32c252b Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sat, 9 Nov 2024 11:00:21 +0100
Subject: [PATCH 086/102] increase sleep before testing detach. The VM must be
 completely up. (#417)

---
 tests/sample/Compute/v2/VolumeAttachmentTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
index 17361b3c..47958a6e 100644
--- a/tests/sample/Compute/v2/VolumeAttachmentTest.php
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -70,7 +70,7 @@ public function testDetach(VolumeAttachment $createdVolumeAttachment)
         // let's wait for the server to be completely up
         // https://bugs.launchpad.net/nova/+bug/1998148
         // https://bugs.launchpad.net/nova/+bug/1960346
-        sleep(15);
+        sleep(30);
 
         require_once $this->sampleFile(
             'volume_attachments/delete.php',

From d305fb6b4bd403b5dd851d25255df398bc9d044b Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sat, 9 Nov 2024 17:26:43 +0100
Subject: [PATCH 087/102] revert sleep time, add more debug to the failed test
 (#418)

fix volume detach test for dalmatian
---
 tests/sample/Compute/v2/VolumeAttachmentTest.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/sample/Compute/v2/VolumeAttachmentTest.php b/tests/sample/Compute/v2/VolumeAttachmentTest.php
index 47958a6e..62512c94 100644
--- a/tests/sample/Compute/v2/VolumeAttachmentTest.php
+++ b/tests/sample/Compute/v2/VolumeAttachmentTest.php
@@ -70,7 +70,7 @@ public function testDetach(VolumeAttachment $createdVolumeAttachment)
         // let's wait for the server to be completely up
         // https://bugs.launchpad.net/nova/+bug/1998148
         // https://bugs.launchpad.net/nova/+bug/1960346
-        sleep(30);
+        sleep(15);
 
         require_once $this->sampleFile(
             'volume_attachments/delete.php',
@@ -84,9 +84,20 @@ public function testDetach(VolumeAttachment $createdVolumeAttachment)
         $volume->waitUntil('available', 240);
         $this->assertEquals('available', $volume->status);
 
+        sleep(5);
+
         $server = $this->getService()->getServer(['id' => $createdVolumeAttachment->serverId]);
+        $server->retrieve();
         foreach ($server->listVolumeAttachments() as $volumeAttachment) {
-            $this->assertNotEquals($createdVolumeAttachment->id, $volumeAttachment->id);
+            if ($volumeAttachment->volumeId === $createdVolumeAttachment->volumeId) {
+                print_r($volume);
+                print_r($volumeAttachment);
+                print_r($server);
+
+                $this->fail('Volume attachment was not detached');
+            } else {
+                $this->assertNotEquals($createdVolumeAttachment->id, $volumeAttachment->id);
+            }
         }
 
         $volume->delete();

From 998e5c0ed262bc7bc192fbcf0c48fee2928597f6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Date: Wed, 20 Nov 2024 19:59:59 +0100
Subject: [PATCH 088/102] feat: Add PHP 8.4 support (#415)

Signed-off-by: Joas Schilling <coding@schilljs.com>
Co-authored-by: Konstantin Babushkin <koka@idwrx.com>
---
 .github/workflows/unit_tests.yml             |  2 +-
 src/Common/Auth/AuthHandler.php              |  2 +-
 src/Common/Error/Builder.php                 |  4 +-
 src/Common/HydratorStrategyTrait.php         |  2 +-
 src/Common/JsonSchema/Schema.php             |  2 +-
 src/Common/Resource/Alias.php                |  2 +-
 src/Common/Resource/Listable.php             |  8 ++--
 src/Common/Resource/OperatorResource.php     |  4 +-
 src/Common/Service/Builder.php               |  2 +-
 src/Common/Transport/HandlerStack.php        |  2 +-
 src/Common/Transport/HandlerStackFactory.php |  2 +-
 src/Common/Transport/Middleware.php          |  4 +-
 src/Common/Transport/RequestSerializer.php   |  2 +-
 src/Common/Transport/Utils.php               |  2 +-
 src/Compute/v2/Service.php                   | 40 ++++++++++----------
 src/Images/v2/Models/Schema.php              |  2 +-
 src/ObjectStore/v1/Models/Container.php      |  2 +-
 src/ObjectStore/v1/Service.php               |  6 +--
 src/OpenStack.php                            |  2 +-
 19 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 22972dd7..6b6ac130 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-         php: [ 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 ]
+         php: [ 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4 ]
          composer:
            - name: lowest
              arg: "--prefer-lowest --prefer-stable"
diff --git a/src/Common/Auth/AuthHandler.php b/src/Common/Auth/AuthHandler.php
index 71a58721..4abf2b83 100644
--- a/src/Common/Auth/AuthHandler.php
+++ b/src/Common/Auth/AuthHandler.php
@@ -25,7 +25,7 @@ class AuthHandler
     /** @var Token */
     private $token;
 
-    public function __construct(callable $nextHandler, callable $tokenGenerator, Token $token = null)
+    public function __construct(callable $nextHandler, callable $tokenGenerator, ?Token $token = null)
     {
         $this->nextHandler    = $nextHandler;
         $this->tokenGenerator = $tokenGenerator;
diff --git a/src/Common/Error/Builder.php b/src/Common/Error/Builder.php
index f2717aa1..a9830309 100644
--- a/src/Common/Error/Builder.php
+++ b/src/Common/Error/Builder.php
@@ -35,7 +35,7 @@ class Builder
      */
     private $client;
 
-    public function __construct(ClientInterface $client = null)
+    public function __construct(?ClientInterface $client = null)
     {
         $this->client = $client ?: new Client();
     }
@@ -164,7 +164,7 @@ private function getStatusCodeMessage(int $statusCode): string
      * @param mixed       $userValue    The incorrect value the user actually provided
      * @param string|null $furtherLink  a link to further information if necessary (optional)
      */
-    public function userInputError(string $expectedType, $userValue, string $furtherLink = null): UserInputError
+    public function userInputError(string $expectedType, $userValue, ?string $furtherLink = null): UserInputError
     {
         $message = $this->header('User Input Error');
 
diff --git a/src/Common/HydratorStrategyTrait.php b/src/Common/HydratorStrategyTrait.php
index 83d5719b..43ddd946 100644
--- a/src/Common/HydratorStrategyTrait.php
+++ b/src/Common/HydratorStrategyTrait.php
@@ -25,7 +25,7 @@ public function hydrate(array $data, array $aliases = [])
         }
     }
 
-    public function set(string $key, $property, array $data, callable $fn = null)
+    public function set(string $key, $property, array $data, ?callable $fn = null)
     {
         if (isset($data[$key]) && property_exists($this, $property)) {
             $value           = $fn ? call_user_func($fn, $data[$key]) : $data[$key];
diff --git a/src/Common/JsonSchema/Schema.php b/src/Common/JsonSchema/Schema.php
index 36396d5e..d2ac5cdd 100644
--- a/src/Common/JsonSchema/Schema.php
+++ b/src/Common/JsonSchema/Schema.php
@@ -14,7 +14,7 @@ class Schema
     /** @var Validator */
     private $validator;
 
-    public function __construct($body, Validator $validator = null)
+    public function __construct($body, ?Validator $validator = null)
     {
         $this->body      = (object) $body;
         $this->validator = $validator ?: new Validator();
diff --git a/src/Common/Resource/Alias.php b/src/Common/Resource/Alias.php
index ebd7a6bf..53944bab 100644
--- a/src/Common/Resource/Alias.php
+++ b/src/Common/Resource/Alias.php
@@ -26,7 +26,7 @@ class Alias
      * @param string|null $className    A class name for the property value
      * @param bool        $list         Whether value of the property should be treated as a list or not
      */
-    public function __construct(string $propertyName, string $className = null, bool $list = false)
+    public function __construct(string $propertyName, ?string $className = null, bool $list = false)
     {
         $this->isList       = $list;
         $this->propertyName = $propertyName;
diff --git a/src/Common/Resource/Listable.php b/src/Common/Resource/Listable.php
index a19499e3..899e80fc 100644
--- a/src/Common/Resource/Listable.php
+++ b/src/Common/Resource/Listable.php
@@ -18,11 +18,11 @@ interface Listable
      * of the marker will depend on the last element returned in the previous response. If a limit is
      * provided, the loop will continue up until that point.
      *
-     * @param array    $def      The operation definition
-     * @param array    $userVals The user values
-     * @param callable $mapFn    an optional callback that will be executed on every resource iteration
+     * @param array         $def      The operation definition
+     * @param array         $userVals The user values
+     * @param callable|null $mapFn    an optional callback that will be executed on every resource iteration
      *
      * @returns \Generator<mixed, static>
      */
-    public function enumerate(array $def, array $userVals = [], callable $mapFn = null);
+    public function enumerate(array $def, array $userVals = [], ?callable $mapFn = null);
 }
diff --git a/src/Common/Resource/OperatorResource.php b/src/Common/Resource/OperatorResource.php
index 89492598..ac940c76 100644
--- a/src/Common/Resource/OperatorResource.php
+++ b/src/Common/Resource/OperatorResource.php
@@ -69,7 +69,7 @@ private function getResourcesKey(): string
      *
      * @returns \Generator<mixed, static>
      */
-    public function enumerate(array $def, array $userVals = [], callable $mapFn = null): \Generator
+    public function enumerate(array $def, array $userVals = [], ?callable $mapFn = null): \Generator
     {
         $operation = $this->getOperation($def);
 
@@ -105,7 +105,7 @@ public function enumerate(array $def, array $userVals = [], callable $mapFn = nu
      *
      * @return array<self>
      */
-    public function extractMultipleInstances(ResponseInterface $response, string $key = null): array
+    public function extractMultipleInstances(ResponseInterface $response, ?string $key = null): array
     {
         $key           = $key ?: $this->getResourcesKey();
         $resourcesData = Utils::jsonDecode($response)[$key];
diff --git a/src/Common/Service/Builder.php b/src/Common/Service/Builder.php
index f63eefc1..a5dca997 100644
--- a/src/Common/Service/Builder.php
+++ b/src/Common/Service/Builder.php
@@ -109,7 +109,7 @@ private function stockAuthHandler(array &$options): void
         }
     }
 
-    private function httpClient(string $baseUrl, HandlerStack $stack, string $serviceType = null, string $microVersion = null): ClientInterface
+    private function httpClient(string $baseUrl, HandlerStack $stack, ?string $serviceType = null, ?string $microVersion = null): ClientInterface
     {
         $clientOptions = [
             'base_uri' => Utils::normalizeUrl($baseUrl),
diff --git a/src/Common/Transport/HandlerStack.php b/src/Common/Transport/HandlerStack.php
index fd500be5..158b57b3 100644
--- a/src/Common/Transport/HandlerStack.php
+++ b/src/Common/Transport/HandlerStack.php
@@ -10,7 +10,7 @@ class HandlerStack
     /**
      * @deprecated use \OpenStack\Common\Transport\HandlerStackFactory::createWithOptions instead
      */
-    public static function create(callable $handler = null): \GuzzleHttp\HandlerStack
+    public static function create(?callable $handler = null): \GuzzleHttp\HandlerStack
     {
         return HandlerStackFactory::create($handler);
     }
diff --git a/src/Common/Transport/HandlerStackFactory.php b/src/Common/Transport/HandlerStackFactory.php
index a2324d58..7afa0373 100644
--- a/src/Common/Transport/HandlerStackFactory.php
+++ b/src/Common/Transport/HandlerStackFactory.php
@@ -13,7 +13,7 @@ class HandlerStackFactory
     /**
      * @deprecated use \OpenStack\Common\Transport\HandlerStackFactory::createWithOptions instead
      */
-    public static function create(callable $handler = null): HandlerStack
+    public static function create(?callable $handler = null): HandlerStack
     {
         $stack = new HandlerStack($handler ?: Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
diff --git a/src/Common/Transport/Middleware.php b/src/Common/Transport/Middleware.php
index d11667ef..c7eaed34 100644
--- a/src/Common/Transport/Middleware.php
+++ b/src/Common/Transport/Middleware.php
@@ -31,7 +31,7 @@ function (ResponseInterface $response) use ($request, $verbosity) {
         };
     }
 
-    public static function authHandler(callable $tokenGenerator, Token $token = null): callable
+    public static function authHandler(callable $tokenGenerator, ?Token $token = null): callable
     {
         return function (callable $handler) use ($tokenGenerator, $token) {
             return new AuthHandler($handler, $tokenGenerator, $token);
@@ -49,7 +49,7 @@ public static function history(array &$container): callable
     /**
      * @codeCoverageIgnore
      */
-    public static function retry(callable $decider, callable $delay = null): callable
+    public static function retry(callable $decider, ?callable $delay = null): callable
     {
         return GuzzleMiddleware::retry($decider, $delay);
     }
diff --git a/src/Common/Transport/RequestSerializer.php b/src/Common/Transport/RequestSerializer.php
index 533a11c5..20d29e66 100644
--- a/src/Common/Transport/RequestSerializer.php
+++ b/src/Common/Transport/RequestSerializer.php
@@ -11,7 +11,7 @@ class RequestSerializer
 {
     private $jsonSerializer;
 
-    public function __construct(JsonSerializer $jsonSerializer = null)
+    public function __construct(?JsonSerializer $jsonSerializer = null)
     {
         $this->jsonSerializer = $jsonSerializer ?: new JsonSerializer();
     }
diff --git a/src/Common/Transport/Utils.php b/src/Common/Transport/Utils.php
index 6a52a81a..52a4f3c9 100644
--- a/src/Common/Transport/Utils.php
+++ b/src/Common/Transport/Utils.php
@@ -45,7 +45,7 @@ public static function jsonDecode(ResponseInterface $response, bool $assoc = tru
      *
      * @return array
      */
-    public static function flattenJson($data, string $key = null)
+    public static function flattenJson($data, ?string $key = null)
     {
         return (!empty($data) && $key && isset($data[$key])) ? $data[$key] : $data;
     }
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index 3dc1fd4c..968b22eb 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -44,7 +44,7 @@ public function createServer(array $options): Server
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Server>
      */
-    public function listServers(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
+    public function listServers(bool $detailed = false, array $options = [], ?callable $mapFn = null): \Generator
     {
         $def = (true === $detailed) ? $this->api->getServersDetail() : $this->api->getServers();
 
@@ -72,13 +72,13 @@ public function getServer(array $options = []): Server
     /**
      * List flavors.
      *
-     * @param array    $options  {@see \OpenStack\Compute\v2\Api::getFlavors}
-     * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
-     * @param bool     $detailed set to true to fetch flavors' details
+     * @param array         $options  {@see \OpenStack\Compute\v2\Api::getFlavors}
+     * @param callable|null $mapFn    a callable function that will be invoked on every iteration of the list
+     * @param bool          $detailed set to true to fetch flavors' details
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Flavor>
      */
-    public function listFlavors(array $options = [], callable $mapFn = null, bool $detailed = false): \Generator
+    public function listFlavors(array $options = [], ?callable $mapFn = null, bool $detailed = false): \Generator
     {
         $def = true === $detailed ? $this->api->getFlavorsDetail() : $this->api->getFlavors();
 
@@ -119,7 +119,7 @@ public function createFlavor(array $options = []): Flavor
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Image>
      */
-    public function listImages(array $options = [], callable $mapFn = null): \Generator
+    public function listImages(array $options = [], ?callable $mapFn = null): \Generator
     {
         return $this->model(Image::class)->enumerate($this->api->getImages(), $options, $mapFn);
     }
@@ -143,12 +143,12 @@ public function getImage(array $options = []): Image
     /**
      * List key pairs.
      *
-     * @param array    $options {@see \OpenStack\Compute\v2\Api::getKeyPairs}
-     * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @param array         $options {@see \OpenStack\Compute\v2\Api::getKeyPairs}
+     * @param callable|null $mapFn   a callable function that will be invoked on every iteration of the list
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Keypair>
      */
-    public function listKeypairs(array $options = [], callable $mapFn = null): \Generator
+    public function listKeypairs(array $options = [], ?callable $mapFn = null): \Generator
     {
         return $this->model(Keypair::class)->enumerate($this->api->getKeypairs(), $options, $mapFn);
     }
@@ -197,14 +197,14 @@ public function getHypervisorStatistics(): HypervisorStatistic
     /**
      * List hypervisors.
      *
-     * @param bool     $detailed Determines whether detailed information will be returned. If FALSE is specified, only
-     *                           the ID, name and links attributes are returned, saving bandwidth.
-     * @param array    $options  {@see \OpenStack\Compute\v2\Api::getHypervisors}
-     * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
+     * @param bool          $detailed Determines whether detailed information will be returned. If FALSE is specified, only
+     *                                the ID, name and links attributes are returned, saving bandwidth.
+     * @param array         $options  {@see \OpenStack\Compute\v2\Api::getHypervisors}
+     * @param callable|null $mapFn    a callable function that will be invoked on every iteration of the list
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Hypervisor>
      */
-    public function listHypervisors(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
+    public function listHypervisors(bool $detailed = false, array $options = [], ?callable $mapFn = null): \Generator
     {
         $def = (true === $detailed) ? $this->api->getHypervisorsDetail() : $this->api->getHypervisors();
 
@@ -224,12 +224,12 @@ public function getHypervisor(array $options = []): Hypervisor
     /**
      * List hosts.
      *
-     * @param array    $options {@see \OpenStack\Compute\v2\Api::getHosts}
-     * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @param array         $options {@see \OpenStack\Compute\v2\Api::getHosts}
+     * @param callable|null $mapFn   a callable function that will be invoked on every iteration of the list
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\Host>
      */
-    public function listHosts(array $options = [], callable $mapFn = null): \Generator
+    public function listHosts(array $options = [], ?callable $mapFn = null): \Generator
     {
         return $this->model(Host::class)->enumerate($this->api->getHosts(), $options, $mapFn);
     }
@@ -255,12 +255,12 @@ public function getHost(array $options = []): Host
     /**
      * List AZs.
      *
-     * @param array    $options {@see \OpenStack\Compute\v2\Api::getAvailabilityZones}
-     * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
+     * @param array         $options {@see \OpenStack\Compute\v2\Api::getAvailabilityZones}
+     * @param callable|null $mapFn   a callable function that will be invoked on every iteration of the list
      *
      * @return \Generator<mixed, \OpenStack\Compute\v2\Models\AvailabilityZone>
      */
-    public function listAvailabilityZones(array $options = [], callable $mapFn = null): \Generator
+    public function listAvailabilityZones(array $options = [], ?callable $mapFn = null): \Generator
     {
         return $this->model(AvailabilityZone::class)->enumerate($this->api->getAvailabilityZones(), $options, $mapFn);
     }
diff --git a/src/Images/v2/Models/Schema.php b/src/Images/v2/Models/Schema.php
index 44532fab..10373e6f 100644
--- a/src/Images/v2/Models/Schema.php
+++ b/src/Images/v2/Models/Schema.php
@@ -8,7 +8,7 @@
 
 class Schema extends \OpenStack\Common\JsonSchema\Schema
 {
-    public function __construct($data, Validator $validator = null)
+    public function __construct($data, ?Validator $validator = null)
     {
         if (!isset($data->type)) {
             $data->type = 'object';
diff --git a/src/ObjectStore/v1/Models/Container.php b/src/ObjectStore/v1/Models/Container.php
index fa935026..74f2e466 100644
--- a/src/ObjectStore/v1/Models/Container.php
+++ b/src/ObjectStore/v1/Models/Container.php
@@ -57,7 +57,7 @@ public function populateFromResponse(ResponseInterface $response): self
      *
      * @return \Generator<mixed, \OpenStack\ObjectStore\v1\Models\StorageObject>
      */
-    public function listObjects(array $options = [], callable $mapFn = null): \Generator
+    public function listObjects(array $options = [], ?callable $mapFn = null): \Generator
     {
         $options = array_merge($options, ['name' => $this->name, 'format' => 'json']);
 
diff --git a/src/ObjectStore/v1/Service.php b/src/ObjectStore/v1/Service.php
index d4bdbae7..e4686c3b 100644
--- a/src/ObjectStore/v1/Service.php
+++ b/src/ObjectStore/v1/Service.php
@@ -30,7 +30,7 @@ public function getAccount(): Account
      *
      * @return \Generator<mixed, \OpenStack\ObjectStore\v1\Models\Container>
      */
-    public function listContainers(array $options = [], callable $mapFn = null): \Generator
+    public function listContainers(array $options = [], ?callable $mapFn = null): \Generator
     {
         $options = array_merge($options, ['format' => 'json']);
 
@@ -41,9 +41,9 @@ public function listContainers(array $options = [], callable $mapFn = null): \Ge
      * Retrieves a Container object and populates its name according to the value provided. Please note that the
      * remote API is not contacted.
      *
-     * @param string $name The unique name of the container
+     * @param string|null $name The unique name of the container
      */
-    public function getContainer(string $name = null): Container
+    public function getContainer(?string $name = null): Container
     {
         return $this->model(Container::class, ['name' => $name]);
     }
diff --git a/src/OpenStack.php b/src/OpenStack.php
index 4eecd642..254e66df 100644
--- a/src/OpenStack.php
+++ b/src/OpenStack.php
@@ -33,7 +33,7 @@ class OpenStack
      *         ['requestOptions']   = (array)             Guzzle Http request options    [OPTIONAL]
      *         ['cachedToken']      = (array)             Cached token credential        [OPTIONAL]
      */
-    public function __construct(array $options = [], Builder $builder = null)
+    public function __construct(array $options = [], ?Builder $builder = null)
     {
         $defaults = ['errorVerbosity' => 2];
         $options  = array_merge($defaults, $options);

From 842981a05f6cf7b2440d0f4bb98337b2401d4972 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sat, 14 Dec 2024 21:06:12 +0100
Subject: [PATCH 089/102] antelope unmaintained (#420)

* antelope unmaintained

* change actions/cache@v2 to v3 due to deprecation
---
 .github/workflows/integration_tests.yml | 2 +-
 .github/workflows/unit_tests.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 6edbe437..c460cf21 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -32,7 +32,7 @@ jobs:
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
           - name: "antelope"
-            openstack_version: "stable/2023.1"
+            openstack_version: "unmaintained/2023.1"
             ubuntu_version: "22.04"
           - name: "zed"
             openstack_version: "unmaintained/zed"
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 6b6ac130..b379bdfd 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.php_cs.cache

From 9886899de3a81e95dd6cb352253870fa02abd0f9 Mon Sep 17 00:00:00 2001
From: Anton Dollmaier <a.dollmaier@aditsystems.de>
Date: Tue, 7 Jan 2025 08:11:23 +0100
Subject: [PATCH 090/102] extend FloatingIP with description and subnet_id
 (#421)

Add optional `description` and `subnet_id` parameters to Floating IPs creation endpoint.
---
 samples/Networking/v2/floatingIPs/create.php   |  3 ++-
 src/Networking/v2/Extensions/Layer3/Api.php    |  2 ++
 .../v2/Extensions/Layer3/ApiTrait.php          |  3 +++
 .../v2/Extensions/Layer3/Models/FloatingIp.php |  3 +++
 src/Networking/v2/Extensions/Layer3/Params.php |  9 +++++++++
 .../v2/Extensions/Layer3/ParamsTrait.php       | 18 ++++++++++++++++++
 tests/sample/Networking/v2/FloatingIpTest.php  |  4 ++++
 .../Extensions/Layer3/Fixtures/FloatingIp.resp |  1 +
 .../Layer3/Fixtures/FloatingIps.resp           |  2 ++
 .../Layer3/Models/FloatingIpTest.php           |  6 ++++++
 10 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/samples/Networking/v2/floatingIPs/create.php b/samples/Networking/v2/floatingIPs/create.php
index 0e7aea99..410640e6 100644
--- a/samples/Networking/v2/floatingIPs/create.php
+++ b/samples/Networking/v2/floatingIPs/create.php
@@ -17,5 +17,6 @@
 $floatingIp = $networking->createFloatingIp([
     "floatingNetworkId" => "{networkId}",
     "portId"            => "{portId}",
-    'fixedIpAddress'    => '{fixedIpAddress}',
+    "fixedIpAddress"    => "{fixedIpAddress}",
+    "description"       => "{description}",
 ]);
diff --git a/src/Networking/v2/Extensions/Layer3/Api.php b/src/Networking/v2/Extensions/Layer3/Api.php
index faab09ac..c7b3ec8e 100644
--- a/src/Networking/v2/Extensions/Layer3/Api.php
+++ b/src/Networking/v2/Extensions/Layer3/Api.php
@@ -26,6 +26,7 @@ public function postFloatingIps(): array
             'jsonKey' => 'floatingip',
             'params'  => [
                 'tenantId'          => $this->params->tenantIdJson(),
+                'description'       => $this->notRequired($this->params->descriptionJson()),
                 'floatingNetworkId' => $this->params->floatingNetworkIdJson(),
                 'fixedIpAddress'    => $this->params->fixedIpAddressJson(),
                 'floatingIpAddress' => $this->params->floatingIpAddressJson(),
@@ -53,6 +54,7 @@ public function putFloatingIp(): array
             'jsonKey' => 'floatingip',
             'params'  => [
                 'id'                => $this->params->idPath(),
+                'description'       => $this->notRequired($this->params->descriptionJson()),
                 'floatingNetworkId' => $this->notRequired($this->params->floatingNetworkIdJson()),
                 'fixedIpAddress'    => $this->params->fixedIpAddressJson(),
                 'floatingIpAddress' => $this->params->floatingIpAddressJson(),
diff --git a/src/Networking/v2/Extensions/Layer3/ApiTrait.php b/src/Networking/v2/Extensions/Layer3/ApiTrait.php
index 5d7c757a..362f9bd7 100644
--- a/src/Networking/v2/Extensions/Layer3/ApiTrait.php
+++ b/src/Networking/v2/Extensions/Layer3/ApiTrait.php
@@ -20,7 +20,9 @@ public function postFloatingIps(): array
             'jsonKey' => 'floatingip',
             'params'  => [
                 'tenantId'          => $this->params->tenantIdJson(),
+                'description'       => $this->notRequired($this->params->descriptionJson()),
                 'floatingNetworkId' => $this->params->floatingNetworkIdJson(),
+                'subnetId'          => $this->notRequired($this->params->subnetIdJson()),
                 'fixedIpAddress'    => $this->params->fixedIpAddressJson(),
                 'floatingIpAddress' => $this->params->floatingIpAddressJson(),
                 'portId'            => $this->params->portIdJson(),
@@ -47,6 +49,7 @@ public function putFloatingIp(): array
             'jsonKey' => 'floatingip',
             'params'  => [
                 'id'                => $this->params->idPath(),
+                'description'       => $this->notRequired($this->params->descriptionJson()),
                 'floatingNetworkId' => $this->notRequired($this->params->floatingNetworkIdJson()),
                 'fixedIpAddress'    => $this->params->fixedIpAddressJson(),
                 'floatingIpAddress' => $this->params->floatingIpAddressJson(),
diff --git a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
index 048b942b..2a0ecb92 100644
--- a/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
+++ b/src/Networking/v2/Extensions/Layer3/Models/FloatingIp.php
@@ -21,6 +21,9 @@ class FloatingIp extends OperatorResource implements Listable, Creatable, Retrie
     /** @var string */
     public $status;
 
+    /** @var string */
+    public $description;
+
     /** @var string */
     public $floatingNetworkId;
 
diff --git a/src/Networking/v2/Extensions/Layer3/Params.php b/src/Networking/v2/Extensions/Layer3/Params.php
index d502f61c..ef6d2787 100644
--- a/src/Networking/v2/Extensions/Layer3/Params.php
+++ b/src/Networking/v2/Extensions/Layer3/Params.php
@@ -9,6 +9,15 @@
  */
 class Params extends \OpenStack\Networking\v2\Params
 {
+    public function descriptionJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The description of the floating IP.',
+            'sentAs'      => 'description',
+        ];
+    }
+
     public function tenantIdJson(): array
     {
         return [
diff --git a/src/Networking/v2/Extensions/Layer3/ParamsTrait.php b/src/Networking/v2/Extensions/Layer3/ParamsTrait.php
index c201a82e..27465655 100644
--- a/src/Networking/v2/Extensions/Layer3/ParamsTrait.php
+++ b/src/Networking/v2/Extensions/Layer3/ParamsTrait.php
@@ -9,6 +9,15 @@
  */
 trait ParamsTrait
 {
+    public function descriptionJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The description of the floating IP.',
+            'sentAs'      => 'description',
+        ];
+    }
+
     public function floatingNetworkIdJson(): array
     {
         return [
@@ -37,6 +46,15 @@ public function floatingIpAddressJson(): array
         ];
     }
 
+    public function subnetIdJson(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'description' => 'The UUID of the subnet of the floating Network associated with the floating IP.',
+            'sentAs'      => 'subnet',
+        ];
+    }
+
     public function portIdJson(): array
     {
         return [
diff --git a/tests/sample/Networking/v2/FloatingIpTest.php b/tests/sample/Networking/v2/FloatingIpTest.php
index 196f0edc..5c447dbf 100644
--- a/tests/sample/Networking/v2/FloatingIpTest.php
+++ b/tests/sample/Networking/v2/FloatingIpTest.php
@@ -63,16 +63,19 @@ public function testCreate(): FloatingIpData
             'name'      => $this->randomStr(),
         ]);
         $fixedIp = $this->findSubnetIp($data->port, $data->internalSubnet);
+        $description = $this->randomStr();
 
         /** @var FloatingIp $floatingIp */
         require_once $this->sampleFile('floatingIPs/create.php', [
             '{networkId}'      => $data->externalNetwork->id,
             '{portId}'         => $data->port->id,
             '{fixedIpAddress}' => $fixedIp,
+            '{description}'    => $description,
         ]);
         $this->assertInstanceOf(FloatingIp::class, $floatingIp);
         $this->assertEquals($data->externalNetwork->id, $floatingIp->floatingNetworkId);
         $this->assertEquals($data->port->id, $floatingIp->portId);
+        $this->assertEquals($description, $floatingIp->description);
 
         $data->floatingIp = $floatingIp;
 
@@ -123,6 +126,7 @@ public function testGet(FloatingIpData $data)
         $this->assertInstanceOf(FloatingIp::class, $floatingIp);
         $this->assertEquals($data->floatingIp->id, $floatingIp->id);
         $this->assertEmpty($floatingIp->portId);
+        $this->assertEmpty($floatingIp->description);
 
         $floatingIp->retrieve();
         $this->assertEquals($data->floatingIp->portId, $floatingIp->portId);
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIp.resp b/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIp.resp
index d4f9fbd5..35a5d434 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIp.resp
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIp.resp
@@ -8,6 +8,7 @@ Content-Type: application/json
         "fixed_ip_address": "10.0.0.3",
         "floating_ip_address": "172.24.4.228",
         "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
+        "description": "some-floating-ip",
         "status": "ACTIVE",
         "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
         "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7"
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIps.resp b/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIps.resp
index 66046e79..50d7d103 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIps.resp
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Fixtures/FloatingIps.resp
@@ -11,6 +11,7 @@ Content-Type: application/json
             "floating_ip_address": "172.24.4.228",
             "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
             "id": "2f245a7b-796b-4f26-9cf9-9e82d248fda7",
+            "description": "some-floating-ip",
             "status": "ACTIVE"
         },
         {
@@ -21,6 +22,7 @@ Content-Type: application/json
             "floating_ip_address": "172.24.4.227",
             "port_id": null,
             "id": "61cea855-49cb-4846-997d-801b70c71bdd",
+            "description": "some-floating-ip",
             "status": "DOWN"
         }
     ]
diff --git a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
index a0446f86..7567b055 100644
--- a/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
+++ b/tests/unit/Networking/v2/Extensions/Layer3/Models/FloatingIpTest.php
@@ -27,12 +27,14 @@ public function test_it_updates()
         $expectedJson = ['floatingip' => [
             "floating_network_id" => "376da547-b977-4cfe-9cba-275c80debf57",
             "port_id"             => "ce705c24-c1ef-408a-bda3-7bbd946164ab",
+            "description"         => "some-floating-ip",
         ]];
 
         $this->mockRequest('PUT', 'v2.0/floatingips/id', new Response(202), $expectedJson, []);
 
         $this->floatingIp->floatingNetworkId = "376da547-b977-4cfe-9cba-275c80debf57";
         $this->floatingIp->portId = "ce705c24-c1ef-408a-bda3-7bbd946164ab";
+        $this->floatingIp->description = "some-floating-ip";
         $this->floatingIp->update();
     }
 
@@ -49,6 +51,10 @@ public function test_it_retrieves()
 
         $this->floatingIp->retrieve();
 
+        self::assertEquals(
+            'some-floating-ip',
+                            $this->floatingIp->description
+        );
         self::assertEquals(
             '376da547-b977-4cfe-9cba-275c80debf57',
                             $this->floatingIp->floatingNetworkId

From c9342554f587a9a5a130185dab92ba120cd58ea7 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Sun, 16 Mar 2025 10:59:12 +0100
Subject: [PATCH 091/102] fix github actions (#423)

---
 .github/workflows/integration_tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index c460cf21..69dbadc0 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: get cache directory
         id: composer-cache
@@ -126,7 +126,7 @@ jobs:
 
       - name: Save logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: failure-logs
           path: failure-logs

From 2a23c7b1f9a1dc62e52720d4d68f12d904105494 Mon Sep 17 00:00:00 2001
From: evs-xsarus <44158071+evs-xsarus@users.noreply.github.com>
Date: Wed, 30 Apr 2025 16:49:35 +0200
Subject: [PATCH 092/102] Support json-schema v6 for
 nimbusoft/flysystem-openstack-swift . (#424)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index defad050..f8658c8b 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "guzzlehttp/guzzle": "^7.0",
         "guzzlehttp/psr7": ">=1.7",
         "guzzlehttp/uri-template": "^0.2 || ^1.0",
-        "justinrainbow/json-schema": "^5.2"
+        "justinrainbow/json-schema": "^5.2 || ^6.0"
     },
     "require-dev": {
         "ext-json": "*",

From 94bac6dbbdcb2261beffcc9b51f7a98ff7bc0b52 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Wed, 30 Apr 2025 20:36:28 +0200
Subject: [PATCH 093/102] remove wallaby and yoga due to ubuntu 20.04
 deprecation (#425)

---
 .github/workflows/integration_tests.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 69dbadc0..ffc568dd 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -36,14 +36,7 @@ jobs:
             ubuntu_version: "22.04"
           - name: "zed"
             openstack_version: "unmaintained/zed"
-            ubuntu_version: "20.04"
-          - name: "yoga"
-            openstack_version: "unmaintained/yoga"
-            ubuntu_version: "20.04"
-          - name: "wallaby"
-            openstack_version: "unmaintained/wallaby"
-            ubuntu_version: "20.04"
-            block_storage_v2: true
+            ubuntu_version: "22.04"
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
     steps:
@@ -128,5 +121,5 @@ jobs:
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
-          name: failure-logs
+          name: failure-logs-${{ strategy.job-index }}
           path: failure-logs

From b92ea5581ca91779b88f08b1b44e6ca880b34fc3 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Fri, 30 May 2025 11:26:42 +0200
Subject: [PATCH 094/102] merge headers in `OperatorTrait::sendRequest` (#427)

* merge headers in `OperatorTrait::sendRequest`

* remove bobcat integration tests
---
 .github/workflows/integration_tests.yml     |  3 ---
 src/Common/Api/OperatorTrait.php            |  7 +++++-
 tests/unit/Common/Api/OperatorTraitTest.php | 24 +++++++++++++++++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index ffc568dd..43ca7262 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -28,9 +28,6 @@ jobs:
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
-          - name: "bobcat"
-            openstack_version: "stable/2023.2"
-            ubuntu_version: "22.04"
           - name: "antelope"
             openstack_version: "unmaintained/2023.1"
             ubuntu_version: "22.04"
diff --git a/src/Common/Api/OperatorTrait.php b/src/Common/Api/OperatorTrait.php
index 710bd8ad..56f4d42d 100644
--- a/src/Common/Api/OperatorTrait.php
+++ b/src/Common/Api/OperatorTrait.php
@@ -101,8 +101,13 @@ protected function sendRequest(Operation $operation, array $userValues = [], boo
 
         $uri = Utils::uri_template($operation->getPath(), $userValues);
 
-        if (array_key_exists('requestOptions', $userValues)) {
+        if (isset($userValues['requestOptions'])) {
             $options += $userValues['requestOptions'];
+
+            // headers are always created in options, merge them
+            if (isset($userValues['requestOptions']['headers'])) {
+                $options['headers'] = array_merge($options['headers'], $userValues['requestOptions']['headers']);
+            }
         }
 
         $options['openstack.skip_auth'] = $operation->getSkipAuth();
diff --git a/tests/unit/Common/Api/OperatorTraitTest.php b/tests/unit/Common/Api/OperatorTraitTest.php
index c269b5b1..66b4d61a 100644
--- a/tests/unit/Common/Api/OperatorTraitTest.php
+++ b/tests/unit/Common/Api/OperatorTraitTest.php
@@ -111,6 +111,30 @@ public function test_guzzle_options_are_forwarded()
             'requestOptions' => ['stream' => true],
         ]);
     }
+
+    public function test_it_sends_custom_headers_in_request_options()
+    {
+        $this->client
+            ->requestAsync('GET', 'test',
+                [
+                    'headers' => [
+                        'Access-Control-Allow-Origin'  => '*',
+                        'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS',
+                    ],
+                    'openstack.skip_auth' => false,
+                ])
+            ->shouldBeCalled()
+            ->willReturn(new Promise());
+
+        $this->operator->executeAsync($this->def, [
+            'requestOptions' => [
+                'headers' => [
+                    'Access-Control-Allow-Origin'  => '*',
+                    'Access-Control-Allow-Methods' => 'GET, POST, OPTIONS',
+                ],
+            ],
+        ]);
+    }
 }
 
 

From 46bc05bbd7ed386182042ea2609db9d4a85428b2 Mon Sep 17 00:00:00 2001
From: Konstantin Babushkin <koka@idwrx.com>
Date: Mon, 2 Jun 2025 18:43:14 +0200
Subject: [PATCH 095/102] fix integration tests, add epoxy release (#428)

* use `cinder/block-storage` service instead of `cinderv3/volumev3` in tests
---
 .github/workflows/integration_tests.yml       | 32 ++++++++++---------
 doc/services/block-storage/v3/index.rst       |  7 ++++
 samples/BlockStorage/v3/snapshots/create.php  |  2 +-
 samples/BlockStorage/v3/snapshots/delete.php  |  2 +-
 samples/BlockStorage/v3/snapshots/get.php     |  2 +-
 .../v3/snapshots/get_metadata.php             |  2 +-
 samples/BlockStorage/v3/snapshots/list.php    |  2 +-
 .../BlockStorage/v3/snapshots/list_detail.php |  2 +-
 .../BlockStorage/v3/snapshots/list_sorted.php |  2 +-
 .../v3/snapshots/merge_metadata.php           |  2 +-
 .../v3/snapshots/reset_metadata.php           |  2 +-
 samples/BlockStorage/v3/snapshots/update.php  |  2 +-
 .../BlockStorage/v3/volume_types/create.php   |  2 +-
 .../BlockStorage/v3/volume_types/delete.php   |  2 +-
 samples/BlockStorage/v3/volume_types/list.php |  2 +-
 samples/BlockStorage/v3/volume_types/read.php |  2 +-
 .../BlockStorage/v3/volume_types/update.php   |  2 +-
 samples/BlockStorage/v3/volumes/create.php    |  2 +-
 .../v3/volumes/create_from_image.php          |  2 +-
 .../v3/volumes/create_from_snapshot.php       |  2 +-
 .../v3/volumes/create_from_volume.php         |  2 +-
 samples/BlockStorage/v3/volumes/delete.php    |  2 +-
 samples/BlockStorage/v3/volumes/list.php      |  2 +-
 .../BlockStorage/v3/volumes/list_detail.php   |  2 +-
 samples/BlockStorage/v3/volumes/read.php      |  2 +-
 samples/BlockStorage/v3/volumes/update.php    |  2 +-
 src/Images/v2/Models/Image.php                |  3 ++
 tests/sample/Images/v2/ImageTest.php          |  2 +-
 tests/sample/TestCase.php                     |  2 +-
 29 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 43ca7262..c8dbdc79 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -2,6 +2,16 @@ name: Integration Tests
 
 on:
   workflow_dispatch:
+    inputs:
+      tmate_enabled:
+        type: boolean
+        description: 'Run the build with tmate debugging enabled'
+        required: false
+        default: false
+      openstack_version:
+        description: 'Comma-separated list of Openstack versions e.g. "stable/2025.1", "unmaintained/zed"'
+        required: false
+        default: false
   pull_request:
   push:
     branches:
@@ -19,23 +29,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openstack_version: [ "stable/2023.2" ]
+        openstack_version: ${{ fromJSON(format('[{0}]', inputs.openstack_version || vars.OPENSTACK_VERSIONS )) }}
         php_version: [ 8.1 ]
-        include:
-          - name: "dalmatian"
-            openstack_version: "stable/2024.2"
-            ubuntu_version: "22.04"
-          - name: "caracal"
-            openstack_version: "stable/2024.1"
-            ubuntu_version: "22.04"
-          - name: "antelope"
-            openstack_version: "unmaintained/2023.1"
-            ubuntu_version: "22.04"
-          - name: "zed"
-            openstack_version: "unmaintained/zed"
-            ubuntu_version: "22.04"
+        ubuntu_version: [ 22.04 ]
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.name }} and run integration tests with php ${{matrix.php_version}}
+    name: Deploy OpenStack ${{ matrix.openstack_version }} and run integration tests with php ${{matrix.php_version}}
     steps:
       - uses: actions/checkout@v4
 
@@ -120,3 +118,7 @@ jobs:
         with:
           name: failure-logs-${{ strategy.job-index }}
           path: failure-logs
+
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ always() && github.event_name == 'workflow_dispatch' && inputs.tmate_enabled }}
\ No newline at end of file
diff --git a/doc/services/block-storage/v3/index.rst b/doc/services/block-storage/v3/index.rst
index 7c8acfbd..9245691d 100644
--- a/doc/services/block-storage/v3/index.rst
+++ b/doc/services/block-storage/v3/index.rst
@@ -4,6 +4,13 @@ Block Storage v3
 OpenStack Block Storage API v3 (Cinder). Cinder is the OpenStack Block Storage service for providing volumes
 to Nova virtual machines, Ironic bare metal hosts, containers and more.
 
+.. note::
+
+    By default we are creating Cinder service with ``cinderv3`` name and ``volumev3`` type.
+    This is left for backward compatibility and would be changed on the next major release of OpenStack SDK.
+    It's made to be compatible with the old OpenStack installations where the 2nd version of Cinder was also installed.
+    Check your service name and type. New installations would use ``cinder`` name and ``block-storage`` type.
+
 .. osdoc:: https://docs.openstack.org/api-ref/block-storage/v3/
 
 .. toctree::
diff --git a/samples/BlockStorage/v3/snapshots/create.php b/samples/BlockStorage/v3/snapshots/create.php
index 94ad40ae..c764801e 100644
--- a/samples/BlockStorage/v3/snapshots/create.php
+++ b/samples/BlockStorage/v3/snapshots/create.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshot = $service->createSnapshot([
     'volumeId'    => '{volumeId}',
diff --git a/samples/BlockStorage/v3/snapshots/delete.php b/samples/BlockStorage/v3/snapshots/delete.php
index 7136ca1e..b17a185b 100644
--- a/samples/BlockStorage/v3/snapshots/delete.php
+++ b/samples/BlockStorage/v3/snapshots/delete.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 $snapshot->delete();
diff --git a/samples/BlockStorage/v3/snapshots/get.php b/samples/BlockStorage/v3/snapshots/get.php
index 2466cbfc..862ea41c 100644
--- a/samples/BlockStorage/v3/snapshots/get.php
+++ b/samples/BlockStorage/v3/snapshots/get.php
@@ -9,6 +9,6 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshot = $service->getSnapshot('{snapshotId}');
diff --git a/samples/BlockStorage/v3/snapshots/get_metadata.php b/samples/BlockStorage/v3/snapshots/get_metadata.php
index 76e319a6..23fe6c2a 100644
--- a/samples/BlockStorage/v3/snapshots/get_metadata.php
+++ b/samples/BlockStorage/v3/snapshots/get_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $metadata = $service->getSnapshot('{snapshotId}')
                     ->getMetadata();
diff --git a/samples/BlockStorage/v3/snapshots/list.php b/samples/BlockStorage/v3/snapshots/list.php
index fdf3f66d..c887806d 100644
--- a/samples/BlockStorage/v3/snapshots/list.php
+++ b/samples/BlockStorage/v3/snapshots/list.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshots = $service->listSnapshots();
 
diff --git a/samples/BlockStorage/v3/snapshots/list_detail.php b/samples/BlockStorage/v3/snapshots/list_detail.php
index 525ea482..c53cf80f 100644
--- a/samples/BlockStorage/v3/snapshots/list_detail.php
+++ b/samples/BlockStorage/v3/snapshots/list_detail.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshots = $service->listSnapshots(true);
 
diff --git a/samples/BlockStorage/v3/snapshots/list_sorted.php b/samples/BlockStorage/v3/snapshots/list_sorted.php
index ce9a50bf..d722825e 100644
--- a/samples/BlockStorage/v3/snapshots/list_sorted.php
+++ b/samples/BlockStorage/v3/snapshots/list_sorted.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshots = $service->listSnapshots(false, ['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
 
diff --git a/samples/BlockStorage/v3/snapshots/merge_metadata.php b/samples/BlockStorage/v3/snapshots/merge_metadata.php
index c85386c7..40eca4bf 100644
--- a/samples/BlockStorage/v3/snapshots/merge_metadata.php
+++ b/samples/BlockStorage/v3/snapshots/merge_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v3/snapshots/reset_metadata.php b/samples/BlockStorage/v3/snapshots/reset_metadata.php
index d0d7a710..114111d9 100644
--- a/samples/BlockStorage/v3/snapshots/reset_metadata.php
+++ b/samples/BlockStorage/v3/snapshots/reset_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v3/snapshots/update.php b/samples/BlockStorage/v3/snapshots/update.php
index 3310d44a..b9adf70e 100644
--- a/samples/BlockStorage/v3/snapshots/update.php
+++ b/samples/BlockStorage/v3/snapshots/update.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v3/volume_types/create.php b/samples/BlockStorage/v3/volume_types/create.php
index abed4941..c3ceb209 100644
--- a/samples/BlockStorage/v3/volume_types/create.php
+++ b/samples/BlockStorage/v3/volume_types/create.php
@@ -11,7 +11,7 @@
     ,
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volumeType = $service->createVolumeType([
     'name' => '{name}',
diff --git a/samples/BlockStorage/v3/volume_types/delete.php b/samples/BlockStorage/v3/volume_types/delete.php
index f0e9a2f7..2d118583 100644
--- a/samples/BlockStorage/v3/volume_types/delete.php
+++ b/samples/BlockStorage/v3/volume_types/delete.php
@@ -11,7 +11,7 @@
     ,
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
 $volumeType->delete();
diff --git a/samples/BlockStorage/v3/volume_types/list.php b/samples/BlockStorage/v3/volume_types/list.php
index 23857289..d9974d73 100644
--- a/samples/BlockStorage/v3/volume_types/list.php
+++ b/samples/BlockStorage/v3/volume_types/list.php
@@ -11,7 +11,7 @@
     ,
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volumeTypes = $service->listVolumeTypes();
 
diff --git a/samples/BlockStorage/v3/volume_types/read.php b/samples/BlockStorage/v3/volume_types/read.php
index b254c8ea..217a97f3 100644
--- a/samples/BlockStorage/v3/volume_types/read.php
+++ b/samples/BlockStorage/v3/volume_types/read.php
@@ -11,7 +11,7 @@
     ,
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
 $volumeType->retrieve();
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/volume_types/update.php b/samples/BlockStorage/v3/volume_types/update.php
index bdd08ab5..b99b0464 100644
--- a/samples/BlockStorage/v3/volume_types/update.php
+++ b/samples/BlockStorage/v3/volume_types/update.php
@@ -11,7 +11,7 @@
     ,
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
 $volumeType->name = '{newName}';
diff --git a/samples/BlockStorage/v3/volumes/create.php b/samples/BlockStorage/v3/volumes/create.php
index 0af2293b..6de12095 100644
--- a/samples/BlockStorage/v3/volumes/create.php
+++ b/samples/BlockStorage/v3/volumes/create.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volume = $service->createVolume([
     'description' => '{description}',
diff --git a/samples/BlockStorage/v3/volumes/create_from_image.php b/samples/BlockStorage/v3/volumes/create_from_image.php
index b561c353..316b9a82 100644
--- a/samples/BlockStorage/v3/volumes/create_from_image.php
+++ b/samples/BlockStorage/v3/volumes/create_from_image.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volume = $service->createVolume([
     'description' => '{description}',
diff --git a/samples/BlockStorage/v3/volumes/create_from_snapshot.php b/samples/BlockStorage/v3/volumes/create_from_snapshot.php
index 2c9de9c8..6d08b151 100644
--- a/samples/BlockStorage/v3/volumes/create_from_snapshot.php
+++ b/samples/BlockStorage/v3/volumes/create_from_snapshot.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volume = $service->createVolume([
     'description' => '{description}',
diff --git a/samples/BlockStorage/v3/volumes/create_from_volume.php b/samples/BlockStorage/v3/volumes/create_from_volume.php
index a72ed00c..e48172e2 100644
--- a/samples/BlockStorage/v3/volumes/create_from_volume.php
+++ b/samples/BlockStorage/v3/volumes/create_from_volume.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volume = $service->createVolume([
     'description'    => '{description}',
diff --git a/samples/BlockStorage/v3/volumes/delete.php b/samples/BlockStorage/v3/volumes/delete.php
index 8776244f..4f70cd95 100644
--- a/samples/BlockStorage/v3/volumes/delete.php
+++ b/samples/BlockStorage/v3/volumes/delete.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volume = $service->getVolume('{volumeId}');
 $volume->delete();
diff --git a/samples/BlockStorage/v3/volumes/list.php b/samples/BlockStorage/v3/volumes/list.php
index 5f88fa84..473b6f0b 100644
--- a/samples/BlockStorage/v3/volumes/list.php
+++ b/samples/BlockStorage/v3/volumes/list.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volumes = $service->listVolumes();
 
diff --git a/samples/BlockStorage/v3/volumes/list_detail.php b/samples/BlockStorage/v3/volumes/list_detail.php
index 2029d32c..755606c0 100644
--- a/samples/BlockStorage/v3/volumes/list_detail.php
+++ b/samples/BlockStorage/v3/volumes/list_detail.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 foreach ($service->listVolumes(true) as $volume) {
     /** @var $volume \OpenStack\BlockStorage\v2\Models\Volume */
diff --git a/samples/BlockStorage/v3/volumes/read.php b/samples/BlockStorage/v3/volumes/read.php
index d1de298e..1a3ef135 100644
--- a/samples/BlockStorage/v3/volumes/read.php
+++ b/samples/BlockStorage/v3/volumes/read.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volume = $service->getVolume('{volumeId}');
 $volume->retrieve();
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/volumes/update.php b/samples/BlockStorage/v3/volumes/update.php
index d2ead417..9aaea22e 100644
--- a/samples/BlockStorage/v3/volumes/update.php
+++ b/samples/BlockStorage/v3/volumes/update.php
@@ -11,7 +11,7 @@
     ],
 ]);
 
-$service = $openstack->blockStorageV3();
+$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
 
 $volume = $service->getVolume('{volumeId}');
 
diff --git a/src/Images/v2/Models/Image.php b/src/Images/v2/Models/Image.php
index 9cff176b..5ee322f6 100644
--- a/src/Images/v2/Models/Image.php
+++ b/src/Images/v2/Models/Image.php
@@ -8,6 +8,7 @@
 use OpenStack\Common\Resource\Alias;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
+use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
 use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
@@ -20,6 +21,8 @@
  */
 class Image extends OperatorResource implements Creatable, Listable, Retrievable, Deletable
 {
+    use HasWaiterTrait;
+
     /** @var string */
     public $status;
 
diff --git a/tests/sample/Images/v2/ImageTest.php b/tests/sample/Images/v2/ImageTest.php
index af524d3f..ffb93836 100644
--- a/tests/sample/Images/v2/ImageTest.php
+++ b/tests/sample/Images/v2/ImageTest.php
@@ -18,7 +18,7 @@ public function testCreate(): Image
                 '{tag1}'            => 'ubuntu',
                 '{tag2}'            => 'test',
                 '{containerFormat}' => 'bare',
-                '{diskFormat}'      => 'qcow2',
+                '{diskFormat}'      => 'raw',
                 '{visibility}'      => 'private',
             ]
         );
diff --git a/tests/sample/TestCase.php b/tests/sample/TestCase.php
index 79ef2313..e7c1a7ee 100644
--- a/tests/sample/TestCase.php
+++ b/tests/sample/TestCase.php
@@ -48,7 +48,7 @@ protected function getCachedService(string $serviceType): AbstractService
                 $service = $this->getOpenStack()->blockStorageV2();
                 break;
             case \OpenStack\BlockStorage\v3\Service::class:
-                $service = $this->getOpenStack()->blockStorageV3();
+                $service = $this->getOpenStack()->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
                 break;
             case \OpenStack\Compute\v2\Service::class:
                 $service = $this->getOpenStack()->computeV2();

From 90815bc8ebb88403a6595c1837bc5e93517ade99 Mon Sep 17 00:00:00 2001
From: davemednick <davemednick@users.noreply.github.com>
Date: Thu, 24 Jul 2025 12:00:43 +0000
Subject: [PATCH 096/102] Normalize composer.json

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index fe2767e5..3c6881ca 100644
--- a/composer.json
+++ b/composer.json
@@ -25,9 +25,9 @@
             "homepage": "https://github.com/k0ka"
         },
         {
-          "name": "Dave Mednick",
-          "email": "david.mednick@nexcess.net",
-          "homepage": "https://github.com/davemednick"
+            "name": "Dave Mednick",
+            "email": "david.mednick@nexcess.net",
+            "homepage": "https://github.com/davemednick"
         }
     ],
     "homepage": "https://github.com/php-opencloud/openstack",

From 50e2bbafa45e4cf88ddbba0c7f46a3516a5968e3 Mon Sep 17 00:00:00 2001
From: davemednick <davemednick@users.noreply.github.com>
Date: Thu, 24 Jul 2025 12:00:52 +0000
Subject: [PATCH 097/102] Apply php-cs-fixer changes

---
 src/BlockStorage/Enum.php                     | 46 +++++-----
 src/BlockStorage/v2/Api.php                   |  2 +-
 src/BlockStorage/v2/Models/Volume.php         |  4 +-
 src/BlockStorage/v2/Params.php                |  2 +-
 src/Compute/v2/Api.php                        | 26 +++---
 src/Compute/v2/Models/Aggregate.php           | 16 ++--
 src/Compute/v2/Models/InstanceAction.php      | 19 ++--
 src/Compute/v2/Models/Server.php              | 76 +++++-----------
 src/Compute/v2/Params.php                     |  1 -
 src/Compute/v2/Service.php                    | 68 ++-------------
 src/Networking/v2/Api.php                     | 10 +--
 .../v2/Models/NetworkIpAvailability.php       | 12 +--
 src/Networking/v2/Service.php                 | 87 +------------------
 13 files changed, 101 insertions(+), 268 deletions(-)

diff --git a/src/BlockStorage/Enum.php b/src/BlockStorage/Enum.php
index 31e4c709..26b977ae 100644
--- a/src/BlockStorage/Enum.php
+++ b/src/BlockStorage/Enum.php
@@ -1,33 +1,33 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\BlockStorage\v2;
 
 /**
  * Represents common constants.
- *
- * @package OpenStack\BlockStorage\v2
  */
 abstract class Enum
 {
-    const STATUS_AVAILABLE = 'available';
-    const STATUS_CREATING = 'creating';
-    const STATUS_RESERVED = 'reserved';
-    const STATUS_ATTACHING = 'attaching';
-    const STATUS_DETACHING = 'detaching';
-    const STATUS_IN_USE = 'in-use';
-    const STATUS_MAINTENANCE = 'maintenance';
-    const STATUS_DELETING = 'deleting';
-    const STATUS_AWAITING_TRANSFER = 'awaiting-transfer';
-    const STATUS_ERROR = 'error';
-    const STATUS_ERROR_DELETING = 'error_deleting';
-    const STATUS_BACKING_UP = 'backing-up';
-    const STATUS_ERROR_BACKING_UP = 'error_backing-up';
-    const STATUS_ERROR_RESTORING = 'error_restoring';
-    const STATUS_DOWNLOADING = 'downloading';
-    const STATUS_UPLOADING = 'uploading';
-    const STATUS_RETYPINGi = 'retyping';
-    const STATUS_EXTENDING = 'extending';
+    public const STATUS_AVAILABLE         = 'available';
+    public const STATUS_CREATING          = 'creating';
+    public const STATUS_RESERVED          = 'reserved';
+    public const STATUS_ATTACHING         = 'attaching';
+    public const STATUS_DETACHING         = 'detaching';
+    public const STATUS_IN_USE            = 'in-use';
+    public const STATUS_MAINTENANCE       = 'maintenance';
+    public const STATUS_DELETING          = 'deleting';
+    public const STATUS_AWAITING_TRANSFER = 'awaiting-transfer';
+    public const STATUS_ERROR             = 'error';
+    public const STATUS_ERROR_DELETING    = 'error_deleting';
+    public const STATUS_BACKING_UP        = 'backing-up';
+    public const STATUS_ERROR_BACKING_UP  = 'error_backing-up';
+    public const STATUS_ERROR_RESTORING   = 'error_restoring';
+    public const STATUS_DOWNLOADING       = 'downloading';
+    public const STATUS_UPLOADING         = 'uploading';
+    public const STATUS_RETYPINGi         = 'retyping';
+    public const STATUS_EXTENDING         = 'extending';
 
-    const ATTACH_STATUS_ATTACHED = 'attached';
-    const ATTACH_STATUS_DETACHED = 'detached';
+    public const ATTACH_STATUS_ATTACHED = 'attached';
+    public const ATTACH_STATUS_DETACHED = 'detached';
 }
diff --git a/src/BlockStorage/v2/Api.php b/src/BlockStorage/v2/Api.php
index 645248eb..ba4437f4 100644
--- a/src/BlockStorage/v2/Api.php
+++ b/src/BlockStorage/v2/Api.php
@@ -368,7 +368,7 @@ public function resetVolumeStatus(): array
             'jsonKey' => 'os-reset_status',
             'params'  => [
                 'id'     => $this->params->idPath(),
-                'status' => $this->params->status()
+                'status' => $this->params->status(),
             ],
         ];
     }
diff --git a/src/BlockStorage/v2/Models/Volume.php b/src/BlockStorage/v2/Models/Volume.php
index 4b073293..824c8d73 100644
--- a/src/BlockStorage/v2/Models/Volume.php
+++ b/src/BlockStorage/v2/Models/Volume.php
@@ -158,8 +158,8 @@ public function parseMetadata(ResponseInterface $response): array
     public function extend(int $size_in_gb)
     {
         $response = $this->execute($this->api->extendVolume(), [
-            'id' => $this->id,
-            'new_size' => $size_in_gb
+            'id'       => $this->id,
+            'new_size' => $size_in_gb,
         ]);
         $this->populateFromResponse($response);
     }
diff --git a/src/BlockStorage/v2/Params.php b/src/BlockStorage/v2/Params.php
index 23139048..9a799271 100644
--- a/src/BlockStorage/v2/Params.php
+++ b/src/BlockStorage/v2/Params.php
@@ -273,7 +273,7 @@ public function nullAction(): array
         return [
             'type'     => self::NULL_TYPE,
             'location' => self::JSON,
-            'required' => true
+            'required' => true,
         ];
     }
 
diff --git a/src/Compute/v2/Api.php b/src/Compute/v2/Api.php
index 8412faef..59b48e67 100644
--- a/src/Compute/v2/Api.php
+++ b/src/Compute/v2/Api.php
@@ -332,31 +332,31 @@ public function stopServer(): array
         ];
     }
 
-    public function resumeServer() : array
+    public function resumeServer(): array
     {
         return [
             'method'  => 'POST',
             'path'    => 'servers/{id}/action',
             'params'  => [
                 'id'      => $this->params->urlId('server'),
-                'resume' => $this->params->nullAction()
+                'resume'  => $this->params->nullAction(),
             ],
         ];
     }
 
-    public function suspendServer() : array
+    public function suspendServer(): array
     {
         return [
             'method'  => 'POST',
             'path'    => 'servers/{id}/action',
             'params'  => [
                 'id'      => $this->params->urlId('server'),
-                'suspend' => $this->params->nullAction()
+                'suspend' => $this->params->nullAction(),
             ],
         ];
     }
 
-    public function shelveServer() : array
+    public function shelveServer(): array
     {
         return [
             'method'  => 'POST',
@@ -368,50 +368,50 @@ public function shelveServer() : array
         ];
     }
 
-    public function shelveOffloadServer() : array
+    public function shelveOffloadServer(): array
     {
         return [
             'method'  => 'POST',
             'path'    => 'servers/{id}/action',
             'params'  => [
                 'id'            => $this->params->urlId('server'),
-                'shelveOffload' => $this->params->nullAction()
+                'shelveOffload' => $this->params->nullAction(),
             ],
         ];
     }
 
-    public function unshelveServer() : array
+    public function unshelveServer(): array
     {
         return [
             'method'  => 'POST',
             'path'    => 'servers/{id}/action',
             'params'  => [
                 'id'       => $this->params->urlId('server'),
-                'unshelve' => $this->params->nullAction()
+                'unshelve' => $this->params->nullAction(),
             ],
         ];
     }
 
-    public function lockServer() : array
+    public function lockServer(): array
     {
         return [
             'method'  => 'POST',
             'path'    => 'servers/{id}/action',
             'params'  => [
                 'id'   => $this->params->urlId('server'),
-                'lock' => $this->params->nullAction()
+                'lock' => $this->params->nullAction(),
             ],
         ];
     }
 
-    public function unlockServer() : array
+    public function unlockServer(): array
     {
         return [
             'method'  => 'POST',
             'path'    => 'servers/{id}/action',
             'params'  => [
                 'id'     => $this->params->urlId('server'),
-                'unlock' => $this->params->nullAction()
+                'unlock' => $this->params->nullAction(),
             ],
         ];
     }
diff --git a/src/Compute/v2/Models/Aggregate.php b/src/Compute/v2/Models/Aggregate.php
index 223b1696..227948ec 100644
--- a/src/Compute/v2/Models/Aggregate.php
+++ b/src/Compute/v2/Models/Aggregate.php
@@ -1,17 +1,17 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
 use OpenStack\Common\Resource\Listable;
-use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\OperatorResource;
+use OpenStack\Common\Resource\Retrievable;
 
 /**
  * @property \OpenStack\Compute\v2\Api $api
  */
-class Aggregate extends OperatorResource implements
-    Retrievable,
-    Listable
+class Aggregate extends OperatorResource implements Retrievable, Listable
 {
     /** @var int */
     public $id;
@@ -25,7 +25,7 @@ class Aggregate extends OperatorResource implements
     /** @var string */
     public $deletedAt;
 
-    /** @var boolean */
+    /** @var bool */
     public $deleted;
 
     /** @var array */
@@ -43,14 +43,14 @@ class Aggregate extends OperatorResource implements
     /** @var string */
     public $uuid;
 
-    protected $resourceKey = 'aggregate';
+    protected $resourceKey  = 'aggregate';
     protected $resourcesKey = 'aggregates';
 
     protected $aliases = [
       'availability_zone' => 'availabilityZone',
       'created_at'        => 'createdAt',
       'deleted_at'        => 'deletedAt',
-      'updated_at'        => 'updatedAt'
+      'updated_at'        => 'updatedAt',
     ];
 
     /**
diff --git a/src/Compute/v2/Models/InstanceAction.php b/src/Compute/v2/Models/InstanceAction.php
index 52e889ca..8a0991fe 100644
--- a/src/Compute/v2/Models/InstanceAction.php
+++ b/src/Compute/v2/Models/InstanceAction.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\Compute\v2\Models;
 
@@ -8,10 +10,8 @@
 /**
  * @property \OpenStack\Compute\v2\Api $api
  */
-class InstanceAction extends OperatorResource implements
-    Listable
+class InstanceAction extends OperatorResource implements Listable
 {
-
     /** @var string */
     public $requestId;
 
@@ -30,15 +30,14 @@ class InstanceAction extends OperatorResource implements
     /** @var array */
     public $events;
 
-    protected $resourceKey = 'instanceAction';
+    protected $resourceKey  = 'instanceAction';
     protected $resourcesKey = 'instanceActions';
 
     protected $aliases = [
       'instance_uuid' => 'instanceUuid',
-      'project_id' => 'projectId',
-      'request_id' => 'requestId',
-      'start_time' => 'startTime',
-      'user_id' => 'userId'
+      'project_id'    => 'projectId',
+      'request_id'    => 'requestId',
+      'start_time'    => 'startTime',
+      'user_id'       => 'userId',
     ];
-
 }
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index 6c397914..58ac3772 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -4,19 +4,19 @@
 
 namespace OpenStack\Compute\v2\Models;
 
+use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
 use OpenStack\Common\Resource\Alias;
-use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Creatable;
 use OpenStack\Common\Resource\Deletable;
+use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Common\Resource\Updateable;
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Transport\Utils;
-use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
-use OpenStack\Networking\v2\Models\InterfaceAttachment;
 use OpenStack\Compute\v2\Enum;
 use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
+use OpenStack\Networking\v2\Models\InterfaceAttachment;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -232,13 +232,13 @@ public function stop()
     }
 
     /**
-     * Shelves server
+     * Shelves server.
      */
     public function shelve()
     {
         $this->execute($this->api->shelveServer(), [
-            'id' => $this->id,
-            'shelve' => null
+            'id'     => $this->id,
+            'shelve' => null,
         ]);
     }
 
@@ -248,30 +248,30 @@ public function shelve()
     public function suspend()
     {
         $this->execute($this->api->suspendServer(), [
-            'id' => $this->id,
-            'suspend' => null
+            'id'      => $this->id,
+            'suspend' => null,
         ]);
     }
 
     /**
-     * Shelf-offloads server
+     * Shelf-offloads server.
      */
     public function shelveOffload()
     {
         $this->execute($this->api->shelveOffloadServer(), [
-            'id' => $this->id,
-            'shelveOffload' => null
+            'id'            => $this->id,
+            'shelveOffload' => null,
         ]);
     }
 
     /**
-     * Unshelves server
+     * Unshelves server.
      */
     public function unshelve()
     {
         $this->execute($this->api->unshelveServer(), [
-            'id' => $this->id,
-            'unshelve' => null
+            'id'       => $this->id,
+            'unshelve' => null,
         ]);
     }
 
@@ -281,30 +281,30 @@ public function unshelve()
     public function resume()
     {
         $this->execute($this->api->resumeServer(), [
-            'id' => $this->id,
-            'resume' => null
+            'id'     => $this->id,
+            'resume' => null,
         ]);
     }
 
     /**
-     * Locks server
+     * Locks server.
      */
     public function lock()
     {
         $this->execute($this->api->lockServer(), [
-            'id' => $this->id,
-            'lock' => null
+            'id'   => $this->id,
+            'lock' => null,
         ]);
     }
 
     /**
-     * Unlocks server
+     * Unlocks server.
      */
     public function unlock()
     {
         $this->execute($this->api->unlockServer(), [
-            'id' => $this->id,
-            'unlock' => null
+            'id'     => $this->id,
+            'unlock' => null,
         ]);
     }
 
@@ -325,8 +325,6 @@ public function rebuild(array $options)
      * Rescues the server.
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::rescueServer}
-     *
-     * @return string
      */
     public function rescue(array $options): string
     {
@@ -380,8 +378,6 @@ public function revertResize()
      * Gets the console output of the server.
      *
      * @param int $length the number of lines, by default all lines will be returned
-     *
-     * @return string
      */
     public function getConsoleOutput(int $length = -1): string
     {
@@ -401,8 +397,6 @@ public function getConsoleOutput(int $length = -1): string
      *
      * @param string $type the type of VNC console: novnc|xvpvnc.
      *                     Defaults to novnc
-     *
-     * @return array
      */
     public function getVncConsole($type = Enum::CONSOLE_NOVNC): array
     {
@@ -415,8 +409,6 @@ public function getVncConsole($type = Enum::CONSOLE_NOVNC): array
      * Gets a RDP console for a server.
      *
      * @param string $type the type of VNC console: rdp-html5 (default)
-     *
-     * @return array
      */
     public function getRDPConsole($type = Enum::CONSOLE_RDP_HTML5): array
     {
@@ -429,8 +421,6 @@ public function getRDPConsole($type = Enum::CONSOLE_RDP_HTML5): array
      * Gets a Spice console for a server.
      *
      * @param string $type the type of VNC console: spice-html5
-     *
-     * @return array
      */
     public function getSpiceConsole($type = Enum::CONSOLE_SPICE_HTML5): array
     {
@@ -443,8 +433,6 @@ public function getSpiceConsole($type = Enum::CONSOLE_SPICE_HTML5): array
      * Gets a serial console for a server.
      *
      * @param string $type the type of VNC console: serial
-     *
-     * @return array
      */
     public function getSerialConsole($type = Enum::CONSOLE_SERIAL): array
     {
@@ -483,8 +471,6 @@ public function listAddresses(array $options = []): array
 
     /**
      * Returns Generator for InterfaceAttachment.
-     *
-     * @return \Generator
      */
     public function listInterfaceAttachments(array $options = []): \Generator
     {
@@ -495,8 +481,6 @@ public function listInterfaceAttachments(array $options = []): \Generator
      * Gets an interface attachment.
      *
      * @param string $portId the unique ID of the port
-     *
-     * @return InterfaceAttachment
      */
     public function getInterfaceAttachment(string $portId): InterfaceAttachment
     {
@@ -512,8 +496,6 @@ public function getInterfaceAttachment(string $portId): InterfaceAttachment
      * Creates an interface attachment.
      *
      * @param array $userOptions {@see \OpenStack\Compute\v2\Api::postInterfaceAttachment}
-     *
-     * @return InterfaceAttachment
      */
     public function createInterfaceAttachment(array $userOptions): InterfaceAttachment
     {
@@ -528,8 +510,6 @@ public function createInterfaceAttachment(array $userOptions): InterfaceAttachme
 
     /**
      * Detaches an interface attachment.
-     *
-     * @param string $portId
      */
     public function detachInterface(string $portId)
     {
@@ -541,8 +521,6 @@ public function detachInterface(string $portId)
 
     /**
      * Retrieves metadata from the API.
-     *
-     * @return array
      */
     public function getMetadata(): array
     {
@@ -612,8 +590,6 @@ public function deleteMetadataItem(string $key)
      * Add security group to a server (addSecurityGroup action).
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::postSecurityGroup}
-     *
-     * @return SecurityGroup
      */
     public function addSecurityGroup(array $options): SecurityGroup
     {
@@ -642,8 +618,6 @@ public function parseMetadata(ResponseInterface $response): array
 
     /**
      * Returns Generator for SecurityGroups.
-     *
-     * @return \Generator
      */
     public function listSecurityGroups(): \Generator
     {
@@ -652,8 +626,6 @@ public function listSecurityGroups(): \Generator
 
     /**
      * Returns Generator for VolumeAttachment.
-     *
-     * @return \Generator
      */
     public function listVolumeAttachments(): \Generator
     {
@@ -664,8 +636,6 @@ public function listVolumeAttachments(): \Generator
      * Attach a volume and returns volume that was attached.
      *
      * @param $volumeId
-     *
-     * @return VolumeAttachment
      */
     public function attachVolume(string $volumeId): VolumeAttachment
     {
diff --git a/src/Compute/v2/Params.php b/src/Compute/v2/Params.php
index 002ebddc..b8a8b73e 100644
--- a/src/Compute/v2/Params.php
+++ b/src/Compute/v2/Params.php
@@ -662,5 +662,4 @@ public function quotaSetLimitServerGroupMembers(): array
     {
         return $this->quotaSetLimit('server_group_members', 'The number of allowed members for each server group.');
     }
-
 }
diff --git a/src/Compute/v2/Service.php b/src/Compute/v2/Service.php
index 76214233..3b4eeeea 100644
--- a/src/Compute/v2/Service.php
+++ b/src/Compute/v2/Service.php
@@ -5,17 +5,17 @@
 namespace OpenStack\Compute\v2;
 
 use OpenStack\Common\Service\AbstractService;
+use OpenStack\Compute\v2\Models\Aggregate;
+use OpenStack\Compute\v2\Models\AvailabilityZone;
 use OpenStack\Compute\v2\Models\Flavor;
+use OpenStack\Compute\v2\Models\Host;
+use OpenStack\Compute\v2\Models\Hypervisor;
 use OpenStack\Compute\v2\Models\HypervisorStatistic;
 use OpenStack\Compute\v2\Models\Image;
 use OpenStack\Compute\v2\Models\Keypair;
 use OpenStack\Compute\v2\Models\Limit;
-use OpenStack\Compute\v2\Models\Server;
-use OpenStack\Compute\v2\Models\Host;
-use OpenStack\Compute\v2\Models\Hypervisor;
-use OpenStack\Compute\v2\Models\AvailabilityZone;
 use OpenStack\Compute\v2\Models\QuotaSet;
-use OpenStack\Compute\v2\Models\Aggregate;
+use OpenStack\Compute\v2\Models\Server;
 
 /**
  * Compute v2 service for OpenStack.
@@ -29,8 +29,6 @@ class Service extends AbstractService
      * service API.
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::postServer}
-     *
-     * @return \OpenStack\Compute\v2\Models\Server
      */
     public function createServer(array $options): Server
     {
@@ -44,8 +42,6 @@ public function createServer(array $options): Server
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getServers}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listServers(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
     {
@@ -63,8 +59,6 @@ public function listServers(bool $detailed = false, array $options = [], callabl
      *
      * @param array $options An array of attributes that will be set on the {@see Server} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Server
      */
     public function getServer(array $options = []): Server
     {
@@ -80,8 +74,6 @@ public function getServer(array $options = []): Server
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getFlavors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
      * @param bool     $detailed set to true to fetch flavors' details
-     *
-     * @return \Generator
      */
     public function listFlavors(array $options = [], callable $mapFn = null, bool $detailed = false): \Generator
     {
@@ -97,8 +89,6 @@ public function listFlavors(array $options = [], callable $mapFn = null, bool $d
      *
      * @param array $options An array of attributes that will be set on the {@see Flavor} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Flavor
      */
     public function getFlavor(array $options = []): Flavor
     {
@@ -112,8 +102,6 @@ public function getFlavor(array $options = []): Flavor
      * Create a new flavor resource.
      *
      * @param array $options {@see \OpenStack\Compute\v2\Api::postFlavors}
-     *
-     * @return Flavor
      */
     public function createFlavor(array $options = []): Flavor
     {
@@ -125,8 +113,6 @@ public function createFlavor(array $options = []): Flavor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getImages}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listImages(array $options = [], callable $mapFn = null): \Generator
     {
@@ -140,8 +126,6 @@ public function listImages(array $options = [], callable $mapFn = null): \Genera
      *
      * @param array $options An array of attributes that will be set on the {@see Image} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Image
      */
     public function getImage(array $options = []): Image
     {
@@ -156,8 +140,6 @@ public function getImage(array $options = []): Image
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getKeyPairs}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listKeypairs(array $options = [], callable $mapFn = null): \Generator
     {
@@ -166,10 +148,6 @@ public function listKeypairs(array $options = [], callable $mapFn = null): \Gene
 
     /**
      * Create or import keypair.
-     *
-     * @param array $options
-     *
-     * @return Keypair
      */
     public function createKeypair(array $options): Keypair
     {
@@ -178,10 +156,6 @@ public function createKeypair(array $options): Keypair
 
     /**
      * Get keypair.
-     *
-     * @param array $options
-     *
-     * @return Keypair
      */
     public function getKeypair(array $options = []): Keypair
     {
@@ -193,8 +167,6 @@ public function getKeypair(array $options = []): Keypair
 
     /**
      * Shows rate and absolute limits for the tenant.
-     *
-     * @return Limit
      */
     public function getLimits(): Limit
     {
@@ -206,8 +178,6 @@ public function getLimits(): Limit
 
     /**
      * Shows summary statistics for all hypervisors over all compute nodes.
-     *
-     * @return HypervisorStatistic
      */
     public function getHypervisorStatistics(): HypervisorStatistic
     {
@@ -224,8 +194,6 @@ public function getHypervisorStatistics(): HypervisorStatistic
      *                           the ID, name and links attributes are returned, saving bandwidth.
      * @param array    $options  {@see \OpenStack\Compute\v2\Api::getHypervisors}
      * @param callable $mapFn    a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listHypervisors(bool $detailed = false, array $options = [], callable $mapFn = null): \Generator
     {
@@ -236,10 +204,6 @@ public function listHypervisors(bool $detailed = false, array $options = [], cal
 
     /**
      * Shows details for a given hypervisor.
-     *
-     * @param array $options
-     *
-     * @return Hypervisor
      */
     public function getHypervisor(array $options = []): Hypervisor
     {
@@ -253,8 +217,6 @@ public function getHypervisor(array $options = []): Hypervisor
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getHosts}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listHosts(array $options = [], callable $mapFn = null): \Generator
     {
@@ -270,8 +232,6 @@ public function listHosts(array $options = [], callable $mapFn = null): \Generat
      *
      * @param array $options An array of attributes that will be set on the {@see Host} object. The array keys need to
      *                       correspond to the class public properties.
-     *
-     * @return \OpenStack\Compute\v2\Models\Host
      */
     public function getHost(array $options = []): Host
     {
@@ -286,8 +246,6 @@ public function getHost(array $options = []): Host
      *
      * @param array    $options {@see \OpenStack\Compute\v2\Api::getAvailabilityZones}
      * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
-     *
-     * @return \Generator
      */
     public function listAvailabilityZones(array $options = [], callable $mapFn = null): \Generator
     {
@@ -296,11 +254,6 @@ public function listAvailabilityZones(array $options = [], callable $mapFn = nul
 
     /**
      * Shows A Quota for a tenant.
-     *
-     * @param string $tenantId
-     * @param bool   $detailed
-     *
-     * @return QuotaSet
      */
     public function getQuotaSet(string $tenantId, bool $detailed = false): QuotaSet
     {
@@ -313,10 +266,8 @@ public function getQuotaSet(string $tenantId, bool $detailed = false): QuotaSet
     /**
      * List host aggregates.
      *
-     * @param array    $options  {@see \OpenStack\Compute\v2\Api::getAggregates}
-     * @param callable $mapFn    A callable function that will be invoked on every iteration of the list.
-     *
-     * @return \Generator
+     * @param array    $options {@see \OpenStack\Compute\v2\Api::getAggregates}
+     * @param callable $mapFn   a callable function that will be invoked on every iteration of the list
      */
     public function listAggregates(array $options = [], callable $mapFn = null): \Generator
     {
@@ -325,14 +276,11 @@ public function listAggregates(array $options = [], callable $mapFn = null): \Ge
 
     /**
      * Shows details for a given host aggregate.
-     *
-     * @param array $options
-     *
-     * @return Aggregate
      */
     public function getAggregate(array $options = []): Aggregate
     {
         $aggregate = $this->model(Aggregate::class);
+
         return $aggregate->populateFromArray($options);
     }
 }
diff --git a/src/Networking/v2/Api.php b/src/Networking/v2/Api.php
index 107f0a74..e34ce11c 100644
--- a/src/Networking/v2/Api.php
+++ b/src/Networking/v2/Api.php
@@ -709,11 +709,11 @@ public function deleteLoadBalancerHealthMonitor(): array
         ];
     }
 
-    public function getNetworkIpAvailability() : array
+    public function getNetworkIpAvailability(): array
     {
         return [
             'method' => 'GET',
-            'path'   => $this->pathPrefix . '/network-ip-availabilities/{id}',
+            'path'   => $this->pathPrefix.'/network-ip-availabilities/{id}',
             'params' => ['id' => $this->params->urlId('network')],
         ];
     }
@@ -722,10 +722,10 @@ public function getNetworkIpAvailabilities(): array
     {
         return [
             'method' => 'GET',
-            'path'   => $this->pathPrefix . '/network-ip-availabilities',
+            'path'   => $this->pathPrefix.'/network-ip-availabilities',
             'params' => [
-                'tenantId' => $this->params->queryTenantId()
-            ]
+                'tenantId' => $this->params->queryTenantId(),
+            ],
         ];
     }
 }
diff --git a/src/Networking/v2/Models/NetworkIpAvailability.php b/src/Networking/v2/Models/NetworkIpAvailability.php
index 3fd20be2..db27f4cb 100644
--- a/src/Networking/v2/Models/NetworkIpAvailability.php
+++ b/src/Networking/v2/Models/NetworkIpAvailability.php
@@ -1,10 +1,12 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace OpenStack\Networking\v2\Models;
 
-use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\HasWaiterTrait;
 use OpenStack\Common\Resource\Listable;
+use OpenStack\Common\Resource\OperatorResource;
 use OpenStack\Common\Resource\Retrievable;
 
 /**
@@ -44,10 +46,10 @@ class NetworkIpAvailability extends OperatorResource implements Listable, Retrie
         'project_id'             => 'projectId',
         'total_ips'              => 'totalIps',
         'used_ips'               => 'usedIps',
-        'subnet_ip_availability' => 'subnetIpAvailability'
+        'subnet_ip_availability' => 'subnetIpAvailability',
     ];
 
-    protected $resourceKey = 'network_ip_availability';
+    protected $resourceKey  = 'network_ip_availability';
     protected $resourcesKey = 'network_ip_availabilities';
 
     /**
@@ -55,7 +57,7 @@ class NetworkIpAvailability extends OperatorResource implements Listable, Retrie
      */
     public function retrieve()
     {
-        $response = $this->execute($this->api->getNetworkIpAvailability(), ['id' => (string)$this->id]);
+        $response = $this->execute($this->api->getNetworkIpAvailability(), ['id' => (string) $this->id]);
         $this->populateFromResponse($response);
     }
 }
diff --git a/src/Networking/v2/Service.php b/src/Networking/v2/Service.php
index f7b74cdf..0d0bfc7c 100644
--- a/src/Networking/v2/Service.php
+++ b/src/Networking/v2/Service.php
@@ -28,8 +28,6 @@ class Service extends AbstractService
      * Create a new network resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postNetwork}
-     *
-     * @return Network
      */
     public function createNetwork(array $options): Network
     {
@@ -40,8 +38,6 @@ public function createNetwork(array $options): Network
      * Create a new network resources.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postNetworks}
-     *
-     * @return array
      */
     public function createNetworks(array $options): array
     {
@@ -52,10 +48,6 @@ public function createNetworks(array $options): array
      * Retrieve a network object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Network::retrieve}.
-     *
-     * @param string $id
-     *
-     * @return Network
      */
     public function getNetwork(string $id): Network
     {
@@ -66,8 +58,6 @@ public function getNetwork(string $id): Network
      * List networks.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getNetworks}
-     *
-     * @return \Generator
      */
     public function listNetworks(array $options = []): \Generator
     {
@@ -78,8 +68,6 @@ public function listNetworks(array $options = []): \Generator
      * Create a new subnet resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postSubnet}
-     *
-     * @return Subnet
      */
     public function createSubnet(array $options): Subnet
     {
@@ -102,10 +90,6 @@ public function createSubnets(array $options): array
      * Retrieve a subnet object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Subnet::retrieve}.
-     *
-     * @param string $id
-     *
-     * @return Subnet
      */
     public function getSubnet(string $id): Subnet
     {
@@ -116,8 +100,6 @@ public function getSubnet(string $id): Subnet
      * List subnets.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getSubnets}
-     *
-     * @return \Generator
      */
     public function listSubnets(array $options = []): \Generator
     {
@@ -128,8 +110,6 @@ public function listSubnets(array $options = []): \Generator
      * Create a new port resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postSinglePort}
-     *
-     * @return Port
      */
     public function createPort(array $options): Port
     {
@@ -152,10 +132,6 @@ public function createPorts(array $options): array
      * Retrieve a subnet object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Port::retrieve}.
-     *
-     * @param string $id
-     *
-     * @return Port
      */
     public function getPort(string $id): Port
     {
@@ -166,8 +142,6 @@ public function getPort(string $id): Port
      * List ports.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getPorts}
-     *
-     * @return \Generator
      */
     public function listPorts(array $options = []): \Generator
     {
@@ -176,8 +150,6 @@ public function listPorts(array $options = []): \Generator
 
     /**
      * Lists quotas for projects with non-default quota values.
-     *
-     * @return \Generator
      */
     public function listQuotas(): \Generator
     {
@@ -190,10 +162,6 @@ public function listQuotas(): \Generator
      * Retrieve a quota object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see Quota::retrieve}.
-     *
-     * @param string $tenantId
-     *
-     * @return Quota
      */
     public function getQuota(string $tenantId): Quota
     {
@@ -202,10 +170,6 @@ public function getQuota(string $tenantId): Quota
 
     /**
      * Lists default quotas for a project.
-     *
-     * @param string $tenantId
-     *
-     * @return Quota
      */
     public function getDefaultQuota(string $tenantId): Quota
     {
@@ -217,8 +181,6 @@ public function getDefaultQuota(string $tenantId): Quota
 
     /**
      * Lists loadbalancers for projects.
-     *
-     * @return \Generator
      */
     public function listLoadBalancers(): \Generator
     {
@@ -227,10 +189,6 @@ public function listLoadBalancers(): \Generator
 
     /**
      * Retrieve an instance of a LoadBalancer object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancer
      */
     public function getLoadBalancer(string $id): LoadBalancer
     {
@@ -241,8 +199,6 @@ public function getLoadBalancer(string $id): LoadBalancer
      * Create a new loadbalancer resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancer}
-     *
-     * @return LoadBalancer
      */
     public function createLoadBalancer(array $options): LoadBalancer
     {
@@ -251,8 +207,6 @@ public function createLoadBalancer(array $options): LoadBalancer
 
     /**
      * Lists loadbalancer listeners.
-     *
-     * @return \Generator
      */
     public function listLoadBalancerListeners(): \Generator
     {
@@ -261,10 +215,6 @@ public function listLoadBalancerListeners(): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer listener object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancerListener
      */
     public function getLoadBalancerListener(string $id): LoadBalancerListener
     {
@@ -275,8 +225,6 @@ public function getLoadBalancerListener(string $id): LoadBalancerListener
      * Create a new loadbalancer Listener resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerListener}
-     *
-     * @return LoadBalancerListener
      */
     public function createLoadBalancerListener(array $options): LoadBalancerListener
     {
@@ -285,8 +233,6 @@ public function createLoadBalancerListener(array $options): LoadBalancerListener
 
     /**
      * Lists loadbalancer pools.
-     *
-     * @return \Generator
      */
     public function listLoadBalancerPools(): \Generator
     {
@@ -295,10 +241,6 @@ public function listLoadBalancerPools(): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer Pool object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancerPool
      */
     public function getLoadBalancerPool(string $id): LoadBalancerPool
     {
@@ -309,8 +251,6 @@ public function getLoadBalancerPool(string $id): LoadBalancerPool
      * Create a new loadbalancer Pool resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerPool}
-     *
-     * @return LoadBalancerPool
      */
     public function createLoadBalancerPool(array $options): LoadBalancerPool
     {
@@ -319,10 +259,6 @@ public function createLoadBalancerPool(array $options): LoadBalancerPool
 
     /**
      * Lists loadbalancer members.
-     *
-     * @param string $poolId
-     *
-     * @return \Generator
      */
     public function listLoadBalancerMembers(string $poolId): \Generator
     {
@@ -331,11 +267,6 @@ public function listLoadBalancerMembers(string $poolId): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer Member object.
-     *
-     * @param string $poolId
-     * @param string $memberId
-     *
-     * @return LoadBalancerMember
      */
     public function getLoadBalancerMember(string $poolId, string $memberId): LoadBalancerMember
     {
@@ -346,8 +277,6 @@ public function getLoadBalancerMember(string $poolId, string $memberId): LoadBal
      * Create a new loadbalancer member resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerMember}
-     *
-     * @return LoadBalancerMember
      */
     public function createLoadBalancerMember(array $options): LoadBalancerMember
     {
@@ -356,8 +285,6 @@ public function createLoadBalancerMember(array $options): LoadBalancerMember
 
     /**
      * Lists loadbalancer healthmonitors.
-     *
-     * @return \Generator
      */
     public function listLoadBalancerHealthMonitors(): \Generator
     {
@@ -366,10 +293,6 @@ public function listLoadBalancerHealthMonitors(): \Generator
 
     /**
      * Retrieve an instance of a loadbalancer healthmonitor object.
-     *
-     * @param string $id
-     *
-     * @return LoadBalancerHealthMonitor
      */
     public function getLoadBalancerHealthMonitor(string $id): LoadBalancerHealthMonitor
     {
@@ -380,8 +303,6 @@ public function getLoadBalancerHealthMonitor(string $id): LoadBalancerHealthMoni
      * Create a new loadbalancer healthmonitor resource.
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::postLoadBalancerHealthMonitor}
-     *
-     * @return LoadBalancerHealthMonitor
      */
     public function createLoadBalancerHealthMonitor(array $options): LoadBalancerHealthMonitor
     {
@@ -392,10 +313,6 @@ public function createLoadBalancerHealthMonitor(array $options): LoadBalancerHea
      * Retrieve a network IP availability object without calling the remote API. Any values provided in the array will populate the
      * empty object, allowing you greater control without the expense of network transactions. To call the remote API
      * and have the response populate the object, call {@see NetworkIpAvailabilities::retrieve}.
-     *
-     * @param string $id
-     *
-     * @return NetworkIpAvailability
      */
     public function getNetworkIpAvailability(string $id): NetworkIpAvailability
     {
@@ -403,11 +320,9 @@ public function getNetworkIpAvailability(string $id): NetworkIpAvailability
     }
 
     /**
-     * List network IP availability(es)
+     * List network IP availability(es).
      *
      * @param array $options {@see \OpenStack\Networking\v2\Api::getNetworkIpAvailabilities()
-     *
-     * @return \Generator
      */
     public function listNetworkIpAvailabilities(array $options = []): \Generator
     {

From 908ce680545bf3c10aeefc13d47aa27db4f03cd5 Mon Sep 17 00:00:00 2001
From: davemednick <93415315+davemednick@users.noreply.github.com>
Date: Thu, 24 Jul 2025 08:28:04 -0400
Subject: [PATCH 098/102] fix: add commits

---
 src/BlockStorage/v2/Api.php                 |  19 +
 src/BlockStorage/v2/Params.php              |  20 +
 src/Compute/v2/Api.php                      |  78 ++
 src/Compute/v2/Models/Server.php            |  38 +
 src/Compute/v2/Params.php                   |   1 -
 tests/integration/Compute/v2/CoreTest.php   | 753 ++++++++++++++++++++
 tests/unit/Compute/v2/Models/ServerTest.php |  18 -
 7 files changed, 908 insertions(+), 19 deletions(-)
 create mode 100644 tests/integration/Compute/v2/CoreTest.php

diff --git a/src/BlockStorage/v2/Api.php b/src/BlockStorage/v2/Api.php
index 645248eb..08a2ceaa 100644
--- a/src/BlockStorage/v2/Api.php
+++ b/src/BlockStorage/v2/Api.php
@@ -372,4 +372,23 @@ public function resetVolumeStatus(): array
             ],
         ];
     }
+
+    public function resetStatus(string $status)
+    {
+        $response = $this->execute($this->api->resetVolumeStatus(), [
+            'id' => $this->id,
+            'status' => $status
+        ]);
+        $this->populateFromResponse($response);
+    }
+
+
+    public function extend(int $size_in_gb)
+    {
+        $response = $this->execute($this->api->extendVolume(), [
+            'id' => $this->id,
+            'new_size' => $size_in_gb
+        ]);
+        $this->populateFromResponse($response);
+    }
 }
diff --git a/src/BlockStorage/v2/Params.php b/src/BlockStorage/v2/Params.php
index 23139048..3b44f29b 100644
--- a/src/BlockStorage/v2/Params.php
+++ b/src/BlockStorage/v2/Params.php
@@ -296,4 +296,24 @@ public function projectId(): array
             'description' => 'The UUID of the project in a multi-tenancy cloud.',
         ];
     }
+
+
+    public function nullAction(): array
+    {
+        return [
+            'type'     => self::NULL_TYPE,
+            'location' => self::JSON,
+            'required' => true
+        ];
+    }
+
+    public function status(): array
+    {
+        return [
+            'type'        => self::STRING_TYPE,
+            'location'    => self::JSON,
+            'required'    => true,
+            'description' => 'The new status of the volume',
+        ];
+    }
 }
diff --git a/src/Compute/v2/Api.php b/src/Compute/v2/Api.php
index 8412faef..1ca212e5 100644
--- a/src/Compute/v2/Api.php
+++ b/src/Compute/v2/Api.php
@@ -973,4 +973,82 @@ public function putQuotaSet(): array
             ],
         ];
     }
+
+    public function getAggregates(): array
+    {
+        return [
+            'method'  => 'GET',
+            'path'    => 'os-aggregates',
+            'jsonKey' => 'aggregates',
+            'params'  => [
+                'limit'  => $this->params->limit(),
+                'marker' => $this->params->marker()
+            ],
+        ];
+    }
+
+    public function getAggregate(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => 'os-aggregates/{id}',
+            'params' => ['id' => $this->params->urlId('id')]
+        ];
+    }
+
+    public function getConsoleLog(): array
+    {
+        return [
+            'method' => 'POST',
+            'path' => 'servers/{id}/action',
+            'jsonKey' => 'os-getConsoleOutput',
+            'params' => [
+                'id' => $this->params->urlId('server'),
+                'length' => $this->params->consoleLogLength()
+            ]
+        ];
+    }
+
+    public function getInstanceActions(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => 'servers/{id}/os-instance-actions',
+            'params' => [
+                'id' => $this->params->urlId('server')
+            ]
+        ];
+    }
+
+    public function getInstanceAction(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => 'servers/{id}/os-instance-actions/{requestId}',
+            'params' => [
+                'id'        => $this->params->urlId('server'),
+                'requestId' => $this->params->urlId('request')
+            ]
+        ];
+    }
+
+    public function getNetworkIpAvailability() : array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix . '/network-ip-availabilities/{id}',
+            'params' => ['id' => $this->params->urlId('network')],
+        ];
+    }
+
+    public function getNetworkIpAvailabilities(): array
+    {
+        return [
+            'method' => 'GET',
+            'path'   => $this->pathPrefix . '/network-ip-availabilities',
+            'params' => [
+                'tenantId' => $this->params->queryTenantId()
+            ]
+        ];
+    }
 }
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index 6c397914..9efdbfd1 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -683,4 +683,42 @@ public function detachVolume(string $attachmentId)
     {
         $this->execute($this->api->deleteVolumeAttachments(), ['id' => $this->id, 'attachmentId' => $attachmentId]);
     }
+
+
+    /**
+     * Get the console log.
+     *
+     * @param int $length Number of lines of console log to grab.
+     *
+     * @return string - the console log output
+     */
+    public function getConsoleLog(int $length = 50): string
+    {
+        $response = $this->execute($this->api->getConsoleLog(), ['id' => $this->id, 'length' => $length]);
+        return Utils::jsonDecode($response)['output'];
+    }
+
+
+    /**
+     * Get a Generator for the instance actions
+     *
+     * @return \Generator
+     */
+    public function listInstanceActions(): \Generator
+    {
+        return $this->model(InstanceAction::class)->enumerate($this->api->getInstanceActions(), ['id' => $this->id]);
+    }
+
+    /**
+     * Get a specific instance action
+     *
+     * @string The request ID of the instance action
+     * @return InstanceAction
+     */
+    public function getInstanceAction(string $requestId): InstanceAction
+    {
+        $response = $this->execute($this->api->getInstanceAction(), ['id' => $this->id, 'requestId' => $requestId]);
+
+        return $this->model(InstanceAction::class)->populateFromResponse($response);
+    }
 }
diff --git a/src/Compute/v2/Params.php b/src/Compute/v2/Params.php
index 002ebddc..b8a8b73e 100644
--- a/src/Compute/v2/Params.php
+++ b/src/Compute/v2/Params.php
@@ -662,5 +662,4 @@ public function quotaSetLimitServerGroupMembers(): array
     {
         return $this->quotaSetLimit('server_group_members', 'The number of allowed members for each server group.');
     }
-
 }
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
new file mode 100644
index 00000000..201d26c4
--- /dev/null
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -0,0 +1,753 @@
+<?php
+
+namespace OpenStack\Integration\Compute\v2;
+
+use OpenStack\BlockStorage\v2\Models\Volume;
+use OpenStack\Compute\v2\Models\Flavor;
+use OpenStack\Compute\v2\Models\HypervisorStatistic;
+use OpenStack\Compute\v2\Models\Hypervisor;
+use OpenStack\Compute\v2\Models\Image;
+use OpenStack\Compute\v2\Models\Keypair;
+use OpenStack\Compute\v2\Models\Limit;
+use OpenStack\Compute\v2\Models\Server;
+use OpenStack\Integration\TestCase;
+use OpenStack\Integration\Utils;
+use OpenStack\Networking\v2\Models\Network;
+use OpenStack\Networking\v2\Models\Subnet;
+use OpenStack\Networking\v2\Service as NetworkService;
+use OpenStack\BlockStorage\v2\Service as BlockStorageService;
+
+class CoreTest extends TestCase
+{
+    // Test environment constants
+    const NETWORK = 'phptest_network';
+    const SUBNET = 'phptest_subnet';
+    const VOLUME = 'phptest_volume';
+
+    const IMAGE = 'cirros';
+
+    /** @var NetworkService */
+    private $networkService;
+
+    /** @var BlockStorageService */
+    private $blockStorageService;
+
+    /** @var  Network */
+    private $network;
+
+    /** @var  Subnet */
+    private $subnet;
+
+    /** @var  Volume */
+    private $volume;
+
+    // Core test
+    private $service;
+    private $serverId;
+    private $adminPass;
+    private $imageId;
+    private $flavorId;
+    private $keypairName;
+    private $volumeAttachmentId;
+
+    private function getService()
+    {
+        if (null === $this->service) {
+            $this->service = Utils::getOpenStack()->computeV2();
+        }
+
+        return $this->service;
+    }
+
+    private function getNetworkService()
+    {
+        if (!$this->networkService) {
+            $this->networkService = Utils::getOpenStack()->networkingV2();
+        }
+
+        return $this->networkService;
+    }
+
+    private function getBlockStorageService()
+    {
+        if (!$this->blockStorageService) {
+            $this->blockStorageService = Utils::getOpenStack()->blockStorageV2();
+        }
+
+        return $this->blockStorageService;
+    }
+
+    private function searchImages($name)
+    {
+        foreach ($this->getService()->listImages() as $image) {
+            if (strpos($image->name, $name) !== false) {
+                $this->imageId = $image->id;
+                break;
+            }
+        }
+
+        if (!$this->imageId) {
+            throw new \RuntimeException(sprintf('Unable to find image "%s". Make sure this image is available for integration test.', $name));
+        }
+    }
+
+    protected function setUp()
+    {
+        $this->network = $this->getNetworkService()->createNetwork(
+            [
+                'name'         => self::NETWORK,
+                'adminStateUp' => true,
+            ]
+        );
+
+        $this->logStep('Created network {name} with id {id}', ['name' => $this->network->name, 'id' => $this->network->id]);
+
+        $this->subnet = $this->getNetworkService()->createSubnet(
+            [
+                'name'      => self::SUBNET,
+                'networkId' => $this->network->id,
+                'ipVersion' => 4,
+                'cidr'      => '10.20.30.0/24',
+            ]
+        );
+
+        $this->logStep('Created subnet {name} with id {id}', ['name' => $this->subnet->name, 'id' => $this->subnet->id]);
+
+        $this->volume = $this->getBlockStorageService()->createVolume(
+            [
+                'name' => self::VOLUME,
+                'description' => '',
+                'size' => 1
+            ]
+        );
+
+        $this->logStep('Created volume {name} with id {id}', ['name' => $this->volume->name, 'id' => $this->volume->id]);
+    }
+
+    public function runTests()
+    {
+        $this->startTimer();
+
+        // Manually trigger setUp
+        $this->setUp();
+
+        $this->searchImages(self::IMAGE);
+
+        // Servers
+        $this->createServer();
+
+        try {
+            $this->updateServer();
+            $this->retrieveServer();
+            $this->serverMetadata();
+
+            // Server actions
+            //$this->changeServerPassword();
+            $this->stopServer();
+            $this->startServer();
+            $this->suspendServer();
+            $this->resumeServer();
+            $this->resizeServer();
+            $this->confirmServerResize();
+            $this->rebuildServer();
+            $this->rescueServer();
+            $this->createServerImage();
+            $this->rebootServer();
+
+            // Security groups
+            $this->addSecurityGroupToServer();
+            $this->listServerSecurityGroups();
+            $this->removeServerSecurityGroup();
+
+            // Volume attachments
+            $this->attachVolumeToServer();
+            $this->listVolumeAttachmentsForServer();
+            $this->detachVolumeFromServer();
+
+            // Flavors
+            $this->createFlavor();
+            $this->listFlavors();
+            $this->getFlavor();
+
+            // Images
+            $this->listImages();
+            $this->getImage();
+            $this->imageMetadata();
+            $this->deleteServerImage();
+
+            // Keypairs
+            $this->listKeypairs();
+            $this->createKeypair();
+            $this->getKeypair();
+            $this->deleteKeypair();
+
+            // Limits
+            $this->getLimits();
+
+            // Hypervisors
+            $this->listHypervisors();
+            $this->getHypervisorsStatistics();
+            $this->getHypervisor();
+
+            // Console
+            $this->getVncConsole();
+
+            // Interface attachments
+            $this->createInterfaceAttachment();
+        } finally {
+            // Teardown
+            $this->deleteServer();
+            $this->deleteFlavor();
+            $this->subnet->delete();
+            $this->network->delete();
+            $this->volume->delete();
+        }
+
+        $this->outputTimeTaken();
+    }
+
+    private function createServer()
+    {
+        $flavorId = getenv('OS_FLAVOR');
+
+        if (!$flavorId) {
+            throw new \RuntimeException('OS_FLAVOR env var must be set');
+        }
+
+        $replacements = [
+            '{serverName}' => $this->randomStr(),
+            '{imageId}'    => $this->imageId,
+            '{flavorId}'   => $flavorId,
+            '{networkId}'  => $this->network->id
+        ];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        $path = $this->sampleFile($replacements, 'servers/create_server.php');
+        require_once $path;
+
+        $server->waitUntilActive(false);
+
+        $this->assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
+        $this->assertNotEmpty($server->id);
+        $this->assertNotEmpty($server->adminPass);
+
+        $this->serverId = $server->id;
+        $this->adminPass = $server->adminPass;
+
+        $this->logStep('Created server {id}', ['{id}' => $server->id]);
+    }
+
+    private function updateServer()
+    {
+        $name = $this->randomStr();
+
+        $replacements = [
+            '{serverId}' => $this->serverId,
+            '{newName}'  => $name,
+        ];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        $path = $this->sampleFile($replacements, 'servers/update_server.php');
+        require_once $path;
+
+        $this->assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
+        $this->assertEquals($name, $server->name);
+
+        $server->waitUntilActive(false);
+
+        $this->logStep('Updated server ID to use this name: NAME', ['ID' => $this->serverId, 'NAME' => $name]);
+    }
+
+    private function deleteServer()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        $path = $this->sampleFile($replacements, 'servers/delete_server.php');
+        require_once $path;
+
+        // Needed so that subnet and network can be removed
+        $server->waitUntilDeleted();
+        $this->logStep('Deleted server ID', ['ID' => $this->serverId]);
+    }
+
+    private function retrieveServer()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        $path = $this->sampleFile($replacements, 'servers/get_server.php');
+        require_once $path;
+
+        $this->assertInstanceOf('OpenStack\Compute\v2\Models\Server', $server);
+        $this->assertEquals($this->serverId, $server->id);
+        $this->assertNotNull($server->created);
+        $this->assertNotNull($server->updated);
+        $this->assertNotNull($server->name);
+        $this->assertNotNull($server->ipv4);
+        $this->assertNotNull($server->status);
+        $this->assertInstanceOf(Image::class, $server->image);
+        $this->assertInstanceOf(Flavor::class, $server->flavor);
+
+        $this->logStep('Retrieved the details of server ID', ['ID' => $this->serverId]);
+    }
+
+    private function serverMetadata()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/reset_server_metadata.php');
+        $this->logStep('Reset metadata of server {serverId}', $replacements);
+
+        require_once $this->sampleFile($replacements, 'servers/get_server_metadata.php');
+        $this->logStep('Retrieved metadata of server {serverId}', $replacements);
+
+        require_once $this->sampleFile($replacements, 'servers/delete_server_metadata_item.php');
+        $this->logStep('Deleted metadata key of server {serverId}', $replacements);
+    }
+
+    private function changeServerPassword()
+    {
+        $this->adminPass = $this->randomStr();
+
+        $replacements = [
+            '{serverId}'    => $this->serverId,
+            '{newPassword}' => $this->adminPass,
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/change_server_password.php');
+
+        $this->logStep('Changed root password of server {serverId} to {newPassword}', $replacements);
+    }
+
+    private function resizeServer()
+    {
+        $resizeFlavorId = getenv('OS_RESIZE_FLAVOR');
+        if (!$resizeFlavorId) {
+            throw new \RuntimeException('OS_RESIZE_FLAVOR env var must be set');
+        }
+
+        $replacements = [
+            '{serverId}' => $this->serverId,
+            '{flavorId}' => $resizeFlavorId,
+        ];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/resize_server.php');
+
+        $server->waitUntil('VERIFY_RESIZE');
+
+        $this->logStep('Resized server {serverId} to flavor {flavorId}', $replacements);
+    }
+
+    private function confirmServerResize()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/confirm_server_resize.php');
+
+        $server->waitUntilActive();
+
+        $this->logStep('Confirmed resize of server {serverId}', $replacements);
+    }
+
+    private function rebuildServer()
+    {
+        $replacements = [
+            '{serverId}'  => $this->serverId,
+            '{imageId}'   => $this->imageId,
+            '{adminPass}' => $this->adminPass,
+        ];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/rebuild_server.php');
+
+        $server->waitUntilActive();
+
+        $this->logStep('Rebuilt server {serverId}', $replacements);
+    }
+
+    private function rescueServer()
+    {
+        $replacements = [
+            '{serverId}'  => $this->serverId,
+            '{imageId}'   => $this->imageId,
+            '{adminPass}' => $this->adminPass,
+        ];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/rescue_server.php');
+
+        $server->waitUntil('RESCUE');
+
+        require_once $this->sampleFile($replacements, 'servers/unrescue_server.php');
+
+        $server->waitUntilActive();
+
+        $this->logStep('Rescued server {serverId}', $replacements);
+    }
+
+    private function rebootServer()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/reboot_server.php');
+
+        $server->waitUntilActive(false);
+
+        $this->logStep('Rebooted server {serverId}', $replacements);
+    }
+
+    private function stopServer()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/stop_server.php');
+
+        $server->waitUntil('SHUTOFF', false);
+
+        $this->logStep('Stopped server {serverId}', $replacements);
+    }
+
+    private function startServer()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/start_server.php');
+
+        $server->waitUntilActive(false);
+
+        $this->logStep('Started server {serverId}', $replacements);
+    }
+
+    private function suspendServer()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/suspend_server.php');
+
+        $server->waitUntilActive(false);
+
+        $this->logStep('Suspended server {serverId}', $replacements);
+    }
+
+    private function resumeServer()
+    {
+        $replacements = ['{serverId}' => $this->serverId];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'servers/resume_server.php');
+
+        $server->waitUntilActive(false);
+
+        $this->logStep('Resumed server {serverId}', $replacements);
+    }
+
+    private function createFlavor()
+    {
+        $replacements = [
+            '{flavorName}' => $this->randomStr()
+        ];
+
+        /** @var $flavor \OpenStack\Compute\v2\Models\Flavor */
+        $path = $this->sampleFile($replacements, 'flavors/create_flavor.php');
+        require_once $path;
+
+        $this->assertInstanceOf('\OpenStack\Compute\v2\Models\Flavor', $flavor);
+
+        $this->flavorId = $flavor->id;
+        $this->logStep('Created flavor {id}', ['{id}' => $flavor->id]);
+    }
+
+    private function deleteFlavor()
+    {
+        $replacements = ['{flavorId}' => $this->flavorId];
+
+        $path = $this->sampleFile($replacements, 'flavors/delete_flavor.php');
+        require_once $path;
+
+        $this->logStep('Deleted flavor ID', ['ID' => $this->flavorId]);
+    }
+
+    private function listFlavors()
+    {
+        require_once $this->sampleFile([], 'flavors/list_flavors.php');
+
+        $this->logStep('Listed all available flavors');
+    }
+
+    private function getFlavor()
+    {
+        $replacements = ['{flavorId}' => 1];
+
+        require_once $this->sampleFile($replacements, 'flavors/get_flavor.php');
+
+        $this->logStep('Retrieved details for flavor {flavorId}', $replacements);
+    }
+
+    private function createServerImage()
+    {
+        $name = $this->randomStr();
+
+        $replacements = [
+            '{serverId}'  => $this->serverId,
+            '{imageName}' => $name,
+        ];
+
+        /** @var $server \OpenStack\Compute\v2\Models\Server */
+        require_once $this->sampleFile($replacements, 'images/create_server_image.php');
+
+        $server->waitWithCallback(function (Server $server) {
+            return !$server->taskState;
+        }, false);
+
+        $this->searchImages($name);
+
+        $this->logStep('Created an image for server {serverId} with name {imageName}', $replacements);
+    }
+
+    private function listImages()
+    {
+        require_once $this->sampleFile([], 'images/list_images.php');
+
+        $this->logStep('Listed all available images');
+    }
+
+    private function getImage()
+    {
+        $replacements = ['{imageId}' => $this->imageId];
+
+        require_once $this->sampleFile($replacements, 'images/get_image.php');
+
+        $this->logStep('Retrieved details for image {imageId}', $replacements);
+    }
+
+    private function imageMetadata()
+    {
+        $replacements = ['{imageId}' => $this->imageId];
+
+        /** @var $image \OpenStack\Compute\v2\Models\Image */
+        require_once $this->sampleFile($replacements, 'images/reset_image_metadata.php');
+        $this->logStep('Reset metadata of image {imageId}', $replacements);
+
+        require_once $this->sampleFile($replacements, 'images/retrieve_image_metadata.php');
+        $this->logStep('Retrieved metadata of image {imageId}', $replacements);
+
+        require_once $this->sampleFile($replacements + ['{metadataKey}'], 'images/delete_image_metadata_item.php');
+        $this->logStep('Deleted metadata key of image {imageId}', $replacements);
+    }
+
+    private function deleteServerImage()
+    {
+        $replacements = ['{imageId}' => $this->imageId];
+        require_once $this->sampleFile($replacements, 'images/delete_image.php');
+        $this->logStep('Deleted image {imageId}', $replacements);
+    }
+
+    private function listKeypairs()
+    {
+        /** @var $keypairs \Generator */
+        require_once $this->sampleFile([], 'keypairs/list_keypairs.php');
+
+        $this->assertInstanceOf(\Generator::class, $keypairs);
+
+        $this->logStep('Listed all keypairs');
+    }
+
+    private function createKeypair()
+    {
+        $replacements = [
+            '{name}'      => $this->randomStr(),
+            '{publicKey}' => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp4H/vDGnLi0QgWgMsQkv//FEz0xgv/mujVX+XCh6fHXxc/PbaASY+MsoI2Xr238cG9eaeAAUvbpJuEuHQ0M9WX97bvsWaWzLQ9F6hzLAwUBGxcG8cSh1nB3Ah7alR2nbIZ1N94yE72hXLb1AGogJ97NBVIph438BCXUNejqoOBsXL8UBP3RGdPnTHJ/6XSMaNTQAJruQMoQwecyGFQmuS2IEy2mBOmSldD6JZirHpj7PTCKJY4CS89QChGpKIeOymKn4tEQQVVtNFUyULEMdin88H1yMftPfq7QqH+ULFT2X2XvP3CI+sESq84lrIcVu7LjJCRIwlKsnMu2ESYCdz foo@bar.com'
+        ];
+
+        require_once $this->sampleFile($replacements, 'keypairs/create_keypair.php');
+        /**@var Keypair $keypair */
+
+        $this->assertInstanceOf(Keypair::class, $keypair);
+        $this->assertEquals($replacements['{name}'], $keypair->name);
+        $this->assertEquals($replacements['{publicKey}'], $keypair->publicKey);
+
+        $this->keypairName = $keypair->name;
+        $this->logStep('Created keypair name {name}', ['{name}' => $keypair->name]);
+    }
+
+    private function getKeypair()
+    {
+        $replacements = [
+            '{name}' => $this->keypairName,
+        ];
+
+        require_once $this->sampleFile($replacements, 'keypairs/get_keypair.php');
+
+        /**@var Keypair $keypair */
+        $this->assertInstanceOf(Keypair::class, $keypair);
+
+        $this->assertEquals($replacements['{name}'], $keypair->name);
+
+        $this->logStep('Retrieved details for keypair {name}', $replacements);
+    }
+
+    private function deleteKeypair()
+    {
+        $replacements = [
+            '{name}' => $this->keypairName,
+        ];
+
+        require_once $this->sampleFile($replacements, 'keypairs/delete_keypair.php');
+        $this->logStep('Deleted keypair name {name}', ['{name}' => $this->keypairName]);
+    }
+
+    private function listHypervisors()
+    {
+        require_once $this->sampleFile([], 'hypervisors/list_hypervisors.php');
+
+        $this->logStep('Listed all available hypervisors');
+    }
+
+    private function getHypervisor()
+    {
+        $replacements = [
+            '{hypervisorId}' => '1',
+        ];
+
+        require_once $this->sampleFile($replacements, 'hypervisors/get_hypervisor.php');
+
+        /**@var Hypervisor $hypervisor */
+        $this->assertInstanceOf(Hypervisor::class, $hypervisor);
+        $this->assertEquals($replacements['{hypervisorId}'], $hypervisor->id);
+
+        $this->logStep('Retrieved details for hypervisor id {hypervisorId}', $replacements);
+    }
+
+    private function getHypervisorsStatistics()
+    {
+        require_once  $this->sampleFile([], 'hypervisors/get_hypervisors_statistics.php');
+
+        /**@var HypervisorStatistic $hypervisorStatistics */
+        $this->assertInstanceOf(HypervisorStatistic::class, $hypervisorStatistics);
+
+        $this->logStep('Retrieved hypervisors statistics');
+    }
+
+    private function getLimits()
+    {
+        require_once $this->sampleFile([], 'limits/get_limits.php');
+
+        /**@var Limit $limit */
+        $this->assertInstanceOf(Limit::class, $limit);
+
+        $this->logStep('Retrieved tenant limit');
+    }
+
+    private function addSecurityGroupToServer()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId,
+            '{secGroupName}' => 'default'
+        ];
+
+        require_once  $this->sampleFile($replacements, 'servers/add_security_group.php');
+
+        /**@var Server $server*/
+        $this->logStep('Added security group {secGroupName} to server {serverId}', $replacements);
+    }
+
+    private function listServerSecurityGroups()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId
+        ];
+
+        require_once  $this->sampleFile($replacements, 'servers/list_security_groups.php');
+
+        /**@var \Generator $securityGroups */
+        $this->assertInstanceOf(\Generator::class, $securityGroups);
+
+        $this->logStep('Listed all security groups attached to server {serverId}', $replacements);
+    }
+
+    private function removeServerSecurityGroup()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId,
+            '{secGroupName}' => 'default'
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/remove_security_group.php');
+
+        $this->logStep('Delete security group {secGroupName} from server {serverId}', $replacements);
+    }
+
+    private function attachVolumeToServer()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId,
+            '{volumeId}' => $this->volume->id
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/attach_volume_attachment.php');
+        /**@var VolumeAttachment $volumeAttachment */
+        $this->volumeAttachmentId = $volumeAttachment->id;
+
+        $this->volume->waitUntil('in-use');
+
+        $this->logStep('Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',
+            array_merge($replacements, ['{volumeAttachmentId}' => $volumeAttachment->id])
+        );
+    }
+
+    private function listVolumeAttachmentsForServer()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/list_volume_attachments.php');
+
+        $this->logStep('Retrieved volume attachments for server {serverId}', $replacements);
+    }
+
+    private function detachVolumeFromServer()
+    {
+        $replacements = [
+            '{serverId}'           => $this->serverId,
+            '{volumeAttachmentId}' => $this->volumeAttachmentId,
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/detach_volume_attachment.php');
+
+        $this->volume->waitUntil('available');
+
+        $this->logStep('Detached volume attachments for server {serverId}', $replacements);
+    }
+
+    private function getVncConsole()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/get_server_vnc_console.php');
+
+        $this->logStep('Get VNC console for server {serverId}', $replacements);
+    }
+
+    private function createInterfaceAttachment()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId,
+            '{networkId}' => $this->network->id
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/create_interface_attachment.php');
+
+        $this->logStep('Create interface attachment for server {serverId}', $replacements);
+    }
+}
diff --git a/tests/unit/Compute/v2/Models/ServerTest.php b/tests/unit/Compute/v2/Models/ServerTest.php
index 8b6703fd..ba732b14 100644
--- a/tests/unit/Compute/v2/Models/ServerTest.php
+++ b/tests/unit/Compute/v2/Models/ServerTest.php
@@ -233,24 +233,6 @@ public function test_it_suspends()
         $this->server->suspend();
     }
 
-    public function test_it_suspends()
-    {
-        $expectedJson = ['suspend' => null];
-
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
-
-        $this->assertNull($this->server->suspend());
-    }
-
-    public function test_it_resumes()
-    {
-        $expectedJson = ['resume' => null];
-
-        $this->setupMock('POST', 'servers/serverId/action', $expectedJson, [], new Response(202));
-
-        $this->assertNull($this->server->resume());
-    }
-
     public function test_it_resizes()
     {
         $expectedJson = ['resize' => ['flavorRef' => 'flavorId']];

From bce05c011ae78d964d718ee8f4f864b757bc0e53 Mon Sep 17 00:00:00 2001
From: davemednick <davemednick@users.noreply.github.com>
Date: Thu, 24 Jul 2025 12:28:52 +0000
Subject: [PATCH 099/102] Apply php-cs-fixer changes

---
 src/BlockStorage/v2/Api.php      |  9 ++++-----
 src/BlockStorage/v2/Params.php   |  3 +--
 src/Compute/v2/Api.php           | 34 ++++++++++++++++----------------
 src/Compute/v2/Models/Server.php | 12 ++++-------
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/BlockStorage/v2/Api.php b/src/BlockStorage/v2/Api.php
index 240f9b74..0c4dfa1c 100644
--- a/src/BlockStorage/v2/Api.php
+++ b/src/BlockStorage/v2/Api.php
@@ -376,18 +376,17 @@ public function resetVolumeStatus(): array
     public function resetStatus(string $status)
     {
         $response = $this->execute($this->api->resetVolumeStatus(), [
-            'id' => $this->id,
-            'status' => $status
+            'id'     => $this->id,
+            'status' => $status,
         ]);
         $this->populateFromResponse($response);
     }
 
-
     public function extend(int $size_in_gb)
     {
         $response = $this->execute($this->api->extendVolume(), [
-            'id' => $this->id,
-            'new_size' => $size_in_gb
+            'id'       => $this->id,
+            'new_size' => $size_in_gb,
         ]);
         $this->populateFromResponse($response);
     }
diff --git a/src/BlockStorage/v2/Params.php b/src/BlockStorage/v2/Params.php
index fb85149a..6fa3cf77 100644
--- a/src/BlockStorage/v2/Params.php
+++ b/src/BlockStorage/v2/Params.php
@@ -297,13 +297,12 @@ public function projectId(): array
         ];
     }
 
-
     public function nullAction(): array
     {
         return [
             'type'     => self::NULL_TYPE,
             'location' => self::JSON,
-            'required' => true
+            'required' => true,
         ];
     }
 
diff --git a/src/Compute/v2/Api.php b/src/Compute/v2/Api.php
index 377bdbe5..64567ee2 100644
--- a/src/Compute/v2/Api.php
+++ b/src/Compute/v2/Api.php
@@ -982,7 +982,7 @@ public function getAggregates(): array
             'jsonKey' => 'aggregates',
             'params'  => [
                 'limit'  => $this->params->limit(),
-                'marker' => $this->params->marker()
+                'marker' => $this->params->marker(),
             ],
         ];
     }
@@ -992,20 +992,20 @@ public function getAggregate(): array
         return [
             'method' => 'GET',
             'path'   => 'os-aggregates/{id}',
-            'params' => ['id' => $this->params->urlId('id')]
+            'params' => ['id' => $this->params->urlId('id')],
         ];
     }
 
     public function getConsoleLog(): array
     {
         return [
-            'method' => 'POST',
-            'path' => 'servers/{id}/action',
+            'method'  => 'POST',
+            'path'    => 'servers/{id}/action',
             'jsonKey' => 'os-getConsoleOutput',
-            'params' => [
-                'id' => $this->params->urlId('server'),
-                'length' => $this->params->consoleLogLength()
-            ]
+            'params'  => [
+                'id'     => $this->params->urlId('server'),
+                'length' => $this->params->consoleLogLength(),
+            ],
         ];
     }
 
@@ -1015,8 +1015,8 @@ public function getInstanceActions(): array
             'method' => 'GET',
             'path'   => 'servers/{id}/os-instance-actions',
             'params' => [
-                'id' => $this->params->urlId('server')
-            ]
+                'id' => $this->params->urlId('server'),
+            ],
         ];
     }
 
@@ -1027,16 +1027,16 @@ public function getInstanceAction(): array
             'path'   => 'servers/{id}/os-instance-actions/{requestId}',
             'params' => [
                 'id'        => $this->params->urlId('server'),
-                'requestId' => $this->params->urlId('request')
-            ]
+                'requestId' => $this->params->urlId('request'),
+            ],
         ];
     }
 
-    public function getNetworkIpAvailability() : array
+    public function getNetworkIpAvailability(): array
     {
         return [
             'method' => 'GET',
-            'path'   => $this->pathPrefix . '/network-ip-availabilities/{id}',
+            'path'   => $this->pathPrefix.'/network-ip-availabilities/{id}',
             'params' => ['id' => $this->params->urlId('network')],
         ];
     }
@@ -1045,10 +1045,10 @@ public function getNetworkIpAvailabilities(): array
     {
         return [
             'method' => 'GET',
-            'path'   => $this->pathPrefix . '/network-ip-availabilities',
+            'path'   => $this->pathPrefix.'/network-ip-availabilities',
             'params' => [
-                'tenantId' => $this->params->queryTenantId()
-            ]
+                'tenantId' => $this->params->queryTenantId(),
+            ],
         ];
     }
 }
diff --git a/src/Compute/v2/Models/Server.php b/src/Compute/v2/Models/Server.php
index 8c4f45fd..d443f761 100644
--- a/src/Compute/v2/Models/Server.php
+++ b/src/Compute/v2/Models/Server.php
@@ -654,25 +654,22 @@ public function detachVolume(string $attachmentId)
         $this->execute($this->api->deleteVolumeAttachments(), ['id' => $this->id, 'attachmentId' => $attachmentId]);
     }
 
-
     /**
      * Get the console log.
      *
-     * @param int $length Number of lines of console log to grab.
+     * @param int $length number of lines of console log to grab
      *
      * @return string - the console log output
      */
     public function getConsoleLog(int $length = 50): string
     {
         $response = $this->execute($this->api->getConsoleLog(), ['id' => $this->id, 'length' => $length]);
+
         return Utils::jsonDecode($response)['output'];
     }
 
-
     /**
-     * Get a Generator for the instance actions
-     *
-     * @return \Generator
+     * Get a Generator for the instance actions.
      */
     public function listInstanceActions(): \Generator
     {
@@ -680,10 +677,9 @@ public function listInstanceActions(): \Generator
     }
 
     /**
-     * Get a specific instance action
+     * Get a specific instance action.
      *
      * @string The request ID of the instance action
-     * @return InstanceAction
      */
     public function getInstanceAction(string $requestId): InstanceAction
     {

From 3039e87c98dc843d0fb1cfb9a815b772b8e39333 Mon Sep 17 00:00:00 2001
From: davemednick <93415315+davemednick@users.noreply.github.com>
Date: Thu, 24 Jul 2025 08:49:06 -0400
Subject: [PATCH 100/102] fix: Params dupe methods test fixes

---
 src/BlockStorage/v2/Params.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/BlockStorage/v2/Params.php b/src/BlockStorage/v2/Params.php
index 6fa3cf77..9a799271 100644
--- a/src/BlockStorage/v2/Params.php
+++ b/src/BlockStorage/v2/Params.php
@@ -296,23 +296,4 @@ public function projectId(): array
             'description' => 'The UUID of the project in a multi-tenancy cloud.',
         ];
     }
-
-    public function nullAction(): array
-    {
-        return [
-            'type'     => self::NULL_TYPE,
-            'location' => self::JSON,
-            'required' => true,
-        ];
-    }
-
-    public function status(): array
-    {
-        return [
-            'type'        => self::STRING_TYPE,
-            'location'    => self::JSON,
-            'required'    => true,
-            'description' => 'The new status of the volume',
-        ];
-    }
 }

From ef8a4f228eb85a22c4155ca50b80ebcf9d8da28f Mon Sep 17 00:00:00 2001
From: davemednick <93415315+davemednick@users.noreply.github.com>
Date: Thu, 24 Jul 2025 09:11:28 -0400
Subject: [PATCH 101/102] chore: add tests

---
 .github/workflows/format.yml                  |  50 ---
 .github/workflows/integration_tests.yml       | 124 ------
 .github/workflows/unit_tests.yml              |  57 ---
 .../integration/BlockStorage/v2/CoreTest.php  | 183 +++++++++
 tests/integration/Compute/v2/CoreTest.php     |  14 +-
 tests/integration/DefaultLogger.php           |  20 +
 tests/integration/Identity/v2/CoreTest.php    |  12 +
 tests/integration/Identity/v3/CoreTest.php    | 385 ++++++++++++++++++
 tests/integration/Images/v2/CoreTest.php      |  99 +++++
 tests/integration/Networking/v2/CoreTest.php  | 359 ++++++++++++++++
 .../integration/Networking/v2/Layer3Test.php  | 158 +++++++
 .../Networking/v2/SecGroupTest.php            |  12 +
 tests/integration/ObjectStore/v1/CoreTest.php | 199 +++++++++
 tests/integration/Runner.php                  | 162 ++++++++
 tests/integration/SampleManager.php           | 111 +++++
 tests/integration/SampleManagerInterface.php  |  10 +
 tests/integration/TestCase.php                | 134 ++++++
 tests/integration/TestInterface.php           |  16 +
 tests/integration/Utils.php                   |  65 +++
 tests/integration/run.php                     |  12 +
 tests/integration/script/compute_v2           |   3 +
 tests/integration/script/identity_v3          |   3 +
 tests/integration/script/networking_v2        |   3 +
 tests/integration/script/objectstore_v2       |   3 +
 24 files changed, 1962 insertions(+), 232 deletions(-)
 delete mode 100644 .github/workflows/format.yml
 delete mode 100644 .github/workflows/integration_tests.yml
 delete mode 100644 .github/workflows/unit_tests.yml
 create mode 100644 tests/integration/BlockStorage/v2/CoreTest.php
 create mode 100644 tests/integration/DefaultLogger.php
 create mode 100644 tests/integration/Identity/v2/CoreTest.php
 create mode 100644 tests/integration/Identity/v3/CoreTest.php
 create mode 100644 tests/integration/Images/v2/CoreTest.php
 create mode 100644 tests/integration/Networking/v2/CoreTest.php
 create mode 100644 tests/integration/Networking/v2/Layer3Test.php
 create mode 100644 tests/integration/Networking/v2/SecGroupTest.php
 create mode 100644 tests/integration/ObjectStore/v1/CoreTest.php
 create mode 100644 tests/integration/Runner.php
 create mode 100644 tests/integration/SampleManager.php
 create mode 100644 tests/integration/SampleManagerInterface.php
 create mode 100644 tests/integration/TestCase.php
 create mode 100644 tests/integration/TestInterface.php
 create mode 100644 tests/integration/Utils.php
 create mode 100644 tests/integration/run.php
 create mode 100755 tests/integration/script/compute_v2
 create mode 100755 tests/integration/script/identity_v3
 create mode 100755 tests/integration/script/networking_v2
 create mode 100755 tests/integration/script/objectstore_v2

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
deleted file mode 100644
index db2aacd2..00000000
--- a/.github/workflows/format.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: "Format"
-on:
-  push:
-    branches:
-      - '*'
-
-jobs:
-  composer-normalize:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          coverage: none
-          extensions: mbstring
-          php-version: 8.2
-
-      - run: composer install --no-interaction --no-progress --no-suggest
-
-      - run: composer normalize
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Normalize composer.json
-
-  php-cs-fixer:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          coverage: none
-          extensions: mbstring
-          php-version: 8.1
-
-      - run: composer install --no-interaction --no-progress --no-suggest
-
-      - run: vendor/bin/php-cs-fixer fix
-
-      - run: git pull
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Apply php-cs-fixer changes
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
deleted file mode 100644
index c8dbdc79..00000000
--- a/.github/workflows/integration_tests.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-name: Integration Tests
-
-on:
-  workflow_dispatch:
-    inputs:
-      tmate_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled'
-        required: false
-        default: false
-      openstack_version:
-        description: 'Comma-separated list of Openstack versions e.g. "stable/2025.1", "unmaintained/zed"'
-        required: false
-        default: false
-  pull_request:
-  push:
-    branches:
-      - master
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  tests:
-    if: |
-      !contains(github.event.pull_request.body, 'skip ci') 
-      && !contains(github.event.pull_request.body, 'skip integration')
-    strategy:
-      fail-fast: false
-      matrix:
-        openstack_version: ${{ fromJSON(format('[{0}]', inputs.openstack_version || vars.OPENSTACK_VERSIONS )) }}
-        php_version: [ 8.1 ]
-        ubuntu_version: [ 22.04 ]
-    runs-on: ubuntu-${{ matrix.ubuntu_version }}
-    name: Deploy OpenStack ${{ matrix.openstack_version }} and run integration tests with php ${{matrix.php_version}}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php_version }}-${{ hashFiles('**.composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php_version }}-
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php_version }}
-          extensions: curl
-          tools: composer:v2
-          coverage: none
-
-      - run: composer install --prefer-dist --no-interaction --no-progress
-
-      - name: Restore devstack cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            /opt/stack/*
-            !/opt/stack/data
-            ~/devstack/
-          key: ${{ runner.os }}-openstack-${{ matrix.openstack_version }}-${{ github.workflow }}
-
-      - name: Deploy devstack
-        uses: EmilienM/devstack-action@v0.15
-        with:
-          branch: ${{ matrix.openstack_version }}
-          conf_overrides: |
-            CINDER_ISCSI_HELPER=lioadm
-            SWIFT_ENABLE_TEMPURLS=True
-            SWIFT_TEMPURL_KEY=secretkey
-            TARGET_BRANCH=${{ matrix.openstack_version }}
-            [[post-config|\$SWIFT_CONFIG_PROXY_SERVER]]
-            [filter:versioned_writes]
-            allow_object_versioning = true
-          enabled_services: 's-account,s-container,s-object,s-proxy,s-bak'
-
-      - name: Set env variables
-        run: |
-          {
-            echo OS_AUTH_URL="$(grep -oP -m 1 "(?<=auth_url: )(.*)\$" /etc/openstack/clouds.yaml)/v3"
-            echo OS_REGION=RegionOne
-            echo OS_REGION_NAME=RegionOne
-            echo OS_USER_ID=$(openstack --os-cloud=devstack-admin user show admin -f value -c id)
-            echo OS_USERNAME=admin
-            echo OS_PASSWORD=secret
-            echo OS_PROJECT_ID=$(openstack --os-cloud=devstack-admin project show admin -f value -c id)
-            echo OS_PROJECT_NAME=admin
-            echo OS_RESIZE_FLAVOR=c1
-            echo OS_FLAVOR=1
-            echo OS_DOMAIN_ID=default
-          } >> "$GITHUB_ENV"
-
-      - name: Check if Block Storage API v2 must be tested
-        if: matrix.block_storage_v2 == true
-        run: echo "OS_BLOCK_STORAGE_V2=1" >> "$GITHUB_ENV"
-
-      - name: Execute Integration tests via PhpUnit
-        run: vendor/bin/phpunit --configuration ./phpunit.sample.xml.dist
-
-      - name: Collect logs
-        if: ${{ failure() }}
-        run: |
-          set -x
-          journalctl >failure-logs
-
-      - name: Save logs
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: failure-logs-${{ strategy.job-index }}
-          path: failure-logs
-
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        if: ${{ always() && github.event_name == 'workflow_dispatch' && inputs.tmate_enabled }}
\ No newline at end of file
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
deleted file mode 100644
index b379bdfd..00000000
--- a/.github/workflows/unit_tests.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Unit Tests
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - master
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  tests:
-    runs-on: ubuntu-22.04
-    if: |
-      !contains(github.event.pull_request.body, 'skip ci') 
-      && !contains(github.event.pull_request.body, 'skip unit')
-    strategy:
-      fail-fast: false
-      matrix:
-         php: [ 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4 ]
-         composer:
-           - name: lowest
-             arg: "--prefer-lowest --prefer-stable"
-           - name: highest
-             arg: "" # No args added as highest is default
-    name: PHPUnit on PHP ${{ matrix.php }} with ${{ matrix.composer.name }} dependencies
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ matrix.composer.name }}-${{ hashFiles('**.composer.lock') }}
-
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: curl
-          tools: composer:v2
-          coverage: none
-
-      - run: composer update --prefer-dist --no-interaction --no-progress ${{ matrix.composer.arg }}
-
-      - run: vendor/bin/parallel-lint --exclude vendor .
-
-      - name: execute unit tests
-        run: vendor/bin/phpunit --configuration phpunit.xml.dist
-
diff --git a/tests/integration/BlockStorage/v2/CoreTest.php b/tests/integration/BlockStorage/v2/CoreTest.php
new file mode 100644
index 00000000..1615cbc9
--- /dev/null
+++ b/tests/integration/BlockStorage/v2/CoreTest.php
@@ -0,0 +1,183 @@
+<?php
+
+namespace OpenStack\integration\BlockStorage\v2;
+
+use OpenStack\BlockStorage\v2\Models\Snapshot;
+use OpenStack\BlockStorage\v2\Models\Volume;
+use OpenStack\BlockStorage\v2\Models\VolumeType;
+use OpenStack\Integration\TestCase;
+use OpenStack\Integration\Utils;
+
+class CoreTest extends TestCase
+{
+    private $service;
+
+    /**
+     * @return \OpenStack\BlockStorage\v2\Service
+     */
+    private function getService()
+    {
+        if (null === $this->service) {
+            $this->service = Utils::getOpenStack()->blockStorageV2();
+        }
+
+        return $this->service;
+    }
+
+    public function runTests()
+    {
+        $this->startTimer();
+
+        $this->volumes();
+        $this->volumeTypes();
+        $this->snapshots();
+
+        $this->outputTimeTaken();
+    }
+
+    public function volumes()
+    {
+        $this->logStep('Creating volume type');
+        $volumeType = $this->getService()->createVolumeType(['name' => $this->randomStr()]);
+
+        $replacements = [
+            '{description}' => $this->randomStr(),
+            "'{size}'"      => 1,
+            '{name}'        => $this->randomStr(),
+            '{volumeType}'  => $volumeType->id,
+            '{key1}'        => $this->randomStr(),
+            '{val1}'        => $this->randomStr(),
+        ];
+
+        $this->logStep('Creating volume');
+        /** @var Volume $volume */
+        require_once $this->sampleFile($replacements, 'volumes/create.php');
+        $this->assertInstanceOf(Volume::class, $volume);
+        $this->assertEquals($replacements['{name}'], $volume->name);
+        $this->assertEquals(1, $volume->size);
+        $this->assertEquals($volumeType->name, $volume->volumeTypeName);
+
+        $volumeId = $volume->id;
+        $replacements = ['{volumeId}' => $volumeId];
+
+        $this->logStep('Getting volume');
+        /** @var Volume $volume */
+        require_once $this->sampleFile($replacements, 'volumes/get.php');
+        $this->assertInstanceOf(Volume::class, $volume);
+
+        $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
+
+        $this->logStep('Updating volume');
+        /** @var Volume $volume */
+        require_once $this->sampleFile($replacements, 'volumes/update.php');
+        $this->assertInstanceOf(Volume::class, $volume);
+
+        $this->logStep('Listing volumes');
+        /** @var \Generator $volumes */
+        require_once $this->sampleFile($replacements, 'volumes/list.php');
+
+        $this->logStep('Deleting volume');
+        require_once $this->sampleFile($replacements, 'volumes/delete.php');
+
+        $volume = $this->getService()->getVolume($volumeId);
+        $volume->waitUntilDeleted();
+
+        $this->logStep('Deleting volume type');
+        $volumeType->delete();
+    }
+
+    public function volumeTypes()
+    {
+        $replacements = [
+            '{name}' => $this->randomStr(),
+        ];
+
+        $this->logStep('Creating volume type');
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile($replacements, 'volume_types/create.php');
+        $this->assertInstanceOf(VolumeType::class, $volumeType);
+        $this->assertEquals($replacements['{name}'], $volumeType->name);
+
+        $replacements = ['{volumeTypeId}' => $volumeType->id];
+
+        $this->logStep('Getting volume type');
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile($replacements, 'volume_types/get.php');
+        $this->assertInstanceOf(VolumeType::class, $volumeType);
+
+        $replacements += ['{newName}' => $this->randomStr()];
+
+        $this->logStep('Updating volume type');
+        /** @var VolumeType $volumeType */
+        require_once $this->sampleFile($replacements, 'volume_types/update.php');
+        $this->assertInstanceOf(VolumeType::class, $volumeType);
+
+        $this->logStep('Listing volume types');
+        /** @var \Generator $volumeTypes */
+        require_once $this->sampleFile($replacements, 'volume_types/list.php');
+
+        $this->logStep('Deleting volume type');
+        require_once $this->sampleFile($replacements, 'volume_types/delete.php');
+    }
+
+    public function snapshots()
+    {
+        $this->logStep('Creating volume');
+        $volume = $this->getService()->createVolume(['name' => $this->randomStr(), 'size' => 1]);
+        $volume->waitUntilActive();
+
+        $replacements = [
+            '{volumeId}'    => $volume->id,
+            '{name}'        => $this->randomStr(),
+            '{description}' => $this->randomStr(),
+        ];
+
+        $this->logStep('Creating snapshot');
+        /** @var Snapshot $snapshot */
+        require_once $this->sampleFile($replacements, 'snapshots/create.php');
+        $this->assertInstanceOf(Snapshot::class, $snapshot);
+        $this->assertEquals($replacements['{name}'], $snapshot->name);
+        $snapshot->waitUntilActive();
+
+        $snapshotId = $snapshot->id;
+        $replacements = ['{snapshotId}' => $snapshotId];
+
+        $this->logStep('Getting snapshot');
+        /** @var Snapshot $snapshot */
+        require_once $this->sampleFile($replacements, 'snapshots/get.php');
+        $this->assertInstanceOf(Snapshot::class, $snapshot);
+
+        $this->getService()
+            ->getSnapshot($snapshot->id)
+            ->mergeMetadata(['key1' => 'val1']);
+
+        $replacements += ['{key}' => 'key2', '{val}' => 'val2'];
+        $this->logStep('Adding metadata');
+        require_once $this->sampleFile($replacements, 'snapshots/merge_metadata.php');
+
+        $this->logStep('Retrieving metadata');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
+        $this->assertEquals(['key1' => 'val1', 'key2' => 'val2'], $metadata);
+
+        $replacements = ['{snapshotId}' => $snapshot->id, '{key}' => 'key3', '{val}' => 'val3'];
+        $this->logStep('Resetting metadata');
+        require_once $this->sampleFile($replacements, 'snapshots/reset_metadata.php');
+
+        $this->logStep('Retrieving metadata');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'snapshots/get_metadata.php');
+        $this->assertEquals(['key3' => 'val3'], $metadata);
+
+        $replacements += ['{newName}' => $this->randomStr(), '{newDescription}' => $this->randomStr()];
+        $this->logStep('Updating snapshot');
+        require_once $this->sampleFile($replacements, 'snapshots/update.php');
+
+        $this->logStep('Deleting snapshot');
+        require_once $this->sampleFile($replacements, 'snapshots/delete.php');
+        $snapshot->waitUntilDeleted();
+
+        $this->logStep('Deleting volume');
+        $volume->delete();
+    }
+}
diff --git a/tests/integration/Compute/v2/CoreTest.php b/tests/integration/Compute/v2/CoreTest.php
index 201d26c4..26bd89e3 100644
--- a/tests/integration/Compute/v2/CoreTest.php
+++ b/tests/integration/Compute/v2/CoreTest.php
@@ -698,7 +698,8 @@ private function attachVolumeToServer()
 
         $this->volume->waitUntil('in-use');
 
-        $this->logStep('Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',
+        $this->logStep(
+            'Attached volume {volumeId} to server {serverId} with volume attachment id {volumeAttachmentId}',
             array_merge($replacements, ['{volumeAttachmentId}' => $volumeAttachment->id])
         );
     }
@@ -750,4 +751,15 @@ private function createInterfaceAttachment()
 
         $this->logStep('Create interface attachment for server {serverId}', $replacements);
     }
+
+    private function getConsoleOutput()
+    {
+        $replacements = [
+            '{serverId}' => $this->serverId
+        ];
+
+        require_once $this->sampleFile($replacements, 'servers/get_server_console_output.php');
+
+        $this->logStep('Get console output for server {serverId}', $replacements);
+    }
 }
diff --git a/tests/integration/DefaultLogger.php b/tests/integration/DefaultLogger.php
new file mode 100644
index 00000000..aa3e1a2c
--- /dev/null
+++ b/tests/integration/DefaultLogger.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace OpenStack\Integration;
+
+use Psr\Log\AbstractLogger;
+
+class DefaultLogger extends AbstractLogger
+{
+    public function log($level, $message, array $context = [])
+    {
+        echo $this->format($level, $message, $context);
+    }
+
+    private function format($level, $message, $context)
+    {
+        $msg = strtr($message, $context);
+
+        return sprintf("%s: %s\n", strtoupper($level), $msg);
+    }
+}
diff --git a/tests/integration/Identity/v2/CoreTest.php b/tests/integration/Identity/v2/CoreTest.php
new file mode 100644
index 00000000..c0382a4b
--- /dev/null
+++ b/tests/integration/Identity/v2/CoreTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace OpenStack\integration\Identity\v2;
+
+use OpenStack\Integration\TestCase;
+
+class CoreTest extends TestCase
+{
+    public function runTests()
+    {
+    }
+}
diff --git a/tests/integration/Identity/v3/CoreTest.php b/tests/integration/Identity/v3/CoreTest.php
new file mode 100644
index 00000000..2533a395
--- /dev/null
+++ b/tests/integration/Identity/v3/CoreTest.php
@@ -0,0 +1,385 @@
+<?php
+
+namespace OpenStack\integration\Identity\v3;
+
+use OpenStack\Identity\v3\Models;
+use OpenStack\Integration\TestCase;
+use OpenStack\Integration\Utils;
+
+class CoreTest extends TestCase
+{
+    private $service;
+
+    /**
+     * @return \OpenStack\Identity\v3\Service
+     */
+    private function getService()
+    {
+        if (null === $this->service) {
+            $this->service = Utils::getOpenStack()->identityV3();
+        }
+
+        return $this->service;
+    }
+
+    public function runTests()
+    {
+        $this->defaultLogging = true;
+        $this->startTimer();
+
+        $this->tokens();
+        $this->domains();
+
+        $this->outputTimeTaken();
+    }
+
+    public function tokens()
+    {
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        $path = $this->sampleFile([], 'tokens/generate_token_with_username.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Token::class, $token);
+
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        $path = $this->sampleFile([], 'tokens/generate_token_with_user_id.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Token::class, $token);
+
+        $replacements = ['{tokenId}' => $token->id];
+
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        $path = $this->sampleFile($replacements, 'tokens/generate_token_scoped_to_project_id.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Token::class, $token);
+
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        $path = $this->sampleFile($replacements, 'tokens/generate_token_scoped_to_project_name.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Token::class, $token);
+
+        /** @var $token \OpenStack\Identity\v3\Models\Token */
+        $path = $this->sampleFile($replacements, 'tokens/generate_token_from_id.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Token::class, $token);
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements, 'tokens/validate_token.php');
+        require_once $path;
+        $this->assertTrue($result);
+
+        $path = $this->sampleFile($replacements, 'tokens/revoke_token.php');
+        require_once $path;
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements, 'tokens/validate_token.php');
+        require_once $path;
+        $this->assertFalse($result);
+    }
+
+    public function domains()
+    {
+        $replacements = [
+            '{name}'        => $this->randomStr(),
+            '{description}' => $this->randomStr(),
+        ];
+
+        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
+        $path = $this->sampleFile($replacements, 'domains/add_domain.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Domain::class, $domain);
+
+        $replacements['{domainId}'] = $domain->id;
+
+        $path = $this->sampleFile([], 'domains/list_domains.php');
+        require_once $path;
+
+        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
+        $path = $this->sampleFile($replacements, 'domains/show_domain.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Domain::class, $domain);
+
+        $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
+        $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
+
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'domains/grant_group_role.php');
+        require_once $path;
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'domains/check_group_role.php');
+        require_once $path;
+        $this->assertTrue($result);
+
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id], 'domains/list_group_roles.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'domains/revoke_group_role.php');
+        require_once $path;
+
+        $group->delete();
+
+        $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
+
+        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/grant_user_role.php');
+        require_once $path;
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/check_user_role.php');
+        require_once $path;
+        $this->assertTrue($result);
+
+        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id], 'domains/list_user_roles.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements + ['{domainUserId}' => $user->id, '{roleId}' => $parentRole->id], 'domains/revoke_user_role.php');
+        require_once $path;
+
+        $user->delete();
+        $parentRole->delete();
+
+        /** @var $domain \OpenStack\Identity\v3\Models\Domain */
+        $path = $this->sampleFile($replacements, 'domains/update_domain.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Domain::class, $domain);
+
+        $path = $this->sampleFile($replacements, 'domains/delete_domain.php');
+        require_once $path;
+    }
+
+    public function endpoints()
+    {
+        $service = $this->getService()->createService(['name' => $this->randomStr(), 'type' => 'volume', 'description' => $this->randomStr()]);
+
+        $replacements = [
+            '{endpointName}' => $this->randomStr(),
+            '{serviceId}' => $service->id,
+            '{endpointUrl}' => getenv('OS_AUTH_URL'),
+            '{region}' => 'RegionOne',
+        ];
+
+        /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
+        $path = $this->sampleFile($replacements, 'endpoints/add_endpoint.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Endpoint::class, $endpoint);
+
+        $replacements['{endpointId}'] = $endpoint->id;
+
+        $path = $this->sampleFile($replacements, 'endpoints/list_endpoints.php');
+        require_once $path;
+
+        /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
+        $path = $this->sampleFile($replacements, 'endpoints/update_endpoint.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'endpoints/delete_endpoint.php');
+        require_once $path;
+
+        $service->delete();
+    }
+
+    public function services()
+    {
+        $replacements = [
+            '{serviceName}' => $this->randomStr(),
+            '{serviceType}' => $this->randomStr(),
+        ];
+
+        /** @var $service \OpenStack\Identity\v3\Models\Service */
+        $path = $this->sampleFile($replacements, 'services/add_service.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Service::class, $service);
+
+        $replacements['{serviceId}'] = $service->id;
+
+        $path = $this->sampleFile($replacements, 'services/list_services.php');
+        require_once $path;
+
+        /** @var $service \OpenStack\Identity\v3\Models\Service */
+        $path = $this->sampleFile($replacements, 'services/update_service.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Service::class, $service);
+
+        /** @var $service \OpenStack\Identity\v3\Models\Service */
+        $path = $this->sampleFile($replacements, 'services/get_service.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Service::class, $service);
+
+        $path = $this->sampleFile($replacements, 'services/delete_service.php');
+        require_once $path;
+    }
+
+    public function groups()
+    {
+        $groupUser = $this->getService()->createUser(['name' => $this->randomStr()]);
+
+        /** @var $group \OpenStack\Identity\v3\Models\Group */
+        $path = $this->sampleFile(['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'groups/add_group.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Group::class, $group);
+
+        $replacements = ['{groupId}' => $group->id];
+
+        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/add_user.php');
+        require_once $path;
+
+        /** @var $group \OpenStack\Identity\v3\Models\Group */
+        $path = $this->sampleFile($replacements, 'groups/get_group.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Group::class, $group);
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/check_user_membership.php');
+        require_once $path;
+        $this->assertTrue($result);
+
+        $path = $this->sampleFile($replacements, 'groups/list_users.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/remove_user.php');
+        require_once $path;
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements + ['{groupUserId}' => $groupUser->id], 'groups/check_user_membership.php');
+        require_once $path;
+        $this->assertFalse($result);
+
+        $path = $this->sampleFile($replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'groups/update_group.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'groups/list_groups.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'groups/delete_group.php');
+        require_once $path;
+
+        $groupUser->delete();
+    }
+
+    public function projects()
+    {
+        /** @var $project \OpenStack\Identity\v3\Models\Project */
+        $path = $this->sampleFile(['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'projects/add_project.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Project::class, $project);
+
+        $replacements = ['{id}' => $project->id];
+
+        /** @var $project \OpenStack\Identity\v3\Models\Project */
+        $path = $this->sampleFile($replacements, 'projects/get_project.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Project::class, $project);
+
+        $domain = $this->getService()->createDomain(['name' => $this->randomStr()]);
+        $parentRole = $this->getService()->createRole(['name' => $this->randomStr()]);
+        $group = $this->getService()->createGroup(['name' => $this->randomStr(), 'domainId' => $domain->id]);
+
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'projects/grant_group_role.php');
+        require_once $path;
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'projects/check_group_role.php');
+        require_once $path;
+        $this->assertTrue($result);
+
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id], 'projects/list_group_roles.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements + ['{groupId}' => $group->id, '{roleId}' => $parentRole->id], 'projects/revoke_group_role.php');
+        require_once $path;
+
+        $group->delete();
+
+        $user = $this->getService()->createUser(['name' => $this->randomStr(), 'domainId' => $domain->id]);
+
+        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id], 'projects/grant_user_role.php');
+        require_once $path;
+
+        /** @var $result bool */
+        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id], 'projects/check_user_role.php');
+        require_once $path;
+        $this->assertTrue($result);
+
+        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id], 'projects/list_user_roles.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements + ['{projectUserId}' => $user->id, '{roleId}' => $parentRole->id], 'projects/revoke_user_role.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'projects/update_project.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'projects/delete_project.php');
+        require_once $path;
+
+        $user->delete();
+        $parentRole->delete();
+
+        $domain->enabled = false;
+        $domain->update();
+        $domain->delete();
+    }
+
+    public function roles()
+    {
+        /** @var $role \OpenStack\Identity\v3\Models\Role */
+        $path = $this->sampleFile(['{name}' => $this->randomStr()], 'roles/add_role.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\Role::class, $role);
+
+        $path = $this->sampleFile([], 'roles/list_roles.php');
+        require_once $path;
+
+        $path = $this->sampleFile([], 'roles/list_assignments.php');
+        require_once $path;
+    }
+
+    public function users()
+    {
+        $parentDomain  = $this->getService()->createDomain(['name' => $this->randomStr()]);
+        $parentProject = $this->getService()->createProject(['name' => $this->randomStr(), 'domainId' => $parentDomain->id]);
+
+        $replacements = [
+            '{defaultProjectId}' => $parentProject->id,
+            '{description}'      => $this->randomStr(),
+            '{domainId}'         => $parentDomain->id,
+            '{email}'            => 'foo@bar.com',
+            '{enabled}'          => true,
+            '{name}'             => $this->randomStr(),
+            '{userPass}'         => $this->randomStr(),
+        ];
+
+        /** @var $user \OpenStack\Identity\v3\Models\User */
+        $path = $this->sampleFile($replacements, 'users/add_user.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\User::class, $user);
+
+        $replacements = ['{id}' => $user->id];
+
+        /** @var $user \OpenStack\Identity\v3\Models\User */
+        $path = $this->sampleFile($replacements, 'users/get_user.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\User::class, $user);
+
+        $path = $this->sampleFile([], 'users/list_users.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'users/list_groups.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'users/list_projects.php');
+        require_once $path;
+
+        /** @var $user \OpenStack\Identity\v3\Models\User */
+        $path = $this->sampleFile($replacements + ['{name}' => $this->randomStr(), '{description}' => $this->randomStr()], 'users/update_user.php');
+        require_once $path;
+        $this->assertInstanceOf(Models\User::class, $user);
+
+        $path = $this->sampleFile($replacements, 'users/delete_user.php');
+        require_once $path;
+
+        $parentProject->delete();
+
+        $parentDomain->enabled = false;
+        $parentDomain->update();
+        $parentDomain->delete();
+    }
+}
diff --git a/tests/integration/Images/v2/CoreTest.php b/tests/integration/Images/v2/CoreTest.php
new file mode 100644
index 00000000..f459e5ee
--- /dev/null
+++ b/tests/integration/Images/v2/CoreTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace OpenStack\integration\Images\v2;
+
+use OpenStack\Images\v2\Models\Image;
+use OpenStack\Images\v2\Models\Member;
+use OpenStack\Integration\TestCase;
+
+class CoreTest extends TestCase
+{
+    public function runTests()
+    {
+        $this->startTimer();
+
+        $this->images();
+        $this->members();
+
+        $this->outputTimeTaken();
+    }
+
+    public function images()
+    {
+        $replacements = [
+            '{name}'            => 'Ubuntu 12.10',
+            '{tag1}'            => 'ubuntu',
+            '{tag2}'            => 'quantal',
+            '{containerFormat}' => 'bare',
+            '{diskFormat}'      => 'qcow2',
+            '{visibility}'      => 'private',
+        ];
+
+        $this->logStep('Creating image');
+        /** @var Image $image */
+        require_once $this->sampleFile($replacements, 'images/create.php');
+        $this->assertInstanceOf(Image::class, $image);
+
+        $replacements = ['{imageId}' => $image->id];
+
+        $this->logStep('Listing images');
+        /** @var \Generator $images */
+        require_once $this->sampleFile($replacements, 'images/list.php');
+
+        $this->logStep('Getting image');
+        /** @var Image $image */
+        require_once $this->sampleFile($replacements, 'images/get.php');
+        $this->assertInstanceOf(Image::class, $image);
+
+        $replacements += [
+            '{name}'       => 'newName',
+            '{visibility}' => 'private',
+        ];
+
+        $this->logStep('Updating image');
+        /** @var Image $image */
+        require_once $this->sampleFile($replacements, 'images/update.php');
+
+        $this->logStep('Deleting image');
+        /** @var Image $image */
+        require_once $this->sampleFile($replacements, 'images/delete.php');
+    }
+
+    public function members()
+    {
+        $replacements = [
+            '{name}'            => 'Ubuntu 12.10',
+            '{tag1}'            => 'ubuntu',
+            '{tag2}'            => 'quantal',
+            '{containerFormat}' => 'bare',
+            '{diskFormat}'      => 'qcow2',
+            '{visibility}'      => 'private',
+            'true'              => 'false',
+        ];
+
+        $this->logStep('Creating image');
+        /** @var Image $image */
+        require_once $this->sampleFile($replacements, 'images/create.php');
+
+        $replacements = ['{imageId}' => $image->id];
+
+        $this->logStep('Adding member');
+        /** @var Member $member */
+        require_once $this->sampleFile($replacements, 'members/add.php');
+        $this->assertInstanceOf(Member::class, $member);
+
+        $replacements += ['status' => Member::STATUS_REJECTED];
+        $this->logStep('Updating member status');
+        /** @var Member $member */
+        require_once $this->sampleFile($replacements, 'members/update_status.php');
+        $this->assertInstanceOf(Member::class, $member);
+
+        $this->logStep('Deleting member');
+        /** @var Member $member */
+        require_once $this->sampleFile($replacements, 'members/delete.php');
+
+        $this->logStep('Deleting image');
+        /** @var Image $image */
+        require_once $this->sampleFile($replacements, 'images/delete.php');
+    }
+}
diff --git a/tests/integration/Networking/v2/CoreTest.php b/tests/integration/Networking/v2/CoreTest.php
new file mode 100644
index 00000000..6f1521bd
--- /dev/null
+++ b/tests/integration/Networking/v2/CoreTest.php
@@ -0,0 +1,359 @@
+<?php
+
+namespace OpenStack\Integration\Networking\v2;
+
+use OpenStack\Networking\v2\Models\Network;
+use OpenStack\Networking\v2\Models\Port;
+use OpenStack\Networking\v2\Models\Subnet;
+use OpenStack\Integration\TestCase;
+
+class CoreTest extends TestCase
+{
+    public function runTests()
+    {
+        $this->startTimer();
+
+        $this->networks();
+        $this->subnets();
+        $this->ports();
+
+        $this->outputTimeTaken();
+    }
+
+    public function subnets()
+    {
+        $this->createSubnetsAndDelete();
+        $this->createSubnetWithHostRoutes();
+
+        list($subnetId, $networkId) = $this->createSubnet();
+
+        $this->updateSubnet($subnetId);
+        $this->retrieveSubnet($subnetId);
+        $this->deleteSubnet($subnetId);
+        $this->deleteNetwork($networkId);
+    }
+
+    public function networks()
+    {
+        $this->createNetworksAndDelete();
+
+        $networkId = $this->createNetwork();
+        $this->updateNetwork($networkId);
+        $this->retrieveNetwork($networkId);
+        $this->deleteNetwork($networkId);
+    }
+
+    private function createNetworksAndDelete()
+    {
+        $replacements = [
+            '{networkName1}' => $this->randomStr(),
+            '{networkName2}' => $this->randomStr()
+        ];
+
+        /** @var $networks array */
+        $path = $this->sampleFile($replacements, 'networks/create_batch.php');
+        require_once $path;
+
+        foreach ($networks as $network) {
+            $this->assertInstanceOf(Network::class, $network);
+            $this->assertNotEmpty($network->id);
+
+            $this->networkId = $network->id;
+            $this->logStep('Created network {id}', ['{id}' => $this->networkId]);
+
+            $this->deleteNetwork($network->id);
+        }
+    }
+
+    private function createNetwork()
+    {
+        $replacements = [
+            '{networkName}' => $this->randomStr(),
+        ];
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile($replacements, 'networks/create.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Network::class, $network);
+        $this->assertNotEmpty($network->id);
+
+        $this->logStep('Created network {id}', ['{id}' => $this->networkId]);
+
+        return $network->id;
+    }
+
+    private function updateNetwork($networkId)
+    {
+        $name = $this->randomStr();
+
+        $replacements = [
+            '{networkId}' => $networkId,
+            '{newName}'   => $name,
+        ];
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile($replacements, 'networks/update.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Network::class, $network);
+        $this->assertEquals($name, $network->name);
+
+        $this->logStep('Updated network ID to use this name: NAME', ['ID' => $networkId, 'NAME' => $name]);
+    }
+
+    private function retrieveNetwork($networkId)
+    {
+        $replacements = ['{networkId}' => $networkId];
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile($replacements, 'networks/get.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Network::class, $network);
+
+        $this->logStep('Retrieved the details of network ID', ['ID' => $networkId]);
+    }
+
+    private function deleteNetwork($networkId)
+    {
+        $replacements = ['{networkId}' => $networkId];
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile($replacements, 'networks/delete.php');
+        require_once $path;
+
+        $this->logStep('Deleted network ID', ['ID' => $networkId]);
+    }
+
+    private function createSubnetsAndDelete()
+    {
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
+        require_once $path;
+
+        $replacements = [
+            '{subnetName1}' => $this->randomStr(),
+            '{subnetName2}' => $this->randomStr(),
+            '{networkId1}'  => $network->id,
+            '{networkId2}'  => $network->id,
+        ];
+
+        /** @var $subnets array */
+        $path = $this->sampleFile($replacements, 'subnets/create_batch.php');
+        require_once $path;
+
+        foreach ($subnets as $subnet) {
+            $this->assertInstanceOf(Subnet::class, $subnet);
+            $this->assertNotEmpty($subnet->id);
+
+            $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
+
+            $this->deleteSubnet($subnet->id);
+        }
+
+        $path = $this->sampleFile(['{networkId}' => $network->id], 'networks/delete.php');
+        require_once $path;
+    }
+
+    private function createSubnet()
+    {
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
+        require_once $path;
+
+        $replacements = [
+            '{subnetName}' => $this->randomStr(),
+            '{networkId}'  => $network->id,
+        ];
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile($replacements, 'subnets/create.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertNotEmpty($subnet->id);
+
+        $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
+
+        return [$subnet->id, $network->id];
+    }
+
+    private function createSubnetWithGatewayIp()
+    {
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
+        require_once $path;
+
+        $replacements = [
+            '{networkId}' => $network->id,
+        ];
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile($replacements, 'subnets/create_with_gateway_ip.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertNotEmpty($subnet->id);
+
+        $this->subnetId = $subnet->id;
+
+        $this->logStep('Created subnet {id} with gateway ip', ['{id}' => $this->subnetId]);
+
+        $path = $this->sampleFile($replacements, 'networks/delete.php');
+        require_once $path;
+    }
+
+    private function createSubnetWithHostRoutes()
+    {
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{newName}' => $this->randomStr()], 'networks/create.php');
+        require_once $path;
+
+        $replacements = [
+            '{networkId}' => $network->id,
+        ];
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile($replacements, 'subnets/create_with_host_routes.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertNotEmpty($subnet->id);
+
+        $this->logStep('Created subnet {id} with host routes', ['{id}' => $subnet->id]);
+
+        $path = $this->sampleFile($replacements, 'networks/delete.php');
+        require_once $path;
+    }
+
+    private function updateSubnet($subnetId)
+    {
+        $name = $this->randomStr();
+
+        $replacements = [
+            '{subnetId}' => $subnetId,
+            '{newName}'  => $name,
+        ];
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile($replacements, 'subnets/update.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+        $this->assertEquals($name, $subnet->name);
+
+        $this->logStep('Updated subnet ID to use this name: NAME', ['ID' => $subnetId, 'NAME' => $name]);
+    }
+
+
+    private function retrieveSubnet($subnetId)
+    {
+        $replacements = ['{subnetId}' => $subnetId];
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile($replacements, 'subnets/get.php');
+        require_once $path;
+
+        $this->assertInstanceOf(Subnet::class, $subnet);
+
+        $this->logStep('Retrieved the details of subnet ID', ['ID' => $subnetId]);
+    }
+
+    private function deleteSubnet($subnetId)
+    {
+        $replacements = ['{subnetId}' => $subnetId];
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile($replacements, 'subnets/delete.php');
+        require_once $path;
+
+        $this->logStep('Deleted subnet ID', ['ID' => $subnetId]);
+    }
+
+    public function ports()
+    {
+        $this->logStep('Test port');
+
+        $replacements = ['{newName}' => $this->randomStr()];
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile($replacements, 'networks/create.php');
+        require_once $path;
+
+        $replacements = ['{networkId}' => $network->id];
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        $path = $this->sampleFile($replacements, 'ports/create.php');
+        require_once $path;
+
+        $replacements['{portId}'] = $port->id;
+        $port->networkId = $network->id;
+
+        /** @var $ports array */
+        $path = $this->sampleFile($replacements, 'ports/create_batch.php');
+        require_once $path;
+        foreach ($ports as $port) {
+            $this->assertInstanceOf(Port::class, $port);
+            $port->delete();
+        }
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        $path = $this->sampleFile($replacements, 'ports/list.php');
+        require_once $path;
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        $path = $this->sampleFile($replacements, 'ports/get.php');
+        require_once $path;
+        $this->assertInstanceOf(Port::class, $port);
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        $path = $this->sampleFile($replacements, 'ports/update.php');
+        require_once $path;
+        $this->assertInstanceOf(Port::class, $port);
+
+        $path = $this->sampleFile($replacements, 'ports/delete.php');
+        require_once $path;
+
+        $path = $this->sampleFile($replacements, 'networks/delete.php');
+        require_once $path;
+
+        $this->createPortWithFixedIps();
+    }
+
+    private function createPortWithFixedIps()
+    {
+        $this->logStep('Test port with fixed IP');
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{networkName}' => $this->randomStr()], 'networks/create.php');
+        require_once $path;
+        $this->logStep('Created network {id}', ['{id}' => $network->id]);
+
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile(['{subnetName}' => $this->randomStr(), '{networkId}' => $network->id], 'subnets/create.php');
+        require_once $path;
+        $this->logStep('Created subnet {id}', ['{id}' => $subnet->id]);
+
+        /** @var $port \OpenStack\Networking\v2\Models\Port */
+        $path = $this->sampleFile(['{networkId}' => $network->id], 'ports/create_with_fixed_ips.php');
+        require_once $path;
+        $this->logStep('Created port {id}', ['{id}' => $port->id]);
+
+        $path = $this->sampleFile(['{portId}' => $port->id], 'ports/delete.php');
+        require_once $path;
+
+        $this->logStep('Deleted port {id}', ['{id}' => $port->id]);
+
+        /** @var $subnet \OpenStack\Networking\v2\Models\Subnet */
+        $path = $this->sampleFile(['{subnetId}' => $subnet->id], 'subnets/delete.php');
+        require_once $path;
+        $this->logStep('Deleted subnet {id}', ['{id}' => $subnet->id]);
+
+        /** @var $network \OpenStack\Networking\v2\Models\Network */
+        $path = $this->sampleFile(['{networkId}' => $network->id], 'networks/delete.php');
+        require_once $path;
+        $this->logStep('Deleted network {id}', ['{id}' => $network->id]);
+    }
+}
diff --git a/tests/integration/Networking/v2/Layer3Test.php b/tests/integration/Networking/v2/Layer3Test.php
new file mode 100644
index 00000000..0f2c9913
--- /dev/null
+++ b/tests/integration/Networking/v2/Layer3Test.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace OpenStack\Integration\Networking\v2;
+
+use Guzzle\Tests\Service\Mock\Command\Sub\Sub;
+use OpenStack\Integration\TestCase;
+use OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp;
+use OpenStack\Networking\v2\Models\Network;
+use OpenStack\Networking\v2\Models\Port;
+use OpenStack\Networking\v2\Models\Subnet;
+
+class Layer3Test extends TestCase
+{
+    public function getService(): \OpenStack\Networking\v2\Extensions\Layer3\Service
+    {
+        return $this->getBaseClient()->networkingV2ExtLayer3();
+    }
+
+    private function getV2Service(): \OpenStack\Networking\v2\Service
+    {
+        return $this->getBaseClient()->networkingV2();
+    }
+
+    public function runTests()
+    {
+        $this->startTimer();
+        $this->floatingIps();
+        $this->outputTimeTaken();
+    }
+
+    public function teardown()
+    {
+        parent::teardown();
+
+        $this->deleteItems($this->getV2Service()->listPorts());
+        $this->deleteItems($this->getV2Service()->listNetworks());
+        $this->deleteItems($this->getService()->listFloatingIps());
+    }
+
+    private function createNetwork(bool $routerAccessible = true): Network
+    {
+        $network = $this->getV2Service()->createNetwork([
+            'name'             => $this->randomStr(),
+            'routerAccessible' => $routerAccessible,
+        ]);
+        $network->waitUntilActive();
+        return $network;
+    }
+
+    private function createSubnet(Network $network, string $cidr = '192.168.199.0/24'): Subnet
+    {
+        return $this->getV2Service()->createSubnet([
+            'networkId' => $network->id,
+            'name'      => $this->randomStr(),
+            'ipVersion' => 4,
+            'cidr'      => $cidr,
+        ]);
+    }
+
+    private function createPort(Network $network): Port
+    {
+        return $this->getV2Service()->createPort([
+            'networkId' => $network->id,
+            'name'      => $this->randomStr(),
+        ]);
+    }
+
+    private function findSubnetIp(Port $port, Subnet $subnet): string
+    {
+        foreach ($port->fixedIps as $fixedIp) {
+            if ($fixedIp['subnet_id'] == $subnet->id) {
+                return $fixedIp['ip_address'];
+            }
+        }
+
+        return '';
+    }
+
+    public function floatingIps()
+    {
+        $this->logStep('Creating external network');
+        $externalNetwork = $this->createNetwork();
+
+        $this->logStep('Creating subnet for external network %id%', ['%id%' => $externalNetwork->id]);
+        $this->createSubnet($externalNetwork, '10.0.0.0/24');
+
+        $this->logStep('Creating internal network');
+        $internalNetwork = $this->createNetwork(false);
+
+        $this->logStep('Creating subnet for internal network %id%', ['%id%' => $internalNetwork->id]);
+        $subnet = $this->createSubnet($internalNetwork);
+
+        $this->logStep('Creating router for external network %id%', ['%id%' => $externalNetwork->id]);
+        $router = $this->getService()->createRouter([
+            'name'                => $this->randomStr(),
+            'externalGatewayInfo' => [
+                'networkId'  => $externalNetwork->id,
+                'enableSnat' => true,
+            ],
+        ]);
+
+        $this->logStep('Create interface for subnet %subnet% and router %router%', [
+            '%subnet%' => $subnet->id, '%router%' => $router->id,
+        ]);
+        $router->addInterface(['subnetId' => $subnet->id]);
+
+        $this->logStep('Creating port for internal network %id%', ['%id%' => $internalNetwork->id]);
+        $port1 = $this->createPort($internalNetwork);
+        $fixedIp = $this->findSubnetIp($port1, $subnet);
+
+        $replacements = [
+            '{networkId}'      => $externalNetwork->id,
+            '{portId}'         => $port1->id,
+            '{fixedIpAddress}' => $fixedIp,
+        ];
+
+        $this->logStep('Create floating IP');
+        /** @var FloatingIp $ip */
+        $path = $this->sampleFile($replacements, 'floatingIPs/create.php');
+        require_once $path;
+        $this->assertInstanceOf(FloatingIp::class, $ip);
+        $this->assertEquals($externalNetwork->id, $ip->floatingNetworkId);
+        $this->assertEquals($port1->id, $ip->portId);
+
+        $this->logStep('List floating IPs');
+        $path = $this->sampleFile($replacements, 'floatingIPs/list.php');
+        require_once $path;
+
+        $this->logStep('Get floating IP');
+        $replacements['{id}'] = $ip->id;
+        $path = $this->sampleFile($replacements, 'floatingIPs/get.php');
+        require_once $path;
+        $this->assertInstanceOf(FloatingIp::class, $ip);
+
+        $this->logStep('Update floating IP');
+        $port2 = $this->createPort($internalNetwork);
+        $replacements['{newPortId}'] = $port2->id;
+        $path = $this->sampleFile($replacements, 'floatingIPs/update.php');
+        require_once $path;
+
+        $this->logStep('Delete floating IP');
+        $path = $this->sampleFile($replacements, 'floatingIPs/delete.php');
+        require_once $path;
+
+        $router->removeInterface(['subnetId' => $subnet->id]);
+        $router->delete();
+        $router->waitUntilDeleted();
+
+        $port1->delete();
+        $port2->delete();
+
+        $internalNetwork->delete();
+        $internalNetwork->waitUntilDeleted();
+
+        $externalNetwork->delete();
+        $externalNetwork->waitUntilDeleted();
+    }
+}
diff --git a/tests/integration/Networking/v2/SecGroupTest.php b/tests/integration/Networking/v2/SecGroupTest.php
new file mode 100644
index 00000000..6b82dd98
--- /dev/null
+++ b/tests/integration/Networking/v2/SecGroupTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace OpenStack\Integration\Networking\v2;
+
+use OpenStack\Integration\TestCase;
+
+class SecGroupTest extends TestCase
+{
+    public function runTests()
+    {
+    }
+}
diff --git a/tests/integration/ObjectStore/v1/CoreTest.php b/tests/integration/ObjectStore/v1/CoreTest.php
new file mode 100644
index 00000000..d3657216
--- /dev/null
+++ b/tests/integration/ObjectStore/v1/CoreTest.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace OpenStack\integration\ObjectStore\v1;
+
+use OpenStack\Integration\TestCase;
+use OpenStack\Integration\Utils;
+use Psr\Http\Message\StreamInterface;
+
+class CoreTest extends TestCase
+{
+    private $service;
+
+    /**
+     * @return \OpenStack\ObjectStore\v1\Service
+     */
+    protected function getService()
+    {
+        if (null === $this->service) {
+            $this->service = Utils::getOpenStack()->objectStoreV1();
+        }
+
+        return $this->service;
+    }
+
+    public function runTests()
+    {
+        $this->startTimer();
+
+        $this->accountMetadata();
+        $this->containers();
+        $this->objects();
+
+        $this->outputTimeTaken();
+    }
+
+    public function accountMetadata()
+    {
+        $this->logStep('Ensure all metadata is wiped');
+        $this->getService()->getAccount()->resetMetadata([]);
+
+        $replacements = [
+            '{key_1}' => 'Foo',
+            '{key_2}' => 'Bar',
+            '{val_1}' => $this->randomStr(),
+            '{val_2}' => $this->randomStr(),
+        ];
+
+        $this->logStep('Setting account metadata');
+        require_once $this->sampleFile($replacements, 'account/merge_metadata.php');
+
+        $this->logStep('Getting account metadata');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'account/get_metadata.php');
+        $this->assertArraySubset([
+            'Foo' => $replacements['{val_1}'],
+            'Bar' => $replacements['{val_2}'],
+        ], $metadata);
+
+        $this->logStep('Resetting account metadata');
+        $replacements = [
+            '{key_1}' => 'Foo1',
+            '{key_2}' => 'Bar1',
+            '{val_1}' => $this->randomStr(),
+            '{val_2}' => $this->randomStr(),
+        ];
+        require_once $this->sampleFile($replacements, 'account/reset_metadata.php');
+
+        $this->logStep('Checking account metadata was reset properly');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'account/get_metadata.php');
+        $this->assertEquals([
+            'Foo1' => $replacements['{val_1}'],
+            'Bar1' => $replacements['{val_2}'],
+        ], $metadata);
+    }
+
+    public function containers()
+    {
+        $containerName = $this->randomStr();
+        $replacements = ['{containerName}' => $containerName];
+
+        $this->logStep('Create container');
+        require_once $this->sampleFile($replacements, 'containers/create.php');
+
+        $this->logStep('Get container');
+        require_once $this->sampleFile($replacements, 'containers/get.php');
+
+        $this->logStep('Listing containers');
+        require_once $this->sampleFile($replacements, 'containers/list.php');
+
+        $this->logStep('Merging metadata');
+        $replacements += [
+            '{key_1}' => 'Foo',
+            '{key_2}' => 'Bar',
+            '{val_1}' => $this->randomStr(),
+            '{val_2}' => $this->randomStr(),
+        ];
+        require_once $this->sampleFile($replacements, 'containers/merge_metadata.php');
+
+        $this->logStep('Getting metadata');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'containers/get_metadata.php');
+        $this->assertEquals([
+            'Foo' => $replacements['{val_1}'],
+            'Bar' => $replacements['{val_2}'],
+        ], $metadata);
+
+        $this->logStep('Resetting metadata');
+        $replacements['{key_1}'] = 'Foo1';
+        $replacements['{key_2}'] = 'Bar1';
+
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'containers/reset_metadata.php');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'containers/get_metadata.php');
+        $this->assertEquals([
+            'Foo1' => $replacements['{val_1}'],
+            'Bar1' => $replacements['{val_2}'],
+        ], $metadata);
+
+        $this->logStep('Delete container');
+        $replacements = ['{containerName}' => $containerName];
+        require_once $this->sampleFile($replacements, 'containers/delete.php');
+    }
+
+    public function objects()
+    {
+        $containerName = $this->randomStr();
+
+        $this->logStep('Create container named {name}', ['{name}' => $containerName]);
+        $container = $this->getService()->createContainer(['name' => $containerName]);
+
+        $objectName = $this->randomStr();
+        $replacements = ['{containerName}' => $container->name, '{objectName}' => $objectName];
+
+        $this->logStep('Create object');
+        $replacements['{objectContent}'] = str_repeat('A', 1000);
+        require_once $this->sampleFile($replacements, 'objects/create.php');
+
+        $this->logStep('Copy object');
+        $newName = $this->randomStr();
+        $replacements += ['{newContainerName}' => $containerName, '{newObjectName}' => $newName];
+        require_once $this->sampleFile($replacements, 'objects/copy.php');
+
+        $this->logStep('Check that new object exists');
+        /** @var bool $exists */
+        require_once $this->sampleFile(['{containerName}' => $containerName, '{objectName}' => $newName], 'objects/check_exists.php');
+        $this->assertTrue($exists);
+
+        $this->logStep('Downloading object');
+        /** @var StreamInterface $stream */
+        require_once $this->sampleFile($replacements, 'objects/download.php');
+        $this->assertInstanceOf(StreamInterface::class, $stream);
+        $this->assertEquals(1000, $stream->getSize());
+
+        $this->logStep('Get object');
+        require_once $this->sampleFile($replacements, 'objects/get.php');
+
+        $this->logStep('Listing objects');
+        require_once $this->sampleFile($replacements, 'objects/list.php');
+
+        $this->logStep('Merging metadata');
+        $replacements += [
+            '{key_1}' => 'Foo',
+            '{key_2}' => 'Bar',
+            '{val_1}' => $this->randomStr(),
+            '{val_2}' => $this->randomStr(),
+        ];
+        require_once $this->sampleFile($replacements, 'objects/merge_metadata.php');
+
+        $this->logStep('Getting metadata');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'objects/get_metadata.php');
+        $this->assertEquals([
+            'Foo' => $replacements['{val_1}'],
+            'Bar' => $replacements['{val_2}'],
+        ], $metadata);
+
+        $this->logStep('Resetting metadata');
+        $replacements['{key_1}'] = 'Foo1';
+        $replacements['{key_2}'] = 'Bar1';
+
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'objects/reset_metadata.php');
+        /** @var array $metadata */
+        require_once $this->sampleFile($replacements, 'objects/get_metadata.php');
+        $this->assertEquals([
+            'Foo1' => $replacements['{val_1}'],
+            'Bar1' => $replacements['{val_2}'],
+        ], $metadata);
+
+        $this->logStep('Delete object');
+        require_once $this->sampleFile($replacements, 'objects/delete.php');
+        $container->getObject($replacements['{newObjectName}'])->delete();
+
+        $this->logStep('Delete container');
+        $container->delete();
+    }
+}
diff --git a/tests/integration/Runner.php b/tests/integration/Runner.php
new file mode 100644
index 00000000..8a385e74
--- /dev/null
+++ b/tests/integration/Runner.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace OpenStack\Integration;
+
+class Runner
+{
+    private $testsDir;
+    private $samplesDir;
+    private $logger;
+    private $tests;
+    private $namespace;
+
+    public function __construct($samplesDir, $testsDir, $testNamespace)
+    {
+        $this->samplesDir = $samplesDir;
+        $this->testsDir = $testsDir;
+        $this->namespace = $testNamespace;
+
+        $this->logger = new DefaultLogger();
+        $this->assembleTestFiles();
+    }
+
+    private function traverse(string $path): \DirectoryIterator
+    {
+        return new \DirectoryIterator($path);
+    }
+
+    private function assembleTestFiles()
+    {
+        foreach ($this->traverse($this->testsDir) as $servicePath) {
+            if ($servicePath->isDir()) {
+                $serviceBn = $servicePath->getBasename();
+                foreach ($this->traverse($servicePath->getPathname()) as $versionPath) {
+                    $versionBn = $versionPath->getBasename();
+                    if ($servicePath->isDir() && $versionBn[0] == 'v') {
+                        foreach ($this->traverse($versionPath->getPathname()) as $testPath) {
+                            if (strpos($testPath->getFilename(), 'Test.php')) {
+                                $testBn = strtolower(substr($testPath->getBasename(), 0, -8));
+                                $this->tests[strtolower($serviceBn)][strtolower($versionBn)][] = $testBn;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private function getOpts()
+    {
+        $opts = getopt('s:v:m:t:', ['service:', 'version:', 'module::', 'test::', 'debug::', 'help::']);
+
+        $getOpt = function (array $keys, $default) use ($opts) {
+            $value = $default;
+            foreach ($keys as $key) {
+                if (isset($opts[$key])) {
+                    $value = $opts[$key];
+                    break;
+                }
+            }
+            return strtolower($value);
+        };
+
+        return [
+            $getOpt(['s', 'service'], 'all'),
+            $getOpt(['v', 'version'], 'all'),
+            $getOpt(['m', 'module'], 'core'),
+            $getOpt(['t', 'test'], ''),
+            isset($opts['debug']) ? (int)$opts['debug'] : 0,
+        ];
+    }
+
+    private function getRunnableServices($service, $version, $module)
+    {
+        $tests = $this->tests;
+
+        if ($service != 'all') {
+            if (!isset($tests[$service])) {
+                $this->logger->critical(sprintf("%s is not a valid service", $service));
+                exit(1);
+            }
+
+            $serviceArray = $tests[$service];
+            $tests = [$service => $serviceArray];
+
+            if ($version != 'all') {
+                if (!isset($serviceArray[$version])) {
+                    $this->logger->critical(sprintf("%s is not a valid version for the %s service", $version, $service));
+                    exit(1);
+                }
+
+                $versionArray = $serviceArray[$version];
+                if ($module != 'core') {
+                    if (!in_array($module, $serviceArray[$version])) {
+                        $this->logger->critical(sprintf("%s is not a valid test class for the %s %s service", $module, $version, $service));
+                        exit(1);
+                    }
+                    $versionArray = [$module];
+                }
+
+                $tests = [$service => [$version => $versionArray]];
+            }
+        }
+
+        return $tests;
+    }
+
+    /**
+     * @return TestInterface
+     */
+    private function getTest($service, $version, $test, $verbosity)
+    {
+        $className = sprintf("%s\\%s\\%s\\%sTest", $this->namespace, Utils::toCamelCase($service), $version, ucfirst($test));
+
+        if (!class_exists($className)) {
+            throw new \RuntimeException(sprintf("%s does not exist", $className));
+        }
+
+        $basePath = $this->samplesDir . DIRECTORY_SEPARATOR . $service . DIRECTORY_SEPARATOR . $version;
+        $smClass  = sprintf("%s\\SampleManager", $this->namespace);
+        $class = new $className($this->logger, new $smClass($basePath, $verbosity), $verbosity);
+
+        if (!($class instanceof TestInterface)) {
+            throw new \RuntimeException(sprintf("%s does not implement TestInterface", $className));
+        }
+
+        return $class;
+    }
+
+    public function runServices()
+    {
+        list($serviceOpt, $versionOpt, $moduleOpt, $testMethodOpt, $verbosityOpt) = $this->getOpts();
+
+        foreach ($this->getRunnableServices($serviceOpt, $versionOpt, $moduleOpt) as $serviceName => $serviceArray) {
+            foreach ($serviceArray as $versionName => $versionArray) {
+                foreach ($versionArray as $testName) {
+                    $this->logger->info(str_repeat('=', 49));
+                    $this->logger->info("Starting %s %v %m integration test(s)", [
+                        '%s' => $serviceName,
+                        '%v' => $versionName,
+                        '%m' => $moduleOpt,
+                    ]);
+                    $this->logger->info(str_repeat('=', 49));
+
+                    $testRunner = $this->getTest($serviceName, $versionName, $testName, $verbosityOpt);
+
+                    try {
+                        if ($testMethodOpt) {
+                            $testRunner->runOneTest($testMethodOpt);
+                        } else {
+                            $testRunner->runTests();
+                        }
+                    } finally {
+                        $this->logger->info(str_repeat('=', 11));
+                        $this->logger->info('Cleaning up');
+                        $this->logger->info(str_repeat('=', 11));
+                        $testRunner->teardown();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/integration/SampleManager.php b/tests/integration/SampleManager.php
new file mode 100644
index 00000000..edc3e07a
--- /dev/null
+++ b/tests/integration/SampleManager.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace OpenStack\integration;
+
+use OpenStack\Integration\SampleManagerInterface;
+
+class SampleManager implements SampleManagerInterface
+{
+    protected $basePath;
+    protected $paths = [];
+    protected $verbosity;
+
+    public function __construct($basePath, $verbosity)
+    {
+        $this->basePath = $basePath;
+        $this->verbosity = $verbosity;
+    }
+
+    public function deletePaths()
+    {
+        if (!empty($this->paths)) {
+            foreach ($this->paths as $path) {
+                unlink($path);
+            }
+        }
+    }
+
+    protected function getGlobalReplacements()
+    {
+        return [
+            '{userId}'      => getenv('OS_USER_ID'),
+            '{username}'    => getenv('OS_USERNAME'),
+            '{password}'    => getenv('OS_PASSWORD'),
+            '{domainId}'    => getenv('OS_DOMAIN_ID'),
+            '{authUrl}'     => getenv('OS_AUTH_URL'),
+            '{tenantId}'    => getenv('OS_TENANT_ID'),
+            '{region}'      => getenv('OS_REGION'),
+            '{projectId}'   => getenv('OS_PROJECT_ID'),
+            '{projectName}' => getenv('OS_PROJECT_NAME'),
+        ];
+    }
+
+    public function getConnectionStr()
+    {
+        return str_replace('$openstack =', 'return', $this->getConnectionTemplate());
+    }
+
+    protected function getConnectionTemplate()
+    {
+        if ($this->verbosity === 1) {
+            $subst = <<<'EOL'
+use OpenStack\Integration\DefaultLogger;
+use OpenStack\Integration\Utils;
+use GuzzleHttp\MessageFormatter;
+
+$options = [
+    'debugLog'         => true,
+    'logger'           => new DefaultLogger(),
+    'messageFormatter' => new MessageFormatter(),
+];
+$openstack = new OpenStack\OpenStack(Utils::getAuthOpts($options));
+EOL;
+        } elseif ($this->verbosity === 2) {
+            $subst = <<<'EOL'
+use OpenStack\Integration\DefaultLogger;
+use OpenStack\Integration\Utils;
+use GuzzleHttp\MessageFormatter;
+
+$options = [
+    'debugLog'         => true,
+    'logger'           => new DefaultLogger(),
+    'messageFormatter' => new MessageFormatter(MessageFormatter::DEBUG),
+];
+$openstack = new OpenStack\OpenStack(Utils::getAuthOpts($options));
+EOL;
+        } else {
+            $subst = <<<'EOL'
+use OpenStack\Integration\Utils;
+
+$openstack = new OpenStack\OpenStack(Utils::getAuthOpts());
+EOL;
+        }
+
+        return $subst;
+    }
+
+    public function write($path, array $replacements)
+    {
+        $replacements = array_merge($this->getGlobalReplacements(), $replacements);
+
+        $sampleFile = rtrim($this->basePath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $path;
+
+        if (!file_exists($sampleFile) || !is_readable($sampleFile)) {
+            throw new \RuntimeException(sprintf("%s either does not exist or is not readable", $sampleFile));
+        }
+
+        $content = strtr(file_get_contents($sampleFile), $replacements);
+        $content = str_replace("'vendor/'", "'" . dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . "vendor'", $content);
+
+        $subst = $this->getConnectionTemplate();
+        $content = preg_replace('/\([^)]+\)/', '', $content, 1);
+        $content = str_replace('$openstack = new OpenStack\OpenStack;', $subst, $content);
+
+        $tmp = tempnam(sys_get_temp_dir(), 'openstack');
+        file_put_contents($tmp, $content);
+
+        $this->paths[] = $tmp;
+
+        return $tmp;
+    }
+}
diff --git a/tests/integration/SampleManagerInterface.php b/tests/integration/SampleManagerInterface.php
new file mode 100644
index 00000000..108f7684
--- /dev/null
+++ b/tests/integration/SampleManagerInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace OpenStack\Integration;
+
+interface SampleManagerInterface
+{
+    public function write($path, array $replacements);
+
+    public function deletePaths();
+}
diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php
new file mode 100644
index 00000000..f382e301
--- /dev/null
+++ b/tests/integration/TestCase.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace OpenStack\Integration;
+
+use OpenStack\Common\Resource\Deletable;
+use Psr\Log\LoggerInterface;
+
+abstract class TestCase extends \PHPUnit\Framework\TestCase implements TestInterface
+{
+    protected $logger;
+    private $startPoint;
+    private $lastPoint;
+    private $sampleManager;
+    private $namePrefix = 'phptest_';
+
+    public function __construct(LoggerInterface $logger, SampleManagerInterface $sampleManager)
+    {
+        $this->logger = $logger;
+        $this->sampleManager = $sampleManager;
+    }
+
+    public function teardown()
+    {
+        $this->sampleManager->deletePaths();
+    }
+
+    public function runOneTest($name)
+    {
+        if (!method_exists($this, $name)) {
+            throw new \InvalidArgumentException(sprintf("%s method does not exist", $name));
+        }
+
+        $this->startTimer();
+        $this->$name();
+        $this->outputTimeTaken();
+    }
+
+    protected function startTimer()
+    {
+        $this->startPoint = $this->lastPoint = microtime(true);
+    }
+
+    private function wrapColor($message, $colorPrefix)
+    {
+        return sprintf("%s%s", $colorPrefix, $message) . "\033[0m\033[1;0m";
+    }
+
+    protected function logStep($message, array $context = [])
+    {
+        $duration = microtime(true) - $this->lastPoint;
+
+        $stepTimeTaken = sprintf('(%s)', $this->formatSecDifference($duration));
+
+        if ($duration >= 10) {
+            $color = "\033[0m\033[1;31m"; // red
+        } elseif ($duration >= 2) {
+            $color = "\033[0m\033[1;33m"; // yellow
+        } else {
+            $color = "\033[0m\033[1;32m"; // green
+        }
+
+        $message = '{timeTaken} ' . $message;
+        $context['{timeTaken}'] = $this->wrapColor($stepTimeTaken, $color);
+
+        $this->logger->info($message, $context);
+
+        $this->lastPoint = microtime(true);
+    }
+
+    protected function randomStr($length = 5)
+    {
+        $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $charsLen = strlen($chars);
+
+        $randomString = '';
+        for ($i = 0; $i < $length; $i++) {
+            $randomString .= $chars[rand(0, $charsLen - 1)];
+        }
+
+        return $this->namePrefix . $randomString;
+    }
+
+    private function formatMinDifference($duration)
+    {
+        $output = '';
+
+        if (($minutes = floor($duration / 60)) > 0) {
+            $output .= $minutes . 'min' . (($minutes > 1) ? 's' : '');
+        }
+
+        if (($seconds = number_format(fmod($duration, 60), 2)) > 0) {
+            if ($minutes > 0) {
+                $output .= ' ';
+            }
+            $output .= $seconds . 's';
+        }
+
+        return $output;
+    }
+
+    private function formatSecDifference($duration)
+    {
+        return number_format($duration, 2) . 's';
+    }
+
+    protected function outputTimeTaken()
+    {
+        $output = $this->formatMinDifference(microtime(true) - $this->startPoint);
+
+        $this->logger->info('Finished all tests! Time taken: {output}.', ['{output}' => $output]);
+    }
+
+    protected function sampleFile(array $replacements, $path)
+    {
+        return $this->sampleManager->write($path, $replacements);
+    }
+
+    protected function getBaseClient()
+    {
+        return eval($this->sampleManager->getConnectionStr());
+    }
+
+    protected function deleteItems(\Generator $items)
+    {
+        foreach ($items as $item) {
+            if ($item instanceof Deletable
+                && property_exists($item, 'name')
+                && strpos($item->name, $this->namePrefix) === 0
+            ) {
+                $item->delete();
+            }
+        }
+    }
+}
diff --git a/tests/integration/TestInterface.php b/tests/integration/TestInterface.php
new file mode 100644
index 00000000..abac45f9
--- /dev/null
+++ b/tests/integration/TestInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace OpenStack\Integration;
+
+use Psr\Log\LoggerInterface;
+
+interface TestInterface
+{
+    public function __construct(LoggerInterface $logger, SampleManagerInterface $sampleManager);
+
+    public function runTests();
+
+    public function runOneTest($name);
+
+    public function teardown();
+}
diff --git a/tests/integration/Utils.php b/tests/integration/Utils.php
new file mode 100644
index 00000000..7f3b8c1f
--- /dev/null
+++ b/tests/integration/Utils.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace OpenStack\Integration;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\HandlerStack;
+use OpenStack\Identity\v2\Service;
+use OpenStack\Common\Transport\Utils as TransportUtils;
+use OpenStack\OpenStack;
+
+class Utils
+{
+    public static function getOpenStack(): OpenStack
+    {
+        return new OpenStack(self::getAuthOpts());
+    }
+
+    public static function getAuthOptsV3()
+    {
+        return [
+            'authUrl' => getenv('OS_AUTH_URL'),
+            'region'  => getenv('OS_REGION_NAME'),
+            'user'    => [
+                'id'       => getenv('OS_USER_ID'),
+                'password' => getenv('OS_PASSWORD'),
+            ],
+            'scope'   => [
+                'project' => [
+                    'id' => getenv('OS_PROJECT_ID'),
+                ]
+            ]
+        ];
+    }
+
+    public static function getAuthOptsV2()
+    {
+        $httpClient = new Client([
+            'base_uri' => TransportUtils::normalizeUrl(getenv('OS_AUTH_URL')),
+            'handler'  => HandlerStack::create(),
+        ]);
+
+        return [
+            'authUrl'         => getenv('OS_AUTH_URL'),
+            'region'          => getenv('OS_REGION_NAME'),
+            'username'        => getenv('OS_USERNAME'),
+            'password'        => getenv('OS_PASSWORD'),
+            'tenantName'      => getenv('OS_TENANT_NAME'),
+            'identityService' => Service::factory($httpClient),
+        ];
+    }
+
+    public static function getAuthOpts(array $options = [])
+    {
+        $authOptions = getenv('OS_IDENTITY_API_VERSION') == '2.0'
+            ? self::getAuthOptsV2()
+            : self::getAuthOptsV3();
+
+        return array_merge($authOptions, $options);
+    }
+
+    public static function toCamelCase($word, $separator = '_')
+    {
+        return str_replace($separator, '', ucwords($word, $separator));
+    }
+}
diff --git a/tests/integration/run.php b/tests/integration/run.php
new file mode 100644
index 00000000..959cb117
--- /dev/null
+++ b/tests/integration/run.php
@@ -0,0 +1,12 @@
+<?php
+ini_set('display_errors', 1);
+error_reporting(E_ALL);
+
+$rootDir = dirname(dirname(__DIR__));
+
+require_once $rootDir . '/vendor/autoload.php';
+
+$sampleDir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'samples';
+
+$runner = new \OpenStack\Integration\Runner($sampleDir, __DIR__, 'OpenStack\\Integration');
+$runner->runServices();
diff --git a/tests/integration/script/compute_v2 b/tests/integration/script/compute_v2
new file mode 100755
index 00000000..762523eb
--- /dev/null
+++ b/tests/integration/script/compute_v2
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php tests/integration/run.php -s compute -v v2
diff --git a/tests/integration/script/identity_v3 b/tests/integration/script/identity_v3
new file mode 100755
index 00000000..233bc108
--- /dev/null
+++ b/tests/integration/script/identity_v3
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php tests/integration/run.php -s identity -v v3
diff --git a/tests/integration/script/networking_v2 b/tests/integration/script/networking_v2
new file mode 100755
index 00000000..be95d37b
--- /dev/null
+++ b/tests/integration/script/networking_v2
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php tests/integration/run.php -s networking -v v2
diff --git a/tests/integration/script/objectstore_v2 b/tests/integration/script/objectstore_v2
new file mode 100755
index 00000000..4bd97a35
--- /dev/null
+++ b/tests/integration/script/objectstore_v2
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php tests/integration/run.php -s objectstore -v v2

From 9a77217e7d2c435822a294504ccc55e94265b4d5 Mon Sep 17 00:00:00 2001
From: davemednick <93415315+davemednick@users.noreply.github.com>
Date: Thu, 24 Jul 2025 09:16:00 -0400
Subject: [PATCH 102/102] chore: add tests

---
 doc/api-docs/.gitignore                       |   2 +
 doc/api-docs/config.php                       |  23 ++
 doc/api-docs/template/class.twig              | 312 ++++++++++++++++++
 doc/api-docs/template/css/opencloud.css       |  82 +++++
 doc/api-docs/template/img/link.png            | Bin 0 -> 421 bytes
 doc/api-docs/template/layout/base.twig        |  15 +
 doc/api-docs/template/layout/layout.twig      |  78 +++++
 doc/api-docs/template/manifest.yml            |   9 +
 doc/api-docs/template/sub_param_macros.twig   | 117 +++++++
 samples/BlockStorage/v2/create.php            |  14 -
 .../BlockStorage/v3/snapshots/list_sorted.php |  18 -
 .../BlockStorage/v3/volume_types/create.php   |  18 -
 .../BlockStorage/v3/volume_types/delete.php   |  17 -
 samples/BlockStorage/v3/volume_types/list.php |  20 --
 samples/BlockStorage/v3/volume_types/read.php |  17 -
 samples/BlockStorage/v3/volumes/create.php    |  22 --
 .../v3/volumes/create_from_image.php          |  21 --
 samples/BlockStorage/v3/volumes/delete.php    |  17 -
 samples/BlockStorage/v3/volumes/list.php      |  20 --
 samples/BlockStorage/v3/volumes/read.php      |  17 -
 samples/BlockStorage/v3/volumes/update.php    |  21 --
 samples/Compute/v2/servers/read.php           |  17 -
 samples/Compute/v2/servers/resume.php         |  17 -
 samples/Compute/v2/servers/suspend.php        |  17 -
 samples/Compute/v2/servers/update.php         |  19 --
 .../Compute/v2/volume_attachments/list.php    |  19 --
 .../v3/application_credentials/create.php     |  20 --
 .../v3/application_credentials/delete.php     |  19 --
 .../v3/application_credentials/read.php       |  19 --
 ...e_token_with_application_credential_id.php |  21 --
 samples/Images/v2/create.php                  |  14 -
 samples/Images/v2/create_with_region.php      |  13 -
 samples/Images/v2/images/list.php             |  20 --
 samples/Images/v2/images/list_sorted.php      |  20 --
 samples/Images/v2/images/read.php             |  17 -
 .../Images/v2/images/upload_binary_data.php   |  22 --
 samples/Images/v2/members/create.php          |  16 -
 samples/Images/v2/members/delete.php          |  17 -
 samples/Images/v2/members/list.php            |  18 -
 samples/Images/v2/members/read.php            |  17 -
 samples/Images/v2/members/update_status.php   |  20 --
 samples/Networking/v2/floatingIPs/delete.php  |  18 -
 samples/Networking/v2/floatingIPs/get.php     |  16 -
 .../v2/lbaas/healthmonitors/read.php          |  17 -
 .../Networking/v2/networks/create_batch.php   |  22 --
 samples/Networking/v2/networks/read.php       |  17 -
 samples/Networking/v2/ports/create.php        |  20 --
 samples/Networking/v2/ports/create_batch.php  |  27 --
 samples/Networking/v2/ports/delete.php        |  17 -
 samples/Networking/v2/ports/list.php          |  18 -
 samples/Networking/v2/ports/update.php        |  18 -
 .../Networking/v2/subnets/create_batch.php    |  29 --
 .../v2/subnets/create_with_gateway_ip.php     |  22 --
 samples/Networking/v2/subnets/read.php        |  17 -
 samples/ObjectStore/v1/account/read.php       |  17 -
 samples/ObjectStore/v1/containers/delete.php  |  17 -
 samples/ObjectStore/v1/containers/read.php    |  17 -
 .../ObjectStore/v1/objects/check_exists.php   |  17 -
 samples/ObjectStore/v1/objects/copy.php       |  21 --
 samples/ObjectStore/v1/objects/create.php     |  19 --
 .../v1/objects/create_from_stream.php         |  24 --
 .../v1/objects/create_large_object.php        |  30 --
 samples/ObjectStore/v1/objects/delete.php     |  18 -
 samples/ObjectStore/v1/objects/download.php   |  18 -
 .../v1/objects/download_stream.php            |  18 -
 .../ObjectStore/v1/objects/get_metadata.php   |  18 -
 .../ObjectStore/v1/objects/merge_metadata.php |  21 --
 samples/ObjectStore/v1/objects/read.php       |  18 -
 .../ObjectStore/v1/objects/reset_metadata.php |  21 --
 samples/Setup/application_credential_id.php   |  12 -
 samples/Setup/token_id.php                    |   9 -
 samples/Setup/user_id.php                     |  12 -
 samples/Setup/username.php                    |  15 -
 .../v2}/snapshots/create.php                  |   2 +-
 .../v2}/snapshots/delete.php                  |   2 +-
 .../v3 => block_storage/v2}/snapshots/get.php |   2 +-
 .../v2}/snapshots/get_metadata.php            |   2 +-
 .../v2}/snapshots/list.php                    |   4 +-
 .../v2}/snapshots/list_detail.php             |   2 +-
 .../v2}/snapshots/merge_metadata.php          |   2 +-
 .../v2}/snapshots/reset_metadata.php          |   2 +-
 .../v2}/snapshots/update.php                  |   2 +-
 .../block_storage/v2/volume_types/create.php  |  16 +
 .../block_storage/v2/volume_types/delete.php  |  15 +
 samples/block_storage/v2/volume_types/get.php |  14 +
 .../block_storage/v2/volume_types/list.php    |  18 +
 .../v2}/volume_types/update.php               |   8 +-
 samples/block_storage/v2/volumes/create.php   |  20 ++
 .../v2/volumes/create_from_image.php}         |  10 +-
 .../v2}/volumes/create_from_snapshot.php      |   8 +-
 .../v2/volumes/create_from_source_volume.php  |  19 ++
 samples/block_storage/v2/volumes/delete.php   |  15 +
 samples/block_storage/v2/volumes/get.php      |  14 +
 samples/block_storage/v2/volumes/list.php     |  18 +
 .../v2}/volumes/list_detail.php               |   8 +-
 samples/block_storage/v2/volumes/update.php   |  19 ++
 .../v2/flavors/create_flavor.php}             |   5 +-
 .../v2/flavors/delete_flavor.php}             |   4 +-
 samples/compute/v2/flavors/get_flavor.php     |  24 ++
 .../v2/flavors/list_flavors.php}              |   6 +-
 .../v2/hypervisors/get_hypervisor.php         |   0
 .../get_hypervisors_statistics.php            |   1 +
 .../v2/hypervisors/list_hypervisors.php       |   4 +-
 .../v2/images/create_server_image.php         |   0
 .../v2/images/delete_image.php                |   2 -
 .../v2/images/delete_image_metadata_item.php  |   2 +-
 .../v2/images/get_image.php                   |   0
 .../v2/images/list_images.php                 |   1 -
 .../v2/images/reset_image_metadata.php        |   2 +-
 .../v2/images/retrieve_image_metadata.php     |   4 +-
 .../v2/keypairs/create_keypair.php            |   0
 .../v2/keypairs/delete_keypair.php            |   0
 .../v2/keypairs/get_keypair.php               |   1 +
 .../v2/keypairs/list_keypairs.php             |   4 +-
 .../v2/limits/get_limits.php                  |   1 +
 .../v2/servers/add_security_group.php         |   5 +-
 .../v2/servers/attach_volume_attachment.php}  |   6 +-
 .../v2/servers/change_server_password.php     |   4 +-
 .../v2/servers/confirm_server_resize.php      |   1 -
 .../servers/create_interface_attachment.php}  |   9 +-
 .../v2/servers/create_server.php}             |   4 +-
 .../servers/delete_interface_attachment.php   |   0
 .../v2/servers/delete_server.php}             |   3 +-
 .../servers/delete_server_metadata_item.php   |   2 +-
 .../v2/servers/detach_volume_attachment.php   |  25 ++
 .../v2/servers/get_interface_attachment.php   |   0
 samples/compute/v2/servers/get_server.php     |  24 ++
 .../v2/servers/get_server_console_output.php  |   1 +
 .../v2/servers/get_server_metadata.php        |   0
 .../v2/servers/get_server_metadata_item.php   |   0
 .../v2/servers/get_server_rdp_console.php     |   0
 .../v2/servers/get_server_serial_console.php  |   0
 .../v2/servers/get_server_spice_console.php   |   0
 .../v2/servers/get_server_vnc_console.php     |   1 +
 .../v2/servers/list_security_groups.php       |  31 ++
 .../v2/servers/list_server_addresses.php      |   0
 .../v2/servers/list_servers.php}              |   5 +-
 .../v2/servers/list_volume_attachments.php}   |   8 +-
 .../v2/servers/merge_server_metadata.php      |   2 +-
 .../v2/servers/reboot_server.php              |   6 +-
 .../v2/servers/rebuild_server.php             |   4 +-
 .../v2/servers/remove_security_group.php      |   0
 .../v2/servers/rescue_server.php              |   4 +-
 .../v2/servers/reset_server_metadata.php      |  10 +-
 .../v2/servers/reset_server_state.php         |   0
 .../v2/servers/resize_server.php              |   0
 .../v2/servers/resume_server.php              |   0
 .../v2/servers/revert_server_resize.php       |   1 -
 .../v2/servers/start_server.php               |   0
 .../v2/servers/stop_server.php                |   0
 .../v2/servers/suspend_server.php             |   0
 .../v2/servers/unrescue_server.php            |   5 +-
 .../v2/servers/update_server.php}             |   9 +-
 .../v2/authentication.php                     |   2 +
 .../v2/generate_token.php                     |   0
 .../v3/credentials/add_cred.php}              |   3 +-
 .../v3/credentials/delete_cred.php}           |   3 +-
 .../v3/credentials/get_cred.php}              |   5 +-
 .../v3/credentials/list_creds.php}            |   3 +-
 .../v3/credentials/update_cred.php}           |   9 +-
 .../v3/domains/add_domain.php}                |   7 +-
 .../v3/domains/check_group_role.php           |   7 +-
 .../v3/domains/check_user_role.php            |   7 +-
 .../v3/domains/delete_domain.php}             |   7 +-
 .../v3/domains/grant_group_role.php           |   7 +-
 .../v3/domains/grant_user_role.php            |   7 +-
 .../v3/domains/list_domains.php}              |   8 +-
 .../v3/domains/list_group_roles.php           |   8 +-
 .../v3/domains/list_user_roles.php            |   8 +-
 .../v3/domains/revoke_group_role.php          |   7 +-
 .../v3/domains/revoke_user_role.php           |   7 +-
 .../v3/domains/show_domain.php}               |   7 +-
 .../v3/domains/update_domain.php}             |   7 +-
 .../v3/endpoints/add_endpoint.php}            |   7 +-
 .../v3/endpoints/delete_endpoint.php}         |   7 +-
 .../v3/endpoints/get_endpoint.php}            |   8 +-
 .../v3/endpoints/list_endpoints.php}          |   8 +-
 .../v3/endpoints/update_endpoint.php}         |   7 +-
 .../v3/groups/add_group.php}                  |   7 +-
 .../v3/groups/add_user.php                    |   7 +-
 .../v3/groups/check_user_membership.php       |  12 +-
 .../v3/groups/delete_group.php}               |   7 +-
 .../v3/groups/get_group.php}                  |   7 +-
 .../v3/groups/list_groups.php}                |   8 +-
 .../v3/groups/list_users.php                  |   8 +-
 .../v3/groups/remove_user.php                 |   7 +-
 .../v3/groups/update_group.php}               |  11 +-
 .../v3/projects/add_project.php}              |   7 +-
 .../v3/projects/check_group_role.php          |   7 +-
 .../v3/projects/check_user_role.php           |   7 +-
 .../v3/projects/delete_project.php}           |   7 +-
 .../v3/projects/get_project.php}              |   7 +-
 .../v3/projects/grant_group_role.php          |   7 +-
 .../v3/projects/grant_user_role.php           |   7 +-
 .../v3/projects/list_group_roles.php          |   8 +-
 .../v3/projects/list_projects.php}            |   7 +-
 .../v3/projects/list_user_roles.php           |   8 +-
 .../v3/projects/revoke_group_role.php         |   7 +-
 .../v3/projects/revoke_user_role.php          |   7 +-
 .../v3/projects/update_project.php}           |   7 +-
 .../v3/roles/add_role.php}                    |   5 +
 .../v3/roles/list_assignments.php             |   6 +-
 .../v3/roles/list_roles.php}                  |   6 +-
 .../v3/services/add_service.php}              |   7 +-
 .../v3/services/delete_service.php}           |   7 +-
 .../v3/services/get_service.php}              |   8 +-
 .../v3/services/list_services.php}            |   8 +-
 .../v3/services/update_service.php}           |   7 +-
 .../v3/tokens/export_authentication_token.php |   3 +
 .../v3/tokens/generate_token_from_id.php      |   5 +
 .../generate_token_scoped_to_project_id.php   |   3 +
 .../generate_token_scoped_to_project_name.php |   7 +
 .../v3/tokens/generate_token_with_user_id.php |   3 +
 .../tokens/generate_token_with_username.php   |   7 +
 .../v3/tokens/revoke_token.php                |   5 +-
 .../use_cached_authentication_token.php       |   3 +
 .../v3/tokens/validate_token.php              |   5 +-
 .../v3/users/add_user.php}                    |   1 +
 .../v3/users/delete_user.php}                 |   5 +
 .../v3/users/get_user.php}                    |   5 +
 .../v3/users/list_groups.php                  |   6 +-
 .../v3/users/list_projects.php                |   6 +-
 .../v3/users/list_users.php}                  |   6 +-
 .../v3/users/update_user.php}                 |   5 +
 .../{Images => images}/v2/images/create.php   |  10 +-
 .../v2/images/deactivate.php                  |   6 +-
 samples/images/v2/images/delete.php           |  14 +
 .../v2/images/download_binary_data.php        |   7 +-
 .../delete.php => images/v2/images/get.php}   |   7 +-
 samples/images/v2/images/list.php             |  16 +
 .../v2/images/reactivate.php                  |   6 +-
 .../{Images => images}/v2/images/update.php   |   6 +-
 .../images/v2/images/upload_binary_data.php   |  16 +
 samples/images/v2/members/add.php             |  14 +
 samples/images/v2/members/delete.php          |  15 +
 samples/images/v2/members/get.php             |  14 +
 samples/images/v2/members/list.php            |  16 +
 samples/images/v2/members/update_status.php   |  17 +
 .../v2/floatingIPs/create.php                 |   8 +-
 samples/networking/v2/floatingIPs/delete.php  |  17 +
 samples/networking/v2/floatingIPs/get.php     |  17 +
 .../v2/floatingIPs/list.php                   |   8 +-
 .../v2/floatingIPs/update.php                 |   8 +-
 .../v2/lbaas/healthmonitors/create.php        |   0
 .../v2/lbaas/healthmonitors/delete.php        |   0
 .../v2/lbaas/healthmonitors/get.php           |  23 ++
 .../v2/lbaas/healthmonitors/list.php          |   0
 .../v2/lbaas/healthmonitors/update.php        |   0
 .../v2/lbaas/listeners/create.php             |   0
 .../v2/lbaas/listeners/delete.php             |   0
 .../v2/lbaas/listeners/get.php}               |  10 +-
 .../v2/lbaas/listeners/list.php               |   0
 .../v2/lbaas/listeners/update.php             |   0
 .../v2/lbaas/loadbalancers/add_listener.php   |   0
 .../v2/lbaas/loadbalancers/create.php         |   0
 .../v2/lbaas/loadbalancers/delete.php         |   0
 .../v2/lbaas/loadbalancers/get.php}           |   0
 .../v2/lbaas/loadbalancers/get_stats.php      |   0
 .../v2/lbaas/loadbalancers/get_statuses.php   |   3 +-
 .../v2/lbaas/loadbalancers/list.php           |   0
 .../v2/lbaas/loadbalancers/update.php         |   0
 .../v2/lbaas/pools/add-healthmonitor.php      |   0
 .../v2/lbaas/pools/add-member.php             |   0
 .../v2/lbaas/pools/create.php                 |   0
 .../v2/lbaas/pools/delete-member.php          |   0
 .../v2/lbaas/pools/delete.php                 |   0
 .../v2/lbaas/pools/get-member.php             |   0
 .../v2/lbaas/pools/get.php}                   |   9 +-
 .../v2/lbaas/pools/list.php                   |   0
 .../v2/lbaas/pools/update.php                 |   0
 .../v2/networks/create.php                    |  17 +-
 .../networking/v2/networks/create_batch.php   |  30 ++
 .../v2/networks/delete.php                    |  10 +-
 samples/networking/v2/networks/get.php        |  28 ++
 .../v2/networks/update.php                    |  10 +-
 samples/networking/v2/ports/create.php        |  18 +
 samples/networking/v2/ports/create_batch.php  |  25 ++
 .../v2/ports/create_with_fixed_ips.php        |  12 +-
 samples/networking/v2/ports/delete.php        |  15 +
 .../read.php => networking/v2/ports/get.php}  |   9 +-
 samples/networking/v2/ports/list.php          |  15 +
 samples/networking/v2/ports/update.php        |  16 +
 .../v2/securityGroupRules/create.php          |   2 +-
 .../v2/securityGroupRules/delete.php          |   2 +-
 .../v2/securityGroupRules/get.php             |   2 +-
 .../v2/securityGroupRules/list.php            |   7 +-
 .../v2/securityGroups/create.php              |   5 +-
 .../v2/securityGroups/delete.php              |   2 +-
 .../v2/securityGroups/get.php                 |   2 +-
 .../v2/securityGroups/list.php                |   2 +-
 .../v2/subnets/create.php                     |   0
 .../networking/v2/subnets/create_batch.php    |  36 ++
 .../v2/subnets/create_with_gateway_ip.php     |  30 ++
 .../v2/subnets/create_with_host_routes.php    |  16 +-
 .../v2/subnets/delete.php                     |  10 +-
 samples/networking/v2/subnets/get.php         |  28 ++
 .../v2/subnets/update.php                     |  12 +-
 .../v1/account/get.php}                       |   8 +-
 .../v1/account/get_metadata.php               |   1 +
 .../v1/account/merge_metadata.php             |   1 +
 .../v1/account/reset_metadata.php             |   2 +
 .../v1/containers/create.php                  |   5 +-
 samples/object_store/v1/containers/delete.php |  17 +
 .../v1/containers/get.php}                    |   7 +-
 .../v1/containers/get_metadata.php            |   9 +-
 .../v1/containers/list.php                    |   3 +-
 .../v1/containers/merge_metadata.php          |   1 +
 .../v1/containers/reset_metadata.php          |   2 +
 .../object_store/v1/objects/check_exists.php  |  18 +
 samples/object_store/v1/objects/copy.php      |  20 ++
 samples/object_store/v1/objects/create.php    |  23 ++
 .../v1/objects/create_from_stream.php         |  28 ++
 .../v1/objects/create_large_object.php        |  33 ++
 samples/object_store/v1/objects/delete.php    |  18 +
 samples/object_store/v1/objects/download.php  |  19 ++
 samples/object_store/v1/objects/get.php       |  18 +
 .../object_store/v1/objects/get_metadata.php  |  19 ++
 .../v1/objects/list.php                       |   7 +-
 .../v1/objects/merge_metadata.php             |  21 ++
 .../v1/objects/reset_metadata.php             |  21 ++
 320 files changed, 2215 insertions(+), 1441 deletions(-)
 create mode 100644 doc/api-docs/.gitignore
 create mode 100644 doc/api-docs/config.php
 create mode 100644 doc/api-docs/template/class.twig
 create mode 100644 doc/api-docs/template/css/opencloud.css
 create mode 100644 doc/api-docs/template/img/link.png
 create mode 100644 doc/api-docs/template/layout/base.twig
 create mode 100644 doc/api-docs/template/layout/layout.twig
 create mode 100644 doc/api-docs/template/manifest.yml
 create mode 100644 doc/api-docs/template/sub_param_macros.twig
 delete mode 100644 samples/BlockStorage/v2/create.php
 delete mode 100644 samples/BlockStorage/v3/snapshots/list_sorted.php
 delete mode 100644 samples/BlockStorage/v3/volume_types/create.php
 delete mode 100644 samples/BlockStorage/v3/volume_types/delete.php
 delete mode 100644 samples/BlockStorage/v3/volume_types/list.php
 delete mode 100644 samples/BlockStorage/v3/volume_types/read.php
 delete mode 100644 samples/BlockStorage/v3/volumes/create.php
 delete mode 100644 samples/BlockStorage/v3/volumes/create_from_image.php
 delete mode 100644 samples/BlockStorage/v3/volumes/delete.php
 delete mode 100644 samples/BlockStorage/v3/volumes/list.php
 delete mode 100644 samples/BlockStorage/v3/volumes/read.php
 delete mode 100644 samples/BlockStorage/v3/volumes/update.php
 delete mode 100644 samples/Compute/v2/servers/read.php
 delete mode 100644 samples/Compute/v2/servers/resume.php
 delete mode 100644 samples/Compute/v2/servers/suspend.php
 delete mode 100644 samples/Compute/v2/servers/update.php
 delete mode 100644 samples/Compute/v2/volume_attachments/list.php
 delete mode 100644 samples/Identity/v3/application_credentials/create.php
 delete mode 100644 samples/Identity/v3/application_credentials/delete.php
 delete mode 100644 samples/Identity/v3/application_credentials/read.php
 delete mode 100644 samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
 delete mode 100644 samples/Images/v2/create.php
 delete mode 100644 samples/Images/v2/create_with_region.php
 delete mode 100644 samples/Images/v2/images/list.php
 delete mode 100644 samples/Images/v2/images/list_sorted.php
 delete mode 100644 samples/Images/v2/images/read.php
 delete mode 100644 samples/Images/v2/images/upload_binary_data.php
 delete mode 100644 samples/Images/v2/members/create.php
 delete mode 100644 samples/Images/v2/members/delete.php
 delete mode 100644 samples/Images/v2/members/list.php
 delete mode 100644 samples/Images/v2/members/read.php
 delete mode 100644 samples/Images/v2/members/update_status.php
 delete mode 100644 samples/Networking/v2/floatingIPs/delete.php
 delete mode 100644 samples/Networking/v2/floatingIPs/get.php
 delete mode 100644 samples/Networking/v2/lbaas/healthmonitors/read.php
 delete mode 100644 samples/Networking/v2/networks/create_batch.php
 delete mode 100644 samples/Networking/v2/networks/read.php
 delete mode 100644 samples/Networking/v2/ports/create.php
 delete mode 100644 samples/Networking/v2/ports/create_batch.php
 delete mode 100644 samples/Networking/v2/ports/delete.php
 delete mode 100644 samples/Networking/v2/ports/list.php
 delete mode 100644 samples/Networking/v2/ports/update.php
 delete mode 100644 samples/Networking/v2/subnets/create_batch.php
 delete mode 100644 samples/Networking/v2/subnets/create_with_gateway_ip.php
 delete mode 100644 samples/Networking/v2/subnets/read.php
 delete mode 100644 samples/ObjectStore/v1/account/read.php
 delete mode 100644 samples/ObjectStore/v1/containers/delete.php
 delete mode 100644 samples/ObjectStore/v1/containers/read.php
 delete mode 100644 samples/ObjectStore/v1/objects/check_exists.php
 delete mode 100644 samples/ObjectStore/v1/objects/copy.php
 delete mode 100644 samples/ObjectStore/v1/objects/create.php
 delete mode 100644 samples/ObjectStore/v1/objects/create_from_stream.php
 delete mode 100644 samples/ObjectStore/v1/objects/create_large_object.php
 delete mode 100644 samples/ObjectStore/v1/objects/delete.php
 delete mode 100644 samples/ObjectStore/v1/objects/download.php
 delete mode 100644 samples/ObjectStore/v1/objects/download_stream.php
 delete mode 100644 samples/ObjectStore/v1/objects/get_metadata.php
 delete mode 100644 samples/ObjectStore/v1/objects/merge_metadata.php
 delete mode 100644 samples/ObjectStore/v1/objects/read.php
 delete mode 100644 samples/ObjectStore/v1/objects/reset_metadata.php
 delete mode 100644 samples/Setup/application_credential_id.php
 delete mode 100644 samples/Setup/token_id.php
 delete mode 100644 samples/Setup/user_id.php
 delete mode 100644 samples/Setup/username.php
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/create.php (80%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/delete.php (76%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/get.php (75%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/get_metadata.php (77%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/list.php (67%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/list_detail.php (80%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/merge_metadata.php (78%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/reset_metadata.php (78%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/snapshots/update.php (80%)
 create mode 100644 samples/block_storage/v2/volume_types/create.php
 create mode 100644 samples/block_storage/v2/volume_types/delete.php
 create mode 100644 samples/block_storage/v2/volume_types/get.php
 create mode 100644 samples/block_storage/v2/volume_types/list.php
 rename samples/{BlockStorage/v3 => block_storage/v2}/volume_types/update.php (56%)
 create mode 100644 samples/block_storage/v2/volumes/create.php
 rename samples/{BlockStorage/v3/volumes/create_from_volume.php => block_storage/v2/volumes/create_from_image.php} (55%)
 rename samples/{BlockStorage/v3 => block_storage/v2}/volumes/create_from_snapshot.php (61%)
 create mode 100644 samples/block_storage/v2/volumes/create_from_source_volume.php
 create mode 100644 samples/block_storage/v2/volumes/delete.php
 create mode 100644 samples/block_storage/v2/volumes/get.php
 create mode 100644 samples/block_storage/v2/volumes/list.php
 rename samples/{BlockStorage/v3 => block_storage/v2}/volumes/list_detail.php (56%)
 create mode 100644 samples/block_storage/v2/volumes/update.php
 rename samples/{Compute/v2/flavors/create.php => compute/v2/flavors/create_flavor.php} (69%)
 rename samples/{Compute/v2/flavors/delete.php => compute/v2/flavors/delete_flavor.php} (78%)
 create mode 100644 samples/compute/v2/flavors/get_flavor.php
 rename samples/{Compute/v2/flavors/list.php => compute/v2/flavors/list_flavors.php} (64%)
 rename samples/{Compute => compute}/v2/hypervisors/get_hypervisor.php (100%)
 rename samples/{Compute => compute}/v2/hypervisors/get_hypervisors_statistics.php (89%)
 rename samples/{Compute => compute}/v2/hypervisors/list_hypervisors.php (84%)
 rename samples/{Compute => compute}/v2/images/create_server_image.php (100%)
 rename samples/{Compute => compute}/v2/images/delete_image.php (95%)
 rename samples/{Compute => compute}/v2/images/delete_image_metadata_item.php (91%)
 rename samples/{Compute => compute}/v2/images/get_image.php (100%)
 rename samples/{Compute => compute}/v2/images/list_images.php (88%)
 rename samples/{Compute => compute}/v2/images/reset_image_metadata.php (94%)
 rename samples/{Compute => compute}/v2/images/retrieve_image_metadata.php (87%)
 rename samples/{Compute => compute}/v2/keypairs/create_keypair.php (100%)
 rename samples/{Compute => compute}/v2/keypairs/delete_keypair.php (100%)
 rename samples/{Compute => compute}/v2/keypairs/get_keypair.php (88%)
 rename samples/{Compute => compute}/v2/keypairs/list_keypairs.php (85%)
 rename samples/{Compute => compute}/v2/limits/get_limits.php (87%)
 rename samples/{Compute => compute}/v2/servers/add_security_group.php (78%)
 rename samples/{Compute/v2/volume_attachments/create.php => compute/v2/servers/attach_volume_attachment.php} (72%)
 rename samples/{Compute => compute}/v2/servers/change_server_password.php (86%)
 rename samples/{Compute => compute}/v2/servers/confirm_server_resize.php (92%)
 rename samples/{Compute/v2/servers/list_security_groups.php => compute/v2/servers/create_interface_attachment.php} (67%)
 rename samples/{Compute/v2/servers/create.php => compute/v2/servers/create_server.php} (80%)
 rename samples/{Compute => compute}/v2/servers/delete_interface_attachment.php (100%)
 rename samples/{Compute/v2/servers/create_interface_attachment.php => compute/v2/servers/delete_server.php} (81%)
 rename samples/{Compute => compute}/v2/servers/delete_server_metadata_item.php (91%)
 create mode 100644 samples/compute/v2/servers/detach_volume_attachment.php
 rename samples/{Compute => compute}/v2/servers/get_interface_attachment.php (100%)
 create mode 100644 samples/compute/v2/servers/get_server.php
 rename samples/{Compute => compute}/v2/servers/get_server_console_output.php (93%)
 rename samples/{Compute => compute}/v2/servers/get_server_metadata.php (100%)
 rename samples/{Compute => compute}/v2/servers/get_server_metadata_item.php (100%)
 rename samples/{Compute => compute}/v2/servers/get_server_rdp_console.php (100%)
 rename samples/{Compute => compute}/v2/servers/get_server_serial_console.php (100%)
 rename samples/{Compute => compute}/v2/servers/get_server_spice_console.php (100%)
 rename samples/{Compute => compute}/v2/servers/get_server_vnc_console.php (94%)
 create mode 100644 samples/compute/v2/servers/list_security_groups.php
 rename samples/{Compute => compute}/v2/servers/list_server_addresses.php (100%)
 rename samples/{Compute/v2/servers/list.php => compute/v2/servers/list_servers.php} (60%)
 rename samples/{Compute/v2/volume_attachments/delete.php => compute/v2/servers/list_volume_attachments.php} (68%)
 rename samples/{Compute => compute}/v2/servers/merge_server_metadata.php (94%)
 rename samples/{Compute => compute}/v2/servers/reboot_server.php (75%)
 rename samples/{Compute => compute}/v2/servers/rebuild_server.php (88%)
 rename samples/{Compute => compute}/v2/servers/remove_security_group.php (100%)
 rename samples/{Compute => compute}/v2/servers/rescue_server.php (87%)
 rename samples/{Compute => compute}/v2/servers/reset_server_metadata.php (62%)
 rename samples/{Compute => compute}/v2/servers/reset_server_state.php (100%)
 rename samples/{Compute => compute}/v2/servers/resize_server.php (100%)
 rename samples/{Compute => compute}/v2/servers/resume_server.php (100%)
 rename samples/{Compute => compute}/v2/servers/revert_server_resize.php (92%)
 rename samples/{Compute => compute}/v2/servers/start_server.php (100%)
 rename samples/{Compute => compute}/v2/servers/stop_server.php (100%)
 rename samples/{Compute => compute}/v2/servers/suspend_server.php (100%)
 rename samples/{Compute => compute}/v2/servers/unrescue_server.php (81%)
 rename samples/{Compute/v2/images/merge_image_metadata.php => compute/v2/servers/update_server.php} (77%)
 rename samples/{Identity => identity}/v2/authentication.php (88%)
 rename samples/{Identity => identity}/v2/generate_token.php (100%)
 rename samples/{Identity/v3/credentials/create.php => identity/v3/credentials/add_cred.php} (77%)
 rename samples/{Identity/v3/credentials/delete.php => identity/v3/credentials/delete_cred.php} (72%)
 rename samples/{Identity/v3/credentials/read.php => identity/v3/credentials/get_cred.php} (60%)
 rename samples/{Identity/v3/credentials/list.php => identity/v3/credentials/list_creds.php} (75%)
 rename samples/{Identity/v3/credentials/update.php => identity/v3/credentials/update_cred.php} (53%)
 rename samples/{Identity/v3/domains/create.php => identity/v3/domains/add_domain.php} (71%)
 rename samples/{Identity => identity}/v3/domains/check_group_role.php (73%)
 rename samples/{Identity => identity}/v3/domains/check_user_role.php (73%)
 rename samples/{Identity/v3/domains/delete.php => identity/v3/domains/delete_domain.php} (66%)
 rename samples/{Identity => identity}/v3/domains/grant_group_role.php (71%)
 rename samples/{Identity => identity}/v3/domains/grant_user_role.php (71%)
 rename samples/{Identity/v3/domains/list.php => identity/v3/domains/list_domains.php} (65%)
 rename samples/{Identity => identity}/v3/domains/list_group_roles.php (70%)
 rename samples/{Identity => identity}/v3/domains/list_user_roles.php (70%)
 rename samples/{Identity => identity}/v3/domains/revoke_group_role.php (71%)
 rename samples/{Identity => identity}/v3/domains/revoke_user_role.php (71%)
 rename samples/{Identity/v3/domains/read.php => identity/v3/domains/show_domain.php} (66%)
 rename samples/{Identity/v3/domains/update.php => identity/v3/domains/update_domain.php} (68%)
 rename samples/{Identity/v3/endpoints/create.php => identity/v3/endpoints/add_endpoint.php} (76%)
 rename samples/{Identity/v3/endpoints/delete.php => identity/v3/endpoints/delete_endpoint.php} (67%)
 rename samples/{Identity/v3/endpoints/read.php => identity/v3/endpoints/get_endpoint.php} (65%)
 rename samples/{Identity/v3/endpoints/list.php => identity/v3/endpoints/list_endpoints.php} (65%)
 rename samples/{Identity/v3/endpoints/update.php => identity/v3/endpoints/update_endpoint.php} (71%)
 rename samples/{Identity/v3/groups/create.php => identity/v3/groups/add_group.php} (69%)
 rename samples/{Identity => identity}/v3/groups/add_user.php (68%)
 rename samples/{Identity => identity}/v3/groups/check_user_membership.php (53%)
 rename samples/{Identity/v3/groups/delete.php => identity/v3/groups/delete_group.php} (66%)
 rename samples/{Identity/v3/groups/read.php => identity/v3/groups/get_group.php} (66%)
 rename samples/{Identity/v3/groups/list.php => identity/v3/groups/list_groups.php} (65%)
 rename samples/{Identity => identity}/v3/groups/list_users.php (68%)
 rename samples/{Identity => identity}/v3/groups/remove_user.php (68%)
 rename samples/{Identity/v3/groups/update.php => identity/v3/groups/update_group.php} (59%)
 rename samples/{Identity/v3/projects/create.php => identity/v3/projects/add_project.php} (71%)
 rename samples/{Identity => identity}/v3/projects/check_group_role.php (72%)
 rename samples/{Identity => identity}/v3/projects/check_user_role.php (73%)
 rename samples/{Identity/v3/projects/delete.php => identity/v3/projects/delete_project.php} (66%)
 rename samples/{Identity/v3/projects/read.php => identity/v3/projects/get_project.php} (66%)
 rename samples/{Identity => identity}/v3/projects/grant_group_role.php (70%)
 rename samples/{Identity => identity}/v3/projects/grant_user_role.php (71%)
 rename samples/{Identity => identity}/v3/projects/list_group_roles.php (70%)
 rename samples/{Identity/v3/projects/list.php => identity/v3/projects/list_projects.php} (65%)
 rename samples/{Identity => identity}/v3/projects/list_user_roles.php (70%)
 rename samples/{Identity => identity}/v3/projects/revoke_group_role.php (70%)
 rename samples/{Identity => identity}/v3/projects/revoke_user_role.php (71%)
 rename samples/{Identity/v3/projects/update.php => identity/v3/projects/update_project.php} (68%)
 rename samples/{Identity/v3/roles/create.php => identity/v3/roles/add_role.php} (78%)
 rename samples/{Identity => identity}/v3/roles/list_assignments.php (78%)
 rename samples/{Identity/v3/roles/list.php => identity/v3/roles/list_roles.php} (78%)
 rename samples/{Identity/v3/services/create.php => identity/v3/services/add_service.php} (69%)
 rename samples/{Identity/v3/services/delete.php => identity/v3/services/delete_service.php} (66%)
 rename samples/{Identity/v3/services/read.php => identity/v3/services/get_service.php} (65%)
 rename samples/{Identity/v3/services/list.php => identity/v3/services/list_services.php} (65%)
 rename samples/{Identity/v3/services/update.php => identity/v3/services/update_service.php} (69%)
 rename samples/{Identity => identity}/v3/tokens/export_authentication_token.php (92%)
 rename samples/{Identity => identity}/v3/tokens/generate_token_from_id.php (81%)
 rename samples/{Identity => identity}/v3/tokens/generate_token_scoped_to_project_id.php (87%)
 rename samples/{Identity => identity}/v3/tokens/generate_token_scoped_to_project_name.php (66%)
 rename samples/{Identity => identity}/v3/tokens/generate_token_with_user_id.php (85%)
 rename samples/{Identity => identity}/v3/tokens/generate_token_with_username.php (64%)
 rename samples/{Identity => identity}/v3/tokens/revoke_token.php (71%)
 rename samples/{Identity => identity}/v3/tokens/use_cached_authentication_token.php (89%)
 rename samples/{Identity => identity}/v3/tokens/validate_token.php (74%)
 rename samples/{Identity/v3/users/create.php => identity/v3/users/add_user.php} (91%)
 rename samples/{Identity/v3/users/delete.php => identity/v3/users/delete_user.php} (78%)
 rename samples/{Identity/v3/users/read.php => identity/v3/users/get_user.php} (78%)
 rename samples/{Identity => identity}/v3/users/list_groups.php (79%)
 rename samples/{Identity => identity}/v3/users/list_projects.php (80%)
 rename samples/{Identity/v3/users/list.php => identity/v3/users/list_users.php} (78%)
 rename samples/{Identity/v3/users/update.php => identity/v3/users/update_user.php} (81%)
 rename samples/{Images => images}/v2/images/create.php (70%)
 rename samples/{Images => images}/v2/images/deactivate.php (66%)
 create mode 100644 samples/images/v2/images/delete.php
 rename samples/{Images => images}/v2/images/download_binary_data.php (60%)
 rename samples/{Images/v2/images/delete.php => images/v2/images/get.php} (64%)
 create mode 100644 samples/images/v2/images/list.php
 rename samples/{Images => images}/v2/images/reactivate.php (66%)
 rename samples/{Images => images}/v2/images/update.php (75%)
 create mode 100644 samples/images/v2/images/upload_binary_data.php
 create mode 100644 samples/images/v2/members/add.php
 create mode 100644 samples/images/v2/members/delete.php
 create mode 100644 samples/images/v2/members/get.php
 create mode 100644 samples/images/v2/members/list.php
 create mode 100644 samples/images/v2/members/update_status.php
 rename samples/{Networking => networking}/v2/floatingIPs/create.php (64%)
 create mode 100644 samples/networking/v2/floatingIPs/delete.php
 create mode 100644 samples/networking/v2/floatingIPs/get.php
 rename samples/{Networking => networking}/v2/floatingIPs/list.php (64%)
 rename samples/{Networking => networking}/v2/floatingIPs/update.php (58%)
 rename samples/{Networking => networking}/v2/lbaas/healthmonitors/create.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/healthmonitors/delete.php (100%)
 create mode 100644 samples/networking/v2/lbaas/healthmonitors/get.php
 rename samples/{Networking => networking}/v2/lbaas/healthmonitors/list.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/healthmonitors/update.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/listeners/create.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/listeners/delete.php (100%)
 rename samples/{Networking/v2/lbaas/listeners/read.php => networking/v2/lbaas/listeners/get.php} (54%)
 rename samples/{Networking => networking}/v2/lbaas/listeners/list.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/listeners/update.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/loadbalancers/add_listener.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/loadbalancers/create.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/loadbalancers/delete.php (100%)
 rename samples/{Networking/v2/lbaas/loadbalancers/read.php => networking/v2/lbaas/loadbalancers/get.php} (100%)
 rename samples/{Networking => networking}/v2/lbaas/loadbalancers/get_stats.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/loadbalancers/get_statuses.php (89%)
 rename samples/{Networking => networking}/v2/lbaas/loadbalancers/list.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/loadbalancers/update.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/pools/add-healthmonitor.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/pools/add-member.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/pools/create.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/pools/delete-member.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/pools/delete.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/pools/get-member.php (100%)
 rename samples/{Networking/v2/lbaas/pools/read.php => networking/v2/lbaas/pools/get.php} (59%)
 rename samples/{Networking => networking}/v2/lbaas/pools/list.php (100%)
 rename samples/{Networking => networking}/v2/lbaas/pools/update.php (100%)
 rename samples/{Networking => networking}/v2/networks/create.php (51%)
 create mode 100644 samples/networking/v2/networks/create_batch.php
 rename samples/{Networking => networking}/v2/networks/delete.php (58%)
 create mode 100644 samples/networking/v2/networks/get.php
 rename samples/{Networking => networking}/v2/networks/update.php (61%)
 create mode 100644 samples/networking/v2/ports/create.php
 create mode 100644 samples/networking/v2/ports/create_batch.php
 rename samples/{Networking => networking}/v2/ports/create_with_fixed_ips.php (61%)
 create mode 100644 samples/networking/v2/ports/delete.php
 rename samples/{Networking/v2/ports/read.php => networking/v2/ports/get.php} (64%)
 create mode 100644 samples/networking/v2/ports/list.php
 create mode 100644 samples/networking/v2/ports/update.php
 rename samples/{Networking => networking}/v2/securityGroupRules/create.php (92%)
 rename samples/{Networking => networking}/v2/securityGroupRules/delete.php (90%)
 rename samples/{Networking => networking}/v2/securityGroupRules/get.php (89%)
 rename samples/{Networking => networking}/v2/securityGroupRules/list.php (74%)
 rename samples/{Networking => networking}/v2/securityGroups/create.php (75%)
 rename samples/{Networking => networking}/v2/securityGroups/delete.php (89%)
 rename samples/{Networking => networking}/v2/securityGroups/get.php (89%)
 rename samples/{Networking => networking}/v2/securityGroups/list.php (89%)
 rename samples/{Networking => networking}/v2/subnets/create.php (100%)
 create mode 100644 samples/networking/v2/subnets/create_batch.php
 create mode 100644 samples/networking/v2/subnets/create_with_gateway_ip.php
 rename samples/{Networking => networking}/v2/subnets/create_with_host_routes.php (64%)
 rename samples/{Networking => networking}/v2/subnets/delete.php (58%)
 create mode 100644 samples/networking/v2/subnets/get.php
 rename samples/{Networking => networking}/v2/subnets/update.php (53%)
 rename samples/{Compute/v2/servers/delete.php => object_store/v1/account/get.php} (64%)
 rename samples/{ObjectStore => object_store}/v1/account/get_metadata.php (86%)
 rename samples/{ObjectStore => object_store}/v1/account/merge_metadata.php (87%)
 rename samples/{ObjectStore => object_store}/v1/account/reset_metadata.php (87%)
 rename samples/{ObjectStore => object_store}/v1/containers/create.php (70%)
 create mode 100644 samples/object_store/v1/containers/delete.php
 rename samples/{Compute/v2/flavors/read.php => object_store/v1/containers/get.php} (60%)
 rename samples/{ObjectStore => object_store}/v1/containers/get_metadata.php (51%)
 rename samples/{ObjectStore => object_store}/v1/containers/list.php (73%)
 rename samples/{ObjectStore => object_store}/v1/containers/merge_metadata.php (88%)
 rename samples/{ObjectStore => object_store}/v1/containers/reset_metadata.php (88%)
 create mode 100644 samples/object_store/v1/objects/check_exists.php
 create mode 100644 samples/object_store/v1/objects/copy.php
 create mode 100644 samples/object_store/v1/objects/create.php
 create mode 100644 samples/object_store/v1/objects/create_from_stream.php
 create mode 100644 samples/object_store/v1/objects/create_large_object.php
 create mode 100644 samples/object_store/v1/objects/delete.php
 create mode 100644 samples/object_store/v1/objects/download.php
 create mode 100644 samples/object_store/v1/objects/get.php
 create mode 100644 samples/object_store/v1/objects/get_metadata.php
 rename samples/{ObjectStore => object_store}/v1/objects/list.php (63%)
 create mode 100644 samples/object_store/v1/objects/merge_metadata.php
 create mode 100644 samples/object_store/v1/objects/reset_metadata.php

diff --git a/doc/api-docs/.gitignore b/doc/api-docs/.gitignore
new file mode 100644
index 00000000..e64e6172
--- /dev/null
+++ b/doc/api-docs/.gitignore
@@ -0,0 +1,2 @@
+build/
+cache/
diff --git a/doc/api-docs/config.php b/doc/api-docs/config.php
new file mode 100644
index 00000000..cb1a379c
--- /dev/null
+++ b/doc/api-docs/config.php
@@ -0,0 +1,23 @@
+<?php
+
+use Sami\Sami;
+use Symfony\Component\Finder\Finder;
+
+$iterator = Finder::create()
+    ->files()
+    ->name('*.php')
+    ->notName('Api.php')
+    ->notName('Params.php')
+    ->in($dir = dirname(dirname(__DIR__)) . '/src')
+;
+
+return new Sami($iterator, [
+    'title'         => 'Test',
+    'theme'         => 'new_theme',
+    'build_dir'     => __DIR__ . '/build',
+    'cache_dir'     => __DIR__ . '/cache',
+    'template_dirs' => [
+        __DIR__ . '/template'
+    ],
+    'default_opened_level' => 1,
+]);
diff --git a/doc/api-docs/template/class.twig b/doc/api-docs/template/class.twig
new file mode 100644
index 00000000..1a70e1c8
--- /dev/null
+++ b/doc/api-docs/template/class.twig
@@ -0,0 +1,312 @@
+{% extends "layout/layout.twig" %}
+
+{% import _self as selfClass %}
+{% from "macros.twig" import render_classes, breadcrumbs, namespace_link, class_link, property_link, method_link, hint_link %}
+{% from "sub_param_macros.twig" import output_sub_param, iterate_sub_params, fill, sub_param_example %}
+{% block title %}{{ class.name }} | {{ parent() }}{% endblock %}
+{% block body_class 'class' %}
+    {% block page_id 'class:' ~ (class.name|replace({'\\': '_'})) %}
+
+        {% block below_menu %}
+            {% if class.namespace %}
+                <div class="namespace-breadcrumbs">
+                    <ol class="breadcrumb">
+                        <li><span class="label label-default">{{ class.categoryName }}</span></li>
+                        {{ breadcrumbs(class.namespace) }}
+                        <li>{{ class.shortname }}</li>
+                    </ol>
+                </div>
+            {% endif %}
+        {% endblock %}
+
+        {% block page_content %}
+            <div class="page-header">
+                <h1>{{ class.name|split('\\')|last }}</h1>
+            </div>
+
+            <p>{{ block('class_signature') }}</p>
+
+            {% if class.shortdesc or class.longdesc %}
+                <div class="description">
+                    {% if class.shortdesc -%}
+                        <p>{{ class.shortdesc|desc(class) }}</p>
+                    {%- endif %}
+                    {% if class.longdesc -%}
+                        <p>{{ class.longdesc|desc(class) }}</p>
+                    {%- endif %}
+                </div>
+            {% endif %}
+
+            {% if traits %}
+                <h2>Traits</h2>
+
+                {{ render_classes(traits) }}
+            {% endif %}
+
+            {% set has_constants = false %}
+            {% for constant in constants if constant.class is sameas(class) %}
+                {% set has_constants = true %}
+            {% endfor %}
+
+            {% if has_constants == true %}
+                <h2>Constants</h2>
+
+                {{ block('constants') }}
+            {% endif %}
+
+            {% set has_properties = false %}
+            {% for property in properties if property.class is sameas(class) %}
+                {%- for hint in property.hint %}
+                    {%- if hint.class %}
+                        {% if hint.name.projectclass or hint.name.phpclass %}
+                            {% set has_properties = true %}
+                        {% endif %}
+                    {% else %}
+                        {% set has_properties = true %}
+                    {%- endif %}
+                {%- endfor %}
+            {% endfor %}
+
+            {% if has_properties == true %}
+                <h2>Properties</h2>
+
+                {{ block('properties') }}
+            {% endif %}
+
+            {% set has_methods = false %}
+            {% for method in methods if method.class is sameas(class) %}
+                {% set has_methods = true %}
+            {% endfor %}
+
+            {% if has_methods == true %}
+                <h2>Methods</h2>
+
+                {{ block('methods') }}
+
+                <h2>Details</h2>
+
+                {{ block('methods_details') }}
+            {% endif %}
+
+        {% endblock %}
+
+        {% block class_signature -%}
+            {% if not class.interface and class.abstract %}abstract {% endif %}
+            {{ class.categoryName }}
+            <strong>{{ class.shortname }}</strong>
+            {%- if class.parent %}
+                extends {{ class_link(class.parent) }}
+            {%- endif %}
+            {%- if class.interfaces|length > 0 %}
+                implements
+                {% for interface in class.interfaces %}
+                    {{- class_link(interface) }}
+                    {%- if not loop.last %}, {% endif %}
+                {%- endfor %}
+            {%- endif %}
+        {% endblock %}
+
+        {% block method_signature -%}
+            {% if method.final %}final{% endif %}
+            {% if method.abstract %}abstract{% endif %}
+            {% if method.static %}static{% endif %}
+            {% if method.protected %}protected{% endif %}
+            {% if method.private %}private{% endif %}
+            <strong>{{ method.name }}</strong>{{ block('method_parameters_signature') }}
+        {%- endblock %}
+
+        {% block method_parameters_signature -%}
+            {%- from "macros.twig" import method_parameters_signature -%}
+            {{ method_parameters_signature(method) }}
+        {%- endblock %}
+
+        {% block parameters %}
+            {% set subParams = [] %}
+
+            <table class="table table-condensed params-table">
+                {% for parameter in method.parameters %}
+                    <tr>
+                        <td class="param-name" width="15%"><span class="name">${{ parameter.name }}</span></td>
+                        <td width="10%">{% if parameter.hint %}{{ hint_link(parameter.hint) }}{% endif %}</td>
+                        <td>
+                            {% if parameter.subParams|length > 0 %}
+                                {% set subParams = parameter.subParams %}
+                                Configuration options. See table below.
+                            {% else %}
+                                {{ parameter.shortdesc|desc(class) }}
+                            {% endif %}
+                        </td>
+                    </tr>
+
+                {% endfor %}
+            </table>
+
+            {% if subParams is not empty %}
+                <h4>Configuration Options</h4>
+                <div class="params">
+                    {{ iterate_sub_params(subParams) }}
+                </div>
+            {% endif %}
+
+        {% endblock %}
+
+        {% block return %}
+            <table class="table table-condensed">
+                <tr>
+                    <td>
+                        {{ hint_link(method.hint) }}
+                    </td>
+                    <td>{{ method.hintDesc|desc(class) }}</td>
+                </tr>
+            </table>
+        {% endblock %}
+
+        {% block exceptions %}
+            <table class="table table-condensed">
+                {% for exception in method.exceptions %}
+                    <tr>
+                        <td>{{ class_link(exception[0]) }}</td>
+                        <td>{{ exception[1]|desc(class) }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endblock %}
+
+        {% block see %}
+            <table class="table table-condensed">
+                {% for tag in method.tags('see') %}
+                    <tr>
+                        <td>{{ tag[0] }}</td>
+                        <td>{{ tag[1:]|join(' ') }}</td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endblock %}
+
+        {% block constants %}
+            <table class="table table-condensed">
+                {% for constant in constants if constant.class is sameas(class) %}
+                    <tr>
+                        <td>{{ constant.name }}</td>
+                        <td class="last">
+                            <p><em>{{ constant.shortdesc|desc(class) }}</em></p>
+
+                            <p>{{ constant.longdesc|desc(class) }}</p>
+                        </td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endblock %}
+
+        {% block properties %}
+            <table class="table table-condensed">
+                {% for property in properties if property.class is sameas(class) %}
+                    {% set display = false %}
+                    {%- for hint in property.hint %}
+                        {%- if hint.class %}
+                            {% if hint.name.projectclass or hint.name.phpclass %}
+                                {% set display = true %}
+                            {% endif %}
+                        {% else %}
+                            {% set display = true %}
+                        {%- endif %}
+                    {%- endfor %}
+                    {% if display %}
+                    <tr>
+                        <td class="param-name" width="10%"><span>${{ property.name }}</span></td>
+                        <td class="type" id="property_{{ property.name }}" width="10%">
+                            {{ hint_link(property.hint) }}
+                        </td>
+                        <td class="last">{{ property.shortdesc }}</td>
+                    </tr>
+                    {% endif %}
+                {% endfor %}
+            </table>
+        {% endblock %}
+
+        {% block methods %}
+            <div class="container-fluid underlined">
+                {% for method in methods if method.class is sameas(class) %}
+                    <div class="row">
+                        <div class="col-md-12 type">
+                            <div class="method-header">
+                                <a href="#method_{{ method.name }}">{{ method.name }}</a>
+                                {{ block('method_parameters_signature') }}
+                                {% if method.hint %} : {% endif %}
+                                {% if method.static %}static&nbsp;{% endif %}{{ hint_link(method.hint) }}
+                            </div>
+                            {% if not method.shortdesc %}
+                                <p class="no-description">No description</p>
+                            {% else %}
+                                <p>{{ method.shortdesc|desc(class) }}</p>
+                            {%- endif %}
+                        </div>
+                    </div>
+                {% endfor %}
+            </div>
+        {% endblock %}
+
+        {% block methods_details %}
+            <div id="method-details">
+                {% for method in methods if method.class is sameas(class) %}
+                    <div class="method-item">
+                        {{ block('method') }}
+                    </div>
+                {% endfor %}
+            </div>
+        {% endblock %}
+
+        {% block method %}
+            <h3 id="method_{{ method.name }}">
+                <div class="location">
+                    <a href="https://github.com/php-opencloud/openstack/blob/master/{{ method.file }}#L{{ method.line }}"
+                       target="_blank">View source</a>
+                </div>
+                <a href="#method_{{ method.name }}"><img src="{{ path('img/link.png') }}"/></a>
+                <code>{{ block('method_signature') }}</code>
+            </h3>
+            <div class="details">
+                {% if method.shortdesc or method.longdesc %}
+                    <div class="method-description">
+                        {% if not method.shortdesc and not method.longdesc %}
+                            <p class="no-description">No description</p>
+                        {% else %}
+                            {% if method.shortdesc -%}
+                                <p>{{ method.shortdesc|desc(class) }}</p>
+                            {%- endif %}
+                            {% if method.longdesc -%}
+                                <p>{{ method.longdesc|desc(class) }}</p>
+                            {%- endif %}
+                        {%- endif %}
+                    </div>
+                {% endif %}
+                <div class="tags">
+                    {% if method.parameters %}
+                        <h4>Parameters</h4>
+
+                        {{ block('parameters') }}
+                    {% endif %}
+
+                    {% if method.hintDesc or method.hint %}
+                        <h4>Return value</h4>
+
+                        {{ block('return') }}
+                    {% endif %}
+
+                    {% if method.exceptions %}
+                        <h4>Exceptions</h4>
+
+                        {{ block('exceptions') }}
+                    {% endif %}
+
+                    {% if method.tags('see') %}
+                        <h4>See also</h4>
+
+                        {{ block('see') }}
+                    {% endif %}
+
+                    <h4>Example code</h4>
+                    <pre class="php"><code class="php">{{ code_sample(class, method)|trim|raw }}</code></pre>
+                </div>
+            </div>
+        {% endblock %}
diff --git a/doc/api-docs/template/css/opencloud.css b/doc/api-docs/template/css/opencloud.css
new file mode 100644
index 00000000..a5cf3990
--- /dev/null
+++ b/doc/api-docs/template/css/opencloud.css
@@ -0,0 +1,82 @@
+div.params div.row {
+    display: block;
+    clear: both;
+    width: 100%;
+    border-top: 1px solid #ddd;
+    padding: 10px 0;
+    margin: 0;
+}
+div.params div.row:last-child {
+    border-bottom: 1px solid #ddd;
+}
+div.params div.row:last-of-type {
+    border-bottom: 1px solid #ddd;
+    margin-bottom: 20px;
+}
+div.params div.row > div.col-md-2, div.params div.row > div.col-md-8 {
+    padding-left: 0;
+}
+div.params div.row div.row {
+    border: 0;
+    margin: 10px 0;
+    /*padding-left: 10px;*/
+}
+div.params div.row div.row:last-child {
+    margin-bottom: 0;
+}
+div.params .cleafix:after {
+    content:"";
+    display:table;
+    clear:both;
+}
+div.params .param-name {
+    width: 20%;
+    float:left;
+    padding-right: 10px;
+    word-wrap: break-word;
+}
+div.params .param-type {
+    width: 8%;
+    float:left;
+}
+div.params .param-req {
+  float:left;
+  width:8%;
+}
+div.params .param-desc {
+    width: 64%;
+    float:left;
+}
+.param-name span.name {
+    color:green;
+}
+.param-name span.parent {
+    color: grey;
+}
+.param-name span, .method-header {
+  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+div.details {
+  padding-left: 10px !important;
+}
+table.params-table td {
+  padding: 10px 5px !important;
+}
+.method-header {
+  margin-bottom: 5px;
+}
+.method-item {
+    border-top: 3px solid #bbb;
+}
+.method-item h3 {
+    padding:10px !important;
+    margin-top:0 !important;
+}
+pre.php {
+    padding: 15px;
+    font-size: 14px;
+    border: none;
+}
+code.pre {
+    padding: 0;
+}
\ No newline at end of file
diff --git a/doc/api-docs/template/img/link.png b/doc/api-docs/template/img/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..b55e498ce764cea31649a217569e8479bcac13e8
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004ONkl<ZI8U9D
z%~irs5QV=9Zv0u$fpj1i0K}yy3m+Ar6@V2OD^Mzs4hZLv<B~uFVg+Ia!ouv#cwRy{
z{2f5wcIJL_=gt!jd{q<r0u9h2NF+G-QE)wxL-bYC?}$iarB`(-6fXAyDyH9ZM4o_|
zC@!2#626};P@%UM;F_?U2)?8EQQ(cO3)c*aD)ASoi+?=Vyp~jw58!hvpkl&X2b!Rz
z<-iuxi3bQ}RoW|n)Ee;%f>}0ZcO7*-Gq0y&(09>OcL7)}GW*fQ9C0>Ih+B$`3miu}
zpPY-M;3~^tU7V#23Dib`*S0|_SZ9mLR&0AxK&{>%gIwgNvT0ZAVI)wqNh4CsR?2MW
z;uMhnFyUdnm`)Y#<X}}gqrhveA5CiYZ~~l*a+%-xFPF6dwSr;STM0BFZaUE02bF3)
z3<PdaI>W%bTMkT>$5G(<yBtZjD{q@kn}KZu&Ci(qcOgCBbRO8w$vNy7zh%YsEwSPZ
P00000NkvXXu0mjfm-Mu6

literal 0
HcmV?d00001

diff --git a/doc/api-docs/template/layout/base.twig b/doc/api-docs/template/layout/base.twig
new file mode 100644
index 00000000..e3818fa2
--- /dev/null
+++ b/doc/api-docs/template/layout/base.twig
@@ -0,0 +1,15 @@
+{% extends "default/layout/base.twig" %}
+
+{% block head %}
+    <link rel="stylesheet" type="text/css" href="{{ path('css/bootstrap.min.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ path('css/bootstrap-theme.min.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ path('css/sami.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ path('css/opencloud.css') }}">
+    <script src="{{ path('js/jquery-1.11.1.min.js') }}"></script>
+    <script src="{{ path('js/bootstrap.min.js') }}"></script>
+    <script src="{{ path('js/typeahead.min.js') }}"></script>
+    <script src="{{ path('sami.js') }}"></script>
+
+    <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/highlight.min.js"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/doc/api-docs/template/layout/layout.twig b/doc/api-docs/template/layout/layout.twig
new file mode 100644
index 00000000..794cce1d
--- /dev/null
+++ b/doc/api-docs/template/layout/layout.twig
@@ -0,0 +1,78 @@
+{% extends 'layout/base.twig' %}
+
+{% block content %}
+<div id="content">
+    <div id="left-column">
+        {{ block('control_panel') }}
+        {{ block('leftnav') }}
+    </div>
+    <div id="right-column">
+    {{ block('menu') }}
+    {% block below_menu '' %}
+        <div id="page-content">
+        {% block page_content '' %}
+            </div>
+            {{ block('footer') }}
+            </div>
+            </div>
+        {% endblock %}
+
+        {% block menu %}
+            <nav id="site-nav" class="navbar navbar-default" role="navigation">
+                <div class="container-fluid">
+                    <div class="navbar-header">
+                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-elements">
+                            <span class="sr-only">Toggle navigation</span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                        </button>
+                        <a class="navbar-brand" href="{{ path('index.html') }}">{{ project.config('title') }}</a>
+                    </div>
+                    <div class="collapse navbar-collapse" id="navbar-elements">
+                        <ul class="nav navbar-nav">
+                            <li><a href="{{ path('classes.html') }}">Classes</a></li>
+                            {% if has_namespaces %}
+                                <li><a href="{{ path('namespaces.html') }}">Namespaces</a></li>
+                            {% endif %}
+                            <li><a href="{{ path('interfaces.html') }}">Interfaces</a></li>
+                            <li><a href="{{ path('traits.html') }}">Traits</a></li>
+                            <li><a href="{{ path('doc-index.html') }}">Index</a></li>
+                            <li><a href="{{ path('search.html') }}">Search</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </nav>
+        {% endblock %}
+
+        {% block leftnav %}
+            <div id="api-tree"></div>
+        {% endblock %}
+
+        {% block control_panel %}
+            <div id="control-panel">
+                {% if project.versions|length > 1 %}
+                    <form action="#" method="GET">
+                        <select id="version-switcher" name="version">
+                            {% for version in project.versions %}
+                                <option value="{{ path('../' ~ version ~ '/index.html') }}"{{ version == project.version ? ' selected' : '' }}>{{ version.longname }}</option>
+                            {% endfor %}
+                        </select>
+                    </form>
+                {% endif %}
+                <form id="search-form" action="{{ path('search.html') }}" method="GET">
+                    <span class="glyphicon glyphicon-search"></span>
+                    <input name="search"
+                           class="typeahead form-control"
+                           type="search"
+                           placeholder="Search">
+                </form>
+            </div>
+        {% endblock %}
+
+        {% block footer %}
+            <div id="footer">
+                Generated by <a href="http://sami.sensiolabs.org/">Sami, the API Documentation Generator</a>.
+            </div>
+            <script>hljs.initHighlightingOnLoad();</script>
+        {% endblock %}
\ No newline at end of file
diff --git a/doc/api-docs/template/manifest.yml b/doc/api-docs/template/manifest.yml
new file mode 100644
index 00000000..166d6a7f
--- /dev/null
+++ b/doc/api-docs/template/manifest.yml
@@ -0,0 +1,9 @@
+name: new_theme
+parent: default
+
+static:
+    'css/opencloud.css': "css/opencloud.css"
+    'img/link.png': "img/link.png"
+
+class:
+    'class.twig': '%s.html'
\ No newline at end of file
diff --git a/doc/api-docs/template/sub_param_macros.twig b/doc/api-docs/template/sub_param_macros.twig
new file mode 100644
index 00000000..bd706f59
--- /dev/null
+++ b/doc/api-docs/template/sub_param_macros.twig
@@ -0,0 +1,117 @@
+{% macro output_sub_param(name, sub_param, parent_is_array, parent_name) -%}
+
+    {% set render = 'true' %}
+
+    {% set type = sub_param.type %}
+
+    {% set full_name = name %}
+    {% if parent_name %}
+        {% if not name %}
+            {% if parent_is_array == 'true' %}
+                {% set full_name = parent_name ~ '[]' %}
+            {% else %}
+                {% set full_name = parent_name %}
+            {% endif %}
+        {% elseif parent_is_array == 'true' %}
+            {% set full_name = parent_name ~ '[].' ~ name %}
+        {% else %}
+            {% set full_name = parent_name ~ '.' ~ name %}
+        {% endif %}
+    {% endif %}
+
+    {% if sub_param.type == 'object' %}
+        {% if parent_is_array == 'true' %}
+            {% set render = 'false' %}
+            <div class="clearfix"></div>
+            {{ _self.iterate_sub_params(sub_param.properties, 'false', full_name) }}
+        {% endif %}
+    {% elseif sub_param.type == 'array' %}
+        {% set subType = sub_param.itemSchema.type %}
+        {% set type = 'array of ' ~ subType ~ 's' %}
+    {% elseif parent_is_array == 'true' %}
+        {% set render = 'false' %}
+    {% endif %}
+
+    {% if render == 'true' %}
+        <div class="row">
+
+            <div class="col param-name">
+                {% if parent_name %}
+                    {% if parent_name == 'metadata' %}
+                        <span class="parent">metadata.</span><span class="name">key</span>
+                    {% else %}
+                        <span class="parent">{{ parent_name }}.</span><span class="name">{{ name }}</span>
+                    {% endif %}
+                {% else %}
+                    <span class="name">{{ name }}</span>
+                {% endif %}
+            </div>
+            <div class="col param-type">
+                {% if type is empty %}
+                    {% set type = "string" %}
+                {% endif %}
+                {{ _self.fill(type) }}
+            </div>
+            <div class="col param-req">
+                {% if sub_param.required == 'true' %}
+                    Required
+                {% else %}
+                    Optional
+                {% endif %}
+            </div>
+            <div class="col param-desc">
+                {{ _self.fill(sub_param.description) }}
+            </div>
+
+            {% if sub_param.itemSchema|length > 0 %}
+                <div class="clearfix"></div>
+                {{ _self.output_sub_param('', sub_param.itemSchema, 'true', full_name) }}
+            {% elseif sub_param.properties|length > 0 %}
+                <div class="clearfix"></div>
+                {{ _self.iterate_sub_params(sub_param.properties, 'false', full_name) }}
+            {% endif %}
+
+        </div>
+    {% endif %}
+
+{%- endmacro %}
+
+{% macro iterate_sub_params(sub_params, parent_is_array, parent_name) -%}
+
+    {% for name, sub_param in sub_params if sub_params|length > 0 %}
+        {{ _self.output_sub_param(name, sub_param, parent_is_array, parent_name) }}
+    {% endfor %}
+
+{%- endmacro %}
+
+{% macro fill(val) -%}
+    {% if val is iterable %}
+        {% for subval in val %}
+            {{ _self.fill(subval) }}
+        {% endfor %}
+    {% elseif val is not empty %}
+        {{ val }}
+    {% else %}
+        &nbsp;
+    {% endif %}
+{%- endmacro %}
+
+{% macro sub_param_example(sub_param, name) %}
+    {%- if sub_param.type == 'string' -%}
+        {%- verbatim -%}'{{%- endverbatim -%}{{- name -}}{%- verbatim -%}}'{%- endverbatim -%}
+    {%- elseif sub_param.type == 'bool' or sub_param.type == 'boolean' -%}
+        {{- 'true' -}}
+    {%- elseif sub_param.type == 'array' -%}
+        {% verbatim %}[{% endverbatim %}
+        {% for i in 1..2 %}
+            {{ _self.sub_param_example(sub_param.itemSchema, 'val' ~ i)|trim|raw }}{% verbatim %},{% endverbatim %}
+        {% endfor %}
+        {% verbatim %}]{% endverbatim %}
+    {%- elseif sub_param.type == 'object' -%}
+        {% verbatim %}[{% endverbatim %}
+        {% for propName, prop in sub_param.properties %}
+            {% verbatim %}'{% endverbatim %}{{- propName|trim -}}{%- verbatim -%}' => {%- endverbatim -%}{{- _self.sub_param_example(prop, propName)|trim|raw -}}{% verbatim %},{% endverbatim %}
+        {% endfor %}
+        {% verbatim %}]{% endverbatim %}
+    {%- endif -%}
+{% endmacro %}
\ No newline at end of file
diff --git a/samples/BlockStorage/v2/create.php b/samples/BlockStorage/v2/create.php
deleted file mode 100644
index eab4bfb9..00000000
--- a/samples/BlockStorage/v2/create.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->blockStorageV2();
diff --git a/samples/BlockStorage/v3/snapshots/list_sorted.php b/samples/BlockStorage/v3/snapshots/list_sorted.php
deleted file mode 100644
index d722825e..00000000
--- a/samples/BlockStorage/v3/snapshots/list_sorted.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => ['id' => '{userId}', 'password' => '{password}'],
-    'scope'   => ['project' => ['id' => '{projectId}']]
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$snapshots = $service->listSnapshots(false, ['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
-
-foreach ($snapshots as $snapshot) {
-    /** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */
-}
diff --git a/samples/BlockStorage/v3/volume_types/create.php b/samples/BlockStorage/v3/volume_types/create.php
deleted file mode 100644
index c3ceb209..00000000
--- a/samples/BlockStorage/v3/volume_types/create.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}']
-    ,
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volumeType = $service->createVolumeType([
-    'name' => '{name}',
-]);
diff --git a/samples/BlockStorage/v3/volume_types/delete.php b/samples/BlockStorage/v3/volume_types/delete.php
deleted file mode 100644
index 2d118583..00000000
--- a/samples/BlockStorage/v3/volume_types/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}']
-    ,
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volumeType = $service->getVolumeType('{volumeTypeId}');
-$volumeType->delete();
diff --git a/samples/BlockStorage/v3/volume_types/list.php b/samples/BlockStorage/v3/volume_types/list.php
deleted file mode 100644
index d9974d73..00000000
--- a/samples/BlockStorage/v3/volume_types/list.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}']
-    ,
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volumeTypes = $service->listVolumeTypes();
-
-foreach ($volumeTypes as $volumeType) {
-    /** @var \OpenStack\BlockStorage\v2\Models\VolumeType $volumeType */
-}
diff --git a/samples/BlockStorage/v3/volume_types/read.php b/samples/BlockStorage/v3/volume_types/read.php
deleted file mode 100644
index 217a97f3..00000000
--- a/samples/BlockStorage/v3/volume_types/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}']
-    ,
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volumeType = $service->getVolumeType('{volumeTypeId}');
-$volumeType->retrieve();
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/volumes/create.php b/samples/BlockStorage/v3/volumes/create.php
deleted file mode 100644
index 6de12095..00000000
--- a/samples/BlockStorage/v3/volumes/create.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volume = $service->createVolume([
-    'description' => '{description}',
-    'size'        => '{size}',
-    'name'        => '{name}',
-    'volumeType'  => '{volumeType}',
-    'metadata'    => ['{key1}' => '{val1}'],
-]);
diff --git a/samples/BlockStorage/v3/volumes/create_from_image.php b/samples/BlockStorage/v3/volumes/create_from_image.php
deleted file mode 100644
index 316b9a82..00000000
--- a/samples/BlockStorage/v3/volumes/create_from_image.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volume = $service->createVolume([
-    'description' => '{description}',
-    'size'        => '{size}',
-    'name'        => '{name}',
-    'imageId'     => '{imageId}',
-]);
diff --git a/samples/BlockStorage/v3/volumes/delete.php b/samples/BlockStorage/v3/volumes/delete.php
deleted file mode 100644
index 4f70cd95..00000000
--- a/samples/BlockStorage/v3/volumes/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volume = $service->getVolume('{volumeId}');
-$volume->delete();
diff --git a/samples/BlockStorage/v3/volumes/list.php b/samples/BlockStorage/v3/volumes/list.php
deleted file mode 100644
index 473b6f0b..00000000
--- a/samples/BlockStorage/v3/volumes/list.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volumes = $service->listVolumes();
-
-foreach ($volumes as $volume) {
-    /** @var \OpenStack\BlockStorage\v2\Models\Volume $volume */
-}
diff --git a/samples/BlockStorage/v3/volumes/read.php b/samples/BlockStorage/v3/volumes/read.php
deleted file mode 100644
index 1a3ef135..00000000
--- a/samples/BlockStorage/v3/volumes/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volume = $service->getVolume('{volumeId}');
-$volume->retrieve();
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/volumes/update.php b/samples/BlockStorage/v3/volumes/update.php
deleted file mode 100644
index 9aaea22e..00000000
--- a/samples/BlockStorage/v3/volumes/update.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
-
-$volume = $service->getVolume('{volumeId}');
-
-$volume->name = '{newName}';
-$volume->description = '{newDescription}';
-
-$volume->update();
diff --git a/samples/Compute/v2/servers/read.php b/samples/Compute/v2/servers/read.php
deleted file mode 100644
index 442086c6..00000000
--- a/samples/Compute/v2/servers/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$compute = $openstack->computeV2();
-
-$server = $compute->getServer(['id' => '{serverId}']);
-$server->retrieve();
diff --git a/samples/Compute/v2/servers/resume.php b/samples/Compute/v2/servers/resume.php
deleted file mode 100644
index e3347623..00000000
--- a/samples/Compute/v2/servers/resume.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->computeV2();
-$server = $service->getServer(['id' => '{serverId}']);
-
-$server->resume();
diff --git a/samples/Compute/v2/servers/suspend.php b/samples/Compute/v2/servers/suspend.php
deleted file mode 100644
index d53e1f1c..00000000
--- a/samples/Compute/v2/servers/suspend.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->computeV2();
-$server = $service->getServer(['id' => '{serverId}']);
-
-$server->suspend();
diff --git a/samples/Compute/v2/servers/update.php b/samples/Compute/v2/servers/update.php
deleted file mode 100644
index 1ee83ed7..00000000
--- a/samples/Compute/v2/servers/update.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$compute = $openstack->computeV2();
-
-$server = $compute->getServer(['id' => '{serverId}']);
-
-$server->name = '{newName}';
-$server->update();
diff --git a/samples/Compute/v2/volume_attachments/list.php b/samples/Compute/v2/volume_attachments/list.php
deleted file mode 100644
index 58cc6639..00000000
--- a/samples/Compute/v2/volume_attachments/list.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$compute = $openstack->computeV2();
-$server = $compute->getServer(['id' => '{serverId}']);
-
-foreach ($server->listVolumeAttachments() as $volumeAttachment) {
-    /** @var \OpenStack\BlockStorage\v2\Models\VolumeAttachment $volumeAttachment */
-}
diff --git a/samples/Identity/v3/application_credentials/create.php b/samples/Identity/v3/application_credentials/create.php
deleted file mode 100644
index be71f042..00000000
--- a/samples/Identity/v3/application_credentials/create.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$identity = $openstack->identityV3();
-
-$user = $identity->getUser('{userId}');
-$applicationCredential = $user->createApplicationCredential([
-    'name'        => '{name}',
-    'description' => '{description}',
-]);
diff --git a/samples/Identity/v3/application_credentials/delete.php b/samples/Identity/v3/application_credentials/delete.php
deleted file mode 100644
index 5ce70855..00000000
--- a/samples/Identity/v3/application_credentials/delete.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$identity = $openstack->identityV3();
-
-$user = $identity->getUser('{userId}');
-$applicationCredential = $user->getApplicationCredential('{applicationCredentialId}');
-$applicationCredential->delete();
-
diff --git a/samples/Identity/v3/application_credentials/read.php b/samples/Identity/v3/application_credentials/read.php
deleted file mode 100644
index a7db5f80..00000000
--- a/samples/Identity/v3/application_credentials/read.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$identity = $openstack->identityV3();
-
-$user = $identity->getUser('{userId}');
-$applicationCredential = $user->getApplicationCredential('{applicationCredentialId}');
-$applicationCredential->retrieve();
-
diff --git a/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php b/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
deleted file mode 100644
index 408dba47..00000000
--- a/samples/Identity/v3/tokens/generate_token_with_application_credential_id.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$identity = $openstack->identityV3();
-
-$token = $identity->generateToken([
-    'application_credential' => [
-        'id'     => '{applicationCredentialId}',
-        'secret' => '{secret}'
-    ]
-]);
diff --git a/samples/Images/v2/create.php b/samples/Images/v2/create.php
deleted file mode 100644
index b0a98a8c..00000000
--- a/samples/Images/v2/create.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
diff --git a/samples/Images/v2/create_with_region.php b/samples/Images/v2/create_with_region.php
deleted file mode 100644
index 91c5e21b..00000000
--- a/samples/Images/v2/create_with_region.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$service = $openstack->imagesV2(['region' => '{region}']);
\ No newline at end of file
diff --git a/samples/Images/v2/images/list.php b/samples/Images/v2/images/list.php
deleted file mode 100644
index 8574678b..00000000
--- a/samples/Images/v2/images/list.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-
-$images = $service->listImages();
-
-foreach ($images as $image) {
-    /** @var \OpenStack\Images\v2\Models\Image $image */
-}
diff --git a/samples/Images/v2/images/list_sorted.php b/samples/Images/v2/images/list_sorted.php
deleted file mode 100644
index 2b0f8044..00000000
--- a/samples/Images/v2/images/list_sorted.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-
-$images = $service->listImages(['sortKey' => '{sortKey}', 'sortDir' => '{sortDir}']);
-
-foreach ($images as $image) {
-    /** @var \OpenStack\Images\v2\Models\Image $image */
-}
diff --git a/samples/Images/v2/images/read.php b/samples/Images/v2/images/read.php
deleted file mode 100644
index 83c7240a..00000000
--- a/samples/Images/v2/images/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-
-$image = $service->getImage('{imageId}');
-$image->retrieve();
diff --git a/samples/Images/v2/images/upload_binary_data.php b/samples/Images/v2/images/upload_binary_data.php
deleted file mode 100644
index ef5018a1..00000000
--- a/samples/Images/v2/images/upload_binary_data.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-
-$image  = $service->getImage('{imageId}');
-
-$stream = function_exists('\GuzzleHttp\Psr7\stream_for')
-    ? \GuzzleHttp\Psr7\stream_for(fopen('{fileName}', 'r'))
-    : \GuzzleHttp\Psr7\Utils::streamFor(fopen('{fileName}', 'r'));
-
-$image->uploadData($stream);
diff --git a/samples/Images/v2/members/create.php b/samples/Images/v2/members/create.php
deleted file mode 100644
index dc387eeb..00000000
--- a/samples/Images/v2/members/create.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-$image = $service->getImage('{imageId}');
-$member = $image->addMember('{projectId}');
diff --git a/samples/Images/v2/members/delete.php b/samples/Images/v2/members/delete.php
deleted file mode 100644
index 4f3fcfa7..00000000
--- a/samples/Images/v2/members/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-$image = $service->getImage('{imageId}');
-$member = $image->getMember('{projectId}');
-$member->delete();
diff --git a/samples/Images/v2/members/list.php b/samples/Images/v2/members/list.php
deleted file mode 100644
index 4e19cef1..00000000
--- a/samples/Images/v2/members/list.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-$image = $service->getImage('{imageId}');
-
-foreach ($image->listMembers() as $member) {
-}
diff --git a/samples/Images/v2/members/read.php b/samples/Images/v2/members/read.php
deleted file mode 100644
index 33456add..00000000
--- a/samples/Images/v2/members/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-$image = $service->getImage('{imageId}');
-$member = $image->getMember('{projectId}');
-$member->retrieve();
diff --git a/samples/Images/v2/members/update_status.php b/samples/Images/v2/members/update_status.php
deleted file mode 100644
index cb830df8..00000000
--- a/samples/Images/v2/members/update_status.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-use OpenStack\Images\v2\Models\Member;
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->imagesV2();
-
-$image = $service->getImage('{imageId}');
-$member = $image->getMember('{projectId}');
-$member->updateStatus(Member::STATUS_ACCEPTED);
diff --git a/samples/Networking/v2/floatingIPs/delete.php b/samples/Networking/v2/floatingIPs/delete.php
deleted file mode 100644
index b3fe53b8..00000000
--- a/samples/Networking/v2/floatingIPs/delete.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
-]);
-
-$networking = $openstack->networkingV2();
-$floatIp = $networking->getFloatingIp('{id}');
-
-$floatIp->delete();
diff --git a/samples/Networking/v2/floatingIPs/get.php b/samples/Networking/v2/floatingIPs/get.php
deleted file mode 100644
index d9c52ed2..00000000
--- a/samples/Networking/v2/floatingIPs/get.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
-]);
-
-$floatingIp = $openstack->networkingV2()
-    ->getFloatingIp('{id}');
diff --git a/samples/Networking/v2/lbaas/healthmonitors/read.php b/samples/Networking/v2/lbaas/healthmonitors/read.php
deleted file mode 100644
index 58ce8108..00000000
--- a/samples/Networking/v2/lbaas/healthmonitors/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$service = $openstack->networkingV2();
-$healthMonitor = $service->getLoadBalancerHealthMonitor('{healthMonitorId}');
-
-$healthMonitor->retrieve();
diff --git a/samples/Networking/v2/networks/create_batch.php b/samples/Networking/v2/networks/create_batch.php
deleted file mode 100644
index 07395cdd..00000000
--- a/samples/Networking/v2/networks/create_batch.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-$networks = $service->createNetworks([
-    [
-        'name' => '{networkName1}',
-    ],
-    [
-        'name' => '{networkName2}',
-    ],
-]);
diff --git a/samples/Networking/v2/networks/read.php b/samples/Networking/v2/networks/read.php
deleted file mode 100644
index 4b9dcee5..00000000
--- a/samples/Networking/v2/networks/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$service = $openstack->networkingV2();
-$network = $service->getNetwork('{networkId}');
-
-$network->retrieve();
diff --git a/samples/Networking/v2/ports/create.php b/samples/Networking/v2/ports/create.php
deleted file mode 100644
index 9312d3f2..00000000
--- a/samples/Networking/v2/ports/create.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-
-$port = $service->createPort([
-    'name'         => '{portName}',
-    'networkId'    => '{networkId}',
-    'adminStateUp' => true,
-]);
diff --git a/samples/Networking/v2/ports/create_batch.php b/samples/Networking/v2/ports/create_batch.php
deleted file mode 100644
index 7c32b811..00000000
--- a/samples/Networking/v2/ports/create_batch.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-
-$ports = $service->createPorts([
-    [
-        'name'         => '{name1}',
-        'networkId'    => '{networkId1}',
-        'adminStateUp' => true,
-    ],
-    [
-        'name'         => '{name2}',
-        'networkId'    => '{networkId2}',
-        'adminStateUp' => true,
-    ],
-]);
diff --git a/samples/Networking/v2/ports/delete.php b/samples/Networking/v2/ports/delete.php
deleted file mode 100644
index 2c6a8884..00000000
--- a/samples/Networking/v2/ports/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-$port = $service->getPort('{portId}');
-
-$port->delete();
diff --git a/samples/Networking/v2/ports/list.php b/samples/Networking/v2/ports/list.php
deleted file mode 100644
index 19b8039c..00000000
--- a/samples/Networking/v2/ports/list.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-
-foreach ($service->listPorts() as $port) {
-    /** @var \OpenStack\Networking\v2\Models\Port $port */
-}
diff --git a/samples/Networking/v2/ports/update.php b/samples/Networking/v2/ports/update.php
deleted file mode 100644
index 4d2682e3..00000000
--- a/samples/Networking/v2/ports/update.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-$port = $service->getPort('{portId}');
-
-$port->name = '{newName}';
-$port->update();
diff --git a/samples/Networking/v2/subnets/create_batch.php b/samples/Networking/v2/subnets/create_batch.php
deleted file mode 100644
index 5d4599c4..00000000
--- a/samples/Networking/v2/subnets/create_batch.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-
-$subnets = $service->createSubnets([
-    [
-        'name'      => '{subnetName1}',
-        'networkId' => '{networkId1}',
-        'ipVersion' => 4,
-        'cidr'      => '192.168.199.0/24',
-    ],
-    [
-        'name'      => '{subnetName2}',
-        'networkId' => '{networkId2}',
-        'ipVersion' => 4,
-        'cidr'      => '10.56.4.0/22',
-    ],
-]);
diff --git a/samples/Networking/v2/subnets/create_with_gateway_ip.php b/samples/Networking/v2/subnets/create_with_gateway_ip.php
deleted file mode 100644
index 8c07deeb..00000000
--- a/samples/Networking/v2/subnets/create_with_gateway_ip.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-
-$subnet = $service->createSubnet([
-    'name'      => '{subnetName}',
-    'networkId' => '{networkId}',
-    'ipVersion' => 4,
-    'cidr'      => '192.168.199.0/25',
-    'gatewayIp' => '192.168.199.128',
-]);
diff --git a/samples/Networking/v2/subnets/read.php b/samples/Networking/v2/subnets/read.php
deleted file mode 100644
index 4cc15fc9..00000000
--- a/samples/Networking/v2/subnets/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->networkingV2();
-$subnet = $service->getSubnet('{subnetId}');
-
-$subnet->retrieve();
diff --git a/samples/ObjectStore/v1/account/read.php b/samples/ObjectStore/v1/account/read.php
deleted file mode 100644
index 82490797..00000000
--- a/samples/ObjectStore/v1/account/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$account = $service->getAccount();
-
-$account->retrieve();
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/containers/delete.php b/samples/ObjectStore/v1/containers/delete.php
deleted file mode 100644
index da5c06ed..00000000
--- a/samples/ObjectStore/v1/containers/delete.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-
-$container->delete();
diff --git a/samples/ObjectStore/v1/containers/read.php b/samples/ObjectStore/v1/containers/read.php
deleted file mode 100644
index 4f7b4206..00000000
--- a/samples/ObjectStore/v1/containers/read.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-
-$container->retrieve();
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/objects/check_exists.php b/samples/ObjectStore/v1/objects/check_exists.php
deleted file mode 100644
index 0d6e72de..00000000
--- a/samples/ObjectStore/v1/objects/check_exists.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-
-$exists = $container->objectExists('{objectName}');
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/objects/copy.php b/samples/ObjectStore/v1/objects/copy.php
deleted file mode 100644
index 80bd233a..00000000
--- a/samples/ObjectStore/v1/objects/copy.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$object->copy([
-    'destination' => '{newContainerName}/{newObjectName}',
-]);
-
diff --git a/samples/ObjectStore/v1/objects/create.php b/samples/ObjectStore/v1/objects/create.php
deleted file mode 100644
index 12d955ab..00000000
--- a/samples/ObjectStore/v1/objects/create.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->createObject([
-    'name'    => '{objectName}',
-    'content' => '{objectContent}',
-]);
diff --git a/samples/ObjectStore/v1/objects/create_from_stream.php b/samples/ObjectStore/v1/objects/create_from_stream.php
deleted file mode 100644
index 461d4b20..00000000
--- a/samples/ObjectStore/v1/objects/create_from_stream.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-// You can use any instance of \Psr\Http\Message\StreamInterface
-$stream = new \GuzzleHttp\Psr7\Stream(fopen('/path/to/object.txt', 'r'));
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-
-$object = $container->createObject([
-    'name'   => '{objectName}',
-    'stream' => $stream,
-]);
-
diff --git a/samples/ObjectStore/v1/objects/create_large_object.php b/samples/ObjectStore/v1/objects/create_large_object.php
deleted file mode 100644
index 8b99ca3b..00000000
--- a/samples/ObjectStore/v1/objects/create_large_object.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$options = [
-];
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-
-$object = $container->createObject([
-    'name'             => '{objectName}',
-    'stream'           => new \GuzzleHttp\Psr7\Stream(fopen('/path/to/large_object.mov', 'r')),
-
-    // optional: specify the size of each segment in bytes
-    'segmentSize'      => 1073741824,
-
-    // optional: specify the container where the segments live. This does not necessarily have to be the
-    // same as the container which holds the manifest file
-    'segmentContainer' => 'test_segments',
-]);
diff --git a/samples/ObjectStore/v1/objects/delete.php b/samples/ObjectStore/v1/objects/delete.php
deleted file mode 100644
index 6392b4aa..00000000
--- a/samples/ObjectStore/v1/objects/delete.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$object->delete();
diff --git a/samples/ObjectStore/v1/objects/download.php b/samples/ObjectStore/v1/objects/download.php
deleted file mode 100644
index 97d033f9..00000000
--- a/samples/ObjectStore/v1/objects/download.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$stream = $object->download();
diff --git a/samples/ObjectStore/v1/objects/download_stream.php b/samples/ObjectStore/v1/objects/download_stream.php
deleted file mode 100644
index 9d63366d..00000000
--- a/samples/ObjectStore/v1/objects/download_stream.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$stream = $object->download(['requestOptions' => ['stream' => true]]);
diff --git a/samples/ObjectStore/v1/objects/get_metadata.php b/samples/ObjectStore/v1/objects/get_metadata.php
deleted file mode 100644
index 51d49c87..00000000
--- a/samples/ObjectStore/v1/objects/get_metadata.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$metadata = $object->getMetadata();
diff --git a/samples/ObjectStore/v1/objects/merge_metadata.php b/samples/ObjectStore/v1/objects/merge_metadata.php
deleted file mode 100644
index f6c3b500..00000000
--- a/samples/ObjectStore/v1/objects/merge_metadata.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$object->mergeMetadata([
-    '{key_1}' => '{val_1}',
-    '{key_2}' => '{val_2}',
-]);
diff --git a/samples/ObjectStore/v1/objects/read.php b/samples/ObjectStore/v1/objects/read.php
deleted file mode 100644
index 21c11a5a..00000000
--- a/samples/ObjectStore/v1/objects/read.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$object->retrieve();
\ No newline at end of file
diff --git a/samples/ObjectStore/v1/objects/reset_metadata.php b/samples/ObjectStore/v1/objects/reset_metadata.php
deleted file mode 100644
index 407298eb..00000000
--- a/samples/ObjectStore/v1/objects/reset_metadata.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
-]);
-
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-$object = $container->getObject('{objectName}');
-
-$object->resetMetadata([
-    '{key_1}' => '{val_1}',
-    '{key_2}' => '{val_2}',
-]);
diff --git a/samples/Setup/application_credential_id.php b/samples/Setup/application_credential_id.php
deleted file mode 100644
index 64a6cd84..00000000
--- a/samples/Setup/application_credential_id.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl'                => '{authUrl}',
-    'region'                 => '{region}',
-    'application_credential' => [
-        'id'     => '{applicationCredentialId}',
-        'secret' => '{secret}',
-    ],
-]);
\ No newline at end of file
diff --git a/samples/Setup/token_id.php b/samples/Setup/token_id.php
deleted file mode 100644
index 8727447f..00000000
--- a/samples/Setup/token_id.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'tokenId' => '{tokenId}',
-]);
diff --git a/samples/Setup/user_id.php b/samples/Setup/user_id.php
deleted file mode 100644
index 53948b51..00000000
--- a/samples/Setup/user_id.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user' => [
-        'id'       => '{userId}',
-        'password' => '{password}'
-    ]
-]);
\ No newline at end of file
diff --git a/samples/Setup/username.php b/samples/Setup/username.php
deleted file mode 100644
index 83458a00..00000000
--- a/samples/Setup/username.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-require 'vendor/autoload.php';
-
-$openstack = new OpenStack\OpenStack([
-    'authUrl' => '{authUrl}',
-    'region'  => '{region}',
-    'user' => [
-        'name'     => '{username}',
-        'password' => '{password}',
-        'domain'   => [
-            'id' => '{domainId}'
-        ]
-    ]
-]);
\ No newline at end of file
diff --git a/samples/BlockStorage/v3/snapshots/create.php b/samples/block_storage/v2/snapshots/create.php
similarity index 80%
rename from samples/BlockStorage/v3/snapshots/create.php
rename to samples/block_storage/v2/snapshots/create.php
index c764801e..fdab656a 100644
--- a/samples/BlockStorage/v3/snapshots/create.php
+++ b/samples/block_storage/v2/snapshots/create.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshot = $service->createSnapshot([
     'volumeId'    => '{volumeId}',
diff --git a/samples/BlockStorage/v3/snapshots/delete.php b/samples/block_storage/v2/snapshots/delete.php
similarity index 76%
rename from samples/BlockStorage/v3/snapshots/delete.php
rename to samples/block_storage/v2/snapshots/delete.php
index b17a185b..a7bc30db 100644
--- a/samples/BlockStorage/v3/snapshots/delete.php
+++ b/samples/block_storage/v2/snapshots/delete.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 $snapshot->delete();
diff --git a/samples/BlockStorage/v3/snapshots/get.php b/samples/block_storage/v2/snapshots/get.php
similarity index 75%
rename from samples/BlockStorage/v3/snapshots/get.php
rename to samples/block_storage/v2/snapshots/get.php
index 862ea41c..d87a89c8 100644
--- a/samples/BlockStorage/v3/snapshots/get.php
+++ b/samples/block_storage/v2/snapshots/get.php
@@ -9,6 +9,6 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
diff --git a/samples/BlockStorage/v3/snapshots/get_metadata.php b/samples/block_storage/v2/snapshots/get_metadata.php
similarity index 77%
rename from samples/BlockStorage/v3/snapshots/get_metadata.php
rename to samples/block_storage/v2/snapshots/get_metadata.php
index 23fe6c2a..17a29187 100644
--- a/samples/BlockStorage/v3/snapshots/get_metadata.php
+++ b/samples/block_storage/v2/snapshots/get_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $metadata = $service->getSnapshot('{snapshotId}')
                     ->getMetadata();
diff --git a/samples/BlockStorage/v3/snapshots/list.php b/samples/block_storage/v2/snapshots/list.php
similarity index 67%
rename from samples/BlockStorage/v3/snapshots/list.php
rename to samples/block_storage/v2/snapshots/list.php
index c887806d..6853cd9e 100644
--- a/samples/BlockStorage/v3/snapshots/list.php
+++ b/samples/block_storage/v2/snapshots/list.php
@@ -9,10 +9,10 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshots = $service->listSnapshots();
 
 foreach ($snapshots as $snapshot) {
-    /** @var \OpenStack\BlockStorage\v2\Models\Snapshot $snapshot */
+    /** @var $snapshot \OpenStack\BlockStorage\v2\Models\Snapshot */
 }
diff --git a/samples/BlockStorage/v3/snapshots/list_detail.php b/samples/block_storage/v2/snapshots/list_detail.php
similarity index 80%
rename from samples/BlockStorage/v3/snapshots/list_detail.php
rename to samples/block_storage/v2/snapshots/list_detail.php
index c53cf80f..aab57992 100644
--- a/samples/BlockStorage/v3/snapshots/list_detail.php
+++ b/samples/block_storage/v2/snapshots/list_detail.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshots = $service->listSnapshots(true);
 
diff --git a/samples/BlockStorage/v3/snapshots/merge_metadata.php b/samples/block_storage/v2/snapshots/merge_metadata.php
similarity index 78%
rename from samples/BlockStorage/v3/snapshots/merge_metadata.php
rename to samples/block_storage/v2/snapshots/merge_metadata.php
index 40eca4bf..182bfd50 100644
--- a/samples/BlockStorage/v3/snapshots/merge_metadata.php
+++ b/samples/block_storage/v2/snapshots/merge_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v3/snapshots/reset_metadata.php b/samples/block_storage/v2/snapshots/reset_metadata.php
similarity index 78%
rename from samples/BlockStorage/v3/snapshots/reset_metadata.php
rename to samples/block_storage/v2/snapshots/reset_metadata.php
index 114111d9..afaac8ef 100644
--- a/samples/BlockStorage/v3/snapshots/reset_metadata.php
+++ b/samples/block_storage/v2/snapshots/reset_metadata.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/BlockStorage/v3/snapshots/update.php b/samples/block_storage/v2/snapshots/update.php
similarity index 80%
rename from samples/BlockStorage/v3/snapshots/update.php
rename to samples/block_storage/v2/snapshots/update.php
index b9adf70e..f72a15a0 100644
--- a/samples/BlockStorage/v3/snapshots/update.php
+++ b/samples/block_storage/v2/snapshots/update.php
@@ -9,7 +9,7 @@
     'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $snapshot = $service->getSnapshot('{snapshotId}');
 
diff --git a/samples/block_storage/v2/volume_types/create.php b/samples/block_storage/v2/volume_types/create.php
new file mode 100644
index 00000000..f9042a7f
--- /dev/null
+++ b/samples/block_storage/v2/volume_types/create.php
@@ -0,0 +1,16 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volumeType = $service->createVolumeType([
+    'name' => '{name}',
+]);
diff --git a/samples/block_storage/v2/volume_types/delete.php b/samples/block_storage/v2/volume_types/delete.php
new file mode 100644
index 00000000..11f02cac
--- /dev/null
+++ b/samples/block_storage/v2/volume_types/delete.php
@@ -0,0 +1,15 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volumeType = $service->getVolumeType('{volumeTypeId}');
+$volumeType->delete();
diff --git a/samples/block_storage/v2/volume_types/get.php b/samples/block_storage/v2/volume_types/get.php
new file mode 100644
index 00000000..19051d0f
--- /dev/null
+++ b/samples/block_storage/v2/volume_types/get.php
@@ -0,0 +1,14 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volumeType = $service->getVolumeType('{volumeTypeId}');
diff --git a/samples/block_storage/v2/volume_types/list.php b/samples/block_storage/v2/volume_types/list.php
new file mode 100644
index 00000000..567aed53
--- /dev/null
+++ b/samples/block_storage/v2/volume_types/list.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volumeTypes = $service->listVolumeTypes();
+
+foreach ($volumeTypes as $volumeType) {
+    /** @var $volumeType \OpenStack\BlockStorage\v2\VolumeType */
+}
diff --git a/samples/BlockStorage/v3/volume_types/update.php b/samples/block_storage/v2/volume_types/update.php
similarity index 56%
rename from samples/BlockStorage/v3/volume_types/update.php
rename to samples/block_storage/v2/volume_types/update.php
index b99b0464..5f24db38 100644
--- a/samples/BlockStorage/v3/volume_types/update.php
+++ b/samples/block_storage/v2/volume_types/update.php
@@ -5,13 +5,11 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}']
-    ,
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $volumeType = $service->getVolumeType('{volumeTypeId}');
 $volumeType->name = '{newName}';
diff --git a/samples/block_storage/v2/volumes/create.php b/samples/block_storage/v2/volumes/create.php
new file mode 100644
index 00000000..eb48f8bd
--- /dev/null
+++ b/samples/block_storage/v2/volumes/create.php
@@ -0,0 +1,20 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volume = $service->createVolume([
+    'description'      => '{description}',
+    'size'             => '{size}',
+    'name'             => '{name}',
+    'volumeType'       => '{volumeType}',
+    'metadata'         => ['{key1}' => '{val1}'],
+]);
diff --git a/samples/BlockStorage/v3/volumes/create_from_volume.php b/samples/block_storage/v2/volumes/create_from_image.php
similarity index 55%
rename from samples/BlockStorage/v3/volumes/create_from_volume.php
rename to samples/block_storage/v2/volumes/create_from_image.php
index e48172e2..0701e39f 100644
--- a/samples/BlockStorage/v3/volumes/create_from_volume.php
+++ b/samples/block_storage/v2/volumes/create_from_image.php
@@ -5,17 +5,15 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $volume = $service->createVolume([
     'description'    => '{description}',
     'size'           => '{size}',
     'name'           => '{name}',
-    'sourceVolumeId' => '{volumeId}',
+    'sourceVolumeId' => '{snapshotId}',
 ]);
diff --git a/samples/BlockStorage/v3/volumes/create_from_snapshot.php b/samples/block_storage/v2/volumes/create_from_snapshot.php
similarity index 61%
rename from samples/BlockStorage/v3/volumes/create_from_snapshot.php
rename to samples/block_storage/v2/volumes/create_from_snapshot.php
index 6d08b151..dfff8ea9 100644
--- a/samples/BlockStorage/v3/volumes/create_from_snapshot.php
+++ b/samples/block_storage/v2/volumes/create_from_snapshot.php
@@ -5,13 +5,11 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 $volume = $service->createVolume([
     'description' => '{description}',
diff --git a/samples/block_storage/v2/volumes/create_from_source_volume.php b/samples/block_storage/v2/volumes/create_from_source_volume.php
new file mode 100644
index 00000000..1f26a61e
--- /dev/null
+++ b/samples/block_storage/v2/volumes/create_from_source_volume.php
@@ -0,0 +1,19 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volume = $service->createVolume([
+    'description' => '{description}',
+    'size'        => '{size}',
+    'name'        => '{name}',
+    'imageId'     => '{snapshotId}',
+]);
diff --git a/samples/block_storage/v2/volumes/delete.php b/samples/block_storage/v2/volumes/delete.php
new file mode 100644
index 00000000..46527f04
--- /dev/null
+++ b/samples/block_storage/v2/volumes/delete.php
@@ -0,0 +1,15 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volume = $service->getVolume('{volumeId}');
+$volume->delete();
diff --git a/samples/block_storage/v2/volumes/get.php b/samples/block_storage/v2/volumes/get.php
new file mode 100644
index 00000000..2c347787
--- /dev/null
+++ b/samples/block_storage/v2/volumes/get.php
@@ -0,0 +1,14 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volume = $service->getVolume('{volumeId}');
diff --git a/samples/block_storage/v2/volumes/list.php b/samples/block_storage/v2/volumes/list.php
new file mode 100644
index 00000000..d91d0145
--- /dev/null
+++ b/samples/block_storage/v2/volumes/list.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volumes = $service->listVolumes();
+
+foreach ($volumes as $volume) {
+    /** @var $volume \OpenStack\BlockStorage\v2\Models\Volume */
+}
diff --git a/samples/BlockStorage/v3/volumes/list_detail.php b/samples/block_storage/v2/volumes/list_detail.php
similarity index 56%
rename from samples/BlockStorage/v3/volumes/list_detail.php
rename to samples/block_storage/v2/volumes/list_detail.php
index 755606c0..a67d35a4 100644
--- a/samples/BlockStorage/v3/volumes/list_detail.php
+++ b/samples/block_storage/v2/volumes/list_detail.php
@@ -5,13 +5,11 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->blockStorageV3(['catalogName' => 'cinder', 'catalogType' => 'block-storage']);
+$service = $openstack->blockStorageV2();
 
 foreach ($service->listVolumes(true) as $volume) {
     /** @var $volume \OpenStack\BlockStorage\v2\Models\Volume */
diff --git a/samples/block_storage/v2/volumes/update.php b/samples/block_storage/v2/volumes/update.php
new file mode 100644
index 00000000..07605d3f
--- /dev/null
+++ b/samples/block_storage/v2/volumes/update.php
@@ -0,0 +1,19 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->blockStorageV2();
+
+$volume = $service->getVolume('{volumeId}');
+
+$volume->name        = '{newName}';
+$volume->description = '{newDescription}';
+
+$volume->update();
diff --git a/samples/Compute/v2/flavors/create.php b/samples/compute/v2/flavors/create_flavor.php
similarity index 69%
rename from samples/Compute/v2/flavors/create.php
rename to samples/compute/v2/flavors/create_flavor.php
index 0dc5ff19..ee88ba57 100644
--- a/samples/Compute/v2/flavors/create.php
+++ b/samples/compute/v2/flavors/create_flavor.php
@@ -7,11 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
+$compute = $openstack->computeV2(['region' => '{region}']);
 
 $flavor = $compute->createFlavor([
     'name'  => '{flavorName}',
diff --git a/samples/Compute/v2/flavors/delete.php b/samples/compute/v2/flavors/delete_flavor.php
similarity index 78%
rename from samples/Compute/v2/flavors/delete.php
rename to samples/compute/v2/flavors/delete_flavor.php
index 91828cde..53d20117 100644
--- a/samples/Compute/v2/flavors/delete.php
+++ b/samples/compute/v2/flavors/delete_flavor.php
@@ -7,11 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
+
 $flavor = $compute->getFlavor(['id' => '{flavorId}']);
 $flavor->delete();
diff --git a/samples/compute/v2/flavors/get_flavor.php b/samples/compute/v2/flavors/get_flavor.php
new file mode 100644
index 00000000..acaa4dc2
--- /dev/null
+++ b/samples/compute/v2/flavors/get_flavor.php
@@ -0,0 +1,24 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$compute = $openstack->computeV2(['region' => '{region}']);
+
+$flavor = $compute->getFlavor(['id' => '{flavorId}']);
+
+// By default, this will return an empty Flavor object and NOT hit the API.
+// This is convenient for when you want to use the object for operations
+// that do not require an initial GET request. To retrieve the flavor's details,
+// run the following, which *will* call the API with a GET request:
+
+$flavor->retrieve();
diff --git a/samples/Compute/v2/flavors/list.php b/samples/compute/v2/flavors/list_flavors.php
similarity index 64%
rename from samples/Compute/v2/flavors/list.php
rename to samples/compute/v2/flavors/list_flavors.php
index 7b7730fa..570af2d0 100644
--- a/samples/Compute/v2/flavors/list.php
+++ b/samples/compute/v2/flavors/list_flavors.php
@@ -7,14 +7,14 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
+$compute = $openstack->computeV2(['region' => '{region}']);
 
 $flavors = $compute->listFlavors();
 
 foreach ($flavors as $flavor) {
-    /** @var \OpenStack\Compute\v2\Models\Flavor $flavor */
 }
diff --git a/samples/Compute/v2/hypervisors/get_hypervisor.php b/samples/compute/v2/hypervisors/get_hypervisor.php
similarity index 100%
rename from samples/Compute/v2/hypervisors/get_hypervisor.php
rename to samples/compute/v2/hypervisors/get_hypervisor.php
diff --git a/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php b/samples/compute/v2/hypervisors/get_hypervisors_statistics.php
similarity index 89%
rename from samples/Compute/v2/hypervisors/get_hypervisors_statistics.php
rename to samples/compute/v2/hypervisors/get_hypervisors_statistics.php
index b702b4d5..c4e78e35 100644
--- a/samples/Compute/v2/hypervisors/get_hypervisors_statistics.php
+++ b/samples/compute/v2/hypervisors/get_hypervisors_statistics.php
@@ -16,4 +16,5 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
+/** @var HypervisorStatistic $hypervisorStatistics */
 $hypervisorStatistics = $compute->getHypervisorStatistics();
diff --git a/samples/Compute/v2/hypervisors/list_hypervisors.php b/samples/compute/v2/hypervisors/list_hypervisors.php
similarity index 84%
rename from samples/Compute/v2/hypervisors/list_hypervisors.php
rename to samples/compute/v2/hypervisors/list_hypervisors.php
index 4dd7b384..dee1eaf9 100644
--- a/samples/Compute/v2/hypervisors/list_hypervisors.php
+++ b/samples/compute/v2/hypervisors/list_hypervisors.php
@@ -1,5 +1,7 @@
 <?php
 
+use OpenStack\Compute\v2\Models\Hypervisor;
+
 require 'vendor/autoload.php';
 
 $openstack = new OpenStack\OpenStack([
@@ -17,5 +19,5 @@
 $hypervisors = $compute->listHypervisors();
 
 foreach ($hypervisors as $hypervisor) {
-    /** @var \OpenStack\Compute\v2\Models\Hypervisor $hypervisor */
+    /**@var Hypervisor $hypervisor*/
 }
diff --git a/samples/Compute/v2/images/create_server_image.php b/samples/compute/v2/images/create_server_image.php
similarity index 100%
rename from samples/Compute/v2/images/create_server_image.php
rename to samples/compute/v2/images/create_server_image.php
diff --git a/samples/Compute/v2/images/delete_image.php b/samples/compute/v2/images/delete_image.php
similarity index 95%
rename from samples/Compute/v2/images/delete_image.php
rename to samples/compute/v2/images/delete_image.php
index 51e08b0f..a8462863 100644
--- a/samples/Compute/v2/images/delete_image.php
+++ b/samples/compute/v2/images/delete_image.php
@@ -15,5 +15,3 @@
 $compute = $openstack->computeV2(['region' => '{region}']);
 
 $image = $compute->getImage(['id' => '{imageId}']);
-
-$image->delete();
diff --git a/samples/Compute/v2/images/delete_image_metadata_item.php b/samples/compute/v2/images/delete_image_metadata_item.php
similarity index 91%
rename from samples/Compute/v2/images/delete_image_metadata_item.php
rename to samples/compute/v2/images/delete_image_metadata_item.php
index 442fd320..31e89e0d 100644
--- a/samples/Compute/v2/images/delete_image_metadata_item.php
+++ b/samples/compute/v2/images/delete_image_metadata_item.php
@@ -16,4 +16,4 @@
 
 $image = $compute->getImage(['id' => '{imageId}']);
 
-$image->deleteMetadataItem('{key}');
+$image->deleteMetadataItem('key');
diff --git a/samples/Compute/v2/images/get_image.php b/samples/compute/v2/images/get_image.php
similarity index 100%
rename from samples/Compute/v2/images/get_image.php
rename to samples/compute/v2/images/get_image.php
diff --git a/samples/Compute/v2/images/list_images.php b/samples/compute/v2/images/list_images.php
similarity index 88%
rename from samples/Compute/v2/images/list_images.php
rename to samples/compute/v2/images/list_images.php
index d0353c8d..0c7f5638 100644
--- a/samples/Compute/v2/images/list_images.php
+++ b/samples/compute/v2/images/list_images.php
@@ -17,5 +17,4 @@
 $images = $compute->listImages(['status' => 'ACTIVE']);
 
 foreach ($images as $image) {
-    /** @var \OpenStack\Compute\v2\Models\Image $image */
 }
diff --git a/samples/Compute/v2/images/reset_image_metadata.php b/samples/compute/v2/images/reset_image_metadata.php
similarity index 94%
rename from samples/Compute/v2/images/reset_image_metadata.php
rename to samples/compute/v2/images/reset_image_metadata.php
index 176dc948..790f8e5a 100644
--- a/samples/Compute/v2/images/reset_image_metadata.php
+++ b/samples/compute/v2/images/reset_image_metadata.php
@@ -17,5 +17,5 @@
 $image = $compute->getImage(['id' => '{imageId}']);
 
 $image->resetMetadata([
-    '{key}' => '{value}',
+    'key' => 'value',
 ]);
diff --git a/samples/Compute/v2/images/retrieve_image_metadata.php b/samples/compute/v2/images/retrieve_image_metadata.php
similarity index 87%
rename from samples/Compute/v2/images/retrieve_image_metadata.php
rename to samples/compute/v2/images/retrieve_image_metadata.php
index e2316f68..44600436 100644
--- a/samples/Compute/v2/images/retrieve_image_metadata.php
+++ b/samples/compute/v2/images/retrieve_image_metadata.php
@@ -16,4 +16,6 @@
 
 $image = $compute->getImage(['id' => '{imageId}']);
 
-$metadata = $image->getMetadata();
+$metadata = $image->getMetadata([
+    'key' => 'value'
+]);
diff --git a/samples/Compute/v2/keypairs/create_keypair.php b/samples/compute/v2/keypairs/create_keypair.php
similarity index 100%
rename from samples/Compute/v2/keypairs/create_keypair.php
rename to samples/compute/v2/keypairs/create_keypair.php
diff --git a/samples/Compute/v2/keypairs/delete_keypair.php b/samples/compute/v2/keypairs/delete_keypair.php
similarity index 100%
rename from samples/Compute/v2/keypairs/delete_keypair.php
rename to samples/compute/v2/keypairs/delete_keypair.php
diff --git a/samples/Compute/v2/keypairs/get_keypair.php b/samples/compute/v2/keypairs/get_keypair.php
similarity index 88%
rename from samples/Compute/v2/keypairs/get_keypair.php
rename to samples/compute/v2/keypairs/get_keypair.php
index bbfc0ba1..9ed0fb5e 100644
--- a/samples/Compute/v2/keypairs/get_keypair.php
+++ b/samples/compute/v2/keypairs/get_keypair.php
@@ -14,6 +14,7 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
+/** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
 $keypair = $compute->getKeypair(['name' => '{name}']);
 
 $keypair->retrieve();
diff --git a/samples/Compute/v2/keypairs/list_keypairs.php b/samples/compute/v2/keypairs/list_keypairs.php
similarity index 85%
rename from samples/Compute/v2/keypairs/list_keypairs.php
rename to samples/compute/v2/keypairs/list_keypairs.php
index dedf9bbe..c1b88ae6 100644
--- a/samples/Compute/v2/keypairs/list_keypairs.php
+++ b/samples/compute/v2/keypairs/list_keypairs.php
@@ -1,5 +1,7 @@
 <?php
 
+use OpenStack\Compute\v2\Models\Keypair;
+
 require 'vendor/autoload.php';
 
 $openstack = new OpenStack\OpenStack([
@@ -17,5 +19,5 @@
 $keypairs = $compute->listKeypairs();
 
 foreach ($keypairs as $keypair) {
-    /** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
+    /**@var Keypair $keypair */
 }
diff --git a/samples/Compute/v2/limits/get_limits.php b/samples/compute/v2/limits/get_limits.php
similarity index 87%
rename from samples/Compute/v2/limits/get_limits.php
rename to samples/compute/v2/limits/get_limits.php
index 2123995f..15aa6e16 100644
--- a/samples/Compute/v2/limits/get_limits.php
+++ b/samples/compute/v2/limits/get_limits.php
@@ -14,4 +14,5 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
+/** @var \OpenStack\Compute\v2\Models\Limit $limit */
 $limit = $compute->getLimits();
diff --git a/samples/Compute/v2/servers/add_security_group.php b/samples/compute/v2/servers/add_security_group.php
similarity index 78%
rename from samples/Compute/v2/servers/add_security_group.php
rename to samples/compute/v2/servers/add_security_group.php
index 1b471306..429d5207 100644
--- a/samples/Compute/v2/servers/add_security_group.php
+++ b/samples/compute/v2/servers/add_security_group.php
@@ -14,6 +14,9 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer(['id' => '{serverId}']);
+/**@var OpenStack\Compute\v2\Models\Server $server */
+$server = $compute->getServer([
+    'id' => '{serverId}',
+]);
 
 $server->addSecurityGroup(['name' => '{secGroupName}']);
diff --git a/samples/Compute/v2/volume_attachments/create.php b/samples/compute/v2/servers/attach_volume_attachment.php
similarity index 72%
rename from samples/Compute/v2/volume_attachments/create.php
rename to samples/compute/v2/servers/attach_volume_attachment.php
index 769c2cfa..fb803c6a 100644
--- a/samples/Compute/v2/volume_attachments/create.php
+++ b/samples/compute/v2/servers/attach_volume_attachment.php
@@ -13,9 +13,13 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
+$compute = $openstack->computeV2(['region' => '{region}']);
+
+/**@var OpenStack\Compute\v2\Models\Server $server */
 $server = $compute->getServer(['id' => '{serverId}']);
 
+/**@var VolumeAttachment $volumeAttachment*/
 $volumeAttachment = $server->attachVolume('{volumeId}');
diff --git a/samples/Compute/v2/servers/change_server_password.php b/samples/compute/v2/servers/change_server_password.php
similarity index 86%
rename from samples/Compute/v2/servers/change_server_password.php
rename to samples/compute/v2/servers/change_server_password.php
index f3f22ed3..c2330a2e 100644
--- a/samples/Compute/v2/servers/change_server_password.php
+++ b/samples/compute/v2/servers/change_server_password.php
@@ -14,6 +14,8 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer(['id' => '{serverId}']);
+$server = $compute->getServer([
+    'id' => '{serverId}',
+]);
 
 $server->changePassword('{newPassword}');
diff --git a/samples/Compute/v2/servers/confirm_server_resize.php b/samples/compute/v2/servers/confirm_server_resize.php
similarity index 92%
rename from samples/Compute/v2/servers/confirm_server_resize.php
rename to samples/compute/v2/servers/confirm_server_resize.php
index 46e50469..085a900c 100644
--- a/samples/Compute/v2/servers/confirm_server_resize.php
+++ b/samples/compute/v2/servers/confirm_server_resize.php
@@ -18,5 +18,4 @@
     'id' => '{serverId}',
 ]);
 
-$server->waitUntil('VERIFY_RESIZE');
 $server->confirmResize();
diff --git a/samples/Compute/v2/servers/list_security_groups.php b/samples/compute/v2/servers/create_interface_attachment.php
similarity index 67%
rename from samples/Compute/v2/servers/list_security_groups.php
rename to samples/compute/v2/servers/create_interface_attachment.php
index d7743c25..f87d9929 100644
--- a/samples/Compute/v2/servers/list_security_groups.php
+++ b/samples/compute/v2/servers/create_interface_attachment.php
@@ -16,8 +16,7 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
-$securityGroups = $server->listSecurityGroups();
-
-foreach ($securityGroups as $securityGroup) {
-    /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $securityGroup */
-}
+/**@var OpenStack\Networking\v2\Models\InterfaceAttachment $interface */
+$interface = $server->createInterfaceAttachment([
+    'networkId' => '{networkId}',
+]);
diff --git a/samples/Compute/v2/servers/create.php b/samples/compute/v2/servers/create_server.php
similarity index 80%
rename from samples/Compute/v2/servers/create.php
rename to samples/compute/v2/servers/create_server.php
index e99355e0..41190f5d 100644
--- a/samples/Compute/v2/servers/create.php
+++ b/samples/compute/v2/servers/create_server.php
@@ -9,9 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
+$compute = $openstack->computeV2(['region' => '{region}']);
 
 $options = [
     // Required
@@ -30,4 +31,5 @@
 ];
 
 // Create the server
+/**@var OpenStack\Compute\v2\Models\Server $server */
 $server = $compute->createServer($options);
diff --git a/samples/Compute/v2/servers/delete_interface_attachment.php b/samples/compute/v2/servers/delete_interface_attachment.php
similarity index 100%
rename from samples/Compute/v2/servers/delete_interface_attachment.php
rename to samples/compute/v2/servers/delete_interface_attachment.php
diff --git a/samples/Compute/v2/servers/create_interface_attachment.php b/samples/compute/v2/servers/delete_server.php
similarity index 81%
rename from samples/Compute/v2/servers/create_interface_attachment.php
rename to samples/compute/v2/servers/delete_server.php
index 430e0cc7..650ae209 100644
--- a/samples/Compute/v2/servers/create_interface_attachment.php
+++ b/samples/compute/v2/servers/delete_server.php
@@ -14,6 +14,7 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
+/**@var OpenStack\Compute\v2\Models\Server $server */
 $server = $compute->getServer(['id' => '{serverId}']);
 
-$interfaceAttachment = $server->createInterfaceAttachment(['networkId' => '{networkId}']);
+$server->delete();
diff --git a/samples/Compute/v2/servers/delete_server_metadata_item.php b/samples/compute/v2/servers/delete_server_metadata_item.php
similarity index 91%
rename from samples/Compute/v2/servers/delete_server_metadata_item.php
rename to samples/compute/v2/servers/delete_server_metadata_item.php
index 2b51dd63..318f1d32 100644
--- a/samples/Compute/v2/servers/delete_server_metadata_item.php
+++ b/samples/compute/v2/servers/delete_server_metadata_item.php
@@ -16,4 +16,4 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
-$server->deleteMetadataItem('{key}');
+$server->deleteMetadataItem('key');
diff --git a/samples/compute/v2/servers/detach_volume_attachment.php b/samples/compute/v2/servers/detach_volume_attachment.php
new file mode 100644
index 00000000..f08c2176
--- /dev/null
+++ b/samples/compute/v2/servers/detach_volume_attachment.php
@@ -0,0 +1,25 @@
+<?php
+
+use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule;
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$compute = $openstack->computeV2(['region' => '{region}']);
+
+/**@var OpenStack\Compute\v2\Models\Server $server */
+$server = $compute->getServer(['id' => '{serverId}']);
+
+//Must detach by volumeAttachment id
+$server->detachVolume('{volumeAttachmentId}');
diff --git a/samples/Compute/v2/servers/get_interface_attachment.php b/samples/compute/v2/servers/get_interface_attachment.php
similarity index 100%
rename from samples/Compute/v2/servers/get_interface_attachment.php
rename to samples/compute/v2/servers/get_interface_attachment.php
diff --git a/samples/compute/v2/servers/get_server.php b/samples/compute/v2/servers/get_server.php
new file mode 100644
index 00000000..7ba12d3c
--- /dev/null
+++ b/samples/compute/v2/servers/get_server.php
@@ -0,0 +1,24 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$compute = $openstack->computeV2(['region' => '{region}']);
+
+$server = $compute->getServer(['id' => '{serverId}']);
+
+// By default, this will return an empty Server object and NOT hit the API.
+// This is convenient for when you want to use the object for operations
+// that do not require an initial GET request. To retrieve the server's details,
+// run the following, which *will* call the API with a GET request:
+
+$server->retrieve();
diff --git a/samples/Compute/v2/servers/get_server_console_output.php b/samples/compute/v2/servers/get_server_console_output.php
similarity index 93%
rename from samples/Compute/v2/servers/get_server_console_output.php
rename to samples/compute/v2/servers/get_server_console_output.php
index 4a9118c8..e579f367 100644
--- a/samples/Compute/v2/servers/get_server_console_output.php
+++ b/samples/compute/v2/servers/get_server_console_output.php
@@ -16,4 +16,5 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
+/** @var string $consoleOutput */
 $consoleOutput = $server->getConsoleOutput();
diff --git a/samples/Compute/v2/servers/get_server_metadata.php b/samples/compute/v2/servers/get_server_metadata.php
similarity index 100%
rename from samples/Compute/v2/servers/get_server_metadata.php
rename to samples/compute/v2/servers/get_server_metadata.php
diff --git a/samples/Compute/v2/servers/get_server_metadata_item.php b/samples/compute/v2/servers/get_server_metadata_item.php
similarity index 100%
rename from samples/Compute/v2/servers/get_server_metadata_item.php
rename to samples/compute/v2/servers/get_server_metadata_item.php
diff --git a/samples/Compute/v2/servers/get_server_rdp_console.php b/samples/compute/v2/servers/get_server_rdp_console.php
similarity index 100%
rename from samples/Compute/v2/servers/get_server_rdp_console.php
rename to samples/compute/v2/servers/get_server_rdp_console.php
diff --git a/samples/Compute/v2/servers/get_server_serial_console.php b/samples/compute/v2/servers/get_server_serial_console.php
similarity index 100%
rename from samples/Compute/v2/servers/get_server_serial_console.php
rename to samples/compute/v2/servers/get_server_serial_console.php
diff --git a/samples/Compute/v2/servers/get_server_spice_console.php b/samples/compute/v2/servers/get_server_spice_console.php
similarity index 100%
rename from samples/Compute/v2/servers/get_server_spice_console.php
rename to samples/compute/v2/servers/get_server_spice_console.php
diff --git a/samples/Compute/v2/servers/get_server_vnc_console.php b/samples/compute/v2/servers/get_server_vnc_console.php
similarity index 94%
rename from samples/Compute/v2/servers/get_server_vnc_console.php
rename to samples/compute/v2/servers/get_server_vnc_console.php
index d662c481..fc1bcf2c 100644
--- a/samples/Compute/v2/servers/get_server_vnc_console.php
+++ b/samples/compute/v2/servers/get_server_vnc_console.php
@@ -16,4 +16,5 @@
 
 $server = $compute->getServer(['id' => '{serverId}']);
 
+/** @var array $console */
 $console = $server->getVncConsole();
diff --git a/samples/compute/v2/servers/list_security_groups.php b/samples/compute/v2/servers/list_security_groups.php
new file mode 100644
index 00000000..f215a3e3
--- /dev/null
+++ b/samples/compute/v2/servers/list_security_groups.php
@@ -0,0 +1,31 @@
+<?php
+
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
+use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule;
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$compute = $openstack->computeV2(['region' => '{region}']);
+
+$server = $compute->getServer(['id' => '{serverId}']);
+
+$securityGroups = $server->listSecurityGroups();
+
+foreach ($securityGroups as $securityGroup) {
+    /**@var SecurityGroup $securityGroup */
+    $rules = $securityGroup->securityGroupRules;
+
+    foreach ($rules as $rule) {
+        /**@var SecurityGroupRule $rule */
+    }
+}
diff --git a/samples/Compute/v2/servers/list_server_addresses.php b/samples/compute/v2/servers/list_server_addresses.php
similarity index 100%
rename from samples/Compute/v2/servers/list_server_addresses.php
rename to samples/compute/v2/servers/list_server_addresses.php
diff --git a/samples/Compute/v2/servers/list.php b/samples/compute/v2/servers/list_servers.php
similarity index 60%
rename from samples/Compute/v2/servers/list.php
rename to samples/compute/v2/servers/list_servers.php
index f96bd4a4..f853af64 100644
--- a/samples/Compute/v2/servers/list.php
+++ b/samples/compute/v2/servers/list_servers.php
@@ -9,11 +9,12 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
+$compute = $openstack->computeV2(['region' => '{region}']);
 
-$servers = $compute->listServers();
+$servers = $compute->listServers(['imageId' => '{imageId}']);
 
 foreach ($servers as $server) {
 }
diff --git a/samples/Compute/v2/volume_attachments/delete.php b/samples/compute/v2/servers/list_volume_attachments.php
similarity index 68%
rename from samples/Compute/v2/volume_attachments/delete.php
rename to samples/compute/v2/servers/list_volume_attachments.php
index 482152a1..518e9364 100644
--- a/samples/Compute/v2/volume_attachments/delete.php
+++ b/samples/compute/v2/servers/list_volume_attachments.php
@@ -13,9 +13,13 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
+$compute = $openstack->computeV2(['region' => '{region}']);
+
 $server = $compute->getServer(['id' => '{serverId}']);
 
-$server->detachVolume('{volumeId}');
+foreach ($server->listVolumeAttachments() as $volumeAttachment) {
+    /**@var VolumeAttachment $volumeAttachment*/
+}
diff --git a/samples/Compute/v2/servers/merge_server_metadata.php b/samples/compute/v2/servers/merge_server_metadata.php
similarity index 94%
rename from samples/Compute/v2/servers/merge_server_metadata.php
rename to samples/compute/v2/servers/merge_server_metadata.php
index 447e05fc..e67cf8b5 100644
--- a/samples/Compute/v2/servers/merge_server_metadata.php
+++ b/samples/compute/v2/servers/merge_server_metadata.php
@@ -17,5 +17,5 @@
 $server = $compute->getServer(['id' => '{serverId}']);
 
 $server->mergeMetadata([
-    '{key}' => '{value}'
+    'key' => 'value'
 ]);
diff --git a/samples/Compute/v2/servers/reboot_server.php b/samples/compute/v2/servers/reboot_server.php
similarity index 75%
rename from samples/Compute/v2/servers/reboot_server.php
rename to samples/compute/v2/servers/reboot_server.php
index a341cc4f..ac4a50ca 100644
--- a/samples/Compute/v2/servers/reboot_server.php
+++ b/samples/compute/v2/servers/reboot_server.php
@@ -14,6 +14,8 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer(['id' => '{serverId}']);
+$server = $compute->getServer([
+    'id' => '{serverId}',
+]);
 
-$server->reboot(\OpenStack\Compute\v2\Enum::REBOOT_HARD);
+$server->reboot();
diff --git a/samples/Compute/v2/servers/rebuild_server.php b/samples/compute/v2/servers/rebuild_server.php
similarity index 88%
rename from samples/Compute/v2/servers/rebuild_server.php
rename to samples/compute/v2/servers/rebuild_server.php
index 26f8ba19..0867abdb 100644
--- a/samples/Compute/v2/servers/rebuild_server.php
+++ b/samples/compute/v2/servers/rebuild_server.php
@@ -14,7 +14,9 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer(['id' => '{serverId}']);
+$server = $compute->getServer([
+    'id' => '{serverId}',
+]);
 
 $server->rebuild([
     'imageId'   => '{imageId}',
diff --git a/samples/Compute/v2/servers/remove_security_group.php b/samples/compute/v2/servers/remove_security_group.php
similarity index 100%
rename from samples/Compute/v2/servers/remove_security_group.php
rename to samples/compute/v2/servers/remove_security_group.php
diff --git a/samples/Compute/v2/servers/rescue_server.php b/samples/compute/v2/servers/rescue_server.php
similarity index 87%
rename from samples/Compute/v2/servers/rescue_server.php
rename to samples/compute/v2/servers/rescue_server.php
index 38a28abd..d4c6516a 100644
--- a/samples/Compute/v2/servers/rescue_server.php
+++ b/samples/compute/v2/servers/rescue_server.php
@@ -14,7 +14,9 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer(['id' => '{serverId}']);
+$server = $compute->getServer([
+    'id' => '{serverId}',
+]);
 
 $server->rescue([
     'imageId'   => '{imageId}',
diff --git a/samples/Compute/v2/servers/reset_server_metadata.php b/samples/compute/v2/servers/reset_server_metadata.php
similarity index 62%
rename from samples/Compute/v2/servers/reset_server_metadata.php
rename to samples/compute/v2/servers/reset_server_metadata.php
index 0a3036e1..37748a4c 100644
--- a/samples/Compute/v2/servers/reset_server_metadata.php
+++ b/samples/compute/v2/servers/reset_server_metadata.php
@@ -7,15 +7,17 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer(['id' => '{serverId}']);
+$server = $compute->getServer([
+    'id' => '{serverId}',
+]);
 
 $server->resetMetadata([
-    '{key}' => '{value}',
+    'key' => 'value',
 ]);
diff --git a/samples/Compute/v2/servers/reset_server_state.php b/samples/compute/v2/servers/reset_server_state.php
similarity index 100%
rename from samples/Compute/v2/servers/reset_server_state.php
rename to samples/compute/v2/servers/reset_server_state.php
diff --git a/samples/Compute/v2/servers/resize_server.php b/samples/compute/v2/servers/resize_server.php
similarity index 100%
rename from samples/Compute/v2/servers/resize_server.php
rename to samples/compute/v2/servers/resize_server.php
diff --git a/samples/Compute/v2/servers/resume_server.php b/samples/compute/v2/servers/resume_server.php
similarity index 100%
rename from samples/Compute/v2/servers/resume_server.php
rename to samples/compute/v2/servers/resume_server.php
diff --git a/samples/Compute/v2/servers/revert_server_resize.php b/samples/compute/v2/servers/revert_server_resize.php
similarity index 92%
rename from samples/Compute/v2/servers/revert_server_resize.php
rename to samples/compute/v2/servers/revert_server_resize.php
index 2b0390a7..ee116d5b 100644
--- a/samples/Compute/v2/servers/revert_server_resize.php
+++ b/samples/compute/v2/servers/revert_server_resize.php
@@ -18,5 +18,4 @@
     'id' => '{serverId}',
 ]);
 
-$server->waitUntil('VERIFY_RESIZE');
 $server->revertResize();
diff --git a/samples/Compute/v2/servers/start_server.php b/samples/compute/v2/servers/start_server.php
similarity index 100%
rename from samples/Compute/v2/servers/start_server.php
rename to samples/compute/v2/servers/start_server.php
diff --git a/samples/Compute/v2/servers/stop_server.php b/samples/compute/v2/servers/stop_server.php
similarity index 100%
rename from samples/Compute/v2/servers/stop_server.php
rename to samples/compute/v2/servers/stop_server.php
diff --git a/samples/Compute/v2/servers/suspend_server.php b/samples/compute/v2/servers/suspend_server.php
similarity index 100%
rename from samples/Compute/v2/servers/suspend_server.php
rename to samples/compute/v2/servers/suspend_server.php
diff --git a/samples/Compute/v2/servers/unrescue_server.php b/samples/compute/v2/servers/unrescue_server.php
similarity index 81%
rename from samples/Compute/v2/servers/unrescue_server.php
rename to samples/compute/v2/servers/unrescue_server.php
index 34f1527d..b5f59a17 100644
--- a/samples/Compute/v2/servers/unrescue_server.php
+++ b/samples/compute/v2/servers/unrescue_server.php
@@ -14,7 +14,8 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$server = $compute->getServer(['id' => '{serverId}']);
+$server = $compute->getServer([
+    'id' => '{serverId}',
+]);
 
-$server->waitUntil('RESCUE');
 $server->unrescue();
diff --git a/samples/Compute/v2/images/merge_image_metadata.php b/samples/compute/v2/servers/update_server.php
similarity index 77%
rename from samples/Compute/v2/images/merge_image_metadata.php
rename to samples/compute/v2/servers/update_server.php
index c2b9151b..088d586f 100644
--- a/samples/Compute/v2/images/merge_image_metadata.php
+++ b/samples/compute/v2/servers/update_server.php
@@ -14,8 +14,9 @@
 
 $compute = $openstack->computeV2(['region' => '{region}']);
 
-$image = $compute->getImage(['id' => '{imageId}']);
-
-$image->mergeMetadata([
-    '{key}' => '{value}',
+$server = $compute->getServer([
+    'id' => '{serverId}',
 ]);
+
+$server->name = '{newName}';
+$server->update();
diff --git a/samples/Identity/v2/authentication.php b/samples/identity/v2/authentication.php
similarity index 88%
rename from samples/Identity/v2/authentication.php
rename to samples/identity/v2/authentication.php
index eb03c73d..89cd14d1 100644
--- a/samples/Identity/v2/authentication.php
+++ b/samples/identity/v2/authentication.php
@@ -24,6 +24,8 @@
     'identityService' => Service::factory($httpClient),
 ];
 
+/** @var OpenStack $openstack */
 $openstack = new OpenStack($options);
 
+/** @var \OpenStack\Compute\v2\Models\Server[] $servers */
 $servers = $openstack->computeV2()->listServers();
diff --git a/samples/Identity/v2/generate_token.php b/samples/identity/v2/generate_token.php
similarity index 100%
rename from samples/Identity/v2/generate_token.php
rename to samples/identity/v2/generate_token.php
diff --git a/samples/Identity/v3/credentials/create.php b/samples/identity/v3/credentials/add_cred.php
similarity index 77%
rename from samples/Identity/v3/credentials/create.php
rename to samples/identity/v3/credentials/add_cred.php
index 339f5d8b..76563879 100644
--- a/samples/Identity/v3/credentials/create.php
+++ b/samples/identity/v3/credentials/add_cred.php
@@ -9,9 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $credential = $identity->createCredential([
     'blob'      => '{blob}',
diff --git a/samples/Identity/v3/credentials/delete.php b/samples/identity/v3/credentials/delete_cred.php
similarity index 72%
rename from samples/Identity/v3/credentials/delete.php
rename to samples/identity/v3/credentials/delete_cred.php
index 09b6fe43..6b5bfef3 100644
--- a/samples/Identity/v3/credentials/delete.php
+++ b/samples/identity/v3/credentials/delete_cred.php
@@ -9,9 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $credential = $identity->getCredential('credentialId');
 $credential->delete();
diff --git a/samples/Identity/v3/credentials/read.php b/samples/identity/v3/credentials/get_cred.php
similarity index 60%
rename from samples/Identity/v3/credentials/read.php
rename to samples/identity/v3/credentials/get_cred.php
index c03e8de0..b06ba11c 100644
--- a/samples/Identity/v3/credentials/read.php
+++ b/samples/identity/v3/credentials/get_cred.php
@@ -9,9 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
-$credential = $identity->getCredential('{credentialId}');
+$credential = $identity->getCredential('credentialId');
 $credential->retrieve();
diff --git a/samples/Identity/v3/credentials/list.php b/samples/identity/v3/credentials/list_creds.php
similarity index 75%
rename from samples/Identity/v3/credentials/list.php
rename to samples/identity/v3/credentials/list_creds.php
index 8f8041f9..6ed4a38e 100644
--- a/samples/Identity/v3/credentials/list.php
+++ b/samples/identity/v3/credentials/list_creds.php
@@ -9,9 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listCredentials() as $credential) {
     /** @var $credential \OpenStack\Identity\v3\Models\Credential */
diff --git a/samples/Identity/v3/credentials/update.php b/samples/identity/v3/credentials/update_cred.php
similarity index 53%
rename from samples/Identity/v3/credentials/update.php
rename to samples/identity/v3/credentials/update_cred.php
index c0b603f4..e8fa51b3 100644
--- a/samples/Identity/v3/credentials/update.php
+++ b/samples/identity/v3/credentials/update_cred.php
@@ -9,13 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
-$credential = $identity->getCredential('{credentialId}');
+$credential = $identity->getCredential('credentialId');
 
-$credential->type = '{type}';
-$credential->blob = '{blob}';
+$credential->type = 'foo';
+$credential->blob = 'bar';
 
 $credential->update();
diff --git a/samples/Identity/v3/domains/create.php b/samples/identity/v3/domains/add_domain.php
similarity index 71%
rename from samples/Identity/v3/domains/create.php
rename to samples/identity/v3/domains/add_domain.php
index 4ff25cfe..bd8b5239 100644
--- a/samples/Identity/v3/domains/create.php
+++ b/samples/identity/v3/domains/add_domain.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->createDomain([
     'description' => '{description}',
diff --git a/samples/Identity/v3/domains/check_group_role.php b/samples/identity/v3/domains/check_group_role.php
similarity index 73%
rename from samples/Identity/v3/domains/check_group_role.php
rename to samples/identity/v3/domains/check_group_role.php
index 50ca6dd6..1c96160d 100644
--- a/samples/Identity/v3/domains/check_group_role.php
+++ b/samples/identity/v3/domains/check_group_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/check_user_role.php b/samples/identity/v3/domains/check_user_role.php
similarity index 73%
rename from samples/Identity/v3/domains/check_user_role.php
rename to samples/identity/v3/domains/check_user_role.php
index e2bf4200..4f4b3152 100644
--- a/samples/Identity/v3/domains/check_user_role.php
+++ b/samples/identity/v3/domains/check_user_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/delete.php b/samples/identity/v3/domains/delete_domain.php
similarity index 66%
rename from samples/Identity/v3/domains/delete.php
rename to samples/identity/v3/domains/delete_domain.php
index fd99463b..590aa36d 100644
--- a/samples/Identity/v3/domains/delete.php
+++ b/samples/identity/v3/domains/delete_domain.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 $domain->delete();
diff --git a/samples/Identity/v3/domains/grant_group_role.php b/samples/identity/v3/domains/grant_group_role.php
similarity index 71%
rename from samples/Identity/v3/domains/grant_group_role.php
rename to samples/identity/v3/domains/grant_group_role.php
index 24f0e6b9..af1bc176 100644
--- a/samples/Identity/v3/domains/grant_group_role.php
+++ b/samples/identity/v3/domains/grant_group_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/grant_user_role.php b/samples/identity/v3/domains/grant_user_role.php
similarity index 71%
rename from samples/Identity/v3/domains/grant_user_role.php
rename to samples/identity/v3/domains/grant_user_role.php
index 65592911..c305759e 100644
--- a/samples/Identity/v3/domains/grant_user_role.php
+++ b/samples/identity/v3/domains/grant_user_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/list.php b/samples/identity/v3/domains/list_domains.php
similarity index 65%
rename from samples/Identity/v3/domains/list.php
rename to samples/identity/v3/domains/list_domains.php
index 817c6b26..f971e421 100644
--- a/samples/Identity/v3/domains/list.php
+++ b/samples/identity/v3/domains/list_domains.php
@@ -9,10 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listDomains() as $domain) {
-    /** @var $domain \OpenStack\Identity\v3\Models\Domain */
 }
diff --git a/samples/Identity/v3/domains/list_group_roles.php b/samples/identity/v3/domains/list_group_roles.php
similarity index 70%
rename from samples/Identity/v3/domains/list_group_roles.php
rename to samples/identity/v3/domains/list_group_roles.php
index 58a360ca..b0ed10d8 100644
--- a/samples/Identity/v3/domains/list_group_roles.php
+++ b/samples/identity/v3/domains/list_group_roles.php
@@ -9,12 +9,16 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
 foreach ($domain->listGroupRoles(['groupId' => '{groupId}']) as $role) {
-    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/domains/list_user_roles.php b/samples/identity/v3/domains/list_user_roles.php
similarity index 70%
rename from samples/Identity/v3/domains/list_user_roles.php
rename to samples/identity/v3/domains/list_user_roles.php
index c19d61f7..7d538158 100644
--- a/samples/Identity/v3/domains/list_user_roles.php
+++ b/samples/identity/v3/domains/list_user_roles.php
@@ -9,12 +9,16 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
 foreach ($domain->listUserRoles(['userId' => '{domainUserId}']) as $role) {
-    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/domains/revoke_group_role.php b/samples/identity/v3/domains/revoke_group_role.php
similarity index 71%
rename from samples/Identity/v3/domains/revoke_group_role.php
rename to samples/identity/v3/domains/revoke_group_role.php
index 394834a2..decb28fb 100644
--- a/samples/Identity/v3/domains/revoke_group_role.php
+++ b/samples/identity/v3/domains/revoke_group_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/revoke_user_role.php b/samples/identity/v3/domains/revoke_user_role.php
similarity index 71%
rename from samples/Identity/v3/domains/revoke_user_role.php
rename to samples/identity/v3/domains/revoke_user_role.php
index c109927a..fcc6ca93 100644
--- a/samples/Identity/v3/domains/revoke_user_role.php
+++ b/samples/identity/v3/domains/revoke_user_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/domains/read.php b/samples/identity/v3/domains/show_domain.php
similarity index 66%
rename from samples/Identity/v3/domains/read.php
rename to samples/identity/v3/domains/show_domain.php
index ebd9431e..c84b29d5 100644
--- a/samples/Identity/v3/domains/read.php
+++ b/samples/identity/v3/domains/show_domain.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 $domain->retrieve();
diff --git a/samples/Identity/v3/domains/update.php b/samples/identity/v3/domains/update_domain.php
similarity index 68%
rename from samples/Identity/v3/domains/update.php
rename to samples/identity/v3/domains/update_domain.php
index b3633d9b..97208e19 100644
--- a/samples/Identity/v3/domains/update.php
+++ b/samples/identity/v3/domains/update_domain.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $domain = $identity->getDomain('{domainId}');
 
diff --git a/samples/Identity/v3/endpoints/create.php b/samples/identity/v3/endpoints/add_endpoint.php
similarity index 76%
rename from samples/Identity/v3/endpoints/create.php
rename to samples/identity/v3/endpoints/add_endpoint.php
index 1e774e62..b123bf3f 100644
--- a/samples/Identity/v3/endpoints/create.php
+++ b/samples/identity/v3/endpoints/add_endpoint.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $endpoint = $identity->createEndpoint([
     'interface' => \OpenStack\Identity\v3\Enum::INTERFACE_INTERNAL,
diff --git a/samples/Identity/v3/endpoints/delete.php b/samples/identity/v3/endpoints/delete_endpoint.php
similarity index 67%
rename from samples/Identity/v3/endpoints/delete.php
rename to samples/identity/v3/endpoints/delete_endpoint.php
index b25e469d..56cafda7 100644
--- a/samples/Identity/v3/endpoints/delete.php
+++ b/samples/identity/v3/endpoints/delete_endpoint.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $endpoint = $identity->getEndpoint('{endpointId}');
 $endpoint->delete();
diff --git a/samples/Identity/v3/endpoints/read.php b/samples/identity/v3/endpoints/get_endpoint.php
similarity index 65%
rename from samples/Identity/v3/endpoints/read.php
rename to samples/identity/v3/endpoints/get_endpoint.php
index 05bbc236..9d869360 100644
--- a/samples/Identity/v3/endpoints/read.php
+++ b/samples/identity/v3/endpoints/get_endpoint.php
@@ -9,9 +9,13 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $endpoint = $identity->getEndpoint('{endpointId}');
-$endpoint->retrieve();
diff --git a/samples/Identity/v3/endpoints/list.php b/samples/identity/v3/endpoints/list_endpoints.php
similarity index 65%
rename from samples/Identity/v3/endpoints/list.php
rename to samples/identity/v3/endpoints/list_endpoints.php
index f53612eb..ed466970 100644
--- a/samples/Identity/v3/endpoints/list.php
+++ b/samples/identity/v3/endpoints/list_endpoints.php
@@ -9,10 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listEndpoints() as $endpoint) {
-    /** @var $endpoint \OpenStack\Identity\v3\Models\Endpoint */
 }
diff --git a/samples/Identity/v3/endpoints/update.php b/samples/identity/v3/endpoints/update_endpoint.php
similarity index 71%
rename from samples/Identity/v3/endpoints/update.php
rename to samples/identity/v3/endpoints/update_endpoint.php
index e2fdf73a..c77a0d8a 100644
--- a/samples/Identity/v3/endpoints/update.php
+++ b/samples/identity/v3/endpoints/update_endpoint.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $endpoint = $identity->getEndpoint('{endpointId}');
 
diff --git a/samples/Identity/v3/groups/create.php b/samples/identity/v3/groups/add_group.php
similarity index 69%
rename from samples/Identity/v3/groups/create.php
rename to samples/identity/v3/groups/add_group.php
index 66455bdb..b389a5b6 100644
--- a/samples/Identity/v3/groups/create.php
+++ b/samples/identity/v3/groups/add_group.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->createGroup([
     'description' => '{description}',
diff --git a/samples/Identity/v3/groups/add_user.php b/samples/identity/v3/groups/add_user.php
similarity index 68%
rename from samples/Identity/v3/groups/add_user.php
rename to samples/identity/v3/groups/add_user.php
index 3d8edabb..01c28c71 100644
--- a/samples/Identity/v3/groups/add_user.php
+++ b/samples/identity/v3/groups/add_user.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/groups/check_user_membership.php b/samples/identity/v3/groups/check_user_membership.php
similarity index 53%
rename from samples/Identity/v3/groups/check_user_membership.php
rename to samples/identity/v3/groups/check_user_membership.php
index ba6d76a2..64caabab 100644
--- a/samples/Identity/v3/groups/check_user_membership.php
+++ b/samples/identity/v3/groups/check_user_membership.php
@@ -9,10 +9,18 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->getGroup('{groupId}');
 
-$hasMembership = $group->checkMembership(['userId' => '{groupUserId}']);
+$result = $group->checkMembership(['userId' => '{groupUserId}']);
+
+if (true === $result) {
+}
diff --git a/samples/Identity/v3/groups/delete.php b/samples/identity/v3/groups/delete_group.php
similarity index 66%
rename from samples/Identity/v3/groups/delete.php
rename to samples/identity/v3/groups/delete_group.php
index d29e2012..be29565c 100644
--- a/samples/Identity/v3/groups/delete.php
+++ b/samples/identity/v3/groups/delete_group.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/groups/read.php b/samples/identity/v3/groups/get_group.php
similarity index 66%
rename from samples/Identity/v3/groups/read.php
rename to samples/identity/v3/groups/get_group.php
index b2b3c653..da4d8f0f 100644
--- a/samples/Identity/v3/groups/read.php
+++ b/samples/identity/v3/groups/get_group.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->getGroup('{groupId}');
 $group->retrieve();
diff --git a/samples/Identity/v3/groups/list.php b/samples/identity/v3/groups/list_groups.php
similarity index 65%
rename from samples/Identity/v3/groups/list.php
rename to samples/identity/v3/groups/list_groups.php
index 5d1e038f..f889f3bc 100644
--- a/samples/Identity/v3/groups/list.php
+++ b/samples/identity/v3/groups/list_groups.php
@@ -9,10 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listGroups() as $group) {
-    /** @var $group \OpenStack\Identity\v3\Models\Group */
 }
diff --git a/samples/Identity/v3/groups/list_users.php b/samples/identity/v3/groups/list_users.php
similarity index 68%
rename from samples/Identity/v3/groups/list_users.php
rename to samples/identity/v3/groups/list_users.php
index d1652b2b..0b186c22 100644
--- a/samples/Identity/v3/groups/list_users.php
+++ b/samples/identity/v3/groups/list_users.php
@@ -9,12 +9,16 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->getGroup('{groupId}');
 
 foreach ($group->listUsers() as $user) {
-    /** @var $user \OpenStack\Identity\v3\Models\User */
 }
diff --git a/samples/Identity/v3/groups/remove_user.php b/samples/identity/v3/groups/remove_user.php
similarity index 68%
rename from samples/Identity/v3/groups/remove_user.php
rename to samples/identity/v3/groups/remove_user.php
index b7210ba9..7a975c0c 100644
--- a/samples/Identity/v3/groups/remove_user.php
+++ b/samples/identity/v3/groups/remove_user.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->getGroup('{groupId}');
 
diff --git a/samples/Identity/v3/groups/update.php b/samples/identity/v3/groups/update_group.php
similarity index 59%
rename from samples/Identity/v3/groups/update.php
rename to samples/identity/v3/groups/update_group.php
index 9cfabdfe..ee48d9c6 100644
--- a/samples/Identity/v3/groups/update.php
+++ b/samples/identity/v3/groups/update_group.php
@@ -9,13 +9,18 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $group = $identity->getGroup('{groupId}');
 
-$group->description = '{description}';
-$group->name = '{name}';
+$group->description = 'foo';
+$group->name = 'bar';
 
 $group->update();
diff --git a/samples/Identity/v3/projects/create.php b/samples/identity/v3/projects/add_project.php
similarity index 71%
rename from samples/Identity/v3/projects/create.php
rename to samples/identity/v3/projects/add_project.php
index f6debd3f..0dcd0d25 100644
--- a/samples/Identity/v3/projects/create.php
+++ b/samples/identity/v3/projects/add_project.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->createProject([
     'description' => '{description}',
diff --git a/samples/Identity/v3/projects/check_group_role.php b/samples/identity/v3/projects/check_group_role.php
similarity index 72%
rename from samples/Identity/v3/projects/check_group_role.php
rename to samples/identity/v3/projects/check_group_role.php
index 1f38cd3b..0fc01cd4 100644
--- a/samples/Identity/v3/projects/check_group_role.php
+++ b/samples/identity/v3/projects/check_group_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/check_user_role.php b/samples/identity/v3/projects/check_user_role.php
similarity index 73%
rename from samples/Identity/v3/projects/check_user_role.php
rename to samples/identity/v3/projects/check_user_role.php
index 2d5736ae..2704b406 100644
--- a/samples/Identity/v3/projects/check_user_role.php
+++ b/samples/identity/v3/projects/check_user_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/delete.php b/samples/identity/v3/projects/delete_project.php
similarity index 66%
rename from samples/Identity/v3/projects/delete.php
rename to samples/identity/v3/projects/delete_project.php
index 1401a242..2ce0c387 100644
--- a/samples/Identity/v3/projects/delete.php
+++ b/samples/identity/v3/projects/delete_project.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/read.php b/samples/identity/v3/projects/get_project.php
similarity index 66%
rename from samples/Identity/v3/projects/read.php
rename to samples/identity/v3/projects/get_project.php
index 50d993ea..8e548ade 100644
--- a/samples/Identity/v3/projects/read.php
+++ b/samples/identity/v3/projects/get_project.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 $project->retrieve();
diff --git a/samples/Identity/v3/projects/grant_group_role.php b/samples/identity/v3/projects/grant_group_role.php
similarity index 70%
rename from samples/Identity/v3/projects/grant_group_role.php
rename to samples/identity/v3/projects/grant_group_role.php
index 8fd69fde..8bec285c 100644
--- a/samples/Identity/v3/projects/grant_group_role.php
+++ b/samples/identity/v3/projects/grant_group_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/grant_user_role.php b/samples/identity/v3/projects/grant_user_role.php
similarity index 71%
rename from samples/Identity/v3/projects/grant_user_role.php
rename to samples/identity/v3/projects/grant_user_role.php
index be3721f0..6acb4b74 100644
--- a/samples/Identity/v3/projects/grant_user_role.php
+++ b/samples/identity/v3/projects/grant_user_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/list_group_roles.php b/samples/identity/v3/projects/list_group_roles.php
similarity index 70%
rename from samples/Identity/v3/projects/list_group_roles.php
rename to samples/identity/v3/projects/list_group_roles.php
index ef64004d..dc1e8641 100644
--- a/samples/Identity/v3/projects/list_group_roles.php
+++ b/samples/identity/v3/projects/list_group_roles.php
@@ -9,12 +9,16 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
 foreach ($project->listGroupRoles(['groupId' => '{groupId}']) as $role) {
-    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/projects/list.php b/samples/identity/v3/projects/list_projects.php
similarity index 65%
rename from samples/Identity/v3/projects/list.php
rename to samples/identity/v3/projects/list_projects.php
index 3fc190bf..07890bdf 100644
--- a/samples/Identity/v3/projects/list.php
+++ b/samples/identity/v3/projects/list_projects.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listProjects() as $project) {
 }
diff --git a/samples/Identity/v3/projects/list_user_roles.php b/samples/identity/v3/projects/list_user_roles.php
similarity index 70%
rename from samples/Identity/v3/projects/list_user_roles.php
rename to samples/identity/v3/projects/list_user_roles.php
index d943d978..93efacaa 100644
--- a/samples/Identity/v3/projects/list_user_roles.php
+++ b/samples/identity/v3/projects/list_user_roles.php
@@ -9,12 +9,16 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
 foreach ($project->listUserRoles(['userId' => '{projectUserId}']) as $role) {
-    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/projects/revoke_group_role.php b/samples/identity/v3/projects/revoke_group_role.php
similarity index 70%
rename from samples/Identity/v3/projects/revoke_group_role.php
rename to samples/identity/v3/projects/revoke_group_role.php
index 85e13597..8011a3e5 100644
--- a/samples/Identity/v3/projects/revoke_group_role.php
+++ b/samples/identity/v3/projects/revoke_group_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/revoke_user_role.php b/samples/identity/v3/projects/revoke_user_role.php
similarity index 71%
rename from samples/Identity/v3/projects/revoke_user_role.php
rename to samples/identity/v3/projects/revoke_user_role.php
index b8d4c390..cd910562 100644
--- a/samples/Identity/v3/projects/revoke_user_role.php
+++ b/samples/identity/v3/projects/revoke_user_role.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/projects/update.php b/samples/identity/v3/projects/update_project.php
similarity index 68%
rename from samples/Identity/v3/projects/update.php
rename to samples/identity/v3/projects/update_project.php
index d35b9de6..862185bb 100644
--- a/samples/Identity/v3/projects/update.php
+++ b/samples/identity/v3/projects/update_project.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $project = $identity->getProject('{id}');
 
diff --git a/samples/Identity/v3/roles/create.php b/samples/identity/v3/roles/add_role.php
similarity index 78%
rename from samples/Identity/v3/roles/create.php
rename to samples/identity/v3/roles/add_role.php
index bf82ec08..41a759d1 100644
--- a/samples/Identity/v3/roles/create.php
+++ b/samples/identity/v3/roles/add_role.php
@@ -9,6 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/roles/list_assignments.php b/samples/identity/v3/roles/list_assignments.php
similarity index 78%
rename from samples/Identity/v3/roles/list_assignments.php
rename to samples/identity/v3/roles/list_assignments.php
index 9b929804..74279e6b 100644
--- a/samples/Identity/v3/roles/list_assignments.php
+++ b/samples/identity/v3/roles/list_assignments.php
@@ -9,10 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
 
 foreach ($identity->listRoleAssignments() as $assignment) {
-    /** @var $assignment \OpenStack\Identity\v3\Models\Assignment */
 }
diff --git a/samples/Identity/v3/roles/list.php b/samples/identity/v3/roles/list_roles.php
similarity index 78%
rename from samples/Identity/v3/roles/list.php
rename to samples/identity/v3/roles/list_roles.php
index 22e650c8..4036c270 100644
--- a/samples/Identity/v3/roles/list.php
+++ b/samples/identity/v3/roles/list_roles.php
@@ -9,10 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
 
 foreach ($identity->listRoles() as $role) {
-    /** @var $role \OpenStack\Identity\v3\Models\Role */
 }
diff --git a/samples/Identity/v3/services/create.php b/samples/identity/v3/services/add_service.php
similarity index 69%
rename from samples/Identity/v3/services/create.php
rename to samples/identity/v3/services/add_service.php
index f4d24a69..ac4a5c36 100644
--- a/samples/Identity/v3/services/create.php
+++ b/samples/identity/v3/services/add_service.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $service = $identity->createService([
     'name' => '{serviceName}',
diff --git a/samples/Identity/v3/services/delete.php b/samples/identity/v3/services/delete_service.php
similarity index 66%
rename from samples/Identity/v3/services/delete.php
rename to samples/identity/v3/services/delete_service.php
index d5c01a1d..cdd62f45 100644
--- a/samples/Identity/v3/services/delete.php
+++ b/samples/identity/v3/services/delete_service.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $service = $identity->getService('{serviceId}');
 $service->delete();
diff --git a/samples/Identity/v3/services/read.php b/samples/identity/v3/services/get_service.php
similarity index 65%
rename from samples/Identity/v3/services/read.php
rename to samples/identity/v3/services/get_service.php
index 65d59493..1b8991a6 100644
--- a/samples/Identity/v3/services/read.php
+++ b/samples/identity/v3/services/get_service.php
@@ -9,9 +9,13 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $service = $identity->getService('{serviceId}');
-$service->retrieve();
diff --git a/samples/Identity/v3/services/list.php b/samples/identity/v3/services/list_services.php
similarity index 65%
rename from samples/Identity/v3/services/list.php
rename to samples/identity/v3/services/list_services.php
index e506411f..f72c22cf 100644
--- a/samples/Identity/v3/services/list.php
+++ b/samples/identity/v3/services/list_services.php
@@ -9,10 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 foreach ($identity->listServices() as $service) {
-    /** @var $service \OpenStack\Identity\v3\Models\Service */
 }
diff --git a/samples/Identity/v3/services/update.php b/samples/identity/v3/services/update_service.php
similarity index 69%
rename from samples/Identity/v3/services/update.php
rename to samples/identity/v3/services/update_service.php
index 26af68f0..600c80fd 100644
--- a/samples/Identity/v3/services/update.php
+++ b/samples/identity/v3/services/update_service.php
@@ -9,9 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $service = $identity->getService('{serviceId}');
 
diff --git a/samples/Identity/v3/tokens/export_authentication_token.php b/samples/identity/v3/tokens/export_authentication_token.php
similarity index 92%
rename from samples/Identity/v3/tokens/export_authentication_token.php
rename to samples/identity/v3/tokens/export_authentication_token.php
index 818152ed..995a6430 100644
--- a/samples/Identity/v3/tokens/export_authentication_token.php
+++ b/samples/identity/v3/tokens/export_authentication_token.php
@@ -10,6 +10,9 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ];
 
 $openstack = new OpenStack\OpenStack($params);
diff --git a/samples/Identity/v3/tokens/generate_token_from_id.php b/samples/identity/v3/tokens/generate_token_from_id.php
similarity index 81%
rename from samples/Identity/v3/tokens/generate_token_from_id.php
rename to samples/identity/v3/tokens/generate_token_from_id.php
index b25096f2..38821c68 100644
--- a/samples/Identity/v3/tokens/generate_token_from_id.php
+++ b/samples/identity/v3/tokens/generate_token_from_id.php
@@ -9,6 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php b/samples/identity/v3/tokens/generate_token_scoped_to_project_id.php
similarity index 87%
rename from samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php
rename to samples/identity/v3/tokens/generate_token_scoped_to_project_id.php
index 15960c8a..7cfed1d2 100644
--- a/samples/Identity/v3/tokens/generate_token_scoped_to_project_id.php
+++ b/samples/identity/v3/tokens/generate_token_scoped_to_project_id.php
@@ -9,6 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php b/samples/identity/v3/tokens/generate_token_scoped_to_project_name.php
similarity index 66%
rename from samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php
rename to samples/identity/v3/tokens/generate_token_scoped_to_project_name.php
index 78476941..5b84a1b1 100644
--- a/samples/Identity/v3/tokens/generate_token_scoped_to_project_name.php
+++ b/samples/identity/v3/tokens/generate_token_scoped_to_project_name.php
@@ -9,10 +9,17 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ]);
 
 $identity = $openstack->identityV3();
 
+// Since project names will not be unique across an entire OpenStack installation,
+// when authenticating with them you must also provide your domain ID. You do
+// not have to do this if you authenticate with a project ID.
+
 $token = $identity->generateToken([
     'user' => [
         'id'       => '{userId}',
diff --git a/samples/Identity/v3/tokens/generate_token_with_user_id.php b/samples/identity/v3/tokens/generate_token_with_user_id.php
similarity index 85%
rename from samples/Identity/v3/tokens/generate_token_with_user_id.php
rename to samples/identity/v3/tokens/generate_token_with_user_id.php
index 71969741..0a0b475c 100644
--- a/samples/Identity/v3/tokens/generate_token_with_user_id.php
+++ b/samples/identity/v3/tokens/generate_token_with_user_id.php
@@ -9,6 +9,9 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/tokens/generate_token_with_username.php b/samples/identity/v3/tokens/generate_token_with_username.php
similarity index 64%
rename from samples/Identity/v3/tokens/generate_token_with_username.php
rename to samples/identity/v3/tokens/generate_token_with_username.php
index ceb07143..cbab6dd5 100644
--- a/samples/Identity/v3/tokens/generate_token_with_username.php
+++ b/samples/identity/v3/tokens/generate_token_with_username.php
@@ -10,10 +10,17 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ]);
 
 $identity = $openstack->identityV3();
 
+// Since usernames will not be unique across an entire OpenStack installation,
+// when authenticating with them you must also provide your domain ID. You do
+// not have to do this if you authenticate with a user ID.
+
 $token = $identity->generateToken([
     'user' => [
         'name'     => '{username}',
diff --git a/samples/Identity/v3/tokens/revoke_token.php b/samples/identity/v3/tokens/revoke_token.php
similarity index 71%
rename from samples/Identity/v3/tokens/revoke_token.php
rename to samples/identity/v3/tokens/revoke_token.php
index de8f9675..e25882c9 100644
--- a/samples/Identity/v3/tokens/revoke_token.php
+++ b/samples/identity/v3/tokens/revoke_token.php
@@ -10,8 +10,11 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $identity->revokeToken('{tokenId}');
diff --git a/samples/Identity/v3/tokens/use_cached_authentication_token.php b/samples/identity/v3/tokens/use_cached_authentication_token.php
similarity index 89%
rename from samples/Identity/v3/tokens/use_cached_authentication_token.php
rename to samples/identity/v3/tokens/use_cached_authentication_token.php
index 464d476d..ddc40a73 100644
--- a/samples/Identity/v3/tokens/use_cached_authentication_token.php
+++ b/samples/identity/v3/tokens/use_cached_authentication_token.php
@@ -10,6 +10,9 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ];
 
 $token = json_decode(file_get_contents('token.json'), true);
diff --git a/samples/Identity/v3/tokens/validate_token.php b/samples/identity/v3/tokens/validate_token.php
similarity index 74%
rename from samples/Identity/v3/tokens/validate_token.php
rename to samples/identity/v3/tokens/validate_token.php
index ef9dcb59..7302d965 100644
--- a/samples/Identity/v3/tokens/validate_token.php
+++ b/samples/identity/v3/tokens/validate_token.php
@@ -10,9 +10,12 @@
         'password' => '{password}',
         'domain'   => ['id' => '{domainId}']
     ],
+    'scope' => [
+        'project' => ['id' => '{projectId}']
+    ]
 ]);
 
-$identity = $openstack->identityV3();
+$identity = $openstack->identityV3(['region' => '{region}']);
 
 $result = $identity->validateToken('{tokenId}');
 
diff --git a/samples/Identity/v3/users/create.php b/samples/identity/v3/users/add_user.php
similarity index 91%
rename from samples/Identity/v3/users/create.php
rename to samples/identity/v3/users/add_user.php
index 38a066e0..892e67c7 100644
--- a/samples/Identity/v3/users/create.php
+++ b/samples/identity/v3/users/add_user.php
@@ -9,6 +9,7 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/delete.php b/samples/identity/v3/users/delete_user.php
similarity index 78%
rename from samples/Identity/v3/users/delete.php
rename to samples/identity/v3/users/delete_user.php
index 715a7a09..3dc90d20 100644
--- a/samples/Identity/v3/users/delete.php
+++ b/samples/identity/v3/users/delete_user.php
@@ -9,6 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/read.php b/samples/identity/v3/users/get_user.php
similarity index 78%
rename from samples/Identity/v3/users/read.php
rename to samples/identity/v3/users/get_user.php
index 432da367..df4924b4 100644
--- a/samples/Identity/v3/users/read.php
+++ b/samples/identity/v3/users/get_user.php
@@ -9,6 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Identity/v3/users/list_groups.php b/samples/identity/v3/users/list_groups.php
similarity index 79%
rename from samples/Identity/v3/users/list_groups.php
rename to samples/identity/v3/users/list_groups.php
index f2156d8e..5ec919ed 100644
--- a/samples/Identity/v3/users/list_groups.php
+++ b/samples/identity/v3/users/list_groups.php
@@ -9,6 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
@@ -16,5 +21,4 @@
 $user = $identity->getUser('{id}');
 
 foreach ($user->listGroups() as $group) {
-    /** @var $group \OpenStack\Identity\v3\Models\Group */
 }
diff --git a/samples/Identity/v3/users/list_projects.php b/samples/identity/v3/users/list_projects.php
similarity index 80%
rename from samples/Identity/v3/users/list_projects.php
rename to samples/identity/v3/users/list_projects.php
index edae2e9d..7f665325 100644
--- a/samples/Identity/v3/users/list_projects.php
+++ b/samples/identity/v3/users/list_projects.php
@@ -9,6 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
@@ -16,5 +21,4 @@
 $user = $identity->getUser('{id}');
 
 foreach ($user->listProjects() as $project) {
-    /** @var $project \OpenStack\Identity\v3\Models\Project */
 }
diff --git a/samples/Identity/v3/users/list.php b/samples/identity/v3/users/list_users.php
similarity index 78%
rename from samples/Identity/v3/users/list.php
rename to samples/identity/v3/users/list_users.php
index a52becd9..340255db 100644
--- a/samples/Identity/v3/users/list.php
+++ b/samples/identity/v3/users/list_users.php
@@ -9,10 +9,14 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
 
 foreach ($identity->listUsers() as $user) {
-    /** @var $user \OpenStack\Identity\v3\Models\User */
 }
diff --git a/samples/Identity/v3/users/update.php b/samples/identity/v3/users/update_user.php
similarity index 81%
rename from samples/Identity/v3/users/update.php
rename to samples/identity/v3/users/update_user.php
index 0bb3af76..2c4dc2b5 100644
--- a/samples/Identity/v3/users/update.php
+++ b/samples/identity/v3/users/update_user.php
@@ -9,6 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
 $identity = $openstack->identityV3();
diff --git a/samples/Images/v2/images/create.php b/samples/images/v2/images/create.php
similarity index 70%
rename from samples/Images/v2/images/create.php
rename to samples/images/v2/images/create.php
index 501760a1..73ebf40f 100644
--- a/samples/Images/v2/images/create.php
+++ b/samples/images/v2/images/create.php
@@ -5,10 +5,8 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->imagesV2();
@@ -20,8 +18,6 @@
     'diskFormat'      => '{diskFormat}',
     'visibility'      => '{visibility}',
     'minDisk'         => 10,
-    'protected'       => false,
+    'protected'       => true,
     'minRam'          => 10,
 ]);
-
-$image->uploadData(\GuzzleHttp\Psr7\Utils::streamFor('fake-image.img'));
\ No newline at end of file
diff --git a/samples/Images/v2/images/deactivate.php b/samples/images/v2/images/deactivate.php
similarity index 66%
rename from samples/Images/v2/images/deactivate.php
rename to samples/images/v2/images/deactivate.php
index 6b973551..fd604d64 100644
--- a/samples/Images/v2/images/deactivate.php
+++ b/samples/images/v2/images/deactivate.php
@@ -5,10 +5,8 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/images/v2/images/delete.php b/samples/images/v2/images/delete.php
new file mode 100644
index 00000000..69b48eb6
--- /dev/null
+++ b/samples/images/v2/images/delete.php
@@ -0,0 +1,14 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->imagesV2()
+    ->getImage('{imageId}')
+    ->delete();
diff --git a/samples/Images/v2/images/download_binary_data.php b/samples/images/v2/images/download_binary_data.php
similarity index 60%
rename from samples/Images/v2/images/download_binary_data.php
rename to samples/images/v2/images/download_binary_data.php
index 20a4a69d..74f434ef 100644
--- a/samples/Images/v2/images/download_binary_data.php
+++ b/samples/images/v2/images/download_binary_data.php
@@ -5,14 +5,13 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->imagesV2();
 
 $image  = $service->getImage('{imageId}');
 
+/** @var \GuzzleHttp\Psr7\Stream $stream */
 $stream = $image->downloadData();
diff --git a/samples/Images/v2/images/delete.php b/samples/images/v2/images/get.php
similarity index 64%
rename from samples/Images/v2/images/delete.php
rename to samples/images/v2/images/get.php
index 8a2f31c8..98c95671 100644
--- a/samples/Images/v2/images/delete.php
+++ b/samples/images/v2/images/get.php
@@ -5,13 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->imagesV2();
 
 $image = $service->getImage('{imageId}');
-$image->delete();
diff --git a/samples/images/v2/images/list.php b/samples/images/v2/images/list.php
new file mode 100644
index 00000000..0173cf32
--- /dev/null
+++ b/samples/images/v2/images/list.php
@@ -0,0 +1,16 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$images = $openstack->imagesV2()
+                    ->listImages();
+
+foreach ($images as $image) {
+}
diff --git a/samples/Images/v2/images/reactivate.php b/samples/images/v2/images/reactivate.php
similarity index 66%
rename from samples/Images/v2/images/reactivate.php
rename to samples/images/v2/images/reactivate.php
index f37c3e93..3b7730c1 100644
--- a/samples/Images/v2/images/reactivate.php
+++ b/samples/images/v2/images/reactivate.php
@@ -5,10 +5,8 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/Images/v2/images/update.php b/samples/images/v2/images/update.php
similarity index 75%
rename from samples/Images/v2/images/update.php
rename to samples/images/v2/images/update.php
index dcb86537..0778bcae 100644
--- a/samples/Images/v2/images/update.php
+++ b/samples/images/v2/images/update.php
@@ -5,10 +5,8 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->imagesV2();
diff --git a/samples/images/v2/images/upload_binary_data.php b/samples/images/v2/images/upload_binary_data.php
new file mode 100644
index 00000000..fc42e6ff
--- /dev/null
+++ b/samples/images/v2/images/upload_binary_data.php
@@ -0,0 +1,16 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$service = $openstack->imagesV2();
+
+$image  = $service->getImage('{imageId}');
+$stream = \GuzzleHttp\Psr7\stream_for(fopen('{fileName}', 'r'));
+$image->uploadData($stream);
diff --git a/samples/images/v2/members/add.php b/samples/images/v2/members/add.php
new file mode 100644
index 00000000..f8226ffa
--- /dev/null
+++ b/samples/images/v2/members/add.php
@@ -0,0 +1,14 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$member = $openstack->imagesV2()
+                    ->getImage('{imageId}')
+                    ->addMember('{tenantId}');
diff --git a/samples/images/v2/members/delete.php b/samples/images/v2/members/delete.php
new file mode 100644
index 00000000..19723b08
--- /dev/null
+++ b/samples/images/v2/members/delete.php
@@ -0,0 +1,15 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->imagesV2()
+          ->getImage('{imageId}')
+          ->getMember('{tenantId}')
+          ->delete();
diff --git a/samples/images/v2/members/get.php b/samples/images/v2/members/get.php
new file mode 100644
index 00000000..f824ead0
--- /dev/null
+++ b/samples/images/v2/members/get.php
@@ -0,0 +1,14 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$member = $openstack->imagesV2()
+                    ->getImage('{imageId}')
+                    ->getMember('{tenantId}');
diff --git a/samples/images/v2/members/list.php b/samples/images/v2/members/list.php
new file mode 100644
index 00000000..fb14aa8e
--- /dev/null
+++ b/samples/images/v2/members/list.php
@@ -0,0 +1,16 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$image = $openstack->imagesV2()
+                   ->getImage('{imageId}');
+
+foreach ($image->listMembers() as $member) {
+}
diff --git a/samples/images/v2/members/update_status.php b/samples/images/v2/members/update_status.php
new file mode 100644
index 00000000..01ea9091
--- /dev/null
+++ b/samples/images/v2/members/update_status.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+use OpenStack\Images\v2\Models\Member;
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->imagesV2()
+    ->getImage('{imageId}')
+    ->getMember('{tenantId}')
+    ->updateStatus(Member::STATUS_ACCEPTED);
diff --git a/samples/Networking/v2/floatingIPs/create.php b/samples/networking/v2/floatingIPs/create.php
similarity index 64%
rename from samples/Networking/v2/floatingIPs/create.php
rename to samples/networking/v2/floatingIPs/create.php
index 410640e6..1ec2628c 100644
--- a/samples/Networking/v2/floatingIPs/create.php
+++ b/samples/networking/v2/floatingIPs/create.php
@@ -12,11 +12,11 @@
     'scope'   => ['project' => ['id' => '{projectId}']],
 ]);
 
-$networking = $openstack->networkingV2();
+$networking = $openstack->networkingV2ExtLayer3();
 
-$floatingIp = $networking->createFloatingIp([
+/** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $ip */
+$ip = $networking->createFloatingIp([
     "floatingNetworkId" => "{networkId}",
     "portId"            => "{portId}",
-    "fixedIpAddress"    => "{fixedIpAddress}",
-    "description"       => "{description}",
+    'fixedIpAddress'    => '{fixedIpAddress}',
 ]);
diff --git a/samples/networking/v2/floatingIPs/delete.php b/samples/networking/v2/floatingIPs/delete.php
new file mode 100644
index 00000000..6accb015
--- /dev/null
+++ b/samples/networking/v2/floatingIPs/delete.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->networkingV2ExtLayer3()
+          ->getFloatingIp('{id}')
+          ->delete();
diff --git a/samples/networking/v2/floatingIPs/get.php b/samples/networking/v2/floatingIPs/get.php
new file mode 100644
index 00000000..54ff62ca
--- /dev/null
+++ b/samples/networking/v2/floatingIPs/get.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => ['project' => ['id' => '{projectId}']]
+]);
+
+/** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $ip */
+$ip = $openstack->networkingV2ExtLayer3()
+                ->getFloatingIp('{id}');
diff --git a/samples/Networking/v2/floatingIPs/list.php b/samples/networking/v2/floatingIPs/list.php
similarity index 64%
rename from samples/Networking/v2/floatingIPs/list.php
rename to samples/networking/v2/floatingIPs/list.php
index 498d064a..da87c819 100644
--- a/samples/Networking/v2/floatingIPs/list.php
+++ b/samples/networking/v2/floatingIPs/list.php
@@ -7,13 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
+    'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$floatingIps = $openstack->networkingV2()
-    ->listFloatingIps();
+$floatingIps = $openstack->networkingV2ExtLayer3()
+                         ->listFloatingIps();
 
 foreach ($floatingIps as $floatingIp) {
     /** @var \OpenStack\Networking\v2\Extensions\Layer3\Models\FloatingIp $floatingIp */
diff --git a/samples/Networking/v2/floatingIPs/update.php b/samples/networking/v2/floatingIPs/update.php
similarity index 58%
rename from samples/Networking/v2/floatingIPs/update.php
rename to samples/networking/v2/floatingIPs/update.php
index e7bba62e..9698d30d 100644
--- a/samples/Networking/v2/floatingIPs/update.php
+++ b/samples/networking/v2/floatingIPs/update.php
@@ -7,13 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
-    'scope'   => ['project' => ['id' => '{projectId}']],
+    'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$floatingIp = $openstack->networkingV2()
-    ->getFloatingIp('{id}');
+$floatingIp = $openstack->networkingV2ExtLayer3()
+                        ->getFloatingIp('{id}');
 
 $floatingIp->portId = '{newPortId}';
 $floatingIp->update();
diff --git a/samples/Networking/v2/lbaas/healthmonitors/create.php b/samples/networking/v2/lbaas/healthmonitors/create.php
similarity index 100%
rename from samples/Networking/v2/lbaas/healthmonitors/create.php
rename to samples/networking/v2/lbaas/healthmonitors/create.php
diff --git a/samples/Networking/v2/lbaas/healthmonitors/delete.php b/samples/networking/v2/lbaas/healthmonitors/delete.php
similarity index 100%
rename from samples/Networking/v2/lbaas/healthmonitors/delete.php
rename to samples/networking/v2/lbaas/healthmonitors/delete.php
diff --git a/samples/networking/v2/lbaas/healthmonitors/get.php b/samples/networking/v2/lbaas/healthmonitors/get.php
new file mode 100644
index 00000000..1b848062
--- /dev/null
+++ b/samples/networking/v2/lbaas/healthmonitors/get.php
@@ -0,0 +1,23 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$networking = $openstack->networkingV2();
+
+// Get the health monitor
+$healthmonitor = $networking->getLoadBalancerHealthMonitor('{healthmonitorId}');
+$healthmonitor->retrieve();
diff --git a/samples/Networking/v2/lbaas/healthmonitors/list.php b/samples/networking/v2/lbaas/healthmonitors/list.php
similarity index 100%
rename from samples/Networking/v2/lbaas/healthmonitors/list.php
rename to samples/networking/v2/lbaas/healthmonitors/list.php
diff --git a/samples/Networking/v2/lbaas/healthmonitors/update.php b/samples/networking/v2/lbaas/healthmonitors/update.php
similarity index 100%
rename from samples/Networking/v2/lbaas/healthmonitors/update.php
rename to samples/networking/v2/lbaas/healthmonitors/update.php
diff --git a/samples/Networking/v2/lbaas/listeners/create.php b/samples/networking/v2/lbaas/listeners/create.php
similarity index 100%
rename from samples/Networking/v2/lbaas/listeners/create.php
rename to samples/networking/v2/lbaas/listeners/create.php
diff --git a/samples/Networking/v2/lbaas/listeners/delete.php b/samples/networking/v2/lbaas/listeners/delete.php
similarity index 100%
rename from samples/Networking/v2/lbaas/listeners/delete.php
rename to samples/networking/v2/lbaas/listeners/delete.php
diff --git a/samples/Networking/v2/lbaas/listeners/read.php b/samples/networking/v2/lbaas/listeners/get.php
similarity index 54%
rename from samples/Networking/v2/lbaas/listeners/read.php
rename to samples/networking/v2/lbaas/listeners/get.php
index cba83f94..7c9b4305 100644
--- a/samples/Networking/v2/lbaas/listeners/read.php
+++ b/samples/networking/v2/lbaas/listeners/get.php
@@ -9,9 +9,15 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$service = $openstack->networkingV2();
-$listener = $service->getLoadBalancerListener('{listenerId}');
+$networking = $openstack->networkingV2();
 
+// Get the listener
+$listener = $networking->getLoadBalancerListener('{listenerId}');
 $listener->retrieve();
diff --git a/samples/Networking/v2/lbaas/listeners/list.php b/samples/networking/v2/lbaas/listeners/list.php
similarity index 100%
rename from samples/Networking/v2/lbaas/listeners/list.php
rename to samples/networking/v2/lbaas/listeners/list.php
diff --git a/samples/Networking/v2/lbaas/listeners/update.php b/samples/networking/v2/lbaas/listeners/update.php
similarity index 100%
rename from samples/Networking/v2/lbaas/listeners/update.php
rename to samples/networking/v2/lbaas/listeners/update.php
diff --git a/samples/Networking/v2/lbaas/loadbalancers/add_listener.php b/samples/networking/v2/lbaas/loadbalancers/add_listener.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/add_listener.php
rename to samples/networking/v2/lbaas/loadbalancers/add_listener.php
diff --git a/samples/Networking/v2/lbaas/loadbalancers/create.php b/samples/networking/v2/lbaas/loadbalancers/create.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/create.php
rename to samples/networking/v2/lbaas/loadbalancers/create.php
diff --git a/samples/Networking/v2/lbaas/loadbalancers/delete.php b/samples/networking/v2/lbaas/loadbalancers/delete.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/delete.php
rename to samples/networking/v2/lbaas/loadbalancers/delete.php
diff --git a/samples/Networking/v2/lbaas/loadbalancers/read.php b/samples/networking/v2/lbaas/loadbalancers/get.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/read.php
rename to samples/networking/v2/lbaas/loadbalancers/get.php
diff --git a/samples/Networking/v2/lbaas/loadbalancers/get_stats.php b/samples/networking/v2/lbaas/loadbalancers/get_stats.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/get_stats.php
rename to samples/networking/v2/lbaas/loadbalancers/get_stats.php
diff --git a/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php b/samples/networking/v2/lbaas/loadbalancers/get_statuses.php
similarity index 89%
rename from samples/Networking/v2/lbaas/loadbalancers/get_statuses.php
rename to samples/networking/v2/lbaas/loadbalancers/get_statuses.php
index 40e3132e..cd4c165d 100644
--- a/samples/Networking/v2/lbaas/loadbalancers/get_statuses.php
+++ b/samples/networking/v2/lbaas/loadbalancers/get_statuses.php
@@ -18,6 +18,7 @@
 
 $networking = $openstack->networkingV2();
 
+// Get the loadbalancer
 $lb = $networking->getLoadBalancer('{loadbalancerId}');
 
-$status = $lb->getStatuses();
+$stats = $lb->getStats();
diff --git a/samples/Networking/v2/lbaas/loadbalancers/list.php b/samples/networking/v2/lbaas/loadbalancers/list.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/list.php
rename to samples/networking/v2/lbaas/loadbalancers/list.php
diff --git a/samples/Networking/v2/lbaas/loadbalancers/update.php b/samples/networking/v2/lbaas/loadbalancers/update.php
similarity index 100%
rename from samples/Networking/v2/lbaas/loadbalancers/update.php
rename to samples/networking/v2/lbaas/loadbalancers/update.php
diff --git a/samples/Networking/v2/lbaas/pools/add-healthmonitor.php b/samples/networking/v2/lbaas/pools/add-healthmonitor.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/add-healthmonitor.php
rename to samples/networking/v2/lbaas/pools/add-healthmonitor.php
diff --git a/samples/Networking/v2/lbaas/pools/add-member.php b/samples/networking/v2/lbaas/pools/add-member.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/add-member.php
rename to samples/networking/v2/lbaas/pools/add-member.php
diff --git a/samples/Networking/v2/lbaas/pools/create.php b/samples/networking/v2/lbaas/pools/create.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/create.php
rename to samples/networking/v2/lbaas/pools/create.php
diff --git a/samples/Networking/v2/lbaas/pools/delete-member.php b/samples/networking/v2/lbaas/pools/delete-member.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/delete-member.php
rename to samples/networking/v2/lbaas/pools/delete-member.php
diff --git a/samples/Networking/v2/lbaas/pools/delete.php b/samples/networking/v2/lbaas/pools/delete.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/delete.php
rename to samples/networking/v2/lbaas/pools/delete.php
diff --git a/samples/Networking/v2/lbaas/pools/get-member.php b/samples/networking/v2/lbaas/pools/get-member.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/get-member.php
rename to samples/networking/v2/lbaas/pools/get-member.php
diff --git a/samples/Networking/v2/lbaas/pools/read.php b/samples/networking/v2/lbaas/pools/get.php
similarity index 59%
rename from samples/Networking/v2/lbaas/pools/read.php
rename to samples/networking/v2/lbaas/pools/get.php
index 8c48db7f..734336a8 100644
--- a/samples/Networking/v2/lbaas/pools/read.php
+++ b/samples/networking/v2/lbaas/pools/get.php
@@ -9,10 +9,15 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$read = $openstack->networkingV2();
+$networking = $openstack->networkingV2();
 
 // Get the pool
-$pool = $read->getLoadBalancerPool('{poolId}');
+$pool = $networking->getLoadBalancerPool('{poolId}');
 $pool->retrieve();
diff --git a/samples/Networking/v2/lbaas/pools/list.php b/samples/networking/v2/lbaas/pools/list.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/list.php
rename to samples/networking/v2/lbaas/pools/list.php
diff --git a/samples/Networking/v2/lbaas/pools/update.php b/samples/networking/v2/lbaas/pools/update.php
similarity index 100%
rename from samples/Networking/v2/lbaas/pools/update.php
rename to samples/networking/v2/lbaas/pools/update.php
diff --git a/samples/Networking/v2/networks/create.php b/samples/networking/v2/networks/create.php
similarity index 51%
rename from samples/Networking/v2/networks/create.php
rename to samples/networking/v2/networks/create.php
index e6632053..5b794822 100644
--- a/samples/Networking/v2/networks/create.php
+++ b/samples/networking/v2/networks/create.php
@@ -7,12 +7,21 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope'   => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$service = $openstack->networkingV2();
-$network = $service->createNetwork([
+$networking = $openstack->networkingV2();
+
+$options = [
     'name'         => '{networkName}',
     'adminStateUp' => true,
-]);
+];
+
+// Create the network
+$network = $networking->createNetwork($options);
diff --git a/samples/networking/v2/networks/create_batch.php b/samples/networking/v2/networks/create_batch.php
new file mode 100644
index 00000000..4f499f8b
--- /dev/null
+++ b/samples/networking/v2/networks/create_batch.php
@@ -0,0 +1,30 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$networking = $openstack->networkingV2();
+
+$options = [
+    [
+      'name' => '{networkName1}'
+    ],
+    [
+      'name' => '{networkName2}'
+    ],
+];
+
+$networks = $networking->createNetworks($options);
diff --git a/samples/Networking/v2/networks/delete.php b/samples/networking/v2/networks/delete.php
similarity index 58%
rename from samples/Networking/v2/networks/delete.php
rename to samples/networking/v2/networks/delete.php
index 3965aa15..87325d91 100644
--- a/samples/Networking/v2/networks/delete.php
+++ b/samples/networking/v2/networks/delete.php
@@ -9,9 +9,15 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$service = $openstack->networkingV2();
-$network = $service->getNetwork('{networkId}');
+$networking = $openstack->networkingV2();
+
+$network = $networking->getNetwork('{networkId}');
 
 $network->delete();
diff --git a/samples/networking/v2/networks/get.php b/samples/networking/v2/networks/get.php
new file mode 100644
index 00000000..bda39d2d
--- /dev/null
+++ b/samples/networking/v2/networks/get.php
@@ -0,0 +1,28 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$networking = $openstack->networkingV2();
+
+$network = $networking->getNetwork('{networkId}');
+
+// By default, this will return an empty Network object and NOT hit the API.
+// This is convenient for when you want to use the object for operations
+// that do not require an initial GET request. To retrieve the network's details,
+// run the following, which *will* call the API with a GET request:
+
+$network->retrieve();
diff --git a/samples/Networking/v2/networks/update.php b/samples/networking/v2/networks/update.php
similarity index 61%
rename from samples/Networking/v2/networks/update.php
rename to samples/networking/v2/networks/update.php
index 06c03cbb..01e9422c 100644
--- a/samples/Networking/v2/networks/update.php
+++ b/samples/networking/v2/networks/update.php
@@ -9,10 +9,16 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$service = $openstack->networkingV2();
-$network = $service->getNetwork('{networkId}');
+$networking = $openstack->networkingV2();
+
+$network = $networking->getNetwork('{networkId}');
 
 $network->name = '{newName}';
 $network->update();
diff --git a/samples/networking/v2/ports/create.php b/samples/networking/v2/ports/create.php
new file mode 100644
index 00000000..69635ed1
--- /dev/null
+++ b/samples/networking/v2/ports/create.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$networking = $openstack->networkingV2();
+
+$port = $networking->createPort([
+    'name'         => 'portName',
+    'networkId'    => '{networkId}',
+    'adminStateUp' => true
+]);
diff --git a/samples/networking/v2/ports/create_batch.php b/samples/networking/v2/ports/create_batch.php
new file mode 100644
index 00000000..66970388
--- /dev/null
+++ b/samples/networking/v2/ports/create_batch.php
@@ -0,0 +1,25 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$networking = $openstack->networkingV2();
+
+$ports = $networking->createPorts([
+    [
+        'name'         => 'port1',
+        'networkId'    => '{networkId}',
+        'adminStateUp' => true
+    ],
+    [
+        'name'         => 'port2',
+        'networkId'    => '{networkId}',
+        'adminStateUp' => true
+    ],
+]);
diff --git a/samples/Networking/v2/ports/create_with_fixed_ips.php b/samples/networking/v2/ports/create_with_fixed_ips.php
similarity index 61%
rename from samples/Networking/v2/ports/create_with_fixed_ips.php
rename to samples/networking/v2/ports/create_with_fixed_ips.php
index 4d96884f..921bf1b6 100644
--- a/samples/Networking/v2/ports/create_with_fixed_ips.php
+++ b/samples/networking/v2/ports/create_with_fixed_ips.php
@@ -5,16 +5,14 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id' => '{userId}',
-        'password' => '{password}'
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->networkingV2();
+$networking = $openstack->networkingV2();
 
-$port = $service->createPort([
-    'name'         => '{portName}',
+$port = $networking->createPort([
+    'name'         => 'portName',
     'networkId'    => '{networkId}',
     'adminStateUp' => true,
     'fixedIps' => [
diff --git a/samples/networking/v2/ports/delete.php b/samples/networking/v2/ports/delete.php
new file mode 100644
index 00000000..5c8f338d
--- /dev/null
+++ b/samples/networking/v2/ports/delete.php
@@ -0,0 +1,15 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$networking = $openstack->networkingV2();
+
+$port = $networking->getPort('{portId}');
+$port->delete();
diff --git a/samples/Networking/v2/ports/read.php b/samples/networking/v2/ports/get.php
similarity index 64%
rename from samples/Networking/v2/ports/read.php
rename to samples/networking/v2/ports/get.php
index 3e00a29e..7e0d960c 100644
--- a/samples/Networking/v2/ports/read.php
+++ b/samples/networking/v2/ports/get.php
@@ -5,13 +5,10 @@
 $openstack = new OpenStack\OpenStack([
     'authUrl' => '{authUrl}',
     'region'  => '{region}',
-    'user'    => [
-        'id'       => '{userId}',
-        'password' => '{password}',
-    ],
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $networking = $openstack->networkingV2();
-$port = $networking->getPort('{portId}');
 
-$port->retrieve();
+$port = $networking->getPort('{portId}');
diff --git a/samples/networking/v2/ports/list.php b/samples/networking/v2/ports/list.php
new file mode 100644
index 00000000..2ab4bc53
--- /dev/null
+++ b/samples/networking/v2/ports/list.php
@@ -0,0 +1,15 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$networking = $openstack->networkingV2();
+
+foreach ($networking->listPorts() as $port) {
+}
diff --git a/samples/networking/v2/ports/update.php b/samples/networking/v2/ports/update.php
new file mode 100644
index 00000000..170b9b63
--- /dev/null
+++ b/samples/networking/v2/ports/update.php
@@ -0,0 +1,16 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => ['id' => '{userId}', 'password' => '{password}'],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$networking = $openstack->networkingV2();
+
+$port = $networking->getPort('{portId}');
+$port->name = 'newName';
+$port->update();
diff --git a/samples/Networking/v2/securityGroupRules/create.php b/samples/networking/v2/securityGroupRules/create.php
similarity index 92%
rename from samples/Networking/v2/securityGroupRules/create.php
rename to samples/networking/v2/securityGroupRules/create.php
index 751c0351..70ac6094 100644
--- a/samples/Networking/v2/securityGroupRules/create.php
+++ b/samples/networking/v2/securityGroupRules/create.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2();
+$networking = $openstack->networkingV2ExtSecGroups();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
 $rule = $networking->createSecurityGroupRule([
diff --git a/samples/Networking/v2/securityGroupRules/delete.php b/samples/networking/v2/securityGroupRules/delete.php
similarity index 90%
rename from samples/Networking/v2/securityGroupRules/delete.php
rename to samples/networking/v2/securityGroupRules/delete.php
index 99521d39..52b56e5f 100644
--- a/samples/Networking/v2/securityGroupRules/delete.php
+++ b/samples/networking/v2/securityGroupRules/delete.php
@@ -13,7 +13,7 @@
 ]);
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
-$rule = $openstack->networkingV2()
+$rule = $openstack->networkingV2ExtSecGroups()
     ->getSecurityGroupRule('{id}');
 
 $rule->delete();
diff --git a/samples/Networking/v2/securityGroupRules/get.php b/samples/networking/v2/securityGroupRules/get.php
similarity index 89%
rename from samples/Networking/v2/securityGroupRules/get.php
rename to samples/networking/v2/securityGroupRules/get.php
index 8827700d..085e5acf 100644
--- a/samples/Networking/v2/securityGroupRules/get.php
+++ b/samples/networking/v2/securityGroupRules/get.php
@@ -13,5 +13,5 @@
 ]);
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule $rule */
-$rule = $openstack->networkingV2()
+$rule = $openstack->networkingV2ExtSecGroups()
     ->getSecurityGroupRule('{id}');
diff --git a/samples/Networking/v2/securityGroupRules/list.php b/samples/networking/v2/securityGroupRules/list.php
similarity index 74%
rename from samples/Networking/v2/securityGroupRules/list.php
rename to samples/networking/v2/securityGroupRules/list.php
index 8c574319..1e9cb034 100644
--- a/samples/Networking/v2/securityGroupRules/list.php
+++ b/samples/networking/v2/securityGroupRules/list.php
@@ -16,15 +16,16 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2();
+/** @var Service $networkingExtSecGroup */
+$networkingExtSecGroup = $openstack->networkingV2ExtSecGroups();
 
 //List all security group rules
-foreach ($networking->listSecurityGroupRules() as $rule) {
+foreach ($networkingExtSecGroup->listSecurityGroupRules() as $rule) {
     /** @var SecurityGroupRule $rule */
 }
 
 /** @var SecurityGroup $securityGroup */
-$securityGroup = $networking->getSecurityGroup('{uuid}');
+$securityGroup = $networkingExtSecGroup->getSecurityGroup(['id' => '{uuid}']);
 
 //List rules belong to a security group
 foreach ($securityGroup->securityGroupRules as $rule) {
diff --git a/samples/Networking/v2/securityGroups/create.php b/samples/networking/v2/securityGroups/create.php
similarity index 75%
rename from samples/Networking/v2/securityGroups/create.php
rename to samples/networking/v2/securityGroups/create.php
index 9da8dce0..32ddb0f7 100644
--- a/samples/Networking/v2/securityGroups/create.php
+++ b/samples/networking/v2/securityGroups/create.php
@@ -7,11 +7,12 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2();
+$networking = $openstack->networkingV2ExtSecGroups();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $secGroup */
 $secGroup = $networking->createSecurityGroup([
diff --git a/samples/Networking/v2/securityGroups/delete.php b/samples/networking/v2/securityGroups/delete.php
similarity index 89%
rename from samples/Networking/v2/securityGroups/delete.php
rename to samples/networking/v2/securityGroups/delete.php
index 992d813f..69bb2ba7 100644
--- a/samples/Networking/v2/securityGroups/delete.php
+++ b/samples/networking/v2/securityGroups/delete.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2();
+$networking = $openstack->networkingV2ExtSecGroups();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $secGroup */
 $secGroup = $networking->getSecurityGroup('{id}');
diff --git a/samples/Networking/v2/securityGroups/get.php b/samples/networking/v2/securityGroups/get.php
similarity index 89%
rename from samples/Networking/v2/securityGroups/get.php
rename to samples/networking/v2/securityGroups/get.php
index 87c7f51c..26f46278 100644
--- a/samples/Networking/v2/securityGroups/get.php
+++ b/samples/networking/v2/securityGroups/get.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2();
+$networking = $openstack->networkingV2ExtSecGroups();
 
 /** @var \OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup $secGroup */
 $secGroup = $networking->getSecurityGroup('{id}');
diff --git a/samples/Networking/v2/securityGroups/list.php b/samples/networking/v2/securityGroups/list.php
similarity index 89%
rename from samples/Networking/v2/securityGroups/list.php
rename to samples/networking/v2/securityGroups/list.php
index 4be1deba..2a423f36 100644
--- a/samples/Networking/v2/securityGroups/list.php
+++ b/samples/networking/v2/securityGroups/list.php
@@ -12,7 +12,7 @@
     'scope' => ['project' => ['id' => '{projectId}']]
 ]);
 
-$networking = $openstack->networkingV2();
+$networking = $openstack->networkingV2ExtSecGroups();
 
 $secGroups = $networking->listSecurityGroups();
 
diff --git a/samples/Networking/v2/subnets/create.php b/samples/networking/v2/subnets/create.php
similarity index 100%
rename from samples/Networking/v2/subnets/create.php
rename to samples/networking/v2/subnets/create.php
diff --git a/samples/networking/v2/subnets/create_batch.php b/samples/networking/v2/subnets/create_batch.php
new file mode 100644
index 00000000..79c60aab
--- /dev/null
+++ b/samples/networking/v2/subnets/create_batch.php
@@ -0,0 +1,36 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$networking = $openstack->networkingV2();
+
+$options = [
+    [
+      'name'        => '{subnetName1}',
+      'networkId'   => '{networkId1}',
+      'ipVersion'   => 4,
+      'cidr'        => '192.168.199.0/24',
+    ],
+    [
+      'name'        => '{subnetName2}',
+      'networkId'   => '{networkId2}',
+      'ipVersion'   => 4,
+      'cidr'        => '10.56.4.0/22',
+    ],
+];
+
+$subnets = $networking->createSubnets($options);
diff --git a/samples/networking/v2/subnets/create_with_gateway_ip.php b/samples/networking/v2/subnets/create_with_gateway_ip.php
new file mode 100644
index 00000000..769b214c
--- /dev/null
+++ b/samples/networking/v2/subnets/create_with_gateway_ip.php
@@ -0,0 +1,30 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$networking = $openstack->networkingV2();
+
+$options = [
+    'name'      => 'My subnet',
+    'networkId' => '{networkId}',
+    'ipVersion' => 4,
+    'cidr'      => '192.168.199.0/25',
+    'gatewayIp' => '192.168.199.128'
+];
+
+// Create the subnet
+$subnet = $networking->createSubnet($options);
diff --git a/samples/Networking/v2/subnets/create_with_host_routes.php b/samples/networking/v2/subnets/create_with_host_routes.php
similarity index 64%
rename from samples/Networking/v2/subnets/create_with_host_routes.php
rename to samples/networking/v2/subnets/create_with_host_routes.php
index 5b4d53c1..ffca710b 100644
--- a/samples/Networking/v2/subnets/create_with_host_routes.php
+++ b/samples/networking/v2/subnets/create_with_host_routes.php
@@ -9,12 +9,17 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$service = $openstack->networkingV2();
+$networking = $openstack->networkingV2();
 
-$subnet = $service->createSubnet([
-    'name'       => '{subnetName}',
+$options = [
+    'name'       => 'My subnet',
     'networkId'  => '{networkId}',
     'ipVersion'  => 4,
     'cidr'       => '192.168.199.0/24',
@@ -22,4 +27,7 @@
         'destination' => '1.1.1.0/24',
         'nexthop'     => '192.168.19.20'
     ]]
-]);
+];
+
+// Create the subnet
+$subnet = $networking->createSubnet($options);
diff --git a/samples/Networking/v2/subnets/delete.php b/samples/networking/v2/subnets/delete.php
similarity index 58%
rename from samples/Networking/v2/subnets/delete.php
rename to samples/networking/v2/subnets/delete.php
index 4d00eac7..ffc13f6c 100644
--- a/samples/Networking/v2/subnets/delete.php
+++ b/samples/networking/v2/subnets/delete.php
@@ -9,9 +9,15 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$service = $openstack->networkingV2();
-$subnet = $service->getSubnet('{subnetId}');
+$networking = $openstack->networkingV2();
+
+$subnet = $networking->getSubnet('{subnetId}');
 
 $subnet->delete();
diff --git a/samples/networking/v2/subnets/get.php b/samples/networking/v2/subnets/get.php
new file mode 100644
index 00000000..b519abce
--- /dev/null
+++ b/samples/networking/v2/subnets/get.php
@@ -0,0 +1,28 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope' => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
+]);
+
+$networking = $openstack->networkingV2();
+
+$subnet = $networking->getSubnet('{subnetId}');
+
+// By default, this will return an empty Subnet object and NOT hit the API.
+// This is convenient for when you want to use the object for operations
+// that do not require an initial GET request. To retrieve the subnet's details,
+// run the following, which *will* call the API with a GET request:
+
+$subnet->retrieve();
diff --git a/samples/Networking/v2/subnets/update.php b/samples/networking/v2/subnets/update.php
similarity index 53%
rename from samples/Networking/v2/subnets/update.php
rename to samples/networking/v2/subnets/update.php
index e0d35f10..cbff505f 100644
--- a/samples/Networking/v2/subnets/update.php
+++ b/samples/networking/v2/subnets/update.php
@@ -7,12 +7,18 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope'   => [
+        'project' => [
+            'id' => '{projectId}'
+        ]
+    ]
 ]);
 
-$service = $openstack->networkingV2();
-$subnet = $service->getSubnet('{subnetId}');
+$networking = $openstack->networkingV2();
+
+$subnet = $networking->getSubnet('{subnetId}');
 
 $subnet->name = '{newName}';
 $subnet->update();
diff --git a/samples/Compute/v2/servers/delete.php b/samples/object_store/v1/account/get.php
similarity index 64%
rename from samples/Compute/v2/servers/delete.php
rename to samples/object_store/v1/account/get.php
index 58cd4a3a..0c4a1d68 100644
--- a/samples/Compute/v2/servers/delete.php
+++ b/samples/object_store/v1/account/get.php
@@ -9,10 +9,8 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
-
-$server = $compute->getServer(['id' => '{serverId}']);
-
-$server->delete();
+$account = $openstack->objectStoreV1()
+                     ->getAccount();
diff --git a/samples/ObjectStore/v1/account/get_metadata.php b/samples/object_store/v1/account/get_metadata.php
similarity index 86%
rename from samples/ObjectStore/v1/account/get_metadata.php
rename to samples/object_store/v1/account/get_metadata.php
index 196a0358..af9e63c9 100644
--- a/samples/ObjectStore/v1/account/get_metadata.php
+++ b/samples/object_store/v1/account/get_metadata.php
@@ -9,6 +9,7 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
diff --git a/samples/ObjectStore/v1/account/merge_metadata.php b/samples/object_store/v1/account/merge_metadata.php
similarity index 87%
rename from samples/ObjectStore/v1/account/merge_metadata.php
rename to samples/object_store/v1/account/merge_metadata.php
index e77a9e74..77e77d16 100644
--- a/samples/ObjectStore/v1/account/merge_metadata.php
+++ b/samples/object_store/v1/account/merge_metadata.php
@@ -9,6 +9,7 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
diff --git a/samples/ObjectStore/v1/account/reset_metadata.php b/samples/object_store/v1/account/reset_metadata.php
similarity index 87%
rename from samples/ObjectStore/v1/account/reset_metadata.php
rename to samples/object_store/v1/account/reset_metadata.php
index 33ae3520..9d79c4b4 100644
--- a/samples/ObjectStore/v1/account/reset_metadata.php
+++ b/samples/object_store/v1/account/reset_metadata.php
@@ -9,9 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
+
 $account = $service->getAccount();
 
 $account->resetMetadata([
diff --git a/samples/ObjectStore/v1/containers/create.php b/samples/object_store/v1/containers/create.php
similarity index 70%
rename from samples/ObjectStore/v1/containers/create.php
rename to samples/object_store/v1/containers/create.php
index 98435ce5..8e867604 100644
--- a/samples/ObjectStore/v1/containers/create.php
+++ b/samples/object_store/v1/containers/create.php
@@ -7,12 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
 
 $container = $service->createContainer([
-    'name' => '{containerName}',
+    'name' => '{containerName}'
 ]);
diff --git a/samples/object_store/v1/containers/delete.php b/samples/object_store/v1/containers/delete.php
new file mode 100644
index 00000000..25ae38df
--- /dev/null
+++ b/samples/object_store/v1/containers/delete.php
@@ -0,0 +1,17 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->objectStoreV1()
+          ->getContainer('{containerName}')
+          ->delete();
diff --git a/samples/Compute/v2/flavors/read.php b/samples/object_store/v1/containers/get.php
similarity index 60%
rename from samples/Compute/v2/flavors/read.php
rename to samples/object_store/v1/containers/get.php
index 9ce8edbd..fe056e91 100644
--- a/samples/Compute/v2/flavors/read.php
+++ b/samples/object_store/v1/containers/get.php
@@ -9,9 +9,8 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$compute = $openstack->computeV2();
-
-$flavor = $compute->getFlavor(['id' => '{flavorId}']);
-$flavor->retrieve();
+$container = $openstack->objectStoreV1()
+                       ->getContainer('{containerName}');
diff --git a/samples/ObjectStore/v1/containers/get_metadata.php b/samples/object_store/v1/containers/get_metadata.php
similarity index 51%
rename from samples/ObjectStore/v1/containers/get_metadata.php
rename to samples/object_store/v1/containers/get_metadata.php
index 7d75d2fd..aded49ae 100644
--- a/samples/ObjectStore/v1/containers/get_metadata.php
+++ b/samples/object_store/v1/containers/get_metadata.php
@@ -9,9 +9,10 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
-
-$metadata = $container->getMetadata();
+/** @var array $metadata */
+$metadata = $openstack->objectStoreV1()
+                      ->getContainer('{containerName}')
+                      ->getMetadata();
diff --git a/samples/ObjectStore/v1/containers/list.php b/samples/object_store/v1/containers/list.php
similarity index 73%
rename from samples/ObjectStore/v1/containers/list.php
rename to samples/object_store/v1/containers/list.php
index 2723be81..c0c05c8d 100644
--- a/samples/ObjectStore/v1/containers/list.php
+++ b/samples/object_store/v1/containers/list.php
@@ -9,10 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
 
 foreach ($service->listContainers() as $container) {
-    /** @var \OpenStack\ObjectStore\v1\Models\Container $container */
+    /** @var $container \OpenStack\ObjectStore\v1\Models\Container */
 }
diff --git a/samples/ObjectStore/v1/containers/merge_metadata.php b/samples/object_store/v1/containers/merge_metadata.php
similarity index 88%
rename from samples/ObjectStore/v1/containers/merge_metadata.php
rename to samples/object_store/v1/containers/merge_metadata.php
index d2a6e504..accf9923 100644
--- a/samples/ObjectStore/v1/containers/merge_metadata.php
+++ b/samples/object_store/v1/containers/merge_metadata.php
@@ -9,6 +9,7 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
diff --git a/samples/ObjectStore/v1/containers/reset_metadata.php b/samples/object_store/v1/containers/reset_metadata.php
similarity index 88%
rename from samples/ObjectStore/v1/containers/reset_metadata.php
rename to samples/object_store/v1/containers/reset_metadata.php
index 60329ce7..7c1e056d 100644
--- a/samples/ObjectStore/v1/containers/reset_metadata.php
+++ b/samples/object_store/v1/containers/reset_metadata.php
@@ -9,9 +9,11 @@
         'id'       => '{userId}',
         'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
 $service = $openstack->objectStoreV1();
+
 $container = $service->getContainer('{containerName}');
 
 $container->resetMetadata([
diff --git a/samples/object_store/v1/objects/check_exists.php b/samples/object_store/v1/objects/check_exists.php
new file mode 100644
index 00000000..48a9f060
--- /dev/null
+++ b/samples/object_store/v1/objects/check_exists.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+/** @var bool $exists */
+$exists = $openstack->objectStoreV1()
+                    ->getContainer('{containerName}')
+                    ->objectExists('{objectName}');
diff --git a/samples/object_store/v1/objects/copy.php b/samples/object_store/v1/objects/copy.php
new file mode 100644
index 00000000..15a08f52
--- /dev/null
+++ b/samples/object_store/v1/objects/copy.php
@@ -0,0 +1,20 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->objectStoreV1()
+          ->getContainer('{containerName}')
+          ->getObject('{objectName}')
+          ->copy([
+              'destination' => '{newContainerName}/{newObjectName}'
+          ]);
diff --git a/samples/object_store/v1/objects/create.php b/samples/object_store/v1/objects/create.php
new file mode 100644
index 00000000..1541c22c
--- /dev/null
+++ b/samples/object_store/v1/objects/create.php
@@ -0,0 +1,23 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$options = [
+    'name'    => '{objectName}',
+    'content' => '{objectContent}',
+];
+
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
+$object = $openstack->objectStoreV1()
+                    ->getContainer('{containerName}')
+                    ->createObject($options);
diff --git a/samples/object_store/v1/objects/create_from_stream.php b/samples/object_store/v1/objects/create_from_stream.php
new file mode 100644
index 00000000..eed9fa20
--- /dev/null
+++ b/samples/object_store/v1/objects/create_from_stream.php
@@ -0,0 +1,28 @@
+<?php
+
+require 'vendor/autoload.php';
+
+use GuzzleHttp\Psr7\Stream;
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+// You can use any instance of \Psr\Http\Message\StreamInterface
+$stream = new Stream(fopen('/path/to/object.txt', 'r'));
+
+$options = [
+    'name'   => '{objectName}',
+    'stream' => $stream,
+];
+
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
+$object = $openstack->objectStoreV1()
+    ->getContainer('{containerName}')
+    ->createObject($options);
diff --git a/samples/object_store/v1/objects/create_large_object.php b/samples/object_store/v1/objects/create_large_object.php
new file mode 100644
index 00000000..52f03b3f
--- /dev/null
+++ b/samples/object_store/v1/objects/create_large_object.php
@@ -0,0 +1,33 @@
+<?php
+
+require 'vendor/autoload.php';
+
+use Guzzle\Stream\Stream;
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$options = [
+    'name'   => 'object_name.txt',
+    'stream' => new Stream(fopen('/path/to/large_object.mov', 'r')),
+];
+
+// optional: specify the size of each segment in bytes
+$options['segmentSize'] = 1073741824;
+
+// optional: specify the container where the segments live. This does not necessarily have to be the
+// same as the container which holds the manifest file
+$options['segmentContainer'] = 'test_segments';
+
+
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
+$object = $openstack->objectStoreV1()
+                    ->getContainer('test')
+                    ->createLargeObject($options);
diff --git a/samples/object_store/v1/objects/delete.php b/samples/object_store/v1/objects/delete.php
new file mode 100644
index 00000000..d66d5b7b
--- /dev/null
+++ b/samples/object_store/v1/objects/delete.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->objectStoreV1()
+          ->getContainer('{containerName}')
+          ->getObject('{objectName}')
+          ->delete();
diff --git a/samples/object_store/v1/objects/download.php b/samples/object_store/v1/objects/download.php
new file mode 100644
index 00000000..6129f635
--- /dev/null
+++ b/samples/object_store/v1/objects/download.php
@@ -0,0 +1,19 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+/** @var \GuzzleHttp\Stream\Stream $stream */
+$stream = $openstack->objectStoreV1()
+                    ->getContainer('{containerName}')
+                    ->getObject('{objectName}')
+                    ->download();
diff --git a/samples/object_store/v1/objects/get.php b/samples/object_store/v1/objects/get.php
new file mode 100644
index 00000000..b7b42f3a
--- /dev/null
+++ b/samples/object_store/v1/objects/get.php
@@ -0,0 +1,18 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+/** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
+$object = $openstack->objectStoreV1()
+                    ->getContainer('{containerName}')
+                    ->getObject('{objectName}');
diff --git a/samples/object_store/v1/objects/get_metadata.php b/samples/object_store/v1/objects/get_metadata.php
new file mode 100644
index 00000000..0e09b71f
--- /dev/null
+++ b/samples/object_store/v1/objects/get_metadata.php
@@ -0,0 +1,19 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+/** @var array $metadata */
+$metadata = $openstack->objectStoreV1()
+                      ->getContainer('{containerName}')
+                      ->getObject('{objectName}')
+                      ->getMetadata();
diff --git a/samples/ObjectStore/v1/objects/list.php b/samples/object_store/v1/objects/list.php
similarity index 63%
rename from samples/ObjectStore/v1/objects/list.php
rename to samples/object_store/v1/objects/list.php
index 54475db0..8d08cf0d 100644
--- a/samples/ObjectStore/v1/objects/list.php
+++ b/samples/object_store/v1/objects/list.php
@@ -7,12 +7,13 @@
     'region'  => '{region}',
     'user'    => [
         'id'       => '{userId}',
-        'password' => '{password}',
+        'password' => '{password}'
     ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
 ]);
 
-$service = $openstack->objectStoreV1();
-$container = $service->getContainer('{containerName}');
+$container = $openstack->objectStoreV1()
+                       ->getContainer('{containerName}');
 
 foreach ($container->listObjects() as $object) {
     /** @var \OpenStack\ObjectStore\v1\Models\StorageObject $object */
diff --git a/samples/object_store/v1/objects/merge_metadata.php b/samples/object_store/v1/objects/merge_metadata.php
new file mode 100644
index 00000000..04c6c793
--- /dev/null
+++ b/samples/object_store/v1/objects/merge_metadata.php
@@ -0,0 +1,21 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->objectStoreV1()
+          ->getContainer('{containerName}')
+          ->getObject('{objectName}')
+          ->mergeMetadata([
+              '{key_1}' => '{val_1}',
+              '{key_2}' => '{val_2}',
+          ]);
diff --git a/samples/object_store/v1/objects/reset_metadata.php b/samples/object_store/v1/objects/reset_metadata.php
new file mode 100644
index 00000000..6c83e647
--- /dev/null
+++ b/samples/object_store/v1/objects/reset_metadata.php
@@ -0,0 +1,21 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$openstack = new OpenStack\OpenStack([
+    'authUrl' => '{authUrl}',
+    'region'  => '{region}',
+    'user'    => [
+        'id'       => '{userId}',
+        'password' => '{password}'
+    ],
+    'scope'   => ['project' => ['id' => '{projectId}']]
+]);
+
+$openstack->objectStoreV1()
+          ->getContainer('{containerName}')
+          ->getObject('{objectName}')
+          ->resetMetadata([
+              '{key_1}' => '{val_1}',
+              '{key_2}' => '{val_2}',
+          ]);