[haizea-commit] r587 - in branches/TP2.0/src/haizea: cli common core core/enact core/frontends core/scheduler core/scheduler/preparation_schedulers traces
haizea-commit at mailman.cs.uchicago.edu
haizea-commit at mailman.cs.uchicago.edu
Wed Jun 17 11:20:38 CDT 2009
Author: borja
Date: 2009-06-17 11:20:36 -0500 (Wed, 17 Jun 2009)
New Revision: 587
Modified:
branches/TP2.0/src/haizea/cli/commands.py
branches/TP2.0/src/haizea/cli/rpc_commands.py
branches/TP2.0/src/haizea/common/constants.py
branches/TP2.0/src/haizea/common/utils.py
branches/TP2.0/src/haizea/core/accounting.py
branches/TP2.0/src/haizea/core/enact/__init__.py
branches/TP2.0/src/haizea/core/enact/opennebula.py
branches/TP2.0/src/haizea/core/enact/simulated.py
branches/TP2.0/src/haizea/core/frontends/opennebula.py
branches/TP2.0/src/haizea/core/frontends/rpc.py
branches/TP2.0/src/haizea/core/frontends/tracefile.py
branches/TP2.0/src/haizea/core/leases.py
branches/TP2.0/src/haizea/core/log.py
branches/TP2.0/src/haizea/core/rm.py
branches/TP2.0/src/haizea/core/scheduler/lease_scheduler.py
branches/TP2.0/src/haizea/core/scheduler/mapper.py
branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py
branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/unmanaged.py
branches/TP2.0/src/haizea/core/scheduler/resourcepool.py
branches/TP2.0/src/haizea/core/scheduler/slottable.py
branches/TP2.0/src/haizea/core/scheduler/vm_scheduler.py
branches/TP2.0/src/haizea/traces/readers.py
Log:
Changed import statements to refer to new "core" package
Modified: branches/TP2.0/src/haizea/cli/commands.py
===================================================================
--- branches/TP2.0/src/haizea/cli/commands.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/cli/commands.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -16,9 +16,9 @@
# limitations under the License. #
# -------------------------------------------------------------------------- #
-from haizea.resourcemanager.rm import ResourceManager
+from haizea.core.rm import ResourceManager
from haizea.common.utils import generate_config_name, unpickle
-from haizea.resourcemanager.configfile import HaizeaConfig, HaizeaMultiConfig
+from haizea.core.configfile import HaizeaConfig, HaizeaMultiConfig
from haizea.common.config import ConfigException
from haizea.cli.optionparser import OptionParser, Option
from haizea.cli import Command
Modified: branches/TP2.0/src/haizea/cli/rpc_commands.py
===================================================================
--- branches/TP2.0/src/haizea/cli/rpc_commands.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/cli/rpc_commands.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -16,7 +16,7 @@
# limitations under the License. #
# -------------------------------------------------------------------------- #
import haizea.common.defaults as defaults
-from haizea.resourcemanager.datastruct import Lease
+from haizea.core.datastruct import Lease
from haizea.cli.optionparser import OptionParser, Option
from haizea.cli import Command
import xmlrpclib
Modified: branches/TP2.0/src/haizea/common/constants.py
===================================================================
--- branches/TP2.0/src/haizea/common/constants.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/common/constants.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -90,7 +90,7 @@
-ENACT_PACKAGE="haizea.resourcemanager.enact"
+ENACT_PACKAGE="haizea.core.enact"
COUNTER_ARACCEPTED="Accepted AR"
COUNTER_ARREJECTED="Rejected AR"
Modified: branches/TP2.0/src/haizea/common/utils.py
===================================================================
--- branches/TP2.0/src/haizea/common/utils.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/common/utils.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -116,17 +116,21 @@
def get_config():
- from haizea.resourcemanager.rm import ResourceManager
+ from haizea.core.rm import ResourceManager
return ResourceManager.get_singleton().config
def get_accounting():
- from haizea.resourcemanager.rm import ResourceManager
+ from haizea.core.rm import ResourceManager
return ResourceManager.get_singleton().accounting
def get_clock():
- from haizea.resourcemanager.rm import ResourceManager
+ from haizea.core.rm import ResourceManager
return ResourceManager.get_singleton().clock
+def get_policy():
+ from haizea.core.rm import ResourceManager
+ return ResourceManager.get_singleton().policy
+
class InvalidStateMachineTransition(Exception):
pass
Modified: branches/TP2.0/src/haizea/core/accounting.py
===================================================================
--- branches/TP2.0/src/haizea/core/accounting.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/accounting.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -20,7 +20,7 @@
import os.path
import haizea.common.constants as constants
from haizea.common.utils import pickle, get_config, get_clock
-from haizea.resourcemanager.leases import BestEffortLease
+from haizea.core.leases import BestEffortLease
from errno import EEXIST
class AccountingData(object):
Modified: branches/TP2.0/src/haizea/core/enact/__init__.py
===================================================================
--- branches/TP2.0/src/haizea/core/enact/__init__.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/enact/__init__.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -17,7 +17,7 @@
# -------------------------------------------------------------------------- #
from haizea.common.utils import abstract
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple
+from haizea.core.scheduler.slottable import ResourceTuple
class ResourcePoolInfo(object):
def __init__(self):
Modified: branches/TP2.0/src/haizea/core/enact/opennebula.py
===================================================================
--- branches/TP2.0/src/haizea/core/enact/opennebula.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/enact/opennebula.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -16,10 +16,10 @@
# limitations under the License. #
# -------------------------------------------------------------------------- #
-from haizea.resourcemanager.scheduler import EnactmentError
-from haizea.resourcemanager.scheduler.resourcepool import Node
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple
-from haizea.resourcemanager.enact import ResourcePoolInfo, VMEnactment, DeploymentEnactment
+from haizea.core.scheduler import EnactmentError
+from haizea.core.scheduler.resourcepool import Node
+from haizea.core.scheduler.slottable import ResourceTuple
+from haizea.core.enact import ResourcePoolInfo, VMEnactment, DeploymentEnactment
from haizea.common.utils import get_config
import haizea.common.constants as constants
from pysqlite2 import dbapi2 as sqlite
Modified: branches/TP2.0/src/haizea/core/enact/simulated.py
===================================================================
--- branches/TP2.0/src/haizea/core/enact/simulated.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/enact/simulated.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -16,9 +16,9 @@
# limitations under the License. #
# -------------------------------------------------------------------------- #
-from haizea.resourcemanager.scheduler.resourcepool import Node
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple
-from haizea.resourcemanager.enact import ResourcePoolInfo, VMEnactment, DeploymentEnactment
+from haizea.core.scheduler.resourcepool import Node
+from haizea.core.scheduler.slottable import ResourceTuple
+from haizea.core.enact import ResourcePoolInfo, VMEnactment, DeploymentEnactment
import haizea.common.constants as constants
from haizea.common.utils import get_config
import logging
Modified: branches/TP2.0/src/haizea/core/frontends/opennebula.py
===================================================================
--- branches/TP2.0/src/haizea/core/frontends/opennebula.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/frontends/opennebula.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -17,9 +17,9 @@
# -------------------------------------------------------------------------- #
import haizea.common.constants as constants
-from haizea.resourcemanager.frontends import RequestFrontend
-from haizea.resourcemanager.leases import ARLease, BestEffortLease, ImmediateLease
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple
+from haizea.core.frontends import RequestFrontend
+from haizea.core.leases import ARLease, BestEffortLease, ImmediateLease
+from haizea.core.scheduler.slottable import ResourceTuple
from haizea.common.utils import UNIX2DateTime, round_datetime, get_config, get_clock
from pysqlite2 import dbapi2 as sqlite
Modified: branches/TP2.0/src/haizea/core/frontends/rpc.py
===================================================================
--- branches/TP2.0/src/haizea/core/frontends/rpc.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/frontends/rpc.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -16,9 +16,9 @@
# limitations under the License. #
# -------------------------------------------------------------------------- #
import haizea.common.constants as constants
-from haizea.resourcemanager.leases import ARLease, BestEffortLease, ImmediateLease
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple
-from haizea.resourcemanager.frontends import RequestFrontend
+from haizea.core.leases import ARLease, BestEffortLease, ImmediateLease
+from haizea.core.scheduler.slottable import ResourceTuple
+from haizea.core.frontends import RequestFrontend
from haizea.common.utils import round_datetime, get_config, get_clock
from mx.DateTime import DateTimeDelta, TimeDelta, ISO
import logging
Modified: branches/TP2.0/src/haizea/core/frontends/tracefile.py
===================================================================
--- branches/TP2.0/src/haizea/core/frontends/tracefile.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/frontends/tracefile.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -18,9 +18,9 @@
import haizea.common.constants as constants
from haizea.common.utils import get_clock
-from haizea.resourcemanager.frontends import RequestFrontend
+from haizea.core.frontends import RequestFrontend
import haizea.traces.readers as tracereaders
-from haizea.resourcemanager.leases import ARLease, BestEffortLease
+from haizea.core.leases import ARLease, BestEffortLease
import operator
import logging
Modified: branches/TP2.0/src/haizea/core/leases.py
===================================================================
--- branches/TP2.0/src/haizea/core/leases.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/leases.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -31,7 +31,7 @@
from haizea.common.constants import LOGLEVEL_VDEBUG
from haizea.common.utils import StateMachine, round_datetime_delta, get_lease_id, pretty_nodemap, xmlrpc_marshall_singlevalue
-from haizea.resourcemanager.scheduler.slottable import ResourceReservation
+from haizea.core.scheduler.slottable import ResourceReservation
from mx.DateTime import TimeDelta
Modified: branches/TP2.0/src/haizea/core/log.py
===================================================================
--- branches/TP2.0/src/haizea/core/log.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/log.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -17,7 +17,7 @@
# -------------------------------------------------------------------------- #
import logging
-from haizea.resourcemanager.rm import ResourceManager
+from haizea.core.rm import ResourceManager
from haizea.common.constants import LOGLEVEL_VDEBUG, LOGLEVEL_STATUS
logging.addLevelName(LOGLEVEL_VDEBUG, "VDEBUG")
Modified: branches/TP2.0/src/haizea/core/rm.py
===================================================================
--- branches/TP2.0/src/haizea/core/rm.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/rm.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -31,23 +31,23 @@
* RealClock: A clock that advances in realtime.
"""
-import haizea.resourcemanager.accounting as accounting
+import haizea.core.accounting as accounting
import haizea.common.constants as constants
-from haizea.resourcemanager.scheduler.preparation_schedulers.unmanaged import UnmanagedPreparationScheduler
-from haizea.resourcemanager.scheduler.preparation_schedulers.imagetransfer import ImageTransferPreparationScheduler
-from haizea.resourcemanager.enact.opennebula import OpenNebulaResourcePoolInfo, OpenNebulaVMEnactment, OpenNebulaDummyDeploymentEnactment
-from haizea.resourcemanager.enact.simulated import SimulatedResourcePoolInfo, SimulatedVMEnactment, SimulatedDeploymentEnactment
-from haizea.resourcemanager.frontends.tracefile import TracefileFrontend
-from haizea.resourcemanager.frontends.opennebula import OpenNebulaFrontend
-from haizea.resourcemanager.frontends.rpc import RPCFrontend
-from haizea.resourcemanager.leases import BestEffortLease
-from haizea.resourcemanager.scheduler import UnrecoverableError
-from haizea.resourcemanager.scheduler.lease_scheduler import LeaseScheduler
-from haizea.resourcemanager.scheduler.vm_scheduler import VMScheduler
-from haizea.resourcemanager.scheduler.slottable import SlotTable
-from haizea.resourcemanager.scheduler.policy import Policy
-from haizea.resourcemanager.scheduler.resourcepool import ResourcePool, ResourcePoolWithReusableImages
-from haizea.resourcemanager.rpcserver import RPCServer
+from haizea.core.scheduler.preparation_schedulers.unmanaged import UnmanagedPreparationScheduler
+from haizea.core.scheduler.preparation_schedulers.imagetransfer import ImageTransferPreparationScheduler
+from haizea.core.enact.opennebula import OpenNebulaResourcePoolInfo, OpenNebulaVMEnactment, OpenNebulaDummyDeploymentEnactment
+from haizea.core.enact.simulated import SimulatedResourcePoolInfo, SimulatedVMEnactment, SimulatedDeploymentEnactment
+from haizea.core.frontends.tracefile import TracefileFrontend
+from haizea.core.frontends.opennebula import OpenNebulaFrontend
+from haizea.core.frontends.rpc import RPCFrontend
+from haizea.core.leases import BestEffortLease
+from haizea.core.scheduler import UnrecoverableError
+from haizea.core.scheduler.lease_scheduler import LeaseScheduler
+from haizea.core.scheduler.vm_scheduler import VMScheduler
+from haizea.core.scheduler.slottable import SlotTable
+from haizea.core.scheduler.policy import Policy
+from haizea.core.scheduler.resourcepool import ResourcePool, ResourcePoolWithReusableImages
+from haizea.core.rpcserver import RPCServer
from haizea.common.utils import abstract, round_datetime, Singleton
import operator
@@ -218,7 +218,7 @@
"""
- from haizea.resourcemanager.log import HaizeaLogger
+ from haizea.core.log import HaizeaLogger
logger = logging.getLogger("")
if self.daemon:
handler = logging.FileHandler(self.config.get("logfile"))
Modified: branches/TP2.0/src/haizea/core/scheduler/lease_scheduler.py
===================================================================
--- branches/TP2.0/src/haizea/core/scheduler/lease_scheduler.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/scheduler/lease_scheduler.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -30,10 +30,10 @@
import haizea.common.constants as constants
from haizea.common.utils import round_datetime, get_config, get_accounting, get_clock
-from haizea.resourcemanager.leases import Lease, ARLease, BestEffortLease, ImmediateLease
-from haizea.resourcemanager.scheduler import RescheduleLeaseException, NormalEndLeaseException, InconsistentLeaseStateError, EnactmentError, UnrecoverableError, NotSchedulableException
-from haizea.resourcemanager.scheduler.slottable import ResourceReservation
-from haizea.resourcemanager.scheduler.vm_scheduler import VMResourceReservation
+from haizea.core.leases import Lease, ARLease, BestEffortLease, ImmediateLease
+from haizea.core.scheduler import RescheduleLeaseException, NormalEndLeaseException, InconsistentLeaseStateError, EnactmentError, UnrecoverableError, NotSchedulableException
+from haizea.core.scheduler.slottable import ResourceReservation
+from haizea.core.scheduler.vm_scheduler import VMResourceReservation
from operator import attrgetter
import logging
Modified: branches/TP2.0/src/haizea/core/scheduler/mapper.py
===================================================================
--- branches/TP2.0/src/haizea/core/scheduler/mapper.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/scheduler/mapper.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -17,7 +17,7 @@
# -------------------------------------------------------------------------- #
from haizea.common.utils import abstract
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple, AvailabilityWindow
+from haizea.core.scheduler.slottable import ResourceTuple, AvailabilityWindow
import haizea.common.constants as constants
import operator
Modified: branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py
===================================================================
--- branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/imagetransfer.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -17,12 +17,12 @@
# -------------------------------------------------------------------------- #
import haizea.common.constants as constants
-from haizea.resourcemanager.scheduler.preparation_schedulers import PreparationScheduler
-from haizea.resourcemanager.scheduler.slottable import ResourceReservation
-from haizea.resourcemanager.leases import Lease, ARLease, BestEffortLease
-from haizea.resourcemanager.scheduler import ReservationEventHandler, NotSchedulableException
+from haizea.core.scheduler.preparation_schedulers import PreparationScheduler
+from haizea.core.scheduler.slottable import ResourceReservation
+from haizea.core.leases import Lease, ARLease, BestEffortLease
+from haizea.core.scheduler import ReservationEventHandler, NotSchedulableException
from haizea.common.utils import estimate_transfer_time, get_config
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple
+from haizea.core.scheduler.slottable import ResourceTuple
import copy
@@ -361,7 +361,7 @@
return newtransfers
def estimate_image_transfer_time(self, lease, bandwidth):
- from haizea.resourcemanager.rm import ResourceManager
+ from haizea.core.rm import ResourceManager
config = ResourceManager.get_singleton().config
forceTransferTime = config.get("force-imagetransfer-time")
if forceTransferTime != None:
Modified: branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/unmanaged.py
===================================================================
--- branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/unmanaged.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/scheduler/preparation_schedulers/unmanaged.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -16,8 +16,8 @@
# limitations under the License. #
# -------------------------------------------------------------------------- #
-from haizea.resourcemanager.leases import Lease
-from haizea.resourcemanager.scheduler.preparation_schedulers import PreparationScheduler
+from haizea.core.leases import Lease
+from haizea.core.scheduler.preparation_schedulers import PreparationScheduler
import haizea.common.constants as constants
class UnmanagedPreparationScheduler(PreparationScheduler):
Modified: branches/TP2.0/src/haizea/core/scheduler/resourcepool.py
===================================================================
--- branches/TP2.0/src/haizea/core/scheduler/resourcepool.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/scheduler/resourcepool.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -18,8 +18,8 @@
from haizea.common.utils import vnodemapstr, get_accounting
import haizea.common.constants as constants
-import haizea.resourcemanager.enact.actions as actions
-from haizea.resourcemanager.scheduler import EnactmentError
+import haizea.core.enact.actions as actions
+from haizea.core.scheduler import EnactmentError
import logging
Modified: branches/TP2.0/src/haizea/core/scheduler/slottable.py
===================================================================
--- branches/TP2.0/src/haizea/core/scheduler/slottable.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/scheduler/slottable.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -443,7 +443,7 @@
# ONLY for simulation
def get_next_premature_end(self, after):
- from haizea.resourcemanager.scheduler.vm_scheduler import VMResourceReservation
+ from haizea.core.scheduler.vm_scheduler import VMResourceReservation
# Inefficient, but ok since this query seldom happens
res = [i.value for i in self.reservations_by_end if isinstance(i.value, VMResourceReservation) and i.value.prematureend > after]
if len(res) > 0:
@@ -455,7 +455,7 @@
# ONLY for simulation
def get_prematurely_ending_res(self, t):
- from haizea.resourcemanager.scheduler.vm_scheduler import VMResourceReservation
+ from haizea.core.scheduler.vm_scheduler import VMResourceReservation
return [i.value for i in self.reservations_by_end if isinstance(i.value, VMResourceReservation) and i.value.prematureend == t]
Modified: branches/TP2.0/src/haizea/core/scheduler/vm_scheduler.py
===================================================================
--- branches/TP2.0/src/haizea/core/scheduler/vm_scheduler.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/core/scheduler/vm_scheduler.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -18,9 +18,9 @@
import haizea.common.constants as constants
from haizea.common.utils import round_datetime_delta, round_datetime, estimate_transfer_time, pretty_nodemap, get_config, get_clock
-from haizea.resourcemanager.leases import Lease, BestEffortLease
-from haizea.resourcemanager.scheduler.slottable import ResourceReservation, ResourceTuple
-from haizea.resourcemanager.scheduler import ReservationEventHandler, RescheduleLeaseException, NormalEndLeaseException, EnactmentError, NotSchedulableException, InconsistentScheduleError, InconsistentLeaseStateError
+from haizea.core.leases import Lease, BestEffortLease
+from haizea.core.scheduler.slottable import ResourceReservation, ResourceTuple
+from haizea.core.scheduler import ReservationEventHandler, RescheduleLeaseException, NormalEndLeaseException, EnactmentError, NotSchedulableException, InconsistentScheduleError, InconsistentLeaseStateError
from operator import attrgetter, itemgetter
from mx.DateTime import TimeDelta
@@ -759,7 +759,7 @@
vmrr.post_rrs.append(shutdown_rr)
def __schedule_suspension(self, vmrr, suspend_by):
- from haizea.resourcemanager.rm import ResourceManager
+ from haizea.core.rm import ResourceManager
config = ResourceManager.get_singleton().config
susp_exclusion = config.get("suspendresume-exclusion")
override = get_config().get("override-suspend-time")
@@ -802,7 +802,7 @@
vmrr.post_rrs.append(susprr)
def __schedule_resumption(self, vmrr, resume_at):
- from haizea.resourcemanager.rm import ResourceManager
+ from haizea.core.rm import ResourceManager
config = ResourceManager.get_singleton().config
resm_exclusion = config.get("suspendresume-exclusion")
override = get_config().get("override-resume-time")
@@ -891,7 +891,7 @@
# TODO: Take into account other things like boot overhead, migration overhead, etc.
def __compute_scheduling_threshold(self, lease):
- from haizea.resourcemanager.rm import ResourceManager
+ from haizea.core.rm import ResourceManager
config = ResourceManager.get_singleton().config
threshold = config.get("force-scheduling-threshold")
if threshold != None:
Modified: branches/TP2.0/src/haizea/traces/readers.py
===================================================================
--- branches/TP2.0/src/haizea/traces/readers.py 2009-06-17 16:16:44 UTC (rev 586)
+++ branches/TP2.0/src/haizea/traces/readers.py 2009-06-17 16:20:36 UTC (rev 587)
@@ -17,8 +17,8 @@
# -------------------------------------------------------------------------- #
from mx.DateTime import TimeDelta
-from haizea.resourcemanager.leases import Lease, ARLease, BestEffortLease
-from haizea.resourcemanager.scheduler.slottable import ResourceTuple
+from haizea.core.leases import Lease, ARLease, BestEffortLease
+from haizea.core.scheduler.slottable import ResourceTuple
import haizea.common.constants as constants
import haizea.traces.formats as formats
More information about the Haizea-commit
mailing list