Merge remote-tracking branch 'origin/rocko' into rocko-merge

Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>

2 files changed, 9 insertions, 0 deletions

diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 6b1106d..4918314 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -81,6 +81,7 @@ class QemuCommand(object):
         self.gdb = args.gdb
         self.pcap = args.pcap
         self.overlay = args.overlay
+        self.secondary_network = args.secondary_network
 
     def command_line(self):
         netuser = 'user,hostfwd=tcp:0.0.0.0:%d-:22,restrict=off' % self.ssh_port
@@ -104,6 +105,11 @@ class QemuCommand(object):
         ]
         if self.pcap:
             cmdline += ['-net', 'dump,file=' + self.pcap]
+        if self.secondary_network:
+            cmdline += [
+                '-net', 'nic,vlan=1,macaddr='+random_mac(),
+                '-net', 'socket,vlan=1,mcast=230.0.0.1:1234,localaddr=127.0.0.1',
+            ]
         if self.gui:
             cmdline += ["-serial", "stdio"]
         else:
diff --git a/scripts/run-qemu-ota b/scripts/run-qemu-ota
index 56e4fbc..b2f55e9 100755
--- a/scripts/run-qemu-ota
+++ b/scripts/run-qemu-ota
@@ -33,6 +33,9 @@ def main():
                         help='Use an overlay storage image file. Will be created if it does not exist. ' +
                              'This option lets you have a persistent image without modifying the underlying image ' +
                              'file, permitting multiple different persistent machines.')
+    parser.add_argument('--secondary-network', action='store_true', dest='secondary_network',
+                        help='Give the image a second network card connected to a virtual network. ' +
+                             'This can be used to test Uptane Primary/Secondary communication.')
     parser.add_argument('-n', '--dry-run', help='Print qemu command line rather then run it', action='store_true')
     args = parser.parse_args()
     try: