interfaces = self.interface_info.values()[0].values()[0]
if not isinstance(interfaces, list):
interfaces = [self.interfaces]
+ # set the url and urn
+ for interface in interfaces:
+ hrn, address, port = interface['hrn'], interface['addr'], interface['port']
+ url = 'http://%(address)s:%(port)s' % locals()
+ interface['url'] = url
+ interface['urn'] = hrn_to_urn(hrn, 'authority')
+
self.interfaces = {}
required_fields = self.default_fields.keys()
for interface in interfaces:
"""
if not gids:
return
- # get hrns we expect to find
- # ignore records for local interfaces
- ignore_interfaces = [self.api.config.SFA_INTERFACE_HRN]
- hrns_expected = [gid.get_hrn() for gid in gids \
- if gid.get_hrn() not in ignore_interfaces]
+
+ # hrns that should have a record
+ hrns_expected = [gid.get_hrn() for gid in gids]
# get hrns that actually exist in the db
table = SfaTable()
# remove old records
for record in records:
- if record['hrn'] not in hrns_expected:
+ if record['hrn'] not in hrns_expected and \
+ record['hrn'] != self.api.config.SFA_INTERFACE_HRN:
table.remove(record)
# add new records
required_fields = self.default_fields.keys()
for interface in self.interfaces.values():
# make sure the required fields are present and not null
- if not all([interface.get(key) for key in required_fields]):
- continue
-
- hrn, address, port = interface['hrn'], interface['addr'], interface['port']
- url = 'http://%(address)s:%(port)s' % locals()
+ url = interface['url']
# check which client we should use
# sfa.util.xmlrpcprotocol is default
client_type = 'xmlrpcprotocol'
client_type = 'geniclientlight'
connections[hrn] = GeniClientLight(url, self.api.key_file, self.api.cert_file)
else:
- connections[hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
+ connections[interface['hrn']] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
return connections