projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #71 from mpeuster/master
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
resourcemodel
/
__init__.py
diff --git
a/src/emuvim/dcemulator/resourcemodel/__init__.py
b/src/emuvim/dcemulator/resourcemodel/__init__.py
index
52a35e5
..
e35da25
100644
(file)
--- a/
src/emuvim/dcemulator/resourcemodel/__init__.py
+++ b/
src/emuvim/dcemulator/resourcemodel/__init__.py
@@
-12,11
+12,13
@@
class ResourceModelRegistrar(object):
Global registry to keep track of all existing resource models.
"""
Global registry to keep track of all existing resource models.
"""
- def __init__(self, dc_emulation_max_cpu):
+ def __init__(self, dc_emulation_max_cpu
, dc_emulation_max_mem
):
self.e_cpu = dc_emulation_max_cpu
self.e_cpu = dc_emulation_max_cpu
+ self.e_mem = dc_emulation_max_mem
# pointer to all resource models assigned to DCs
self._resource_models = dict()
# pointer to all resource models assigned to DCs
self._resource_models = dict()
- LOG.info("Resource model registrar created with dc_emulation_max_cpu=%r" % dc_emulation_max_cpu)
+ LOG.info("Resource model registrar created with dc_emulation_max_cpu=%r and dc_emulation_max_mem=%r"
+ % (dc_emulation_max_cpu, dc_emulation_max_mem))
def register(self, dc, rm):
"""
def register(self, dc, rm):
"""
@@
-29,12
+31,25
@@
class ResourceModelRegistrar(object):
raise Exception("There is already an resource model assigned to this DC.")
self._resource_models[dc] = rm
rm.registrar = self
raise Exception("There is already an resource model assigned to this DC.")
self._resource_models[dc] = rm
rm.registrar = self
+ rm.dcs.append(dc)
LOG.info("Registrar: Added resource model: %r" % rm)
@property
def resource_models(self):
LOG.info("Registrar: Added resource model: %r" % rm)
@property
def resource_models(self):
+ """
+ List of registered resource models
+ :return:
+ """
return list(self._resource_models.itervalues())
return list(self._resource_models.itervalues())
+ @property
+ def num_dcs_with_rms(self):
+ """
+ Total number of data centers that are connected to a resource model
+ :return:
+ """
+ return sum([len(rm.dcs) for rm in list(self._resource_models.itervalues())])
+
class ResourceFlavor(object):
"""
class ResourceFlavor(object):
"""
@@
-60,6
+75,7
@@
class BaseResourceModel(object):
self._flavors = dict()
self._initDefaultFlavors()
self.registrar = None # pointer to registrar
self._flavors = dict()
self._initDefaultFlavors()
self.registrar = None # pointer to registrar
+ self.dcs = list()
self.allocated_compute_instances = dict()
LOG.info("Resource model %r initialized" % self)
self.allocated_compute_instances = dict()
LOG.info("Resource model %r initialized" % self)