From e1eee7be74d77109f44f63bd10a4d45fc7be3bd4 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Tue, 5 Jul 2011 17:26:15 -0400 Subject: [PATCH] Support multiple tags in the RSpec --- sfa/managers/aggregate_manager_eucalyptus.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py index 4bd0c221..3954bf54 100644 --- a/sfa/managers/aggregate_manager_eucalyptus.py +++ b/sfa/managers/aggregate_manager_eucalyptus.py @@ -525,7 +525,7 @@ def CreateSliver(api, xrn, creds, xml, users, call_id): pendingRmInst = [] for sliceInst in s.instances: pendingRmInst.append(sliceInst.instance_id) - existingInstGroup = rspecXML.findall('.//euca_instances') + existingInstGroup = rspecXML.findall("./network[@id='%s']//euca_instances"%cloud['name']) for instGroup in existingInstGroup: for existingInst in instGroup: if existingInst.get('id') in pendingRmInst: @@ -537,7 +537,7 @@ def CreateSliver(api, xrn, creds, xml, users, call_id): conn.terminate_instances(pendingRmInst) # Process new instance requests - requests = rspecXML.findall('.//request') + requests = rspecXML.findall("./network[@id='%s']//request"%cloud['name']) if requests: # Get all the public keys associate with slice. pubKeys = getKeysForSlice(s.slice_hrn) -- 2.47.0