nopaxos: use new nopaxos repo

experiments/pyexps/nopaxos.py

@@ -103,6 +103,9 @@ for proto_config in proto_configs:
                     for c in clients:
                         c.sleep = 5
                         c.node_config.app.server_ips = ['10.0.0.1', '10.0.0.2', '10.0.0.3']
+                        if seq_config == 'ehseq':
+                            c.node_config.app.server_ips.append('10.0.0.100')
+                            c.node_config.app.use_ehseq = True
                         c.node_config.disk_image = 'nopaxos'
                         c.nics[0].sync_period = sync_period
                         c.sync_period = sync_period

experiments/simbricks/nodeconfig.py

@@ -398,7 +398,7 @@ class VRClient(AppConfig):
         for ip in self.server_ips:
             cmds.append('ping -c 1 ' + ip)
         cmds.append('/root/nopaxos/bench/client -c /root/nopaxos.config ' +
-                '-m vr -n 2000')
+                '-m vr -u 2 -h ' + node.ip)
         return cmds
 
 class NOPaxosReplica(AppConfig):
@@ -410,13 +410,17 @@ class NOPaxosReplica(AppConfig):
 class NOPaxosClient(AppConfig):
     server_ips = []
     is_last = False
+    use_ehseq = False
 
     def run_cmds(self, node):
         cmds = []
         for ip in self.server_ips:
             cmds.append('ping -c 1 ' + ip)
-        cmds.append('/root/nopaxos/bench/client -c /root/nopaxos.config ' +
-                '-m nopaxos -n 40000')
+        cmd = '/root/nopaxos/bench/client -c /root/nopaxos.config ' + \
+                '-m nopaxos -u 2 -h ' + node.ip
+        if self.use_ehseq:
+            cmd += ' -e'
+        cmds.append(cmd)
         if self.is_last:
             cmds.append('sleep 1')
         else:
@@ -425,7 +429,7 @@ class NOPaxosClient(AppConfig):
 
 class NOPaxosSequencer(AppConfig):
     def run_cmds(self, node):
-        return ['/root/nopaxos/sequencer/sequencer -c /root/sequencer.config']
+        return ['/root/nopaxos/sequencer/sequencer -c /root/nopaxos.config -m nopaxos']
 
 
 class RPCServer(AppConfig):

experiments/simbricks/simulators.py

@@ -312,7 +312,7 @@ class NS3SequencerNet(NetSim):
             elif 'replica' in n.name:
                 ports += '--ServerPort=' + env.nic_eth_path(n) + ' '
             elif 'sequencer' in n.name:
-                ports += '--EndhostSequencerPort=' + env.nic_eth_path(n) + ' '
+                ports += '--ClientPort=' + env.nic_eth_path(n) + ' '
             else:
                 raise Exception('Wrong NIC type')
         cmd = env.repodir + '/sims/external/ns-3' + '/cosim-run.sh sequencer sequencer-single-switch-example ' + ports + ' ' + self.opt

images/nopaxos.config

@@ -2,4 +2,5 @@ f 1
 replica 10.0.0.1:12345
 replica 10.0.0.2:12345
 replica 10.0.0.3:12345
-multicast 10.0.0.255:12345
+multicast 10.0.0.255:22222
+sequencer 10.0.0.100:12345

images/nopaxos.json

@@ -53,15 +53,9 @@
       "destination": "/tmp/nopaxos.config",
       "direction": "upload"
     },
-    {
-      "type": "file",
-      "source": "sequencer.config",
-      "destination": "/tmp/sequencer.config",
-      "direction": "upload"
-    },
     {
       "type": "shell",
-      "inline": ["sudo mv /tmp/nopaxos.config /root/nopaxos.config; sudo mv /tmp/sequencer.config /root/sequencer.config"]
+      "inline": ["sudo mv /tmp/nopaxos.config /root/nopaxos.config"]
     }
   ],
   "variables": {

images/scripts/install-nopaxos.sh

@@ -9,6 +9,6 @@ make install
 ldconfig
 
 mkdir -p /root
-git clone https://github.com/UWSysLab/NOPaxos.git /root/nopaxos
+git clone https://github.com/nicklijl/simbricks-nopaxos.git /root/nopaxos
 cd /root/nopaxos
 make -j4