X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_eucalyptus.py;h=552f544690347f7df230514631e47e5010a18e5f;hb=b6de9285a970eccb9658a0078c49f76fb11af7cd;hp=6fe47203856ec535beda93e4d0fd7dcd7052f382;hpb=5377ee9f47665b845f230aa678c51bd8d0bd64bb;p=sfa.git diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py index 6fe47203..552f5446 100644 --- a/sfa/managers/aggregate_manager_eucalyptus.py +++ b/sfa/managers/aggregate_manager_eucalyptus.py @@ -286,7 +286,7 @@ class AggregateManagerEucalyptus: _inited=False # the init_server mechanism has vanished - def __init__ (self): + def __init__ (self, config): if AggregateManagerEucalyptus._inited: return AggregateManagerEucalyptus.init_server() @@ -552,7 +552,7 @@ class AggregateManagerEucalyptus: logger.debug("In CreateSliver") aggregate = PlAggregate(self.driver) - slices = PlSlices(api) + slices = PlSlices(self.driver) (hrn, type) = urn_to_hrn(slice_xrn) peer = slices.get_peer(hrn) sfa_peer = slices.get_sfa_peer(hrn) @@ -682,7 +682,7 @@ class AggregateManagerEucalyptus: f.write("%s %s %s\n" % (instId, ipaddr, hrn)) f.close() - def GetVersion(api): + def GetVersion(api, options): version_manager = VersionManager() ad_rspec_versions = [] @@ -695,7 +695,7 @@ class AggregateManagerEucalyptus: xrn=Xrn(api.hrn) version_more = {'interface':'aggregate', 'sfa': 1, - 'geni_api': api.config.SFA_AGGREGATE_API_VERSION, + 'geni_api': '2', 'testbed':'myplc', 'hrn':xrn.get_hrn(), 'geni_request_rspec_versions': request_rspec_versions,