Renamed lans, rack and added chart label
diff --git a/views/ngXosViews/diagnostic/mocks/data/cordsubscriber.json b/views/ngXosViews/diagnostic/mocks/data/cordsubscriber.json
index b0c69bc..e2409a7 100644
--- a/views/ngXosViews/diagnostic/mocks/data/cordsubscriber.json
+++ b/views/ngXosViews/diagnostic/mocks/data/cordsubscriber.json
@@ -28,8 +28,8 @@
"private_ip": null,
"wan_mac": null,
"wan_container_ip": "10.0.1.24",
- "uplink_speed": 1000000000,
- "downlink_speed": 1000000000,
+ "uplink_speed": "1000000000",
+ "downlink_speed": "1000000000",
"status": "copyrightviolation",
"enable_uverse": true
}
diff --git a/views/ngXosViews/diagnostic/src/css/diagnostic.css b/views/ngXosViews/diagnostic/src/css/diagnostic.css
index 4a8a6f9..4492faf 100644
--- a/views/ngXosViews/diagnostic/src/css/diagnostic.css
+++ b/views/ngXosViews/diagnostic/src/css/diagnostic.css
@@ -12,6 +12,7 @@
diagnostic-container .onethird-height {
position: relative;
height: 33%;
+ border-bottom: 1px solid #999;
}
diagnostic-container .twothird-height {
@@ -27,6 +28,17 @@
z-index: 1;
}
+diagnostic-container .onethird-height .well,
+diagnostic-container .twothird-height .well {
+ font-weight: bold;
+ max-width: 165px;
+ text-align: center;
+ margin-top: 15px;
+ background: #eee;
+ border-color: steelblue;
+ padding: 10px;
+}
+
/* subscriber-status-modal */
subscriber-status-modal .row + .row {
@@ -182,6 +194,10 @@
font: 12px sans-serif;
}
+.node text.small {
+ font-size: 10px;
+}
+
.link, .device-link {
fill: none;
stroke: #ccc;
diff --git a/views/ngXosViews/diagnostic/src/js/chart_data_service.js b/views/ngXosViews/diagnostic/src/js/chart_data_service.js
index f39a1e2..c74e289 100644
--- a/views/ngXosViews/diagnostic/src/js/chart_data_service.js
+++ b/views/ngXosViews/diagnostic/src/js/chart_data_service.js
@@ -11,16 +11,18 @@
type: 'router',
children: [
{
- name: 'WAN',
+ name: 'WAN-Side',
+ subtitle: 'Virtual Network',
type: 'network',
children: [
{
- name: 'Rack',
+ name: 'Compute Servers',
type: 'rack',
computeNodes: [],
children: [
{
- name: 'LAN',
+ name: 'LAN-Side',
+ subtitle: 'Virtual Networks',
type: 'network',
children: [{
name: 'Subscriber',
diff --git a/views/ngXosViews/diagnostic/src/js/nodeDrawer.js b/views/ngXosViews/diagnostic/src/js/nodeDrawer.js
index 4bb6c98..dcd7f4e 100644
--- a/views/ngXosViews/diagnostic/src/js/nodeDrawer.js
+++ b/views/ngXosViews/diagnostic/src/js/nodeDrawer.js
@@ -23,10 +23,21 @@
nodes.append('text')
.attr({
- 'text-anchor': 'middle'
+ 'text-anchor': 'middle',
+ y: -5,
+ x: 5,
})
.text(d => d.name)
+ nodes.append('text')
+ .attr({
+ 'text-anchor': 'middle',
+ y: 8,
+ x: 5,
+ class: 'small'
+ })
+ .text(d => d.subtitle)
+
nodes.each(function(n){
let currentNode = d3.select(this);
// cicle trouch node to add Tags and Public IP
diff --git a/views/ngXosViews/diagnostic/src/js/subscriber-modal.js b/views/ngXosViews/diagnostic/src/js/subscriber-modal.js
index 74bb8a7..2911733 100644
--- a/views/ngXosViews/diagnostic/src/js/subscriber-modal.js
+++ b/views/ngXosViews/diagnostic/src/js/subscriber-modal.js
@@ -41,6 +41,11 @@
this.formError = null;
});
+ $scope.$watch(() => this.subscriber, () => {
+ this.subscriber.uplink_speed = parseInt(this.subscriber.uplink_speed, 10);
+ this.subscriber.downlink_speed = parseInt(this.subscriber.downlink_speed, 10);
+ });
+
this.close = () => {
this.open = false;
};
diff --git a/views/ngXosViews/diagnostic/src/templates/diagnostic.tpl.html b/views/ngXosViews/diagnostic/src/templates/diagnostic.tpl.html
index 25e1338..6ae3407 100644
--- a/views/ngXosViews/diagnostic/src/templates/diagnostic.tpl.html
+++ b/views/ngXosViews/diagnostic/src/templates/diagnostic.tpl.html
@@ -1,9 +1,15 @@
<div class="container-fluid">
<div ng-hide="vm.error && vm.loader" style="height: 900px">
<div class="onethird-height">
+ <div class="well">
+ Services Graph
+ </div>
<service-topology service-chain="vm.serviceChain"></service-topology>
</div>
<div class="twothird-height">
+ <div class="well">
+ Logical Resources
+ </div>
<logic-topology ng-if="vm.subscribers" subscribers="vm.subscribers" selected="vm.selectedSubscriber"></logic-topology>
</div>
</div>