From a45eb46d8e0cfc228e3d56523c101152821badce Mon Sep 17 00:00:00 2001 From: "Kotagiri, Ramprasad (rp5662)" Date: Mon, 31 Aug 2020 16:33:58 -0400 Subject: [PATCH] fix issue with deploying server TLS certificates Issue-ID: DCAEGEN2-2298 Change-Id: I45cb6684902f7eedfb84a390717bdfb3dd51f746 Signed-off-by: Kotagiri, Ramprasad (rp5662) --- ccsdk-app-common/.checkstyle | 16 ++++++++-------- ccsdk-app-common/pom.xml | 3 +++ .../ccsdk/dashboard/rest/CloudifyRestClientImpl.java | 3 ++- .../ccsdk/dashboard/rest/CloudifyRestClientImplTest.java | 2 +- ccsdk-app-os/create_table.sql | 2 +- ccsdk-app-os/docker-dashboard-installation.sh | 2 +- ccsdk-app-overlay/.checkstyle | 16 ++++++++-------- pom.xml | 3 +++ 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ccsdk-app-common/.checkstyle b/ccsdk-app-common/.checkstyle index 327b388..46eb53c 100644 --- a/ccsdk-app-common/.checkstyle +++ b/ccsdk-app-common/.checkstyle @@ -1,21 +1,21 @@ - + + - - + + - - - + + - - + + diff --git a/ccsdk-app-common/pom.xml b/ccsdk-app-common/pom.xml index e9595d3..3266c22 100644 --- a/ccsdk-app-common/pom.xml +++ b/ccsdk-app-common/pom.xml @@ -29,6 +29,9 @@ false 0.7.6.201602180812 2.9.8 + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java index ab9dd59..6b7af79 100644 --- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImpl.java @@ -1103,8 +1103,9 @@ public class CloudifyRestClientImpl extends RestClientBase implements CloudifyCl public CloudifyPluginList getPlugins() throws Exception { String url = buildUrl(new String[] {baseUrl, PLUGINS}, null); logger.debug(EELFLoggerDelegate.debugLogger, "getPlugins: url {}", url); + HttpEntity entity = getTenantHeader("default_tenant"); ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, - null, new ParameterizedTypeReference() {}); + entity, new ParameterizedTypeReference() {}); CloudifyPluginList result = response.getBody(); return result; } diff --git a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java index a6f5038..c117f23 100644 --- a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java +++ b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/rest/CloudifyRestClientImplTest.java @@ -772,7 +772,7 @@ public class CloudifyRestClientImplTest extends MockitoTestSuite { ResponseEntity response = new ResponseEntity(cfyPluginList, HttpStatus.OK); - when(mockRest.exchange(anyString(), eq(HttpMethod.GET), isNull(), + when(mockRest.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(new ParameterizedTypeReference() {}))).thenReturn(response); CloudifyPluginList actuals = subject.getPlugins(); diff --git a/ccsdk-app-os/create_table.sql b/ccsdk-app-os/create_table.sql index 837c813..d8d3356 100644 --- a/ccsdk-app-os/create_table.sql +++ b/ccsdk-app-os/create_table.sql @@ -1011,7 +1011,7 @@ Insert into dashboard_pg_db_common.fn_role_function (ROLE_ID,FUNCTION_CD) values Insert into dashboard_pg_db_common.fn_user (USER_ID,ORG_ID,MANAGER_ID,FIRST_NAME,MIDDLE_NAME,LAST_NAME,PHONE,FAX,CELLULAR,EMAIL,ADDRESS_ID,ALERT_METHOD_CD,HRID,ORG_USER_ID,ORG_CODE,LOGIN_ID,LOGIN_PWD,LAST_LOGIN_DATE,ACTIVE_YN,CREATED_ID,CREATED_DATE,MODIFIED_ID,MODIFIED_DATE,IS_INTERNAL_YN,ADDRESS_LINE_1,ADDRESS_LINE_2,CITY,STATE_CD,ZIP_CODE,COUNTRY_CD,LOCATION_CLLI,ORG_MANAGER_USERID,COMPANY,DEPARTMENT_NAME,JOB_TITLE,TIMEZONE,DEPARTMENT,BUSINESS_UNIT,BUSINESS_UNIT_NAME,COST_CENTER,FIN_LOC_CODE,SILO_STATUS) values - (1,null,null,'Super',null,'User','908-901-2494',null,null,'email@om.ops.com',null,null,null,'su1234',null,'su','fusion',to_date('21-AUG-14','%d-%M-%Y'),'Y',null,to_date('15-DEC-05','%d-%M-%Y'),1,to_date('21-AUG-14','%d-%M-%Y'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null) + (1,null,null,'Super',null,'User','908-901-2494',null,null,'email@om.ops.com',null,null,null,'su1234',null,'su1234','fusion',to_date('21-AUG-14','%d-%M-%Y'),'Y',null,to_date('15-DEC-05','%d-%M-%Y'),1,to_date('21-AUG-14','%d-%M-%Y'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null) ; -- fn_app diff --git a/ccsdk-app-os/docker-dashboard-installation.sh b/ccsdk-app-os/docker-dashboard-installation.sh index 1a1a3f9..39f949a 100644 --- a/ccsdk-app-os/docker-dashboard-installation.sh +++ b/ccsdk-app-os/docker-dashboard-installation.sh @@ -63,7 +63,7 @@ then protocol=\"org.apache.coyote.http11.Http11NioProtocol\" port=\"8443\" maxThreads=\"200\" scheme=\"https\" secure=\"true\" SSLEnabled=\"true\" - keystoreFile=\"/opt/app/osaaf/cert.jks\" keystorePass=\"`cat /opt/app/osaaf/jks.pass`\" + keystoreFile=\"/opt/app/osaaf/cert.jks\" keystorePass=\"`sed -e 's/&/\&/g' -e 's//\>/g' -e 's/"/\"/g' -e "s/'/\'/g" < /opt/app/osaaf/jks.pass`\" clientAuth=\"false\" sslProtocol=\"TLS\"/>" >> enablehttps.txt sed '/Service name=\"Catalina\">/r enablehttps.txt' $CATALINA_HOME/conf/server.xml > $CATALINA_HOME/conf/server-https.xml mv $CATALINA_HOME/conf/server-https.xml $CATALINA_HOME/conf/server.xml diff --git a/ccsdk-app-overlay/.checkstyle b/ccsdk-app-overlay/.checkstyle index f7cae1b..f9346ee 100644 --- a/ccsdk-app-overlay/.checkstyle +++ b/ccsdk-app-overlay/.checkstyle @@ -1,21 +1,21 @@ - + + - - + + - - - + + - - + + diff --git a/pom.xml b/pom.xml index 180e0dc..1d23436 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,9 @@ **/external/** 11 11 + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + -- 2.16.6