projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master'
[osm/vim-emu.git]
/
src
/
emuvim
/
dcemulator
/
node.py
diff --git
a/src/emuvim/dcemulator/node.py
b/src/emuvim/dcemulator/node.py
index
3258a9f
..
f9328e3
100755
(executable)
--- a/
src/emuvim/dcemulator/node.py
+++ b/
src/emuvim/dcemulator/node.py
@@
-19,7
+19,7
@@
DCDPID_BASE = 1000 # start of switch dpid's used for data center switches
class EmulatorCompute(Docker):
"""
Emulator specific compute node class.
class EmulatorCompute(Docker):
"""
Emulator specific compute node class.
- Inherits from
Dock
ernet's Docker host class.
+ Inherits from
Contain
ernet's Docker host class.
Represents a single container connected to a (logical)
data center.
We can add emulator specific helper functions to it.
Represents a single container connected to a (logical)
data center.
We can add emulator specific helper functions to it.
@@
-168,7
+168,7
@@
class Datacenter(object):
# if no --net option is given, network = [{}], so 1 empty dict in the list
# this results in 1 default interface with a default ip address
for nw in network:
# if no --net option is given, network = [{}], so 1 empty dict in the list
# this results in 1 default interface with a default ip address
for nw in network:
- # TODO we cannot use TCLink here (see: https://github.com/mpeuster/
dock
ernet/issues/3)
+ # TODO we cannot use TCLink here (see: https://github.com/mpeuster/
contain
ernet/issues/3)
self.net.addLink(d, self.switch, params1=nw, cls=Link, intfName1=nw.get('id'))
# do bookkeeping
self.containers[name] = d
self.net.addLink(d, self.switch, params1=nw, cls=Link, intfName1=nw.get('id'))
# do bookkeeping
self.containers[name] = d