Go Windows Azure Client Library

Merge lp:~axwalk/gwacl/rolesizes-update into lp:gwacl

rolesizes-update
Merge into trunk

Proposed by Andrew Wilkins on 2014-06-23

Status:	Merged
Approved by:	Andrew Wilkins on 2014-06-24
Approved revision:	236
Merge reported by:	Andrew Wilkins
Merged at revision:	not available
Proposed branch:	lp:~axwalk/gwacl/rolesizes-update
Merge into:	lp:gwacl
Diff against target:	512 lines (+370/-100) 2 files modified rolesizes.go (+332/-98) rolesizes_test.go (+38/-2)
To merge this branch:	bzr merge lp:~axwalk/gwacl/rolesizes-update
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ian Booth		2014-06-23	Approve on 2014-06-24
Review via email: mp+224103@code.launchpad.net

Description of the change

Update role sizes

- Add basic tier role sizes.
- Fix OS disk sizes.
- Separate cost from role sizes,
record region-specific costs.

Revision history for this message

Ian Booth (wallyworld) wrote on 2014-06-24:

I think a type alias would be good.

review: Approve

lp:~axwalk/gwacl/rolesizes-update updated on 2014-06-24

236. By Andrew Wilkins on 2014-06-24: Add type name for cost unit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andrew Wilkins

GWACL Hackers

 === modified file 'rolesizes.go'
 --- rolesizes.go	2014-01-31 08:32:00 +0000
 +++ rolesizes.go	2014-06-24 03:26:22 +0000
@@ -5,32 +5,38 @@
  package gwacl
++import (
++    "fmt"
++)
++
  // 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
++//   http://msdn.microsoft.com/en-us/library/windowsazure/dn197896.aspx
  //
  // Pricing from here:
--// http://www.windowsazure.com/en-us/pricing/details/cloud-services/
++//   http://azure.microsoft.com/en-us/pricing/details/virtual-machines
  //
  // Detailed specifications here:
--// http://msdn.microsoft.com/en-us/library/windowsazure/dn197896.aspx
++//   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 2014-01-31.
++// Sizes and costs last updated 2014-06-23.
  type RoleSize struct {
--    Name             string
--    CpuCores         uint64
--    Mem              uint64 // In MB
--    OSDiskSpaceCloud uint64 // In MB
--    OSDiskSpaceVirt  uint64 // In MB
--    MaxDataDisks     uint64 // 1TB each
--    Cost             uint64 // USD cents per hour
++    Name          string
++    CpuCores      uint64
++    Mem           uint64 // In MB
++    OSDiskSpace   uint64 // In MB
++    TempDiskSpace uint64 // In MB
++    MaxDataDisks  uint64 // 1TB each
+ }
++// decicentsPerHour is the unit of cost we store for RoleSizeCost.
++type decicentsPerHour uint64
++
  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.
@@ -39,94 +45,322 @@
      TB  = 1024 * GB
+ )
--var RoleSizes = []RoleSize{
--    {
--        Name:             "ExtraSmall",
--        CpuCores:         1,  // shared
--        Mem:              768 * MB,
--        OSDiskSpaceCloud: 19 * GB,
--        OSDiskSpaceVirt:  20 * GB,
--        MaxDataDisks:     1,
--        Cost:             2,
--    }, {
--        Name:             "Small",
--        CpuCores:         1,
--        Mem:              1.75 * GB,
--        OSDiskSpaceCloud: 224 * GB,
--        OSDiskSpaceVirt:  70 * GB,
--        MaxDataDisks:     2,
--        Cost:             8,
--    }, {
--        Name:             "Medium",
--        CpuCores:         2,
--        Mem:              3.5 * GB,
--        OSDiskSpaceCloud: 489 * GB,
--        OSDiskSpaceVirt:  135 * GB,
--        MaxDataDisks:     4,
--        Cost:             16,
--    }, {
--        Name:             "Large",
--        CpuCores:         4,
--        Mem:              7 * GB,
--        OSDiskSpaceCloud: 999 * GB,
--        OSDiskSpaceVirt:  285 * GB,
--        MaxDataDisks:     8,
--        Cost:             32,
--    }, {
--        Name:             "ExtraLarge",
--        CpuCores:         8,
--        Mem:              14 * GB,
--        OSDiskSpaceCloud: 2039 * GB,
--        OSDiskSpaceVirt:  605 * GB,
--        MaxDataDisks:     16,
--        Cost:             64,
--    }, {
--        Name:             "A5",
--        CpuCores:         2,
--        Mem:              14 * GB,
--        OSDiskSpaceCloud: 489 * GB,
--        OSDiskSpaceVirt:  135 * GB,
--        MaxDataDisks:     4,
--        Cost:             35,
--    }, {
--        Name:             "A6",
--        CpuCores:         4,
--        Mem:              28 * GB,
--        OSDiskSpaceCloud: 999 * GB,
--        OSDiskSpaceVirt:  285 * GB,
--        MaxDataDisks:     8,
--        Cost:             71,
--    }, {
--        Name:             "A7",
--        CpuCores:         8,
--        Mem:              56 * GB,
--        OSDiskSpaceCloud: 2039 * GB,
--        OSDiskSpaceVirt:  605 * GB,
--        MaxDataDisks:     16,
--        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,
++// Basic tier roles.
++var basicRoleSizes = []RoleSize{{ // A0..A4: general purpose
++    Name:          "Basic_A0",
++    CpuCores:      1,  // shared
++    Mem:           768 * MB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 20 * GB,
++    MaxDataDisks:  1,
++}, {
++    Name:          "Basic_A1",
++    CpuCores:      1,
++    Mem:           1.75 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 40 * GB,
++    MaxDataDisks:  2,
++}, {
++    Name:          "Basic_A2",
++    CpuCores:      2,
++    Mem:           3.5 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 60 * GB,
++    MaxDataDisks:  4,
++}, {
++    Name:          "Basic_A3",
++    CpuCores:      4,
++    Mem:           7 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 120 * GB,
++    MaxDataDisks:  8,
++}, {
++    Name:          "Basic_A4",
++    CpuCores:      8,
++    Mem:           14 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 240 * GB,
++    MaxDataDisks:  16,
++}}
++
++// Standard tier roles.
++var standardRoleSizes = []RoleSize{{ // A0..A4: general purpose
++    Name:          "ExtraSmall", // A0
++    CpuCores:      1,            // shared
++    Mem:           768 * MB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 20 * GB,
++    MaxDataDisks:  1,
++}, {
++    Name:          "Small", // A1
++    CpuCores:      1,
++    Mem:           1.75 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 70 * GB,
++    MaxDataDisks:  2,
++}, {
++    Name:          "Medium", // A2
++    CpuCores:      2,
++    Mem:           3.5 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 135 * GB,
++    MaxDataDisks:  4,
++}, {
++    Name:          "Large", // A3
++    CpuCores:      4,
++    Mem:           7 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 285 * GB,
++    MaxDataDisks:  8,
++}, {
++    Name:          "ExtraLarge", // A4
++    CpuCores:      8,
++    Mem:           14 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 605 * GB,
++    MaxDataDisks:  16,
++}, { // A5..A7: memory intensive
++    Name:          "A5",
++    CpuCores:      2,
++    Mem:           14 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 135 * GB,
++    MaxDataDisks:  4,
++}, {
++    Name:          "A6",
++    CpuCores:      4,
++    Mem:           28 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 285 * GB,
++    MaxDataDisks:  8,
++}, {
++    Name:          "A7",
++    CpuCores:      8,
++    Mem:           56 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 605 * GB,
++    MaxDataDisks:  16,
++}, { // A8..A9: compute intensive
++    Name:          "A8",
++    CpuCores:      8,
++    Mem:           56 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 382 * GB,
++    MaxDataDisks:  16,
++}, {
++    Name:          "A9",
++    CpuCores:      16,
++    Mem:           112 * GB,
++    OSDiskSpace:   127 * GB,
++    TempDiskSpace: 382 * GB,
++    MaxDataDisks:  16,
++}}
++
++// RoleSizes describes all known role sizes.
++var RoleSizes = append(append([]RoleSize{}, basicRoleSizes...), standardRoleSizes...)
++
++var allRegionRoleCosts = map[string]map[string]decicentsPerHour{
++    "East US": {
++        "Basic_A0":   18,
++        "Basic_A1":   44,
++        "Basic_A2":   88,
++        "Basic_A3":   176,
++        "Basic_A4":   352,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         250,
++        "A6":         500,
++        "A7":         1000,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "West US": {
++        "Basic_A0":   18,
++        "Basic_A1":   47,
++        "Basic_A2":   94,
++        "Basic_A3":   188,
++        "Basic_A4":   376,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         250,
++        "A6":         500,
++        "A7":         1000,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "North Central US": {
++        "Basic_A0":   18,
++        "Basic_A1":   47,
++        "Basic_A2":   94,
++        "Basic_A3":   188,
++        "Basic_A4":   376,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         250,
++        "A6":         500,
++        "A7":         1000,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "South Central US": {
++        "Basic_A0":   18,
++        "Basic_A1":   44,
++        "Basic_A2":   88,
++        "Basic_A3":   176,
++        "Basic_A4":   352,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         220,
++        "A6":         440,
++        "A7":         880,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "North Europe": {
++        "Basic_A0":   18,
++        "Basic_A1":   47,
++        "Basic_A2":   94,
++        "Basic_A3":   188,
++        "Basic_A4":   376,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         248,
++        "A6":         496,
++        "A7":         992,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "West Europe": {
++        "Basic_A0":   18,
++        "Basic_A1":   51,
++        "Basic_A2":   102,
++        "Basic_A3":   204,
++        "Basic_A4":   408,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         270,
++        "A6":         540,
++        "A7":         1080,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "Southeast Asia": {
++        "Basic_A0":   18,
++        "Basic_A1":   58,
++        "Basic_A2":   116,
++        "Basic_A3":   232,
++        "Basic_A4":   464,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         270,
++        "A6":         540,
++        "A7":         1080,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "East Asia": {
++        "Basic_A0":   18,
++        "Basic_A1":   58,
++        "Basic_A2":   116,
++        "Basic_A3":   232,
++        "Basic_A4":   464,
++        "ExtraSmall": 20,
++        "Small":      60,
++        "Medium":     120,
++        "Large":      240,
++        "ExtraLarge": 480,
++        "A5":         294,
++        "A6":         588,
++        "A7":         1176,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "Japan East": {
++        "Basic_A0":   18,
++        "Basic_A1":   69,
++        "Basic_A2":   138,
++        "Basic_A3":   276,
++        "Basic_A4":   552,
++        "ExtraSmall": 27,
++        "Small":      81,
++        "Medium":     162,
++        "Large":      324,
++        "ExtraLarge": 648,
++        "A5":         281,
++        "A6":         562,
++        "A7":         1124,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "Japan West": {
++        "Basic_A0":   18,
++        "Basic_A1":   61,
++        "Basic_A2":   122,
++        "Basic_A3":   244,
++        "Basic_A4":   488,
++        "ExtraSmall": 25,
++        "Small":      73,
++        "Medium":     146,
++        "Large":      292,
++        "ExtraLarge": 584,
++        "A5":         258,
++        "A6":         516,
++        "A7":         1032,
++        "A8":         1970,
++        "A9":         4470,
++    },
++    "Brazil South": {
++        "Basic_A0":   22,
++        "Basic_A1":   58,
++        "Basic_A2":   116,
++        "Basic_A3":   232,
++        "Basic_A4":   464,
++        "ExtraSmall": 27,
++        "Small":      80,
++        "Medium":     160,
++        "Large":      320,
++        "ExtraLarge": 640,
++        "A5":         291,
++        "A6":         582,
++        "A7":         1164,
++        "A8":         1970,
++        "A9":         4470,
      },
+ }
--var RoleNameMap map[string]RoleSize = make(map[string]RoleSize)
--
--func init() {
--    for _, rolesize := range RoleSizes {
--        RoleNameMap[rolesize.Name] = rolesize
--    }
++// RoleSizeCost returns the cost associated with the given role size and region.
++func RoleSizeCost(region string, roleSize string) (decicentsPerHour uint64, err error) {
++    costs, ok := allRegionRoleCosts[region]
++    if !ok {
++        return 0, fmt.Errorf("no cost data for region %q", region)
++    }
++    cost, ok := costs[roleSize]
++    if ok {
++        return uint64(cost), nil
++    }
++    return 0, fmt.Errorf(
++        "no cost data for role size %q in region %q",
++        roleSize, region,
++    )
+ }
 === modified file 'rolesizes_test.go'
 --- rolesizes_test.go	2013-07-22 03:46:15 +0000
 +++ rolesizes_test.go	2014-06-24 03:26:22 +0000
@@ -11,6 +11,42 @@
  var _ = Suite(&rolesizeSuite{})
--func (suite *rolesizeSuite) TestMapIsCreated(c *C) {
--    c.Check(RoleNameMap, HasLen, len(RoleSizes))
++var knownRegions = []string{
++    "East US",
++    "West US",
++    "North Central US",
++    "South Central US",
++    "North Europe",
++    "West Europe",
++    "Southeast Asia",
++    "East Asia",
++    "Japan East",
++    "Japan West",
++    "Brazil South",
++}
++
++var knownSizes = []string{
++    "Basic_A0", "Basic_A1", "Basic_A2", "Basic_A3", "Basic_A4",
++    "ExtraSmall", "Small", "Medium", "Large", "ExtraLarge",
++    "A5", "A6", "A7", "A8", "A9",
++}
++
++func (suite *rolesizeSuite) TestRoleCostKnownRegions(c *C) {
++    for _, region := range knownRegions {
++        for _, roleSize := range knownSizes {
++            cost, err := RoleSizeCost(region, roleSize)
++            c.Check(err, IsNil)
++            c.Check(cost, Not(Equals), uint64(0))
++        }
++    }
++}
++
++func (suite *rolesizeSuite) TestRoleCostUnknownRegion(c *C) {
++    _, err := RoleSizeCost("Eastasia", "A0")
++    c.Assert(err, ErrorMatches, `no cost data for region "Eastasia"`)
++}
++
++func (suite *rolesizeSuite) TestRoleCostUnknownRoleSize(c *C) {
++    _, err := RoleSizeCost("East US", "A10")
++    c.Assert(err, ErrorMatches, `no cost data for role size "A10" in region "East US"`)
+ }

Go Windows Azure Client Library

Merge lp:~axwalk/gwacl/rolesizes-update into lp:gwacl

Commit message

Description of the change

Preview Diff

Subscribers