protected static int VTP_TEST_CENTER_PORT; // NOSONAR
protected static String VTP_ARTIFACT_STORE; // NOSONAR
protected static String VTP_EXECUTION_TEMP_STORE; // NOSONAR
+ protected static int VTP_EXECUTION_GRPC_TIMEOUT; // NOSONAR
protected static final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.US); // NOSONAR
VTP_TEST_CENTER_PORT = Integer.parseInt(prp.getProperty("vtp.grpc.port"));
VTP_ARTIFACT_STORE = prp.getProperty("vtp.artifact.store");
VTP_EXECUTION_TEMP_STORE = prp.getProperty("vtp.file.store");
+ VTP_EXECUTION_GRPC_TIMEOUT = Integer.parseInt(prp.getProperty("vtp.grpc.timeout")) * 1000 ;
} catch (Exception e) { // NOSONAR
LOG.error(e.getMessage());
}
}
protected Result makeRpc(List <String> args) throws VTPException {
+ return this.makeRpc(args, VTP_EXECUTION_GRPC_TIMEOUT);
+ }
+
+ protected Result makeRpc(List <String> args, int timeout) throws VTPException {
Result result = null;
String requestId = UUID.randomUUID().toString();
try {
- result = OpenRemoteCli.run(
- VTP_TEST_CENTER_IP, VTP_TEST_CENTER_PORT, requestId,
- args);
+ result = new OpenRemoteCli(
+ VTP_TEST_CENTER_IP,
+ VTP_TEST_CENTER_PORT,
+ timeout,
+ requestId).run(args);
} catch(OpenInterfaceGrpcClient.OpenInterfaceGrpcTimeoutExecption e) {
throw new VTPException(
- new VTPError().setHttpStatus(HttpStatus.SC_GATEWAY_TIMEOUT).setMessage("Timeout.").setCode(VTPError.TIMEOUT));
+ new VTPError().setHttpStatus(HttpStatus.SC_GATEWAY_TIMEOUT).setMessage("Timed out. Please use request-id to track the progress.").setCode(VTPError.TIMEOUT));
} catch (Exception e) {
throw new VTPException(new VTPError().setMessage(e.getMessage()));
}
}
protected JsonNode makeRpcAndGetJson(List<String> args) throws VTPException, IOException {
- Result result = this.makeRpc(args);
+ return this.makeRpcAndGetJson(args, VTP_EXECUTION_GRPC_TIMEOUT);
+ }
+
+ protected JsonNode makeRpcAndGetJson(List<String> args, int timeout) throws VTPException, IOException {
+ Result result = this.makeRpc(args, timeout);
ObjectMapper mapper = new ObjectMapper();
JsonNode resultJson = mapper.readTree(result.getOutput());
return resultJson;
}
-
protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonNode argsJsonNode) throws VTPException {
+ return this.makeRpc(scenario, requestId, profile, testCase, argsJsonNode, VTP_EXECUTION_GRPC_TIMEOUT);
+ }
+
+ protected Output makeRpc(String scenario, String requestId, String profile, String testCase, JsonNode argsJsonNode, int timeout) throws VTPException {
Output output = null;
ObjectMapper mapper = new ObjectMapper();
Map <String, String> args = mapper.convertValue(argsJsonNode, Map.class);
try {
- output = OpenRemoteCli.invoke(VTP_TEST_CENTER_IP, VTP_TEST_CENTER_PORT, scenario, profile, testCase, requestId, args);
- } catch(OpenInterfaceGrpcClient.OpenInterfaceGrpcTimeoutExecption e) {
- throw new VTPException(
- new VTPError().setHttpStatus(HttpStatus.SC_GATEWAY_TIMEOUT).setMessage(e.getMessage()).setCode(VTPError.TIMEOUT));
+ output = new OpenRemoteCli(
+ VTP_TEST_CENTER_IP,
+ VTP_TEST_CENTER_PORT,
+ timeout,
+ requestId).invoke(scenario, profile, testCase, args);
+ } catch(OpenInterfaceGrpcClient.OpenInterfaceGrpcTimeoutExecption e) {
+ throw new VTPException(
+ new VTPError().setHttpStatus(HttpStatus.SC_GATEWAY_TIMEOUT).setMessage("Timed out. Please use request-id to track the progress.").setCode(VTPError.TIMEOUT));
} catch (Exception e) {
throw new VTPException(
new VTPError().setMessage(e.getMessage()));
-<?xml version = "1.0" encoding = "UTF-8"?>
-<web-app xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
- xmlns = "http://java.sun.com/xml/ns/javaee"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+<?xml version = "1.0" encoding = "UTF-8"?>
+<web-app xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
+ xmlns = "http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
id = "WebApp_ID" version = "3.0">
- <servlet>
- <servlet-name>Jersey RESTful Application</servlet-name>
- <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
- <init-param>
- <param-name>jersey.config.server.provider.packages</param-name>
+ <servlet>
+ <servlet-name>Jersey RESTful Application</servlet-name>
+ <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+ <init-param>
+ <param-name>jersey.config.server.provider.packages</param-name>
<param-value>io.swagger.jaxrs.listing,
org.onap.vnfsdk.marketplace.resource,
org.onap.vtp.error,
org.onap.vtp.scenario,
org.onap.vtp.execution
- </param-value>
- </init-param>
+ </param-value>
+ </init-param>
<init-param>
<param-name>jersey.config.server.provider.classnames</param-name>
- <param-value>org.glassfish.jersey.media.multipart.MultiPartFeature</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>Jersey RESTful Application</servlet-name>
- <url-pattern>/onapapi/vnfsdk-marketplace/v1/*</url-pattern>
+
<param-value>org.glassfish.jersey.media.multipart.MultiPartFeature</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Jersey RESTful Application</servlet-name>
+ <url-pattern>/onapapi/vnfsdk-marketplace/v1/*</url-pattern>
</servlet-mapping>
-
+
<servlet>
<servlet-name>Jersey2Config</servlet-name>
<servlet-class>io.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
Code Review / vnfsdk / refrepo.git / commitdiff