Merge pull request #172 from linkernetworks/phstsai/VX-214

[Task] VX-214: Improve unit test for query situation

Former-commit-id: 1f1c84e690e0411290914d967e1db5229d6f7b90 [formerly 1f1c84e690e0411290914d967e1db5229d6f7b90 [formerly bd21f12]]
Former-commit-id: 89b4b0be52641a2ee34aa15ad473740b73f79d18
Former-commit-id: bb5ada7

src/server/handler_prometheus_test.go

@@ -83,6 +83,13 @@ func (suite *PrometheusTestSuite) TestListPodMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/pods?node=.*&namespace=.*&controller=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetPodMetrics() {
@@ -106,6 +113,13 @@ func (suite *PrometheusTestSuite) TestListContainerMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/containers?node=.*&namespace=.*&pod=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetContainerMetrics() {
@@ -129,6 +143,13 @@ func (suite *PrometheusTestSuite) TestListServiceMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/services?namespace=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetServiceMetrics() {
@@ -152,6 +173,13 @@ func (suite *PrometheusTestSuite) TestListControllerMetrics() {
 	httpWriter := httptest.NewRecorder()
 	suite.wc.Dispatch(httpWriter, httpRequest)
 	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
+
+	httpRequest, err = http.NewRequest("GET", "http://localhost:7890/v1/monitoring/controllers?namespace=.*", nil)
+	suite.NoError(err)
+
+	httpWriter = httptest.NewRecorder()
+	suite.wc.Dispatch(httpWriter, httpRequest)
+	assertResponseCode(suite.T(), http.StatusOK, httpWriter)
 }
 
 func (suite *PrometheusTestSuite) TestGetControllerMetrics() {