Update main.py ui/index.html ui/ui.js

Add JS support for dynamic VRF selection based on config Fix dict anomalies when VRF is not present on router
internet2 · Jan 9, 2020 · 8bec553 · 8bec553
1 parent 082bc69
commit 8bec553
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/main.py b/main.py
@@ -431,6 +431,8 @@ def loadFlowRouteConfig(self):
 
             else:
                 for vrf in self.vrfs:
+                    _vrf_data = dict()
+                    _data = dict()
                     family = ''
                     if vrf == 'default':
                         try:
@@ -489,7 +491,7 @@ def loadFlowRouteConfig(self):
                                         'srcPrefix': route['match']['source'] if 'source' in route['match'] else None
                                         })
 
-                return True, self.flow_config
+                return True, self.flow_config, self.vrfs
 
     def parseFlow(self, flow=None):
         _flow = flow.split(',')

diff --git a/ui/index.html b/ui/index.html
@@ -174,8 +174,6 @@ <h4 class="modal-title">Add new flow route</h4>
                         <label for="selectVrf" class="col-sm-2 col-form-label">VRF</label>
                         <div class="col-sm-3">
                             <select class="form-control" id="selectVrf">
-                                <option selected="selected">default</option>
-                                <option>trcps</option>
                             </select>
                         </div>
                     </div>
@@ -265,8 +263,6 @@ <h4 class="modal-title">Modify Flow Route</h4>
                         <label for="selectModVrf" class="col-sm-2 col-form-label">VRF</label>
                         <div class="col-sm-3">
                             <select class="form-control" id="selectModVrf">
-                                <option>default</option>
-                                <option>trcps</option>
                             </select>
                         </div>
                     </div>

diff --git a/ui/ui.js b/ui/ui.js
@@ -44,6 +44,23 @@ $(document).ready(function () {
 
                 var return_data = new Array();
 
+                selectVrf = document.getElementById('selectVrf');
+                selectModVrf = document.getElementById('selectModVrf');
+
+                $.each( response[2], function( index, value ) {
+                    var opt = document.createElement('option');
+                    opt.text = value;
+                    opt.value = value;
+                    selectVrf.appendChild(opt);
+                  });
+
+                  $.each( response[2], function( index, value ) {
+                    var opt = document.createElement('option');
+                    opt.text = value;
+                    opt.value = value;
+                    selectModVrf.appendChild(opt);
+                  });
+
                 $.each( response[1], function( name, flow ) {
 
                     var action_val = new Array();