Renamed ONOSes in ceilometer
diff --git a/views/ngXosViews/ceilometerDashboard/env/default.js b/views/ngXosViews/ceilometerDashboard/env/default.js
index f76b607..a829f62 100644
--- a/views/ngXosViews/ceilometerDashboard/env/default.js
+++ b/views/ngXosViews/ceilometerDashboard/env/default.js
@@ -7,7 +7,7 @@
// (works only for local environment as both application are served on the same domain)
module.exports = {
- host: 'http://clnode078.clemson.cloudlab.us:9999/',
- xoscsrftoken: 'Lbrkulk7c9fQOloSjhQEqLdDDFRNHsuL',
- xossessionid: '7j0w1m7t4qcyu472voe32jz6ck9dnq14'
+ host: 'http://apt088.apt.emulab.net:9999/',
+ xoscsrftoken: 'BunrrI2xqNYwNtCPes1ii7zJAFzgORlW',
+ xossessionid: 'ysq87pq2kp0bvarsu2xkq2kcjy7u2mx1'
};
diff --git a/views/ngXosViews/ceilometerDashboard/src/js/main.js b/views/ngXosViews/ceilometerDashboard/src/js/main.js
index 12f5e72..27312ce 100644
--- a/views/ngXosViews/ceilometerDashboard/src/js/main.js
+++ b/views/ngXosViews/ceilometerDashboard/src/js/main.js
@@ -136,6 +136,30 @@
this.loader = true;
Ceilometer.getMappings()
.then((services) => {
+
+ // rename thing in UI
+ services.map((service) => {
+ if(service.service === 'service_ONOS_vBNG'){
+ service.service = 'ONOS_FABRIC';
+ service.slices.map(s => {
+ if(s.slice === 'mysite_onos_vbng'){
+ s.slice = 'ONOS_FABRIC';
+ }
+ });
+ }
+ if(service.service === 'service_ONOS_vOLT'){
+ service.service = 'ONOS_CORD';
+ service.slices.map(s => {
+ if(s.slice === 'mysite_onos_volt'){
+ s.slice = 'ONOS_CORD';
+ }
+ });
+ }
+
+ return service;
+ });
+ // end rename thing in UI
+
this.services = services;
this.openPanels();
})
@@ -172,6 +196,15 @@
// store the status
Ceilometer.selectedSlice = slice;
Ceilometer.selectedService = service_name;
+
+ // rename things in UI
+ sliceMeters.map(m => {
+ m.resource_name = m.resource_name.replace('mysite_onos_vbng', 'ONOS_FABRIC');
+ m.resource_name = m.resource_name.replace('mysite_onos_volt', 'ONOS_CORD');
+ return m;
+ });
+ // end rename things in UI
+
this.selectedResources = lodash.groupBy(sliceMeters, 'resource_name');
// hacky
@@ -315,6 +348,7 @@
id: item.project_id,
name: item.resource_name || item.project_id
});
+
return labels;
}, []);
}
@@ -330,6 +364,14 @@
Ceilometer.getSamples(this.name) //fetch all
.then(res => {
+ // rename things in UI
+ res.map(m => {
+ m.resource_name = m.resource_name.replace('mysite_onos_vbng', 'ONOS_FABRIC');
+ m.resource_name = m.resource_name.replace('mysite_onos_volt', 'ONOS_CORD');
+ return m;
+ });
+ // end rename things in UI
+
// setup data for visualization
this.samplesList = lodash.groupBy(res, 'project_id');
this.sampleLabels = this.formatSamplesLabels(res);
@@ -367,6 +409,11 @@
this.loader = true;
Ceilometer.getStats({tenant: tenant})
.then(res => {
+ res.map(m => {
+ m.resource_name = m.resource_name.replace('mysite_onos_vbng', 'ONOS_FABRIC');
+ m.resource_name = m.resource_name.replace('mysite_onos_volt', 'ONOS_CORD');
+ return m;
+ });
this.stats = res;
})
.catch(err => {
diff --git a/views/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html b/views/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html
index 069141d..62e0ce9 100644
--- a/views/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html
+++ b/views/ngXosViews/ceilometerDashboard/src/templates/accordion-group.html
@@ -1,8 +1,8 @@
<div class="panel {{panelClass || 'panel-default'}}">
<div class="panel-heading" ng-keypress="toggleOpen($event)">
- <h3>
+ <h5>
<a href tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" uib-accordion-transclude="heading"><span ng-class="{'text-muted': isDisabled}">{{heading}}</span></a>
- </h3>
+ </h5>
</div>
<div class="panel-collapse collapse" uib-collapse="!isOpen">
<div class="panel-body" ng-transclude></div>
diff --git a/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html b/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html
index fe7720c..a7a3b9e 100644
--- a/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html
+++ b/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-dashboard.tpl.html
@@ -1,6 +1,6 @@
<div class="row">
<div class="col-sm-10">
- <h1>XOS Monitoring Statistics</h1>
+ <h3>XOS Monitoring Statistics</h3>
</div>
<div class="col-xs-2 text-right">
<a href="" class="btn btn-default"
@@ -25,14 +25,14 @@
<section ng-hide="vm.loader" ng-class="{animate: !vm.loader}">
<div class="row">
<div class="col-sm-3 service-list">
- <h3>XOS Service: </h3>
+ <h4>XOS Service: </h4>
<uib-accordion close-others="true" template-url="templates/accordion.html">
<uib-accordion-group
ng-repeat="service in vm.services | orderBy:'-service'"
template-url="templates/accordion-group.html"
is-open="vm.accordion.open[service.service]"
heading="{{service.service}}">
- <h4>Slices:</h4>
+ <h5>Slices:</h5>
<a ng-repeat="slice in service.slices"
ng-class="{active: slice.slice === vm.selectedSlice}"
ng-click="vm.loadSliceMeter(slice, service.service)"
@@ -49,7 +49,7 @@
<div class="col-xs-12">
<div class="list-group">
<div class="list-group-item">
- <h3>Stats</h3>
+ <h4>Stats</h4>
</div>
<div class="list-group-item">
<ceilometer-stats ng-if="vm.selectedSlice" name="vm.selectedSlice" tenant="vm.selectedTenant"></ceilometer-stats>
@@ -65,7 +65,7 @@
<div class="col-sm-4 animate-slide-left" ng-hide="!vm.selectedSlice">
<div class="list-group">
<div class="list-group-item">
- <h3>Resources</h3>
+ <h4>Resources</h4>
</div>
<a href="#"
ng-click="vm.selectMeters(meters, resource)"
@@ -79,7 +79,7 @@
<div class="col-sm-8 animate-slide-left" ng-hide="!vm.selectedMeters">
<div class="list-group">
<div class="list-group-item">
- <h3>Meters</h3>
+ <h4>Meters</h4>
</div>
<div class="list-group-item">
<div class="row">
diff --git a/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html b/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html
index 531f0cf..e07a87a 100644
--- a/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html
+++ b/views/ngXosViews/ceilometerDashboard/src/templates/ceilometer-stats.tpl.html
@@ -9,13 +9,13 @@
<table class="table" ng-if="vm.stats.length > 0">
<tr>
<th>
- <a ng-click="order = 'category'">Type:</a>
+ <a ng-click="(order == 'category') ? order = '-category' : order = 'category'">Type:</a>
</th>
<th>
- <a ng-click="order = 'resource_name'">Resource:</a>
+ <a ng-click="(order == 'resource_name') ? order = '-resource_name' : order = 'resource_name'">Resource:</a>
</th>
<th>
- <a ng-click="order = 'meter'">Meter:</a>
+ <a ng-click="(order == 'meter') ? order = '-meter' : order = 'meter'">Meter:</a>
</th>
<th>
Unit: