projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented VMware infra collector plugin
[osm/MON.git]
/
osm_mon
/
collector
/
vnf_collectors
/
juju.py
diff --git
a/osm_mon/collector/vnf_collectors/juju.py
b/osm_mon/collector/vnf_collectors/juju.py
index
928b35a
..
6c5e314
100644
(file)
--- a/
osm_mon/collector/vnf_collectors/juju.py
+++ b/
osm_mon/collector/vnf_collectors/juju.py
@@
-29,18
+29,19
@@
from osm_mon.collector.metric import Metric
from osm_mon.collector.vnf_collectors.base import BaseCollector
from osm_mon.collector.vnf_metric import VnfMetric
from osm_mon.core.common_db import CommonDbClient
from osm_mon.collector.vnf_collectors.base import BaseCollector
from osm_mon.collector.vnf_metric import VnfMetric
from osm_mon.core.common_db import CommonDbClient
+from osm_mon.core.config import Config
from osm_mon.core.exceptions import VcaDeploymentInfoNotFound
from osm_mon.core.exceptions import VcaDeploymentInfoNotFound
-from osm_mon.core.settings import Config
log = logging.getLogger(__name__)
class VCACollector(BaseCollector):
log = logging.getLogger(__name__)
class VCACollector(BaseCollector):
- def __init__(self):
-
cfg = Config.instance(
)
- self.common_db = CommonDbClient()
+ def __init__(self
, config: Config
):
+
super().__init__(config
)
+ self.common_db = CommonDbClient(
config
)
self.loop = asyncio.get_event_loop()
self.loop = asyncio.get_event_loop()
- self.n2vc = N2VC(server=cfg.OSMMON_VCA_HOST, user=cfg.OSMMON_VCA_USER, secret=cfg.OSMMON_VCA_SECRET)
+ self.n2vc = N2VC(server=config.get('vca', 'host'), user=config.get('vca', 'user'),
+ secret=config.get('vca', 'secret'))
def collect(self, vnfr: dict) -> List[Metric]:
nsr_id = vnfr['nsr-id-ref']
def collect(self, vnfr: dict) -> List[Metric]:
nsr_id = vnfr['nsr-id-ref']