git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
973ac9f
)
=! should be !=
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 27 Sep 2010 18:44:33 +0000
(14:44 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 27 Sep 2010 18:44:33 +0000
(14:44 -0400)
sfa/managers/slice_manager_pl.py
patch
|
blob
|
history
diff --git
a/sfa/managers/slice_manager_pl.py
b/sfa/managers/slice_manager_pl.py
index
6eaf82a
..
55256e0
100644
(file)
--- a/
sfa/managers/slice_manager_pl.py
+++ b/
sfa/managers/slice_manager_pl.py
@@
-72,7
+72,7
@@
def create_slice(api, xrn, creds, rspec, users):
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
# Just send entire RSpec to each aggregate
continue
# Just send entire RSpec to each aggregate
@@
-96,7
+96,7
@@
def renew_slice(api, xrn, creds, expiration_time):
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
server = api.aggregates[aggregate]
continue
server = api.aggregates[aggregate]
@@
-126,7
+126,7
@@
def get_ticket(api, xrn, creds, rspec, users):
for aggregate, aggregate_rspec in aggregate_rspecs.items():
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate, aggregate_rspec in aggregate_rspecs.items():
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
server = None
if aggregate in api.aggregates:
continue
server = None
if aggregate in api.aggregates:
@@
-195,7
+195,7
@@
def delete_slice(api, xrn, creds):
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
server = api.aggregates[aggregate]
threads.run(server.DeleteSliver, xrn, credential)
continue
server = api.aggregates[aggregate]
threads.run(server.DeleteSliver, xrn, credential)
@@
-215,7
+215,7
@@
def start_slice(api, xrn, creds):
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
server = api.aggregates[aggregate]
threads.run(server.Start, xrn, credential)
continue
server = api.aggregates[aggregate]
threads.run(server.Start, xrn, credential)
@@
-235,7
+235,7
@@
def stop_slice(api, xrn, creds):
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
server = api.aggregates[aggregate]
threads.run(server.Stop, xrn, credential)
continue
server = api.aggregates[aggregate]
threads.run(server.Stop, xrn, credential)
@@
-281,7
+281,7
@@
def get_slices(api, creds):
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
server = api.aggregates[aggregate]
threads.run(server.ListSlices, credential)
continue
server = api.aggregates[aggregate]
threads.run(server.ListSlices, credential)
@@
-330,7
+330,7
@@
def get_rspec(api, creds, options):
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
for aggregate in api.aggregates:
# prevent infinite loop. Dont send request back to caller
# unless the caller is the aggregate's SM
- if caller_hrn == aggrgate and aggregate
=!
api.hrn:
+ if caller_hrn == aggrgate and aggregate
!=
api.hrn:
continue
# get the rspec from the aggregate
server = api.aggregates[aggregate]
continue
# get the rspec from the aggregate
server = api.aggregates[aggregate]