Skip to content

O
OpenXG-RAN
Commit 20b44143 authored by Navid Nikaein's avatar Navid Nikaein
Browse files
Options

* add "FLOW_START_ms" and "FLOW_DURATION_ms" to xml scneario descriptor for OTG 


git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5395 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent c11b6824
Expand all Show whitespace changes
Inline Side-by-side
Showing with 373 additions and 315 deletions
openair-cn/NAS/nas_ue_task.c
View file @ 20b44143
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
# include "nas_parser.h" # include "nas_parser.h"
# include "nas_proc.h" # include "nas_proc.h"
# define NAS_UE_AUTOSTART 0 # define NAS_UE_AUTOSTART 1
extern unsigned char NB_eNB_INST; extern unsigned char NB_eNB_INST;
extern unsigned char NB_UE_INST; extern unsigned char NB_UE_INST;
......
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @ 20b44143
...@@ -2665,6 +2665,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols, ...@@ -2665,6 +2665,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols,
PHY_vars_UE->frame++; PHY_vars_UE->frame++;
} //trials } //trials
// round_trials[0]: number of code word : goodput the protocol
effective_rate = ((double)(round_trials[0]-dci_errors)/((double)round_trials[0] + round_trials[1] + round_trials[2] + round_trials[3])); effective_rate = ((double)(round_trials[0]-dci_errors)/((double)round_trials[0] + round_trials[1] + round_trials[2] + round_trials[3]));
...@@ -2673,7 +2674,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols, ...@@ -2673,7 +2674,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols,
(double)tx_lev_dB+10*log10(PHY_vars_UE->lte_frame_parms.ofdm_symbol_size/(NB_RB*12)), (double)tx_lev_dB+10*log10(PHY_vars_UE->lte_frame_parms.ofdm_symbol_size/(NB_RB*12)),
sigma2_dB); sigma2_dB);
printf("Errors (%d/%d %d/%d %d/%d %d/%d), Pe = (%e,%e,%e,%e), dci_errors %d/%d, Pe = %e => effective rate %f (%2.1f%%,%f), normalized delay %f (%f)\n", printf("Errors (%d/%d %d/%d %d/%d %d/%d), Pe = (%e,%e,%e,%e), dci_errors %d/%d, Pe = %e => effective rate %f (%2.1f%%,%f, %f), normalized delay %f (%f)\n",
errs[0], errs[0],
round_trials[0], round_trials[0],
errs[1], errs[1],
...@@ -2692,6 +2693,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols, ...@@ -2692,6 +2693,7 @@ PHY_vars_UE->lte_ue_pdcch_vars[0]->num_pdcch_symbols,
rate*effective_rate, rate*effective_rate,
100*effective_rate, 100*effective_rate,
rate, rate,
rate*get_Qm(PHY_vars_UE->dlsch_ue[0][0]->harq_processes[PHY_vars_UE->dlsch_ue[0][0]->current_harq_pid]->mcs),
(1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0])/(double)PHY_vars_eNB->dlsch_eNB[0][0]->harq_processes[0]->TBS, (1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0])/(double)PHY_vars_eNB->dlsch_eNB[0][0]->harq_processes[0]->TBS,
(1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0])); (1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0]));
......
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @ 20b44143
...@@ -1262,7 +1262,7 @@ int main(int argc, char **argv) { ...@@ -1262,7 +1262,7 @@ int main(int argc, char **argv) {
effective_rate = ((double)(round_trials[0])/((double)round_trials[0] + round_trials[1] + round_trials[2] + round_trials[3])); effective_rate = ((double)(round_trials[0])/((double)round_trials[0] + round_trials[1] + round_trials[2] + round_trials[3]));
printf("Errors (%d/%d %d/%d %d/%d %d/%d), Pe = (%e,%e,%e,%e) => effective rate %f (%3.1f%%,%f), normalized delay %f (%f)\n", printf("Errors (%d/%d %d/%d %d/%d %d/%d), Pe = (%e,%e,%e,%e) => effective rate %f (%3.1f%%,%f,%f), normalized delay %f (%f)\n",
errs[0], errs[0],
round_trials[0], round_trials[0],
errs[1], errs[1],
...@@ -1278,6 +1278,7 @@ int main(int argc, char **argv) { ...@@ -1278,6 +1278,7 @@ int main(int argc, char **argv) {
rate*effective_rate, rate*effective_rate,
100*effective_rate, 100*effective_rate,
rate, rate,
rate*get_Qm(mcs),
(1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0])/(double)PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->TBS, (1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0])/(double)PHY_vars_eNB->ulsch_eNB[0]->harq_processes[harq_pid]->TBS,
(1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0])); (1.0*(round_trials[0]-errs[0])+2.0*(round_trials[1]-errs[1])+3.0*(round_trials[2]-errs[2])+4.0*(round_trials[3]-errs[3]))/((double)round_trials[0]));
......
openair2/LAYER2/MAC/eNB_scheduler.c
View file @ 20b44143
...@@ -1589,7 +1589,11 @@ int schedule_MBMS(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP) ...@@ -1589,7 +1589,11 @@ int schedule_MBMS(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
header_len_mcch=1; header_len_mcch=1;
else header_len_msi=1; else header_len_msi=1;
// Calculate the padding // Calculate the padding
if ((TBS - header_len_mtch - header_len_mcch - header_len_msi - sdu_length_total) <= 2) { if ((TBS - header_len_mtch - header_len_mcch - header_len_msi - sdu_length_total) < 0) {
LOG_E(MAC,"Error in building MAC PDU, TBS %d < PDU %d \n",
TBS, header_len_mtch + header_len_mcch + header_len_msi + sdu_length_total);
return;
}else if ((TBS - header_len_mtch - header_len_mcch - header_len_msi - sdu_length_total) <= 2) {
padding = (TBS - header_len_mtch - header_len_mcch - header_len_msi - sdu_length_total); padding = (TBS - header_len_mtch - header_len_mcch - header_len_msi - sdu_length_total);
post_padding = 0; post_padding = 0;
} }
...@@ -4196,7 +4200,7 @@ void schedule_ue_spec(module_id_t module_idP, ...@@ -4196,7 +4200,7 @@ void schedule_ue_spec(module_id_t module_idP,
if (mac_xface->lte_frame_parms->frame_type == TDD) { if (mac_xface->lte_frame_parms->frame_type == TDD) {
eNB_mac_inst[module_idP].UE_template[next_ue].DAI++; eNB_mac_inst[module_idP].UE_template[next_ue].DAI++;
// printf("DAI update: subframeP %d: UE %d, DAI %d\n",subframeP,next_ue,eNB_mac_inst[module_idP].UE_template[next_ue].DAI); // printf("DAI update: subframeP %d: UE %d, DAI %d\n",subframeP,next_ue,eNB_mac_inst[module_idP].UE_template[next_ue].DAI);
#warning only for 5MHz channel
update_ul_dci(module_idP,rnti,eNB_mac_inst[module_idP].UE_template[next_ue].DAI); update_ul_dci(module_idP,rnti,eNB_mac_inst[module_idP].UE_template[next_ue].DAI);
} }
......
openair2/UTIL/MATH/oml.c
View file @ 20b44143
...@@ -58,7 +58,7 @@ void init_seeds(int seed){ ...@@ -58,7 +58,7 @@ void init_seeds(int seed){
double uniform_rng() { double uniform_rng() {
double random; double random;
random = (double)taus(OTG)/((double)0xffffffff); random = (double)(taus(OTG)%0xffffffff)/((double)0xffffffff);
//LOG_D(OTG,"Uniform taus random number= %lf\n", random); //LOG_D(OTG,"Uniform taus random number= %lf\n", random);
return random; return random;
} }
......
openair2/UTIL/OCG/OCG.h
View file @ 20b44143
...@@ -475,7 +475,8 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need ...@@ -475,7 +475,8 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need
char *destination_id[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; char *destination_id[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
char *background[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; char *background[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
unsigned int aggregation_level[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; unsigned int aggregation_level[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
int duration[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; int flow_start[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
int flow_duration[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
} Predefined_Traffic; } Predefined_Traffic;
/* @}*/ /* @}*/
...@@ -529,7 +530,8 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need ...@@ -529,7 +530,8 @@ The following diagram is based on graphviz (http://www.graphviz.org/), you need
int stream[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; int stream[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
int destination_port[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; int destination_port[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
unsigned int aggregation_level[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; unsigned int aggregation_level[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
int duration[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; int flow_start[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
int flow_duration[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
char *m2m[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; char *m2m[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX];
//M2M_Traffic m2m_traffic; //M2M_Traffic m2m_traffic;
......
openair2/UTIL/OCG/OCG_parse_XML.c
View file @ 20b44143
...@@ -158,7 +158,8 @@ static int traffic_; /*!< \brief indicating that the parsing position is now wi ...@@ -158,7 +158,8 @@ static int traffic_; /*!< \brief indicating that the parsing position is now wi
static int transport_protocol_; /*!< \brief indicating that the parsing position is now within Transport_Protocol_*/ static int transport_protocol_; /*!< \brief indicating that the parsing position is now within Transport_Protocol_*/
static int ip_version_; static int ip_version_;
static unsigned int aggregation_level_; static unsigned int aggregation_level_;
static int duration_; static int flow_start_;
static int flow_duration_;
static int idt_dist_; static int idt_dist_;
static int idt_min_ms_; static int idt_min_ms_;
static int idt_max_ms_; static int idt_max_ms_;
...@@ -476,8 +477,10 @@ void start_element(void *user_data, const xmlChar *name, const xmlChar **attrs) ...@@ -476,8 +477,10 @@ void start_element(void *user_data, const xmlChar *name, const xmlChar **attrs)
ip_version_ = 1; ip_version_ = 1;
} else if (!xmlStrcmp(name, (unsigned char*) "AGGREGATION_LEVEL")) { } else if (!xmlStrcmp(name, (unsigned char*) "AGGREGATION_LEVEL")) {
aggregation_level_ = 1; aggregation_level_ = 1;
} else if (!xmlStrcmp(name, (unsigned char*) "DURATION_ms")) { } else if (!xmlStrcmp(name, (unsigned char*) "FLOW_START_ms")) {
duration_ = 1; flow_start_ = 1;
} else if (!xmlStrcmp(name, (unsigned char*) "FLOW_DURATION_ms")) {
flow_duration_ = 1;
} else if (!xmlStrcmp(name, (unsigned char*) "IDT_DIST")) { } else if (!xmlStrcmp(name, (unsigned char*) "IDT_DIST")) {
idt_dist_ = 1; idt_dist_ = 1;
} else if (!xmlStrcmp(name, (unsigned char*) "IDT_MIN_ms")) { } else if (!xmlStrcmp(name, (unsigned char*) "IDT_MIN_ms")) {
...@@ -806,8 +809,10 @@ void end_element(void *user_data, const xmlChar *name) { // called once at the e ...@@ -806,8 +809,10 @@ void end_element(void *user_data, const xmlChar *name) { // called once at the e
transport_protocol_ = 0; transport_protocol_ = 0;
} else if (!xmlStrcmp(name, (unsigned char*) "AGGREGATION_LEVEL")) { } else if (!xmlStrcmp(name, (unsigned char*) "AGGREGATION_LEVEL")) {
aggregation_level_ = 0; aggregation_level_ = 0;
} else if (!xmlStrcmp(name, (unsigned char*) "DURATION_ms")) { } else if (!xmlStrcmp(name, (unsigned char*) "FLOW_START_ms")) {
duration_ = 0; flow_start_ = 0;
} else if (!xmlStrcmp(name, (unsigned char*) "FLOW_DURATION_ms")) {
flow_duration_ = 0;
} else if (!xmlStrcmp(name, (unsigned char*) "IP_VERSION")) { } else if (!xmlStrcmp(name, (unsigned char*) "IP_VERSION")) {
ip_version_ = 0; ip_version_ = 0;
} else if (!xmlStrcmp(name, (unsigned char*) "IDT_DIST")) { } else if (!xmlStrcmp(name, (unsigned char*) "IDT_DIST")) {
...@@ -1132,8 +1137,11 @@ void characters(void *user_data, const xmlChar *xmlch, int xmllen) { // called o ...@@ -1132,8 +1137,11 @@ void characters(void *user_data, const xmlChar *xmlch, int xmllen) { // called o
oai_emulation.application_config.predefined_traffic.background[oai_emulation.info.max_predefined_traffic_config_index] = strndup(ch, len); oai_emulation.application_config.predefined_traffic.background[oai_emulation.info.max_predefined_traffic_config_index] = strndup(ch, len);
} else if (aggregation_level_) { } else if (aggregation_level_) {
oai_emulation.application_config.predefined_traffic.aggregation_level[oai_emulation.info.max_predefined_traffic_config_index] = atoi(ch); oai_emulation.application_config.predefined_traffic.aggregation_level[oai_emulation.info.max_predefined_traffic_config_index] = atoi(ch);
} else if (duration_) { } else if (flow_start_) {
oai_emulation.application_config.predefined_traffic.duration[oai_emulation.info.max_predefined_traffic_config_index] = atoi(ch);} oai_emulation.application_config.predefined_traffic.flow_start[oai_emulation.info.max_predefined_traffic_config_index] = atoi(ch);
} else if (flow_duration_) {
oai_emulation.application_config.predefined_traffic.flow_duration[oai_emulation.info.max_predefined_traffic_config_index] = atoi(ch);
}
} else if (customized_traffic_) { } else if (customized_traffic_) {
...@@ -1188,8 +1196,10 @@ void characters(void *user_data, const xmlChar *xmlch, int xmllen) { // called o ...@@ -1188,8 +1196,10 @@ void characters(void *user_data, const xmlChar *xmlch, int xmllen) { // called o
oai_emulation.application_config.customized_traffic.ip_version[oai_emulation.info.max_customized_traffic_config_index] = strndup(ch, len); oai_emulation.application_config.customized_traffic.ip_version[oai_emulation.info.max_customized_traffic_config_index] = strndup(ch, len);
} else if (aggregation_level_) { } else if (aggregation_level_) {
oai_emulation.application_config.customized_traffic.aggregation_level[oai_emulation.info.max_customized_traffic_config_index] = atoi(ch); oai_emulation.application_config.customized_traffic.aggregation_level[oai_emulation.info.max_customized_traffic_config_index] = atoi(ch);
} else if (duration_) { } else if (flow_start_) {
oai_emulation.application_config.customized_traffic.duration[oai_emulation.info.max_customized_traffic_config_index] = atoi(ch); oai_emulation.application_config.customized_traffic.flow_start[oai_emulation.info.max_customized_traffic_config_index] = atoi(ch);
} else if (flow_duration_) {
oai_emulation.application_config.customized_traffic.flow_duration[oai_emulation.info.max_customized_traffic_config_index] = atoi(ch);
} else if (idt_dist_) { } else if (idt_dist_) {
oai_emulation.application_config.customized_traffic.idt_dist[oai_emulation.info.max_customized_traffic_config_index] = strndup(ch, len); oai_emulation.application_config.customized_traffic.idt_dist[oai_emulation.info.max_customized_traffic_config_index] = strndup(ch, len);
} else if (idt_min_ms_) { } else if (idt_min_ms_) {
......
openair2/UTIL/OTG/otg_defs.h
View file @ 20b44143
...@@ -323,7 +323,8 @@ typedef struct { ...@@ -323,7 +323,8 @@ typedef struct {
int trans_proto[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; int trans_proto[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION];
int ip_v[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; int ip_v[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION];
int duration[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief Duration of traffic generation or use the emuulation time instead */ int flow_start[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief Duration of traffic generation or use the emuulation time instead */
int flow_duration[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief Duration of traffic generation or use the emuulation time instead */
int idt_dist[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief Inter Departure Time distribution */ int idt_dist[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief Inter Departure Time distribution */
int idt_min[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][MAX_NUM_APPLICATION]; /*!\brief Min Inter Departure Time, for uniform distrib */ int idt_min[NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_SERVICE_MAX][MAX_NUM_APPLICATION]; /*!\brief Min Inter Departure Time, for uniform distrib */
...@@ -380,7 +381,9 @@ typedef struct { ...@@ -380,7 +381,9 @@ typedef struct {
// num stream for each src // num stream for each src
// int stream [NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; // this requires multi thread for parallel stream for a givcen src // int stream [NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX]; // this requires multi thread for parallel stream for a givcen src
// emu info // emu info
int duration[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief Duration of traffic generation or use the emuulation time instead */ int flow_start_flag[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief flow start time flag for traffic generation or use the emuulation time instead */
int flow_start[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief flow start time of traffic generation or use the emuulation time instead */
int flow_duration[NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][NUMBER_OF_eNB_MAX + NUMBER_OF_UE_MAX][MAX_NUM_APPLICATION]; /*!\brief flow duration of traffic generation or use the emuulation time instead */
int seed; /*!\brief The seed used to generate the random positions*/ int seed; /*!\brief The seed used to generate the random positions*/
......
openair2/UTIL/OTG/otg_tx.c
View file @ 20b44143
This diff is collapsed.
targets/SIMU/EXAMPLES/OSD/WEBXML/template_0.xml
View file @ 20b44143
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</FADING> </FADING>
<WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB> <WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB>
<SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB> <SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB>
<UE_FREQUENCY_GHz>1.9</UE_FREQUENCY_GHz> <SYSTEM_FREQUENCY_GHz>1.9</SYSTEM_FREQUENCY_GHz>
<ANTENNA> <ANTENNA>
<eNB_ANTENNA> <eNB_ANTENNA>
<RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB> <RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB>
...@@ -76,6 +76,9 @@ ...@@ -76,6 +76,9 @@
<SOURCE_ID>0</SOURCE_ID> <SOURCE_ID>0</SOURCE_ID>
<APPLICATION_TYPE>gaming_OA</APPLICATION_TYPE> <!-- OPTIONS: scbr, mcbr, bcbr, m2m_AP, m2m_BR, gaming_OA, gaming_TF, full_buffer --> <APPLICATION_TYPE>gaming_OA</APPLICATION_TYPE> <!-- OPTIONS: scbr, mcbr, bcbr, m2m_AP, m2m_BR, gaming_OA, gaming_TF, full_buffer -->
<DESTINATION_ID>1</DESTINATION_ID> <DESTINATION_ID>1</DESTINATION_ID>
<FLOW_START_ms>400</FLOW_START_ms> <!-- not less than 310 -->
<FLOW_DURATION_ms>2000</FLOW_DURATION_ms> <!-- less than simu time - FLOW_START_ms -->
</PREDEFINED_TRAFFIC> </PREDEFINED_TRAFFIC>
<CUSTOMIZED_TRAFFIC> <CUSTOMIZED_TRAFFIC>
...@@ -96,6 +99,8 @@ ...@@ -96,6 +99,8 @@
<TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL> <!-- OPTIONS: tcp (default), udp --> <TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL> <!-- OPTIONS: tcp (default), udp -->
<IP_VERSION>ipv6</IP_VERSION> <!-- OPTIONS: ipv4 (default), ipv6 --> <IP_VERSION>ipv6</IP_VERSION> <!-- OPTIONS: ipv4 (default), ipv6 -->
<DESTINATION_ID>0</DESTINATION_ID> <DESTINATION_ID>0</DESTINATION_ID>
<FLOW_START_ms>400</FLOW_START_ms> <!-- not less than 310 -->
<FLOW_DURATION_ms>2000</FLOW_DURATION_ms> <!-- less than simu time - FLOW_START_ms -->
<IDT_DIST>uniform</IDT_DIST> <!-- OPTIONS: no_customized_traffic (default), uniform, poission, gaussian, exponential, fixed, weibull, pareto, gamma, cauchy --> <IDT_DIST>uniform</IDT_DIST> <!-- OPTIONS: no_customized_traffic (default), uniform, poission, gaussian, exponential, fixed, weibull, pareto, gamma, cauchy -->
<IDT_MIN_ms>100</IDT_MIN_ms> <IDT_MIN_ms>100</IDT_MIN_ms>
...@@ -121,8 +126,9 @@ ...@@ -121,8 +126,9 @@
<PERFORMANCE> <PERFORMANCE>
<METRICS> <METRICS>
<THROUGHPUT>1</THROUGHPUT> <THROUGHPUT>1</THROUGHPUT>
<LATENCY></LATENCY> <LATENCY>1</LATENCY>
<SIGNALLING_OVERHEAD></SIGNALLING_OVERHEAD> <JITTER>1</JITTER>
<SIGNALLING_OVERHEAD>1</SIGNALLING_OVERHEAD>
</METRICS> </METRICS>
<LAYER> <LAYER>
......
targets/SIMU/EXAMPLES/OSD/WEBXML/template_11.xml
View file @ 20b44143
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</FADING> </FADING>
<WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB> <WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB>
<SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB> <SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB>
<UE_FREQUENCY_GHz>1.9</UE_FREQUENCY_GHz> <SYSTEM_FREQUENCY_GHz>1.9</SYSTEM_FREQUENCY_GHz>
<ANTENNA> <ANTENNA>
<eNB_ANTENNA> <eNB_ANTENNA>
<RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB> <RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB>
......
targets/SIMU/EXAMPLES/OSD/WEBXML/template_20.xml
View file @ 20b44143
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</FREE_SPACE_MODEL_PARAMETERS> </FREE_SPACE_MODEL_PARAMETERS>
<SMALL_SCALE>AWGN</SMALL_SCALE> <SMALL_SCALE>AWGN</SMALL_SCALE>
</FADING> </FADING>
<UE_FREQUENCY_GHz>1.9</UE_FREQUENCY_GHz> <SYSTEM_FREQUENCY_GHz>1.9</SYSTEM_FREQUENCY_GHz>
</ENVIRONMENT_SYSTEM_CONFIG> </ENVIRONMENT_SYSTEM_CONFIG>
<TOPOLOGY_CONFIG> <TOPOLOGY_CONFIG>
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
<TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL> <!-- OPTIONS: tcp (default), udp --> <TRANSPORT_PROTOCOL>udp</TRANSPORT_PROTOCOL> <!-- OPTIONS: tcp (default), udp -->
<IP_VERSION>ipv6</IP_VERSION> <!-- OPTIONS: ipv4 (default), ipv6 --> <IP_VERSION>ipv6</IP_VERSION> <!-- OPTIONS: ipv4 (default), ipv6 -->
<DESTINATION_ID>0</DESTINATION_ID> <DESTINATION_ID>0</DESTINATION_ID>
<DURATION_ms>7000</DURATION_ms> <!-- indicates the start time of the app or the actual duration of the traffic--> <FLOW_START_ms>200</FLOW_START_ms> <!-- indicates the start time of the app or the actual duration of the traffic-->
<FLOW_DURATION_ms>7000</FLOW_DURATION_ms> <!-- indicates the duration of the app or the actual duration of the traffic-->
<BACKGROUND_TRAFFIC>disable</BACKGROUND_TRAFFIC> <!-- options: enable, disable. If enable, it generates a background traffic corresponding to the traffic direction--> <BACKGROUND_TRAFFIC>disable</BACKGROUND_TRAFFIC> <!-- options: enable, disable. If enable, it generates a background traffic corresponding to the traffic direction-->
<IDT_DIST>fixed</IDT_DIST> <!-- available distributions: none (default), uniform, poission, gaussian, exponential,pareto, cauchy,fixed, weibull, gammav--> <IDT_DIST>fixed</IDT_DIST> <!-- available distributions: none (default), uniform, poission, gaussian, exponential,pareto, cauchy,fixed, weibull, gammav-->
<IDT_MIN_ms>40</IDT_MIN_ms> <!--Minimum IDT values in milliseconds--> <IDT_MIN_ms>40</IDT_MIN_ms> <!--Minimum IDT values in milliseconds-->
......
targets/SIMU/EXAMPLES/OSD/WEBXML/template_22.xml
View file @ 20b44143
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</FADING> </FADING>
<WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB> <WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB>
<SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB> <SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB>
<UE_FREQUENCY_GHz>1.9</UE_FREQUENCY_GHz> <SYSTEM_FREQUENCY_GHz>1.9</SYSTEM_FREQUENCY_GHz>
<ANTENNA> <ANTENNA>
<eNB_ANTENNA> <eNB_ANTENNA>
<RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB> <RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB>
...@@ -61,7 +61,8 @@ ...@@ -61,7 +61,8 @@
<!-- UL --> <!-- UL -->
<PREDEFINED_TRAFFIC> <PREDEFINED_TRAFFIC>
<SOURCE_ID>1:9</SOURCE_ID> <!-- valid formats are "n:m" and "n,m" and "n" --> <SOURCE_ID>1:9</SOURCE_ID> <!-- valid formats are "n:m" and "n,m" and "n" -->
<DURATION_ms>5000</DURATION_ms> <FLOW_START_ms>200</FLOW_START_ms> <!-- indicates the start time of the app or the actual duration of the traffic-->
<FLOW_DURATION_ms>5000</FLOW_DURATION_ms>
<APPLICATION_TYPE>scbr</APPLICATION_TYPE> <APPLICATION_TYPE>scbr</APPLICATION_TYPE>
<DESTINATION_ID>0</DESTINATION_ID> <!-- valid formats are "n:m" and "n,m" and "n" --> <DESTINATION_ID>0</DESTINATION_ID> <!-- valid formats are "n:m" and "n,m" and "n" -->
</PREDEFINED_TRAFFIC> </PREDEFINED_TRAFFIC>
......
targets/SIMU/EXAMPLES/OSD/WEBXML/template_3.xml
View file @ 20b44143
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB> <WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB>
<SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB> <SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB>
<UE_FREQUENCY_GHz>1.9</UE_FREQUENCY_GHz> <SYSTEM_FREQUENCY_GHz>1.9</SYSTEM_FREQUENCY_GHz>
<ANTENNA> <ANTENNA>
<eNB_ANTENNA> <eNB_ANTENNA>
......
targets/SIMU/EXAMPLES/OSD/WEBXML/template_5.xml
View file @ 20b44143
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</FADING> </FADING>
<WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB> <WALL_PENETRATION_LOSS_dB>5</WALL_PENETRATION_LOSS_dB>
<SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB> <SYSTEM_BANDWIDTH_MB>7.68</SYSTEM_BANDWIDTH_MB>
<UE_FREQUENCY_GHz>1.9</UE_FREQUENCY_GHz> <SYSTEM_FREQUENCY_GHz>1.9</SYSTEM_FREQUENCY_GHz>
<ANTENNA> <ANTENNA>
<eNB_ANTENNA> <eNB_ANTENNA>
<RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB> <RX_NOISE_LEVEL_dB>5</RX_NOISE_LEVEL_dB>
......
targets/SIMU/USER/oaisim_config.c
View file @ 20b44143
This diff is collapsed.
targets/TEST/OAI/case01.py
View file @ 20b44143
...@@ -106,7 +106,7 @@ def execute(oai, user, pw, logfile,logdir): ...@@ -106,7 +106,7 @@ def execute(oai, user, pw, logfile,logdir):
log.ok(case, test, name, conf, '', logfile) log.ok(case, test, name, conf, '', logfile)
oai.send('cd $OPENAIR_TARGETS;') oai.send('cd $OPENAIR_TARGETS;')
oai.send('cd RTAI/USER;') oai.send('cd RT/USER;')
try: try:
test = '03' test = '03'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment