version = version_core()
cred_types = [{'geni_type': 'geni_sfa', 'geni_version': str(i)} for i in range(4)[-2:]]
geni_api_versions = ApiVersions().get_versions()
- geni_api_versions.append({'3': 'http://%s:%s' % (socket.gethostname(), api.config.sfa_aggregate_port)})
+ geni_api_versions['3'] = 'http://%s:%s' % (api.config.sfa_aggregate_host, api.config.sfa_aggregate_port)
version_generic = {
'testbed': self.driver.testbed_name(),
'interface':'aggregate',
self.xml = XML(source)
def get_versions(self):
- versions = []
+ versions = {}
for value in self.xml.todict().values():
if not value:
continue
for item in value:
if isinstance(item, dict) and \
set(ApiVersions.required_fields).issubset(item.keys()):
- api_version = {str(item['version']): item['url']}
- versions.append(api_version)
+ versions[str(item['version'])] = item['url']
return versions