* add an OTG test to pre-ci

* fix the bug for selecting the destination address/ID



git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5669 818b1a75-f10b-46b9-bf7c-635c3b92a50f

targets/TEST/OAI/case02.py

@@ -76,7 +76,7 @@ def execute(oai, user, pw, logfile,logdir):
         conf = '-a -A AWGN -n 100 -l7'
         trace = logdir + '/log_' + case + test + '_3.txt;'
         tee = ' 2>&1 | tee ' + trace
-        diag = 'Error(s) found in the execution, check the execution logs'
+        diag = '[E] Error(s) found during the execution, check the execution logs'
         oai.send_expect_false('./oaisim.rel8 ' + conf, '[E]', 30)
         
     except log.err, e:
@@ -187,3 +187,15 @@ def execute(oai, user, pw, logfile,logdir):
         log.ok(case, test, name, conf, '', logfile)
         
 
+    try:
+        test='07'
+        name = 'Run oai.rel8.abs.ocg.otg'
+        diag = 'Check the scenario if the tests 0202 and 0203 are passed.'
+        conf = '-a -c26'
+        trace = logdir + '/log_' + case + test + '.txt'
+        tee = ' 2>&1 | tee ' + trace
+        oai.send_expect('./oaisim.rel8 ' + conf + tee, ' DL and UL loss rate below 10% ', 500)
+    except log.err, e:
+        log.fail(case, test, name, conf, e.value, diag, logfile,trace)
+    else:
+        log.ok(case, test, name, conf, '', logfile)

targets/TEST/OAI/openair.py

@@ -92,11 +92,12 @@ class openair(core):
         return (stdout, stderr)
 
     def connect(self, username, password, prompt):
-        self.prompt1 = self.shell_prompt
+        self.prompt2 = self.shell_prompt
         if not prompt :
-            self.prompt2 = self.prompt1
+            self.prompt1 = self.prompt2
         else :
-            self.prompt2 = prompt 
+            self.prompt1 = prompt
+        
         while 1:
             try:
                 if  not username:

targets/TEST/OAI/test01.py

@@ -53,7 +53,7 @@ import case05
 from  openair import *
 
 debug = 0
-prompt = '$'
+prompt2 = '$'
 pw =''
 i = 0
 dlsim=0
@@ -64,7 +64,7 @@ for arg in sys.argv:
     elif arg == '-dd':
         debug = 2
     elif arg == '-p' :
-        prompt = sys.argv[i+1]
+        prompt2 = sys.argv[i+1]
     elif arg == '-w' :
         pw = sys.argv[i+1]
     elif arg == '-P' :
@@ -84,6 +84,7 @@ try:
     user = getpass.getuser()
     print '\n******* Note that the user <'+user+'> should be a sudoer *******\n'
     print '******* Connecting to the localhost to perform the test *******\n'
+    print '******* Make sure that the prompt is correct *******\n'
    
     if not pw :
         print "username: " + user 
@@ -91,7 +92,9 @@ try:
     else :
         print "username: " + user 
         #print "password: " + pw 
-    print "prompt:   " + prompt
+    
+    prompt = os.getenv("PS1")[-2]
+    print "your prompt:   " + prompt
     
     oai.connect(user,pw,prompt)
     #oai.get_shell()