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 1396 - Error creating dashboard with same name in two different users
[osm/MON.git]
/
osm_mon
/
dashboarder
/
service.py
diff --git
a/osm_mon/dashboarder/service.py
b/osm_mon/dashboarder/service.py
index
2abd6be
..
3f83550
100644
(file)
--- a/
osm_mon/dashboarder/service.py
+++ b/
osm_mon/dashboarder/service.py
@@
-18,7
+18,7
@@
# License for the specific language governing permissions and limitations
# under the License.
# For those usages not covered by the Apache License, Version 2.0 please
# License for the specific language governing permissions and limitations
# under the License.
# For those usages not covered by the Apache License, Version 2.0 please
-# contact: glavado@whitestack.com
+# contact: glavado@whitestack.com
or fbravo@whitestack.com
##
import logging
##
import logging
@@
-26,6
+26,7
@@
from osm_mon.core.common_db import CommonDbClient
from osm_mon.core.config import Config
from osm_mon.dashboarder.backends.grafana import GrafanaBackend
from osm_mon import __path__ as mon_path
from osm_mon.core.config import Config
from osm_mon.dashboarder.backends.grafana import GrafanaBackend
from osm_mon import __path__ as mon_path
+from osm_mon.dashboarder.utils import find_in_list
log = logging.getLogger(__name__)
log = logging.getLogger(__name__)
@@
-51,6
+52,7
@@
class DashboarderService:
dashboard_path = '{}/dashboarder/templates/project_scoped.json'.format(mon_path[0])
if project_id not in dashboard_uids:
project_name = project['name']
dashboard_path = '{}/dashboarder/templates/project_scoped.json'.format(mon_path[0])
if project_id not in dashboard_uids:
project_name = project['name']
+ self.grafana.create_grafana_folders(project_name)
self.grafana.create_dashboard(project_id, project_name,
dashboard_path)
log.debug('Created dashboard for Project: %s', project_id)
self.grafana.create_dashboard(project_id, project_name,
dashboard_path)
log.debug('Created dashboard for Project: %s', project_id)
@@
-66,12
+68,14
@@
class DashboarderService:
# Collect NS IDs for periodical dashboard clean-up
osm_resource_uids.append(nsr_id)
# Check if the NSR's VNFDs contain metrics
# Collect NS IDs for periodical dashboard clean-up
osm_resource_uids.append(nsr_id)
# Check if the NSR's VNFDs contain metrics
- constituent_vnfds = nsr['nsd']['constituent-vnfd']
- for constituent_vnfd in constituent_vnfds:
+ # Only one DF at the moment, support for this feature is comming in the future
+ vnfds_profiles = nsr['nsd']["df"][0]['vnf-profile']
+ for vnf_profile in vnfds_profiles:
try:
try:
- vnfd = self.common_db.get_vnfd_by_
name(constituent_vnfd['vnfd-id-ref
'])
+ vnfd = self.common_db.get_vnfd_by_
id(vnf_profile['vnfd-id
'])
# If there are metrics, create dashboard (if exists)
# If there are metrics, create dashboard (if exists)
- if vnfd and 'monitoring-param' in vnfd:
+ vdu_found = find_in_list(vnfd["vdu"], lambda a_vdu: "monitoring-parameter" in a_vdu)
+ if vdu_found:
if nsr_id not in dashboard_uids:
nsr_name = nsr['name']
project_id = nsr["_admin"]["projects_read"][0]
if nsr_id not in dashboard_uids:
nsr_name = nsr['name']
project_id = nsr["_admin"]["projects_read"][0]