Go Windows Azure Client Library

Merge lp:~hazmat/gwacl/azure-new-instances-and-regions into lp:gwacl

  1. azure-new-instances-and-regions
  2. Merge into trunk
Proposed by Kapil Thangavelu
Status: Merged
Merged at revision: 239
Proposed branch: lp:~hazmat/gwacl/azure-new-instances-and-regions
Merge into: lp:gwacl
Diff against target: 458 lines (+300/-13)
3 files modified
management_base.go (+1/-1)
rolesizes.go (+293/-11)
rolesizes_test.go (+6/-1)
To merge this branch: bzr merge lp:~hazmat/gwacl/azure-new-instances-and-regions
Reviewer Review Type Date Requested Status
Andrew Wilkins (community) Approve
Review via email: mp+243212@code.launchpad.net

Description of the change

Add missing instance types (D1-D14 and G1-G5) and regions (US Central, Australia x 2) and updating costs with latest extant. The G series aren't publicly available (private beta it seems), but there has been a request to enable it. I'm doing so speculatively for the G5 in two regions.

To post a comment you must log in.
Revision history for this message
Kapil Thangavelu (hazmat) wrote :

associated to bug http://pad.lv/1389422

Revision history for this message
Andrew Wilkins (axwalk) wrote :

LGTM with extra region. Can you please run "make format" before landing? I'd prefer gofmt, but that's how it is for now.

review: Approve
Revision history for this message
Kapil Thangavelu (hazmat) wrote :

thanks for the catch re region and test. it looks like the make format is broken with go1.3 as gofmt (which it uses) doesn't support the --tabs/--tab-spaces options anymore. i've rebuilt an older version of go for now but its likely to come up again and i'd suggest we just switch out to standard gofmt.

lp:~hazmat/gwacl/azure-new-instances-and-regions updated
240. By Kapil Thangavelu

add in us east 2 to unit tests, reformat with old version of gofmt per project style

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'management_base.go'
2--- management_base.go 2014-09-25 02:16:44 +0000
3+++ management_base.go 2014-12-01 10:30:59 +0000
4@@ -6,10 +6,10 @@
5 import (
6 "encoding/xml"
7 "fmt"
8+ "launchpad.net/gwacl/fork/tls"
9 "net/http"
10 "strings"
11 "time"
12- "launchpad.net/gwacl/fork/tls"
13 )
14
15 // Note: each API call is required to include a version string in the request header.
16
17=== modified file 'rolesizes.go'
18--- rolesizes.go 2014-06-24 03:23:45 +0000
19+++ rolesizes.go 2014-12-01 10:30:59 +0000
20@@ -140,7 +140,7 @@
21 OSDiskSpace: 127 * GB,
22 TempDiskSpace: 605 * GB,
23 MaxDataDisks: 16,
24-}, { // A8..A9: compute intensive
25+}, { // A8..A9: compute intensive / fast network & infiniband suport
26 Name: "A8",
27 CpuCores: 8,
28 Mem: 56 * GB,
29@@ -154,7 +154,98 @@
30 OSDiskSpace: 127 * GB,
31 TempDiskSpace: 382 * GB,
32 MaxDataDisks: 16,
33-}}
34+}, { // D Series - xeon v3 and ssd local
35+ Name: "D1",
36+ CpuCores: 1,
37+ Mem: 3.5 * GB,
38+ OSDiskSpace: 127 * GB,
39+ TempDiskSpace: 50 * GB,
40+ MaxDataDisks: 2,
41+}, {
42+ Name: "D2",
43+ CpuCores: 2,
44+ Mem: 7 * GB,
45+ OSDiskSpace: 127 * GB,
46+ TempDiskSpace: 100 * GB,
47+ MaxDataDisks: 4,
48+}, {
49+ Name: "D3",
50+ CpuCores: 4,
51+ Mem: 14 * GB,
52+ OSDiskSpace: 127 * GB,
53+ TempDiskSpace: 200 * GB,
54+ MaxDataDisks: 8,
55+}, {
56+ Name: "D4",
57+ CpuCores: 8,
58+ Mem: 28 * GB,
59+ OSDiskSpace: 127 * GB,
60+ TempDiskSpace: 400 * GB,
61+ MaxDataDisks: 16,
62+}, {
63+ Name: "D11",
64+ CpuCores: 2,
65+ Mem: 14 * GB,
66+ OSDiskSpace: 127 * GB,
67+ TempDiskSpace: 100 * GB,
68+ MaxDataDisks: 4,
69+}, {
70+ Name: "D12",
71+ CpuCores: 4,
72+ Mem: 28 * GB,
73+ OSDiskSpace: 127 * GB,
74+ TempDiskSpace: 200 * GB,
75+ MaxDataDisks: 8,
76+}, {
77+ Name: "D13",
78+ CpuCores: 8,
79+ Mem: 56 * GB,
80+ OSDiskSpace: 127 * GB,
81+ TempDiskSpace: 400 * GB,
82+ MaxDataDisks: 16,
83+}, {
84+ Name: "D14",
85+ CpuCores: 16,
86+ Mem: 112 * GB,
87+ OSDiskSpace: 127 * GB,
88+ TempDiskSpace: 800 * GB,
89+ MaxDataDisks: 16,
90+}, { // G Series Large Compute + SSD Local
91+ Name: "G1",
92+ CpuCores: 2,
93+ Mem: 28 * GB,
94+ OSDiskSpace: 127 * GB,
95+ TempDiskSpace: 406 * GB,
96+ MaxDataDisks: 4,
97+}, {
98+ Name: "G2",
99+ CpuCores: 4,
100+ Mem: 56 * GB,
101+ OSDiskSpace: 127 * GB,
102+ TempDiskSpace: 812 * GB,
103+ MaxDataDisks: 8,
104+}, {
105+ Name: "G3",
106+ CpuCores: 8,
107+ Mem: 112 * GB,
108+ OSDiskSpace: 127 * GB,
109+ TempDiskSpace: 1630 * GB,
110+ MaxDataDisks: 16,
111+}, {
112+ Name: "G4",
113+ CpuCores: 16,
114+ Mem: 224 * GB,
115+ OSDiskSpace: 127 * GB,
116+ TempDiskSpace: 3250 * GB,
117+ MaxDataDisks: 16,
118+}, {
119+ Name: "G5",
120+ CpuCores: 32,
121+ Mem: 448 * GB,
122+ OSDiskSpace: 127 * GB,
123+ TempDiskSpace: 6500 * GB,
124+ MaxDataDisks: 16},
125+}
126
127 // RoleSizes describes all known role sizes.
128 var RoleSizes = append(append([]RoleSize{}, basicRoleSizes...), standardRoleSizes...)
129@@ -176,6 +267,40 @@
130 "A7": 1000,
131 "A8": 1970,
132 "A9": 4470,
133+ "D1": 94,
134+ "D2": 188,
135+ "D3": 376,
136+ "D4": 752,
137+ "D11": 238,
138+ "D12": 476,
139+ "D13": 857,
140+ "D14": 1542,
141+ },
142+ "East US 2": {
143+ "Basic_A0": 18,
144+ "Basic_A1": 44,
145+ "Basic_A2": 88,
146+ "Basic_A3": 176,
147+ "Basic_A4": 352,
148+ "ExtraSmall": 20,
149+ "Small": 60,
150+ "Medium": 120,
151+ "Large": 240,
152+ "ExtraLarge": 480,
153+ "A5": 220,
154+ "A6": 440,
155+ "A7": 880,
156+ "A8": 1970,
157+ "A9": 4470,
158+ "D1": 85,
159+ "D2": 170,
160+ "D3": 340,
161+ "D4": 680,
162+ "D11": 214,
163+ "D12": 428,
164+ "D13": 770,
165+ "D14": 1387,
166+ "G5": 8940, // Estimate, price is not public
167 },
168 "West US": {
169 "Basic_A0": 18,
170@@ -193,6 +318,40 @@
171 "A7": 1000,
172 "A8": 1970,
173 "A9": 4470,
174+ "D1": 94,
175+ "D2": 188,
176+ "D3": 376,
177+ "D4": 752,
178+ "D11": 238,
179+ "D12": 476,
180+ "D13": 857,
181+ "D14": 1542,
182+ },
183+
184+ "Central US": {
185+ "Basic_A0": 18,
186+ "Basic_A1": 60,
187+ "Basic_A2": 94,
188+ "Basic_A3": 188,
189+ "Basic_A4": 376,
190+ "ExtraSmall": 20,
191+ "Small": 60,
192+ "Medium": 120,
193+ "Large": 240,
194+ "ExtraLarge": 480,
195+ "A5": 250,
196+ "A6": 500,
197+ "A7": 1000,
198+ "A8": 1970,
199+ "A9": 4470,
200+ "D1": 94,
201+ "D2": 188,
202+ "D3": 376,
203+ "D4": 752,
204+ "D11": 238,
205+ "D12": 476,
206+ "D13": 857,
207+ "D14": 1542,
208 },
209 "North Central US": {
210 "Basic_A0": 18,
211@@ -210,6 +369,14 @@
212 "A7": 1000,
213 "A8": 1970,
214 "A9": 4470,
215+ "D1": 94,
216+ "D2": 188,
217+ "D3": 376,
218+ "D4": 752,
219+ "D11": 238,
220+ "D12": 476,
221+ "D13": 857,
222+ "D14": 1542,
223 },
224 "South Central US": {
225 "Basic_A0": 18,
226@@ -227,6 +394,15 @@
227 "A7": 880,
228 "A8": 1970,
229 "A9": 4470,
230+ "D1": 85,
231+ "D2": 170,
232+ "D3": 340,
233+ "D4": 680,
234+ "D11": 214,
235+ "D12": 428,
236+ "D13": 770,
237+ "D14": 1387,
238+ "G5": 8940, // Estimate, price is not public
239 },
240 "North Europe": {
241 "Basic_A0": 18,
242@@ -244,6 +420,14 @@
243 "A7": 992,
244 "A8": 1970,
245 "A9": 4470,
246+ "D1": 94,
247+ "D2": 188,
248+ "D3": 376,
249+ "D4": 752,
250+ "D11": 238,
251+ "D12": 476,
252+ "D13": 857,
253+ "D14": 1542,
254 },
255 "West Europe": {
256 "Basic_A0": 18,
257@@ -261,6 +445,14 @@
258 "A7": 1080,
259 "A8": 1970,
260 "A9": 4470,
261+ "D1": 115,
262+ "D2": 230,
263+ "D3": 460,
264+ "D4": 920,
265+ "D11": 273,
266+ "D12": 546,
267+ "D13": 983,
268+ "D14": 1769,
269 },
270 "Southeast Asia": {
271 "Basic_A0": 18,
272@@ -278,6 +470,14 @@
273 "A7": 1080,
274 "A8": 1970,
275 "A9": 4470,
276+ "D1": 120,
277+ "D2": 240,
278+ "D3": 480,
279+ "D4": 960,
280+ "D11": 256,
281+ "D12": 512,
282+ "D13": 922,
283+ "D14": 1659,
284 },
285 "East Asia": {
286 "Basic_A0": 18,
287@@ -295,6 +495,14 @@
288 "A7": 1176,
289 "A8": 1970,
290 "A9": 4470,
291+ "D1": 138,
292+ "D2": 276,
293+ "D3": 552,
294+ "D4": 1104,
295+ "D11": 295,
296+ "D12": 590,
297+ "D13": 1062,
298+ "D14": 1912,
299 },
300 "Japan East": {
301 "Basic_A0": 18,
302@@ -310,16 +518,24 @@
303 "A5": 281,
304 "A6": 562,
305 "A7": 1124,
306- "A8": 1970,
307- "A9": 4470,
308+ "A8": 2325,
309+ "A9": 5275,
310+ "D1": 142,
311+ "D2": 284,
312+ "D3": 568,
313+ "D4": 1136,
314+ "D11": 295,
315+ "D12": 590,
316+ "D13": 1062,
317+ "D14": 1912,
318 },
319 "Japan West": {
320- "Basic_A0": 18,
321+ "Basic_A0": 19,
322 "Basic_A1": 61,
323 "Basic_A2": 122,
324 "Basic_A3": 244,
325 "Basic_A4": 488,
326- "ExtraSmall": 25,
327+ "ExtraSmall": 21,
328 "Small": 73,
329 "Medium": 146,
330 "Large": 292,
331@@ -327,8 +543,16 @@
332 "A5": 258,
333 "A6": 516,
334 "A7": 1032,
335- "A8": 1970,
336- "A9": 4470,
337+ "A8": 2088,
338+ "A9": 4738,
339+ "D1": 123,
340+ "D2": 246,
341+ "D3": 492,
342+ "D4": 984,
343+ "D11": 256,
344+ "D12": 512,
345+ "D13": 922,
346+ "D14": 1659,
347 },
348 "Brazil South": {
349 "Basic_A0": 22,
350@@ -336,7 +560,7 @@
351 "Basic_A2": 116,
352 "Basic_A3": 232,
353 "Basic_A4": 464,
354- "ExtraSmall": 27,
355+ "ExtraSmall": 24,
356 "Small": 80,
357 "Medium": 160,
358 "Large": 320,
359@@ -344,8 +568,66 @@
360 "A5": 291,
361 "A6": 582,
362 "A7": 1164,
363- "A8": 1970,
364- "A9": 4470,
365+ "A8": 2403,
366+ "A9": 5453,
367+ "D1": 116,
368+ "D2": 232,
369+ "D3": 464,
370+ "D4": 928,
371+ "D11": 290,
372+ "D12": 580,
373+ "D13": 1044,
374+ "D14": 1879,
375+ },
376+ "Australia East": {
377+ "Basic_A0": 24,
378+ "Basic_A1": 58,
379+ "Basic_A2": 116,
380+ "Basic_A3": 232,
381+ "Basic_A4": 464,
382+ "ExtraSmall": 29,
383+ "Small": 71,
384+ "Medium": 142,
385+ "Large": 284,
386+ "ExtraLarge": 568,
387+ "A5": 278,
388+ "A6": 556,
389+ "A7": 1112,
390+ "A8": 2224,
391+ "A9": 4448,
392+ "D1": 120,
393+ "D2": 239,
394+ "D3": 478,
395+ "D4": 956,
396+ "D11": 256,
397+ "D12": 512,
398+ "D13": 922,
399+ "D14": 1660,
400+ },
401+ "Australia Southeast": {
402+ "Basic_A0": 24,
403+ "Basic_A1": 58,
404+ "Basic_A2": 116,
405+ "Basic_A3": 232,
406+ "Basic_A4": 464,
407+ "ExtraSmall": 29,
408+ "Small": 71,
409+ "Medium": 142,
410+ "Large": 284,
411+ "ExtraLarge": 568,
412+ "A5": 278,
413+ "A6": 556,
414+ "A7": 1112,
415+ "A8": 2224,
416+ "A9": 4448,
417+ "D1": 120,
418+ "D2": 239,
419+ "D3": 478,
420+ "D4": 956,
421+ "D11": 256,
422+ "D12": 512,
423+ "D13": 922,
424+ "D14": 1660,
425 },
426 }
427
428
429=== modified file 'rolesizes_test.go'
430--- rolesizes_test.go 2014-06-23 10:52:10 +0000
431+++ rolesizes_test.go 2014-12-01 10:30:59 +0000
432@@ -13,7 +13,9 @@
433
434 var knownRegions = []string{
435 "East US",
436+ "East US 2",
437 "West US",
438+ "Central US",
439 "North Central US",
440 "South Central US",
441 "North Europe",
442@@ -23,12 +25,15 @@
443 "Japan East",
444 "Japan West",
445 "Brazil South",
446+ "Australia Southeast",
447+ "Australia East",
448 }
449
450 var knownSizes = []string{
451 "Basic_A0", "Basic_A1", "Basic_A2", "Basic_A3", "Basic_A4",
452 "ExtraSmall", "Small", "Medium", "Large", "ExtraLarge",
453- "A5", "A6", "A7", "A8", "A9",
454+ "A5", "A6", "A7", "A8", "A9", "D1", "D2", "D3", "D4", "D11",
455+ "D12", "D13", "D14",
456 }
457
458 func (suite *rolesizeSuite) TestRoleCostKnownRegions(c *C) {

Subscribers

People subscribed via source and target branches