- except: logger.log_exc()
-
- # query running network interfaces
- devs = sioc.gifconf()
- ips = dict(zip(devs.values(), devs.keys()))
- macs = {}
- for dev in devs:
- macs[sioc.gifhwaddr(dev).lower()] = dev
-
- for d in data:
- if d['node_id'] != node_id: continue
-
- # XXX Exempt Internet2 destinations from node bwlimits
- # bwlimit.exempt_init('Internet2', internet2_ips)
-
- for network in d['networks']:
- if macs.has_key(network['mac'].lower()):
- dev = macs[network['mac'].lower()]
- elif ips.has_key(network['ip']):
- dev = ips[network['ip']]
- else:
- logger.log('%s: no such interface with address %s/%s' % (self.name, network['ip'], network['mac']))
- continue
-
- try:
- old_bwlimit = bwlimit.get_bwcap(dev)
- except:
- old_bwlimit = None
-
- if network['bwlimit'] is None:
- new_bwlimit = bwlimit.bwmax
- else:
- new_bwlimit = network['bwlimit']
-
- if old_bwlimit != new_bwlimit:
- # reinitialize bandwidth limits
- bwlimit.init(dev, new_bwlimit)
-
- # XXX this should trigger an rspec refresh in case
- # some previously invalid sliver bwlimit is now valid
- # again, or vice-versa.
+ except: logger.log_exc("sm: GetSlivers failed to read /etc/planetlab/node_id")
+
+ if data.has_key('node_id') and data['node_id'] != node_id: return
+
+ if data.has_key('networks'):
+ for network in data['networks']:
+ if network['is_primary'] and network['bwlimit'] is not None:
+ DEFAULT_ALLOCATION['net_max_rate'] = network['bwlimit'] / 1000
+
+ # Take intscripts (global) returned by API, make dict
+ if 'initscripts' not in data:
+ logger.log_missing_data("sm.GetSlivers",'initscripts')
+ return
+ initscripts = {}
+ for is_rec in data['initscripts']:
+ logger.verbose("sm: initscript: %s" % is_rec['name'])
+ initscripts[str(is_rec['name'])] = is_rec['script']
+
+ for sliver in data['slivers']:
+ logger.verbose("sm: %s: sm:GetSlivers in slivers loop"%sliver['name'])
+ rec = sliver.copy()
+ rec.setdefault('timestamp', data['timestamp'])
+
+ # convert attributes field to a proper dict
+ attr_dict = {}
+ for attr in rec.pop('attributes'): attr_dict[attr['tagname']] = attr['value']
+ rec.setdefault("attributes", attr_dict)
+
+ # squash keys
+ keys = rec.pop('keys')
+ rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
+
+ ## 'Type' isn't returned by GetSlivers() for whatever reason. We're overloading
+ ## instantiation here, but i suppose its the same thing when you think about it. -FA
+ # Handle nm controller here
+ if rec['instantiation'].lower() == 'nm-controller':
+ rec.setdefault('type', attr_dict.get('type', 'controller.Controller'))
+ else:
+ rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))