From a460e4a3df7c59f57d1d4b03218493958d29725a Mon Sep 17 00:00:00 2001
From: cwilliams-ericsson <chris.c.williams@ericsson.com>
Date: Mon, 30 Jul 2018 11:04:32 -0400
Subject: [PATCH] Add frequency check question to WINF.FT.C.HBT.1 & 2, for
 Issue #135

Add question to ensure CBSD transmission is within the granted frequency
range, as per Issue #135
---
 .../cbrsPython/model/Utils/Consts.py          |  2 +-
 ...HBT_heartbeat_AuthState2_freqQuestion.json | 35 +++++++++++++++++++
 .../HBT_heartbeat_AuthState_freqQuestion.json | 35 +++++++++++++++++++
 .../testFiles/WINNF.FT.C.HBT.1.csv            |  2 +-
 .../testFiles/WINNF.FT.D.HBT.2.csv            |  2 +-
 5 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState2_freqQuestion.json
 create mode 100644 CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState_freqQuestion.json

diff --git a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/cbrsPython/model/Utils/Consts.py b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/cbrsPython/model/Utils/Consts.py
index 54af3f3..019d0c7 100644
--- a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/cbrsPython/model/Utils/Consts.py
+++ b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/cbrsPython/model/Utils/Consts.py
@@ -14,7 +14,7 @@
 
 ### Program Constants
 TEST_HARNESS_VERSION =                      "predev_1.0.0.3"
-TEST_HARNESS_DATE =                         "2018-July-25"
+TEST_HARNESS_DATE =                         "2018-July-30"
 WINNF_PROTOCOL_VERSION =                    "v1.2"
 SHORTER_GRANT_EXPIRY_TIME =                 360
 DEFAULT_RULE_APPLIED =                      "FCC_PART_96"
diff --git a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState2_freqQuestion.json b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState2_freqQuestion.json
new file mode 100644
index 0000000..6b25a81
--- /dev/null
+++ b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState2_freqQuestion.json
@@ -0,0 +1,35 @@
+{
+    "name":"HBT_heartbeat_AuthState2_freqQuestion",  
+    "questions":
+		[
+			{
+				"question" : "Did CBSD2 transmit power prior to AUTHORIZED state (first successful HBT response)?",
+				"answers" : ["y", "n"], 
+				"expectedAnswer" : "n"
+			},
+			{
+				"question" : "Did CBSD2 transmit only within the frequency range specified in its grantRequest message?",
+				"answers" : ["y", "n"], 
+				"expectedAnswer" : "y"
+			}		
+		],          
+	"heartbeatRequest": 
+			[ 
+			{
+    			"operationState" : "AUTHORIZED"
+  			}
+  			],
+	"response":
+     		{ 
+    		"heartbeatResponse":
+    			[ 
+    			{
+    				"response" : {
+      					"responseCode" : 0
+    					}
+  				}
+		 ]
+	}
+
+	     
+}
\ No newline at end of file
diff --git a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState_freqQuestion.json b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState_freqQuestion.json
new file mode 100644
index 0000000..2a6f864
--- /dev/null
+++ b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/jsonExpectedFolder/HBT_heartbeat_AuthState_freqQuestion.json
@@ -0,0 +1,35 @@
+{
+    "name":"HBT_heartbeat_AuthState_freqQuestion",  
+    "questions":
+		[
+			{
+				"question" : "Did CBSD1 transmit power prior to AUTHORIZED state (first successful HBT response)?",
+				"answers" : ["y", "n"], 
+				"expectedAnswer" : "n"
+			},
+			{
+				"question" : "Did CBSD1 transmit only within the frequency range specified in its grantRequest message?",
+				"answers" : ["y", "n"], 
+				"expectedAnswer" : "y"
+			}			
+		],          
+	"heartbeatRequest": 
+			[ 
+			{
+    			"operationState" : "AUTHORIZED"
+  			}
+  			],
+	"response":
+     		{ 
+    		"heartbeatResponse":
+    			[ 
+    			{
+    				"response" : {
+      					"responseCode" : 0
+    					}
+  				}
+		 ]
+	}
+
+	     
+}
\ No newline at end of file
diff --git a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.C.HBT.1.csv b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.C.HBT.1.csv
index aeacf26..cfc638b 100644
--- a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.C.HBT.1.csv
+++ b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.C.HBT.1.csv
@@ -7,4 +7,4 @@ HBT_heartbeat_AuthState.json
 HBT_heartbeat_AuthState.json
 HBT_heartbeat_AuthState.json
 HBT_heartbeat_AuthState.json
-HBT_heartbeat_AuthState.json
+HBT_heartbeat_AuthState_freqQuestion.json
diff --git a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.D.HBT.2.csv b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.D.HBT.2.csv
index 486d3c1..dca6be4 100644
--- a/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.D.HBT.2.csv
+++ b/CBRS_Mock_SAS_Python_Master/cbrsPython-master/testFiles/WINNF.FT.D.HBT.2.csv
@@ -7,4 +7,4 @@ HBT_heartbeat_AuthState.json,HBT_heartbeat_AuthState2.json
 HBT_heartbeat_AuthState.json,HBT_heartbeat_AuthState2.json
 HBT_heartbeat_AuthState.json,HBT_heartbeat_AuthState2.json
 HBT_heartbeat_AuthState.json,HBT_heartbeat_AuthState2.json
-HBT_heartbeat_AuthState.json,HBT_heartbeat_AuthState2.json
\ No newline at end of file
+HBT_heartbeat_AuthState_freqQuestion.json,HBT_heartbeat_AuthState2_freqQuestion.json