Merge pull request Teevity#126 from vfilanovsky/master

Accommodate new EC2 Reserved Instance Model - fixes Teevity#125

Author: vfilanovsky

src/java/com/netflix/ice/processor/Ec2InstanceReservationPrice.java

@@ -27,6 +27,7 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -234,9 +235,20 @@ public static enum ReservationUtilization {
         HEAVY,
         FIXED;
 
+        static final Map<String, String> reservationTypeMap = new HashMap<String, String>();
+        static {
+            reservationTypeMap.put("ALL", "HEAVY");
+            reservationTypeMap.put("PARTIAL", "MEDIUM");
+            reservationTypeMap.put("NO", "LIGHT");
+        }
+
         public static ReservationUtilization get(String offeringType) {
-            if (offeringType.indexOf(" ") > 0) {
-                offeringType = offeringType.substring(0, offeringType.indexOf(" ")).toUpperCase();
+            int idx = offeringType.indexOf(" ");
+            if (idx > 0) {
+                offeringType = offeringType.substring(0, idx).toUpperCase();
+                String mappedValue = reservationTypeMap.get(offeringType);
+                if (mappedValue != null)
+                    offeringType = mappedValue;
                 return valueOf(offeringType);
             }
             else {