From c72d565bb58226b20625b2bce5f0019046bee649 Mon Sep 17 00:00:00 2001
From: "Sonsino, Ofir (os0695)" <os0695@intl.att.com>
Date: Tue, 10 Jul 2018 14:20:54 +0300
Subject: Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---
 .../org/onap/vid/controllers/VidController.java    | 38 ++++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

(limited to 'vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java
index 41abdee5f..6d6ffb31b 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java
@@ -20,22 +20,21 @@
 
 package org.onap.vid.controllers;
 
-import org.onap.portalsdk.core.controller.RestrictedBaseController;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.onap.vid.asdc.AsdcCatalogException;
 import org.onap.vid.asdc.beans.SecureServices;
 import org.onap.vid.exceptions.VidServiceUnavailableException;
+import org.onap.vid.model.PombaInstance.PombaRequest;
 import org.onap.vid.model.ServiceModel;
 import org.onap.vid.roles.Role;
 import org.onap.vid.roles.RoleProvider;
 import org.onap.vid.services.AaiService;
+import org.onap.vid.services.PombaService;
 import org.onap.vid.services.VidService;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -51,8 +50,7 @@ public class VidController extends RestrictedBaseController {
 	private final VidService service;
 
 	@Autowired
-	public VidController(VidService vidService) throws SdcToscaParserException{
-
+	public VidController(VidService vidService) {
 		service = vidService;
 	}
 
@@ -62,6 +60,9 @@ public class VidController extends RestrictedBaseController {
 	@Autowired
 	RoleProvider roleProvider;
 
+    @Autowired
+	private PombaService pombaService;
+
 //	/**
 //	 * Gets the services.
 //	 *
@@ -112,7 +113,6 @@ public class VidController extends RestrictedBaseController {
 		}
 		catch (Exception t) {
 			LOG.debug("Unexpected error while retrieving service definitions from A&AI: " + t.getMessage() + ":", t);
-			t.printStackTrace();
 			throw new VidServiceUnavailableException("Unexpected error while retrieving service definitions from A&AI: " + t.getMessage(), t);
 		}
 	}
@@ -131,11 +131,16 @@ public class VidController extends RestrictedBaseController {
 		try {
 			return service.getService(uuid);
 		} catch (AsdcCatalogException e) {
-			LOG.error("Failed to retrieve service definitions from SDC", e);
+			LOG.error("Failed to retrieve service definitions from SDC. Error: "+e.getMessage() , e);
 			throw new VidServiceUnavailableException("Failed to retrieve service definitions from SDC", e);
 		}
 	}
 
+	@RequestMapping(value = "/rest/models/reset", method = RequestMethod.POST)
+	@ResponseStatus(HttpStatus.ACCEPTED)
+	public void invalidateServiceModelCache(HttpServletRequest request) {
+		service.invalidateServiceCache();
+	}
 
 	/**
 	 * Gets the services view.
@@ -145,7 +150,12 @@ public class VidController extends RestrictedBaseController {
 	 * @throws VidServiceUnavailableException the vid service unavailable exception
 	 */
 	@RequestMapping(value={"/serviceModels"}, method=RequestMethod.GET)
-	public ModelAndView getServicesView(HttpServletRequest request) throws VidServiceUnavailableException {
-		return new ModelAndView("serviceModels");
-	}
+    public ModelAndView getServicesView(HttpServletRequest request) {
+        return new ModelAndView("serviceModels");
+    }
+
+    @RequestMapping(value = {"/rest/models/services/verifyService"}, method = RequestMethod.POST)
+	public void verifyServiceInstance(HttpServletRequest request, @RequestBody PombaRequest pombaRequest) {
+		pombaService.verify(pombaRequest);
+    }
 }
-- 
cgit 1.2.3-korg