X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_max.py;h=0b37bb32c4f3e00c12ef65e017fbd8bab1599944;hb=f947ffc3bb7509783faee76185ec082c6311ab9f;hp=e586ffb9bd59a4eb475a6022fc3ada26ffb863cd;hpb=45ec5d374d680b30464a5c47082eb578c2acac28;p=sfa.git diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py index e586ffb9..0b37bb32 100644 --- a/sfa/managers/aggregate_manager_max.py +++ b/sfa/managers/aggregate_manager_max.py @@ -1,8 +1,10 @@ #!/usr/bin/python -from sfa.util.rspec import RSpec import sys import pdb +import xml.dom.minidom + +from sfa.util.rspec import RSpec from sfa.util.xrn import urn_to_hrn, hrn_to_urn, get_authority from sfa.util.plxrn import hrn_to_pl_slicename from sfa.util.plxrn import hrn_to_pl_slicename @@ -14,8 +16,8 @@ from sfa.util.policy import Policy from sfa.server.aggregate import Aggregates from sfa.server.registry import Registries from sfa.util.faults import * +from sfa.util.callids import Callids -import xml.dom.minidom SFA_MAX_CONF_FILE = '/etc/sfa/max_allocations' SFA_MAX_DEFAULT_RSPEC = '/etc/sfa/max_physical.xml' @@ -252,7 +254,8 @@ def create_slice_max_aggregate(api, hrn, nodes): return 1 -def get_rspec(api, creds, options): +def get_rspec(api, creds, options, call_id): + if not Callids().should_handle_call_id(call_id): return "" # get slice's hrn from options xrn = options.get('geni_slice_urn', '') hrn, type = urn_to_hrn(xrn)