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:
ed14b10
)
fix NameErrors
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 26 Oct 2011 19:00:16 +0000
(15:00 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 26 Oct 2011 19:00:16 +0000
(15:00 -0400)
sfa/plc/slices.py
patch
|
blob
|
history
diff --git
a/sfa/plc/slices.py
b/sfa/plc/slices.py
index
74de0a8
..
5edce64
100644
(file)
--- a/
sfa/plc/slices.py
+++ b/
sfa/plc/slices.py
@@
-4,7
+4,7
@@
from collections import defaultdict
from sfa.util.xrn import get_leaf, get_authority, urn_to_hrn
from sfa.util.plxrn import hrn_to_pl_slicename
from sfa.util.policy import Policy
from sfa.util.xrn import get_leaf, get_authority, urn_to_hrn
from sfa.util.plxrn import hrn_to_pl_slicename
from sfa.util.policy import Policy
-
+from sfa.rspecs.rspec import RSpec
from sfa.plc.vlink import VLink
MAXINT = 2L**31-1
from sfa.plc.vlink import VLink
MAXINT = 2L**31-1
@@
-185,7
+185,7
@@
class Slices:
def verify_slice_links(self, slice, links, aggregate):
# nodes is undefined here
def verify_slice_links(self, slice, links, aggregate):
# nodes is undefined here
- if not links or not nodes:
+ if not links or not
aggregate.
nodes:
return
for link in links:
topo_rspec = VLink.get_topo_rspec(link)
return
for link in links:
topo_rspec = VLink.get_topo_rspec(link)
@@
-536,8
+536,7
@@
class Slices:
# add requested_attributes
for attribute in added_slice_attributes:
try:
# add requested_attributes
for attribute in added_slice_attributes:
try:
- name, value, node_id = attribute['name'], attribute['value'], attribute.get('node_id', None)
- self.api.plshell.AddSliceTag(self.api.plauth, slice['name'], name, value, node_id)
+ self.api.plshell.AddSliceTag(self.api.plauth, slice['name'], attribute['name'], attribute['value'], attribute.get('node_id', None))
except Exception, e:
self.api.logger.warn('Failed to add sliver attribute. name: %s, value: %s, node_id: %s\nCause:%s'\
% (name, value, node_id, str(e)))
except Exception, e:
self.api.logger.warn('Failed to add sliver attribute. name: %s, value: %s, node_id: %s\nCause:%s'\
% (name, value, node_id, str(e)))