- for sliver in data['slivers']:
- if sliver['name'] == self.name:
- for attribute in sliver['attributes']:
- if attribute['name'] == 'net_min_rate':
- logger.log("bwmon: Updating %s. Min Rate = %s" \
- %(self.name, self.MinRate))
- # To ensure min does not go above 25% of nodecap.
- if int(attribute['value']) > int(.25 * default_MaxRate):
- self.MinRate = int(.25 * default_MaxRate)
- else:
- self.MinRate = int(attribute['value'])
- elif attribute['name'] == 'net_max_rate':
- self.MaxRate = int(attribute['value'])
- logger.log("bwmon: Updating %s. Max Rate = %s" \
- %(self.name, self.MaxRate))
- elif attribute['name'] == 'net_i2_min_rate':
- self.Mini2Rate = int(attribute['value'])
- logger.log("bwmon: Updating %s. Min i2 Rate = %s" \
- %(self.name, self.Mini2Rate))
- elif attribute['name'] == 'net_i2_max_rate':
- self.Maxi2Rate = int(attribute['value'])
- logger.log("bwmon: Updating %s. Max i2 Rate = %s" \
- %(self.name, self.Maxi2Rate))
- elif attribute['name'] == 'net_max_kbyte':
- self.MaxKByte = int(attribute['value'])
- logger.log("bwmon: Updating %s. Max KByte lim = %s" \
- %(self.name, self.MaxKByte))
- elif attribute['name'] == 'net_i2_max_kbyte':
- self.Maxi2KByte = int(attribute['value'])
- logger.log("bwmon: Updating %s. Max i2 KByte = %s" \
- %(self.name, self.Maxi2KByte))
- elif attribute['name'] == 'net_thresh_kbyte':
- self.ThreshKByte = int(attribute['value'])
- logger.log("bwmon: Updating %s. Thresh KByte = %s" \
- %(self.name, self.ThreshKByte))
- elif attribute['name'] == 'net_i2_thresh_kbyte':
- self.Threshi2KByte = int(attribute['value'])
- logger.log("bwmon: Updating %s. i2 Thresh KByte = %s" \
- %(self.name, self.Threshi2KByte))
- elif attribute['name'] == 'net_share':
- self.Share = int(attribute['value'])
- logger.log("bwmon: Updating %s. Net Share = %s" \
- %(self.name, self.Share))
- elif attribute['name'] == 'net_i2_share':
- self.Sharei2 = int(attribute['value'])
- logger.log("bwmon: Updating %s. Net i2 Share = %s" \
- %(self.name, self.i2Share))
-
-
- def reset(self, runningmaxrate, runningmaxi2rate, usedbytes, usedi2bytes, data):
+ if rspec.has_key('net_min_rate'):
+ logger.log("bwmon: Updating %s. Min Rate = %s" %(self.name, self.MinRate))
+ # To ensure min does not go above 25% of nodecap.
+ if int(rspec['net_min_rate']) > int(.25 * default_MaxRate):
+ self.MinRate = int(.25 * default_MaxRate)
+ else:
+ self.MinRate = int(rspec['net_min_rate'])
+
+ MaxRate = int(rspec.get('net_max_rate', bwlimit.get_bwcap() / 1000))
+ if MaxRate != self.MaxRate:
+ self.MaxRate = MaxRate
+ logger.log("bwmon: Updating %s. Max Rate = %s" %(self.name, self.MaxRate))
+
+ Mini2Rate = int(rspec.get('net_i2_min_rate', default_Mini2Rate))
+ if Mini2Rate != self.Mini2Rate:
+ self.Mini2Rate = Mini2Rate
+ logger.log("bwmon: Updating %s. Min i2 Rate = %s" %(self.name, self.Mini2Rate))
+
+ Maxi2Rate = int(rspec.get('net_i2_max_rate', bwlimit.bwmax / 1000))
+ if Maxi2Rate != self.Maxi2Rate:
+ self.Maxi2Rate = Maxi2Rate
+ logger.log("bwmon: Updating %s. Max i2 Rate = %s" %(self.name, self.Maxi2Rate))
+
+ MaxKByte = int(rspec.get('net_max_kbyte', default_MaxKByte))
+ if MaxKByte != self.MaxKByte:
+ self.MaxKByte = MaxKByte
+ logger.log("bwmon: Updating %s. Max KByte lim = %s" %(self.name, self.MaxKByte))
+
+ Maxi2KByte = int(rspec.get('net_i2_max_kbyte', default_Maxi2KByte))
+ if Maxi2KByte != self.Maxi2KByte:
+ self.Maxi2KByte = Maxi2KByte
+ logger.log("bwmon: Updating %s. Max i2 KByte = %s" %(self.name, self.Maxi2KByte))
+
+ ThreshKByte = int(rspec.get('net_thresh_kbyte', default_ThreshKByte))
+ if ThreshKByte != self.ThreshKByte:
+ self.ThreshKByte = ThreshKByte
+ logger.log("bwmon: Updating %s. Thresh KByte = %s" %(self.name, self.ThreshKByte))
+
+ Threshi2KByte = int(rspec.get('net_i2_thresh_kbyte', default_Threshi2KByte))
+ if Threshi2KByte != self.Threshi2KByte:
+ self.Threshi2KByte = Threshi2KByte
+ logger.log("bwmon: Updating %s. i2 Thresh KByte = %s" %(self.name, self.Threshi2KByte))
+
+ Share = int(rspec.get('net_share', default_Share))
+ if Share != self.Share:
+ self.Share = Share
+ logger.log("bwmon: Updating %s. Net Share = %s" %(self.name, self.Share))
+
+ Sharei2 = int(rspec.get('net_i2_share', default_Share))
+ if Sharei2 != self.Sharei2:
+ self.Sharei2 = Sharei2
+ logger.log("bwmon: Updating %s. Net i2 Share = %s" %(self.name, self.i2Share))
+
+
+ def reset(self, runningmaxrate, runningmaxi2rate, usedbytes, usedi2bytes, rspec):