Faked mme, pgw, sgw, video servers
diff --git a/views/ngXosViews/mcordTopology/mocks/data/instances.json b/views/ngXosViews/mcordTopology/mocks/data/instances.json
index 572c775..0f86876 100644
--- a/views/ngXosViews/mcordTopology/mocks/data/instances.json
+++ b/views/ngXosViews/mcordTopology/mocks/data/instances.json
@@ -25,32 +25,5 @@
"name": "vsg_service_instance-4",
"instance_name": "mysite_vsg-4",
"ip": "130.127.133.94"
- },
- {
- "id": 6,
- "humanReadableName": "MME_service_instance-4",
- "instance_id": "instance-00000004",
- "instance_uuid": "44b75cb7-7405-4a68-9400-b4c4e3ea69b5",
- "name": "MME_service_instance-4",
- "instance_name": "mysite_MME-4",
- "ip": "130.127.133.94"
- },
- {
- "id": 7,
- "humanReadableName": "SGW_service_instance-4",
- "instance_id": "instance-00000004",
- "instance_uuid": "44b75cb7-7405-4a68-9400-b4c4e3ea69b5",
- "name": "SGW_service_instance-4",
- "instance_name": "mysite_SGW-4",
- "ip": "130.127.133.94"
- },
- {
- "id": 8,
- "humanReadableName": "PGW_service_instance-4",
- "instance_id": "instance-00000004",
- "instance_uuid": "44b75cb7-7405-4a68-9400-b4c4e3ea69b5",
- "name": "PGW_service_instance-4",
- "instance_name": "mysite_PGW-4",
- "ip": "130.127.133.94"
}
]
\ No newline at end of file
diff --git a/views/ngXosViews/mcordTopology/src/css/mcord.css b/views/ngXosViews/mcordTopology/src/css/mcord.css
index 3f69aa2..7ef1d47 100644
--- a/views/ngXosViews/mcordTopology/src/css/mcord.css
+++ b/views/ngXosViews/mcordTopology/src/css/mcord.css
@@ -56,7 +56,7 @@
opacity: .4
}
-.MME, .SGW, .PGW {
+.MME, .SGW, .PGW, .Vid {
fill: purple;
stroke: #000;
}
@@ -64,7 +64,8 @@
rect.MME,
rect.SGW,
rect.PGW,
-rect.bbu {
+rect.bbu,
+rect.Vid {
fill: #fff;
stroke: #fff;
}
@@ -72,7 +73,8 @@
.bbu text,
.MME text,
.SGW text,
-.PGW text {
+.PGW text,
+.Vid text {
font-size: 10px;
stroke-width: 0;
fill: #000;
diff --git a/views/ngXosViews/mcordTopology/src/js/main.js b/views/ngXosViews/mcordTopology/src/js/main.js
index caf7b65..544482e 100644
--- a/views/ngXosViews/mcordTopology/src/js/main.js
+++ b/views/ngXosViews/mcordTopology/src/js/main.js
@@ -36,11 +36,7 @@
};
const filterOthers = (instances) => {
- return lodash.filter(instances, i => {
- return (i.name.indexOf('MME') >= 0)
- || (i.name.indexOf('SGW') >= 0)
- || (i.name.indexOf('PGW') >= 0)
- });
+ return TopologyElements.fakedInstance;
};
// retrieving instances list
@@ -266,10 +262,12 @@
NodeDrawer.drawRrus(enter.filter('.rru'))
NodeDrawer.drawFabric(enter.filter('.fabric'))
NodeDrawer.drawOthers(enter.filter(d => {
+ console.log(d.type);
return (
d.type === 'MME' ||
d.type === 'SGW' ||
- d.type === 'PGW'
+ d.type === 'PGW' ||
+ d.type === 'Vid'
)
}));
diff --git a/views/ngXosViews/mcordTopology/src/js/node_drawer.js b/views/ngXosViews/mcordTopology/src/js/node_drawer.js
index 4d7b7fe..1673590 100644
--- a/views/ngXosViews/mcordTopology/src/js/node_drawer.js
+++ b/views/ngXosViews/mcordTopology/src/js/node_drawer.js
@@ -192,7 +192,7 @@
x: -12,
opacity: 0
})
- .text(d => d.type)
+ .text(d => d.name.toUpperCase())
.transition()
.duration(duration * 2)
.attr({
diff --git a/views/ngXosViews/mcordTopology/src/js/static.data.js b/views/ngXosViews/mcordTopology/src/js/static.data.js
index 2e2271e..949233a 100644
--- a/views/ngXosViews/mcordTopology/src/js/static.data.js
+++ b/views/ngXosViews/mcordTopology/src/js/static.data.js
@@ -54,6 +54,24 @@
target: 'fabric2'
}
],
+ fakedInstance: [
+ {
+ humanReadableName: 'MME',
+ name: 'MME'
+ },
+ {
+ humanReadableName: 'PGW',
+ name: 'PGW'
+ },
+ {
+ humanReadableName: 'SGW',
+ name: 'SGW'
+ },
+ {
+ humanReadableName: 'Video Server',
+ name: 'Video Server'
+ }
+ ],
icons: {
bbu: `M11.08,4.66H24.76l6.81,6.82H4.23Z M4.24,18.34V13.21H31.6v5.13H4.24Zm25.64-1.72V14.94H28.19v1.69h1.68Zm-13.65-1.7v1.69h1.69V14.93H16.22Zm-3.42,0v1.69h1.68V14.93H12.8Zm-3.42,0v1.69h1.68V14.93H9.38ZM6,14.93v1.69H7.64V14.93H6Z M32.8,33.23H3V11.42l0,0c1.17-1.16,2.54-2.5,3.87-3.8S9.59,5,10.72,3.87l0,0H25.08l0,0C26.25,5,27.6,6.32,28.9,7.61s2.68,2.63,3.83,3.78l0,0v0.06ZM3.3,33H32.53l0-21.43C31.36,10.39,30,9.07,28.71,7.8S26.09,5.22,25,4.1H10.86C9.75,5.21,8.41,6.52,7.12,7.77s-2.67,2.61-3.83,3.76V33Z M4.24,25.18V20.05H31.6v5.13H4.24Zm24-1.73h1.68V21.78H28.19v1.67Zm-12,0H17.9V21.78H16.21v1.68Zm-1.73-1.68H12.81v1.67h1.68V21.78Zm-3.43,1.68V21.78H9.38v1.69h1.68ZM6,23.46H7.64V21.78H6v1.68Z M31.6,26.89V32H4.24V26.89H31.6Zm-3.4,1.72V30.3h1.68V28.61H28.19Zm-10.28,0H16.22V30.3h1.68V28.62Zm-3.43,1.69V28.62H12.8v1.69h1.68Zm-3.42,0V28.62H9.38v1.69h1.68ZM7.65,28.62H6v1.67H7.65V28.62Z`,
// bbu: `M15,100a5,5,0,0,1-5-5v-65a5,5,0,0,1,5-5h80a5,5,0,0,1,5,5v65a5,5,0,0,1-5,5zM14,22.5l11-11a10,3,0,0,1,10-2h40a10,3,0,0,1,10,2l11,11zM16,35a5,5,0,0,1,10,0a5,5,0,0,1-10,0z`,