more changes...added cdms and gsm based bandwidth tests to resolve the depends issue

2 files changed, 37 insertions, 5 deletions

diff --git a/jobs/mobilebroadband.txt.in b/jobs/mobilebroadband.txt.in
index da4bbbb..1ceebf5 100644
--- a/jobs/mobilebroadband.txt.in
+++ b/jobs/mobilebroadband.txt.in
@@ -56,11 +56,13 @@ command:
 _description: Creates a mobile broadband connection for a CDMA based modem and checks the connection to ensure it's working.
 
 plugin: local
-id: mobilebroadband/maximum_bandwidth
+id: mobilebroadband/maximum_bandwidth_gsm
 requires:
 device.category == 'NETWORK'
 package.name == 'zenity'
 package.name == 'iperf'
+environ: IPERF_SERVER FTP_SERVER 
+depends: mobilebroadband/gsm_connection
 command:
 cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
 plugin: user-verify
@@ -82,3 +84,33 @@ command:
 _description:
 This test executes a maximum throughput test against all the devices found on the system.
 
+plugin: local
+id: mobilebroadband/maximum_bandwidth_cdma
+requires:
+ device.category == 'NETWORK'
+ package.name == 'zenity'
+ package.name == 'iperf'
+environ: IPERF_SERVER FTP_SERVER 
+depends: mobilebroadband/cdma_connection
+command:
+ cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"'
+ plugin: user-verify
+ user: root
+ id: mobilebroadband/maximum_bandwidth_$2
+ requires: device.path == "$1"
+ command: network test -i $2 -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'mobile broadband max bw $2'
+ estimated_duration: 330.0
+ _description:
+ PURPOSE:
+ User verification of whether the observed transfer throughput is acceptable
+ for the type and maximum speed of each interface.
+ STEPS:
+ 1. Read the network test summary and confirm that the throughput is acceptable.
+ 2. If needed, click "Test" again to repeat the transfer test.
+ VERIFICATION:
+ Was the reported throughput acceptable for the type and maximum speed of this interface?
+ EOF
+_description:
+ This test executes a maximum throughput test against all the devices found on the system.
+
+
diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 9920e28..fbf5295 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -86,7 +86,7 @@ id: suspend/iperf_before_suspend_mobilebroadband_gsm_auto
 depends: mobilebroadband/gsm_connection
 estimated_duration: 20.0
 user: root
-environ: GSM_CONN_NAME GSM_APN GSM_USERNAME GSM_PASSWORD
+environ: IPERF_SERVER FTP_SERVER
 command: 
 INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep gsm |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
@@ -99,7 +99,7 @@ id: suspend/iperf_before_suspend_mobilebroadband_cdma_auto
 depends: mobilebroadband/cdma_connection
 estimated_duration: 20.0
 user: root
-environ: CDMA_CONN_NAME CDMA_USERNAME CDMA_PASSWORD
+environ: IPERF_SERVER FTP_SERVER
 command: 
 INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep cdma |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
@@ -705,7 +705,7 @@ id: suspend/iperf_after_suspend_mobilebroadband_gsm_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 user: root
-environ: GSM_CONN_NAME GSM_APN GSM_USERNAME GSM_PASSWORD
+environ: IPERF_SERVER FTP_SERVER
 command: 
 INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep gsm |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
@@ -718,7 +718,7 @@ id: suspend/iperf_after_suspend_mobilebroadband_cdma_auto
 depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 user: root
-environ: CDMA_CONN_NAME CDMA_USERNAME CDMA_PASSWORD
+environ: IPERF_SERVER FTP_SERVER
 command: 
 INTERFACE=`nmcli -t -f GENERAL -m tabular dev list |grep cdma |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1