Merge pull request #863 from Wireless-Innovation-Forum/reda_fix_max_e…

…irp_ref_model_dump_cbsd_grant_record # small update of reference model to use "requestedOperationParam" of grant records in dump
Wireless-Innovation-Forum · Dec 5, 2018 · b7af4fa · b7af4fa
2 parents 8ce2bf7 + eedca5f
commit b7af4fa
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/harness/reference_models/common/data.py b/src/harness/reference_models/common/data.py
@@ -176,9 +176,14 @@ def constructCbsdGrantInfo(reg_request, grant_request, is_managing_sas=True):
 
   max_eirp, low_frequency, high_frequency = None, None, None
   if grant_request is not None:
-    max_eirp = grant_request['operationParam']['maxEirp']
-    low_frequency = grant_request['operationParam']['operationFrequencyRange']['lowFrequency']
-    high_frequency = grant_request['operationParam']['operationFrequencyRange']['highFrequency']
+    if 'requestedOperationParam' in grant_request:
+      max_eirp = grant_request['requestedOperationParam']['maxEirp']
+      low_frequency = grant_request['requestedOperationParam']['operationFrequencyRange']['lowFrequency']
+      high_frequency = grant_request['requestedOperationParam']['operationFrequencyRange']['highFrequency']
+    else:
+      max_eirp = grant_request['operationParam']['maxEirp']
+      low_frequency = grant_request['operationParam']['operationFrequencyRange']['lowFrequency']
+      high_frequency = grant_request['operationParam']['operationFrequencyRange']['highFrequency']
   return CbsdGrantInfo(
       # Get information from the registration
       latitude=lat_cbsd,