update environment verification URIs

Signed-off-by: Charlie Wheeler-Robinson <[email protected]>
redhat-partner-solutions · Sep 7, 2023 · d2e38db · d2e38db
1 parent 62c116f
commit d2e38db
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 15 deletions.
diff --git a/pkg/validations/cluster_version.go b/pkg/validations/cluster_version.go
@@ -17,7 +17,7 @@ import (
 )
 
 const (
-	clusterVersionID  = TGMIdBaseURI + "/version/ocp/"
+	clusterVersionID  = TGMEnvVerPath + "/RHOCP/"
 	MinClusterVersion = "4.14.0-0" // trailing -0 is required to allow preGA version
 )
 

diff --git a/pkg/validations/common.go b/pkg/validations/common.go
@@ -11,7 +11,12 @@ import (
 	"github.com/redhat-partner-solutions/vse-sync-collection-tools/pkg/utils"
 )
 
-const TGMIdBaseURI = "https://github.com/redhat-partner-solutions/vse-sync-test/tree/main/tests/sync/G.8272/environment"
+const (
+	TGMTestIDBase   = "https://github.com/redhat-partner-solutions/vse-sync-test/tree/main/tests"
+	TGMEnvModelPath = TGMTestIDBase + "/environment/model"
+	TGMEnvVerPath   = TGMTestIDBase + "/environment/version"
+	TGMSyncEnvPath  = TGMTestIDBase + "/sync/G.8272/environment/status"
+)
 
 type VersionCheck struct {
 	id           string `json:"-"`

diff --git a/pkg/validations/device.go b/pkg/validations/device.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	deviceDetailsID          = TGMIdBaseURI + "/version/nic/model/wpc/"
+	deviceDetailsID          = TGMEnvModelPath + "/nic/"
 	deviceDetailsDescription = "Card is valid NIC"
 )
 

diff --git a/pkg/validations/device_driver.go b/pkg/validations/device_driver.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	deviceDriverVersionID          = TGMIdBaseURI + "/version/nic/driver/wpc/"
+	deviceDriverVersionID          = TGMEnvVerPath + "/ice-driver/"
 	deviceDriverVersionDescription = "Card driver is valid"
 )
 

diff --git a/pkg/validations/device_firmware.go b/pkg/validations/device_firmware.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	deviceFirmwareID          = TGMIdBaseURI + "/version/nic/firmware/wpc/"
+	deviceFirmwareID          = TGMEnvVerPath + "/nic-firmware/"
 	deviceFirmwareDescription = "Card firmware is valid"
 )
 

diff --git a/pkg/validations/gnss_ant_power_status.go b/pkg/validations/gnss_ant_power_status.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	expectedAntStatus        = 2
-	gnssAntStatusID          = TGMIdBaseURI + "/status/gnss/antenna-connected/wpc/"
+	gnssAntStatusID          = TGMSyncEnvPath + "/gnss/antenna-connected/wpc/"
 	gnssAntStatusDescription = "GNSS Module is connected to an antenna"
 )
 

diff --git a/pkg/validations/gnss_devices.go b/pkg/validations/gnss_devices.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	hadGNSSDevices            = TGMIdBaseURI + "/status/gnss/device-detected/wpc/"
+	hadGNSSDevices            = TGMSyncEnvPath + "/gnss/device-detected/wpc/"
 	hadGNSSDevicesDescription = "Has GNSS Devices"
 )
 

diff --git a/pkg/validations/gnss_firmware_version.go b/pkg/validations/gnss_firmware_version.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	gnssID          = TGMIdBaseURI + "/version/gnss/firmware/wpc/"
+	gnssID          = TGMEnvVerPath + "/gnss-firmware/"
 	gnssDescription = "GNSS Version is valid"
 )
 

diff --git a/pkg/validations/gnss_module.go b/pkg/validations/gnss_module.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	expectedModuleName             = "ZED-F9T"
-	gnssModuleIsCorrect            = TGMIdBaseURI + "/version/gnss/model/wpc/"
+	gnssModuleIsCorrect            = TGMEnvModelPath + "/gnss/"
 	gnssModuleIsCorrectDescription = "GNSS module is valid"
 )
 

diff --git a/pkg/validations/gnss_protocol_version.go b/pkg/validations/gnss_protocol_version.go
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	gnssProtID           = TGMIdBaseURI + "/version/gnss/protocol/wpc/"
+	gnssProtID           = TGMEnvVerPath + "/gnss-protocol/"
 	gnssProtIDescription = "GNSS protocol version is valid"
 	MinProtoVersion      = "29.20"
 )

diff --git a/pkg/validations/gnss_receiving_data.go b/pkg/validations/gnss_receiving_data.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	gnssStatusID          = TGMIdBaseURI + "/status/gnss/gpsfix-valid/wpc/"
+	gnssStatusID          = TGMSyncEnvPath + "/gnss/gpsfix-valid/wpc/"
 	gnssStatusDescription = "GNSS Module receiving data"
 )
 

diff --git a/pkg/validations/gpsd_version.go b/pkg/validations/gpsd_version.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	gpsdID          = TGMIdBaseURI + "/version/gnss/gpsd/wpc/"
+	gpsdID          = TGMEnvVerPath + "/gpsd/"
 	gpsdDescription = "GPSD Version is valid"
 	MinGSPDVersion  = "3.25"
 )

diff --git a/pkg/validations/grand_master.go b/pkg/validations/grand_master.go
@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	configuredForGrandMaster            = TGMIdBaseURI + "/status/ptp-operator/"
+	configuredForGrandMaster            = TGMSyncEnvPath + "/ptp-operator/"
 	configuredForGrandMasterDescription = "Configured for grand master"
 	gmFlag                              = "ts2phc.master 1"
 )

diff --git a/pkg/validations/operator_version.go b/pkg/validations/operator_version.go
@@ -17,8 +17,8 @@ import (
 )
 
 const (
-	ptpOperatorVersionID          = TGMIdBaseURI + "/version/ptp-operator/"
-	ptpOperatorVersionDescription = "PTP Operactor Version is valid"
+	ptpOperatorVersionID          = TGMEnvVerPath + "/openshift/ptp-operator/"
+	ptpOperatorVersionDescription = "PTP Operator Version is valid"
 	MinOperatorVersion            = "4.14.0-0" // trailing -0 is required to allow preGA version
 	ptpOperatorDiplayName         = "PTP Operator"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ import ( @@
     )
     const (
-    	clusterVersionID  = TGMIdBaseURI + "/version/ocp/"
+    	clusterVersionID  = TGMEnvVerPath + "/RHOCP/"
     	MinClusterVersion = "4.14.0-0" // trailing -0 is required to allow preGA version
     )
@@ Expand Down @@