ONOS-4713, ONOS-4715 issues merge to master
Change-Id: I3e52af949005529cec18a85e49601c47f7e386f8
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java
index 66c84d4..a17ef6c 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/gui/SfcViewMessageHandler.java
@@ -50,7 +50,7 @@
*/
public class SfcViewMessageHandler extends UiMessageHandler {
- private static final String SLASH = " ; ";
+ private static final String SLASH = " -> ";
private static final String NONE = "none";
private static final String SFCTYPE = "Service Function Chain";
@@ -61,13 +61,13 @@
private static final String ID = "id";
private static final String STATE = "_iconid_state";
private static final String PORTCHAINNAME = "portChainName";
- private static final String HOSTS = "hosts";
+ private static final String SFS = "sfs";
private static final String TYPE = "type";
private static final String SRCIP = "srcIp";
private static final String DSTIP = "dstIp";
private static final String[] COL_IDS = {
- ID, STATE, PORTCHAINNAME, HOSTS, TYPE, SRCIP, DSTIP
+ ID, STATE, PORTCHAINNAME, SFS, TYPE, SRCIP, DSTIP
};
private static final String ICON_ID_ONLINE = "active";
@@ -116,7 +116,7 @@
row.cell(ID, pchain.portChainId().value().toString())
.cell(STATE, sfcState(vpList))
.cell(PORTCHAINNAME, pchain.name())
- .cell(HOSTS, sfcHosts(vpList))
+ .cell(SFS, sfcHosts(vpList))
.cell(TYPE, SFCTYPE)
.cell(SRCIP, portChainIpRange.srcip())
.cell(DSTIP, portChainIpRange.dstip());
diff --git a/apps/vtn/vtnweb/src/main/resources/app/view/sfc/sfc.html b/apps/vtn/vtnweb/src/main/resources/app/view/sfc/sfc.html
index 21697d5..a17aff1 100644
--- a/apps/vtn/vtnweb/src/main/resources/app/view/sfc/sfc.html
+++ b/apps/vtn/vtnweb/src/main/resources/app/view/sfc/sfc.html
@@ -32,7 +32,7 @@
<tr>
<td colId="_iconid_state" class="table-icon" sortable></td>
<td colId="portChainName" sortable>PortChainName </td>
- <td colId="hosts" sortable>Hosts </td>
+ <td colId="sfs" sortable>Sfs </td>
<td colId="type" sortable>Type </td>
<td colId="srcIp" sortable>Source IP Prefix </td>
<td colId="dstIp" sortable>Destination IP Prefix </td>
@@ -54,7 +54,7 @@
<div icon icon-id="{{sfc._iconid_state}}"></div>
</td>
<td>{{sfc.portChainName}}</td>
- <td>{{sfc.hosts}}</td>
+ <td>{{sfc.sfs}}</td>
<td>{{sfc.type}}</td>
<td>{{sfc.srcIp}}</td>
<td>{{sfc.dstIp}}</td>