Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ bin
*/**/CONTRIBUTING.md
*/**/SECURITY.md
*/**/RELEASE.md
*/**/AGENTS.md
# ignore codestyle tools config
*/*/psalm.xml
*/*/psalm.xml.license
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"pear/archive_tar": "^1.6.0",
"pear/pear-core-minimal": "^1.10",
"php-http/guzzle7-adapter": "^1.1.0",
"php-opencloud/openstack": "^3.14",
"php-opencloud/openstack": "^3.17",
"phpseclib/phpseclib": "^3.0.55",
"pimple/pimple": "^3.6.2",
"predis/predis": "^3.4.2",
Expand Down
18 changes: 9 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -1582,6 +1582,7 @@
'OpenStack\\Compute\\v2\\Models\\Limit' => $vendorDir . '/php-opencloud/openstack/src/Compute/v2/Models/Limit.php',
'OpenStack\\Compute\\v2\\Models\\QuotaSet' => $vendorDir . '/php-opencloud/openstack/src/Compute/v2/Models/QuotaSet.php',
'OpenStack\\Compute\\v2\\Models\\Server' => $vendorDir . '/php-opencloud/openstack/src/Compute/v2/Models/Server.php',
'OpenStack\\Compute\\v2\\Models\\ServerGroup' => $vendorDir . '/php-opencloud/openstack/src/Compute/v2/Models/ServerGroup.php',
'OpenStack\\Compute\\v2\\Params' => $vendorDir . '/php-opencloud/openstack/src/Compute/v2/Params.php',
'OpenStack\\Compute\\v2\\Service' => $vendorDir . '/php-opencloud/openstack/src/Compute/v2/Service.php',
'OpenStack\\Identity\\v2\\Api' => $vendorDir . '/php-opencloud/openstack/src/Identity/v2/Api.php',
Expand Down
1 change: 1 addition & 0 deletions composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -2137,6 +2137,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
'OpenStack\\Compute\\v2\\Models\\Limit' => __DIR__ . '/..' . '/php-opencloud/openstack/src/Compute/v2/Models/Limit.php',
'OpenStack\\Compute\\v2\\Models\\QuotaSet' => __DIR__ . '/..' . '/php-opencloud/openstack/src/Compute/v2/Models/QuotaSet.php',
'OpenStack\\Compute\\v2\\Models\\Server' => __DIR__ . '/..' . '/php-opencloud/openstack/src/Compute/v2/Models/Server.php',
'OpenStack\\Compute\\v2\\Models\\ServerGroup' => __DIR__ . '/..' . '/php-opencloud/openstack/src/Compute/v2/Models/ServerGroup.php',
'OpenStack\\Compute\\v2\\Params' => __DIR__ . '/..' . '/php-opencloud/openstack/src/Compute/v2/Params.php',
'OpenStack\\Compute\\v2\\Service' => __DIR__ . '/..' . '/php-opencloud/openstack/src/Compute/v2/Service.php',
'OpenStack\\Identity\\v2\\Api' => __DIR__ . '/..' . '/php-opencloud/openstack/src/Identity/v2/Api.php',
Expand Down
18 changes: 9 additions & 9 deletions composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -2981,22 +2981,22 @@
},
{
"name": "php-opencloud/openstack",
"version": "v3.14.0",
"version_normalized": "3.14.0.0",
"version": "v3.17.0",
"version_normalized": "3.17.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-opencloud/openstack.git",
"reference": "b92ea5581ca91779b88f08b1b44e6ca880b34fc3"
"reference": "8b0aa946dc89f942c69d2968caedaa4d58201aa7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-opencloud/openstack/zipball/b92ea5581ca91779b88f08b1b44e6ca880b34fc3",
"reference": "b92ea5581ca91779b88f08b1b44e6ca880b34fc3",
"url": "https://api.github.com/repos/php-opencloud/openstack/zipball/8b0aa946dc89f942c69d2968caedaa4d58201aa7",
"reference": "8b0aa946dc89f942c69d2968caedaa4d58201aa7",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^7.0",
"guzzlehttp/psr7": ">=1.7",
"guzzlehttp/guzzle": "^7.5.1",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"guzzlehttp/uri-template": "^0.2 || ^1.0",
"justinrainbow/json-schema": "^5.2 || ^6.0",
"php": "^7.2.5 || ^8.0"
Expand All @@ -3011,7 +3011,7 @@
"phpunit/phpunit": ">=8.5.23 <9.0",
"psr/log": "^1.0"
},
"time": "2025-05-30T09:26:42+00:00",
"time": "2026-06-01T14:33:34+00:00",
"type": "library",
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -3055,7 +3055,7 @@
],
"support": {
"issues": "https://github.com/php-opencloud/openstack/issues",
"source": "https://github.com/php-opencloud/openstack/tree/v3.14.0"
"source": "https://github.com/php-opencloud/openstack/tree/v3.17.0"
},
"install-path": "../php-opencloud/openstack"
},
Expand Down
6 changes: 3 additions & 3 deletions composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,9 @@
'dev_requirement' => false,
),
'php-opencloud/openstack' => array(
'pretty_version' => 'v3.14.0',
'version' => '3.14.0.0',
'reference' => 'b92ea5581ca91779b88f08b1b44e6ca880b34fc3',
'pretty_version' => 'v3.17.0',
'version' => '3.17.0.0',
'reference' => '8b0aa946dc89f942c69d2968caedaa4d58201aa7',
'type' => 'library',
'install_path' => __DIR__ . '/../php-opencloud/openstack',
'aliases' => array(),
Expand Down
97 changes: 82 additions & 15 deletions php-opencloud/openstack/src/Compute/v2/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ public function __construct()
$this->params = new Params();
}

private function serverParam(array $param): array
{
return array_merge($param, ['path' => 'server']);
}

public function getLimits(): array
{
return [
Expand Down Expand Up @@ -189,21 +194,21 @@ public function deleteImageMetadataKey(): array
public function postServer(): array
{
return [
'path' => 'servers',
'method' => 'POST',
'jsonKey' => 'server',
'params' => [
'imageId' => $this->notRequired($this->params->imageId()),
'flavorId' => $this->params->flavorId(),
'personality' => $this->params->personality(),
'metadata' => $this->notRequired($this->params->metadata()),
'name' => $this->isRequired($this->params->name('server')),
'securityGroups' => $this->params->securityGroups(),
'userData' => $this->params->userData(),
'availabilityZone' => $this->params->availabilityZone(),
'networks' => $this->params->networks(),
'blockDeviceMapping' => $this->params->blockDeviceMapping(),
'keyName' => $this->params->keyName(),
'path' => 'servers',
'method' => 'POST',
'params' => [
'imageId' => $this->serverParam($this->notRequired($this->params->imageId())),
'flavorId' => $this->serverParam($this->params->flavorId()),
'personality' => $this->serverParam($this->params->personality()),
'metadata' => $this->serverParam($this->notRequired($this->params->metadata())),
'name' => $this->serverParam($this->isRequired($this->params->name('server'))),
'securityGroups' => $this->serverParam($this->params->securityGroups()),
'userData' => $this->serverParam($this->params->userData()),
'availabilityZone' => $this->serverParam($this->params->availabilityZone()),
'networks' => $this->serverParam($this->params->networks()),
'blockDeviceMapping' => $this->serverParam($this->params->blockDeviceMapping()),
'keyName' => $this->serverParam($this->params->keyName()),
'schedulerHints' => $this->params->schedulerHints(),
],
];
}
Expand Down Expand Up @@ -708,6 +713,68 @@ public function deleteKeypair(): array
];
}

public function getServerGroups(): array
{
return [
'method' => 'GET',
'path' => 'os-server-groups',
'params' => [
'allProjects' => $this->params->allProjects(),
'limit' => $this->params->limit(),
'offset' => $this->params->offset(),
],
];
}

public function getServerGroup(): array
{
return [
'method' => 'GET',
'path' => 'os-server-groups/{id}',
'params' => [
'id' => $this->params->urlId('server group'),
],
];
}

public function postServerGroup(): array
{
return [
'method' => 'POST',
'path' => 'os-server-groups',
'jsonKey' => 'server_group',
'params' => [
'name' => $this->isRequired($this->params->name('server group')),
'policies' => $this->isRequired($this->params->serverGroupPolicies()),
],
];
}

public function postServerGroupWithPolicy(): array
{
return [
'method' => 'POST',
'path' => 'os-server-groups',
'jsonKey' => 'server_group',
'params' => [
'name' => $this->isRequired($this->params->name('server group')),
'policy' => $this->isRequired($this->params->serverGroupPolicy()),
'rules' => $this->notRequired($this->params->serverGroupRules()),
],
];
}

public function deleteServerGroup(): array
{
return [
'method' => 'DELETE',
'path' => 'os-server-groups/{id}',
'params' => [
'id' => $this->params->urlId('server group'),
],
];
}

public function postSecurityGroup(): array
{
return [
Expand Down
111 changes: 111 additions & 0 deletions php-opencloud/openstack/src/Compute/v2/Models/ServerGroup.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?php

declare(strict_types=1);

namespace OpenStack\Compute\v2\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;
use OpenStack\Common\Transport\Utils;

/**
* Represents a Compute v2 Server Group.
*
* @property \OpenStack\Compute\v2\Api $api
*/
class ServerGroup extends OperatorResource implements Listable, Retrievable, Creatable, Deletable
{
/** @var string */
public $id;

/** @var array */
public $members = [];

/** @var array */
public $metadata = [];

/** @var string */
public $name;

/** @var string */
public $policy;

/** @var array */
public $policies = [];

/** @var string */
public $projectId;

/** @var array */
public $rules = [];

/** @var string */
public $userId;

protected $aliases = [
'project_id' => 'projectId',
'user_id' => 'userId',
];

protected $resourceKey = 'server_group';
protected $resourcesKey = 'server_groups';

public function retrieve()
{
$response = $this->execute($this->api->getServerGroup(), ['id' => (string) $this->id]);
$this->populateFromResponse($response);
}

public function create(array $userOptions): Creatable
{
if (isset($userOptions['policy'], $userOptions['policies'])) {
throw new \RuntimeException('Provide either "policy" or "policies", not both.');
}

if (isset($userOptions['rules']) && !isset($userOptions['policy'])) {
throw new \RuntimeException('"rules" requires "policy".');
}

if (!isset($userOptions['policy']) && !isset($userOptions['policies'])) {
throw new \RuntimeException('"policy" or "policies" must be set.');
}

$definition = isset($userOptions['policy'])
? $this->api->postServerGroupWithPolicy()
: $this->api->postServerGroup();

$response = $this->execute($definition, $userOptions);

return $this->populateFromResponse($response);
}

public function delete()
{
$this->execute($this->api->deleteServerGroup(), ['id' => (string) $this->id]);
}

public function populateFromArray(array $array): self
{
$array = Utils::flattenJson($array, $this->resourceKey);

if (isset($array['policy']) && !isset($array['policies'])) {
$array['policies'] = [$array['policy']];
}

if (isset($array['policies']) && is_array($array['policies']) && !isset($array['policy']) && count($array['policies']) > 0) {
$array['policy'] = reset($array['policies']);
}

$array += [
'members' => [],
'metadata' => [],
'policies' => [],
'rules' => [],
];

return parent::populateFromArray($array);
}
}
Loading