Merge lp:~jtv/gwacl/a8-a9 into lp:gwacl

[Jeroen T. Vermeulen]

Document the newly announced A8 and A9 machine sizes, update pricing, and correct some disk sizes that should have been 605 GB but were accidentally written as 65 GB.

The Azure site has no information about numbers and sizes of disks on the new instance types, but it does list this information for the previous batch of new sizes so I updated our information about those.

It's starting to look attractive to support the "A2" etc. names for the traditional small/medium/large sizes, and the available information on disk sizes is now more detailed (if still not particularly clear to me). But this project is in low-maintenance mode, so for now I'll leave all that until somebody actually needs it.

Jeroen

[lp:~jtv/gwacl/a8-a9]

233. By Jeroen T. Vermeulen on 2014-01-31

Use more up-to-date version of the pricing page... why do they both exist?

[Raphaël Badin (rvb)]

While having a look at this branch, we found something amusing: http://www.windowsazure.com/en-us/pricing/details/virtual-machines/ and http://www.windowsazure.com/en-us/pricing/details/cloud-services/ show different prices for the same services. For instance the Medium (A2) machine is priced at $0.18 per hour on the first page and $0.16 on the second page.

Oh well, Jeroen tells me this is currently used for relative ordering so I guess that's all right.

review: Approve

=== modified file 'rolesizes.go'
--- rolesizes.go	2013-09-24 07:36:53 +0000
+++ rolesizes.go	2014-01-31 08:32:21 +0000
@@ -1,23 +1,26 @@
-// Copyright 2013 Canonical Ltd.  This software is licensed under the
+// Copyright 2013-2014 Canonical Ltd.  This software is licensed under the
 // GNU Lesser General Public License version 3 (see the file COPYING).
 
-// Define the various role sizes and their attributes.
+// Define the role sizes available in Azure.
 
 package gwacl
 
-// RoleSize is a representation of the data available in the Azure
+// RoleSize is a representation of the machine specs available in the Azure
 // documentation here:
 // http://msdn.microsoft.com/en-us/library/windowsazure/dn197896.aspx and
 //
 // Pricing from here:
-// http://www.windowsazure.com/en-us/pricing/details/virtual-machines/
+// http://www.windowsazure.com/en-us/pricing/details/cloud-services/
+//
+// Detailed specifications here:
+// http://msdn.microsoft.com/en-us/library/windowsazure/dn197896.aspx
 //
 // Our specifications may be inaccurate or out of date.  When in doubt, check!
 //
 // The Disk Space values are only the maxumim permitted; actual space is
 // determined by the OS image being used.
 //
-// Sizes and costs last updated 2013-09-24.
+// Sizes and costs last updated 2014-01-31.
 type RoleSize struct {
     Name             string
     CpuCores         uint64
@@ -52,7 +55,7 @@
         OSDiskSpaceCloud: 224 * GB,
         OSDiskSpaceVirt:  70 * GB,
         MaxDataDisks:     2,
-        Cost:             9,
+        Cost:             8,
     }, {
         Name:             "Medium",
         CpuCores:         2,
@@ -60,7 +63,7 @@
         OSDiskSpaceCloud: 489 * GB,
         OSDiskSpaceVirt:  135 * GB,
         MaxDataDisks:     4,
-        Cost:             18,
+        Cost:             16,
     }, {
         Name:             "Large",
         CpuCores:         4,
@@ -68,23 +71,23 @@
         OSDiskSpaceCloud: 999 * GB,
         OSDiskSpaceVirt:  285 * GB,
         MaxDataDisks:     8,
-        Cost:             36,
+        Cost:             32,
     }, {
         Name:             "ExtraLarge",
         CpuCores:         8,
         Mem:              14 * GB,
         OSDiskSpaceCloud: 2039 * GB,
-        OSDiskSpaceVirt:  65 * GB,
+        OSDiskSpaceVirt:  605 * GB,
         MaxDataDisks:     16,
-        Cost:             72,
+        Cost:             64,
     }, {
         Name:             "A5",
         CpuCores:         2,
         Mem:              14 * GB,
-        OSDiskSpaceCloud: 489 * GB, // Estimate; not yet announced.
-        OSDiskSpaceVirt:  285 * GB, // Estimate; not yet announced.
-        MaxDataDisks:     2,        // Estimate; not yet announced.
-        Cost:             51,
+        OSDiskSpaceCloud: 489 * GB,
+        OSDiskSpaceVirt:  135 * GB,
+        MaxDataDisks:     4,
+        Cost:             35,
     }, {
         Name:             "A6",
         CpuCores:         4,
@@ -92,15 +95,31 @@
         OSDiskSpaceCloud: 999 * GB,
         OSDiskSpaceVirt:  285 * GB,
         MaxDataDisks:     8,
-        Cost:             102,
+        Cost:             71,
     }, {
         Name:             "A7",
         CpuCores:         8,
         Mem:              56 * GB,
         OSDiskSpaceCloud: 2039 * GB,
-        OSDiskSpaceVirt:  65 * GB,
+        OSDiskSpaceVirt:  605 * GB,
         MaxDataDisks:     16,
-        Cost:             204,
+        Cost:             141,
+    }, {
+        Name:             "A8",
+        CpuCores:         8,
+        Mem:              56 * GB,
+        OSDiskSpaceCloud: 2039 * GB, // Estimate; not yet announced.
+        OSDiskSpaceVirt:  605 * GB,  // Estimate; not yet announced.
+        MaxDataDisks:     16,        // Estimate; not yet announced.
+        Cost:             245,
+    }, {
+        Name:             "A9",
+        CpuCores:         16,
+        Mem:              112 * GB,
+        OSDiskSpaceCloud: 2039 * GB, // Estimate; not yet announced.
+        OSDiskSpaceVirt:  605 * GB,  // Estimate; not yet announced.
+        MaxDataDisks:     16,        // Estimate; not yet announced.
+        Cost:             490,
     },
 }