projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from OSM SO master
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwmonitor
/
rift
/
tasklets
/
rwmonitor
/
core.py
diff --git
a/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py
b/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py
index
b8abea7
..
f43da6f
100644
(file)
--- a/
rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py
+++ b/
rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py
@@
-231,7
+231,7
@@
class NfviMetrics(object):
self._account = account
self._plugin = plugin
self._timestamp = 0
self._account = account
self._plugin = plugin
self._timestamp = 0
- self._metrics = RwVnfrYang.YangData_
Vnfr
_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
+ self._metrics = RwVnfrYang.YangData_
RwProject_Project
_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
self._vdur = vdur
self._vim_id = vdur.vim_id
self._updating = None
self._vdur = vdur
self._vim_id = vdur.vim_id
self._updating = None
@@
-305,7
+305,7
@@
class NfviMetrics(object):
try:
# Create uninitialized metric structure
try:
# Create uninitialized metric structure
- vdu_metrics = RwVnfrYang.YangData_
Vnfr
_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
+ vdu_metrics = RwVnfrYang.YangData_
RwProject_Project
_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
# VCPU
vdu_metrics.vcpu.total = self.vdur.vm_flavor.vcpu_count
# VCPU
vdu_metrics.vcpu.total = self.vdur.vm_flavor.vcpu_count
@@
-549,17
+549,19
@@
class Monitor(object):
different sub-systems that are used to monitor the NFVI.
"""
different sub-systems that are used to monitor the NFVI.
"""
- def __init__(self, loop, log, config):
+ def __init__(self, loop, log, config
, project
):
"""Create a Monitor object
Arguments:
"""Create a Monitor object
Arguments:
- loop - an event loop
- log - the logger used by this object
- config - an instance of InstanceConfiguration
+ loop - an event loop
+ log - the logger used by this object
+ config - an instance of InstanceConfiguration
+ project - an instance of the project
"""
self._loop = loop
self._log = log
"""
self._loop = loop
self._log = log
+ self._project = project
self._cloud_accounts = dict()
self._nfvi_plugins = NfviMetricsPluginManager(log)
self._cloud_accounts = dict()
self._nfvi_plugins = NfviMetricsPluginManager(log)
@@
-580,6
+582,10
@@
class Monitor(object):
"""The event log used by this object"""
return self._log
"""The event log used by this object"""
return self._log
+ @property
+ def project(self):
+ return self._project
+
@property
def cache(self):
"""The NFVI metrics cache"""
@property
def cache(self):
"""The NFVI metrics cache"""