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:
a9a62c9
)
verify_slice_links() should exit if links are not supported at the aggregate
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 24 Oct 2012 17:17:32 +0000
(13:17 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 24 Oct 2012 17:17:32 +0000
(13:17 -0400)
sfa/planetlab/plslices.py
patch
|
blob
|
history
diff --git
a/sfa/planetlab/plslices.py
b/sfa/planetlab/plslices.py
index
be38155
..
7e74592
100644
(file)
--- a/
sfa/planetlab/plslices.py
+++ b/
sfa/planetlab/plslices.py
@@
-4,10
+4,9
@@
from collections import defaultdict
from sfa.util.sfatime import utcparse, datetime_to_epoch
from sfa.util.sfalogging import logger
from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
from sfa.util.sfatime import utcparse, datetime_to_epoch
from sfa.util.sfalogging import logger
from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
-
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.rspec import RSpec
-
from sfa.planetlab.vlink import VLink
from sfa.planetlab.vlink import VLink
+from sfa.planetlab.topology import Topology
from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
MAXINT = 2L**31-1
from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
MAXINT = 2L**31-1
@@
-215,10
+214,15
@@
class PlSlices:
return str(key)
def verify_slice_links(self, slice, requested_links, nodes):
return str(key)
def verify_slice_links(self, slice, requested_links, nodes):
- # nodes is undefined here
+
if not requested_links:
return
if not requested_links:
return
-
+
+ # exit if links are not supported here
+ topology = Topology()
+ if not topology:
+ return
+
# build dict of nodes
nodes_dict = {}
interface_ids = []
# build dict of nodes
nodes_dict = {}
interface_ids = []