PCE WEB GUI defect Fixes[ONOS-4811,ONOS-4812, ONOS-4813]

Change-Id: I0bd57e27ec3536e696b5194fdb2b7fba0d06ed29

@@ -198,7 +198,7 @@ public class PceWebTopovMessageHandler extends UiMessageHandler {
             String tunnelName = string(payload, TUNNEL_NAME);
             String tunnelName = string(payload, TUNNEL_NAME);
 
 
             if (tunnelName.equals(STRING_NULL)) {
             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;
                 return;
             }
             }
 
 
@@ -207,8 +207,8 @@ public class PceWebTopovMessageHandler extends UiMessageHandler {
                 return;
                 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)) {
             if ((src != null) && (dst != null)) {

@@ -83,12 +83,22 @@
 
 
         function addAttribute(name, id, nameField, type) {
         function addAttribute(name, id, nameField, type) {
             if (type == 'radio') {
             if (type == 'radio') {
+                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({
                     p.append('input').attr({
                         type: type,
                         type: type,
                         name: name,
                         name: name,
                         id: id,
                         id: id,
                         class: 'radioButtonSpace'
                         class: 'radioButtonSpace'
                     });
                     });
+                }
             } else {
             } else {
                 p.append('input').attr({
                 p.append('input').attr({
                     type: type,
                     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-igp', 'IGP', 'radio');
         addAttribute('pce-cost-type-valname', 'pce-cost-type-te', 'TE', 'radio');
         addAttribute('pce-cost-type-valname', 'pce-cost-type-te', 'TE', 'radio');
         //Add the LSP type related inputs.
         //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-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-srbe', 'Without SR without signalling', 'radio');
         addAttribute('pce-lsp-type-valname', 'pce-lsp-type-srte', 'With SR without signalling', 'radio');
         addAttribute('pce-lsp-type-valname', 'pce-lsp-type-srte', 'With SR without signalling', 'radio');
@@ -453,10 +464,8 @@
                 }
                 }
             }
             }
 
 
-            var lspType = isChecked('pce-lsp-type'),
-                lspTypeVal = null;
+            var lspTypeVal = null;
 
 
-            if (lspType) {
             if (isChecked('pce-lsp-type-cr')) {
             if (isChecked('pce-lsp-type-cr')) {
                 lspTypeVal = 'cr';
                 lspTypeVal = 'cr';
             } else if (isChecked('pce-lsp-type-srbe')) {
             } else if (isChecked('pce-lsp-type-srbe')) {
@@ -464,7 +473,6 @@
             } else if (isChecked('pce-lsp-type-srte')) {
             } else if (isChecked('pce-lsp-type-srte')) {
                    lspTypeVal = 'srte';
                    lspTypeVal = 'srte';
             }
             }
-            }
 
 
             wss.sendEvent(setPathmsg, {
             wss.sendEvent(setPathmsg, {
                 srid: node[0],
                 srid: node[0],
@@ -528,7 +536,7 @@
             idx++;
             idx++;
         }
         }
 
 
-        flash.flash('remove path message');
+        flash.flash('query path message');
     }
     }
 
 
     function remPath(node) {
     function remPath(node) {