Extend probe mechanism

[vid.git] / vid-app-common / src / main / java / org / onap / vid / controller / ProbeController.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java b/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
index 7695e24..0206af4 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/ProbeController.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,13 +22,14 @@ package org.onap.vid.controller;
 
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.vid.aai.AaiClient;
+import org.onap.vid.aai.AaiOverTLSClientInterface;
 import org.onap.vid.model.probes.ExternalComponentStatus;
 import org.onap.vid.mso.MsoBusinessLogic;
 import org.onap.vid.scheduler.SchedulerService;
 import org.onap.vid.services.VidService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -39,23 +40,29 @@ import java.util.List;
 public class ProbeController extends RestrictedBaseController {
 
     private final AaiClient aaiClient;
+    private final AaiOverTLSClientInterface newAaiClient;
     private final VidService vidService;
     private final MsoBusinessLogic msoBusinessLogic;
     private final SchedulerService schedulerService;
 
+
     @Autowired
-    public ProbeController(AaiClient aaiClient, VidService vidService, MsoBusinessLogic msoBusinessLogic, SchedulerService schedulerService) {
+    public ProbeController(AaiClient aaiClient, VidService vidService, MsoBusinessLogic msoBusinessLogic, SchedulerService schedulerService, AaiOverTLSClientInterface newAaiClient) {
         this.aaiClient = aaiClient;
         this.vidService = vidService;
         this.msoBusinessLogic = msoBusinessLogic;
         this.schedulerService = schedulerService;
+        this.newAaiClient = newAaiClient;
     }
 
-    @RequestMapping(method= RequestMethod.GET)
+    @GetMapping
     public List<ExternalComponentStatus> getProbe() {
         List<ExternalComponentStatus> componentStatuses = new ArrayList<>();
         componentStatuses.add(aaiClient.probeAaiGetAllSubscribers());
+        componentStatuses.add(newAaiClient.probeGetAllSubscribers());
         componentStatuses.add(schedulerService.probeGetSchedulerChangeManagements());
+        componentStatuses.add(msoBusinessLogic.probeGetOrchestrationRequests());
+        componentStatuses.add(vidService.probeSDCConnection());
         return componentStatuses;
     }