fix: Add version number validation

Signed-off-by: Cherry Wang <cherry@iotechsys.com>
edgexfoundry · Nov 11, 2024 · cc65ad8 · cc65ad8
1 parent e0c7175
commit cc65ad8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 0 deletions.
diff --git a/TAF/config/global_variables.py b/TAF/config/global_variables.py
@@ -2,6 +2,9 @@
 
 LOG_LEVEL = "INFO"
 
+# Release Version
+REL_MAJOR_VERSION = "4.0"
+
 # API Version
 API_VERSION = "v3"
 

diff --git a/TAF/testCaseModules/keywords/common/commonKeywords.robot b/TAF/testCaseModules/keywords/common/commonKeywords.robot
@@ -117,6 +117,11 @@ apiVersion Should be ${API_VERSION}
     Should contain "apiVersion"
     Should be true  '${content}[apiVersion]' == '${API_VERSION}'
 
+Version Should Contain Release Version
+    ${full_version}  Fetch From Left  ${content}[version]  -
+    ${version_num}  Split String  ${full_version}  .
+    Should Be Equal As Strings  ${REL_MAJOR_VERSION}  ${version_num}[0].${version_num}[1]
+
 totalCount Should be ${value}
     Should contain  ${content}  totalCount
     Should be true  '${content}[totalCount]' == '${value}'

diff --git a/TAF/testScenarios/functionalTest/API/app-service/info/GET.robot b/TAF/testScenarios/functionalTest/API/app-service/info/GET.robot
@@ -19,6 +19,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And Should Return SDK Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms

diff --git a/TAF/testScenarios/functionalTest/API/core-command/info/GET.robot b/TAF/testScenarios/functionalTest/API/core-command/info/GET.robot
@@ -21,6 +21,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 

diff --git a/TAF/testScenarios/functionalTest/API/core-data/info/GET.robot b/TAF/testScenarios/functionalTest/API/core-data/info/GET.robot
@@ -20,6 +20,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 

diff --git a/TAF/testScenarios/functionalTest/API/core-keeper/info/GET.robot b/TAF/testScenarios/functionalTest/API/core-keeper/info/GET.robot
@@ -20,6 +20,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 

diff --git a/TAF/testScenarios/functionalTest/API/core-metadata/info/GET.robot b/TAF/testScenarios/functionalTest/API/core-metadata/info/GET.robot
@@ -20,6 +20,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 

diff --git a/TAF/testScenarios/functionalTest/API/support-cron-scheduler/info/GET.robot b/TAF/testScenarios/functionalTest/API/support-cron-scheduler/info/GET.robot
@@ -20,6 +20,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 

diff --git a/TAF/testScenarios/functionalTest/API/support-notifications/info/GET.robot b/TAF/testScenarios/functionalTest/API/support-notifications/info/GET.robot
@@ -20,6 +20,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 

diff --git a/TAF/testScenarios/functionalTest/device-service/common/info/GET.robot b/TAF/testScenarios/functionalTest/device-service/common/info/GET.robot
@@ -20,6 +20,7 @@ InfoGET001 - Query ping
 InfoGET002 - Query version
     When Query Version
     Then Should Return Status Code "200" And version
+    And Version Should Contain Release Version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms