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_max.py
diff --git
a/sfa/managers/aggregate_manager_max.py
b/sfa/managers/aggregate_manager_max.py
index
7f0a253
..
5c12875
100644
(file)
--- a/
sfa/managers/aggregate_manager_max.py
+++ b/
sfa/managers/aggregate_manager_max.py
@@
-22,15
+22,15
@@
SFA_MAX_CANNED_RSPEC = '/etc/sfa/max_physical_canned.xml'
topology = {}
topology = {}
-class
GeniOutOfResource(Geni
Fault):
+class
SfaOutOfResource(Sfa
Fault):
def __init__(self, interface):
faultString = "Interface " + interface + " not available"
def __init__(self, interface):
faultString = "Interface " + interface + " not available"
-
Geni
Fault.__init__(self, 100, faultString, '')
+
Sfa
Fault.__init__(self, 100, faultString, '')
-class
GeniNoPairRSpec(Geni
Fault):
+class
SfaNoPairRSpec(Sfa
Fault):
def __init__(self, interface, interface2):
faultString = "Interface " + interface + " should be paired with " + interface2
def __init__(self, interface, interface2):
faultString = "Interface " + interface + " should be paired with " + interface2
-
Geni
Fault.__init__(self, 100, faultString, '')
+
Sfa
Fault.__init__(self, 100, faultString, '')
# Returns a mapping from interfaces to the nodes they lie on and their peer interfaces
# i -> node,i_peer
# Returns a mapping from interfaces to the nodes they lie on and their peer interfaces
# i -> node,i_peer
@@
-140,7
+140,7
@@
def alloc_nodes(api,hrn, requested_ifs):
# Taken from slices.py
def create_slice_max_aggregate(api, hrn, nodes):
# Taken from slices.py
def create_slice_max_aggregate(api, hrn, nodes):
- # Get the slice record
from geni
+ # Get the slice record
global topology
topology = get_interface_map()
slice = {}
global topology
topology = get_interface_map()
slice = {}
@@
-288,9
+288,9
@@
def create_slice(api, hrn, rspec_xml):
for a in requested_interfaces:
if (a not in current_hrn_interfaces and a in current_interfaces):
for a in requested_interfaces:
if (a not in current_hrn_interfaces and a in current_interfaces):
- raise
Geni
OutOfResource(a)
+ raise
Sfa
OutOfResource(a)
if (topology[a][1] not in requested_interfaces):
if (topology[a][1] not in requested_interfaces):
- raise
Geni
NoPairRSpec(a,topology[a][1])
+ raise
Sfa
NoPairRSpec(a,topology[a][1])
# Request OK
# Allocations to delete
# Request OK
# Allocations to delete