Changes for adding support for using unblended costs

Author: Anthony Johnson

README.md

@@ -240,6 +240,11 @@ Options with * require writing your own code.
 
   You may also want to show your organization's throughput metric alongside usage and cost. You can choose to implement interface ThroughputMetricService, or you can simply use the existing BasicThroughputMetricService. Using BasicThroughputMetricService requires the throughput metric data to be stores monthly in files with names like <filePrefix>_2013_04, <filePrefix>_2013_05. Data in files should be delimited by new lines. <filePrefix> is specified when you create BasicThroughputMetricService instance.
 
+9. UnBlended Costs
+  By default, blended costs are shown. You can show Unblended costs with the following configuration:
+
+        ice.use_blended=false
+
 ##Support
 
 Please use the [Ice Google Group](https://groups.google.com/d/forum/iceusers) for general questions and discussion.

src/java/com/netflix/ice/basic/BasicLineItemProcessor.java

@@ -50,7 +50,7 @@ public class BasicLineItemProcessor implements LineItemProcessor {
 
     private List<String> header;
 
-    public void initIndexes(boolean withTags, String[] header) {
+    public void initIndexes(ProcessorConfig processorConfig, boolean withTags, String[] header) {
         boolean hasBlendedCost = false;
         for (String column: header) {
             if (column.equalsIgnoreCase("UnBlendedCost")) {
@@ -70,6 +70,8 @@ public void initIndexes(boolean withTags, String[] header) {
         endTimeIndex = 15 + (withTags ? 0 : -1);
         rateIndex = 19 + (withTags ? 0 : -1) + (hasBlendedCost ? 0 : -2);
         costIndex = 20 + (withTags ? 0 : -1) + (hasBlendedCost ? 0 : -2);
+        rateIndex = 19 + (withTags ? 0 : -1) + ((hasBlendedCost && useBlendedCost) ? 0 : -2);
+        costIndex = 20 + (withTags ? 0 : -1) + ((hasBlendedCost && useBlendedCost) ? 0 : -2);
         resourceIndex = 21 + (withTags ? 0 : -1) + (hasBlendedCost ? 0 : -2);
 
         this.header = Lists.newArrayList(header);

src/java/com/netflix/ice/common/IceOptions.java

@@ -80,6 +80,11 @@ public class IceOptions {
      */
     public static final String CUSTOM_TAGS = "ice.customTags";
 
+    /**
+     * Boolean Flag whether to use blended or Unblended Costs.  Default is Blended Cost(true)
+     */
+    public static final String USE_BLENDED = "ice.use_blended";
+
     /**
      * s3 bucket name where output files are to be store. Both read and write permissions are needed. It must be specified in Config.
      */

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

@@ -568,7 +568,7 @@ private void processBillingFile(String fileName, InputStream tempIn, boolean wit
             reader.readRecord();
             String[] headers = reader.getValues();
 
-            config.lineItemProcessor.initIndexes(withTags, headers);
+            config.lineItemProcessor.initIndexes(config, withTags, headers);
 
             while (reader.readRecord()) {
                 String[] items = reader.getValues();

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

@@ -32,7 +32,7 @@ public interface LineItemProcessor {
     public static final DateTimeFormatter amazonBillingDateFormat = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss").withZone(DateTimeZone.UTC);
     public static final DateTimeFormatter amazonBillingDateFormat2 = DateTimeFormat.forPattern("yyyy/MM/dd HH:mm:ss").withZone(DateTimeZone.UTC);
 
-    void initIndexes(boolean withTags, String[] header);
+    void initIndexes(ProcessorConfig config, boolean withTags, String[] header);
     List<String> getHeader();
     int getUserTagStartIndex();
     long getEndMillis(String[] items);

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

@@ -41,6 +41,7 @@ public class ProcessorConfig extends Config {
     public final LineItemProcessor lineItemProcessor;
     public final Randomizer randomizer;
     public final double costPerMonitorMetricPerHour;
+    public final boolean useBlended;
 
     public final String useCostForResourceGroup;
 
@@ -85,6 +86,7 @@ public ProcessorConfig(
         billingAccessExternalIds = properties.getProperty(IceOptions.BILLING_ACCESS_EXTERNALID, "").split(",");
 
         customTags = properties.getProperty(IceOptions.CUSTOM_TAGS, "").split(",");
+        useBlended = properties.getProperty(IceOptions.USE_BLENDED) == null ? true : Boolean.parseBoolean(properties.getProperty(IceOptions.USE_BLENDED));
 
         useCostForResourceGroup = properties.getProperty(IceOptions.RESOURCE_GROUP_COST, "modeled");