Merge pull request #576 from ycombinator/gh-575

Adding support for availability zones in Compute servers.

Author: Jamie Hannaford

lib/OpenCloud/Compute/Resource/Server.php

@@ -172,6 +172,12 @@ class Server extends NovaResource implements HasPtrRecordsInterface
      */
     public $powerStatus;
 
+    /**
+     * @link http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-ext-az
+     * @var string Availability zone of the VM
+     */
+    public $availabilityZone;
+
     protected static $json_name = 'server';
     protected static $url_resource = 'servers';
 
@@ -206,6 +212,7 @@ class Server extends NovaResource implements HasPtrRecordsInterface
         'OS-EXT-STS:vm_state'    => 'extendedStatus',
         'OS-EXT-STS:task_state'  => 'taskStatus',
         'OS-EXT-STS:power_state' => 'powerStatus',
+        'OS-EXT-AZ:availability_zone' => 'availabilityZone'
     );
 
     /**
@@ -729,6 +736,12 @@ protected function createJson()
             $server->user_data = $this->user_data;
         }
 
+        // Availability zone
+        if (!empty($this->availabilityZone)) {
+            $this->checkExtension('OS-EXT-AZ');
+            $server->availability_zone = $this->availabilityZone;
+        }
+
         return (object) array('server' => $server);
     }
 

samples/Compute/create_server_with_availability_zone.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * Copyright 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.
+ */
+
+require dirname(__DIR__) . '/../vendor/autoload.php';
+
+use OpenCloud\OpenStack;
+use Guzzle\Http\Exception\BadResponseException;
+
+// 1. Instantiate a OpenStack client. You can replace {authUrl} with
+// OpenStack::US_IDENTITY_ENDPOINT or similar
+$client = new OpenStack('{authUrl}', array(
+    'username' => '{username}',
+    'password' => '{password}',
+));
+
+// 2. Create Compute service
+$service = $client->computeService('nova', '{region}');
+
+// 3. Get empty server
+$server = $service->server();
+
+// 4. Create the server. If you do not know what imageId or flavorId to use,
+// please run the list_flavors.php and list_images.php scripts.
+try {
+    $response = $server->create(array(
+        'name'             => '{serverName}',
+        'imageId'          => '{imageId}',
+        'flavorId'         => '{flavorId}',
+        'availabilityZone' => '{availabilityZone}'
+    ));
+} catch (BadResponseException $e) {
+    echo $e->getResponse();
+}

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

@@ -403,4 +403,13 @@ public function test_Stop()
         $this->addMockSubscriber(new \Guzzle\Http\Message\Response(202));
         $this->assertEquals(202, $this->server->stop()->getStatusCode());
     }
+
+    public function test_Create_Availability_Zone()
+    {
+        $new = new PublicServer($this->service);
+        $new->setAvailabilityZone('AZ1');
+        $obj = $new->CreateJson();
+
+        $this->assertEquals('AZ1', $obj->server->availability_zone);
+    }
 }

tests/OpenCloud/Tests/Compute/_response/Extensions.resp

@@ -15,6 +15,14 @@ Server: Jetty(8.0.y.z-SNAPSHOT)
             "alias": "OS-DCF",
             "description": "Disk Management Extension."
         },
+        {
+            "updated": "2013-01-30T00:00:00Z",
+            "name": "ExtendedAvailabilityZone",
+            "links": [],
+            "namespace": "http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2",
+            "alias": "OS-EXT-AZ",
+            "description": "Extended Availability Zone support."
+        },
         {
             "updated": "2013-02-19T00:00:00Z",
             "name": "ImageSize",