GUI -- "State" is now an icon on Link and Cluster node views. - Icon mapping has generic names to be reused between views - Fixed broken table unit tests - Other minor cleanup
Change-Id: I7136cba15ad4fd185095617d790940d55b9f968f
diff --git a/web/gui/src/main/webapp/_bripc/practice-table.js b/web/gui/src/main/webapp/_bripc/practice-table.js
index 5015d85..f244c86 100644
--- a/web/gui/src/main/webapp/_bripc/practice-table.js
+++ b/web/gui/src/main/webapp/_bripc/practice-table.js
@@ -31,7 +31,7 @@
"devices": [{
"id": "of:0000000000000001",
"available": true,
- "_iconid_available": "deviceOnline",
+ "_iconid_available": "active",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -44,7 +44,7 @@
{
"id": "of:0000000000000004",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -57,7 +57,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -70,7 +70,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -83,7 +83,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -96,7 +96,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -109,7 +109,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -122,7 +122,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -135,7 +135,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -148,7 +148,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -161,7 +161,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -174,7 +174,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
@@ -187,7 +187,7 @@
{
"id": "of:0000000000000092",
"available": false,
- "_iconid_available": "deviceOffline",
+ "_iconid_available": "inactive",
"role": "MASTER",
"mfr": "Nicira, Inc.",
"hw": "Open vSwitch",
diff --git a/web/gui/src/main/webapp/_bripc/show-icons-test.js b/web/gui/src/main/webapp/_bripc/show-icons-test.js
index aea1343..915e016 100644
--- a/web/gui/src/main/webapp/_bripc/show-icons-test.js
+++ b/web/gui/src/main/webapp/_bripc/show-icons-test.js
@@ -81,9 +81,9 @@
var div = d3.select('#showIcons');
// show device online and offline icons
- icns.loadEmbeddedIcon(div, 'deviceOnline', 50);
+ icns.loadEmbeddedIcon(div, 'active', 50);
div.append('span').style('padding-left', '15px');
- icns.loadEmbeddedIcon(div, 'deviceOffline', 50);
+ icns.loadEmbeddedIcon(div, 'inactive', 50);
var defs = d3.select('defs');