Commit 30ac3f55 authored by lfq's avatar lfq

Merge branch 'dev' of http://git.opensource5g.org/openxg/ran into dev

parents 14a5b696 358fa08c
...@@ -180,7 +180,7 @@ gNBs = ...@@ -180,7 +180,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.199.231"; amf_ip_address = ( { ipv4 = "172.11.200.14";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -191,9 +191,9 @@ gNBs = ...@@ -191,9 +191,9 @@ gNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.199.223/24"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "docker-openxg";
GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_INTERFACE_NAME_FOR_NGU = "eno1";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.199.223/24"; GNB_IPV4_ADDRESS_FOR_NGU = "docker-openxg";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
......
...@@ -125,14 +125,14 @@ gNBs = ...@@ -125,14 +125,14 @@ gNBs =
restrictedSetConfig = 0, restrictedSetConfig = 0,
msg3_DeltaPreamble = 1; msg3_DeltaPreamble = 1;
p0_NominalWithGrant =-70; p0_NominalWithGrant =-80;
# pucch-ConfigCommon setup : # pucch-ConfigCommon setup :
# pucchGroupHopping # pucchGroupHopping
# 0 = neither, 1= group hopping, 2=sequence hopping # 0 = neither, 1= group hopping, 2=sequence hopping
pucchGroupHopping = 0; pucchGroupHopping = 0;
hoppingId = 40; hoppingId = 40;
p0_nominal = -70; p0_nominal = -80;
# ssb_PositionsInBurs_BitmapPR # ssb_PositionsInBurs_BitmapPR
# 1=short, 2=medium, 3=long # 1=short, 2=medium, 3=long
ssb_PositionsInBurst_PR = 2; ssb_PositionsInBurst_PR = 2;
...@@ -180,7 +180,7 @@ gNBs = ...@@ -180,7 +180,7 @@ gNBs =
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.199.231"; amf_ip_address = ( { ipv4 = "172.11.200.14";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -190,10 +190,10 @@ gNBs = ...@@ -190,10 +190,10 @@ gNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_INTERFACE_NAME_FOR_NG_AMF = "docker-openxg";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.199.223/24"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.11.200.1";
GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_INTERFACE_NAME_FOR_NGU = "docker-openxg";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.199.223/24"; GNB_IPV4_ADDRESS_FOR_NGU = "172.11.200.1";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
...@@ -226,11 +226,11 @@ RUs = ( ...@@ -226,11 +226,11 @@ RUs = (
local_rf = "yes" local_rf = "yes"
nb_tx = 1 nb_tx = 1
nb_rx = 1 nb_rx = 1
att_tx = 85 att_tx = 89
att_rx = 0; att_rx = 0;
bands = [78]; bands = [78];
max_pdschReferenceSignalPower = -27; max_pdschReferenceSignalPower = -27;
max_rxgain = 65; max_rxgain = 60;
sf_extension = 0; sf_extension = 0;
eNB_instances = [0]; eNB_instances = [0];
#beamforming 1x4 matrix: #beamforming 1x4 matrix:
......
...@@ -177,9 +177,8 @@ gNBs = ...@@ -177,9 +177,8 @@ gNBs =
SCTP_OUTSTREAMS = 2; SCTP_OUTSTREAMS = 2;
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.199.111"; amf_ip_address = ( { ipv4 = "172.11.200.14";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -190,9 +189,9 @@ gNBs = ...@@ -190,9 +189,9 @@ gNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.199.220/24"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "docker-openxg";
GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_INTERFACE_NAME_FOR_NGU = "eno1";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.199.220/24"; GNB_IPV4_ADDRESS_FOR_NGU = "docker-openxg";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
......
...@@ -207,7 +207,7 @@ gNBs = ...@@ -207,7 +207,7 @@ gNBs =
}; };
////////// AMF parameters: ////////// AMF parameters:
amf_ip_address = ( { ipv4 = "192.168.199.231"; amf_ip_address = ( { ipv4 = "172.11.200.14";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -217,10 +217,10 @@ gNBs = ...@@ -217,10 +217,10 @@ gNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; GNB_INTERFACE_NAME_FOR_NG_AMF = "docker-openxg";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.199.223/24"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.11.200.1";
GNB_INTERFACE_NAME_FOR_NGU = "eno1"; GNB_INTERFACE_NAME_FOR_NGU = "docker-openxg";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.199.223/24"; GNB_IPV4_ADDRESS_FOR_NGU = "172.11.200.1";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
...@@ -252,11 +252,11 @@ RUs = ( ...@@ -252,11 +252,11 @@ RUs = (
local_rf = "yes" local_rf = "yes"
nb_tx = 2 nb_tx = 2
nb_rx = 2 nb_rx = 2
att_tx = 85 att_tx = 89
att_rx = 0; att_rx = 0;
bands = [78]; bands = [78];
max_pdschReferenceSignalPower = -27; max_pdschReferenceSignalPower = -27;
max_rxgain = 65; max_rxgain = 60;
sf_extension = 0; sf_extension = 0;
eNB_instances = [0]; eNB_instances = [0];
##beamforming 1x4 matrix: ##beamforming 1x4 matrix:
......
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