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 (from parent 1:
57b5d95
)
import sfa.rspecs.elements.interface.Interface
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 26 Oct 2011 20:13:25 +0000
(16:13 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 26 Oct 2011 20:13:25 +0000
(16:13 -0400)
sfa/plc/aggregate.py
patch
|
blob
|
history
diff --git
a/sfa/plc/aggregate.py
b/sfa/plc/aggregate.py
index
8fa7c80
..
32dc9ce
100644
(file)
--- a/
sfa/plc/aggregate.py
+++ b/
sfa/plc/aggregate.py
@@
-3,6
+3,7
@@
from sfa.util.xrn import hrn_to_urn, urn_to_hrn
from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.elements.link import Link
from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.elements.link import Link
+from sfa.rspecs.elements.interface import Interface
from sfa.managers.vini.topology import PhysicalLinks
from sfa.rspecs.version_manager import VersionManager
from sfa.plc.vlink import get_tc_rate
from sfa.managers.vini.topology import PhysicalLinks
from sfa.rspecs.version_manager import VersionManager
from sfa.plc.vlink import get_tc_rate
@@
-66,8
+67,8
@@
class Aggregate:
site1_hrn = self.api.hrn + '.' + site1['login_base']
site2_hrn = self.api.hrn + '.' + site2['login_base']
# get the first node
site1_hrn = self.api.hrn + '.' + site1['login_base']
site2_hrn = self.api.hrn + '.' + site2['login_base']
# get the first node
- node1 = self.nodes[site1['node_id'][0]]
- node2 = self.nodes[site2['node_id'][0]]
+ node1 = self.nodes[site1['node_id
s
'][0]]
+ node2 = self.nodes[site2['node_id
s
'][0]]
# set interfaces
# just get first interface of the first node
# set interfaces
# just get first interface of the first node