Merge pull request #626 from claymccoy/handleInstancePriceFormatChange

Handle instance price format change
Netflix · Dec 4, 2014 · 5fe7a94 · 5fe7a94
2 parents e1b8e71 + 0297370
commit 5fe7a94
Show file tree

Hide file tree

Showing 4 changed files with 3,579 additions and 2,628 deletions.
diff --git a/grails-app/services/com/netflix/asgard/InstanceTypeService.groovy b/grails-app/services/com/netflix/asgard/InstanceTypeService.groovy
@@ -126,7 +126,7 @@ class InstanceTypeService implements CacheInitializer {
             if (hardwareProfile) {
                 InstanceTypeData instanceTypeData = new InstanceTypeData(
                         hardwareProfile: hardwareProfile,
-                        linuxOnDemandPrice: onDemandPrices.get(instanceType, InstanceProductType.LINUX_UNIX),
+                        linuxOnDemandPrice: onDemandPrices?.get(instanceType, InstanceProductType.LINUX_UNIX),
                 )
                 namesToInstanceTypeDatas[name] = instanceTypeData
             } else {
@@ -263,7 +263,7 @@ class InstanceTypeService implements CacheInitializer {
         JSONElement config = pricingJson.config
         JSONArray regionJsonArray = config.regions
         for (JSONElement regionJsonObject in regionJsonArray) {
-            Region region = Region.withPricingJsonCode(regionJsonObject.region)
+            Region region = Region.withCode(regionJsonObject.region)
             List<InstanceType> instanceTypes = InstanceType.values() as List
             List<InstanceProductType> products = InstanceProductType.values() as List
             Table<InstanceType, InstanceProductType, BigDecimal> pricesByHardwareAndProduct =