Merge "Fix resume vfModule"

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties
index ea9a257..598d91f 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/asdc.properties
@@ -2,5 +2,5 @@ asdc.client.type=REST
 \r
 asdc.client.rest.protocol=http\r
 asdc.client.rest.host=localhost\r
-asdc.client.rest.port=8080\r
+asdc.client.rest.port=1080\r
 asdc.client.rest.auth=dmlkOnZpZA==\r

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index a11007f..c229f58 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@ -137,7 +137,7 @@ mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1
 mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId=<request_id>
 
 mso.displayTestAPIOnScreen=true
-mso.defaultTestAPI=GR_API
+mso.defaultTestAPI=VNF_API
 mso.maxOpenedInstantiationRequests=20
 mso.asyncPollingIntervalSeconds=1
 refreshTimeInstantiationDashboard=10