Skip to content

Commit d48d2b2

Browse files
committed
Various peer review updates
1 parent e83d546 commit d48d2b2

23 files changed

+151
-213
lines changed

samples/compute/v2/keypair/create_and_delete_keypair.php renamed to samples/compute/v2/keypairs/create.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@
1919
'publicKey' => 'ssh-rsa AAAAB3NAAAAB3NAAAAB3NAAAAB3NAAAAB3NAAAAB3NAAAAB3NAAAAB3NAAAAB3NAAAAB3N'
2020
];
2121

22+
/** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
2223
$keypair = $compute->createKeypair($data);
23-
24-
$keypair->delete();
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
3+
require 'vendor/autoload.php';
4+
5+
$openstack = new OpenStack\OpenStack([
6+
'authUrl' => '{authUrl}',
7+
'region' => '{region}',
8+
'user' => [
9+
'id' => '{userId}',
10+
'password' => '{password}'
11+
],
12+
'scope' => ['project' => ['id' => '{projectId}']]
13+
]);
14+
15+
$compute = $openstack->computeV2(['region' => '{region}']);
16+
17+
/** @var \OpenStack\Compute\v2\Models\Keypair $keypair */
18+
$keypair = $compute->getKeypair(['name' => 'name_of_keypair']);
19+
20+
$keypair->delete();

samples/compute/v2/servers/add_remove_security_group.php renamed to samples/compute/v2/servers/add_security_group.php.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
$compute = $openstack->computeV2(['region' => '{region}']);
1616

17+
/**@var OpenStack\Compute\v2\Models\Server $server */
1718
$server = $compute->getServer([
1819
'id' => '{serverId}',
1920
]);
2021

2122
$server->addSecurityGroup(['name' => 'secgroup name']);
22-
$server->removeSecurityGroup(['name' => 'default']);

samples/compute/v2/servers/attach_detach_volume_attachment.php renamed to samples/compute/v2/servers/attach_volume_attachment.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@
1818

1919
$compute = $openstack->computeV2(['region' => '{region}']);
2020

21+
/**@var OpenStack\Compute\v2\Models\Server $server */
2122
$server = $compute->getServer(['id' => 'uuid']);
2223

2324
/**@var VolumeAttachment $volumeAttachment*/
2425
$volumeAttachment = $server->attachVolume('{volume_uuid}');
25-
26-
27-
//Must detach by volumeAttachment id
28-
$server->detachVolume($volumeAttachment->id);

samples/compute/v2/servers/create_server.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@
2626
];
2727

2828
// Create the server
29+
/**@var OpenStack\Compute\v2\Models\Server $server */
2930
$server = $compute->createServer($options);

samples/compute/v2/servers/delete_server.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
$compute = $openstack->computeV2(['region' => '{region}']);
1616

17+
/**@var OpenStack\Compute\v2\Models\Server $server */
1718
$server = $compute->getServer(['id' => '{serverId}']);
1819

1920
$server->delete();
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
3+
use OpenStack\BlockStorage\v2\Models\VolumeAttachment;
4+
use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroup;
5+
use OpenStack\Networking\v2\Extensions\SecurityGroups\Models\SecurityGroupRule;
6+
7+
require 'vendor/autoload.php';
8+
9+
$openstack = new OpenStack\OpenStack([
10+
'authUrl' => '{authUrl}',
11+
'region' => '{region}',
12+
'user' => [
13+
'id' => '{userId}',
14+
'password' => '{password}'
15+
],
16+
'scope' => ['project' => ['id' => '{projectId}']]
17+
]);
18+
19+
$compute = $openstack->computeV2(['region' => '{region}']);
20+
21+
/**@var OpenStack\Compute\v2\Models\Server $server */
22+
$server = $compute->getServer(['id' => 'uuid']);
23+
24+
//Must detach by volumeAttachment id
25+
$server->detachVolume($volumeAttachment->id);

samples/compute/v2/servers/list_security_groups.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@
2424

2525
foreach ($rules as $rule) {
2626
/**@var SecurityGroupRule $rule */
27-
$rule->direction;
2827
}
2928
}

samples/compute/v2/servers/list_volume_attachments.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@
2222

2323
foreach ($server->listVolumeAttachments() as $volumeAttachment) {
2424
/**@var VolumeAttachment $volumeAttachment*/
25-
print_r($volumeAttachment);
2625
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
require 'vendor/autoload.php';
4+
5+
$openstack = new OpenStack\OpenStack([
6+
'authUrl' => '{authUrl}',
7+
'region' => '{region}',
8+
'user' => [
9+
'id' => '{userId}',
10+
'password' => '{password}'
11+
],
12+
'scope' => ['project' => ['id' => '{projectId}']]
13+
]);
14+
15+
$compute = $openstack->computeV2(['region' => '{region}']);
16+
17+
/**@var OpenStack\Compute\v2\Models\Server $server */
18+
$server = $compute->getServer([
19+
'id' => '{serverId}',
20+
]);
21+
22+
$server->removeSecurityGroup(['name' => 'security group name']);

0 commit comments

Comments
 (0)