refactored service interaction use names with a _, and cleanup up some of the CoreServices methods

daemon/examples/netns/howmanynodes.py

@@ -159,7 +159,7 @@ def main():
             n.newnetif(switch, ["%s/%s" % (prefix.addr(i), prefix.prefixlen)])
             n.cmd([constants.SYSCTL_BIN, "net.ipv4.icmp_echo_ignore_broadcasts=0"])
             if options.services is not None:
-                session.services.addservicestonode(n, "", options.services)
+                session.services.addservicestonode(n, "", options.services.split("|"))
                 n.boot()
             nodelist.append(n)
             if i % 25 == 0:

daemon/examples/netns/wlanemanetests.py

@@ -429,8 +429,7 @@ class Experiment(object):
                 self.net.link(prev.netif(0), tmp.netif(0))
             prev = tmp
 
-    def createemanesession(self, numnodes, verbose=False, cls=None,
-                           values=None):
+    def createemanesession(self, numnodes, verbose=False, cls=None, values=None):
         """ Build a topology consisting of the given number of LxcNodes
             connected to an EMANE WLAN.
         """