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 (parent:
37e3aa3
)
hrn_to_urn() requries 2 arguments
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 11 Nov 2011 03:46:50 +0000
(22:46 -0500)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 11 Nov 2011 03:46:50 +0000
(22:46 -0500)
sfa/plc/aggregate.py
patch
|
blob
|
history
diff --git
a/sfa/plc/aggregate.py
b/sfa/plc/aggregate.py
index
18a5123
..
a995542
100644
(file)
--- a/
sfa/plc/aggregate.py
+++ b/
sfa/plc/aggregate.py
@@
-6,6
+6,7
@@
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.node import Node
from sfa.rspecs.elements.link import Link
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.node import Node
from sfa.rspecs.elements.link import Link
+from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.login import Login
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.interface import Interface
from sfa.rspecs.elements.login import Login
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.interface import Interface
@@
-106,7
+107,7
@@
class Aggregate:
slice = None
if not slice_xrn:
return (slice, slivers)
slice = None
if not slice_xrn:
return (slice, slivers)
- slice_urn = hrn_to_urn(slice_xrn)
+ slice_urn = hrn_to_urn(slice_xrn
, 'slice'
)
slice_hrn, _ = urn_to_hrn(slice_xrn)
slice_name = hrn_to_pl_slicename(slice_hrn)
slices = self.api.driver.GetSlices(slice_name)
slice_hrn, _ = urn_to_hrn(slice_xrn)
slice_name = hrn_to_pl_slicename(slice_hrn)
slices = self.api.driver.GetSlices(slice_name)