git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed another bunch of references to geni
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_pl.py
diff --git
a/sfa/managers/aggregate_manager_pl.py
b/sfa/managers/aggregate_manager_pl.py
index
c608342
..
f890a69
100644
(file)
--- a/
sfa/managers/aggregate_manager_pl.py
+++ b/
sfa/managers/aggregate_manager_pl.py
@@
-7,11
+7,11
@@
import traceback
import sys
from types import StringTypes
import sys
from types import StringTypes
-from sfa.util.
misc
import *
+from sfa.util.
namespace
import *
from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.faults import *
from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.faults import *
-from sfa.util.record import
Geni
Record
+from sfa.util.record import
Sfa
Record
from sfa.util.policy import Policy
from sfa.util.record import *
from sfa.util.sfaticket import SfaTicket
from sfa.util.policy import Policy
from sfa.util.record import *
from sfa.util.sfaticket import SfaTicket
@@
-43,7
+43,7
@@
def create_slice(api, hrn, rspec):
slices = Slices(api)
slices.create_slice_aggregate(hrn, rspec)
slices = Slices(api)
slices.create_slice_aggregate(hrn, rspec)
-def get_ticket(api, slice_hrn, rspec,
gid_origin_caller
=None):
+def get_ticket(api, slice_hrn, rspec,
origin_hrn
=None):
# the the slice record
registries = Registries(api)
registry = registries[api.hrn]
# the the slice record
registries = Registries(api)
registry = registries[api.hrn]
@@
-123,9
+123,9
@@
def get_slices(api):
return slices['hrn']
return slices['hrn']
-def get_rspec(api, hrn=None, origin_
gid_caller
=None):
+def get_rspec(api, hrn=None, origin_
hrn
=None):
from sfa.plc.nodes import Nodes
from sfa.plc.nodes import Nodes
- nodes = Nodes(api, origin_
gid_caller=origin_gid_caller
)
+ nodes = Nodes(api, origin_
hrn=origin_hrn
)
if hrn:
rspec = nodes.get_rspec(hrn)
else:
if hrn:
rspec = nodes.get_rspec(hrn)
else: