Merge lp:~axwalk/gwacl/rolesizes-fix-dg-names into lp:gwacl

Proposed by Andrew Wilkins on 2014-12-03
Status: Merged
Approved by: Ian Booth on 2014-12-03
Approved revision: 241
Merged at revision: 241
Proposed branch: lp:~axwalk/gwacl/rolesizes-fix-dg-names
Merge into: lp:gwacl
Diff against target: 1086 lines (+473/-444)
2 files modified
rolesizes.go (+469/-442)
rolesizes_test.go (+4/-2)
To merge this branch: bzr merge lp:~axwalk/gwacl/rolesizes-fix-dg-names
Reviewer Review Type Date Requested Status
Ian Booth 2014-12-03 Approve on 2014-12-03
Review via email: mp+243478@code.launchpad.net

Commit message

Fix role size names

D1 should be Standard_D1, etc. I've added aliases so we
can improve the user experience.

Description of the change

Fix role size names

D1 should be Standard_D1, etc. I've added aliases so we
can improve the user experience.

To post a comment you must log in.
Ian Booth (wallyworld) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rolesizes.go'
2--- rolesizes.go 2014-12-02 00:36:45 +0000
3+++ rolesizes.go 2014-12-03 02:15:59 +0000
4@@ -26,7 +26,16 @@
5 //
6 // Sizes and costs last updated 2014-06-23.
7 type RoleSize struct {
8- Name string
9+ // Name is the name that Azure assigns to role sizes.
10+ Name string
11+
12+ // Alias is an alternative name for the role size. This may be empty.
13+ //
14+ // Alias exists because the canonical role size names are inconsistent.
15+ // There are currently three different formats for "standard" role sizes:
16+ // e.g. ExtraSmall, A6, Standard_D1.
17+ Alias string
18+
19 CpuCores uint64
20 Mem uint64 // In MB
21 OSDiskSpace uint64 // In MB
22@@ -85,35 +94,40 @@
23
24 // Standard tier roles.
25 var standardRoleSizes = []RoleSize{{ // A0..A4: general purpose
26- Name: "ExtraSmall", // A0
27- CpuCores: 1, // shared
28+ Name: "ExtraSmall",
29+ Alias: "A0",
30+ CpuCores: 1, // shared
31 Mem: 768 * MB,
32 OSDiskSpace: 127 * GB,
33 TempDiskSpace: 20 * GB,
34 MaxDataDisks: 1,
35 }, {
36- Name: "Small", // A1
37+ Name: "Small",
38+ Alias: "A1",
39 CpuCores: 1,
40 Mem: 1.75 * GB,
41 OSDiskSpace: 127 * GB,
42 TempDiskSpace: 70 * GB,
43 MaxDataDisks: 2,
44 }, {
45- Name: "Medium", // A2
46+ Name: "Medium",
47+ Alias: "A2",
48 CpuCores: 2,
49 Mem: 3.5 * GB,
50 OSDiskSpace: 127 * GB,
51 TempDiskSpace: 135 * GB,
52 MaxDataDisks: 4,
53 }, {
54- Name: "Large", // A3
55+ Name: "Large",
56+ Alias: "A3",
57 CpuCores: 4,
58 Mem: 7 * GB,
59 OSDiskSpace: 127 * GB,
60 TempDiskSpace: 285 * GB,
61 MaxDataDisks: 8,
62 }, {
63- Name: "ExtraLarge", // A4
64+ Name: "ExtraLarge",
65+ Alias: "A4",
66 CpuCores: 8,
67 Mem: 14 * GB,
68 OSDiskSpace: 127 * GB,
69@@ -155,552 +169,565 @@
70 TempDiskSpace: 382 * GB,
71 MaxDataDisks: 16,
72 }, { // D Series - xeon v3 and ssd local
73- Name: "D1",
74+ Name: "Standard_D1",
75+ Alias: "D1",
76 CpuCores: 1,
77 Mem: 3.5 * GB,
78 OSDiskSpace: 127 * GB,
79 TempDiskSpace: 50 * GB,
80 MaxDataDisks: 2,
81 }, {
82- Name: "D2",
83+ Name: "Standard_D2",
84+ Alias: "D2",
85 CpuCores: 2,
86 Mem: 7 * GB,
87 OSDiskSpace: 127 * GB,
88 TempDiskSpace: 100 * GB,
89 MaxDataDisks: 4,
90 }, {
91- Name: "D3",
92+ Name: "Standard_D3",
93+ Alias: "D3",
94 CpuCores: 4,
95 Mem: 14 * GB,
96 OSDiskSpace: 127 * GB,
97 TempDiskSpace: 200 * GB,
98 MaxDataDisks: 8,
99 }, {
100- Name: "D4",
101+ Name: "Standard_D4",
102+ Alias: "D4",
103 CpuCores: 8,
104 Mem: 28 * GB,
105 OSDiskSpace: 127 * GB,
106 TempDiskSpace: 400 * GB,
107 MaxDataDisks: 16,
108 }, {
109- Name: "D11",
110+ Name: "Standard_D11",
111+ Alias: "D11",
112 CpuCores: 2,
113 Mem: 14 * GB,
114 OSDiskSpace: 127 * GB,
115 TempDiskSpace: 100 * GB,
116 MaxDataDisks: 4,
117 }, {
118- Name: "D12",
119+ Name: "Standard_D12",
120+ Alias: "D12",
121 CpuCores: 4,
122 Mem: 28 * GB,
123 OSDiskSpace: 127 * GB,
124 TempDiskSpace: 200 * GB,
125 MaxDataDisks: 8,
126 }, {
127- Name: "D13",
128+ Name: "Standard_D13",
129+ Alias: "D12",
130 CpuCores: 8,
131 Mem: 56 * GB,
132 OSDiskSpace: 127 * GB,
133 TempDiskSpace: 400 * GB,
134 MaxDataDisks: 16,
135 }, {
136- Name: "D14",
137+ Name: "Standard_D14",
138+ Alias: "D12",
139 CpuCores: 16,
140 Mem: 112 * GB,
141 OSDiskSpace: 127 * GB,
142 TempDiskSpace: 800 * GB,
143 MaxDataDisks: 16,
144 }, { // G Series Large Compute + SSD Local
145- Name: "G1",
146+ Name: "Standard_G1",
147+ Alias: "G1",
148 CpuCores: 2,
149 Mem: 28 * GB,
150 OSDiskSpace: 127 * GB,
151 TempDiskSpace: 406 * GB,
152 MaxDataDisks: 4,
153 }, {
154- Name: "G2",
155+ Name: "Standard_G2",
156+ Alias: "G2",
157 CpuCores: 4,
158 Mem: 56 * GB,
159 OSDiskSpace: 127 * GB,
160 TempDiskSpace: 812 * GB,
161 MaxDataDisks: 8,
162 }, {
163- Name: "G3",
164+ Name: "Standard_G3",
165+ Alias: "G3",
166 CpuCores: 8,
167 Mem: 112 * GB,
168 OSDiskSpace: 127 * GB,
169 TempDiskSpace: 1630 * GB,
170 MaxDataDisks: 16,
171 }, {
172- Name: "G4",
173+ Name: "Standard_G4",
174+ Alias: "G4",
175 CpuCores: 16,
176 Mem: 224 * GB,
177 OSDiskSpace: 127 * GB,
178 TempDiskSpace: 3250 * GB,
179 MaxDataDisks: 16,
180 }, {
181- Name: "G5",
182+ Name: "Standard_G5",
183+ Alias: "G5",
184 CpuCores: 32,
185 Mem: 448 * GB,
186 OSDiskSpace: 127 * GB,
187 TempDiskSpace: 6500 * GB,
188- MaxDataDisks: 16},
189-}
190+ MaxDataDisks: 16,
191+}}
192
193 // RoleSizes describes all known role sizes.
194 var RoleSizes = append(append([]RoleSize{}, basicRoleSizes...), standardRoleSizes...)
195
196 var allRegionRoleCosts = map[string]map[string]decicentsPerHour{
197 "East US": {
198- "Basic_A0": 18,
199- "Basic_A1": 44,
200- "Basic_A2": 88,
201- "Basic_A3": 176,
202- "Basic_A4": 352,
203- "ExtraSmall": 20,
204- "Small": 60,
205- "Medium": 120,
206- "Large": 240,
207- "ExtraLarge": 480,
208- "A5": 250,
209- "A6": 500,
210- "A7": 1000,
211- "A8": 1970,
212- "A9": 4470,
213- "D1": 94,
214- "D2": 188,
215- "D3": 376,
216- "D4": 752,
217- "D11": 238,
218- "D12": 476,
219- "D13": 857,
220- "D14": 1542,
221- "G1": 8940, // Estimate, price is not public
222- "G2": 8950, // Estimate, price is not public
223- "G3": 8960, // Estimate, price is not public
224- "G4": 8970, // Estimate, price is not public
225- "G5": 8980, // Estimate, price is not public
226+ "Basic_A0": 18,
227+ "Basic_A1": 44,
228+ "Basic_A2": 88,
229+ "Basic_A3": 176,
230+ "Basic_A4": 352,
231+ "ExtraSmall": 20,
232+ "Small": 60,
233+ "Medium": 120,
234+ "Large": 240,
235+ "ExtraLarge": 480,
236+ "A5": 250,
237+ "A6": 500,
238+ "A7": 1000,
239+ "A8": 1970,
240+ "A9": 4470,
241+ "Standard_D1": 94,
242+ "Standard_D2": 188,
243+ "Standard_D3": 376,
244+ "Standard_D4": 752,
245+ "Standard_D11": 238,
246+ "Standard_D12": 476,
247+ "Standard_D13": 857,
248+ "Standard_D14": 1542,
249+ "Standard_G1": 8940, // Estimate, price is not public
250+ "Standard_G2": 8950, // Estimate, price is not public
251+ "Standard_G3": 8960, // Estimate, price is not public
252+ "Standard_G4": 8970, // Estimate, price is not public
253+ "Standard_G5": 8980, // Estimate, price is not public
254 },
255 "East US 2": {
256- "Basic_A0": 18,
257- "Basic_A1": 44,
258- "Basic_A2": 88,
259- "Basic_A3": 176,
260- "Basic_A4": 352,
261- "ExtraSmall": 20,
262- "Small": 60,
263- "Medium": 120,
264- "Large": 240,
265- "ExtraLarge": 480,
266- "A5": 220,
267- "A6": 440,
268- "A7": 880,
269- "A8": 1970,
270- "A9": 4470,
271- "D1": 85,
272- "D2": 170,
273- "D3": 340,
274- "D4": 680,
275- "D11": 214,
276- "D12": 428,
277- "D13": 770,
278- "D14": 1387,
279- "G1": 8940, // Estimate, price is not public
280- "G2": 8950, // Estimate, price is not public
281- "G3": 8960, // Estimate, price is not public
282- "G4": 8970, // Estimate, price is not public
283- "G5": 8980, // Estimate, price is not public
284+ "Basic_A0": 18,
285+ "Basic_A1": 44,
286+ "Basic_A2": 88,
287+ "Basic_A3": 176,
288+ "Basic_A4": 352,
289+ "ExtraSmall": 20,
290+ "Small": 60,
291+ "Medium": 120,
292+ "Large": 240,
293+ "ExtraLarge": 480,
294+ "A5": 220,
295+ "A6": 440,
296+ "A7": 880,
297+ "A8": 1970,
298+ "A9": 4470,
299+ "Standard_D1": 85,
300+ "Standard_D2": 170,
301+ "Standard_D3": 340,
302+ "Standard_D4": 680,
303+ "Standard_D11": 214,
304+ "Standard_D12": 428,
305+ "Standard_D13": 770,
306+ "Standard_D14": 1387,
307+ "Standard_G1": 8940, // Estimate, price is not public
308+ "Standard_G2": 8950, // Estimate, price is not public
309+ "Standard_G3": 8960, // Estimate, price is not public
310+ "Standard_G4": 8970, // Estimate, price is not public
311+ "Standard_G5": 8980, // Estimate, price is not public
312 },
313 "West US": {
314- "Basic_A0": 18,
315- "Basic_A1": 47,
316- "Basic_A2": 94,
317- "Basic_A3": 188,
318- "Basic_A4": 376,
319- "ExtraSmall": 20,
320- "Small": 60,
321- "Medium": 120,
322- "Large": 240,
323- "ExtraLarge": 480,
324- "A5": 250,
325- "A6": 500,
326- "A7": 1000,
327- "A8": 1970,
328- "A9": 4470,
329- "D1": 94,
330- "D2": 188,
331- "D3": 376,
332- "D4": 752,
333- "D11": 238,
334- "D12": 476,
335- "D13": 857,
336- "D14": 1542,
337- "G1": 8940, // Estimate, price is not public
338- "G2": 8950, // Estimate, price is not public
339- "G3": 8960, // Estimate, price is not public
340- "G4": 8970, // Estimate, price is not public
341- "G5": 8980, // Estimate, price is not public
342+ "Basic_A0": 18,
343+ "Basic_A1": 47,
344+ "Basic_A2": 94,
345+ "Basic_A3": 188,
346+ "Basic_A4": 376,
347+ "ExtraSmall": 20,
348+ "Small": 60,
349+ "Medium": 120,
350+ "Large": 240,
351+ "ExtraLarge": 480,
352+ "A5": 250,
353+ "A6": 500,
354+ "A7": 1000,
355+ "A8": 1970,
356+ "A9": 4470,
357+ "Standard_D1": 94,
358+ "Standard_D2": 188,
359+ "Standard_D3": 376,
360+ "Standard_D4": 752,
361+ "Standard_D11": 238,
362+ "Standard_D12": 476,
363+ "Standard_D13": 857,
364+ "Standard_D14": 1542,
365+ "Standard_G1": 8940, // Estimate, price is not public
366+ "Standard_G2": 8950, // Estimate, price is not public
367+ "Standard_G3": 8960, // Estimate, price is not public
368+ "Standard_G4": 8970, // Estimate, price is not public
369+ "Standard_G5": 8980, // Estimate, price is not public
370 },
371
372 "Central US": {
373- "Basic_A0": 18,
374- "Basic_A1": 60,
375- "Basic_A2": 94,
376- "Basic_A3": 188,
377- "Basic_A4": 376,
378- "ExtraSmall": 20,
379- "Small": 60,
380- "Medium": 120,
381- "Large": 240,
382- "ExtraLarge": 480,
383- "A5": 250,
384- "A6": 500,
385- "A7": 1000,
386- "A8": 1970,
387- "A9": 4470,
388- "D1": 94,
389- "D2": 188,
390- "D3": 376,
391- "D4": 752,
392- "D11": 238,
393- "D12": 476,
394- "D13": 857,
395- "D14": 1542,
396- "G1": 8940, // Estimate, price is not public
397- "G2": 8950, // Estimate, price is not public
398- "G3": 8960, // Estimate, price is not public
399- "G4": 8970, // Estimate, price is not public
400- "G5": 8980, // Estimate, price is not public
401+ "Basic_A0": 18,
402+ "Basic_A1": 60,
403+ "Basic_A2": 94,
404+ "Basic_A3": 188,
405+ "Basic_A4": 376,
406+ "ExtraSmall": 20,
407+ "Small": 60,
408+ "Medium": 120,
409+ "Large": 240,
410+ "ExtraLarge": 480,
411+ "A5": 250,
412+ "A6": 500,
413+ "A7": 1000,
414+ "A8": 1970,
415+ "A9": 4470,
416+ "Standard_D1": 94,
417+ "Standard_D2": 188,
418+ "Standard_D3": 376,
419+ "Standard_D4": 752,
420+ "Standard_D11": 238,
421+ "Standard_D12": 476,
422+ "Standard_D13": 857,
423+ "Standard_D14": 1542,
424+ "Standard_G1": 8940, // Estimate, price is not public
425+ "Standard_G2": 8950, // Estimate, price is not public
426+ "Standard_G3": 8960, // Estimate, price is not public
427+ "Standard_G4": 8970, // Estimate, price is not public
428+ "Standard_G5": 8980, // Estimate, price is not public
429 },
430 "North Central US": {
431- "Basic_A0": 18,
432- "Basic_A1": 47,
433- "Basic_A2": 94,
434- "Basic_A3": 188,
435- "Basic_A4": 376,
436- "ExtraSmall": 20,
437- "Small": 60,
438- "Medium": 120,
439- "Large": 240,
440- "ExtraLarge": 480,
441- "A5": 250,
442- "A6": 500,
443- "A7": 1000,
444- "A8": 1970,
445- "A9": 4470,
446- "D1": 94,
447- "D2": 188,
448- "D3": 376,
449- "D4": 752,
450- "D11": 238,
451- "D12": 476,
452- "D13": 857,
453- "D14": 1542,
454- "G1": 8940, // Estimate, price is not public
455- "G2": 8950, // Estimate, price is not public
456- "G3": 8960, // Estimate, price is not public
457- "G4": 8970, // Estimate, price is not public
458- "G5": 8980, // Estimate, price is not public
459+ "Basic_A0": 18,
460+ "Basic_A1": 47,
461+ "Basic_A2": 94,
462+ "Basic_A3": 188,
463+ "Basic_A4": 376,
464+ "ExtraSmall": 20,
465+ "Small": 60,
466+ "Medium": 120,
467+ "Large": 240,
468+ "ExtraLarge": 480,
469+ "A5": 250,
470+ "A6": 500,
471+ "A7": 1000,
472+ "A8": 1970,
473+ "A9": 4470,
474+ "Standard_D1": 94,
475+ "Standard_D2": 188,
476+ "Standard_D3": 376,
477+ "Standard_D4": 752,
478+ "Standard_D11": 238,
479+ "Standard_D12": 476,
480+ "Standard_D13": 857,
481+ "Standard_D14": 1542,
482+ "Standard_G1": 8940, // Estimate, price is not public
483+ "Standard_G2": 8950, // Estimate, price is not public
484+ "Standard_G3": 8960, // Estimate, price is not public
485+ "Standard_G4": 8970, // Estimate, price is not public
486+ "Standard_G5": 8980, // Estimate, price is not public
487 },
488 "South Central US": {
489- "Basic_A0": 18,
490- "Basic_A1": 44,
491- "Basic_A2": 88,
492- "Basic_A3": 176,
493- "Basic_A4": 352,
494- "ExtraSmall": 20,
495- "Small": 60,
496- "Medium": 120,
497- "Large": 240,
498- "ExtraLarge": 480,
499- "A5": 220,
500- "A6": 440,
501- "A7": 880,
502- "A8": 1970,
503- "A9": 4470,
504- "D1": 85,
505- "D2": 170,
506- "D3": 340,
507- "D4": 680,
508- "D11": 214,
509- "D12": 428,
510- "D13": 770,
511- "D14": 1387,
512- "G1": 8940, // Estimate, price is not public
513- "G2": 8950, // Estimate, price is not public
514- "G3": 8960, // Estimate, price is not public
515- "G4": 8970, // Estimate, price is not public
516- "G5": 8980, // Estimate, price is not public
517+ "Basic_A0": 18,
518+ "Basic_A1": 44,
519+ "Basic_A2": 88,
520+ "Basic_A3": 176,
521+ "Basic_A4": 352,
522+ "ExtraSmall": 20,
523+ "Small": 60,
524+ "Medium": 120,
525+ "Large": 240,
526+ "ExtraLarge": 480,
527+ "A5": 220,
528+ "A6": 440,
529+ "A7": 880,
530+ "A8": 1970,
531+ "A9": 4470,
532+ "Standard_D1": 85,
533+ "Standard_D2": 170,
534+ "Standard_D3": 340,
535+ "Standard_D4": 680,
536+ "Standard_D11": 214,
537+ "Standard_D12": 428,
538+ "Standard_D13": 770,
539+ "Standard_D14": 1387,
540+ "Standard_G1": 8940, // Estimate, price is not public
541+ "Standard_G2": 8950, // Estimate, price is not public
542+ "Standard_G3": 8960, // Estimate, price is not public
543+ "Standard_G4": 8970, // Estimate, price is not public
544+ "Standard_G5": 8980, // Estimate, price is not public
545 },
546 "North Europe": {
547- "Basic_A0": 18,
548- "Basic_A1": 47,
549- "Basic_A2": 94,
550- "Basic_A3": 188,
551- "Basic_A4": 376,
552- "ExtraSmall": 20,
553- "Small": 60,
554- "Medium": 120,
555- "Large": 240,
556- "ExtraLarge": 480,
557- "A5": 248,
558- "A6": 496,
559- "A7": 992,
560- "A8": 1970,
561- "A9": 4470,
562- "D1": 94,
563- "D2": 188,
564- "D3": 376,
565- "D4": 752,
566- "D11": 238,
567- "D12": 476,
568- "D13": 857,
569- "D14": 1542,
570- "G1": 8940, // Estimate, price is not public
571- "G2": 8950, // Estimate, price is not public
572- "G3": 8960, // Estimate, price is not public
573- "G4": 8970, // Estimate, price is not public
574- "G5": 8980, // Estimate, price is not public
575+ "Basic_A0": 18,
576+ "Basic_A1": 47,
577+ "Basic_A2": 94,
578+ "Basic_A3": 188,
579+ "Basic_A4": 376,
580+ "ExtraSmall": 20,
581+ "Small": 60,
582+ "Medium": 120,
583+ "Large": 240,
584+ "ExtraLarge": 480,
585+ "A5": 248,
586+ "A6": 496,
587+ "A7": 992,
588+ "A8": 1970,
589+ "A9": 4470,
590+ "Standard_D1": 94,
591+ "Standard_D2": 188,
592+ "Standard_D3": 376,
593+ "Standard_D4": 752,
594+ "Standard_D11": 238,
595+ "Standard_D12": 476,
596+ "Standard_D13": 857,
597+ "Standard_D14": 1542,
598+ "Standard_G1": 8940, // Estimate, price is not public
599+ "Standard_G2": 8950, // Estimate, price is not public
600+ "Standard_G3": 8960, // Estimate, price is not public
601+ "Standard_G4": 8970, // Estimate, price is not public
602+ "Standard_G5": 8980, // Estimate, price is not public
603 },
604 "West Europe": {
605- "Basic_A0": 18,
606- "Basic_A1": 51,
607- "Basic_A2": 102,
608- "Basic_A3": 204,
609- "Basic_A4": 408,
610- "ExtraSmall": 20,
611- "Small": 60,
612- "Medium": 120,
613- "Large": 240,
614- "ExtraLarge": 480,
615- "A5": 270,
616- "A6": 540,
617- "A7": 1080,
618- "A8": 1970,
619- "A9": 4470,
620- "D1": 115,
621- "D2": 230,
622- "D3": 460,
623- "D4": 920,
624- "D11": 273,
625- "D12": 546,
626- "D13": 983,
627- "D14": 1769,
628- "G1": 8940, // Estimate, price is not public
629- "G2": 8950, // Estimate, price is not public
630- "G3": 8960, // Estimate, price is not public
631- "G4": 8970, // Estimate, price is not public
632- "G5": 8980, // Estimate, price is not public
633+ "Basic_A0": 18,
634+ "Basic_A1": 51,
635+ "Basic_A2": 102,
636+ "Basic_A3": 204,
637+ "Basic_A4": 408,
638+ "ExtraSmall": 20,
639+ "Small": 60,
640+ "Medium": 120,
641+ "Large": 240,
642+ "ExtraLarge": 480,
643+ "A5": 270,
644+ "A6": 540,
645+ "A7": 1080,
646+ "A8": 1970,
647+ "A9": 4470,
648+ "Standard_D1": 115,
649+ "Standard_D2": 230,
650+ "Standard_D3": 460,
651+ "Standard_D4": 920,
652+ "Standard_D11": 273,
653+ "Standard_D12": 546,
654+ "Standard_D13": 983,
655+ "Standard_D14": 1769,
656+ "Standard_G1": 8940, // Estimate, price is not public
657+ "Standard_G2": 8950, // Estimate, price is not public
658+ "Standard_G3": 8960, // Estimate, price is not public
659+ "Standard_G4": 8970, // Estimate, price is not public
660+ "Standard_G5": 8980, // Estimate, price is not public
661 },
662 "Southeast Asia": {
663- "Basic_A0": 18,
664- "Basic_A1": 58,
665- "Basic_A2": 116,
666- "Basic_A3": 232,
667- "Basic_A4": 464,
668- "ExtraSmall": 20,
669- "Small": 60,
670- "Medium": 120,
671- "Large": 240,
672- "ExtraLarge": 480,
673- "A5": 270,
674- "A6": 540,
675- "A7": 1080,
676- "A8": 1970,
677- "A9": 4470,
678- "D1": 120,
679- "D2": 240,
680- "D3": 480,
681- "D4": 960,
682- "D11": 256,
683- "D12": 512,
684- "D13": 922,
685- "D14": 1659,
686- "G1": 8940, // Estimate, price is not public
687- "G2": 8950, // Estimate, price is not public
688- "G3": 8960, // Estimate, price is not public
689- "G4": 8970, // Estimate, price is not public
690- "G5": 8980, // Estimate, price is not public
691+ "Basic_A0": 18,
692+ "Basic_A1": 58,
693+ "Basic_A2": 116,
694+ "Basic_A3": 232,
695+ "Basic_A4": 464,
696+ "ExtraSmall": 20,
697+ "Small": 60,
698+ "Medium": 120,
699+ "Large": 240,
700+ "ExtraLarge": 480,
701+ "A5": 270,
702+ "A6": 540,
703+ "A7": 1080,
704+ "A8": 1970,
705+ "A9": 4470,
706+ "Standard_D1": 120,
707+ "Standard_D2": 240,
708+ "Standard_D3": 480,
709+ "Standard_D4": 960,
710+ "Standard_D11": 256,
711+ "Standard_D12": 512,
712+ "Standard_D13": 922,
713+ "Standard_D14": 1659,
714+ "Standard_G1": 8940, // Estimate, price is not public
715+ "Standard_G2": 8950, // Estimate, price is not public
716+ "Standard_G3": 8960, // Estimate, price is not public
717+ "Standard_G4": 8970, // Estimate, price is not public
718+ "Standard_G5": 8980, // Estimate, price is not public
719 },
720 "East Asia": {
721- "Basic_A0": 18,
722- "Basic_A1": 58,
723- "Basic_A2": 116,
724- "Basic_A3": 232,
725- "Basic_A4": 464,
726- "ExtraSmall": 20,
727- "Small": 60,
728- "Medium": 120,
729- "Large": 240,
730- "ExtraLarge": 480,
731- "A5": 294,
732- "A6": 588,
733- "A7": 1176,
734- "A8": 1970,
735- "A9": 4470,
736- "D1": 138,
737- "D2": 276,
738- "D3": 552,
739- "D4": 1104,
740- "D11": 295,
741- "D12": 590,
742- "D13": 1062,
743- "D14": 1912,
744- "G1": 8940, // Estimate, price is not public
745- "G2": 8950, // Estimate, price is not public
746- "G3": 8960, // Estimate, price is not public
747- "G4": 8970, // Estimate, price is not public
748- "G5": 8980, // Estimate, price is not public
749+ "Basic_A0": 18,
750+ "Basic_A1": 58,
751+ "Basic_A2": 116,
752+ "Basic_A3": 232,
753+ "Basic_A4": 464,
754+ "ExtraSmall": 20,
755+ "Small": 60,
756+ "Medium": 120,
757+ "Large": 240,
758+ "ExtraLarge": 480,
759+ "A5": 294,
760+ "A6": 588,
761+ "A7": 1176,
762+ "A8": 1970,
763+ "A9": 4470,
764+ "Standard_D1": 138,
765+ "Standard_D2": 276,
766+ "Standard_D3": 552,
767+ "Standard_D4": 1104,
768+ "Standard_D11": 295,
769+ "Standard_D12": 590,
770+ "Standard_D13": 1062,
771+ "Standard_D14": 1912,
772+ "Standard_G1": 8940, // Estimate, price is not public
773+ "Standard_G2": 8950, // Estimate, price is not public
774+ "Standard_G3": 8960, // Estimate, price is not public
775+ "Standard_G4": 8970, // Estimate, price is not public
776+ "Standard_G5": 8980, // Estimate, price is not public
777 },
778 "Japan East": {
779- "Basic_A0": 18,
780- "Basic_A1": 69,
781- "Basic_A2": 138,
782- "Basic_A3": 276,
783- "Basic_A4": 552,
784- "ExtraSmall": 27,
785- "Small": 81,
786- "Medium": 162,
787- "Large": 324,
788- "ExtraLarge": 648,
789- "A5": 281,
790- "A6": 562,
791- "A7": 1124,
792- "A8": 2325,
793- "A9": 5275,
794- "D1": 142,
795- "D2": 284,
796- "D3": 568,
797- "D4": 1136,
798- "D11": 295,
799- "D12": 590,
800- "D13": 1062,
801- "D14": 1912,
802- "G1": 8940, // Estimate, price is not public
803- "G2": 8950, // Estimate, price is not public
804- "G3": 8960, // Estimate, price is not public
805- "G4": 8970, // Estimate, price is not public
806- "G5": 8980, // Estimate, price is not public
807+ "Basic_A0": 18,
808+ "Basic_A1": 69,
809+ "Basic_A2": 138,
810+ "Basic_A3": 276,
811+ "Basic_A4": 552,
812+ "ExtraSmall": 27,
813+ "Small": 81,
814+ "Medium": 162,
815+ "Large": 324,
816+ "ExtraLarge": 648,
817+ "A5": 281,
818+ "A6": 562,
819+ "A7": 1124,
820+ "A8": 2325,
821+ "A9": 5275,
822+ "Standard_D1": 142,
823+ "Standard_D2": 284,
824+ "Standard_D3": 568,
825+ "Standard_D4": 1136,
826+ "Standard_D11": 295,
827+ "Standard_D12": 590,
828+ "Standard_D13": 1062,
829+ "Standard_D14": 1912,
830+ "Standard_G1": 8940, // Estimate, price is not public
831+ "Standard_G2": 8950, // Estimate, price is not public
832+ "Standard_G3": 8960, // Estimate, price is not public
833+ "Standard_G4": 8970, // Estimate, price is not public
834+ "Standard_G5": 8980, // Estimate, price is not public
835 },
836 "Japan West": {
837- "Basic_A0": 19,
838- "Basic_A1": 61,
839- "Basic_A2": 122,
840- "Basic_A3": 244,
841- "Basic_A4": 488,
842- "ExtraSmall": 21,
843- "Small": 73,
844- "Medium": 146,
845- "Large": 292,
846- "ExtraLarge": 584,
847- "A5": 258,
848- "A6": 516,
849- "A7": 1032,
850- "A8": 2088,
851- "A9": 4738,
852- "D1": 123,
853- "D2": 246,
854- "D3": 492,
855- "D4": 984,
856- "D11": 256,
857- "D12": 512,
858- "D13": 922,
859- "D14": 1659,
860- "G1": 8940, // Estimate, price is not public
861- "G2": 8950, // Estimate, price is not public
862- "G3": 8960, // Estimate, price is not public
863- "G4": 8970, // Estimate, price is not public
864- "G5": 8980, // Estimate, price is not public
865+ "Basic_A0": 19,
866+ "Basic_A1": 61,
867+ "Basic_A2": 122,
868+ "Basic_A3": 244,
869+ "Basic_A4": 488,
870+ "ExtraSmall": 21,
871+ "Small": 73,
872+ "Medium": 146,
873+ "Large": 292,
874+ "ExtraLarge": 584,
875+ "A5": 258,
876+ "A6": 516,
877+ "A7": 1032,
878+ "A8": 2088,
879+ "A9": 4738,
880+ "Standard_D1": 123,
881+ "Standard_D2": 246,
882+ "Standard_D3": 492,
883+ "Standard_D4": 984,
884+ "Standard_D11": 256,
885+ "Standard_D12": 512,
886+ "Standard_D13": 922,
887+ "Standard_D14": 1659,
888+ "Standard_G1": 8940, // Estimate, price is not public
889+ "Standard_G2": 8950, // Estimate, price is not public
890+ "Standard_G3": 8960, // Estimate, price is not public
891+ "Standard_G4": 8970, // Estimate, price is not public
892+ "Standard_G5": 8980, // Estimate, price is not public
893 },
894 "Brazil South": {
895- "Basic_A0": 22,
896- "Basic_A1": 58,
897- "Basic_A2": 116,
898- "Basic_A3": 232,
899- "Basic_A4": 464,
900- "ExtraSmall": 24,
901- "Small": 80,
902- "Medium": 160,
903- "Large": 320,
904- "ExtraLarge": 640,
905- "A5": 291,
906- "A6": 582,
907- "A7": 1164,
908- "A8": 2403,
909- "A9": 5453,
910- "D1": 116,
911- "D2": 232,
912- "D3": 464,
913- "D4": 928,
914- "D11": 290,
915- "D12": 580,
916- "D13": 1044,
917- "D14": 1879,
918- "G1": 8940, // Estimate, price is not public
919- "G2": 8950, // Estimate, price is not public
920- "G3": 8960, // Estimate, price is not public
921- "G4": 8970, // Estimate, price is not public
922- "G5": 8980, // Estimate, price is not public
923+ "Basic_A0": 22,
924+ "Basic_A1": 58,
925+ "Basic_A2": 116,
926+ "Basic_A3": 232,
927+ "Basic_A4": 464,
928+ "ExtraSmall": 24,
929+ "Small": 80,
930+ "Medium": 160,
931+ "Large": 320,
932+ "ExtraLarge": 640,
933+ "A5": 291,
934+ "A6": 582,
935+ "A7": 1164,
936+ "A8": 2403,
937+ "A9": 5453,
938+ "Standard_D1": 116,
939+ "Standard_D2": 232,
940+ "Standard_D3": 464,
941+ "Standard_D4": 928,
942+ "Standard_D11": 290,
943+ "Standard_D12": 580,
944+ "Standard_D13": 1044,
945+ "Standard_D14": 1879,
946+ "Standard_G1": 8940, // Estimate, price is not public
947+ "Standard_G2": 8950, // Estimate, price is not public
948+ "Standard_G3": 8960, // Estimate, price is not public
949+ "Standard_G4": 8970, // Estimate, price is not public
950+ "Standard_G5": 8980, // Estimate, price is not public
951 },
952 "Australia East": {
953- "Basic_A0": 24,
954- "Basic_A1": 58,
955- "Basic_A2": 116,
956- "Basic_A3": 232,
957- "Basic_A4": 464,
958- "ExtraSmall": 29,
959- "Small": 71,
960- "Medium": 142,
961- "Large": 284,
962- "ExtraLarge": 568,
963- "A5": 278,
964- "A6": 556,
965- "A7": 1112,
966- "A8": 2224,
967- "A9": 4448,
968- "D1": 120,
969- "D2": 239,
970- "D3": 478,
971- "D4": 956,
972- "D11": 256,
973- "D12": 512,
974- "D13": 922,
975- "D14": 1660,
976- "G1": 8940, // Estimate, price is not public
977- "G2": 8950, // Estimate, price is not public
978- "G3": 8960, // Estimate, price is not public
979- "G4": 8970, // Estimate, price is not public
980- "G5": 8980, // Estimate, price is not public
981+ "Basic_A0": 24,
982+ "Basic_A1": 58,
983+ "Basic_A2": 116,
984+ "Basic_A3": 232,
985+ "Basic_A4": 464,
986+ "ExtraSmall": 29,
987+ "Small": 71,
988+ "Medium": 142,
989+ "Large": 284,
990+ "ExtraLarge": 568,
991+ "A5": 278,
992+ "A6": 556,
993+ "A7": 1112,
994+ "A8": 2224,
995+ "A9": 4448,
996+ "Standard_D1": 120,
997+ "Standard_D2": 239,
998+ "Standard_D3": 478,
999+ "Standard_D4": 956,
1000+ "Standard_D11": 256,
1001+ "Standard_D12": 512,
1002+ "Standard_D13": 922,
1003+ "Standard_D14": 1660,
1004+ "Standard_G1": 8940, // Estimate, price is not public
1005+ "Standard_G2": 8950, // Estimate, price is not public
1006+ "Standard_G3": 8960, // Estimate, price is not public
1007+ "Standard_G4": 8970, // Estimate, price is not public
1008+ "Standard_G5": 8980, // Estimate, price is not public
1009 },
1010 "Australia Southeast": {
1011- "Basic_A0": 24,
1012- "Basic_A1": 58,
1013- "Basic_A2": 116,
1014- "Basic_A3": 232,
1015- "Basic_A4": 464,
1016- "ExtraSmall": 29,
1017- "Small": 71,
1018- "Medium": 142,
1019- "Large": 284,
1020- "ExtraLarge": 568,
1021- "A5": 278,
1022- "A6": 556,
1023- "A7": 1112,
1024- "A8": 2224,
1025- "A9": 4448,
1026- "D1": 120,
1027- "D2": 239,
1028- "D3": 478,
1029- "D4": 956,
1030- "D11": 256,
1031- "D12": 512,
1032- "D13": 922,
1033- "D14": 1660,
1034- "G1": 8940, // Estimate, price is not public
1035- "G2": 8950, // Estimate, price is not public
1036- "G3": 8960, // Estimate, price is not public
1037- "G4": 8970, // Estimate, price is not public
1038- "G5": 8980, // Estimate, price is not public
1039+ "Basic_A0": 24,
1040+ "Basic_A1": 58,
1041+ "Basic_A2": 116,
1042+ "Basic_A3": 232,
1043+ "Basic_A4": 464,
1044+ "ExtraSmall": 29,
1045+ "Small": 71,
1046+ "Medium": 142,
1047+ "Large": 284,
1048+ "ExtraLarge": 568,
1049+ "A5": 278,
1050+ "A6": 556,
1051+ "A7": 1112,
1052+ "A8": 2224,
1053+ "A9": 4448,
1054+ "Standard_D1": 120,
1055+ "Standard_D2": 239,
1056+ "Standard_D3": 478,
1057+ "Standard_D4": 956,
1058+ "Standard_D11": 256,
1059+ "Standard_D12": 512,
1060+ "Standard_D13": 922,
1061+ "Standard_D14": 1660,
1062+ "Standard_G1": 8940, // Estimate, price is not public
1063+ "Standard_G2": 8950, // Estimate, price is not public
1064+ "Standard_G3": 8960, // Estimate, price is not public
1065+ "Standard_G4": 8970, // Estimate, price is not public
1066+ "Standard_G5": 8980, // Estimate, price is not public
1067 },
1068 }
1069
1070
1071=== modified file 'rolesizes_test.go'
1072--- rolesizes_test.go 2014-12-02 00:36:45 +0000
1073+++ rolesizes_test.go 2014-12-03 02:15:59 +0000
1074@@ -32,8 +32,10 @@
1075 var knownSizes = []string{
1076 "Basic_A0", "Basic_A1", "Basic_A2", "Basic_A3", "Basic_A4",
1077 "ExtraSmall", "Small", "Medium", "Large", "ExtraLarge",
1078- "A5", "A6", "A7", "A8", "A9", "D1", "D2", "D3", "D4", "D11",
1079- "D12", "D13", "D14", "G1", "G2", "G3", "G4", "G5",
1080+ "A5", "A6", "A7", "A8", "A9", "Standard_D1", "Standard_D2",
1081+ "Standard_D3", "Standard_D4", "Standard_D11", "Standard_D12",
1082+ "Standard_D13", "Standard_D14", "Standard_G1", "Standard_G2",
1083+ "Standard_G3", "Standard_G4", "Standard_G5",
1084 }
1085
1086 func (suite *rolesizeSuite) TestRoleCostKnownRegions(c *C) {

Subscribers

People subscribed via source and target branches

to all changes: