Merge branch 'develop' into enhancement-57-UHD-interfacing

cmake_targets/autotests/run_exec_lte-softmodem_tests.py

@@ -1099,7 +1099,6 @@ except KeyError:
    sys.exit(1)
 
 
-
 # get the oai object
 host = os.uname()[1]
 #oai = openair('localdomain','calisson')
@@ -1208,6 +1207,11 @@ if localshell == 0:
            result = oai_list[index].send_expect_false('sudo -S -v','may not run sudo',True)
            print "Sudo permissions..." + result
            
+           print "Killing zombie ssh sessions from earlier sessions..."     
+           cmd='ps aux |grep \"/usr/bin/ssh -q -l guptar\"|tr -s \" \" :|cut -f 2 -d :|xargs kill -9 \''
+           result=oai_list[index].send_recv(cmd, True)
+           print result
+  
            print '\nCleaning Older running programs : ' + CleanUpOldProgs
            cleanOldPrograms(oai_list[index], CleanUpOldProgs, CleanUpAluLteBox, ExmimoRfStop)
 

cmake_targets/lte-simulators/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 set(PACKAGE_NAME "unitary_tests_simulators")
 set(PHYSIM True)
 set(RF_BOARD None)
-set(XFORMS True)
+set(XFORMS False)
 
 set(DEBUG_PHY False)
 set(MU_RECIEVER False)

cmake_targets/tools/stop_exmimo2

@@ -6,6 +6,7 @@ if [ "$OPENAIR_DIR" == "" ]; then
   echo "Is the OPENAIR_DIR path set correctly? Exiting now"
   exit
 fi
+sudo -E bash -c 'echo 3 > /proc/sys/vm/drop_caches'
 
 #load the module
 sudo -E $OPENAIR_DIR/cmake_targets/tools/init_exmimo2

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.epc.local.conf

@@ -16,7 +16,6 @@ eNBs =
     tracking_area_code  =  "1";
 
     mobile_country_code =  "208";
-
     mobile_network_code =  "95";
 
        ////////// Physical parameters:
@@ -100,6 +99,7 @@ eNBs =
       }
     );
 
+
     srb1_parameters :
     {
         # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
@@ -129,28 +129,25 @@ eNBs =
         SCTP_OUTSTREAMS = 2;
     };
 
-
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.188.2.2";
-                              ipv6       = "192:168:30::17";
-                              active     = "yes";
-                              preference = "ipv4";
-                            }
-                          );
+    mme_ip_address      = ( {ipv4 = "192.170.0.1";
+                              ipv6="192:168:30::17";
+                              active="yes";
+                              preference="ipv4";});
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "tun2";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.188.2.2/24";
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0:3";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.170.0.2/24";
 
-        ENB_INTERFACE_NAME_FOR_S1U               = "lo";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.1/24";
-        ENB_PORT_FOR_S1U                         = 2153; # Spec 2152
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0:4";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.170.0.2/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
     log_config :
     {
-      global_log_level                      ="info";
+      global_log_level                      ="debug";
       global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
       hw_log_verbosity                      ="medium";
@@ -164,10 +161,6 @@ eNBs =
       pdcp_log_verbosity                    ="medium";
       rrc_log_level                         ="info";
       rrc_log_verbosity                     ="medium";
-      gtpu_log_level                        ="info";
-      gtpu_log_verbosity                    ="medium";
-      udp_log_level                         ="info";
-      udp_log_verbosity                     ="medium";
    };
 
   }