diff options
Diffstat (limited to 'vid-ext-services-simulator')
-rw-r--r-- | vid-ext-services-simulator/pom.xml | 2 | ||||
-rw-r--r-- | vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java | 75 | ||||
-rw-r--r-- | vid-ext-services-simulator/src/main/resources/download_files/service-PasqualeVmxVpeBvService488-csar-annotations.zip | bin | 0 -> 83322 bytes | |||
-rw-r--r-- | vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar.zip | bin | 0 -> 67068 bytes | |||
-rw-r--r-- | vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar_ecomp_false6.zip | bin | 0 -> 67712 bytes |
5 files changed, 51 insertions, 26 deletions
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml index 4e966754c..8cb3c37b8 100644 --- a/vid-ext-services-simulator/pom.xml +++ b/vid-ext-services-simulator/pom.xml @@ -12,7 +12,7 @@ <properties> <encoding>UTF-8</encoding> - <springframework.version>5.1.6.RELEASE</springframework.version> + <springframework.version>5.1.9.RELEASE</springframework.version> <hibernate.version>5.3.4.Final</hibernate.version> <jackson.version>2.9.8</jackson.version> <!-- Skip assembling the zip by default --> diff --git a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java index 06c72cbd4..3845c7419 100644 --- a/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java +++ b/vid-ext-services-simulator/src/main/java/org/onap/simulator/controller/SimulatorController.java @@ -1,8 +1,41 @@ package org.onap.simulator.controller; +import static org.mockserver.integration.ClientAndServer.startClientAndServer; +import static org.mockserver.matchers.Times.exactly; +import static org.mockserver.model.JsonBody.json; + import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLEncoder; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Scanner; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import javax.persistence.TypedQuery; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.mockserver.integration.ClientAndServer; import org.mockserver.matchers.MatchType; import org.mockserver.matchers.Times; @@ -20,36 +53,22 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.http.*; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.View; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.TypedQuery; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URLEncoder; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.mockserver.integration.ClientAndServer.startClientAndServer; -import static org.mockserver.matchers.Times.exactly; -import static org.mockserver.model.JsonBody.json; - @RestController @Component public class SimulatorController { @@ -245,8 +264,14 @@ public class SimulatorController { return new ResponseEntity<>(jsonString, HttpStatus.OK); } + //*******portal role access simulator end + @RequestMapping(value = {"/ecompportal_att/auxapi//{ver}/getSessionSlotCheckInterval", "/ONAPPORTAL/auxapi//{ver}/getSessionSlotCheckInterval"}, method = RequestMethod.GET) + @ResponseBody + public String getSessionSlotCheckInterval() { + return "300000"; + } @RequestMapping(value = {"/**"}) public ResponseEntity redirectToMockServer(HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-PasqualeVmxVpeBvService488-csar-annotations.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-PasqualeVmxVpeBvService488-csar-annotations.zip Binary files differnew file mode 100644 index 000000000..a1f1f5d83 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-PasqualeVmxVpeBvService488-csar-annotations.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar.zip Binary files differnew file mode 100644 index 000000000..2967a50ec --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar.zip diff --git a/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar_ecomp_false6.zip b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar_ecomp_false6.zip Binary files differnew file mode 100644 index 000000000..dfd929875 --- /dev/null +++ b/vid-ext-services-simulator/src/main/resources/download_files/service-VdorotheaSrv-csar_ecomp_false6.zip |