Merge remote-tracking branch 'origin/develop' into rh_ci_test_nsa

ci-scripts/cls_containerize.py

@@ -343,7 +343,7 @@ class Containerize():
 					startOfTargetImageCreation = False
 					buildStatus = False
 					for line in inputfile:
-						result = re.search('FROM .* as ' + image + '$', str(line))
+						result = re.search('FROM .* [aA][sS] ' + image + '$', str(line))
 						if result is not None:
 							startOfTargetImageCreation = True
 						if startOfTargetImageCreation:

ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpn310.conf

@@ -61,24 +61,15 @@ gNBs =
              initialDLBWPk0_0                    = 0;
              #initialULBWPmappingType
        #0=typeA,1=typeB
-             initialDLBWPmappingType_0           = 0;
+             initialDLBWPmappingType_0           = 0;#for DL slot
              #this is SS=1,L=13
              initialDLBWPstartSymbolAndLength_0  = 40;
 
-             initialDLBWPk0_1                    = 0;
+             initialDLBWPk0_1                    = 0;#for mixed slot
              initialDLBWPmappingType_1           = 0;
-             #this is SS=2,L=12 
-             initialDLBWPstartSymbolAndLength_1  = 53;
-
-             initialDLBWPk0_2                    = 0;
-             initialDLBWPmappingType_2           = 0;
-             #this is SS=1,L=12 
-             initialDLBWPstartSymbolAndLength_2  = 54;
-
-             initialDLBWPk0_3                    = 0;
-             initialDLBWPmappingType_3           = 0;
-             #this is SS=1,L=4 //5 (4 is for 43, 5 is for 57)
-             initialDLBWPstartSymbolAndLength_3  = 57; //43; //57;
+             #this is SS=1,L=5 
+             initialDLBWPstartSymbolAndLength_1  = 57;
+
   #uplinkConfigCommon 
      #frequencyInfoUL
       ul_frequencyBand                                                 = 78;
@@ -103,7 +94,7 @@ gNBs =
           prach_msg1_FDM                                            = 0;
           prach_msg1_FrequencyStart                                 = 0;
           zeroCorrelationZoneConfig                                 = 13;
-          preambleReceivedTargetPower                               = -100;
+          preambleReceivedTargetPower                               = -90;
 #preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
           preambleTransMax                                          = 6;
 #powerRampingStep