Merge lp:~julian-edwards/gwacl/augment-rolesizes into lp:gwacl

[Julian Edwards]

Add more comments, better units and an extra map of role names to role sizes, with thanks to jtv for his ideas.

Taking inspiration from https://code.launchpad.net/~jtv/gwacl/machine-types/+merge/175736 which unfortunately was done at the same time as something I did for this, I've enhanced what I already landed with jtv's ideas.

[Jeroen T. Vermeulen (jtv)]

Thanks for integrating this. It may seem strange that I used thousandths of US dollars in my branch, but that's also what Juju's EC2 provider does. EC2's pricing structure makes use of the extra precision, and Microsoft may find they'll want to tweak their pricing more.

I think it's still worth saying in so many words that we make no guarantees with these cost indications and that we'll happily let them go out of date if no updates are required for our purposes. Otherwise, your statement that the information is correct (do we even really know that?) as of a given date may reasonably be construed as a promise to keep the list updated.

review: Approve

[Julian Edwards (julian-edwards)]

On 23/07/13 12:44, Jeroen T. Vermeulen wrote:
> Review: Approve
>
> Thanks for integrating this. It may seem strange that I used thousandths of US dollars in my branch, but that's also what Juju's EC2 provider does. EC2's pricing structure makes use of the extra precision, and Microsoft may find they'll want to tweak their pricing more.
>
> I think it's still worth saying in so many words that we make no guarantees with these cost indications and that we'll happily let them go out of date if no updates are required for our purposes. Otherwise, your statement that the information is correct (do we even really know that?) as of a given date may reasonably be construed as a promise to keep the list updated.
>

Normally saying something like that means you know it's correct as of a
certain date but you make no guarantees it's correct at a later date.
It just means you checked it on that date.

Thanks for the review!

=== modified file 'rolesizes.go'
--- rolesizes.go	2013-07-19 05:37:56 +0000
+++ rolesizes.go	2013-07-22 03:52:27 +0000
@@ -10,72 +10,92 @@
 // http://msdn.microsoft.com/en-us/library/windowsazure/dn197896.aspx and
 // pricing from here:
 // http://www.windowsazure.com/en-us/pricing/details/virtual-machines/
+// and is correct as of 2013-07-22.
+//
+// The Disk Space values are only the maxumim permitted; actual space is
+// determined by the OS image being used.
 type RoleSize struct {
     Name             string
     CpuCores         uint64
     Mem              uint64 // In MB
-    OSDiskSpaceCloud uint64 // In GB
-    OSDiskSpaceVirt  uint64 // In GB
+    OSDiskSpaceCloud uint64 // In MB
+    OSDiskSpaceVirt  uint64 // In MB
     MaxDataDisks     uint64 // 1TB each
-    Cost             uint64 // US ¢ (cents) per hour
+    Cost             uint64 // USD cents per hour
 }
 
+const (
+    // MB is the unit in which we specify sizes, so it's 1.
+    // But please include it anyway, so that units are always explicit.
+    MB = 1
+    GB = 1024*MB
+    TB = 1024*GB
+)
+
 var RoleSizes = []RoleSize{
     {
         Name:             "ExtraSmall",
         CpuCores:         1,  // shared
-        Mem:              768,
-        OSDiskSpaceCloud: 19,
-        OSDiskSpaceVirt:  20,
+        Mem:              768*MB,
+        OSDiskSpaceCloud: 19*GB,
+        OSDiskSpaceVirt:  20*GB,
         MaxDataDisks:     1,
         Cost:             2,
     }, {
         Name:             "Small",
         CpuCores:         1,
-        Mem:              1792,
-        OSDiskSpaceCloud: 224,
-        OSDiskSpaceVirt:  70,
+        Mem:              1.75*GB,
+        OSDiskSpaceCloud: 224*GB,
+        OSDiskSpaceVirt:  70*GB,
         MaxDataDisks:     2,
         Cost:             6,
     }, {
         Name:             "Medium",
         CpuCores:         2,
-        Mem:              3584,
-        OSDiskSpaceCloud: 489,
-        OSDiskSpaceVirt:  135,
+        Mem:              3.5*GB,
+        OSDiskSpaceCloud: 489*GB,
+        OSDiskSpaceVirt:  135*GB,
         MaxDataDisks:     4,
         Cost:             12,
     }, {
         Name:             "Large",
         CpuCores:         4,
-        Mem:              7168,
-        OSDiskSpaceCloud: 999,
-        OSDiskSpaceVirt:  285,
+        Mem:              7*GB,
+        OSDiskSpaceCloud: 999*GB,
+        OSDiskSpaceVirt:  285*GB,
         MaxDataDisks:     8,
         Cost:             24,
     }, {
         Name:             "ExtraLarge",
         CpuCores:         8,
-        Mem:              14336,
-        OSDiskSpaceCloud: 2039,
-        OSDiskSpaceVirt:  65,
+        Mem:              14*GB,
+        OSDiskSpaceCloud: 2039*GB,
+        OSDiskSpaceVirt:  65*GB,
         MaxDataDisks:     16,
         Cost:             48,
     }, {
         Name:             "A6",
         CpuCores:         4,
-        Mem:              28672,
-        OSDiskSpaceCloud: 999,
-        OSDiskSpaceVirt:  285,
+        Mem:              28*GB,
+        OSDiskSpaceCloud: 999*GB,
+        OSDiskSpaceVirt:  285*GB,
         MaxDataDisks:     8,
         Cost:             82,
     }, {
         Name:             "A7",
         CpuCores:         8,
-        Mem:              57344,
-        OSDiskSpaceCloud: 2039,
-        OSDiskSpaceVirt:  65,
+        Mem:              56*GB,
+        OSDiskSpaceCloud: 2039*GB,
+        OSDiskSpaceVirt:  65*GB,
         MaxDataDisks:     16,
         Cost:             164,
     },
 }
+
+var RoleNameMap map[string]RoleSize = make(map[string]RoleSize)
+
+func init() {
+    for _, rolesize := range RoleSizes {
+        RoleNameMap[rolesize.Name] = rolesize
+    }
+}

=== added file 'rolesizes_test.go'
--- rolesizes_test.go	1970-01-01 00:00:00 +0000
+++ rolesizes_test.go	2013-07-22 03:52:27 +0000
@@ -0,0 +1,16 @@
+// Copyright 2013 Canonical Ltd.  This software is licensed under the
+// GNU Lesser General Public License version 3 (see the file COPYING).
+
+package gwacl
+
+import (
+    . "launchpad.net/gocheck"
+)
+
+type rolesizeSuite struct{}
+
+var _ = Suite(&rolesizeSuite{})
+
+func (suite *rolesizeSuite) TestMapIsCreated(c *C) {
+    c.Check(RoleNameMap, HasLen, len(RoleSizes))
+}