Permalink
Browse files

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

  • Loading branch information...
1 parent 41a6b48 commit 2db1313c9f770fb471c4cadbac5767fed1f0265b Sean Myers committed Jul 10, 2012
Showing with 17 additions and 3 deletions.
  1. +11 −0 tests/test_optimal_instances.json
  2. +6 −3 tests/test_optimize.py
@@ -0,0 +1,11 @@
+{
+"Heavy Utilization": {
+ "m1.small":20
+ },
+"Medium Utilization":{
+ "m1.small": 20
+ },
+"Light Utilization":{
+ "m1.small": 20
+ }
+}
View
@@ -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

0 comments on commit 2db1313

Please sign in to comment.