Added json test optimal instances. Also fixed imports in test optimize

Yelp · Jul 10, 2012 · 2db1313 · 2db1313
1 parent 41a6b48
commit 2db1313
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/tests/test_optimal_instances.json b/tests/test_optimal_instances.json
@@ -0,0 +1,11 @@
+{
+"Heavy Utilization": {
+	"m1.small":20
+	},
+"Medium Utilization":{
+	"m1.small": 20
+	},
+"Light Utilization":{
+	"m1.small": 20
+	}
+}
diff --git a/tests/test_optimize.py b/tests/test_optimize.py
@@ -6,17 +6,20 @@
 
 from emrio_lib.optimizer import Optimizer, convert_to_yearly_estimated_hours
 from emrio_lib import ec2_cost
-from test_prices import *
 
 EC2 = ec2_cost.EC2Info("tests/test_prices.yaml")
-print EC2.COST
-BASETIME = datetime.datetime(2012, 5, 20, 5)
 
+BASETIME = datetime.datetime(2012, 5, 20, 5)
 LIGHT_INTERVAL = datetime.timedelta(0, 30000)
 MEDIUM_INTERVAL = datetime.timedelta(0, 50000)
 HEAVY_INTERVAL = datetime.timedelta(0, 80000)
 DEMAND_INTERVAL = datetime.timedelta(0, 2000)
 
+HEAVY_UTIL = "Heavy Utilization"
+MEDIUM_UTIL = "Medium Utilization"
+LIGHT_UTIL = "Light Utilization"
+DEMAND = "On Demand"
+
 INSTANCE_NAME = 'm1.small'
 BASE_INSTANCES = 10
 JOB_AMOUNT = 5