[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 631: merge the modification of network support for fast models

Message ID 20130626111219.4750.30312.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Liu Yongqin June 26, 2013, 11:12 a.m.
Merge authors:
  Yongqin Liu (liuyq0307)
Related merge proposals:
  https://code.launchpad.net/~liuyq0307/lava-dispatcher/fastmodel-network-support/+merge/170498
  proposed by: Yongqin Liu (liuyq0307)
  review: Approve - Yongqin Liu (liuyq0307)
------------------------------------------------------------
revno: 631 [merge]
committer: Yongqin Liu <yongqin.liu@linaro.org>
branch nick: lava-dispatcher
timestamp: Wed 2013-06-26 19:11:09 +0800
message:
  merge the modification of network support for fast models
modified:
  lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf
  lava_dispatcher/device/fastmodel.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription

Patch

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf	2013-06-19 16:22:43 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/rtsm_ve-armv8.conf	2013-06-25 10:50:02 +0000
@@ -7,11 +7,11 @@ 
 # how long ubuntu takes to boot to prompt
 boot_linaro_timeout = 500
 
-# if you do dhcp on boot, adb will not work (asac) on fastmodels
-enable_network_after_boot_android = 0
+#after enabled the network, we can set it to true
+enable_network_after_boot_android = 1
 
-# we do usermode networking over the loopback
-default_network_interface = lo
+# change to use eth0 after we enabled the network
+default_network_interface = eth0
 
 bootloader_prompt = Start:
 
@@ -50,6 +50,7 @@ 
 sim_bin = /opt/arm/RTSMv8_VE/bin/model_shell64
 sim_model = /opt/arm/RTSMv8_VE/models/Linux64_GCC-4.1/RTSM_VE_AEMv8A.so
 android_adb_port = 5555
+interfaceName = armv8_01
 
 simulator_version_command = %(sim_bin)s --version | grep "Model Shell" | sed 's/Model Shell //'
 
@@ -59,8 +60,6 @@ 
 
 boot_options =
         motherboard.mmc.p_mmc_file
-	motherboard.hostbridge.userNetPorts
-	motherboard.hostbridge.userNetworking
 	motherboard.smsc_91c111.enabled
 	cluster.NUM_CORES
 	cluster.cpu0.unpredictable_WPMASKANDBAS
@@ -72,17 +71,18 @@ 
 	cluster.cpu3.unpredictable_WPMASKANDBAS
 	cluster.cpu3.unpredictable_non-contigous_BAS
 	cluster.take_ccfail_undef
+	motherboard.hostbridge.interfaceName
+	motherboard.smsc_91c111.mac_address
+
+[motherboard.smsc_91c111.mac_address]
+default="auto"
+
+[motherboard.hostbridge.interfaceName]
+default="%(interfaceName)s"
 
 [motherboard.mmc.p_mmc_file]
 default = {IMG}
 
-[motherboard.hostbridge.userNetPorts]
-default="%(android_adb_port)s=%(android_adb_port)s"
-
-[motherboard.hostbridge.userNetworking]
-default = 1
-allowed = 0,1
-
 [motherboard.smsc_91c111.enabled]
 default = 1
 allowed = 0,1

=== modified file 'lava_dispatcher/device/fastmodel.py'
--- lava_dispatcher/device/fastmodel.py	2013-06-18 23:22:13 +0000
+++ lava_dispatcher/device/fastmodel.py	2013-06-25 10:50:02 +0000
@@ -82,8 +82,9 @@ 
                 f.write('\n# LAVA CUSTOMIZATIONS\n')
                 #make sure PS1 is what we expect it to be
                 f.write('PS1="%s"\n' % self.ANDROID_TESTER_PS1)
-                # fast model usermode networking does not support ping
-                f.write('alias ping="echo LAVA-ping override 1 received"\n')
+                if not self.config.enable_network_after_boot_android:
+                    # fast model usermode networking does not support ping
+                    f.write('alias ping="echo LAVA-ping override 1 received"\n')
 
         self.deployment_data = Target.android_deployment_data