Merge pull request #432 from rackspace/working

Merging working -> master in preparation for minor release

Author: ycombinator

README.md

@@ -28,7 +28,7 @@ You must install this library through Composer:
 curl -sS https://getcomposer.org/installer | php
 
 # Require php-opencloud as a dependency
-php composer.phar require rackspace/php-opencloud:dev-master
+php composer.phar require rackspace/php-opencloud
 ```
 
 Once you have installed the library, you will need to load Composer's autoloader (which registers all the required

lib/OpenCloud/Compute/Resource/Server.php

@@ -738,4 +738,44 @@ protected function updateJson($params = array())
     {
         return (object) array('server' => (object) $params);
     }
+
+    /**
+     * Suspend a server
+     *
+     * A suspend request suspend an instance, its VM state is stored on disk, all memory is written
+     * to disk, and the virtual machine is stopped. Suspending an instance is similar to placing a
+     * device in hibernation; memory and vCPUs become available to create other instances.
+     *
+     * @api
+     * @return \Guzzle\Http\Message\Response
+     */
+    public function suspend()
+    {
+        // The suspend action is only available when the os-admin-actions extension is installed.
+        $this->checkExtension('os-admin-actions');
+
+        $object = (object) array('suspend' => 'none');
+
+        return $this->action($object);
+    }
+
+    /**
+     * Resume a server
+     *
+     * A resume request resumes a suspended instance, its VM state was stored on disk, all memory was written
+     * to disk, and the virtual machine was stopped. Resuming a suspended instance is similar to resuming a
+     * device from hibernation.
+     *
+     * @api
+     * @return \Guzzle\Http\Message\Response
+     */
+    public function resume()
+    {
+        // The resume action is only available when the os-admin-actions extension is installed.
+        $this->checkExtension('os-admin-actions');
+
+        $object = (object) array('resume' => 'none');
+
+        return $this->action($object);
+    }
 }

lib/OpenCloud/LoadBalancer/Service.php

@@ -44,17 +44,14 @@ public function loadBalancer($id = null)
      * Return a paginated collection of load balancers
      *
      * @param bool $detail If TRUE, all details are returned; otherwise, a
-     *                     minimal set (ID, name) is retrieved
+     *                     minimal set (ID, name) is retrieved [DEPRECATED]
      * @param array $filter Optional query params used for search
      * @return \OpenCloud\Common\Collection\PaginatedIterator
      */
     public function loadBalancerList($detail = true, array $filter = array())
     {
         $url = $this->getUrl();
         $url->addPath(Resource\LoadBalancer::resourceName());
-        if ($detail) {
-            $url->addPath('detail');
-        }
         $url->setQuery($filter);
 
         return $this->resourceList('LoadBalancer', $url);

lib/OpenCloud/Orchestration/Resource/ResourceType.php

@@ -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.
      *

lib/OpenCloud/Orchestration/Resource/Stack.php

@@ -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;
@@ -49,6 +50,7 @@ class Stack extends PersistentResource
     protected $links;
 
     protected $aliases = array(
+        'parent'              => 'parentStack',
         'disable_rollback'    => 'disableRollback',
         'stack_name'          => 'name',
         'stack_status'        => 'status',

samples/LoadBalancer/list-load-balancers.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright 2012-2014 Rackspace US, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+
+//
+// Pre-requisites:
+// * Prior to running this script, you must setup the following environment variables:
+//   * OS_AUTH_URL: Your Rackspace Cloud Authentication URL,
+//   * OS_USERNAME: Your Rackspace Cloud Account Username,
+//   * RAX_API_KEY:  Your Rackspace Cloud Account API KEY, and
+//   * OS_REGION_NAME: The Rackspace Cloud region you want to use
+//
+
+require __DIR__ . '/../../vendor/autoload.php';
+use OpenCloud\Rackspace;
+
+// 1. Instantiate an Rackspace client.
+$client = new Rackspace(getenv('OS_AUTH_URL'), array(
+    'username' => getenv('OS_USERNAME'),
+    'apiKey' => getenv('RAX_API_KEY')
+));
+
+// 2. Obtain an LoadBalancer service object from the client.
+$region = getenv('OS_REGION_NAME');
+$loadBalancerService = $client->loadBalancerService(null, $region);
+
+// 3. Get load balancers.
+$loadBalancers = $loadBalancerService->loadBalancerList();
+foreach ($loadBalancers as $loadBalancer) {
+    /** @var $loadBalancer OpenCloud\LoadBalancer\Resource\LoadBalancer **/
+    var_dump($loadBalancer);
+}

tests/OpenCloud/Smoke/Unit/Compute.php

@@ -165,6 +165,30 @@ public function main()
             return false;
         }
 
+        sleep(3);
+
+        // Suspend
+        $this->step('Suspend the server');
+        $server->suspend()
+        $server->waitFor('ACTIVE', 120, $this->getWaiterCallback());
+
+        if ($server->status() == 'ERROR') {
+            $this->stepInfo("Server suspension failed with ERROR\n");
+            return false;
+        }
+
+        sleep(3);
+
+        // Resume
+        $this->step('Resume the server');
+        $server->resume()
+        $server->waitFor('ACTIVE', 120, $this->getWaiterCallback());
+
+        if ($server->status() == 'ERROR') {
+            $this->stepInfo("Server resuming failed with ERROR\n");
+            return false;
+        }
+
         sleep(3);
 
         // Attach volume

tests/OpenCloud/Smoke/Unit/Orchestration.php

@@ -126,6 +126,7 @@ public function main()
         $this->stepInfo('%-25s | %s', 'Metadata key', 'Metadata value');
         foreach ($metadata as $key => $value) {
             $this->stepInfo('%-25s | %s', $key, $value);
+        }
 
         $this->step('List stack events');
         $events = $stack->listEvents();
@@ -197,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',

tests/OpenCloud/Tests/Compute/Resource/ServerTest.php

@@ -116,6 +116,18 @@ public function test_Rebuild3()
         $this->assertNotNull($resp->getStatusCode());
     }
 
+    public function test_Suspend()
+    {
+        $resp = $this->server->suspend();
+        $this->assertNotNull($resp->getStatusCode());
+    }
+
+    public function test_Resume()
+    {
+        $resp = $this->server->resume();
+        $this->assertNotNull($resp->getStatusCode());
+    }
+
     public function test_Delete()
     {
         $resp = $this->server->delete();