summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortriatmoko2011-07-12 19:24:51 +0200
committertriatmoko2011-07-12 19:24:51 +0200
commit6ad5dc71e0424324755275addcba6636d2f51796 (patch)
tree15caa71346ed4df26a50774c67afeb31d2378d77
parentBetter working code for landlineCall. Still needs improvements. (diff)
downloadgsm-selftest-6ad5dc71e0424324755275addcba6636d2f51796.tar.gz
gsm-selftest-6ad5dc71e0424324755275addcba6636d2f51796.tar.xz
gsm-selftest-6ad5dc71e0424324755275addcba6636d2f51796.zip
index.php for temporary website interface
-rw-r--r--Controller/Controller-SecondType.py13
-rw-r--r--Website/index.php91
-rw-r--r--Website/index.php~22
-rw-r--r--Website/preview-index.php91
-rw-r--r--notFinishedCode/client.py2
5 files changed, 214 insertions, 5 deletions
diff --git a/Controller/Controller-SecondType.py b/Controller/Controller-SecondType.py
index a45fd05..d9b4e9b 100644
--- a/Controller/Controller-SecondType.py
+++ b/Controller/Controller-SecondType.py
@@ -200,8 +200,8 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
while 1:
resultOrig = X.receiveData()
resultDest = y.receiveData()
- print "Origin1: ", resultOrig
- print "Destination1: ", resultDest
+ print "Test Result origin: ", resultOrig
+ print "Test Result Destination: ", resultDest
if resultOrig <> "" or resultDest <> "":
break
@@ -210,8 +210,13 @@ def FuncTest(orig, origAdd, dest, destAdd, destNo):
if resultOrig == "failed" or resultDest == "failed":
#db.execute ("update result table")
repeatTest="true"
- print "Origin2: ", resultOrig
- print "Destination1: ", resultDest
+ print "Second test result origin: ", resultOrig
+ print "Second test result Destination: ", resultDest
+ else:
+ print "Second test result origin: ", resultOrig
+ print "Second test result Destination: ", resultDest
+ x.sendData('terminated') # signal caller to terminate
+ y.sendData('terminated') # signal receiver to terminate
else: #save to database, tell handler to terminated
#db.execute ("update result table")
diff --git a/Website/index.php b/Website/index.php
new file mode 100644
index 0000000..45ad266
--- /dev/null
+++ b/Website/index.php
@@ -0,0 +1,91 @@
+<HTML>
+ <HEAD>
+ <TITLE>Customize Your Test DUde!!</TITLE>
+ <SCRIPT LANGUAGE="JavaScript">
+ <!--
+ function allClicked()
+ {
+ document.form1.sip_gsmrz1.checked = true
+ document.form1.sip_gsmrz2.checked = true
+ document.form1.sip_gsmrz3.checked = true
+ document.form1.sip_landln.checked = true
+ document.form1.sip_sipuniv.checked = true
+ document.form1.gsmrz1_sip.checked = true
+ document.form1.gsmrz2_sip.checked = true
+ document.form1.gsmrz3_sip.checked = true
+ document.form1.gsmrz1_gsmrz2.checked = true
+ document.form1.gsmrz1_gsmrz3.checked = true
+ document.form1.gsmrz2_gsmrz3.checked = true
+ }
+
+ function sipClicked()
+ {
+ document.form1.sip_gsmrz1.checked = true
+ document.form1.sip_gsmrz2.checked = true
+ document.form1.sip_gsmrz3.checked = true
+ document.form1.sip_landln.checked = true
+ document.form1.sip_sipuniv.checked = true
+ document.form1.gsmrz1_sip.checked = false
+ document.form1.gsmrz2_sip.checked = false
+ document.form1.gsmrz3_sip.checked = false
+ document.form1.gsmrz1_gsmrz2.checked = false
+ document.form1.gsmrz1_gsmrz3.checked = false
+ document.form1.gsmrz2_gsmrz3.checked = false
+ }
+
+ function gsmClicked()
+ {
+ document.form1.sip_gsmrz1.checked = false
+ document.form1.sip_gsmrz2.checked = false
+ document.form1.sip_gsmrz3.checked = false
+ document.form1.sip_landln.checked = false
+ document.form1.sip_sipuniv.checked = false
+ document.form1.gsmrz1_sip.checked = true
+ document.form1.gsmrz2_sip.checked = true
+ document.form1.gsmrz3_sip.checked = true
+ document.form1.gsmrz1_gsmrz2.checked = true
+ document.form1.gsmrz1_gsmrz3.checked = true
+ document.form1.gsmrz2_gsmrz3.checked = true
+ }
+
+
+ function clearCheckboxes()
+ {
+ document.form1.sip_gsmrz1.checked = false
+ document.form1.sip_gsmrz2.checked = false
+ document.form1.sip_gsmrz3.checked = false
+ document.form1.sip_landln.checked = false
+ document.form1.sip_sipuniv.checked = false
+ document.form1.gsmrz1_sip.checked = false
+ document.form1.gsmrz2_sip.checked = false
+ document.form1.gsmrz3_sip.checked = false
+ document.form1.gsmrz1_gsmrz2.checked = false
+ document.form1.gsmrz1_gsmrz3.checked = false
+ document.form1.gsmrz2_gsmrz3.checked = false
+ }
+
+ //-->
+ </SCRIPT>
+ </HEAD>
+
+ <BODY>
+ <H1>Customize Your Test DUde!!</H1>
+ <BR>
+ <FORM NAME="form1">
+ <INPUT TYPE=CHECKBOX NAME="sip_gsmrz1"> SIP to GSM RZ1<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_gsmrz2"> SIP to GSM RZ2<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_gsmrz3"> SIP to GSM RZ3<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_landln"> SIP to Landline<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_sipuniv"> SIP to SIP University Phone line<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz1_sip"> GSM RZ 1 to SIP<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz2_sip"> GSM RZ 2 to SIP<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz3_sip"> GSM RZ 3 to SIP<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz2"> GSM RZ 1 to GSM RZ 2<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz3"> GSM RZ 1 to GSM RZ 3<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz2_gsmrz3"> GSM RZ 2 to GSM RZ 3<BR>
+ <BR>
+ <INPUT TYPE=button VALUE="All Test" ONCLICK="allClicked()" > <INPUT TYPE=button VALUE="SIP Test" ONCLICK="sipClicked()" > <INPUT TYPE=button VALUE="GSM Test" ONCLICK="gsmClicked()" > <INPUT TYPE=button VALUE="Unchecked All" onclick="clearCheckboxes()"> <INPUT TYPE=SUBMIT VALUE="submit">
+ </FORM>
+
+ </BODY>
+</HTML> \ No newline at end of file
diff --git a/Website/index.php~ b/Website/index.php~
new file mode 100644
index 0000000..3d534e6
--- /dev/null
+++ b/Website/index.php~
@@ -0,0 +1,22 @@
+<head><TITLE>test software</TITLE></head>
+<strong><h2>What Kind of Test do you want??</h2></strong>
+
+<FORM ACTION="../cgi-bin/mycgi.pl">
+
+<INPUT TYPE=CHECKBOX NAME="All_Test"> All Tests<BR>
+<INPUT TYPE=CHECKBOX NAME="GSM_part"> GSM Side<BR>
+<INPUT TYPE=CHECKBOX NAME="SIP_Part"> SIP Side<BR>
+<INPUT TYPE=CHECKBOX NAME="sip_gsmrz1"> SIP to GSM RZ1<BR>
+<INPUT TYPE=CHECKBOX NAME="sip_gsmrz2"> SIP to GSM RZ2<BR>
+<INPUT TYPE=CHECKBOX NAME="sip_gsmrz3"> SIP to GSM RZ3<BR>
+<INPUT TYPE=CHECKBOX NAME="sip_landln"> SIP to Landline<BR>
+<INPUT TYPE=CHECKBOX NAME="sip_sipuniv"> SIP to SIP University Phone line<BR>
+<INPUT TYPE=CHECKBOX NAME="gsmrz1_sip"> GSM RZ 1 to SIP<BR>
+<INPUT TYPE=CHECKBOX NAME="gsmrz2_sip"> GSM RZ 2 to SIP<BR>
+<INPUT TYPE=CHECKBOX NAME="gsmrz3_sip"> GSM RZ 3 to SIP<BR>
+<INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz2"> GSM RZ 1 to GSM RZ 2<BR>
+<INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz3"> GSM RZ 1 to GSM RZ 3<BR>
+<INPUT TYPE=CHECKBOX NAME="gsmrz2_gsmrz3"> GSM RZ 2 to GSM RZ 3<BR>
+<BR>
+<INPUT TYPE=SUBMIT VALUE="submit">
+</FORM>
diff --git a/Website/preview-index.php b/Website/preview-index.php
new file mode 100644
index 0000000..45ad266
--- /dev/null
+++ b/Website/preview-index.php
@@ -0,0 +1,91 @@
+<HTML>
+ <HEAD>
+ <TITLE>Customize Your Test DUde!!</TITLE>
+ <SCRIPT LANGUAGE="JavaScript">
+ <!--
+ function allClicked()
+ {
+ document.form1.sip_gsmrz1.checked = true
+ document.form1.sip_gsmrz2.checked = true
+ document.form1.sip_gsmrz3.checked = true
+ document.form1.sip_landln.checked = true
+ document.form1.sip_sipuniv.checked = true
+ document.form1.gsmrz1_sip.checked = true
+ document.form1.gsmrz2_sip.checked = true
+ document.form1.gsmrz3_sip.checked = true
+ document.form1.gsmrz1_gsmrz2.checked = true
+ document.form1.gsmrz1_gsmrz3.checked = true
+ document.form1.gsmrz2_gsmrz3.checked = true
+ }
+
+ function sipClicked()
+ {
+ document.form1.sip_gsmrz1.checked = true
+ document.form1.sip_gsmrz2.checked = true
+ document.form1.sip_gsmrz3.checked = true
+ document.form1.sip_landln.checked = true
+ document.form1.sip_sipuniv.checked = true
+ document.form1.gsmrz1_sip.checked = false
+ document.form1.gsmrz2_sip.checked = false
+ document.form1.gsmrz3_sip.checked = false
+ document.form1.gsmrz1_gsmrz2.checked = false
+ document.form1.gsmrz1_gsmrz3.checked = false
+ document.form1.gsmrz2_gsmrz3.checked = false
+ }
+
+ function gsmClicked()
+ {
+ document.form1.sip_gsmrz1.checked = false
+ document.form1.sip_gsmrz2.checked = false
+ document.form1.sip_gsmrz3.checked = false
+ document.form1.sip_landln.checked = false
+ document.form1.sip_sipuniv.checked = false
+ document.form1.gsmrz1_sip.checked = true
+ document.form1.gsmrz2_sip.checked = true
+ document.form1.gsmrz3_sip.checked = true
+ document.form1.gsmrz1_gsmrz2.checked = true
+ document.form1.gsmrz1_gsmrz3.checked = true
+ document.form1.gsmrz2_gsmrz3.checked = true
+ }
+
+
+ function clearCheckboxes()
+ {
+ document.form1.sip_gsmrz1.checked = false
+ document.form1.sip_gsmrz2.checked = false
+ document.form1.sip_gsmrz3.checked = false
+ document.form1.sip_landln.checked = false
+ document.form1.sip_sipuniv.checked = false
+ document.form1.gsmrz1_sip.checked = false
+ document.form1.gsmrz2_sip.checked = false
+ document.form1.gsmrz3_sip.checked = false
+ document.form1.gsmrz1_gsmrz2.checked = false
+ document.form1.gsmrz1_gsmrz3.checked = false
+ document.form1.gsmrz2_gsmrz3.checked = false
+ }
+
+ //-->
+ </SCRIPT>
+ </HEAD>
+
+ <BODY>
+ <H1>Customize Your Test DUde!!</H1>
+ <BR>
+ <FORM NAME="form1">
+ <INPUT TYPE=CHECKBOX NAME="sip_gsmrz1"> SIP to GSM RZ1<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_gsmrz2"> SIP to GSM RZ2<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_gsmrz3"> SIP to GSM RZ3<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_landln"> SIP to Landline<BR>
+ <INPUT TYPE=CHECKBOX NAME="sip_sipuniv"> SIP to SIP University Phone line<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz1_sip"> GSM RZ 1 to SIP<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz2_sip"> GSM RZ 2 to SIP<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz3_sip"> GSM RZ 3 to SIP<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz2"> GSM RZ 1 to GSM RZ 2<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz1_gsmrz3"> GSM RZ 1 to GSM RZ 3<BR>
+ <INPUT TYPE=CHECKBOX NAME="gsmrz2_gsmrz3"> GSM RZ 2 to GSM RZ 3<BR>
+ <BR>
+ <INPUT TYPE=button VALUE="All Test" ONCLICK="allClicked()" > <INPUT TYPE=button VALUE="SIP Test" ONCLICK="sipClicked()" > <INPUT TYPE=button VALUE="GSM Test" ONCLICK="gsmClicked()" > <INPUT TYPE=button VALUE="Unchecked All" onclick="clearCheckboxes()"> <INPUT TYPE=SUBMIT VALUE="submit">
+ </FORM>
+
+ </BODY>
+</HTML> \ No newline at end of file
diff --git a/notFinishedCode/client.py b/notFinishedCode/client.py
index f414c5b..81f5231 100644
--- a/notFinishedCode/client.py
+++ b/notFinishedCode/client.py
@@ -65,7 +65,7 @@ class Connection:
return 0
#MAIN PART
-x = Connection('132.230.4.69',50008)
+x = Connection('132.230.4.60',50008)
print x.connect()
x.sendData('hello server :)')
print x.receiveData()