projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for bug 1414, bug 1435 & bug 1438 - Multi-tenancy with keystone as backend
[osm/MON.git]
/
osm_mon
/
collector
/
infra_collectors
/
vmware.py
diff --git
a/osm_mon/collector/infra_collectors/vmware.py
b/osm_mon/collector/infra_collectors/vmware.py
index
0f40d48
..
6accd65
100644
(file)
--- a/
osm_mon/collector/infra_collectors/vmware.py
+++ b/
osm_mon/collector/infra_collectors/vmware.py
@@
-50,6
+50,7
@@
class VMwareInfraCollector(BaseVimInfraCollector):
self.admin_password = vim_account['admin_password']
self.vim_uuid = vim_account['vim_uuid']
self.org_name = vim_account['orgname']
self.admin_password = vim_account['admin_password']
self.vim_uuid = vim_account['vim_uuid']
self.org_name = vim_account['orgname']
+ self.vim_project_id = vim_account['project_id']
def connect_vim_as_admin(self):
""" Method connect as pvdc admin user to vCloud director.
def connect_vim_as_admin(self):
""" Method connect as pvdc admin user to vCloud director.
@@
-91,16
+92,15
@@
class VMwareInfraCollector(BaseVimInfraCollector):
vim_account['vim_type'] = vim_account_info['vim_type']
vim_account['vim_url'] = vim_account_info['vim_url']
vim_account['org_user'] = vim_account_info['vim_user']
vim_account['vim_type'] = vim_account_info['vim_type']
vim_account['vim_url'] = vim_account_info['vim_url']
vim_account['org_user'] = vim_account_info['vim_user']
- vim_account['org_password'] = self.common_db.decrypt_vim_password(vim_account_info['vim_password'],
- vim_account_info['schema_version'],
- vim_account_id)
vim_account['vim_uuid'] = vim_account_info['_id']
vim_account['vim_uuid'] = vim_account_info['_id']
+ if vim_account_info['_admin']['projects_read']:
+ vim_account['project_id'] = vim_account_info['_admin']['projects_read'][0]
+ else:
+ vim_account['project_id'] = ''
vim_config = vim_account_info['config']
vim_account['admin_username'] = vim_config['admin_username']
vim_config = vim_account_info['config']
vim_account['admin_username'] = vim_config['admin_username']
- vim_account['admin_password'] = self.common_db.decrypt_vim_password(vim_config['admin_password'],
- vim_account_info['schema_version'],
- vim_account_id)
+ vim_account['admin_password'] = vim_config['admin_password']
if vim_config['orgname'] is not None:
vim_account['orgname'] = vim_config['orgname']
if vim_config['orgname'] is not None:
vim_account['orgname'] = vim_config['orgname']
@@
-171,20
+171,33
@@
class VMwareInfraCollector(BaseVimInfraCollector):
def collect(self) -> List[Metric]:
metrics = []
vim_status = self.check_vim_status()
def collect(self) -> List[Metric]:
metrics = []
vim_status = self.check_vim_status()
- vim_status_metric = Metric({'vim_account_id': self.vim_account_id}, 'vim_status', vim_status)
+ vim_account_id = self.vim_account_id
+ vim_project_id = self.vim_project_id
+ vim_tags = {
+ 'vim_account_id': vim_account_id,
+ 'project_id': vim_project_id
+ }
+ vim_status_metric = Metric(vim_tags, 'vim_status', vim_status)
metrics.append(vim_status_metric)
metrics.append(vim_status_metric)
- vnfrs = self.common_db.get_vnfrs(vim_account_id=
self.
vim_account_id)
+ vnfrs = self.common_db.get_vnfrs(vim_account_id=vim_account_id)
for vnfr in vnfrs:
nsr_id = vnfr['nsr-id-ref']
for vnfr in vnfrs:
nsr_id = vnfr['nsr-id-ref']
+ ns_name = self.common_db.get_nsr(nsr_id)['name']
vnf_member_index = vnfr['member-vnf-index-ref']
vnf_member_index = vnfr['member-vnf-index-ref']
+ if vnfr['_admin']['projects_read']:
+ vnfr_project_id = vnfr['_admin']['projects_read'][0]
+ else:
+ vnfr_project_id = ''
for vdur in vnfr['vdur']:
resource_uuid = vdur['vim-id']
tags = {
'vim_account_id': self.vim_account_id,
'resource_uuid': resource_uuid,
'nsr_id': nsr_id,
for vdur in vnfr['vdur']:
resource_uuid = vdur['vim-id']
tags = {
'vim_account_id': self.vim_account_id,
'resource_uuid': resource_uuid,
'nsr_id': nsr_id,
+ 'ns_name': ns_name,
'vnf_member_index': vnf_member_index,
'vnf_member_index': vnf_member_index,
- 'vdur_name': vdur['name']
+ 'vdur_name': vdur['name'],
+ 'project_id': vnfr_project_id
}
try:
vm_list = self.check_vm_status(resource_uuid)
}
try:
vm_list = self.check_vm_status(resource_uuid)