Skip to content

Orchestration #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2014
Merged

Orchestration #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd10757
Using aliases for disambiguating name of member.
ycombinator Oct 23, 2014
dd42e17
Sleeping for 10 seconds to let abandoned stack be deleted.
ycombinator Oct 23, 2014
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
18 changes: 3 additions & 15 deletions lib/OpenCloud/Orchestration/Resource/ResourceType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,13 @@ class ResourceType extends ReadOnlyResource

protected $resourceType;
protected $attributes;
protected $_properties; // Named so because the Base class has a $properties member.
protected $resourceTypeProperties; // Named so because the Base class has a $properties member.

protected $aliases = array(
'resource_type' => 'resourceType'
'resource_type' => 'resourceType',
'properties' => 'resourceTypeProperties'
);

/**
* Required to prevent the Base class from attempting to populate $this->properties.
*/
protected function setProperties($properties)
{
$this->_properties = $properties;
}

public function getProperties()
{
return $this->_properties;
}

/**
* Returns the template representation for this resource type.
*
Expand Down
2 changes: 2 additions & 0 deletions lib/OpenCloud/Orchestration/Resource/Stack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class Stack extends PersistentResource
protected static $json_name = 'stack';

protected $id;
protected $parentStack; // Named so because the Base class has a $parent member.
protected $disableRollback;
protected $description;
protected $parameters;
Expand All @@ -49,6 +50,7 @@ class Stack extends PersistentResource
protected $links;

protected $aliases = array(
'parent' => 'parentStack',
'disable_rollback' => 'disableRollback',
'stack_name' => 'name',
'stack_status' => 'status',
Expand Down
1 change: 1 addition & 0 deletions tests/OpenCloud/Smoke/Unit/Orchestration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ public function main()
$this->stepInfo('Abandon stack data: %s ', $abandonedStackData);

$this->step('Adopt stack');
sleep(10); // For abandoned stack to get deleted.
$stack = $this->getService()->adoptStack(array(
'name' => 'simple-lamp-setup-from-template-url',
'templateUrl' => 'https://raw.githubusercontent.com/rackspace-orchestration-templates/lamp/master/lamp.yaml',
Expand Down