From 72b3fb69e548cf665204ec025d2778dcf3ce0216 Mon Sep 17 00:00:00 2001 From: Wojciech Sliwka Date: Fri, 14 Jun 2019 11:34:27 +0200 Subject: Extend probe mechanism added methods to: - new aai client - sdc client - so client Change-Id: Ib7beb5a5ac58c2ac9767f5e8dc4f988ac0a44c3e Issue-ID: VID-490 Signed-off-by: Wojciech Sliwka --- .../java/org/onap/vid/controller/ProbeController.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to '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 7695e2435..0206af420 100644 --- 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 getProbe() { List 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; } -- cgit 1.2.3-korg