Merge branch 'develop' into bugfix-48-L1L2signaling

cmake_targets/autotests/README.txt

@@ -98,43 +98,54 @@ Obj.#   Case#   Test#	Description
 
 
 01      55              lte-softmodem tests with USRP B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX, 2TX/2RX
-01      55      00      Band 7 FDD 5MHz UL Throughput for 60 sec for 1TX/1RX
-01      55      01      Band 7 FDD 10MHz UL Throughput for 60 sec for 1TX/1RX
-01      55      02      Band 7 FDD 20MHz UL Throughput for 60 sec for 1TX/1RX
-01      55      03      Band 7 FDD 5MHz DL Throughput for 60 sec for 1TX/1RX
-01      55      04      Band 7 FDD 10MHz DL Throughput for 60 sec for 1TX/1RX
-01      55      05      Band 7 FDD 20MHz DL Throughput for 60 sec for 1TX/1RX
-01      55      06      Band 7 FDD 5MHz UL Throughput for 60 sec for 2TX/2RX
-01      55      07      Band 7 FDD 10MHz UL Throughput for 60 sec for 2TX/2RX
-01      55      08      Band 7 FDD 20MHz UL Throughput for 60 sec for 2TX/2RX
-01      55      09      Band 7 FDD 5MHz DL Throughput for 60 sec for 2TX/2RX
-01      55      10      Band 7 FDD 10MHz DL Throughput for 60 sec for 2TX/2RX
-01      55      11      Band 7 FDD 20MHz DL Throughput for 60 sec for 2TX/2RX
+01      55      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      55      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      55      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      55      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      55      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      55      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+01      55      06      Band 7 FDD 5MHz UL Throughput for 300 sec for 2TX/2RX
+01      55      07      Band 7 FDD 10MHz UL Throughput for 300 sec for 2TX/2RX
+01      55      08      Band 7 FDD 20MHz UL Throughput for 300 sec for 2TX/2RX
+01      55      09      Band 7 FDD 5MHz DL Throughput for 300 sec for 2TX/2RX
+01      55      10      Band 7 FDD 10MHz DL Throughput for 300 sec for 2TX/2RX
+01      55      11      Band 7 FDD 20MHz DL Throughput for 300 sec for 2TX/2RX
 
 01      56              lte-softmodem tests with USRP B210  RF as eNB and  OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
-
+01      56      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      56      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      56      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      56      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      56      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      56      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      57              lte-softmodem tests with USRP B210 RF as eNB and OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
+01      57      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      57      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      57      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      57      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      57      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      57      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      58               lte-softmodem tests with USRP X310 RF as eNB and ALU EPC w/ Bandrich COTS UE for `TX/1RX, 2TX/2RX
-01      58      00      Band 7 FDD 5MHz UL Throughput for 60 sec for 1TX/1RX
-01      58      01      Band 7 FDD 10MHz UL Throughput for 60 sec for 1TX/1RX
-01      58      02      Band 7 FDD 20MHz UL Throughput for 60 sec for 1TX/1RX
-01      58      03      Band 7 FDD 5MHz DL Throughput for 60 sec for 1TX/1RX
-01      58      04      Band 7 FDD 10MHz DL Throughput for 60 sec for 1TX/1RX
-01      58      05      Band 7 FDD 20MHz DL Throughput for 60 sec for 1TX/1RX
+01      58      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      58      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      58      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      58      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      58      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      58      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      59              lte-softmodem tests with USRP X310  RF as eNB and  OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
 
 01      61              lte-softmodem tests with USRP X310 RF as eNB and OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE
 
 01      61              lte-softmodem tests with EXMIMO RF as eNB and ALU EPC w/ Bandrich COTS UE for `TX/1RX, 2TX/2RX
-01      61      00      Band 7 FDD 5MHz UL Throughput for 60 sec for 1TX/1RX
-01      61      01      Band 7 FDD 10MHz UL Throughput for 60 sec for 1TX/1RX
-01      61      02      Band 7 FDD 20MHz UL Throughput for 60 sec for 1TX/1RX
-01      61      03      Band 7 FDD 5MHz DL Throughput for 60 sec for 1TX/1RX
-01      61      04      Band 7 FDD 10MHz DL Throughput for 60 sec for 1TX/1RX
-01      61      05      Band 7 FDD 20MHz DL Throughput for 60 sec for 1TX/1RX
+01      61      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+01      61      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+01      61      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+01      61      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+01      61      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+01      61      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 01      62              lte-softmodem tests with EXMIMO RF as eNB and OAI EPC (eNB and EPC are on same machines) w/ Bandrich COTS UE
 01      63              lte-softmodem tests with EXMIMO RF as eNB and  OAI EPC (eNB and EPC are on different machines) w/ Bandrich COTS UE

cmake_targets/autotests/core.py

@@ -192,6 +192,7 @@ class core:
         if index == 0 or index == 1 :
             return self.oai.before
         else:
+            print "command = " + command + "rsp1  = " + rsp1 + " rsp2 = " + rsp2 + " index = " + str(index)
             raise log.err(self.failed(command, rsp1 + ' or ' + rsp2,debug))
 
            
@@ -240,7 +241,7 @@ class core:
         if  (rsp.find(expect) == -1):
             return 'OK'
         else:
-            print "command = " + cmd + "expect  = " + expect + "rsp = " + rsp
+            print "command = " + command + "expect  = " + expect + "rsp = " + rsp
             raise log.err(self.failed(command, expect,debug))
 
     

cmake_targets/autotests/tools/configure_cots_bandrich_ue.py

@@ -126,8 +126,8 @@ def start_ue () :
           break
         ip = IPRoute()
         idx = ip.link_lookup(ifname=iface)[0]
-        os.system ('route add 192.172.0.1 ppp0')
-        os.system ('ping 192.172.0.1')
+        os.system ('route add ' + gw + ' ppp0')
+        os.system ('ping ' + gw)
         break
      except Exception, e:
         error = ' Interface ' + iface + 'does not exist...'
@@ -188,7 +188,10 @@ def find_usb_path(idVendor, idProduct):
             return tmpdir
   return ''
 
-for arg in sys.argv[1:]:
+i=1
+gw='192.172.0.1'
+while i <  len(sys.argv):
+    arg=sys.argv[i]
     if arg == '--start-ue' :
         find_open_port()
         print 'Using Serial port : ' + serial_port  
@@ -199,8 +202,17 @@ for arg in sys.argv[1:]:
         stop_ue()
     elif arg == '--reset-ue' :
         reset_ue()
+    elif arg == '-gw' :
+        gw = sys.argv[i+1]
+        i=i+1
+    elif arg == '-h' :
+        print "--reset-ue:  Reset the UE on USB Bus. Similar to unplugging and plugging the UE"
+        print "--stop-ue:  Stop the UE. Send DETACH command" 
+        print "--start-ue:  Start the UE. Send ATTACH command"
+        print "-gw:  Specify the default gw as sometimes the gateway/route arguments are not set properly via wvdial"
     else :
         print " Script called with wrong arguments, arg = " + arg
         sys.exit()
+    i = i +1
 
 

cmake_targets/autotests/tools/search_repl.py

@@ -19,9 +19,11 @@ file.close()
 
 
 if keyword == 'mme_ip_address':
-   #string =  (re.sub(r"mme_ip_address\s*=\s*\([^\$]+)\)\s*;\s*", r"<% tex \1 %>", t, re.M)
    replacement_text = keyword + ' =  ( { ' + replacement_text + ' } ) ; '
    string = re.sub(r"mme_ip_address\s*=\s*\(([^\$]+?)\)\s*;", replacement_text, string, re.M)
+elif keyword == 'IPV4_LIST':
+   replacement_text = keyword + ' =  ( ' + replacement_text + '  ) ; '
+   string = re.sub(r"IPV4_LIST\s*=\s*\(([^\$]+?)\)\s*;", replacement_text, string, re.M)
 else :
    replacement_text = keyword + ' =  ' + replacement_text + ' ; '
    string = re.sub(r"%s\s*=\s*([^\$]+?)\s*;" % keyword , replacement_text, string, re.M)