update

ci-scripts/conf_files/enb.conf

@@ -174,7 +174,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.1.12";
+    mme_ip_address      = ( { ipv4       = "192.168.104";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -192,13 +192,13 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
- ENB_INTERFACE_NAME_FOR_S1_MME = "enp1s0";
- ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.1.193";
+ ENB_INTERFACE_NAME_FOR_S1_MME = "eno1";
+ ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.1.68";
 
- ENB_INTERFACE_NAME_FOR_S1U = "enp1s0";
- ENB_IPV4_ADDRESS_FOR_S1U = "192.168.1.193";
+ ENB_INTERFACE_NAME_FOR_S1U = "eno1";
+ ENB_IPV4_ADDRESS_FOR_S1U = "192.168.1.68";
  ENB_PORT_FOR_S1U = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.1.193";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.1.68";
         ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
@@ -249,8 +249,8 @@ THREAD_STRUCT = (
 NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "yes";
-    FLEXRAN_INTERFACE_NAME = "enp1s0";
-    FLEXRAN_IPV4_ADDRESS   = "192.168.1.36";
+    FLEXRAN_INTERFACE_NAME = "eno1";
+    FLEXRAN_IPV4_ADDRESS   = "192.168.1.61";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
     FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/enb.l2sim.conf

@@ -176,7 +176,7 @@ eNBs =
     ////////// MME parameters:
     mme_ip_address = (
       {
-        ipv4       = "192.168.1.12";
+        ipv4       = "192.168.1.61";
         ipv6       = "192:168:30::17";
         active     = "yes";
         preference = "ipv4";
@@ -185,10 +185,10 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "enp1s0";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.1.193/24";
-        ENB_INTERFACE_NAME_FOR_S1U               = "enp1s0";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.1.193/24";
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eno1";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.1.68/24";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eno1";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.1.68/24";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
         ENB_IPV4_ADDRESS_FOR_X2C                 = "127.0.16.3/24";
         ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
@@ -221,8 +221,8 @@ THREAD_STRUCT = (
 NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "yes";
-    FLEXRAN_INTERFACE_NAME = "enp1s0";
-    FLEXRAN_IPV4_ADDRESS   = "192.168.1.36";
+    FLEXRAN_INTERFACE_NAME = "eno1";
+    FLEXRAN_IPV4_ADDRESS   = "192.168.1.61";
     FLEXRAN_PORT           = 2210;
     FLEXRAN_CACHE          = "/tmp";
     FLEXRAN_AWAIT_RECONF   = "no";

ci-scripts/conf_files/sudo virt-install --name=dev-server1 --m

+sudo virt-install --name=dev-server1 --memory=4096,maxmemory=4096 \
+--vcpus=4,maxvcpus=4 --os-type=linux \
+--location=/root/ubuntu-18.04.5-server-amd64.iso \
+--disk path=/var/lib/libvirt/images/oaicn.qcow2  \
+--bridge=br0 --graphics=none --console=pty,target_type=serial \
+--extra-args="console=tty0 console=ttyS0"
\ No newline at end of file

openair2/LAYER2/MAC/slicing/slicing.c

@@ -1284,22 +1284,18 @@ uint16_t get_slice_thrpt(module_id_t mod_id, UE_list_t *UE_list ){
 
   return slice_thrpt;
 }
-float get_slice_thrpt_(module_id_t mod_id, UE_list_t *UE_list ){
+float get_slice_thrpt_(module_id_t mod_id, UE_list_t *UE_list ,int CC_id){
 
   float slice_thrpt=0;
   for (int UE_id =UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
-        float thrpt=0;
-        int lcid=0;
-        for (lcid=NUM_MAX_SRB ; lcid < NUM_MAX_SRB + NUM_MAX_DRB; lcid++){
-           thrpt += (float)flexran_get_pdcp_tx_bytes_w(mod_id, UE_id, lcid);   
-         }
-        slice_thrpt += thrpt;
+        slice_thrpt += (float)flexran_get_total_TBS_dl(mod_id, UE_id, CC_id);   
+
 }
   /* only calculate the DRBs */ 
   
 
 
-  return slice_thrpt/16000;
+  return slice_thrpt;
 }
 /**
  * Schedule R D parameters
@@ -2151,7 +2147,7 @@ void ddqn_dl(module_id_t mod_id,
       static_n_rbg_sched += rbgalloc_mask[rbg];
     }
     p->arb =(get_slice_uesd_rbs(mod_id,&s->s[i]->UEs,CC_id));
-    p->thrpt = get_slice_thrpt_(mod_id,&s->s[i]->UEs);
+    p->thrpt = get_slice_thrpt_(mod_id,&s->s[i]->UEs,CC_id);
     last_postion = last_postion+p->mrb +1;
     if(n_rbg_sched>0){
     s->s[i]->dl_algo.run(mod_id,
@@ -2193,7 +2189,7 @@ void ddqn_dl(module_id_t mod_id,
       continue;   
     if(!strcmp(slice_label,"Besteffort")){
     p->arb =(get_slice_uesd_rbs(mod_id,&s->s[i]->UEs,CC_id));
-    p->thrpt = get_slice_thrpt_(mod_id,&s->s[i]->UEs);
+    p->thrpt = get_slice_thrpt_(mod_id,&s->s[i]->UEs,CC_id);
     p->mrb =dynamic_n_rbg_sched;
       if(dynamic_n_rbg_sched >0 && s->s[i]->UEs.head >=0){
               s->s[i]->dl_algo.run(mod_id,