Commit cf750dfcee75e3e643193847bbbfc4f92962c187
1 parent
bb833489
piority FlowMod (flowtable)
Showing
4 changed files
with
20 additions
and
7 deletions
src/main/java/net/floodlightcontroller/pelstats/rest/RESTQueue.java
| ... | ... | @@ -288,7 +288,7 @@ public class RESTQueue extends ServerResource{ |
| 288 | 288 | OFmessage.setCookie(0); |
| 289 | 289 | OFmessage.setIdleTimeout((short) 0); |
| 290 | 290 | OFmessage.setHardTimeout((short)0); |
| 291 | - OFmessage.setPriority((short)priority); | |
| 291 | + OFmessage.setPriority((short)-1); | |
| 292 | 292 | OFmessage.setBufferId(0); |
| 293 | 293 | OFmessage.setOutPort((short)0xffff); |
| 294 | 294 | OFmessage.setFlags((short) 0); | ... | ... |
src/main/resources/web/js/main.js
| ... | ... | @@ -170,12 +170,13 @@ tpl.loadTemplates(['home', 'status', 'topology', 'header', 'switch', 'switch-lis |
| 170 | 170 | |
| 171 | 171 | setInterval(function () { |
| 172 | 172 | if(updating) { |
| 173 | + allStats.fetch(); | |
| 173 | 174 | swl.fetch(); |
| 174 | 175 | hl.fetch(); |
| 175 | 176 | //vsl.fetch(); |
| 176 | 177 | vl.fetch(); |
| 177 | 178 | v.fetch(); |
| 178 | - allStats.fetch(); | |
| 179 | + | |
| 179 | 180 | |
| 180 | 181 | /*while (views.length>30){ |
| 181 | 182 | var vi=views.shift(); | ... | ... |
src/main/resources/web/js/models/voipmodel.js
| ... | ... | @@ -213,7 +213,7 @@ window.VoIP = Backbone.Model.extend({ |
| 213 | 213 | _.each(t.enabled, function(s) { |
| 214 | 214 | _.each(s.values, function(vs) { |
| 215 | 215 | if (vs.idvoip==self.id) { |
| 216 | - self.set({idvoip: vs.idvoip,idswitch:self.idswitch, | |
| 216 | + self.set({idvoip: vs.idvoip,idswitch:vl.idswitch, | |
| 217 | 217 | caller: vs.caller,receiver:vs.receiver, |
| 218 | 218 | codecRate:vs.codecRate, codec:vs.codec, |
| 219 | 219 | connectedSince:vs.connectedSince, |
| ... | ... | @@ -224,13 +224,13 @@ window.VoIP = Backbone.Model.extend({ |
| 224 | 224 | |
| 225 | 225 | //if the switch has allRTP activated, and the RTP Metric |
| 226 | 226 | //isn't activated for the call, we activate it |
| 227 | - if(allStats.get(self.idswitch).allRtpMetric==true && allStats.get(self.idswitch).ssc.get(vs.idvoip).rtpMetric==false){ | |
| 227 | + if(allStats.get(vl.idswitch).allRtpMetric==true && allStats.get(vl.idswitch).ssc.get(vs.idvoip).rtpMetric==false){ | |
| 228 | 228 | $.ajax({ |
| 229 | - url:hackBase + '/wm/iptv/switch/'+self.idswitch+'/enable/type/5/opt/0.0.0.0/0.0.0.0/30000/'+vs.idvoip+'/json', | |
| 229 | + url:hackBase + '/wm/iptv/switch/'+vl.idswitch+'/enable/type/5/opt/0.0.0.0/0.0.0.0/30000/'+vs.idvoip+'/json', | |
| 230 | 230 | dataType:"json", |
| 231 | 231 | success:function (data) { |
| 232 | - allStats.get(self.model.idswitch).ssc.get(vs.idvoip).rtpMetric=true; | |
| 233 | - console.log("Metric 5 started on "+self.model.idswitch+" for call "+vs.idvoip); | |
| 232 | + allStats.get(vl.idswitch).ssc.get(vs.idvoip).rtpMetric=true; | |
| 233 | + console.log("Metric 5 started on "+vl.idswitch+" for call "+vs.idvoip); | |
| 234 | 234 | }, |
| 235 | 235 | }); |
| 236 | 236 | } | ... | ... |
src/main/resources/web/js/views/voip.js
| ... | ... | @@ -156,6 +156,18 @@ window.VoIPView = Backbone.View.extend({ |
| 156 | 156 | |
| 157 | 157 | render:function (eventName) { |
| 158 | 158 | $(this.el).html(this.template(this.model.toJSON())); |
| 159 | + var self=this; | |
| 160 | + if (this.model.toJSON().id0==0){ | |
| 161 | + $(self.el).find('#0').find('td').each (function(){ | |
| 162 | + $(this).html("-"); | |
| 163 | + }); | |
| 164 | + } | |
| 165 | + | |
| 166 | + if(this.model.toJSON().id1==0){ | |
| 167 | + $(self.el).find('#1').find('td').each (function(){ | |
| 168 | + $(this).html("-"); | |
| 169 | + }); | |
| 170 | + } | |
| 159 | 171 | $(this.el).addClass("src0"); |
| 160 | 172 | return this; |
| 161 | 173 | }, | ... | ... |