experiments: more compact names for simulator paths and in verbose output

experiments/modes/experiments.py

@@ -163,22 +163,22 @@ class ExpEnv(object):
         self.qemu_kernel_path = self.repodir + '/images/bzImage'
 
     def hdcopy_path(self, sim):
-        return '%s/hdcopy.%s.%d' % (self.workdir, sim.name, id(sim))
+        return '%s/hdcopy.%s' % (self.workdir, sim.name)
 
     def hd_path(self, hd_name):
         return '%s/images/output-%s/%s' % (self.repodir, hd_name, hd_name)
 
     def cfgtar_path(self, sim):
-        return '%s/cfg.%s.%d.tar' % (self.workdir, sim.name, id(sim))
+        return '%s/cfg.%s.tar' % (self.workdir, sim.name)
 
     def nic_pci_path(self, sim):
-        return '%s/nic.pci.%s.%d' % (self.workdir, sim.name, id(sim))
+        return '%s/nic.pci.%s' % (self.workdir, sim.name)
 
     def nic_eth_path(self, sim):
-        return '%s/nic.eth.%s.%d' % (self.workdir, sim.name, id(sim))
+        return '%s/nic.eth.%s' % (self.workdir, sim.name)
 
     def nic_shm_path(self, sim):
-        return '%s/nic.shm.%s.%d' % (self.workdir, sim.name, id(sim))
+        return '%s/nic.shm.%s' % (self.workdir, sim.name)
 
 class ExpOutput(object):
     def __init__(self, exp):

experiments/modes/simulators.py

@@ -23,9 +23,10 @@ class HostSim(Simulator):
         self.nics = []
 
     def full_name(self):
-        return 'host.%s.%d' % (self.name, id(self))
+        return 'host.' + self.name
 
     def add_nic(self, nic):
+        nic.name = self.name + '.' + nic.name
         self.nics.append(nic)
 
 class NICSim(Simulator):
@@ -42,7 +43,7 @@ class NICSim(Simulator):
                     env.nic_shm_path(self))
 
     def full_name(self):
-        return 'nic.%s.%d' % (self.name, id(self))
+        return 'nic.' + self.name
 
 class NetSim(Simulator):
     name = ''
@@ -51,7 +52,7 @@ class NetSim(Simulator):
         self.nics = []
 
     def full_name(self):
-        return 'net.%s.%d' % (self.name, id(self))
+        return 'net.' + self.name
 
 
 class QemuHost(HostSim):