Refactor upstream test name to include both OSS and Plus server count

Author: bjee19

tests/suite/scale_test.go

@@ -571,37 +571,24 @@ The logs are attached only if there are errors.
 			},
 		)
 	})
-	if upstreamServerCount == ossUpstreamServerCount {
-		It(fmt.Sprintf("scales upstream servers to %d", ossUpstreamServerCount), func() {
-			const testName = "TestScale_UpstreamServers"
-
-			testResultsDir := filepath.Join(resultsDir, testName)
-			Expect(os.MkdirAll(testResultsDir, 0o755)).To(Succeed())
-
-			runTestWithMetricsAndLogs(
-				testName,
-				testResultsDir,
-				func() {
-					runScaleUpstreams()
-				},
-			)
-		})
-	} else {
-		It(fmt.Sprintf("scales upstream servers to %d", plusUpstreamServerCount), func() {
-			const testName = "TestScale_UpstreamServers"
-
-			testResultsDir := filepath.Join(resultsDir, testName)
-			Expect(os.MkdirAll(testResultsDir, 0o755)).To(Succeed())
-
-			runTestWithMetricsAndLogs(
-				testName,
-				testResultsDir,
-				func() {
-					runScaleUpstreams()
-				},
-			)
-		})
-	}
+
+	It(fmt.Sprintf("scales upstream servers to %d for OSS and %d for Plus",
+		ossUpstreamServerCount,
+		plusUpstreamServerCount,
+	), func() {
+		const testName = "TestScale_UpstreamServers"
+
+		testResultsDir := filepath.Join(resultsDir, testName)
+		Expect(os.MkdirAll(testResultsDir, 0o755)).To(Succeed())
+
+		runTestWithMetricsAndLogs(
+			testName,
+			testResultsDir,
+			func() {
+				runScaleUpstreams()
+			},
+		)
+	})
 
 	It("scales HTTP matches", func() {
 		const testName = "TestScale_HTTPMatches"