PCE WEB GUI defect Fixes[ONOS-4811,ONOS-4812, ONOS-4813]
Change-Id: I0bd57e27ec3536e696b5194fdb2b7fba0d06ed29
diff --git a/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovMessageHandler.java b/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovMessageHandler.java
index ba65db8..2c2ff0f 100644
--- a/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovMessageHandler.java
+++ b/apps/pce/pceweb/src/main/java/org/onosproject/pceweb/PceWebTopovMessageHandler.java
@@ -198,7 +198,7 @@
String tunnelName = string(payload, TUNNEL_NAME);
if (tunnelName.equals(STRING_NULL)) {
- log.error("tunnel name should not be empty");
+ log.error("PCE setup path is failed as tunnel name should not be empty");
return;
}
@@ -207,8 +207,8 @@
return;
}
- if (lspType == null) {
- log.error("PCE setup path is failed.");
+ if (lspType == null || lspType.equals(STRING_NULL)) {
+ log.error("PCE setup path is failed as LSP type is mandatory");
}
if ((src != null) && (dst != null)) {
diff --git a/apps/pce/pceweb/src/main/resources/app/view/pcewebTopov/pcewebTopovDemo.js b/apps/pce/pceweb/src/main/resources/app/view/pcewebTopov/pcewebTopovDemo.js
index c8b9295..7729289 100644
--- a/apps/pce/pceweb/src/main/resources/app/view/pcewebTopov/pcewebTopovDemo.js
+++ b/apps/pce/pceweb/src/main/resources/app/view/pcewebTopov/pcewebTopovDemo.js
@@ -83,12 +83,22 @@
function addAttribute(name, id, nameField, type) {
if (type == 'radio') {
- p.append('input').attr({
- type: type,
- name: name,
- id: id,
- class: 'radioButtonSpace'
- });
+ if (id == 'pce-lsp-type-cr') {
+ p.append('input').attr({
+ type: type,
+ name: name,
+ id: id,
+ checked: 'checked',
+ class: 'radioButtonSpace'
+ });
+ } else {
+ p.append('input').attr({
+ type: type,
+ name: name,
+ id: id,
+ class: 'radioButtonSpace'
+ });
+ }
} else {
p.append('input').attr({
type: type,
@@ -112,7 +122,8 @@
addAttribute('pce-cost-type-valname', 'pce-cost-type-igp', 'IGP', 'radio');
addAttribute('pce-cost-type-valname', 'pce-cost-type-te', 'TE', 'radio');
//Add the LSP type related inputs.
- addAttribute('pce-lsp-type-name', 'pce-lsp-type', 'Lsp Type *', 'checkbox');
+ p.append('span').text("Lsp Type *");
+ p.append('br');
addAttribute('pce-lsp-type-valname', 'pce-lsp-type-cr', 'With signalling', 'radio');
addAttribute('pce-lsp-type-valname', 'pce-lsp-type-srbe', 'Without SR without signalling', 'radio');
addAttribute('pce-lsp-type-valname', 'pce-lsp-type-srte', 'With SR without signalling', 'radio');
@@ -453,17 +464,14 @@
}
}
- var lspType = isChecked('pce-lsp-type'),
- lspTypeVal = null;
+ var lspTypeVal = null;
- if (lspType) {
- if (isChecked('pce-lsp-type-cr')) {
- lspTypeVal = 'cr';
- } else if (isChecked('pce-lsp-type-srbe')) {
+ if (isChecked('pce-lsp-type-cr')) {
+ lspTypeVal = 'cr';
+ } else if (isChecked('pce-lsp-type-srbe')) {
lspTypeVal = 'srbe';
- } else if (isChecked('pce-lsp-type-srte')) {
+ } else if (isChecked('pce-lsp-type-srte')) {
lspTypeVal = 'srte';
- }
}
wss.sendEvent(setPathmsg, {
@@ -528,7 +536,7 @@
idx++;
}
- flash.flash('remove path message');
+ flash.flash('query path message');
}
function remPath(node) {