From 0b767a302b8d3c0e90fa180b08a53df1c9028a0e Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Sat, 26 Feb 2022 08:01:43 +0000
Subject: [PATCH 01/16] setup VDE

---
 wlutil/launch.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/wlutil/launch.py b/wlutil/launch.py
index b6995aaf..0d4f3b21 100644
--- a/wlutil/launch.py
+++ b/wlutil/launch.py
@@ -5,7 +5,7 @@
 from . import wlutil
 
 jobProcs = []
-
+vdeProc = None
 
 # Terminates jobs unless they have stopped running already
 def cleanUpSubProcesses():
@@ -14,12 +14,27 @@ def cleanUpSubProcesses():
         if proc.poll() is None:
             log.info(f'cleaning up launched workload process {proc.pid}')
             proc.terminate()
+    cleanUpVDE()
 
 
 # Register clean up function with wlutil.py so it can be called by SIGINT handler
 wlutil.registerCleanUp(cleanUpSubProcesses)
 
+# Start vde_plug server
+def startVDE():
+    log = logging.getLogger()
+    global vdeProc
+    log.info('Starting VDE')
+    vdeProc = sp.Popen(["vde_plug", "switch:///tmp/mysw", "cmd://slirpvde - --host=172.16.0.2/16 --dns=172.16.0.3"], stderr=sp.STDOUT)
+
 
+# Terminate vdeProc unless it has stopped running already
+def cleanUpVDE():
+    log = logging.getLogger()
+    if vdeProc and vdeProc.poll() is None:
+        log.info(f'cleaning up VDE process {vdeProc.pid}')
+        vdeProc.terminate()
+                                                            
 # Kinda hacky (technically not guaranteed to give a free port, just very likely)
 def get_free_tcp_port():
     tcp = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -58,7 +73,7 @@ def getSpikeCmd(config, nodisk=False):
 
 # Returns a command string to luanch the given config in qemu. Must be called with shell=True.
 def getQemuCmd(config, nodisk=False):
-    launch_port = get_free_tcp_port()
+    # launch_port = get_free_tcp_port()
 
     if nodisk:
         exe = str(wlutil.noDiskPath(config['bin']))
@@ -80,7 +95,8 @@ def getQemuCmd(config, nodisk=False):
            '-object', 'rng-random,filename=/dev/urandom,id=rng0',
            '-device', 'virtio-rng-device,rng=rng0',
            '-device', 'virtio-net-device,netdev=usernet',
-           '-netdev', 'user,id=usernet,hostfwd=tcp::' + launch_port + '-:22']
+           #'-netdev', 'user,id=usernet,hostfwd=tcp::' + launch_port + '-:22']
+           '-netdev', 'vde,id=vde0,sock=vde:///tmp/mysw']
 
     if 'img' in config and not nodisk:
         cmd = cmd + ['-device', 'virtio-blk-device,drive=hd0',
@@ -111,6 +127,9 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
     if not spike and baseConfig.get('qemu', True) is None:
         raise RuntimeError("This workload does not support qemu")
 
+    if not spike:
+        startVDE()
+
     if jobs is None:
         configs = [baseConfig]
     else:
@@ -160,6 +179,9 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
         cleanUpSubProcesses()
         raise
 
+    finally:
+        cleanUpVDE()
+
     for config in configs:
         if 'outputs' in config:
             outputSpec = [wlutil.FileSpec(src=f, dst=runResDir) for f in config['outputs']]

From 7f3727b08463c0dffe85aee90d3f76ab6bdf4a5e Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Sat, 26 Feb 2022 11:23:52 +0000
Subject: [PATCH 02/16] Marshal Integration v1 works!

---
 .../br-base/overlay/etc/init.d/S40network     | 55 ++++++++++---------
 .../br-base/overlay/etc/network/interfaces    |  6 ++
 wlutil/launch.py                              | 19 ++++++-
 3 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network b/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network
index cff8f1d9..20563e7f 100755
--- a/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network
+++ b/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network
@@ -2,37 +2,38 @@
 #
 # Start the network....
 #
-
 # Debian ifupdown needs the /run/network lock directory
 mkdir -p /run/network
 
+resolvconf_file="/etc/resolv.conf"
+rm -f $resolvconf_file
+echo "nameserver 172.16.0.3" > $resolvconf_file
+
+ifname=eth0
+read _ addr _ _ <<< $(/sbin/ip link | /bin/grep -A 1 "$ifname" | /usr/bin/tail -1)
+IFS=: read -r _ _ _ _ machigh maclow <<< $addr
+
 case "$1" in
-  start)
-	printf "Starting network: "
-	/sbin/ifup -a
-	ifname=eth0
-	if test -r "/sys/class/net/${ifname}/address" ; then
-		/sbin/ip link set dev "$ifname" up &&
-		IFS=: read -r _ _ _ _ machigh maclow < "/sys/class/net/${ifname}/address" &&
-		/sbin/ip addr add "172.16.$((16#$machigh)).$((16#$maclow))/16" dev "$ifname"
-	fi
-#	/sbin/ifup eth0
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
-	;;
-  stop)
-	printf "Stopping network: "
-	/sbin/ifdown -a
-#	/sbin/ifdown eth0
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
-	;;
-  restart|reload)
-	"$0" stop
-	"$0" start
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart}"
-	exit 1
+	start)
+		printf "Starting network: "
+        /bin/sed -i -e "1,/^address/{s/^address.*/address 172.16.$((16#$machigh)).$((16#$maclow))/;}" /etc/network/interfaces
+        sbin/ifup -a
+        [ $? = 0 ] && echo "OK" || echo "FAIL"
+        ;;
+    stop)
+        printf "Stopping network: "
+        /sbin/ifdown -a
+        /bin/sed -i -e "1,/^address/{s/^address.*/address firemarshal_ip_addr_uninitialized/;}" /etc/network/interfaces
+        [ $? = 0 ] && echo "OK" || echo "FAIL"
+        ;;
+    restart|reload)
+        "$0" stop
+        "$0" start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+
 esac
 
 exit $?
-
diff --git a/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces b/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces
index fe584263..2cc53a88 100644
--- a/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces
+++ b/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces
@@ -2,3 +2,9 @@
 auto lo
 iface lo inet loopback
 
+auto eth0
+iface eth0 inet static
+address firemarshal_ip_addr_uninitialized
+netmask 255.255.0.0
+gateway 172.16.0.2
+dns-nameservers 172.16.0.3
diff --git a/wlutil/launch.py b/wlutil/launch.py
index 0d4f3b21..54d8e9c3 100644
--- a/wlutil/launch.py
+++ b/wlutil/launch.py
@@ -72,7 +72,7 @@ def getSpikeCmd(config, nodisk=False):
 
 
 # Returns a command string to luanch the given config in qemu. Must be called with shell=True.
-def getQemuCmd(config, nodisk=False):
+def getQemuCmd(config, count, nodisk=False):
     # launch_port = get_free_tcp_port()
 
     if nodisk:
@@ -85,6 +85,14 @@ def getQemuCmd(config, nodisk=False):
     else:
         qemuBin = 'qemu-system-riscv64'
 
+    # We should start static IP addresses at 172.16.0.4 => 4 = 1 (min val of count) + 3
+    count += 3
+    machigh = '00'
+    if count < 16:
+        maclow = '0' + hex(count)[2:]
+    else: 
+        maclow = hex(count)[2:]
+
     cmd = [qemuBin,
            '-nographic',
            '-bios none',
@@ -94,7 +102,7 @@ def getQemuCmd(config, nodisk=False):
            '-kernel', exe,
            '-object', 'rng-random,filename=/dev/urandom,id=rng0',
            '-device', 'virtio-rng-device,rng=rng0',
-           '-device', 'virtio-net-device,netdev=usernet',
+           '-device', f'virtio-net-device,netdev=vde0,mac=00:12:6d:00:{machigh}:{maclow}',
            #'-netdev', 'user,id=usernet,hostfwd=tcp::' + launch_port + '-:22']
            '-netdev', 'vde,id=vde0,sock=vde:///tmp/mysw']
 
@@ -140,8 +148,12 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
     screenIdentifiers = {}
 
     try:
+        count = 0;
         for config in configs:
             if config['launch']:
+                
+                count += 1
+
                 runResDir = baseResDir / config['name']
                 uartLog = runResDir / "uartlog"
                 os.makedirs(runResDir)
@@ -149,7 +161,7 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
                 if spike:
                     cmd = getSpikeCmd(config, config['nodisk'])
                 else:
-                    cmd = getQemuCmd(config, config['nodisk'])
+                    cmd = getQemuCmd(config, count, config['nodisk'])
 
                 log.info(f"\nLaunching job {config['name']}")
                 log.info(f'Running: {cmd}')
@@ -174,6 +186,7 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
 
         for proc in jobProcs:
             proc.wait()
+        cleanUpVDE()
 
     except Exception:
         cleanUpSubProcesses()

From b7ccd931f8d1badf2061449d0061bd70079e4d9e Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Tue, 1 Mar 2022 09:31:44 +0000
Subject: [PATCH 03/16] Internet test + Network test needs better test harness

---
 test/internet.yaml                        |   9 +++++++++
 test/internet/refOutput/internet/uartlog  |   1 +
 test/network.yaml                         |  23 ++++++++++++++++++++++
 test/network/overlay/root/client          | Bin 0 -> 12296 bytes
 test/network/overlay/root/server          | Bin 0 -> 12456 bytes
 test/network/refOutput/network-j0/uartlog |   3 +++
 test/network/refOutput/network-j1/uartlog |   1 +
 test/network/refOutput/network-j2/uartlog |   1 +
 8 files changed, 38 insertions(+)
 create mode 100644 test/internet.yaml
 create mode 100644 test/internet/refOutput/internet/uartlog
 create mode 100644 test/network.yaml
 create mode 100755 test/network/overlay/root/client
 create mode 100755 test/network/overlay/root/server
 create mode 100644 test/network/refOutput/network-j0/uartlog
 create mode 100644 test/network/refOutput/network-j1/uartlog
 create mode 100644 test/network/refOutput/network-j2/uartlog

diff --git a/test/internet.yaml b/test/internet.yaml
new file mode 100644
index 00000000..94ee6af2
--- /dev/null
+++ b/test/internet.yaml
@@ -0,0 +1,9 @@
+{
+  "name" : "internet",
+  "base" : "br-base.json",
+  "command" : "wget -S fires.im",
+  "testing" : {
+    "refDir" : "refOutput",
+    "strip" : true
+  }
+}
diff --git a/test/internet/refOutput/internet/uartlog b/test/internet/refOutput/internet/uartlog
new file mode 100644
index 00000000..12f5268f
--- /dev/null
+++ b/test/internet/refOutput/internet/uartlog
@@ -0,0 +1 @@
+  Location: https://fires.im/
diff --git a/test/network.yaml b/test/network.yaml
new file mode 100644
index 00000000..a77a9652
--- /dev/null
+++ b/test/network.yaml
@@ -0,0 +1,23 @@
+{
+  "name" : "network",
+  "base" : "br-base.json",
+  "overlay": "overlay",
+  "testing" : {
+    "refDir" : "refOutput",
+    "strip" : true
+  },
+  "jobs" : [
+    {
+      "name" : "j0",
+      "command" : "/root/server 172.16.0.4 2",
+    },
+    {
+      "name" : "j1",
+      "command" : "sleep 3; /root/client 172.16.0.4"
+    },
+    {
+      "name" : "j2",
+      "command" : "sleep 5; /root/client 172.16.0.4"
+    }
+  ]
+}
diff --git a/test/network/overlay/root/client b/test/network/overlay/root/client
new file mode 100755
index 0000000000000000000000000000000000000000..2bcc067d6d15e0775a98ca664436db708e2b7642
GIT binary patch
literal 12296
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
XQtqxFhuPIcF4%UTkZ*AbxJdS2OV2H*

literal 0
HcmV?d00001

diff --git a/test/network/overlay/root/server b/test/network/overlay/root/server
new file mode 100755
index 0000000000000000000000000000000000000000..57bb40c3d5ea0b39404ce3558cdd77cd6d4da0b2
GIT binary patch
literal 12456
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

literal 0
HcmV?d00001

diff --git a/test/network/refOutput/network-j0/uartlog b/test/network/refOutput/network-j0/uartlog
new file mode 100644
index 00000000..b2551c72
--- /dev/null
+++ b/test/network/refOutput/network-j0/uartlog
@@ -0,0 +1,3 @@
+Success : 1 : 172.16.0.5
+Success : 2 : 172.16.0.6
+Final Success
diff --git a/test/network/refOutput/network-j1/uartlog b/test/network/refOutput/network-j1/uartlog
new file mode 100644
index 00000000..d6d30664
--- /dev/null
+++ b/test/network/refOutput/network-j1/uartlog
@@ -0,0 +1 @@
+Success : 172.16.0.4
diff --git a/test/network/refOutput/network-j2/uartlog b/test/network/refOutput/network-j2/uartlog
new file mode 100644
index 00000000..d6d30664
--- /dev/null
+++ b/test/network/refOutput/network-j2/uartlog
@@ -0,0 +1 @@
+Success : 172.16.0.4

From c6b8fa74fe3ed86ba6572e99ad89da2e03f308fe Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Tue, 1 Mar 2022 19:05:26 +0000
Subject: [PATCH 04/16] network test works, all jobs launch concurrently during
 testing

---
 test/network/refOutput/network-j0/uartlog | 1 +
 wlutil/test.py                            | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/network/refOutput/network-j0/uartlog b/test/network/refOutput/network-j0/uartlog
index b2551c72..337b59db 100644
--- a/test/network/refOutput/network-j0/uartlog
+++ b/test/network/refOutput/network-j0/uartlog
@@ -1,3 +1,4 @@
 Success : 1 : 172.16.0.5
 Success : 2 : 172.16.0.6
+
 Final Success
diff --git a/wlutil/test.py b/wlutil/test.py
index dee18282..6fd873a2 100755
--- a/wlutil/test.py
+++ b/wlutil/test.py
@@ -147,10 +147,12 @@ def testWorkload(cfgName, cfgs, verbose=False, spike=False, cmp_only=None):
 
             # Run every job (or just the workload itself if no jobs)
             if 'jobs' in cfg:
+                jNames = ''
                 for jName in cfg['jobs'].keys():
-                    log.info("Running job " + jName)
-                    with timeout(testCfg['runTimeout'], 'launch job' + jName):
-                        wllaunch.launchWorkload(cfg, jobs=[jName], spike=spike, silent=not verbose)
+                    jNames += jName + ' '
+                log.info("Running job " + jNames)
+                with timeout(testCfg['runTimeout'], 'launch jobs' + jNames):
+                    wllaunch.launchWorkload(cfg, jobs=cfg['jobs'], spike=spike, silent=not verbose)
             else:
                 log.info("Running workload")
                 with timeout(testCfg['runTimeout'], 'launch'):

From c5de29e0a33217b8aed7f29ee01f0e585d5d2fb7 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Fri, 25 Mar 2022 22:31:14 +0000
Subject: [PATCH 05/16] VDE Integration with vde-2 complete

---
 boards/default/distros/fedora/fedora.py       |   2 ++
 .../etc/systemd/system/firesim.service        |  11 +++++++
 .../overlay/etc/firesim/ifcfg-static          |   2 ++
 .../overlay/etc/firesim/network-static        |   3 ++
 .../etc/firesim/start-firesim-network.sh      |   2 ++
 scripts/fullTest.py                           |   5 +++-
 test/fed-nw-internet.yaml                     |  27 ++++++++++++++++++
 test/fed-nw-internet/overlay/root/client      | Bin 0 -> 12456 bytes
 test/fed-nw-internet/overlay/root/server      | Bin 0 -> 12192 bytes
 .../overlay/root/test-client-1.sh             |  12 ++++++++
 .../overlay/root/test-client-2-copy.sh        |  15 ++++++++++
 .../overlay/root/test-client-2.sh             |  12 ++++++++
 .../overlay/root/test-server.sh               |  12 ++++++++
 .../refOutput/fed-nw-internet-j0/uartlog      |   1 +
 .../refOutput/fed-nw-internet-j1/uartlog      |   1 +
 .../refOutput/fed-nw-internet-j2/uartlog      |   1 +
 .../refOutput/fed-nw-internet-j3/uartlog      |   1 +
 test/internet.yaml                            |   2 +-
 test/internet/refOutput/internet/uartlog      |   2 +-
 test/network.yaml                             |  10 +++----
 test/network/overlay/root/client              | Bin 12296 -> 12456 bytes
 test/network/overlay/root/server              | Bin 12456 -> 12192 bytes
 test/network/overlay/root/test-client-1.sh    |  12 ++++++++
 test/network/overlay/root/test-client-2.sh    |  12 ++++++++
 test/network/overlay/root/test-server.sh      |  12 ++++++++
 test/network/refOutput/network-j0/uartlog     |   5 +---
 test/network/refOutput/network-j1/uartlog     |   2 +-
 test/network/refOutput/network-j2/uartlog     |   2 +-
 test/post-bin/create-file.sh                  |   3 +-
 test/post-bin/refOutputBase/post-bin/uartlog  |   3 +-
 .../refOutputJobs/post-bin-jobs-j0/uartlog    |   3 +-
 .../refOutputJobs/post-bin-jobs-j1/uartlog    |   3 +-
 wlutil/build.py                               |   2 +-
 wlutil/launch.py                              |  26 ++++++++++-------
 34 files changed, 172 insertions(+), 34 deletions(-)
 create mode 100644 boards/default/distros/fedora/overlay/etc/systemd/system/firesim.service
 create mode 100644 boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static
 create mode 100644 test/fed-nw-internet.yaml
 create mode 100755 test/fed-nw-internet/overlay/root/client
 create mode 100755 test/fed-nw-internet/overlay/root/server
 create mode 100755 test/fed-nw-internet/overlay/root/test-client-1.sh
 create mode 100755 test/fed-nw-internet/overlay/root/test-client-2-copy.sh
 create mode 100755 test/fed-nw-internet/overlay/root/test-client-2.sh
 create mode 100755 test/fed-nw-internet/overlay/root/test-server.sh
 create mode 100644 test/fed-nw-internet/refOutput/fed-nw-internet-j0/uartlog
 create mode 100644 test/fed-nw-internet/refOutput/fed-nw-internet-j1/uartlog
 create mode 100644 test/fed-nw-internet/refOutput/fed-nw-internet-j2/uartlog
 create mode 100644 test/fed-nw-internet/refOutput/fed-nw-internet-j3/uartlog
 create mode 100755 test/network/overlay/root/test-client-1.sh
 create mode 100755 test/network/overlay/root/test-client-2.sh
 create mode 100755 test/network/overlay/root/test-server.sh

diff --git a/boards/default/distros/fedora/fedora.py b/boards/default/distros/fedora/fedora.py
index d8491012..a40035c7 100644
--- a/boards/default/distros/fedora/fedora.py
+++ b/boards/default/distros/fedora/fedora.py
@@ -7,6 +7,8 @@
 serviceTemplate = """[Unit]
 Requires=multi-user.target
 After=multi-user.target
+Requires=network-online.target
+After=network-online.target
 Before=firesim.target
 Wants=firesim.target
 
diff --git a/boards/default/distros/fedora/overlay/etc/systemd/system/firesim.service b/boards/default/distros/fedora/overlay/etc/systemd/system/firesim.service
new file mode 100644
index 00000000..6406150d
--- /dev/null
+++ b/boards/default/distros/fedora/overlay/etc/systemd/system/firesim.service
@@ -0,0 +1,11 @@
+[Unit]
+Requires=multi-user.target
+After=multi-user.target
+Requires=network-online.target
+After=network-online.target
+Before=firesim.target
+Wants=firesim.target
+
+[Service]
+ExecStart=/etc/firesim/firesim.sh 
+StandardOutput=journal+console
\ No newline at end of file
diff --git a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static
index a35932cd..3692b9c9 100644
--- a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static
+++ b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static
@@ -2,3 +2,5 @@ DEVICE=eth0
 BOOTPROTO=static
 ONBOOT=on
 PREFIX=16
+PEERDNS=yes
+DNS1=172.16.0.3
diff --git a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static
new file mode 100644
index 00000000..6860e95b
--- /dev/null
+++ b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static
@@ -0,0 +1,3 @@
+NETWORKING=yes
+NETWORKING_IPV6=no
+GATEWAY=172.16.0.2
diff --git a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh
index 39d6c4cf..d6a5ba47 100755
--- a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh
+++ b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh
@@ -12,6 +12,8 @@ case "$macpref" in
                 maclow=$(echo $mac | cut -c 16-17 -)
                 cp /etc/firesim/ifcfg-static /etc/sysconfig/network-scripts/ifcfg-eth0
                 echo IPADDR=172.16.$((16#$machigh)).$((16#$maclow)) >> /etc/sysconfig/network-scripts/ifcfg-eth0
+                echo default via 172.16.0.2 dev eth0 > /etc/sysconfig/network-scripts/route-eth0
+                cp /etc/firesim/network-static /etc/sysconfig/network
                 ;;
         "52:54:00")
                 echo "this looks like not FireSim. exiting"
diff --git a/scripts/fullTest.py b/scripts/fullTest.py
index f7554491..a2de55f3 100755
--- a/scripts/fullTest.py
+++ b/scripts/fullTest.py
@@ -69,7 +69,10 @@
             'qemu',
             'run',
             'simArgs',
-            'noDrivers'
+            'noDrivers',
+            'internet',
+            'network',
+            'fed-nw-internet'
         ],
 
         # This tests both no-disk and spike. In theory, most (maybe all?) tests
diff --git a/test/fed-nw-internet.yaml b/test/fed-nw-internet.yaml
new file mode 100644
index 00000000..7acc0a6f
--- /dev/null
+++ b/test/fed-nw-internet.yaml
@@ -0,0 +1,27 @@
+{
+  "name" : "fed-nw-internet",
+  "base" : "fedora-base.json",
+  "overlay": "overlay",
+  "testing" : {
+    "refDir" : "refOutput",
+    "strip" : true
+  },
+  "jobs" : [
+    {
+      "name" : "j0",
+      "command" : "timeout 75 /root/test-server.sh"
+    },
+    {
+      "name" : "j1",
+      "command" : "/root/test-client-1.sh"
+    },
+    {
+      "name" : "j2",
+      "command" : "/root/test-client-2.sh"
+    },
+    {
+      "name" : "j3",
+      "command" : 'yum install -y wget && wget fires.im && echo "Success : yum + wget"'
+    }
+  ]
+}
diff --git a/test/fed-nw-internet/overlay/root/client b/test/fed-nw-internet/overlay/root/client
new file mode 100755
index 0000000000000000000000000000000000000000..7879b641f2bf7efb1a5e789b5e4564965ea8da70
GIT binary patch
literal 12456
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
S&r@9fXNw&94xfN8EB+grEtMSr

literal 0
HcmV?d00001

diff --git a/test/fed-nw-internet/overlay/root/server b/test/fed-nw-internet/overlay/root/server
new file mode 100755
index 0000000000000000000000000000000000000000..dbb04396d1327291e0f2e3d52a4b83c39a6c2ed9
GIT binary patch
literal 12192
zcmeHNdu$xXd7r&KK97&1juNFxwU4GH(vG<#B}JxWOFkZ7Vk}dPD7lg>ba}j6^3FQ$
z(f5$WRH^tdCDDKxDYPTU5Fk}(V^;_Y!En*Q3Y?^=(YWv*&cmqD2DW6mby^1y1G9<K
z%4EN9cE028+_80ww&)+8!|lxX`yTV{ymr3XJ=wXZ%cUrcl8b%Jkh)rAVFAGysJ99Q
zkOf#PD}ie*^Rq&r-5j&{0j`ZQmi{MJ#wahg#F#4dT3r^<>aqkWuN88X3p3m*`mmhr
z9LBy~YH=uMUW-O4^tHIcqKoga^e8_o{CHmEq=zKx`GuZe=uv)MR8KkGAGQhpj|h85
z#Qjn32OcIrzgn_b?E8mw1ofigKBA>o1(a6{dCE~1)0aUH{rs#+Gz;4&>RYK@sNX0T
zx67L1vB9Qzq%j^dGshc~u~hijwyllv(QR8JS}LKnpdaWP)`L3Ty$9fGVU@gOU2q&A
zT?Bvh-`=<7Kx6Zv3^oVaD}%r23K)aXpYZp<pZr2uETbOUY-2Apv%n37xz$p4$6DSC
zsDrjOwPnMFYjYdCe{kVMbzsc%{x_dJ(f8yFl`Y?yEI<6h1C^iLcks3EeBtQoSN`en
zufF`}FL|}zoxgq<_@KICLSI(F|E)su$P&F*;PVoGhrpY~e6yq(s}p!Y!dnGCAmM8T
zJ}%+d5$Mk)3EwGjuY?Z@+%Mq~f%i#xyTC^!{D{EMO8A!qeqCw@^b!9|l4mf^!Z@O~
zu~Z^_)JU^vI$_57HN{3V=@dw$(uT=W>0}(T5o06;QiCxw!ou-H%3z^z*ceSST}M-T
zDjiCu^^s7_WKSkzX@jNA(PYd_53%k&J;8Q;v$pwuaKrT<{LoE>|E%$i^yzcofZ^+6
zN0ET!^;`Xq<JmqE*4l6!gOvO>Tr3%!)nLPE+#{pehSQpZc&iP^`9UdQ!*PyK+HJ#W
zEkRzN4HruhS2<|I?Q?a&hT|Nd6t&^@^=Z_G<D8~++=k=)mD72c7+cgIwyCeF&-v8$
zPv<5f@At8(mnYdUtPC|8tQWf~o*h;zm=BaKdUno9S4i~i*CoD0&z_U`5<PoX;!E`G
z*Cf6~&(2DGiJpCi__x?~*Ok*X(Dc57*GngjX6AcBSvn6*J9lc6zXqDjS5&{T^vtdK
zi}S9t=W79<sC7+_LrZK#9b@8rJz%Fl91qXD$ZFK3C7)V19#&Q6nwlK1S&cFqPoA$q
znHT?X=4-ycy+1Jb_HWczpPQbZc%$ayMU?+4$+uPAb=~*W#LQH;n-zX=?!#O2@BMbV
zyN)fe%LA@Rn=(26)xYp5%C)+!RULKB6CFOc(s|`{UF$2a)@ci`PSyX_we_cq*i3i0
z{5Ndse)qKt;n${LANEb3z6}0<G~IpA6-582=tB5Hd)?g&i*<Lo7wi1)MWt)Hv!wIZ
zynX|$-L<edSLFV*t!u6Tx_<iB{L(Myik|weuh1JH<h_q(y6e_1+*Uy6PSBaCue*2Q
z_B7Vi3i2O<m30fZePCs(zGJbi>(yzrbMgbE{<IUz-@8$_$-OxJ5+X|11jkO^1U>)4
zBKP=@LH=DI)C<(9qCc4{@CJ5(-a|h}U(mwEcdnd5{#3ntaoZ`Y2K@%=7JUos{~h8e
zcjr6ME{oIkb(<Czv4kx&-F@?CAAW*$qr}qN6WzO}r=UI6tx5;9Z|CIr_9yQ8<V*84
zur2Vp@9wBs2YJao9a~Cf0)@9XE%g3!-!C5hz;|eSAY56(uFPmpzx?z>$A*DNPyJ-N
zcY4}AdA`<tbKN%=-yaR8FQ;8&@5h3VUw*tcG&znV2UF>RRA|`P;oq3@KWJt~^l&_8
znCa9mS{wQeGZHh0S<C&KwU%vKv$nOIv)W+^MqF91K7e}`Tnl%9y0mm38ihpr5alcT
zm~ui<)|b0DhR?HVkb~)*`%FOW^YnQOeBJ{8V=eHm*mn&STf3EABB#9z<$h5k#Z9$D
ziyRgnp1dMXS}$nYqx_Db*9!gyiBEfwaS<>5%i>Z3McxuL?Kv*FEstnV(W+WBtw+a%
zUD}J_dV&caaE_GS3yFOP?Y;WM4O5&&dl7gr@^rAk5+Iytx=+%lJs8!$xMbZ=tI%H(
zw5X2F3wn*<JDmMrAfSGp$n;gQFaN*FDUMcn#715~yx88p!`}c=<30ZE+GeepIQZPK
z`p9bOt76=?l7N)s_;N9Picrru1uT1Jmj9y?t0xXS#j@1BP!jcXL8|{3wzvi7z~k^&
z#vg>Mo8cHLR&Yd?{T!5#{T%#VK_HYG&kiV;sAt3gRNVy-jWG8XK-p!GaI+pL6)Tlc
zZP{N6ec8?Lf{3fQzyP*70T<VgYdQgPZ{>K=C4dSn!yq+)0$w-9)rD~oz<&`dE>1#T
zavCnBd+@?bcmdWk{5l6$mr}d{`kvpyMQNxE0puwIOUk`g*+l$4tL#Ty<K@D)K@k5~
z(ceQ}=6MDsn=AhYE!@O%3on<yjAdQ%i<1wUk;;XNc_=IG3f=rc(8Q!%sQgFHS%ZFK
zs=UGJI`n=!(r3_Sdo$A0@b`X%{71b3DE}D#Rr8|TF&xLVD#n!GtHjn@fWNO;_)@JL
zc1^Kr<uTV&a6RHeTVSY)c?+wQRf<}%zG7pA57#KAN`aCG5ihJ6uB}Y1*x`A=v)$9<
zduW{tmIL)}=JD+Es4y<wn^+G9D>fxCSHu;CR0SxkvDwHf6)c-6RFoc{0)~oe!B}x6
z*hjM^tCjk72$vS{YCKL~9)$5&wwl#LR<5y!){&p}>(Gb5+Ver+RA|ZyoJ!bqXYb4f
zx9YW<N1)0B_qD1B8WlLj)CkD&%}gr5gPq>fldu4+Jr~4f@*MnC)`ab${98piTon*u
z*n^tZlp0G#jL}pRKXPIa^+PzX^&=PV)J4-#ZBbOE#LX1dRpNrHQc}#XR@u5DmvH2g
zB;sXU%Y|A{0vGDQyvlwT{g9nvF*BCd!sq}y3Vx_;HlG;y9!_OgQ#3JRG-U=eW;)Xp
zj>bmELdl4AH;w5;BA#lDnQ&9_I6q+<4u>rs9Ij=|qh{hsQyjSso0%rQGB(A`a6A(+
z7&GESpv-*%H&W?H#2C_|e7S<BNr{W*jrv2T6sYPdcs3~oN}+1<LIVJW2moCTInt#l
zSZK9mL9vP_Zc4!#kpsg5Dj`S7BIa^)X=vYqVvDdOYLQS+VslyyFo{BbOXwsg)^H(9
z0m4x<1x|w$b`5k&p;}b33i_rLy|8)(MlLipKEU8S=7a*V1FpE3=w4}!2v!6-&bYr`
z{QDEGnZmi!XUm?ei2NY<qu?9Cp9Fsz{8{krAj~jGxK?A5S08!gHPOJ!-=El%;V2w3
ziGgZ$t>|XxI!<!|!tij44-k0f`P=&ao3$;Q@zm7c-qK<{0{x96;gLkdi0>RRA|Z1O
z=yb+3b|(3`7*L^PIJz?l=diJn&`>0d$Y5+IKa=%04*MJTZuU3AsMrbhgU!Yv$XmC=
zh=DU)1IQ60Iczk-$ZHHIa0o(p2WT>p;gKB}OGi-(vPL7BG!sCW2{0H6A8i~>CelVY
zok#+hhB0jUiGwi~iZ>d^jWE-D_QK&C1c`bkWkhh|reop8q!CYqVe-Ti=CGe%@ad=P
zsH%sO$<UZ}V#iXkuNZoo8RoH3U=IP`!RD$NGZh;)jfmf}!O#0(&T(mG>%nE?O}07X
zunOTUgZ@cEU86~3SwVR7|Gi`SdfNYs-4jX<A7gL{^OmO5QfxiEd8>aSiOgW!$Y~O6
zD@TtZKnb6rm=t!HiZmzP>|^EdMT?z#C255{M#U~6rLYJU?Y18K47QHs+A{LlI+A0n
zK~&zGbz)F<nnb7$7i+#q<y~2|LsSe1NM&OuFA_n{DD046f96buMyB^?b|qL$;XM?8
zLfT<?P^paKEIUJmJtxImPP~9ooaMv|8O38xyolwCV^r9SQ~cwUFJTl%Iq_0P@rV=m
zWZzRd@iNvRc5F_(9Nw$tYljLpo)@oV6z4kacp1gFPP~dyT<gSFF^Y4XIBd%N`TVJ7
z6b?A$SF`8y%CE7DWy>mqJyxEiGTdh6CY6UK`EZKbojjFMbT8u=b>${&|K!A90n*KW
zwd6!`xyX;>d0{?z^uz^k0{__-hoMc}u_0a|&NC3hgaIYubk4y+xZw0t;FN&cnR@2{
z$8-Dl1mI|g&P{;i=?q*IILVa9$%}yJ^Z)7!_)7PCjoYtaFXb7x`Ru>J<#XrJO~COK
zRvxztTt0W)ek$bU`||RJ%AH?zfGhAOX53FL$qlgWK(2yzllNIa0NjsnZY230z`f8f
zmn8fEx0Cz6HOl3yv;An*%2-0+^87l<@!Wc6g?;&b<+lYczt8>N3U=NU^78x5cLA?*
zRkO3weSL&D>_*8?Iv4v_ZpV|ezb%C*1>c`~rSZQ(;PU(2TPT~SJzp30DUi}c!?l1N
zFV52j5U{0oVZT|bcR!b3o=2oIz~wz`P|U|6Va^bC0+O9O1l}j%#|1th;WGjsmGBD!
zAD8ey6ZlyP|32VVuH5nPrjWlR$;<oMa59}rXNHDgYa20=#xTC4PU>lVags2N6zrEG
z34J)87!1Yr2<)3vdMI<8g%cyAaU*R+v~A6;U(7FL-}}NVnB*86N`^)ZJ(3w283Pp?
zW#2_xqA4SJ%t(S$j(u;}zP3j?_0HZ7U1xgVzP;_89S8Px>U(;6A8zaJ)c3aq_jCfs
zX%6;$9fx|`9_eX!a(G|_5Nwh4&fU6Ydw0h^rg!hz8*JO7@9pa9@7%v^)wxaA^<aO$
z@Wp!L9|+jq%<B;Pq(fl7zoTt`n;z`!?&(FZb%~VT^*d}>UkW%N=ngO|HuwAs1DTyl
z=+TfF!R@azkP+V%WOvH^qXUOFePQ4Lb?W`m1Vk%F@^1bygCsJTN(rC%2MgAh4h|Xo
z&cOj#UpqJ;yq}Z<;a@&D5MAH@NV{lu>k|qGn`x=Bk#uMf@^sS5qg3MVk21}K5KwCi
z_B5tL!%TzVQj3OCQKm)4Oi;G+bkgF$AWX#)ri0Ld2jO5y8;z%#mNt&VHJRYutr<}<
zuA>o<B8q8_*o<k*aT?Q>LquM6Xe1Vf>JnfyW!Z$rWg5)55ttevVhm=6A*2kM!!SJs
z88e3xR1OUeCXHi6Va!ZrKI4dhR-qz9wzTa1w{zUr;1UVT4o|edr|;%!1x}fBb!PlK
zA~<@>>Qfv*-=+CUQRMWTA^3|>!1GM1pW=ma0rUw$l)(h2nLLpl{Ql_I@J@sDDXw@+
z02C<7`oau*01EgHhx94_XjLr<e9mJkgg+Lke%j%-1BRlcPjSj6;UK*y0ui3%_Insm
zI9|&7Pw~te;V>N-lmAo?<rtshJ0GGc?r9YYeqL*?{{n_@T5!L}SWo~I9~~6>^qvVx
zcv|J$Kc4O5Jz@J`qB!a*0n!cQeiIYrPe9qBFP?i>aZo`@(v4Xp_f-^m_9R?UpTsCG
zYY;E$0$ghOLj6a`NhsL$DSo5xBdbYJ<TUOG#upcMeTwtOMg8}YpvdL=&jXHaA%<Hv
z9?X6(Dd}Tfn8?nzpo}Mrq)+>1uXWs*l|vm&q(}M7fZ+#+q)+?wwVzS{HPFSbCVh%S
z>3i1e!eJT?R4?`aUxO}+kbZVwE(Fd1&z?x1@;8BL*QfpL8KF=0kPXr!`lnDpjOwSj
z?0KOm%TxQ4{yR`WteF6jlYW(ilRo7)fKO$+=v7hwxE+MDd_VJm<<oB#6<5>55O!qQ
z+bigI;ADriS5lBjhT)-%q28RBIA8cr>R+>h{`bX^LllkKlH4Cw{FmGQ4dQ5`g*sN)
zAYUohR;d4wIFjfmK}nxnLbh~^oOKl+tdO1;>)4%8-U5H}pPnD^t|2@2pqNd&>#X8?
Xl5xo$h~e_<*Ke})F%GsTiDdr{v#+mM

literal 0
HcmV?d00001

diff --git a/test/fed-nw-internet/overlay/root/test-client-1.sh b/test/fed-nw-internet/overlay/root/test-client-1.sh
new file mode 100755
index 00000000..cc0ee743
--- /dev/null
+++ b/test/fed-nw-internet/overlay/root/test-client-1.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+ip_read=`ip -f inet addr show eth0 | grep -Po 'inet \K[\d.]+'`
+if [ "$ip_read" = "172.16.0.5" ]; then
+	/root/client 172.16.0.4
+       	if [ "$?" -eq "0" ]; then
+		echo 'Success : ip + client'
+	else
+		echo 'Failed : client'
+	fi
+else
+	echo 'Failed : ip'
+fi
diff --git a/test/fed-nw-internet/overlay/root/test-client-2-copy.sh b/test/fed-nw-internet/overlay/root/test-client-2-copy.sh
new file mode 100755
index 00000000..7ae0b4c1
--- /dev/null
+++ b/test/fed-nw-internet/overlay/root/test-client-2-copy.sh
@@ -0,0 +1,15 @@
+#/bin/bash
+ip_read=`ip -f inet addr show`
+str="read ip"
+echo $str
+echo $ip_read
+if [ "$ip_read" = "172.16.0.6" ]; then
+	/root/client 172.16.0.4
+       	if [ "$?" -eq "0" ]; then
+		echo 'Success : ip + client'
+	else
+		echo 'Failed : client'
+	fi
+else
+	echo 'Failed : ip'
+fi
diff --git a/test/fed-nw-internet/overlay/root/test-client-2.sh b/test/fed-nw-internet/overlay/root/test-client-2.sh
new file mode 100755
index 00000000..d3aa7b63
--- /dev/null
+++ b/test/fed-nw-internet/overlay/root/test-client-2.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+ip_read=`ip -f inet addr show eth0 | grep -Po 'inet \K[\d.]+'`
+if [ "$ip_read" = "172.16.0.6" ]; then
+	/root/client 172.16.0.4
+       	if [ "$?" -eq "0" ]; then
+		echo 'Success : ip + client'
+	else
+		echo 'Failed : client'
+	fi
+else
+	echo 'Failed : ip'
+fi
diff --git a/test/fed-nw-internet/overlay/root/test-server.sh b/test/fed-nw-internet/overlay/root/test-server.sh
new file mode 100755
index 00000000..5536978d
--- /dev/null
+++ b/test/fed-nw-internet/overlay/root/test-server.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+ip_read=`ip -f inet addr show eth0 | grep -Po 'inet \K[\d.]+'`
+if [ "$ip_read" = "172.16.0.4" ]; then
+	/root/server 2
+       	if [ "$?" -eq "0" ]; then
+		echo 'Success : ip + server'
+	else
+		echo 'Failed : server'
+	fi
+else
+	echo 'Failed : ip'
+fi
diff --git a/test/fed-nw-internet/refOutput/fed-nw-internet-j0/uartlog b/test/fed-nw-internet/refOutput/fed-nw-internet-j0/uartlog
new file mode 100644
index 00000000..72365904
--- /dev/null
+++ b/test/fed-nw-internet/refOutput/fed-nw-internet-j0/uartlog
@@ -0,0 +1 @@
+Success : ip + server
diff --git a/test/fed-nw-internet/refOutput/fed-nw-internet-j1/uartlog b/test/fed-nw-internet/refOutput/fed-nw-internet-j1/uartlog
new file mode 100644
index 00000000..556bfc7e
--- /dev/null
+++ b/test/fed-nw-internet/refOutput/fed-nw-internet-j1/uartlog
@@ -0,0 +1 @@
+Success : ip + client
diff --git a/test/fed-nw-internet/refOutput/fed-nw-internet-j2/uartlog b/test/fed-nw-internet/refOutput/fed-nw-internet-j2/uartlog
new file mode 100644
index 00000000..556bfc7e
--- /dev/null
+++ b/test/fed-nw-internet/refOutput/fed-nw-internet-j2/uartlog
@@ -0,0 +1 @@
+Success : ip + client
diff --git a/test/fed-nw-internet/refOutput/fed-nw-internet-j3/uartlog b/test/fed-nw-internet/refOutput/fed-nw-internet-j3/uartlog
new file mode 100644
index 00000000..dfe27559
--- /dev/null
+++ b/test/fed-nw-internet/refOutput/fed-nw-internet-j3/uartlog
@@ -0,0 +1 @@
+Success : yum + wget
diff --git a/test/internet.yaml b/test/internet.yaml
index 94ee6af2..7b36740b 100644
--- a/test/internet.yaml
+++ b/test/internet.yaml
@@ -1,7 +1,7 @@
 {
   "name" : "internet",
   "base" : "br-base.json",
-  "command" : "wget -S fires.im",
+  "command" : 'wget -S fires.im && echo "Success : wget"',
   "testing" : {
     "refDir" : "refOutput",
     "strip" : true
diff --git a/test/internet/refOutput/internet/uartlog b/test/internet/refOutput/internet/uartlog
index 12f5268f..8ed09fc2 100644
--- a/test/internet/refOutput/internet/uartlog
+++ b/test/internet/refOutput/internet/uartlog
@@ -1 +1 @@
-  Location: https://fires.im/
+Success : wget
diff --git a/test/network.yaml b/test/network.yaml
index a77a9652..6e3c1483 100644
--- a/test/network.yaml
+++ b/test/network.yaml
@@ -8,16 +8,16 @@
   },
   "jobs" : [
     {
-      "name" : "j0",
-      "command" : "/root/server 172.16.0.4 2",
+      "name" : "j0",      
+      "command" : "timeout 75 /root/test-server.sh"
     },
     {
-      "name" : "j1",
-      "command" : "sleep 3; /root/client 172.16.0.4"
+      "name" : "j1", 
+      "command" : "/root/test-client-1.sh"
     },
     {
       "name" : "j2",
-      "command" : "sleep 5; /root/client 172.16.0.4"
+      "command" : "/root/test-client-2.sh"
     }
   ]
 }
diff --git a/test/network/overlay/root/client b/test/network/overlay/root/client
index 2bcc067d6d15e0775a98ca664436db708e2b7642..7879b641f2bf7efb1a5e789b5e4564965ea8da70 100755
GIT binary patch
delta 3971
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
NNMD&S2Xnr{{{km3-n#$*

delta 3434
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

diff --git a/test/network/overlay/root/server b/test/network/overlay/root/server
index 57bb40c3d5ea0b39404ce3558cdd77cd6d4da0b2..dbb04396d1327291e0f2e3d52a4b83c39a6c2ed9 100755
GIT binary patch
delta 3472
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
E0xeca!vFvP

delta 4359
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

diff --git a/test/network/overlay/root/test-client-1.sh b/test/network/overlay/root/test-client-1.sh
new file mode 100755
index 00000000..af9a006e
--- /dev/null
+++ b/test/network/overlay/root/test-client-1.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+ip_read=`ifconfig eth0 | grep "inet " | awk -F'[: ]+' '{ print $4 }'`
+if [ "$ip_read" = "172.16.0.5" ]; then
+	/root/client 172.16.0.4
+       	if [ "$?" -eq "0" ]; then
+		echo 'Success : ip + client'
+	else
+		echo 'Failed : client'
+	fi
+else
+	echo 'Failed : ip'
+fi
diff --git a/test/network/overlay/root/test-client-2.sh b/test/network/overlay/root/test-client-2.sh
new file mode 100755
index 00000000..c1fceb35
--- /dev/null
+++ b/test/network/overlay/root/test-client-2.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+ip_read=`ifconfig eth0 | grep "inet " | awk -F'[: ]+' '{ print $4 }'`
+if [ "$ip_read" = "172.16.0.6" ]; then
+	/root/client 172.16.0.4
+       	if [ "$?" -eq "0" ]; then
+		echo 'Success : ip + client'
+	else
+		echo 'Failed : client'
+	fi
+else
+	echo 'Failed : ip'
+fi
diff --git a/test/network/overlay/root/test-server.sh b/test/network/overlay/root/test-server.sh
new file mode 100755
index 00000000..59061359
--- /dev/null
+++ b/test/network/overlay/root/test-server.sh
@@ -0,0 +1,12 @@
+#/bin/bash
+ip_read=`ifconfig eth0 | grep "inet " | awk -F'[: ]+' '{ print $4 }'`
+if [ "$ip_read" = "172.16.0.4" ]; then
+	/root/server 2
+       	if [ "$?" -eq "0" ]; then
+		echo 'Success : ip + server'
+	else
+		echo 'Failed : server'
+	fi
+else
+	echo 'Failed : ip'
+fi
diff --git a/test/network/refOutput/network-j0/uartlog b/test/network/refOutput/network-j0/uartlog
index 337b59db..72365904 100644
--- a/test/network/refOutput/network-j0/uartlog
+++ b/test/network/refOutput/network-j0/uartlog
@@ -1,4 +1 @@
-Success : 1 : 172.16.0.5
-Success : 2 : 172.16.0.6
-
-Final Success
+Success : ip + server
diff --git a/test/network/refOutput/network-j1/uartlog b/test/network/refOutput/network-j1/uartlog
index d6d30664..556bfc7e 100644
--- a/test/network/refOutput/network-j1/uartlog
+++ b/test/network/refOutput/network-j1/uartlog
@@ -1 +1 @@
-Success : 172.16.0.4
+Success : ip + client
diff --git a/test/network/refOutput/network-j2/uartlog b/test/network/refOutput/network-j2/uartlog
index d6d30664..556bfc7e 100644
--- a/test/network/refOutput/network-j2/uartlog
+++ b/test/network/refOutput/network-j2/uartlog
@@ -1 +1 @@
-Success : 172.16.0.4
+Success : ip + client
diff --git a/test/post-bin/create-file.sh b/test/post-bin/create-file.sh
index 4e4dc151..6b69b6fb 100755
--- a/test/post-bin/create-file.sh
+++ b/test/post-bin/create-file.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-echo "From create-file.sh script:" >> ${1}.txt
-echo $@ >> ${1}.txt
+echo "From create-file.sh script: $@" >> ${1}.txt
diff --git a/test/post-bin/refOutputBase/post-bin/uartlog b/test/post-bin/refOutputBase/post-bin/uartlog
index 3e9f7802..abe3014d 100644
--- a/test/post-bin/refOutputBase/post-bin/uartlog
+++ b/test/post-bin/refOutputBase/post-bin/uartlog
@@ -1,2 +1 @@
-From create-file.sh script:
-base
+From create-file.sh script: base
diff --git a/test/post-bin/refOutputJobs/post-bin-jobs-j0/uartlog b/test/post-bin/refOutputJobs/post-bin-jobs-j0/uartlog
index 8f51dc10..bf0a8bb9 100644
--- a/test/post-bin/refOutputJobs/post-bin-jobs-j0/uartlog
+++ b/test/post-bin/refOutputJobs/post-bin-jobs-j0/uartlog
@@ -1,2 +1 @@
-From create-file.sh script:
-job0
+From create-file.sh script: job0
diff --git a/test/post-bin/refOutputJobs/post-bin-jobs-j1/uartlog b/test/post-bin/refOutputJobs/post-bin-jobs-j1/uartlog
index 4e12e956..c070dac9 100644
--- a/test/post-bin/refOutputJobs/post-bin-jobs-j1/uartlog
+++ b/test/post-bin/refOutputJobs/post-bin-jobs-j1/uartlog
@@ -1,2 +1 @@
-From create-file.sh script:
-job1
+From create-file.sh script: job1
diff --git a/wlutil/build.py b/wlutil/build.py
index df23724b..5b3ff0a0 100644
--- a/wlutil/build.py
+++ b/wlutil/build.py
@@ -580,7 +580,7 @@ def makeImage(config):
         init_overlay = config['builder'].generateBootScriptOverlay(
             str(config['guest-init'].path), config['guest-init'].args)
         wlutil.applyOverlay(config['img'], init_overlay)
-        wlutil.run(wllaunch.getQemuCmd(config), shell=True, level=logging.DEBUG)
+        wllaunch.launchWorkload(config, jobs=None, spike=False, silent=True, captureOutput=False)
 
         # Clear the init script
         run_overlay = config['builder'].generateBootScriptOverlay(None, None)
diff --git a/wlutil/launch.py b/wlutil/launch.py
index 54d8e9c3..915e32e7 100644
--- a/wlutil/launch.py
+++ b/wlutil/launch.py
@@ -72,7 +72,7 @@ def getSpikeCmd(config, nodisk=False):
 
 
 # Returns a command string to luanch the given config in qemu. Must be called with shell=True.
-def getQemuCmd(config, count, nodisk=False):
+def getQemuCmd(config, count=1, nodisk=False):
     # launch_port = get_free_tcp_port()
 
     if nodisk:
@@ -113,7 +113,7 @@ def getQemuCmd(config, count, nodisk=False):
     return " ".join(cmd) + " " + config.get('qemu-args', '')
 
 
-def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
+def launchWorkload(baseConfig, jobs=None, spike=False, silent=False, captureOutput=True):
     """Launches the specified workload in functional simulation.
 
     cfgName: unique name of the workload in the cfgs
@@ -154,10 +154,6 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
                 
                 count += 1
 
-                runResDir = baseResDir / config['name']
-                uartLog = runResDir / "uartlog"
-                os.makedirs(runResDir)
-
                 if spike:
                     cmd = getSpikeCmd(config, config['nodisk'])
                 else:
@@ -165,10 +161,17 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
 
                 log.info(f"\nLaunching job {config['name']}")
                 log.info(f'Running: {cmd}')
-                if silent:
-                    log.info("For live output see: " + str(uartLog))
 
-                scriptCmd = f'script -f -c "{cmd}" {uartLog}'
+                if captureOutput:
+                    runResDir = baseResDir / config['name']
+                    uartLog = runResDir / "uartlog"
+                    os.makedirs(runResDir)
+                    scriptCmd = f'script -f -c "{cmd}" {uartLog}'
+                else:
+                    scriptCmd = cmd
+
+                if silent and captureOutput:
+                    log.info("For live output see: " + str(uartLog))
 
                 if not silent and len(configs) == 1:
                     jobProcs.append(sp.Popen(["screen", "-S", config['name'], "-m", "bash", "-c", scriptCmd], stderr=sp.STDOUT))
@@ -196,11 +199,12 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False):
         cleanUpVDE()
 
     for config in configs:
-        if 'outputs' in config:
+        if 'outputs' in config and captureOutput:
+            runResDir = baseResDir / config['name']
             outputSpec = [wlutil.FileSpec(src=f, dst=runResDir) for f in config['outputs']]
             wlutil.copyImgFiles(config['img'], outputSpec, direction='out')
 
-    if 'post_run_hook' in baseConfig:
+    if 'post_run_hook' in baseConfig and captureOutput:
         prhCmd = [baseConfig['post_run_hook'].path] + baseConfig['post_run_hook'].args + [baseResDir]
         log.info("Running post_run_hook script: " + ' '.join([str(x) for x in prhCmd]))
         try:

From 3eeec62f45499a4a4dcd27af3923da5dd35ab958 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Fri, 25 Mar 2022 23:54:40 +0000
Subject: [PATCH 06/16] VDE Integration with vdeplug4 complete

---
 wlutil/launch.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wlutil/launch.py b/wlutil/launch.py
index 915e32e7..176e7342 100644
--- a/wlutil/launch.py
+++ b/wlutil/launch.py
@@ -25,7 +25,7 @@ def startVDE():
     log = logging.getLogger()
     global vdeProc
     log.info('Starting VDE')
-    vdeProc = sp.Popen(["vde_plug", "switch:///tmp/mysw", "cmd://slirpvde - --host=172.16.0.2/16 --dns=172.16.0.3"], stderr=sp.STDOUT)
+    vdeProc = sp.Popen(["vde_plug", "vxvde://", "slirp:///host=172.16.0.2"], stderr=sp.STDOUT)
 
 
 # Terminate vdeProc unless it has stopped running already
@@ -104,7 +104,7 @@ def getQemuCmd(config, count=1, nodisk=False):
            '-device', 'virtio-rng-device,rng=rng0',
            '-device', f'virtio-net-device,netdev=vde0,mac=00:12:6d:00:{machigh}:{maclow}',
            #'-netdev', 'user,id=usernet,hostfwd=tcp::' + launch_port + '-:22']
-           '-netdev', 'vde,id=vde0,sock=vde:///tmp/mysw']
+           '-netdev', 'vde,id=vde0,sock=vxvde://']
 
     if 'img' in config and not nodisk:
         cmd = cmd + ['-device', 'virtio-blk-device,drive=hd0',

From 1233cd9f069ea383837d2b30fa126e1896cfbfb0 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Fri, 8 Apr 2022 20:36:22 +0000
Subject: [PATCH 07/16] PR changes

---
 .../br-base/overlay/etc/init.d/S40network     |   9 +-
 .../br-base/overlay/etc/network/interfaces    |   6 +-
 .../overlay/etc/firesim/ifcfg-static          |   2 +-
 .../overlay/etc/firesim/network-static        |   2 +-
 .../etc/firesim/start-firesim-network.sh      |   2 +-
 test/fed-nw-internet.yaml                     |   1 +
 test/fed-nw-internet/client.c                 |  91 ++++++++++++++++++
 test/fed-nw-internet/host-init.sh             |   3 +
 test/fed-nw-internet/overlay/root/client      | Bin 12456 -> 0 bytes
 test/fed-nw-internet/overlay/root/server      | Bin 12192 -> 0 bytes
 .../overlay/root/test-client-1.sh             |   6 +-
 .../overlay/root/test-client-2-copy.sh        |  15 ---
 .../overlay/root/test-client-2.sh             |   6 +-
 .../overlay/root/test-server.sh               |   4 +-
 test/fed-nw-internet/server.c                 |  56 +++++++++++
 test/network.yaml                             |   3 +-
 test/network/client.c                         |  91 ++++++++++++++++++
 test/network/host-init.sh                     |   3 +
 test/network/overlay/root/client              | Bin 12456 -> 0 bytes
 test/network/overlay/root/server              | Bin 12192 -> 0 bytes
 test/network/overlay/root/test-client-1.sh    |   6 +-
 test/network/overlay/root/test-client-2.sh    |   6 +-
 test/network/overlay/root/test-server.sh      |   4 +-
 test/network/server.c                         |  56 +++++++++++
 wlutil/launch.py                              |  16 +--
 25 files changed, 346 insertions(+), 42 deletions(-)
 create mode 100644 test/fed-nw-internet/client.c
 create mode 100755 test/fed-nw-internet/host-init.sh
 delete mode 100755 test/fed-nw-internet/overlay/root/client
 delete mode 100755 test/fed-nw-internet/overlay/root/server
 delete mode 100755 test/fed-nw-internet/overlay/root/test-client-2-copy.sh
 create mode 100644 test/fed-nw-internet/server.c
 create mode 100644 test/network/client.c
 create mode 100755 test/network/host-init.sh
 delete mode 100755 test/network/overlay/root/client
 delete mode 100755 test/network/overlay/root/server
 create mode 100644 test/network/server.c

diff --git a/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network b/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network
index 20563e7f..7df73fc0 100755
--- a/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network
+++ b/boards/firechip/base-workloads/br-base/overlay/etc/init.d/S40network
@@ -5,24 +5,29 @@
 # Debian ifupdown needs the /run/network lock directory
 mkdir -p /run/network
 
+# Write DNS to /etc/resolv.conf
 resolvconf_file="/etc/resolv.conf"
 rm -f $resolvconf_file
-echo "nameserver 172.16.0.3" > $resolvconf_file
+echo "nameserver 172.16.1.3" > $resolvconf_file
 
+# mac address of NIC at eth0 decides ip address we'd like to use
 ifname=eth0
 read _ addr _ _ <<< $(/sbin/ip link | /bin/grep -A 1 "$ifname" | /usr/bin/tail -1)
+# Extract the bottom 2 bytes of mac addr
 IFS=: read -r _ _ _ _ machigh maclow <<< $addr
 
 case "$1" in
 	start)
 		printf "Starting network: "
-        /bin/sed -i -e "1,/^address/{s/^address.*/address 172.16.$((16#$machigh)).$((16#$maclow))/;}" /etc/network/interfaces
+	# Use sed to substitute target address 172.16.machigh.maclow for the first interface (eth0) in /etc/network/interfaces
+	/bin/sed -i -e "1,/^address/{s/^address.*/address 172.16.$((16#$machigh)).$((16#$maclow))/;}" /etc/network/interfaces
         sbin/ifup -a
         [ $? = 0 ] && echo "OK" || echo "FAIL"
         ;;
     stop)
         printf "Stopping network: "
         /sbin/ifdown -a
+	# Not functionalyl necessary, substitute "firemarshal_ip_addr_uninitialized" for eth0 in /etc/network/interfaces to make the file understandable for users
         /bin/sed -i -e "1,/^address/{s/^address.*/address firemarshal_ip_addr_uninitialized/;}" /etc/network/interfaces
         [ $? = 0 ] && echo "OK" || echo "FAIL"
         ;;
diff --git a/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces b/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces
index 2cc53a88..26ecc2ed 100644
--- a/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces
+++ b/boards/firechip/base-workloads/br-base/overlay/etc/network/interfaces
@@ -1,4 +1,4 @@
-
+# marshal requires eth0 to be the first interface in this file, please add other interfaces below it
 auto lo
 iface lo inet loopback
 
@@ -6,5 +6,5 @@ auto eth0
 iface eth0 inet static
 address firemarshal_ip_addr_uninitialized
 netmask 255.255.0.0
-gateway 172.16.0.2
-dns-nameservers 172.16.0.3
+gateway 172.16.0.1
+dns-nameservers 172.16.1.3
diff --git a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static
index 3692b9c9..831d7b26 100644
--- a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static
+++ b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/ifcfg-static
@@ -3,4 +3,4 @@ BOOTPROTO=static
 ONBOOT=on
 PREFIX=16
 PEERDNS=yes
-DNS1=172.16.0.3
+DNS1=172.16.1.3
diff --git a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static
index 6860e95b..46ef1742 100644
--- a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static
+++ b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/network-static
@@ -1,3 +1,3 @@
 NETWORKING=yes
 NETWORKING_IPV6=no
-GATEWAY=172.16.0.2
+GATEWAY=172.16.0.1
diff --git a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh
index d6a5ba47..5c4151c6 100755
--- a/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh
+++ b/boards/firechip/base-workloads/fedora-base/overlay/etc/firesim/start-firesim-network.sh
@@ -12,7 +12,7 @@ case "$macpref" in
                 maclow=$(echo $mac | cut -c 16-17 -)
                 cp /etc/firesim/ifcfg-static /etc/sysconfig/network-scripts/ifcfg-eth0
                 echo IPADDR=172.16.$((16#$machigh)).$((16#$maclow)) >> /etc/sysconfig/network-scripts/ifcfg-eth0
-                echo default via 172.16.0.2 dev eth0 > /etc/sysconfig/network-scripts/route-eth0
+                echo default via 172.16.0.1 dev eth0 > /etc/sysconfig/network-scripts/route-eth0
                 cp /etc/firesim/network-static /etc/sysconfig/network
                 ;;
         "52:54:00")
diff --git a/test/fed-nw-internet.yaml b/test/fed-nw-internet.yaml
index 7acc0a6f..e0597782 100644
--- a/test/fed-nw-internet.yaml
+++ b/test/fed-nw-internet.yaml
@@ -1,6 +1,7 @@
 {
   "name" : "fed-nw-internet",
   "base" : "fedora-base.json",
+  "host-init" : "host-init.sh",
   "overlay": "overlay",
   "testing" : {
     "refDir" : "refOutput",
diff --git a/test/fed-nw-internet/client.c b/test/fed-nw-internet/client.c
new file mode 100644
index 00000000..c8e8267b
--- /dev/null
+++ b/test/fed-nw-internet/client.c
@@ -0,0 +1,91 @@
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <time.h>
+
+
+int main(int argc, char *argv[])
+{
+    int sockfd = 0, res = 0, n = 0;
+    char recvBuff[1024];
+    struct sockaddr_in serv_addr; 
+    fd_set myset; 
+    struct timeval tv; 
+    int valopt; 
+    socklen_t lon; 
+
+    if(argc != 2)
+    {
+        printf("\nUsage: %s <ip of server>\n",argv[0]);
+        return 1;
+    } 
+
+    memset(&serv_addr, '0', sizeof(serv_addr)); 
+
+    serv_addr.sin_family = AF_INET;
+    serv_addr.sin_port = htons(5000); 
+
+    if(inet_pton(AF_INET, argv[1], &serv_addr.sin_addr)<=0)
+    {
+        printf("\nError : inet_pton error occured\n");
+        return 1;
+    } 
+
+    memset(recvBuff, '0',sizeof(recvBuff));
+
+    if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    {
+        printf("\nError : Could not create socket (%d %s) \n", errno, strerror(errno));
+        return 1;
+    } 
+
+    
+    int t = 0;
+    while(1){
+			
+			if(t >= 30)	
+			{
+				printf("\nError : Could not connect to server (%d %s) \n", errno, strerror(errno));
+				return 1;
+			}
+			if(connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) >= 0) {
+					break;
+			}
+			sleep(1);
+			
+			t += 1;	
+	}
+
+
+    while ((n = read(sockfd, recvBuff, sizeof(recvBuff)-1)) > 0)
+    {
+        recvBuff[n] = 0;
+        if(fputs(recvBuff, stdout) == EOF)
+        {
+            printf("\nError : Fputs error\n");
+        }
+    } 
+
+    if(n < 0)
+    {
+        printf("\nError : Read error\n");
+    } else {
+        if (strncmp(recvBuff,argv[1],strlen(argv[1])) == 0) {
+            printf("\nSuccess : %s\n", argv[1]);
+        } else {
+			printf("\n Error : Expected : %s Received : %s\n", argv[1], recvBuff);
+		}
+    }
+
+    close(sockfd);
+
+    return 0;
+}
diff --git a/test/fed-nw-internet/host-init.sh b/test/fed-nw-internet/host-init.sh
new file mode 100755
index 00000000..614384fa
--- /dev/null
+++ b/test/fed-nw-internet/host-init.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+riscv64-unknown-linux-gnu-gcc client.c -o overlay/root/client
+riscv64-unknown-linux-gnu-gcc server.c -o overlay/root/server
diff --git a/test/fed-nw-internet/overlay/root/client b/test/fed-nw-internet/overlay/root/client
deleted file mode 100755
index 7879b641f2bf7efb1a5e789b5e4564965ea8da70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12456
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
S&r@9fXNw&94xfN8EB+grEtMSr

diff --git a/test/fed-nw-internet/overlay/root/server b/test/fed-nw-internet/overlay/root/server
deleted file mode 100755
index dbb04396d1327291e0f2e3d52a4b83c39a6c2ed9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12192
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
Xl5xo$h~e_<*Ke})F%GsTiDdr{v#+mM

diff --git a/test/fed-nw-internet/overlay/root/test-client-1.sh b/test/fed-nw-internet/overlay/root/test-client-1.sh
index cc0ee743..dfce50ff 100755
--- a/test/fed-nw-internet/overlay/root/test-client-1.sh
+++ b/test/fed-nw-internet/overlay/root/test-client-1.sh
@@ -1,7 +1,7 @@
 #/bin/bash
 ip_read=`ip -f inet addr show eth0 | grep -Po 'inet \K[\d.]+'`
-if [ "$ip_read" = "172.16.0.5" ]; then
-	/root/client 172.16.0.4
+if [ "$ip_read" = "172.16.0.3" ]; then
+	/root/client 172.16.0.2
        	if [ "$?" -eq "0" ]; then
 		echo 'Success : ip + client'
 	else
@@ -9,4 +9,6 @@ if [ "$ip_read" = "172.16.0.5" ]; then
 	fi
 else
 	echo 'Failed : ip'
+	echo 'Expected : 172.16.0.3'                                                                                                                                                                                                        
+	echo 'Received : $ip_read'
 fi
diff --git a/test/fed-nw-internet/overlay/root/test-client-2-copy.sh b/test/fed-nw-internet/overlay/root/test-client-2-copy.sh
deleted file mode 100755
index 7ae0b4c1..00000000
--- a/test/fed-nw-internet/overlay/root/test-client-2-copy.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#/bin/bash
-ip_read=`ip -f inet addr show`
-str="read ip"
-echo $str
-echo $ip_read
-if [ "$ip_read" = "172.16.0.6" ]; then
-	/root/client 172.16.0.4
-       	if [ "$?" -eq "0" ]; then
-		echo 'Success : ip + client'
-	else
-		echo 'Failed : client'
-	fi
-else
-	echo 'Failed : ip'
-fi
diff --git a/test/fed-nw-internet/overlay/root/test-client-2.sh b/test/fed-nw-internet/overlay/root/test-client-2.sh
index d3aa7b63..50e63c06 100755
--- a/test/fed-nw-internet/overlay/root/test-client-2.sh
+++ b/test/fed-nw-internet/overlay/root/test-client-2.sh
@@ -1,7 +1,7 @@
 #/bin/bash
 ip_read=`ip -f inet addr show eth0 | grep -Po 'inet \K[\d.]+'`
-if [ "$ip_read" = "172.16.0.6" ]; then
-	/root/client 172.16.0.4
+if [ "$ip_read" = "172.16.0.4" ]; then
+	/root/client 172.16.0.2
        	if [ "$?" -eq "0" ]; then
 		echo 'Success : ip + client'
 	else
@@ -9,4 +9,6 @@ if [ "$ip_read" = "172.16.0.6" ]; then
 	fi
 else
 	echo 'Failed : ip'
+	echo 'Expected : 172.16.0.4'                                                                                                                                                                                                        
+	echo 'Received : $ip_read'
 fi
diff --git a/test/fed-nw-internet/overlay/root/test-server.sh b/test/fed-nw-internet/overlay/root/test-server.sh
index 5536978d..52b97bce 100755
--- a/test/fed-nw-internet/overlay/root/test-server.sh
+++ b/test/fed-nw-internet/overlay/root/test-server.sh
@@ -1,6 +1,6 @@
 #/bin/bash
 ip_read=`ip -f inet addr show eth0 | grep -Po 'inet \K[\d.]+'`
-if [ "$ip_read" = "172.16.0.4" ]; then
+if [ "$ip_read" = "172.16.0.2" ]; then
 	/root/server 2
        	if [ "$?" -eq "0" ]; then
 		echo 'Success : ip + server'
@@ -9,4 +9,6 @@ if [ "$ip_read" = "172.16.0.4" ]; then
 	fi
 else
 	echo 'Failed : ip'
+	echo 'Expected : 172.16.0.2'                                                                                                                                                                                                       
+	echo 'Received : $ip_read'
 fi
diff --git a/test/fed-nw-internet/server.c b/test/fed-nw-internet/server.c
new file mode 100644
index 00000000..50f55833
--- /dev/null
+++ b/test/fed-nw-internet/server.c
@@ -0,0 +1,56 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h> 
+#include <fcntl.h>
+
+int main(int argc, char *argv[])
+{
+    if(argc != 2)
+    {
+        printf("\nUsage: %s <num_clients>\n",argv[0]);
+        return 1;
+    } 
+
+    int num_clients = *(int *)(argv[1]);
+    
+    int listenfd = 0, connfd = 0;
+    struct sockaddr_in serv_addr; 
+
+    char sendBuff[1025];
+    time_t ticks; 
+
+    listenfd = socket(AF_INET, SOCK_STREAM, 0);
+    memset(&serv_addr, '0', sizeof(serv_addr));
+    memset(sendBuff, '0', sizeof(sendBuff)); 
+
+    serv_addr.sin_family = AF_INET;
+    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+    serv_addr.sin_port = htons(5000); 
+
+    bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)); 
+
+    listen(listenfd, 10);
+
+    for (int i = 0; i < 2; i += 1) {
+        
+        connfd = accept(listenfd, (struct sockaddr*)NULL, NULL); 
+	
+	printf("Sending\n");
+        snprintf(sendBuff, sizeof(sendBuff), "172.16.0.2\r\n");
+        write(connfd, sendBuff, strlen(sendBuff));
+       	printf("Closing\n");	
+        close(connfd);
+    } 
+
+    close(listenfd);
+
+    return 0;
+
+}
diff --git a/test/network.yaml b/test/network.yaml
index 6e3c1483..862f5823 100644
--- a/test/network.yaml
+++ b/test/network.yaml
@@ -1,7 +1,8 @@
 {
   "name" : "network",
   "base" : "br-base.json",
-  "overlay": "overlay",
+  "overlay" : "overlay",
+  "host-init" : "host-init.sh",
   "testing" : {
     "refDir" : "refOutput",
     "strip" : true
diff --git a/test/network/client.c b/test/network/client.c
new file mode 100644
index 00000000..c8e8267b
--- /dev/null
+++ b/test/network/client.c
@@ -0,0 +1,91 @@
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <time.h>
+
+
+int main(int argc, char *argv[])
+{
+    int sockfd = 0, res = 0, n = 0;
+    char recvBuff[1024];
+    struct sockaddr_in serv_addr; 
+    fd_set myset; 
+    struct timeval tv; 
+    int valopt; 
+    socklen_t lon; 
+
+    if(argc != 2)
+    {
+        printf("\nUsage: %s <ip of server>\n",argv[0]);
+        return 1;
+    } 
+
+    memset(&serv_addr, '0', sizeof(serv_addr)); 
+
+    serv_addr.sin_family = AF_INET;
+    serv_addr.sin_port = htons(5000); 
+
+    if(inet_pton(AF_INET, argv[1], &serv_addr.sin_addr)<=0)
+    {
+        printf("\nError : inet_pton error occured\n");
+        return 1;
+    } 
+
+    memset(recvBuff, '0',sizeof(recvBuff));
+
+    if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    {
+        printf("\nError : Could not create socket (%d %s) \n", errno, strerror(errno));
+        return 1;
+    } 
+
+    
+    int t = 0;
+    while(1){
+			
+			if(t >= 30)	
+			{
+				printf("\nError : Could not connect to server (%d %s) \n", errno, strerror(errno));
+				return 1;
+			}
+			if(connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) >= 0) {
+					break;
+			}
+			sleep(1);
+			
+			t += 1;	
+	}
+
+
+    while ((n = read(sockfd, recvBuff, sizeof(recvBuff)-1)) > 0)
+    {
+        recvBuff[n] = 0;
+        if(fputs(recvBuff, stdout) == EOF)
+        {
+            printf("\nError : Fputs error\n");
+        }
+    } 
+
+    if(n < 0)
+    {
+        printf("\nError : Read error\n");
+    } else {
+        if (strncmp(recvBuff,argv[1],strlen(argv[1])) == 0) {
+            printf("\nSuccess : %s\n", argv[1]);
+        } else {
+			printf("\n Error : Expected : %s Received : %s\n", argv[1], recvBuff);
+		}
+    }
+
+    close(sockfd);
+
+    return 0;
+}
diff --git a/test/network/host-init.sh b/test/network/host-init.sh
new file mode 100755
index 00000000..614384fa
--- /dev/null
+++ b/test/network/host-init.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+riscv64-unknown-linux-gnu-gcc client.c -o overlay/root/client
+riscv64-unknown-linux-gnu-gcc server.c -o overlay/root/server
diff --git a/test/network/overlay/root/client b/test/network/overlay/root/client
deleted file mode 100755
index 7879b641f2bf7efb1a5e789b5e4564965ea8da70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12456
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
S&r@9fXNw&94xfN8EB+grEtMSr

diff --git a/test/network/overlay/root/server b/test/network/overlay/root/server
deleted file mode 100755
index dbb04396d1327291e0f2e3d52a4b83c39a6c2ed9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12192
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
Xl5xo$h~e_<*Ke})F%GsTiDdr{v#+mM

diff --git a/test/network/overlay/root/test-client-1.sh b/test/network/overlay/root/test-client-1.sh
index af9a006e..6005974f 100755
--- a/test/network/overlay/root/test-client-1.sh
+++ b/test/network/overlay/root/test-client-1.sh
@@ -1,7 +1,7 @@
 #/bin/bash
 ip_read=`ifconfig eth0 | grep "inet " | awk -F'[: ]+' '{ print $4 }'`
-if [ "$ip_read" = "172.16.0.5" ]; then
-	/root/client 172.16.0.4
+if [ "$ip_read" = "172.16.0.3" ]; then
+	/root/client 172.16.0.2
        	if [ "$?" -eq "0" ]; then
 		echo 'Success : ip + client'
 	else
@@ -9,4 +9,6 @@ if [ "$ip_read" = "172.16.0.5" ]; then
 	fi
 else
 	echo 'Failed : ip'
+	echo 'Expected : 172.16.0.3'
+	echo 'Received : $ip_read'
 fi
diff --git a/test/network/overlay/root/test-client-2.sh b/test/network/overlay/root/test-client-2.sh
index c1fceb35..9a72c060 100755
--- a/test/network/overlay/root/test-client-2.sh
+++ b/test/network/overlay/root/test-client-2.sh
@@ -1,7 +1,7 @@
 #/bin/bash
 ip_read=`ifconfig eth0 | grep "inet " | awk -F'[: ]+' '{ print $4 }'`
-if [ "$ip_read" = "172.16.0.6" ]; then
-	/root/client 172.16.0.4
+if [ "$ip_read" = "172.16.0.4" ]; then
+	/root/client 172.16.0.2
        	if [ "$?" -eq "0" ]; then
 		echo 'Success : ip + client'
 	else
@@ -9,4 +9,6 @@ if [ "$ip_read" = "172.16.0.6" ]; then
 	fi
 else
 	echo 'Failed : ip'
+	echo 'Expected : 172.16.0.4'
+	echo 'Received : $ip_read'
 fi
diff --git a/test/network/overlay/root/test-server.sh b/test/network/overlay/root/test-server.sh
index 59061359..d819e815 100755
--- a/test/network/overlay/root/test-server.sh
+++ b/test/network/overlay/root/test-server.sh
@@ -1,6 +1,6 @@
 #/bin/bash
 ip_read=`ifconfig eth0 | grep "inet " | awk -F'[: ]+' '{ print $4 }'`
-if [ "$ip_read" = "172.16.0.4" ]; then
+if [ "$ip_read" = "172.16.0.2" ]; then
 	/root/server 2
        	if [ "$?" -eq "0" ]; then
 		echo 'Success : ip + server'
@@ -9,4 +9,6 @@ if [ "$ip_read" = "172.16.0.4" ]; then
 	fi
 else
 	echo 'Failed : ip'
+	echo 'Expected : 172.16.0.2'
+	echo 'Received : $ip_read'
 fi
diff --git a/test/network/server.c b/test/network/server.c
new file mode 100644
index 00000000..50f55833
--- /dev/null
+++ b/test/network/server.c
@@ -0,0 +1,56 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h> 
+#include <fcntl.h>
+
+int main(int argc, char *argv[])
+{
+    if(argc != 2)
+    {
+        printf("\nUsage: %s <num_clients>\n",argv[0]);
+        return 1;
+    } 
+
+    int num_clients = *(int *)(argv[1]);
+    
+    int listenfd = 0, connfd = 0;
+    struct sockaddr_in serv_addr; 
+
+    char sendBuff[1025];
+    time_t ticks; 
+
+    listenfd = socket(AF_INET, SOCK_STREAM, 0);
+    memset(&serv_addr, '0', sizeof(serv_addr));
+    memset(sendBuff, '0', sizeof(sendBuff)); 
+
+    serv_addr.sin_family = AF_INET;
+    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+    serv_addr.sin_port = htons(5000); 
+
+    bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)); 
+
+    listen(listenfd, 10);
+
+    for (int i = 0; i < 2; i += 1) {
+        
+        connfd = accept(listenfd, (struct sockaddr*)NULL, NULL); 
+	
+	printf("Sending\n");
+        snprintf(sendBuff, sizeof(sendBuff), "172.16.0.2\r\n");
+        write(connfd, sendBuff, strlen(sendBuff));
+       	printf("Closing\n");	
+        close(connfd);
+    } 
+
+    close(listenfd);
+
+    return 0;
+
+}
diff --git a/wlutil/launch.py b/wlutil/launch.py
index 176e7342..89847c25 100644
--- a/wlutil/launch.py
+++ b/wlutil/launch.py
@@ -25,7 +25,7 @@ def startVDE():
     log = logging.getLogger()
     global vdeProc
     log.info('Starting VDE')
-    vdeProc = sp.Popen(["vde_plug", "vxvde://", "slirp:///host=172.16.0.2"], stderr=sp.STDOUT)
+    vdeProc = sp.Popen(["vde_plug", "vxvde://", "cmd://slirpvde - --host=172.16.0.1/16 --dns=172.16.1.3"], stderr=sp.STDOUT)
 
 
 # Terminate vdeProc unless it has stopped running already
@@ -73,7 +73,6 @@ def getSpikeCmd(config, nodisk=False):
 
 # Returns a command string to luanch the given config in qemu. Must be called with shell=True.
 def getQemuCmd(config, count=1, nodisk=False):
-    # launch_port = get_free_tcp_port()
 
     if nodisk:
         exe = str(wlutil.noDiskPath(config['bin']))
@@ -85,8 +84,8 @@ def getQemuCmd(config, count=1, nodisk=False):
     else:
         qemuBin = 'qemu-system-riscv64'
 
-    # We should start static IP addresses at 172.16.0.4 => 4 = 1 (min val of count) + 3
-    count += 3
+    # We should start static IP addresses at 172.16.0.2 => 4 = 1 (min val of count) + 1
+    count += 1
     machigh = '00'
     if count < 16:
         maclow = '0' + hex(count)[2:]
@@ -103,7 +102,6 @@ def getQemuCmd(config, count=1, nodisk=False):
            '-object', 'rng-random,filename=/dev/urandom,id=rng0',
            '-device', 'virtio-rng-device,rng=rng0',
            '-device', f'virtio-net-device,netdev=vde0,mac=00:12:6d:00:{machigh}:{maclow}',
-           #'-netdev', 'user,id=usernet,hostfwd=tcp::' + launch_port + '-:22']
            '-netdev', 'vde,id=vde0,sock=vxvde://']
 
     if 'img' in config and not nodisk:
@@ -124,6 +122,8 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False, captureOutp
     silent: If false, the output from the simulator will be displayed to
         stdout. If true, only the uartlog will be written (it is written live and
         unbuffered so users can still 'tail' the output if they'd like).
+    captureOutput: If true, the output for each workload will be captured in a uartlog file stored
+        in a separate workload specific directory. If false, no output will be captured. (Useful for building workloads.)
 
     Returns: Path of output directory
     """
@@ -148,16 +148,16 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False, captureOutp
     screenIdentifiers = {}
 
     try:
-        count = 0;
+        jobSlot = 0;
         for config in configs:
             if config['launch']:
                 
-                count += 1
+                jobSlot += 1
 
                 if spike:
                     cmd = getSpikeCmd(config, config['nodisk'])
                 else:
-                    cmd = getQemuCmd(config, count, config['nodisk'])
+                    cmd = getQemuCmd(config, jobSlot, config['nodisk'])
 
                 log.info(f"\nLaunching job {config['name']}")
                 log.info(f'Running: {cmd}')

From a5e391cf808f511e3b883cb2a558a888f4683e8d Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Fri, 8 Apr 2022 23:17:46 +0000
Subject: [PATCH 08/16] Updated tutorial to include networking

---
 docs/source/Tutorials/paralleljobs.rst | 51 +++++++++++++++++++++++---
 docs/source/commands.rst               |  2 +-
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/docs/source/Tutorials/paralleljobs.rst b/docs/source/Tutorials/paralleljobs.rst
index 3c186459..c808f4e9 100644
--- a/docs/source/Tutorials/paralleljobs.rst
+++ b/docs/source/Tutorials/paralleljobs.rst
@@ -4,7 +4,7 @@ Parallel Jobs
 ======================
 ``example-workloads/parallelJobs.yaml``
 
-FireMarshal is capable of running multiple jobs in parallel. To understand how this feature works, let's use the ``parallelJobs.yaml`` workload as an example.
+FireMarshal is capable of running multiple networked jobs in parallel. To understand how this feature works, let's use the ``parallelJobs.yaml`` workload as an example.
 
 .. include:: ../../../example-workloads/parallelJobs.yaml
   :code: json
@@ -28,7 +28,23 @@ The default login details for all workloads are:
 
 ``Password:`` ``firesim``
 
-Once logged in, you can run commands in the terminal. To exit, use:
+Once logged in, you can run commands in the terminal. 
+
+FireMarshal uses a Virtual Distributed Ethernet (VDE) network with a gateway at ``172.16.0.1`` and DNS nameserver at ``172.16.1.3``. It assigns IP addresses starting with ``172.16.0.2``. 
+
+We expect the root workload to have an IP address of ``172.16.0.2``. We can check the IP address assigned to interface ``eth0`` with:
+
+::
+
+  ip addr show eth0
+
+We can also test conncectivity to the internet with:
+
+::
+
+  wget -S fires.im
+
+To exit, use:
 
 ::
 
@@ -61,28 +77,51 @@ For instance, attach to job ``j0``, using:
 
   screen -r parallelJobs-j0
 
+You need to login with the the details provided above.
+
+We expect job ``j0`` to have IP address ``172.16.0.2`` and job ``j1`` to have IP address ``172.16.0.3``. Let's test these out!
+
+Inside job ``j0``, run:
+
+::
+
+  ip addr show eth0
+
 
 To detach from inside the screen session, use ``ctrl-a`` then ``ctrl-d``.
 
 
-Similarly, attach to job ``j1``, using:
+Again, we can attach to job ``j1``, using:
 
 ::
 
   screen -r parallelJobs-j1
 
+Similarly, we test the IP address of job ``j1`` with:
+
+::
+
+  ip addr show eth0
+
+Jobs ``j0`` and ``j1`` should be able to communicate with each other over the network. We can try this feature by pinging ``j0 (172.16.0.2)`` from ``j1``:
+
+::
+
+  ping 172.16.0.2
+
+You should see the command print the result of sending and receiving packets. We can terminate this command with ``Ctrl/Command + C``.
 
-Login (with the details provided above) and then use the ``poweroff`` command to shut job ``j1`` down.
+Now, use the ``poweroff`` command to shut job ``j1`` down.
 
 
-Now re-attach to job ``j0``, using:
+Then, re-attach to job ``j0``, using:
 
 ::
 
   screen -r parallelJobs-j0
 
 
-Login (with the details provided above) and then use the ``poweroff`` command to shut job ``j0`` down.
+Again, use the ``poweroff`` command to shut job ``j0`` down.
 
 FireMarshal also logs ``stdout`` and ``stderr`` to a ``uartlog`` file for each workload. These files can be found inside the corresponding workload output directory inside ``runOutputs``. The path to this directory will be output by the ``launch`` command. For instance, a workload output directory for the launched ``parallelJobs`` workload would be called ``parallelJobs-launch-YYYY-MM-DD--HH-MM-SS-<HASH>``.  
 
diff --git a/docs/source/commands.rst b/docs/source/commands.rst
index b91c5980..33f34826 100644
--- a/docs/source/commands.rst
+++ b/docs/source/commands.rst
@@ -83,7 +83,7 @@ Launch all jobs in the workload. Jobs will be run sequentially. See the
 ``-j --job``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 In workloads with multiple jobs, you can specify which job(s) to launch.
-FireMarshal supports running multiple jobs concurrently but does not support networked jobs yet. Jobs are identified by their ``name`` attribute. Multiple ``-j``
+FireMarshal supports running multiple networked jobs concurrently. Jobs are identified by their ``name`` attribute. Multiple ``-j``
 options may be passed to invoke multiple jobs. Use ``--all`` to launch all jobs
 in the workload. If neither ``--job`` nor ``--all`` are provided, the root
 workload will be run. The root workload is the parent of all the jobs (i.e. the

From 606416abd3199e573d2e643ca50377e4d6fcddb8 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Thu, 21 Apr 2022 08:59:59 +0000
Subject: [PATCH 09/16] Updated centos/ubuntu reqs + created
 marshal-dependencies script + added dependencies dir to .gitignore

---
 .gitignore              |   1 +
 centos-requirements.txt |   5 +
 gccwrap-centos          |   3 +
 gccwrap-ubuntu          |   3 +
 marshal-dependencies.sh | 240 ++++++++++++++++++++++++++++++++++++++++
 ubuntu-requirements.txt |   4 +
 6 files changed, 256 insertions(+)
 create mode 100755 gccwrap-centos
 create mode 100755 gccwrap-ubuntu
 create mode 100755 marshal-dependencies.sh

diff --git a/.gitignore b/.gitignore
index dfab433e..0b3a51bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ wlutil/_command.sh
 .doit.db*
 marshal-config.yaml
 .ropeproject
+dependencies
diff --git a/centos-requirements.txt b/centos-requirements.txt
index 110729a2..b4dfe2c9 100644
--- a/centos-requirements.txt
+++ b/centos-requirements.txt
@@ -15,3 +15,8 @@ glib-devel
 gtk2-devel
 ctags
 bc
+openssl-devel
+pkgconfig
+glib2-devel
+unzip
+wget
diff --git a/gccwrap-centos b/gccwrap-centos
new file mode 100755
index 00000000..8afa1ede
--- /dev/null
+++ b/gccwrap-centos
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec gcc -I "${MARSHAL_PREFIX}/include" -L "${MARSHAL_PREFIX}/lib64" -L "${MARSHAL_PREFIX}/lib64/x86_64-linux-gnu" "$@"
diff --git a/gccwrap-ubuntu b/gccwrap-ubuntu
new file mode 100755
index 00000000..4bdab126
--- /dev/null
+++ b/gccwrap-ubuntu
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec gcc -I "${MARSHAL_PREFIX}/include" -L "${MARSHAL_PREFIX}/lib" -L "${MARSHAL_PREFIX}/lib/x86_64-linux-gnu" "$@"
diff --git a/marshal-dependencies.sh b/marshal-dependencies.sh
new file mode 100755
index 00000000..a2f58d4e
--- /dev/null
+++ b/marshal-dependencies.sh
@@ -0,0 +1,240 @@
+#!/bin/bash
+#set -x
+
+# thanks to Giacomo Rizzi: some ideas have been taken from: https://github.com/gufoe/vuos-tutorial
+
+while getopts p: flag
+do
+	case "${flag}" in
+		p) prefix=${OPTARG};;
+	esac
+done
+
+BASE=$(pwd)
+echo "BASE: $BASE"
+
+function check_env {
+	if [ -z ${RISCV} ]
+	then
+		echo "RISCV environment variable NOT FOUND"
+		exit 1
+	fi
+
+	_=$(which apt)
+	if [ $? -eq 0 ]
+	then 
+		os="deb/ubuntu"
+	else
+		_=$(which yum)
+		if [ $? -eq 0 ]
+		then
+			os="centos"
+		else
+			echo "yum/apt NOT FOUND"
+			exit 1
+		fi
+	fi
+
+}
+
+function check_deps {
+	_=$(which python3.8)
+	if [ $? -ne 0 ]
+	then
+		echo "python3.8 not found"
+		exit 1
+	fi
+	
+	_=$(which unzip)
+	if [ $? -ne 0 ]
+	then
+		echo "unzip not found"
+		exit 1
+	fi
+	
+	_=$(which wget)
+	if [ $? -ne 0 ]
+	then
+		echo "wget not found"
+		exit 1
+	fi
+
+}
+
+check_env
+
+check_deps
+
+# User friendly messages on error
+set -E
+set -o functrace
+function handle_error {
+    local retval=$?
+    local line=${last_lineno:-$1}
+    echo "Failed at $line: $BASH_COMMAND"
+    echo "Trace: " "$@"
+    exit $retval
+}
+if (( ${BASH_VERSION%%.*} <= 3 )) || [[ ${BASH_VERSION%.*} = 4.0 ]]; then
+	trap '[[ $FUNCNAME = handle_error ]] || { last_lineno=$real_lineno; real_lineno=$LINENO; }' DEBUG
+fi
+trap 'handle_error $LINENO ${BASH_LINENO[@]}' ERR
+
+function install_repo {
+	REPO=$1
+	NAME=$2
+	PREWD=$(pwd)
+	echo installing $1
+	cd  "$BASE"/dependencies
+	mkdir $NAME
+	wget $REPO -O $NAME.tar.gz
+	tar -xvzf $NAME.tar.gz -C $NAME --strip-components=1
+	cd $NAME
+
+	echo CMAKE
+	mkdir -p build
+	cd build
+	if [ -z "$prefix" ]
+	then
+		cmake .. $2
+		make
+	else
+		if [ "$os" = "deb/ubuntu" ]
+		then
+			MARSHAL_PREFIX=$prefix CC=$BASE/gccwrap-ubuntu $prefix/bin/cmake .. -DCMAKE_PREFIX_PATH=$prefix -DCMAKE_INSTALL_PREFIX=$prefix
+			C_INCLUDE_PATH="$prefix/include" LIBRARY_PATH="$prefix/lib" make
+		else
+			MARSHAL_PREFIX=$prefix CC=$BASE/gccwrap-centos $prefix/bin/cmake .. -DCMAKE_PREFIX_PATH=$prefix -DCMAKE_INSTALL_PREFIX=$prefix
+			C_INCLUDE_PATH="$prefix/include" LIBRARY_PATH="$prefix/lib64" make
+		fi
+	fi
+	make install
+
+
+	cd $PREWD
+}
+
+function install_cmake {
+	PREWD=$(pwd)
+	version=3.23
+	build=0
+	echo installing cmake-$version.$build
+	cd "$BASE"/dependencies
+	wget https://github.com/Kitware/CMake/releases/download/v$version.$build/cmake-$version.$build-linux-x86_64.sh
+	if [ -z "$prefix" ]
+	then
+		bash cmake-$version.$build-linux-x86_64.sh --prefix="/usr/local/bin" --exclude-subdir --skip-license 
+	else
+		bash cmake-$version.$build-linux-x86_64.sh --prefix=$prefix --exclude-subdir --skip-license 
+	fi
+	cd $PREWD
+}
+
+function install_meson {
+	PREWD=$(pwd)
+	release=0.61.4
+	echo installing meson-$release
+	cd "$BASE"/dependencies
+	mkdir meson
+	wget https://github.com/mesonbuild/meson/releases/download/$release/meson-$release.tar.gz -O meson.tar.gz
+	tar -xzvf meson.tar.gz -C meson --strip-components=1
+	cd $PREWD
+}
+
+function install_ninja {
+	PREWD=$(pwd)
+	release=1.10.2
+	echo installing ninja-$release
+	cd "$BASE"/dependencies
+	wget https://github.com/ninja-build/ninja/releases/download/v$release/ninja-linux.zip
+	if [ -z "$prefix" ]
+	then
+		unzip -d /usr/local/bin/ ninja-linux.zip
+	else
+		unzip -d $prefix/bin/ ninja-linux.zip
+	fi
+	cd $PREWD
+}
+
+function install_libslirp {
+	PREWD=$(pwd)
+	release=4.6.1
+	echo installing libslirp
+	cd "$BASE"/dependencies
+	mkdir libslirp
+	wget https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v$release/libslirp-v$release.tar.gz -O libslirp.tar.gz
+	tar -xvzf libslirp.tar.gz -C libslirp --strip-components=1
+	cd libslirp
+	if [ -z "$prefix" ]
+	then
+		python3.8 ../meson/meson.py build
+		ninja -C build install
+	else
+		NINJA=$prefix/bin/ninja python3.8 ../meson/meson.py build -Dprefix=$prefix
+		$prefix/bin/ninja -C build install
+	fi
+	cd $PREWD
+}
+
+function install_qemu {
+	PREWD=$(pwd)
+	release=6.2.0
+	echo installing qemu-$release
+	cd  "$BASE"/dependencies
+	mkdir qemu
+	wget https://download.qemu.org/qemu-$release.tar.xz -O qemu.tar.xz
+	tar -xvJf qemu.tar.xz -C qemu --strip-components=1
+	cd qemu
+
+	mkdir -p build
+	cd build
+	if [ -z "$prefix" ]
+	then
+		../configure --target-list=riscv64-softmu --enable-vde --disable-werror
+		make
+	else
+		if [ "$os" = "deb/ubuntu" ]
+		then
+			MARSHAL_PREFIX=$prefix ../configure --prefix=$prefix --interp-prefix=$prefix --cc=$BASE/gccwrap-ubuntu --target-list=riscv64-softmmu --enable-vde --disable-werror
+			C_INCLUDE_PATH="$prefix/include" LIBRARY_PATH="$prefix/lib" make
+		else
+			MARSHAL_PREFIX=$prefix ../configure --prefix=$prefix --interp-prefix=$prefix --cc=$BASE/gccwrap-centos --target-list=riscv64-softmmu --enable-vde --disable-werror
+			C_INCLUDE_PATH="$prefix/include" LIBRARY_PATH="$prefix/lib64" make
+		fi
+	fi
+	make install
+
+
+	cd $PREWD
+}
+
+# Start installation
+
+rm -rf dependencies
+mkdir dependencies
+
+if [ -z "$prefix" ]
+then
+	prefix=${RISCV}
+fi
+
+if [ -n "$prefix" ]
+then
+	export PATH="$prefix:$prefix/bin:${PATH}"
+fi
+
+install_cmake
+install_ninja
+install_meson
+install_libslirp
+
+install_repo https://github.com/virtualsquare/s2argv-execs/archive/refs/tags/1.3.tar.gz s2argv-execs
+install_repo https://github.com/rd235/vdeplug4/archive/refs/tags/v4.0.1.tar.gz vdeplug4
+install_repo https://github.com/virtualsquare/libvdeslirp/archive/refs/tags/0.1.1.tar.gz libvdeslirp
+install_repo https://github.com/virtualsquare/vdeplug_slirp/archive/refs/tags/0.1.0.tar.gz vdeplug_slirp
+
+install_qemu
+
+./init-submodules.sh
+
+echo 'Installation completed'
diff --git a/ubuntu-requirements.txt b/ubuntu-requirements.txt
index 7418d274..4c22b093 100644
--- a/ubuntu-requirements.txt
+++ b/ubuntu-requirements.txt
@@ -15,3 +15,7 @@ ctags
 bc
 e2fsprogs
 unzip
+build-essential
+libssl-dev
+pkg-config
+wget

From f81a34674a3d9832352e6313aede80ae145bdf98 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Thu, 21 Apr 2022 23:19:28 +0000
Subject: [PATCH 10/16] fixed tab + lint errors

---
 test/fed-nw-internet/client.c | 135 +++++++++++++++++-----------------
 test/fed-nw-internet/server.c |  80 ++++++++++----------
 test/network/client.c         | 134 ++++++++++++++++-----------------
 test/network/server.c         |  80 ++++++++++----------
 wlutil/launch.py              |  11 ++-
 5 files changed, 222 insertions(+), 218 deletions(-)

diff --git a/test/fed-nw-internet/client.c b/test/fed-nw-internet/client.c
index c8e8267b..85cdb9df 100644
--- a/test/fed-nw-internet/client.c
+++ b/test/fed-nw-internet/client.c
@@ -14,78 +14,79 @@
 
 int main(int argc, char *argv[])
 {
-    int sockfd = 0, res = 0, n = 0;
-    char recvBuff[1024];
-    struct sockaddr_in serv_addr; 
-    fd_set myset; 
-    struct timeval tv; 
-    int valopt; 
-    socklen_t lon; 
-
-    if(argc != 2)
-    {
-        printf("\nUsage: %s <ip of server>\n",argv[0]);
-        return 1;
-    } 
-
-    memset(&serv_addr, '0', sizeof(serv_addr)); 
-
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_port = htons(5000); 
-
-    if(inet_pton(AF_INET, argv[1], &serv_addr.sin_addr)<=0)
-    {
-        printf("\nError : inet_pton error occured\n");
-        return 1;
-    } 
-
-    memset(recvBuff, '0',sizeof(recvBuff));
-
-    if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-        printf("\nError : Could not create socket (%d %s) \n", errno, strerror(errno));
-        return 1;
-    } 
-
-    
-    int t = 0;
-    while(1){
-			
-			if(t >= 30)	
-			{
-				printf("\nError : Could not connect to server (%d %s) \n", errno, strerror(errno));
-				return 1;
-			}
-			if(connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) >= 0) {
-					break;
-			}
-			sleep(1);
-			
-			t += 1;	
+	int sockfd = 0, res = 0, n = 0;
+	char recvBuff[1024];
+	struct sockaddr_in serv_addr; 
+	fd_set myset; 
+	struct timeval tv; 
+	int valopt; 
+	socklen_t lon; 
+
+	if(argc != 2)
+	{
+		printf("\nUsage: %s <ip of server>\n",argv[0]);
+		return 1;
+	} 
+
+	memset(&serv_addr, '0', sizeof(serv_addr)); 
+
+	serv_addr.sin_family = AF_INET;
+	serv_addr.sin_port = htons(5000); 
+
+	if(inet_pton(AF_INET, argv[1], &serv_addr.sin_addr)<=0)
+	{
+		printf("\nError : inet_pton error occured\n");
+		return 1;
+	} 
+
+	memset(recvBuff, '0',sizeof(recvBuff));
+
+	if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+	{
+		printf("\nError : Could not create socket (%d %s) \n", errno, strerror(errno));
+		return 1;
+	} 
+
+
+	int t = 0;
+	while(1){
+
+		if(t >= 30)	
+		{
+			printf("\nError : Could not connect to server (%d %s) \n", errno, strerror(errno));
+			return 1;
+		}
+
+		if(connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) >= 0) {
+			break;
+		}
+		sleep(1);
+
+		t += 1;	
 	}
 
 
-    while ((n = read(sockfd, recvBuff, sizeof(recvBuff)-1)) > 0)
-    {
-        recvBuff[n] = 0;
-        if(fputs(recvBuff, stdout) == EOF)
-        {
-            printf("\nError : Fputs error\n");
-        }
-    } 
-
-    if(n < 0)
-    {
-        printf("\nError : Read error\n");
-    } else {
-        if (strncmp(recvBuff,argv[1],strlen(argv[1])) == 0) {
-            printf("\nSuccess : %s\n", argv[1]);
-        } else {
+	while ((n = read(sockfd, recvBuff, sizeof(recvBuff)-1)) > 0)
+	{
+		recvBuff[n] = 0;
+		if(fputs(recvBuff, stdout) == EOF)
+		{
+			printf("\nError : Fputs error\n");
+		}
+	} 
+
+	if(n < 0)
+	{
+		printf("\nError : Read error\n");
+	} else {
+		if (strncmp(recvBuff,argv[1],strlen(argv[1])) == 0) {
+			printf("\nSuccess : %s\n", argv[1]);
+		} else {
 			printf("\n Error : Expected : %s Received : %s\n", argv[1], recvBuff);
 		}
-    }
+	}
 
-    close(sockfd);
+	close(sockfd);
 
-    return 0;
+	return 0;
 }
diff --git a/test/fed-nw-internet/server.c b/test/fed-nw-internet/server.c
index 50f55833..084e3b42 100644
--- a/test/fed-nw-internet/server.c
+++ b/test/fed-nw-internet/server.c
@@ -12,45 +12,45 @@
 
 int main(int argc, char *argv[])
 {
-    if(argc != 2)
-    {
-        printf("\nUsage: %s <num_clients>\n",argv[0]);
-        return 1;
-    } 
-
-    int num_clients = *(int *)(argv[1]);
-    
-    int listenfd = 0, connfd = 0;
-    struct sockaddr_in serv_addr; 
-
-    char sendBuff[1025];
-    time_t ticks; 
-
-    listenfd = socket(AF_INET, SOCK_STREAM, 0);
-    memset(&serv_addr, '0', sizeof(serv_addr));
-    memset(sendBuff, '0', sizeof(sendBuff)); 
-
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    serv_addr.sin_port = htons(5000); 
-
-    bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)); 
-
-    listen(listenfd, 10);
-
-    for (int i = 0; i < 2; i += 1) {
-        
-        connfd = accept(listenfd, (struct sockaddr*)NULL, NULL); 
-	
-	printf("Sending\n");
-        snprintf(sendBuff, sizeof(sendBuff), "172.16.0.2\r\n");
-        write(connfd, sendBuff, strlen(sendBuff));
-       	printf("Closing\n");	
-        close(connfd);
-    } 
-
-    close(listenfd);
-
-    return 0;
+	if(argc != 2)
+	{
+		printf("\nUsage: %s <num_clients>\n",argv[0]);
+		return 1;
+	} 
+
+	int num_clients = *(int *)(argv[1]);
+
+	int listenfd = 0, connfd = 0;
+	struct sockaddr_in serv_addr; 
+
+	char sendBuff[1025];
+	time_t ticks; 
+
+	listenfd = socket(AF_INET, SOCK_STREAM, 0);
+	memset(&serv_addr, '0', sizeof(serv_addr));
+	memset(sendBuff, '0', sizeof(sendBuff)); 
+
+	serv_addr.sin_family = AF_INET;
+	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	serv_addr.sin_port = htons(5000); 
+
+	bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)); 
+
+	listen(listenfd, 10);
+
+	for (int i = 0; i < 2; i += 1) {
+
+		connfd = accept(listenfd, (struct sockaddr*)NULL, NULL); 
+
+		printf("Sending\n");
+		snprintf(sendBuff, sizeof(sendBuff), "172.16.0.2\r\n");
+		write(connfd, sendBuff, strlen(sendBuff));
+		printf("Closing\n");	
+		close(connfd);
+	} 
+
+	close(listenfd);
+
+	return 0;
 
 }
diff --git a/test/network/client.c b/test/network/client.c
index c8e8267b..e5114d63 100644
--- a/test/network/client.c
+++ b/test/network/client.c
@@ -14,78 +14,78 @@
 
 int main(int argc, char *argv[])
 {
-    int sockfd = 0, res = 0, n = 0;
-    char recvBuff[1024];
-    struct sockaddr_in serv_addr; 
-    fd_set myset; 
-    struct timeval tv; 
-    int valopt; 
-    socklen_t lon; 
-
-    if(argc != 2)
-    {
-        printf("\nUsage: %s <ip of server>\n",argv[0]);
-        return 1;
-    } 
-
-    memset(&serv_addr, '0', sizeof(serv_addr)); 
-
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_port = htons(5000); 
-
-    if(inet_pton(AF_INET, argv[1], &serv_addr.sin_addr)<=0)
-    {
-        printf("\nError : inet_pton error occured\n");
-        return 1;
-    } 
-
-    memset(recvBuff, '0',sizeof(recvBuff));
-
-    if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-        printf("\nError : Could not create socket (%d %s) \n", errno, strerror(errno));
-        return 1;
-    } 
-
-    
-    int t = 0;
-    while(1){
-			
-			if(t >= 30)	
-			{
-				printf("\nError : Could not connect to server (%d %s) \n", errno, strerror(errno));
-				return 1;
-			}
-			if(connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) >= 0) {
-					break;
-			}
-			sleep(1);
-			
-			t += 1;	
+	int sockfd = 0, res = 0, n = 0;
+	char recvBuff[1024];
+	struct sockaddr_in serv_addr; 
+	fd_set myset; 
+	struct timeval tv; 
+	int valopt; 
+	socklen_t lon; 
+
+	if(argc != 2)
+	{
+		printf("\nUsage: %s <ip of server>\n",argv[0]);
+		return 1;
+	} 
+
+	memset(&serv_addr, '0', sizeof(serv_addr)); 
+
+	serv_addr.sin_family = AF_INET;
+	serv_addr.sin_port = htons(5000); 
+
+	if(inet_pton(AF_INET, argv[1], &serv_addr.sin_addr)<=0)
+	{
+		printf("\nError : inet_pton error occured\n");
+		return 1;
+	} 
+
+	memset(recvBuff, '0',sizeof(recvBuff));
+
+	if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+	{
+		printf("\nError : Could not create socket (%d %s) \n", errno, strerror(errno));
+		return 1;
+	} 
+
+
+	int t = 0;
+	while(1){
+
+		if(t >= 30)	
+		{
+			printf("\nError : Could not connect to server (%d %s) \n", errno, strerror(errno));
+			return 1;
+		}
+		if(connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) >= 0) {
+			break;
+		}
+		sleep(1);
+
+		t += 1;	
 	}
 
 
-    while ((n = read(sockfd, recvBuff, sizeof(recvBuff)-1)) > 0)
-    {
-        recvBuff[n] = 0;
-        if(fputs(recvBuff, stdout) == EOF)
-        {
-            printf("\nError : Fputs error\n");
-        }
-    } 
-
-    if(n < 0)
-    {
-        printf("\nError : Read error\n");
-    } else {
-        if (strncmp(recvBuff,argv[1],strlen(argv[1])) == 0) {
-            printf("\nSuccess : %s\n", argv[1]);
-        } else {
+	while ((n = read(sockfd, recvBuff, sizeof(recvBuff)-1)) > 0)
+	{
+		recvBuff[n] = 0;
+		if(fputs(recvBuff, stdout) == EOF)
+		{
+			printf("\nError : Fputs error\n");
+		}
+	} 
+
+	if(n < 0)
+	{
+		printf("\nError : Read error\n");
+	} else {
+		if (strncmp(recvBuff,argv[1],strlen(argv[1])) == 0) {
+			printf("\nSuccess : %s\n", argv[1]);
+		} else {
 			printf("\n Error : Expected : %s Received : %s\n", argv[1], recvBuff);
 		}
-    }
+	}
 
-    close(sockfd);
+	close(sockfd);
 
-    return 0;
+	return 0;
 }
diff --git a/test/network/server.c b/test/network/server.c
index 50f55833..084e3b42 100644
--- a/test/network/server.c
+++ b/test/network/server.c
@@ -12,45 +12,45 @@
 
 int main(int argc, char *argv[])
 {
-    if(argc != 2)
-    {
-        printf("\nUsage: %s <num_clients>\n",argv[0]);
-        return 1;
-    } 
-
-    int num_clients = *(int *)(argv[1]);
-    
-    int listenfd = 0, connfd = 0;
-    struct sockaddr_in serv_addr; 
-
-    char sendBuff[1025];
-    time_t ticks; 
-
-    listenfd = socket(AF_INET, SOCK_STREAM, 0);
-    memset(&serv_addr, '0', sizeof(serv_addr));
-    memset(sendBuff, '0', sizeof(sendBuff)); 
-
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    serv_addr.sin_port = htons(5000); 
-
-    bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)); 
-
-    listen(listenfd, 10);
-
-    for (int i = 0; i < 2; i += 1) {
-        
-        connfd = accept(listenfd, (struct sockaddr*)NULL, NULL); 
-	
-	printf("Sending\n");
-        snprintf(sendBuff, sizeof(sendBuff), "172.16.0.2\r\n");
-        write(connfd, sendBuff, strlen(sendBuff));
-       	printf("Closing\n");	
-        close(connfd);
-    } 
-
-    close(listenfd);
-
-    return 0;
+	if(argc != 2)
+	{
+		printf("\nUsage: %s <num_clients>\n",argv[0]);
+		return 1;
+	} 
+
+	int num_clients = *(int *)(argv[1]);
+
+	int listenfd = 0, connfd = 0;
+	struct sockaddr_in serv_addr; 
+
+	char sendBuff[1025];
+	time_t ticks; 
+
+	listenfd = socket(AF_INET, SOCK_STREAM, 0);
+	memset(&serv_addr, '0', sizeof(serv_addr));
+	memset(sendBuff, '0', sizeof(sendBuff)); 
+
+	serv_addr.sin_family = AF_INET;
+	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	serv_addr.sin_port = htons(5000); 
+
+	bind(listenfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)); 
+
+	listen(listenfd, 10);
+
+	for (int i = 0; i < 2; i += 1) {
+
+		connfd = accept(listenfd, (struct sockaddr*)NULL, NULL); 
+
+		printf("Sending\n");
+		snprintf(sendBuff, sizeof(sendBuff), "172.16.0.2\r\n");
+		write(connfd, sendBuff, strlen(sendBuff));
+		printf("Closing\n");	
+		close(connfd);
+	} 
+
+	close(listenfd);
+
+	return 0;
 
 }
diff --git a/wlutil/launch.py b/wlutil/launch.py
index 89847c25..315abb71 100644
--- a/wlutil/launch.py
+++ b/wlutil/launch.py
@@ -7,6 +7,7 @@
 jobProcs = []
 vdeProc = None
 
+
 # Terminates jobs unless they have stopped running already
 def cleanUpSubProcesses():
     log = logging.getLogger()
@@ -20,6 +21,7 @@ def cleanUpSubProcesses():
 # Register clean up function with wlutil.py so it can be called by SIGINT handler
 wlutil.registerCleanUp(cleanUpSubProcesses)
 
+
 # Start vde_plug server
 def startVDE():
     log = logging.getLogger()
@@ -34,7 +36,8 @@ def cleanUpVDE():
     if vdeProc and vdeProc.poll() is None:
         log.info(f'cleaning up VDE process {vdeProc.pid}')
         vdeProc.terminate()
-                                                            
+
+
 # Kinda hacky (technically not guaranteed to give a free port, just very likely)
 def get_free_tcp_port():
     tcp = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -89,7 +92,7 @@ def getQemuCmd(config, count=1, nodisk=False):
     machigh = '00'
     if count < 16:
         maclow = '0' + hex(count)[2:]
-    else: 
+    else:
         maclow = hex(count)[2:]
 
     cmd = [qemuBin,
@@ -148,10 +151,10 @@ def launchWorkload(baseConfig, jobs=None, spike=False, silent=False, captureOutp
     screenIdentifiers = {}
 
     try:
-        jobSlot = 0;
+        jobSlot = 0
         for config in configs:
             if config['launch']:
-                
+
                 jobSlot += 1
 
                 if spike:

From 66ba53b7df64e3b1b8452dc3d42eeab475ea79aa Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Fri, 22 Apr 2022 21:31:38 +0000
Subject: [PATCH 11/16] modified README.md

---
 README.md | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 08dbb9a7..3aec4f8c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ FireMarshal
 ==================================
 
 This tool builds base images for several linux-based distros that work with qemu,
-spike, and firesim.
+spike, and FireSim.
 
 This is just a quick primer. To see full documentation, please see the official
 documentation:
@@ -11,8 +11,9 @@ https://firemarshal.readthedocs.io/en/latest/index.html
 # Requirements
 The easiest way to use Marshal is to run it via Chipyard
 (https://chipyard.readthedocs.io/en/latest/) or FireSim
-(https://docs.fires.im/en/latest/). However, this is not required. To run
-FireMarshal independently, you will need the following dependencies:
+(https://docs.fires.im/en/latest/). However, this is not required. 
+
+To run FireMarshal, you will need the following dependencies:
 
 ## Standard Packages
 ``centos-requirements.txt`` is a list of packages for centos7 that are needed by
@@ -35,29 +36,33 @@ out of the box on Ubuntu. See
 https://github.com/firesim/firesim-software/issues/30 for a workaround.
 
 ## Python
-This project was written for python 3.6. You can install all dependencies using:
+This project was written for python 3.8. You can install all dependencies using:
 ```
 pip3 install -r python-requirements.txt
 ```
 
+## Other Packages
+FireMarshal depends on other open-source packages that can be installed by running:
+
+```
+./marshal-dependencies.sh
+```
+
+Note that this script downloads dependencies to a `dependencies` directory and installs them at the path pointed to by the `RISCV` environment variable. Thus, the script requires `RISCV` to be set (Chipyard/FireSim already do this).
+
+This script also updates submodules.
+
 ## RISC-V Tools
 In addition to standard libraries, you will need a RISC-V compatible toolchain,
-the RISC-V isa simulator (spike).
+the RISC-V isa simulator (spike). This is already installed by Chipyard/FireSim.
 
 See the [Chipyard documentation](https://chipyard.readthedocs.io/en/latest/Chipyard-Basics/Initial-Repo-Setup.html#building-a-toolchain)
 for help setting up a known-good toolchain and environment.
 
 ## Qemu
-Qemu is the default simulator used by firemarshal. We require version v5.0.0 or
-greater. If you aren't using chipyard, you can get it from:
-
-https://github.com/qemu/qemu/tree/v5.0.0
+Qemu is the default simulator used by FireMarshal and it currently installs v6.2.0.
 
 # Basic Usage
-If you only want to build bare-metal workloads, you can skip updating
-submodules. Otherwise, you should update the required submodules by running:
-
-    ./init-submodules.sh
 
 Building workloads:
 
@@ -67,7 +72,7 @@ To run in qemu:
 
     ./marshal launch br-base.json
 
-To install into FireSim (assuming you cloned this as a submodule of firesim or chipyard):
+To install into FireSim (assuming you cloned this as a submodule of FireSim or Chipyard):
 
     ./marshal install br-base.json
 

From 1306aaeb92b5e337a91d1053508a4c11116fd2e3 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Sun, 24 Apr 2022 00:48:20 +0000
Subject: [PATCH 12/16] Updated README.md

---
 README.md | 43 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index 3aec4f8c..1df0dd4a 100644
--- a/README.md
+++ b/README.md
@@ -8,60 +8,37 @@ This is just a quick primer. To see full documentation, please see the official
 documentation:
 https://firemarshal.readthedocs.io/en/latest/index.html
 
-# Requirements
+# Setup
+
 The easiest way to use Marshal is to run it via Chipyard
 (https://chipyard.readthedocs.io/en/latest/) or FireSim
 (https://docs.fires.im/en/latest/). However, this is not required. 
 
-To run FireMarshal, you will need the following dependencies:
+Run the following script to install all of FireMarshal's dependencies (standard packages from apt/yum, python libraries, open-source packages, submodules):
 
-## Standard Packages
-``centos-requirements.txt`` is a list of packages for centos7 that are needed by
-marshal. You can install these with:
 ```
-cat centos-requirements.txt | sudo xargs yum install -y
+./install/marshal-dependencies.sh
 ```
 
-``ubuntu-requirements.txt`` is a list of packages for Ubuntu 18.04 that are needed by marshal.
-You can install these with:
+Note that this script downloads dependencies to `install/dependencies` and installs them at the path pointed to by the `RISCV` environment variable. Thus, the script requires `RISCV` to be set and FireMarshal expects `PATH` to contain the path it points to (Chipyard/FireSim already do this).
+
+Running bare-metal workloads requires a minimal set of dependencies. You can install just these by passing the `-b` flag as follows:
+
 ```
-cat ubuntu-requirements.txt | sudo xargs apt-get install -y
+./install/marshal-dependencies.sh -b
 ```
 
-Package names may be different on other distributions.
-
 ### Note for Ubuntu
 The libguestfs-tools package (needed for the guestmount command) does not work
 out of the box on Ubuntu. See
 https://github.com/firesim/firesim-software/issues/30 for a workaround.
 
-## Python
-This project was written for python 3.8. You can install all dependencies using:
-```
-pip3 install -r python-requirements.txt
-```
-
-## Other Packages
-FireMarshal depends on other open-source packages that can be installed by running:
-
-```
-./marshal-dependencies.sh
-```
-
-Note that this script downloads dependencies to a `dependencies` directory and installs them at the path pointed to by the `RISCV` environment variable. Thus, the script requires `RISCV` to be set (Chipyard/FireSim already do this).
-
-This script also updates submodules.
-
 ## RISC-V Tools
-In addition to standard libraries, you will need a RISC-V compatible toolchain,
-the RISC-V isa simulator (spike). This is already installed by Chipyard/FireSim.
+In addition to the dependencies installed above, you will need a RISC-V compatible toolchain, the RISC-V isa simulator (spike). This is already installed by Chipyard/FireSim.
 
 See the [Chipyard documentation](https://chipyard.readthedocs.io/en/latest/Chipyard-Basics/Initial-Repo-Setup.html#building-a-toolchain)
 for help setting up a known-good toolchain and environment.
 
-## Qemu
-Qemu is the default simulator used by FireMarshal and it currently installs v6.2.0.
-
 # Basic Usage
 
 Building workloads:

From f5f0a1db077723b82325289fcd2e71be91496648 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Sun, 24 Apr 2022 05:59:26 +0000
Subject: [PATCH 13/16] Updated docs for getting started section

---
 docs/source/gettingStarted.rst | 88 ++++++++++++++++++++++++++++++++++
 docs/source/index.rst          |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 docs/source/gettingStarted.rst

diff --git a/docs/source/gettingStarted.rst b/docs/source/gettingStarted.rst
new file mode 100644
index 00000000..e0ec247d
--- /dev/null
+++ b/docs/source/gettingStarted.rst
@@ -0,0 +1,88 @@
+.. _getting-started:
+
+Getting Started
+====================
+
+Setup
+---------
+
+The easiest way to use Marshal is to run it via Chipyard
+(https://chipyard.readthedocs.io/en/latest/) or FireSim
+(https://docs.fires.im/en/latest/). However, this is not required.
+
+Run the following script to install all of FireMarshal's dependencies
+(standard packages from apt/yum, python libraries, open-source packages,
+submodules):
+
+::
+
+    ./install/marshal-dependencies.sh
+
+Note that this script downloads dependencies to ``install/dependencies``
+and installs them at the path pointed to by the ``RISCV`` environment
+variable. Thus, the script requires ``RISCV`` to be set and FireMarshal
+expects ``PATH`` to contain the path it points to (Chipyard/FireSim
+already do this).
+
+Running bare-metal workloads requires a minimal set of dependencies. You
+can install just these by passing the ``-b`` flag as follows:
+
+::
+
+    ./install/marshal-dependencies.sh -b
+
+Note for Ubuntu
+^^^^^^^^^^^^^^^^^^
+
+The libguestfs-tools package (needed for the guestmount command) does
+not work out of the box on Ubuntu. See
+https://github.com/firesim/firesim-software/issues/30 for a workaround.
+
+RISC-V Tools
+^^^^^^^^^^^^^^^
+
+In addition to the dependencies installed above, you will need a RISC-V
+compatible toolchain, the RISC-V isa simulator (spike). This is already
+installed by Chipyard/FireSim.
+
+See the `Chipyard
+documentation <https://chipyard.readthedocs.io/en/latest/Chipyard-Basics/Initial-Repo-Setup.html#building-a-toolchain>`__
+for help setting up a known-good toolchain and environment.
+
+Basic Usage
+------------------
+
+Building workloads:
+
+::
+
+    ./marshal build br-base.json
+
+To run in qemu:
+
+::
+
+    ./marshal launch br-base.json
+
+To install into FireSim (assuming you cloned this as a submodule of
+FireSim or Chipyard):
+
+::
+
+    ./marshal install br-base.json
+
+Security Note
+---------------------
+
+Be advised that FireMarshal will run initialization scripts provided by
+workloads. These scripts will have all the permissions your user has, be
+sure to read all workloads carefully before building them.
+
+Getting Help / Discussion:
+----------------------------
+
+-  For general questions, help, and discussion: use the FireSim user
+   forum: https://groups.google.com/forum/#!forum/firesim
+-  For bugs and feature requests: use the github issue tracker:
+   https://github.com/firesim/FireMarshal/issues
+-  See CONTRIBUTING.md for more details
diff --git a/docs/source/index.rst b/docs/source/index.rst
index a5b9e5a9..1f82e1fb 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -28,6 +28,7 @@ supported).
    :maxdepth: 3
    :caption: Contents:
 
+   gettingStarted
    Tutorials/index
    commands
    workloadConfig

From c78d62c9f9952663120cd762dd46bfbf8b9129a5 Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Sun, 24 Apr 2022 06:14:28 +0000
Subject: [PATCH 14/16] Moved scripts to install directory + single script for
 complete installation

---
 .../centos-requirements.txt                   |  1 +
 gccwrap-centos => install/gccwrap-centos      |  0
 gccwrap-ubuntu => install/gccwrap-ubuntu      |  0
 .../marshal-dependencies.sh                   | 97 ++++++++++++++-----
 .../python-requirements.txt                   |  0
 .../ubuntu-requirements.txt                   |  1 +
 6 files changed, 73 insertions(+), 26 deletions(-)
 rename centos-requirements.txt => install/centos-requirements.txt (94%)
 rename gccwrap-centos => install/gccwrap-centos (100%)
 rename gccwrap-ubuntu => install/gccwrap-ubuntu (100%)
 rename marshal-dependencies.sh => install/marshal-dependencies.sh (75%)
 rename python-requirements.txt => install/python-requirements.txt (100%)
 rename ubuntu-requirements.txt => install/ubuntu-requirements.txt (96%)

diff --git a/centos-requirements.txt b/install/centos-requirements.txt
similarity index 94%
rename from centos-requirements.txt
rename to install/centos-requirements.txt
index b4dfe2c9..c91bbf69 100644
--- a/centos-requirements.txt
+++ b/install/centos-requirements.txt
@@ -13,6 +13,7 @@ expat
 expat-devel
 glib-devel
 gtk2-devel
+gtk3-devel
 ctags
 bc
 openssl-devel
diff --git a/gccwrap-centos b/install/gccwrap-centos
similarity index 100%
rename from gccwrap-centos
rename to install/gccwrap-centos
diff --git a/gccwrap-ubuntu b/install/gccwrap-ubuntu
similarity index 100%
rename from gccwrap-ubuntu
rename to install/gccwrap-ubuntu
diff --git a/marshal-dependencies.sh b/install/marshal-dependencies.sh
similarity index 75%
rename from marshal-dependencies.sh
rename to install/marshal-dependencies.sh
index a2f58d4e..b99c54c2 100755
--- a/marshal-dependencies.sh
+++ b/install/marshal-dependencies.sh
@@ -3,13 +3,20 @@
 
 # thanks to Giacomo Rizzi: some ideas have been taken from: https://github.com/gufoe/vuos-tutorial
 
+bare_metal=0
+
 while getopts p: flag
 do
 	case "${flag}" in
 		p) prefix=${OPTARG};;
+		b) bare_metal=1;;
 	esac
 done
 
+INITWD=$(pwd)
+
+# switch to firemarshal/install dir
+cd "$(dirname "$0")"
 BASE=$(pwd)
 echo "BASE: $BASE"
 
@@ -38,13 +45,24 @@ function check_env {
 }
 
 function check_deps {
-	_=$(which python3.8)
-	if [ $? -ne 0 ]
+
+	if [ $bare_metal -eq 1 ] && [ "$os" = "centos" ]
 	then
-		echo "python3.8 not found"
-		exit 1
+		_=$(which python3)
+		if [ $? -ne 0 ]
+		then
+			echo "python3 not found"
+			exit 1
+		fi
+	else 
+		_=$(which python3.8)
+		if [ $? -ne 0 ]
+		then
+			echo "python3.8 not found"
+			exit 1
+		fi
 	fi
-	
+		
 	_=$(which unzip)
 	if [ $? -ne 0 ]
 	then
@@ -61,9 +79,30 @@ function check_deps {
 
 }
 
-check_env
+function install_std {
+	if [ "$os" = "deb/ubuntu" ]
+	then
+		cat ubuntu-requirements.txt | sudo xargs apt-get install -y
+	elif [ "$os" = "centos" ]
+	then
+		if [ $bare_metal -eq 0 ]
+		then
+			sudo yum install -y centos-release-scl
+			sudo yum install -y rh-python38
+			scl enable rh-python38 bash
+		fi
+		cat centos-requirements.txt | sudo xargs yum install -y
+	fi
+}
+
+function install_pylibs {
+	pip3 install -r python-requirements.txt
+}
 
+check_env
+install_std
 check_deps
+instal_pylibs
 
 # User friendly messages on error
 set -E
@@ -210,31 +249,37 @@ function install_qemu {
 
 # Start installation
 
-rm -rf dependencies
-mkdir dependencies
-
-if [ -z "$prefix" ]
+if [ $bare_metal -eq 0 ]
 then
-	prefix=${RISCV}
-fi
+	
+	rm -rf dependencies
+	mkdir dependencies
 
-if [ -n "$prefix" ]
-then
-	export PATH="$prefix:$prefix/bin:${PATH}"
-fi
+	if [ -z "$prefix" ]
+	then
+		prefix=${RISCV}
+	fi
+	
+	install_cmake
+	install_ninja
+	install_meson
+	install_libslirp
 
-install_cmake
-install_ninja
-install_meson
-install_libslirp
+	install_repo https://github.com/virtualsquare/s2argv-execs/archive/refs/tags/1.3.tar.gz s2argv-execs
+	install_repo https://github.com/rd235/vdeplug4/archive/refs/tags/v4.0.1.tar.gz vdeplug4
+	install_repo https://github.com/virtualsquare/libvdeslirp/archive/refs/tags/0.1.1.tar.gz libvdeslirp
+	install_repo https://github.com/virtualsquare/vdeplug_slirp/archive/refs/tags/0.1.0.tar.gz vdeplug_slirp
 
-install_repo https://github.com/virtualsquare/s2argv-execs/archive/refs/tags/1.3.tar.gz s2argv-execs
-install_repo https://github.com/rd235/vdeplug4/archive/refs/tags/v4.0.1.tar.gz vdeplug4
-install_repo https://github.com/virtualsquare/libvdeslirp/archive/refs/tags/0.1.1.tar.gz libvdeslirp
-install_repo https://github.com/virtualsquare/vdeplug_slirp/archive/refs/tags/0.1.0.tar.gz vdeplug_slirp
+	install_qemu
 
-install_qemu
+	cd .. && ./init-submodules.sh
 
-./init-submodules.sh
+
+	if [ "$os" = "centos" ]
+	then
+		sudo yum remove -y rm-python38-python
+	fi
+fi
 
 echo 'Installation completed'
+cd $INITWD
diff --git a/python-requirements.txt b/install/python-requirements.txt
similarity index 100%
rename from python-requirements.txt
rename to install/python-requirements.txt
diff --git a/ubuntu-requirements.txt b/install/ubuntu-requirements.txt
similarity index 96%
rename from ubuntu-requirements.txt
rename to install/ubuntu-requirements.txt
index 4c22b093..b0f4b3d7 100644
--- a/ubuntu-requirements.txt
+++ b/install/ubuntu-requirements.txt
@@ -19,3 +19,4 @@ build-essential
 libssl-dev
 pkg-config
 wget
+gettext

From 34b7866a42dfbdc726eee1d865e694c389f55742 Mon Sep 17 00:00:00 2001
From: Nathan Pemberton <nathanp@berkeley.edu>
Date: Tue, 26 Apr 2022 23:50:21 +0000
Subject: [PATCH 15/16] Switch to sourcing scl enable rather than using the scl
 command (it creates a subshell and messes everything up). This also refactors
 some stuff to make it simpler

---
 install/marshal-dependencies.sh | 105 ++++++++++----------------------
 1 file changed, 31 insertions(+), 74 deletions(-)

diff --git a/install/marshal-dependencies.sh b/install/marshal-dependencies.sh
index b99c54c2..2ef3a6f3 100755
--- a/install/marshal-dependencies.sh
+++ b/install/marshal-dependencies.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-#set -x
+# set -x
 
 # thanks to Giacomo Rizzi: some ideas have been taken from: https://github.com/gufoe/vuos-tutorial
 
@@ -20,89 +20,46 @@ cd "$(dirname "$0")"
 BASE=$(pwd)
 echo "BASE: $BASE"
 
-function check_env {
-	if [ -z ${RISCV} ]
-	then
-		echo "RISCV environment variable NOT FOUND"
-		exit 1
-	fi
+if [ -z ${RISCV} ]
+then
+	echo "RISCV environment variable NOT FOUND"
+	exit 1
+fi
 
-	_=$(which apt)
+# Determine Ubuntu vs Centos
+_=$(which apt)
+if [ $? -eq 0 ]
+then
+	os="deb/ubuntu"
+else
+	_=$(which yum)
 	if [ $? -eq 0 ]
-	then 
-		os="deb/ubuntu"
-	else
-		_=$(which yum)
-		if [ $? -eq 0 ]
-		then
-			os="centos"
-		else
-			echo "yum/apt NOT FOUND"
-			exit 1
-		fi
-	fi
-
-}
-
-function check_deps {
-
-	if [ $bare_metal -eq 1 ] && [ "$os" = "centos" ]
 	then
-		_=$(which python3)
-		if [ $? -ne 0 ]
-		then
-			echo "python3 not found"
-			exit 1
-		fi
-	else 
-		_=$(which python3.8)
-		if [ $? -ne 0 ]
-		then
-			echo "python3.8 not found"
-			exit 1
-		fi
-	fi
-		
-	_=$(which unzip)
-	if [ $? -ne 0 ]
-	then
-		echo "unzip not found"
-		exit 1
-	fi
-	
-	_=$(which wget)
-	if [ $? -ne 0 ]
-	then
-		echo "wget not found"
+		os="centos"
+	else
+		echo "yum/apt NOT FOUND"
 		exit 1
 	fi
+fi
 
-}
 
-function install_std {
-	if [ "$os" = "deb/ubuntu" ]
-	then
-		cat ubuntu-requirements.txt | sudo xargs apt-get install -y
-	elif [ "$os" = "centos" ]
+echo -e "\nInstalling standard packages"
+if [ "$os" = "deb/ubuntu" ]
+then
+	cat ubuntu-requirements.txt | sudo xargs apt-get install -y
+elif [ "$os" = "centos" ]
+then
+	if [ $bare_metal -eq 0 ]
 	then
-		if [ $bare_metal -eq 0 ]
-		then
-			sudo yum install -y centos-release-scl
-			sudo yum install -y rh-python38
-			scl enable rh-python38 bash
-		fi
-		cat centos-requirements.txt | sudo xargs yum install -y
+		sudo yum install -y centos-release-scl
+		sudo yum install -y rh-python38
+        source /opt/rh/rh-python38/enable
 	fi
-}
-
-function install_pylibs {
-	pip3 install -r python-requirements.txt
-}
+	cat centos-requirements.txt | sudo xargs yum install -y
+fi
 
-check_env
-install_std
-check_deps
-instal_pylibs
+echo -e "\nInstalling python dependencies"
+pip3 install --user -r python-requirements.txt
 
 # User friendly messages on error
 set -E

From dc691370cdbe1b0d1cf45c40dd266caef9c8775e Mon Sep 17 00:00:00 2001
From: Raghav Gupta <raghavgupta@berkeley.edu>
Date: Mon, 2 May 2022 06:05:53 +0000
Subject: [PATCH 16/16] fixed centos py38 issue + bug fix

---
 install/marshal-dependencies.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/install/marshal-dependencies.sh b/install/marshal-dependencies.sh
index 2ef3a6f3..eece72f6 100755
--- a/install/marshal-dependencies.sh
+++ b/install/marshal-dependencies.sh
@@ -49,12 +49,6 @@ then
 	cat ubuntu-requirements.txt | sudo xargs apt-get install -y
 elif [ "$os" = "centos" ]
 then
-	if [ $bare_metal -eq 0 ]
-	then
-		sudo yum install -y centos-release-scl
-		sudo yum install -y rh-python38
-        source /opt/rh/rh-python38/enable
-	fi
 	cat centos-requirements.txt | sudo xargs yum install -y
 fi
 
@@ -217,10 +211,26 @@ then
 		prefix=${RISCV}
 	fi
 	
+	# vde packages need cmake >3.13
 	install_cmake
+
+	# meson needs Python 3.8, not available on CentOS 7 w/o scl
+	if [ "$os" = "centos" ]
+	then
+		sudo yum install -y centos-release-scl
+		sudo yum install -y rh-python38
+        source /opt/rh/rh-python38/enable
+	fi
+
 	install_ninja
 	install_meson
 	install_libslirp
+	
+	# we're done with meson
+	if [ "$os" = "centos" ]
+	then
+		sudo yum remove -y rh-python38-python
+	fi
 
 	install_repo https://github.com/virtualsquare/s2argv-execs/archive/refs/tags/1.3.tar.gz s2argv-execs
 	install_repo https://github.com/rd235/vdeplug4/archive/refs/tags/v4.0.1.tar.gz vdeplug4
@@ -230,12 +240,6 @@ then
 	install_qemu
 
 	cd .. && ./init-submodules.sh
-
-
-	if [ "$os" = "centos" ]
-	then
-		sudo yum remove -y rm-python38-python
-	fi
 fi
 
 echo 'Installation completed'