Merge pull request #170 from Pranav-b-7/canary-endpoint-changes

Query param changes added
spinnaker · Mar 2, 2021 · bb69047 · bb69047
2 parents 95bcb9f + 7cd4f8f
commit bb69047
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/...eb/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy b/...eb/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy
@@ -202,9 +202,15 @@ class OpsmxAutopilotController {
                          @PathVariable("source") String source,
                          @PathVariable("source1") String source1,
                          @RequestParam(value = "Ids", required = false) String[] applicationsIds,
-                         @RequestParam(value = "datasourceType", required = false) String datasourceType) {
-
-    return opsmxAutopilotService.getAutoResponse4(type, source, source1, applicationsIds, datasourceType)
+                         @RequestParam(value = "datasourceType", required = false) String datasourceType,
+                          @RequestParam(value = "canaryId", required = false) Integer canaryId,
+                          @RequestParam(value = "serviceId", required = false) Integer serviceId,
+                          @RequestParam(value = "pageNo", required = false) Integer pageNo,
+                          @RequestParam(value = "pageLimit", required = false) Integer pageLimit,
+                          @RequestParam(value = "sortBy", required = false) String sortBy,
+                          @RequestParam(value = "sortOrder", required = false) String sortOrder) {
+
+    return opsmxAutopilotService.getAutoResponse4(type, source, source1, applicationsIds, datasourceType, canaryId, serviceId, pageNo, pageLimit, sortBy, sortOrder)
   }
 
   @ApiOperation(value = "Endpoint for autopilot rest services")

diff --git a/...src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy b/...src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy
@@ -88,10 +88,16 @@ interface OpsmxAutopilotService {
 
   @GET("/autopilot/{type}/{source}/{source1}")
   Object getAutoResponse4(@Path('type') String type,
-                         @Path('source') String source,
-                         @Path('source1') String source1,
-                         @Query("Ids") String[] applicationsIds,
-                         @Query("datasourceType") String datasourceType)
+                          @Path('source') String source,
+                          @Path('source1') String source1,
+                          @Query("Ids") String[] applicationsIds,
+                          @Query("datasourceType") String datasourceType,
+                          @Query("canaryId") Integer canaryId,
+                          @Query("serviceId") Integer serviceId,
+                          @Query("pageNo") Integer pageNo,
+                          @Query("pageLimit") Integer pageLimit,
+                          @Query("sortBy") String sortBy,
+                          @Query("sortOrder") String sortOrder)
 
   @GET("/autopilot/{type}/{source}/{source1}/{source2}")
   Object getAutoResponse5(@Path('type') String type,