Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Predev 1.0.0.3 #138

Merged
merged 9 commits into from
Nov 13, 2018
Merged

Predev 1.0.0.3 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fc71f71
Fix #115 where spectrumInquiry returns 'PAL' channelType
cwilliams-ericsson Jun 18, 2018
ec723d8
Update branch version to predev_1.0.0.3
cwilliams-ericsson Jun 18, 2018
880412a
Fix for Issue #129, test does not finish properly
cwilliams-ericsson Jun 25, 2018
3bf5642
Fix issue #130, updated questions for WINNF.FT.D.DRG.2 and DRG.4
cwilliams-ericsson Jun 25, 2018
9a24f66
Updated test harness date for this branch
cwilliams-ericsson Jun 25, 2018
4af35ae
Add OCSP Responder readme and cnf files to certificates folder
cwilliams-ericsson Jul 25, 2018
007955a
Updated MES.4 to match Test Spec (Issue #125)
cwilliams-ericsson Jul 26, 2018
a460e4a
Add frequency check question to WINF.FT.C.HBT.1 & 2, for Issue #135
cwilliams-ericsson Jul 30, 2018
6b7b1ed
Update questions for RLQ and DRG test cases, as per Issue #119
cwilliams-ericsson Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions CBRS_Mock_SAS_Python_Master/cbrsPython-master/cbrsPython/model/Engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,13 @@ def process_request(self,httpRequest,typeOfCalling):


def add_Cbrs_Obj(self,cbsdSerialNumber):
tempCbrsObj = cbrsObj(cbsdSerialNumber, self.testDefinition, self.confFile, self.dirPath,self.loggerHandler)
if tempCbrsObj not in self.cbrsObjArray:
self.cbrsObjArray.append(tempCbrsObj)
del tempCbrsObj
duplicate_cbsd = False
for cbsdObject in self.cbrsObjArray:
if cbsdObject.cbsdSerialNumber == cbsdSerialNumber:
duplicate_cbsd = True
if duplicate_cbsd == False:
# if tempCbrsObj not in self.cbrsObjArray:
self.cbrsObjArray.append(cbrsObj(cbsdSerialNumber, self.testDefinition, self.confFile, self.dirPath,self.loggerHandler))

def handle_Http_Req(self,cbsdSerialNumber,httpReq,typeOfCalling, msg_timestamp):
for cbrsObj in self.cbrsObjArray:
Expand Down
4 changes: 2 additions & 2 deletions CBRS_Mock_SAS_Python_Master/cbrsPython-master/cbrsPython/model/Utils/Consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.

### Program Constants
TEST_HARNESS_VERSION = "1.0.0.2"
TEST_HARNESS_DATE = "2018-May-24"
TEST_HARNESS_VERSION = "predev_1.0.0.3"
TEST_HARNESS_DATE = "2018-July-30"
WINNF_PROTOCOL_VERSION = "v1.2"
SHORTER_GRANT_EXPIRY_TIME = 360
DEFAULT_RULE_APPLIED = "FCC_PART_96"
Expand Down
4 changes: 2 additions & 2 deletions CBRS_Mock_SAS_Python_Master/cbrsPython-master/cbrsPython/model/powerMeasRequestHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def processSpectrumInquiryResponse(self,jsonResponsedefined,httpRequest):
responseChannel["maxEirp"]=self.currentGrantEIRP
if(itemReq["lowFrequency"]>=consts.SPECTRUM_GAA_LOW and itemReq["highFrequency"] <= consts.SPECTRUM_GAA_HIGH):
responseChannel["channelType"]="GAA"
elif(itemReq["lowFrequency"]>consts.SPECTRUM_PAL_LOW and itemReq["highFrequency"] < consts.SPECTRUM_PAL_HIGH):
elif(itemReq["lowFrequency"]>=consts.SPECTRUM_PAL_LOW and itemReq["highFrequency"] <= consts.SPECTRUM_PAL_HIGH):
responseChannel["channelType"]="PAL"
availableChannel.append(responseChannel)
self.loggerHandler.print_to_Logs_Files('The requested spectrum is in the range, SpectrumInquiry response code is 0', True)
Expand All @@ -278,7 +278,7 @@ def processSpectrumInquiryResponse(self,jsonResponsedefined,httpRequest):
if(responseChannel["frequencyRange"]["lowFrequency"]>=consts.SPECTRUM_GAA_LOW and \
responseChannel["frequencyRange"]["highFrequency"]<=consts.SPECTRUM_GAA_HIGH):
responseChannel["channelType"]="GAA"
if(responseChannel["frequencyRange"]["lowFrequency"]>=consts.SPECTRUM_PAL_LOW and \
elif(responseChannel["frequencyRange"]["lowFrequency"]>=consts.SPECTRUM_PAL_LOW and \
responseChannel["frequencyRange"]["highFrequency"]<=consts.SPECTRUM_PAL_HIGH):
responseChannel["channelType"]="PAL"
availableChannel.append(responseChannel)
Expand Down
Loading