FTS-781:All server config now can be done per VO

src/fts3rest/fts3rest/public/js/config/debug.js

@@ -96,6 +96,7 @@ function refreshDebugList()
 
             tbody.append(
                 tr.append($("<td></td>").append(deleteBtn))
+                  .append($("<td></td>").append($("<span class='monospace'></span>").text(debug.vo)))
                   .append($("<td></td>").append($("<span class='monospace'></span>").text(debug.source_se)))
                   .append($("<td></td>").append($("<span class='monospace'></span>").text(debug.dest_se)))
                   .append($("<td></td>").append(debugLevelSelect(debug)))
@@ -119,6 +120,7 @@ function setupDebug()
 	// Attach to the form
 	$("#debug-add-frm").submit(function() {
         var payload = {
+            vo: $(this).find("[name=vo]").val(),
             source_se: $(this).find("[name=source_se]").val(),
             dest_se: $(this).find("[name=dest_se]").val(),
             debug_level: $(this).find("[name=debug_level]").val(),

src/fts3rest/fts3rest/public/js/config/fixed.js

@@ -38,6 +38,7 @@ function refreshFixList()
                 tr.css("background", "#d9534f");
                 
                 var data = {
+                		vo: fix.vo,
                         source_se: fix.source_se,
                         dest_se: fix.dest_se,
                         min_active: 0,
@@ -63,6 +64,7 @@ function refreshFixList()
 
             var changeFunction = function(){
                 var data = {
+                    vo: fix.vo,
                     source_se: fix.source_se,
                     dest_se: fix.dest_se,
                     min_active: changeMinActiveField.val(),
@@ -98,6 +100,7 @@ function refreshFixList()
             .change(changeFunction);
 
             tr.append($("<td></td>").append(deleteBtn))
+              .append($("<td></td>").text(fix.vo))
               .append($("<td></td>").text(fix.source_se))
               .append($("<td></td>").text(fix.dest_se))
               .append($("<td></td>").append(changeMinActiveField))
@@ -119,6 +122,7 @@ function setupFixed()
     // Attach to forms
     $("#fixed-add-frm").submit(function(event) {
         var payload = {
+            vo: $(this).find("[name=vo]").val(),
             source_se: $(this).find("[name=source_se]").val(),
             dest_se: $(this).find("[name=dest_se]").val(),
             min_active: $(this).find("[name=min_active]").val(),

src/fts3rest/fts3rest/public/js/config/links.js

@@ -54,6 +54,7 @@ function refreshLinks()
             });
 
             tr.append($("<td></td>").append(deleteBtn))
+              .append($("<td></td>").text(link.vo))
               .append($("<td></td>").text(link.symbolicname))
               .append($("<td></td>").text(link.source))
               .append($("<td></td>").text(link.destination))
@@ -172,6 +173,7 @@ function setupLinks()
     $("#link-config-add-frm").submit(function(event) {
         var addFrm = $("#link-config-add-frm");
         var payload = {
+            vo: addFrm.find("[name=vo]").val(),
             symbolicname: addFrm.find("[name=symbolicname]").val(),
             source: addFrm.find("[name=source]").val(),
             destination: addFrm.find("[name=destination]").val(),

src/fts3rest/fts3rest/public/js/config/se.js

@@ -66,7 +66,8 @@ function getSubForm(form, klass)
 {
     var subform = form.find("." + klass);
     var subset = {};
-
+    
+    subset.vo = (subform.find("select[name='vo']").val());
     subset.active = parseInt(subform.find("input[name='active']").val());
     subset.ipv6 = (subform.find("select[name='ipv6']").val() == "true");
     subset.throughput = parseFloat(subform.find("input[name='throughput']").val());

src/fts3rest/fts3rest/templates/config/debug.html

@@ -27,6 +27,10 @@
                             <i class="glyphicon glyphicon-plus"></i>
                         </button>
                     </td>
+                    <td>
+                        <input type="text" name="vo" placeholder="VO" class="form-control"
+                            id="debug-add-field-vo"/>
+                    </td>
                     <td>
                         <input type="text" name="source_se" placeholder="Source SE" class="form-control"
                             id="debug-add-field-source"/>

src/fts3rest/fts3rest/templates/config/fixed.html

@@ -14,6 +14,7 @@
 		<thead>
 			<tr>
 				<th style="width: 5em;"></th>
+				<th>VO</th>
 				<th>Source</th>
 				<th>Destination</th>
 				<th style="width: 10em;">Min Active</th>
@@ -29,6 +30,10 @@
                         <i class="glyphicon glyphicon-plus"></i>
                     </button>
 				</td>
+				<td>
+					<input type="text" name="vo" id="fixed-add-field-vo" class="form-control"
+						placeholder="VO"/>
+				</td>
 				<td>
 					<input type="text" name="source_se" id="fixed-add-field-source" class="form-control"
 						placeholder="Source"/>

src/fts3rest/fts3rest/templates/config/links.html

@@ -13,6 +13,7 @@
         <thead>
             <tr>
                 <th></th>
+                <th>VO</th>
                 <th>Symbolic name</th>
                 <th>Source</th>
                 <th>Destination</th>
@@ -31,6 +32,9 @@
                         <i class="glyphicon glyphicon-plus"></i>
                     </button>
                 </td>
+                <td>
+                    <input class="form-control" type="text" placeholder="VO" name="vo"/>
+                </td>
                 <td>
                     <input class="form-control" type="text" placeholder="Symbolic name" name="symbolicname"/>
                 </td>

src/fts3rest/fts3rest/templates/config/se.html

@@ -25,6 +25,10 @@
                                     <h3 class="panel-title">As source</h3>
                                 </div>
                                 <div class="panel-body">
+  									<div class="form-group">
+                                        <label>VO</label>
+                                        <input class="form-control" name="vo" type="number" value="{{as_source/vo}}"/>
+                                    </div>
                                     <div class="form-group">
                                         <label>Active limit</label>
                                         <input class="form-control" name="active" type="number" value="{{as_source/active}}"/>
@@ -56,6 +60,10 @@
                                     <h3 class="panel-title">As destination</h3>
                                 </div>
                                 <div class="panel-body">
+									<div class="form-group">
+                                        <label>VO</label>
+                                        <input class="form-control" name="vo" type="number" value="{{as_destination/vo}}"/>
+                                    </div>
                                     <div class="form-group">
                                         <label>Active limit</label>
                                         <input class="form-control" name="active" type="number" value="{{as_destination/active}}"/>
@@ -172,6 +180,10 @@
         						<h3 class="panel-title">As source</h3>
         					</div>
         					<div class="panel-body">
+        						<div class="form-group">
+        							<label for="as_source-vo">VO</label>
+        							<input class="form-control" name="vo" id="as_source-vo" type="text">
+        						</div>
         						<div class="form-group">
         							<label for="as_source-active">Active limit</label>
         							<input class="form-control" name="active" id="as_source-active" type="number">
@@ -207,6 +219,10 @@
         						<h3 class="panel-title">As destination</h3>
         					</div>
         					<div class="panel-body">
+        					    <div class="form-group">
+        							<label for="as_destination-vo">VO</label>
+        							<input class="form-control" name="vo" id="as_destination-vo" type="text">
+        						</div>
         						<div class="form-group">
         							<label>Active limit</label>
         							<input class="form-control" name="active" type="number">