Merge pull request #451 from ycombinator/perf-to-general

Updating performance flavor references to equivalent general flavors.

Author: ycombinator

samples/Compute/create_server_from_bootable_volume.php

@@ -24,7 +24,7 @@
  * - RAX_API_KEY:  Your Rackspace Cloud Account API Key,
  * - RAX_REGION:   Rackspace Cloud region in which to create server; e.g.: DFW,
  * - RAX_BOOTABLE_VOLUME_ID: ID of bootable volume in Rackspace Cloud region, and
- * - RAX_FLAVOR_ID: ID of a compute flavor (performance or higher) in the Rackspace Cloud; e.g.: performance1-1.
+ * - RAX_FLAVOR_ID: ID of a compute flavor (general or higher) in the Rackspace Cloud; e.g.: general1-1.
  *
  * - You have an existing keypair. For this script, it will be called 'my_keypair'
  * but this will change depending on what you called yours.

samples/Compute/create_server_from_bootable_volume_delete_on_termination.php

@@ -24,7 +24,7 @@
  * - RAX_API_KEY:  Your Rackspace Cloud Account API Key,
  * - RAX_REGION:   Rackspace Cloud region in which to create server; e.g.: DFW,
  * - RAX_BOOTABLE_VOLUME_ID: ID of bootable volume in Rackspace Cloud region, and
- * - RAX_FLAVOR_ID: ID of a compute flavor (performance or higher) in the Rackspace Cloud; e.g.: performance1-1.
+ * - RAX_FLAVOR_ID: ID of a compute flavor (general or higher) in the Rackspace Cloud; e.g.: general1-1.
  *
  * - You have an existing keypair. For this script, it will be called 'my_keypair'
  * but this will change depending on what you called yours.

samples/Orchestration/lamp-updated.yaml

@@ -55,15 +55,15 @@ parameters:
       Required: Rackspace Cloud Server flavor to use. The size is based on the
       amount of RAM for the provisioned server.
     type: string
-    default: 1 GB Performance
+    default: 1 GB General Purpose v1
     constraints:
     - allowed_values:
-      - 1 GB Performance
-      - 2 GB Performance
-      - 4 GB Performance
-      - 8 GB Performance
-      - 15 GB Performance
-      - 30 GB Performance
+      - 1 GB General Purpose v1
+      - 2 GB General Purpose v1
+      - 4 GB General Purpose v1
+      - 8 GB General Purpose v1
+      - 15 GB I/O v1
+      - 30 GB I/O v1
       description: |
         Must be a valid Rackspace Cloud Server flavor for the region you have
         selected to deploy into.

samples/Orchestration/lamp.yaml

@@ -55,15 +55,15 @@ parameters:
       Required: Rackspace Cloud Server flavor to use. The size is based on the
       amount of RAM for the provisioned server.
     type: string
-    default: 1 GB Performance
+    default: 1 GB General Purpose v1
     constraints:
     - allowed_values:
-      - 1 GB Performance
-      - 2 GB Performance
-      - 4 GB Performance
-      - 8 GB Performance
-      - 15 GB Performance
-      - 30 GB Performance
+      - 1 GB General Purpose v1
+      - 2 GB General Purpose v1
+      - 4 GB General Purpose v1
+      - 8 GB General Purpose v1
+      - 15 GB I/O v1
+      - 30 GB I/O v1
       description: |
         Must be a valid Rackspace Cloud Server flavor for the region you have
         selected to deploy into.

tests/OpenCloud/Smoke/Resource/Orchestration/lamp-updated.yaml

@@ -55,15 +55,15 @@ parameters:
       Required: Rackspace Cloud Server flavor to use. The size is based on the
       amount of RAM for the provisioned server.
     type: string
-    default: 1 GB Performance
+    default: 1 GB General Purpose v1
     constraints:
     - allowed_values:
-      - 1 GB Performance
-      - 2 GB Performance
-      - 4 GB Performance
-      - 8 GB Performance
-      - 15 GB Performance
-      - 30 GB Performance
+      - 1 GB General Purpose v1
+      - 2 GB General Purpose v1
+      - 4 GB General Purpose v1
+      - 8 GB General Purpose v1
+      - 15 GB I/O v1
+      - 30 GB I/O v1
       description: |
         Must be a valid Rackspace Cloud Server flavor for the region you have
         selected to deploy into.

tests/OpenCloud/Smoke/Resource/Orchestration/lamp.yaml

@@ -55,15 +55,15 @@ parameters:
       Required: Rackspace Cloud Server flavor to use. The size is based on the
       amount of RAM for the provisioned server.
     type: string
-    default: 1 GB Performance
+    default: 1 GB General Purpose v1
     constraints:
     - allowed_values:
-      - 1 GB Performance
-      - 2 GB Performance
-      - 4 GB Performance
-      - 8 GB Performance
-      - 15 GB Performance
-      - 30 GB Performance
+      - 1 GB General Purpose v1
+      - 2 GB General Purpose v1
+      - 4 GB General Purpose v1
+      - 8 GB General Purpose v1
+      - 15 GB I/O v1
+      - 30 GB I/O v1
       description: |
         Must be a valid Rackspace Cloud Server flavor for the region you have
         selected to deploy into.

tests/OpenCloud/Smoke/Unit/Compute.php

@@ -35,7 +35,7 @@ class Compute extends AbstractUnit implements UnitInterface
     const SERVER_NAME  = 'FooServer';
     const SNAPSHOT_NAME = 'FooSnapshot';
 
-    const FLAVOR = 'performance1-2';
+    const FLAVOR = 'general1-2';
     const IMAGE  = "046832f9-4549-4b38-a903-11acecac8cb9";
 
     public function setupService()