refactored service methods to be shorter, updated some logging to debug, added some more service tests
This commit is contained in:
parent
8186f3716c
commit
bb533406a6
23 changed files with 226 additions and 112 deletions
|
@ -160,7 +160,7 @@ def main():
|
|||
n.cmd([constants.SYSCTL_BIN, "net.ipv4.icmp_echo_ignore_broadcasts=0"])
|
||||
if options.services is not None:
|
||||
session.services.add_services(n, "", options.services.split("|"))
|
||||
session.services.boot_node_services(n)
|
||||
session.services.boot_services(n)
|
||||
nodelist.append(n)
|
||||
if i % 25 == 0:
|
||||
print "\n%s nodes created " % i,
|
||||
|
|
|
@ -88,7 +88,7 @@ ip forwarding
|
|||
|
||||
def boot(self):
|
||||
self.config()
|
||||
self.session.services.boot_node_services(self)
|
||||
self.session.services.boot_services(self)
|
||||
|
||||
def bootscript(self):
|
||||
return """\
|
||||
|
|
|
@ -421,7 +421,7 @@ class Experiment(object):
|
|||
tmp.newnetif(self.net, [addr])
|
||||
self.nodes.append(tmp)
|
||||
self.session.services.add_services(tmp, "router", "IPForward")
|
||||
self.session.services.boot_node_services(tmp)
|
||||
self.session.services.boot_services(tmp)
|
||||
self.staticroutes(i, prefix, numnodes)
|
||||
|
||||
# link each node in a chain, with the previous node
|
||||
|
@ -463,7 +463,7 @@ class Experiment(object):
|
|||
|
||||
for i in xrange(1, numnodes + 1):
|
||||
tmp = self.nodes[i - 1]
|
||||
self.session.services.boot_node_services(tmp)
|
||||
self.session.services.boot_services(tmp)
|
||||
self.staticroutes(i, prefix, numnodes)
|
||||
|
||||
def setnodes(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue