From 5b1ad1ec6afa21f3c32b0132d65cda335eafc935 Mon Sep 17 00:00:00 2001 From: "Welch, Lorraine (lb2391)" Date: Mon, 17 Sep 2018 18:02:12 -0400 Subject: Changed ecomp and AT&T references Issue-ID: PORTAL-302 Change-Id: Iec2ed9ba78ceb81f3d5dff84837697482415937d Signed-off-by: Welch, Lorraine (lb2391) --- .../analytics/model/runtime/ChartD3Helper.java | 12 +++++----- .../analytics/controller/WizardProcessorTest.java | 12 +++++----- .../controller/core/LogoutControllerTest.java | 12 +++++----- .../controller/core/MenuListControllerTest.java | 8 +++---- ecomp-sdk/epsdk-app-os/db-scripts/readme | 10 ++++----- .../src/main/resources/music.properties | 14 ++++++------ .../src/main/resources/portal.properties | 10 ++++----- .../epsdk-app-os/src/main/webapp/WEB-INF/web.xml | 26 ++++++++++++++++++++-- .../core/logging/aspect/EELFLoggerAdvice.java | 6 ++--- .../portalsdk/core/onboarding/util/CipherUtil.java | 4 ++-- 10 files changed, 68 insertions(+), 46 deletions(-) diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java index 60c45b4f..4839f115 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java @@ -1,9 +1,9 @@ /* - * ============LICENSE_START========================================== + * ================LICENSE_START========================================== * ONAP Portal SDK - * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== + * ======================================================================= + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * ======================================================================= * * Unless otherwise specified, all software contained herein is licensed * under the Apache License, Version 2.0 (the "License"); @@ -31,7 +31,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ============LICENSE_END============================================ + * ================LICENSE_END============================================ * * */ @@ -3083,7 +3083,7 @@ public class ChartD3Helper { StringBuffer groupBuffer = new StringBuffer(""); StringBuffer s = new StringBuffer(""); dataStr.append("{"); - dataStr.append(" \"ss4262\":{\n"); + dataStr.append(" \"xxxxxx\":{\n"); String mid = ""; String mid_old = ""; String level = "-1"; diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java index 52e0b1a1..7cfacadd 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java @@ -1,9 +1,9 @@ /* - * ============LICENSE_START========================================== + * ============LICENSE_START============================================== * ONAP Portal SDK - * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== + * ======================================================================= + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * ======================================================================= * * Unless otherwise specified, all software contained herein is licensed * under the Apache License, Version 2.0 (the "License"); @@ -31,7 +31,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * ============LICENSE_END============================================ + * ============LICENSE_END================================================ * * */ @@ -412,7 +412,7 @@ public class WizardProcessorTest { mockHttpAttribute("hideExcelIcons","N"); mockHttpAttribute("hidePDFIcons","N"); - mockHttpAttribute("dataSource","org.att.onap.DataSource"); + mockHttpAttribute("dataSource","org.onap.DataSource"); mockHttpAttribute("numFormCols","10"); mockHttpAttribute("reportTitle","ONAP Portal User Report"); diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java index a6ffb038..8883cfa8 100644 --- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java +++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START========================================== * ONAP Portal SDK * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -108,7 +108,7 @@ public class LogoutControllerTest { ServletRequestAttributes ServletRequestAttributes = new ServletRequestAttributes(mockedRequest); Mockito.when(RequestContextHolder.currentRequestAttributes()).thenReturn(ServletRequestAttributes); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); logoutController.globalLogout(mockedRequest); } @@ -117,20 +117,20 @@ public class LogoutControllerTest { PowerMockito.mockStatic(PortalApiProperties.class); PowerMockito.mockStatic(PortalApiConstants.class); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); assertNull(logoutController.globalLogout(mockedRequest)); } @Test public void appLogoutTest(){ - ModelAndView actualModelView = new ModelAndView("redirect:https://portal.openecomp.org/ecompportal/process_csp"); + ModelAndView actualModelView = new ModelAndView("redirect:http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); PowerMockito.mockStatic(PortalApiProperties.class); PowerMockito.mockStatic(PortalApiConstants.class); PowerMockito.mockStatic(RequestContextHolder.class); ServletRequestAttributes ServletRequestAttributes = new ServletRequestAttributes(mockedRequest); Mockito.when(RequestContextHolder.currentRequestAttributes()).thenReturn(ServletRequestAttributes); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); ModelAndView expectedModelView = logoutController.appLogout(mockedRequest); assertEquals(actualModelView.getViewName(), expectedModelView.getViewName()); } @@ -140,7 +140,7 @@ public class LogoutControllerTest { PowerMockito.mockStatic(PortalApiProperties.class); PowerMockito.mockStatic(PortalApiConstants.class); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); assertNull(logoutController.appLogout(mockedRequest)); } diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java index 2d6c0cd1..cc935b38 100644 --- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java +++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java @@ -193,7 +193,7 @@ public class MenuListControllerTest { Mockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("user"); Mockito.when(session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME))).thenReturn(user); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); StringWriter sw = new StringWriter(); PrintWriter writer = new PrintWriter(sw); Mockito.when(mockedResponse.getWriter()).thenReturn(writer); @@ -206,7 +206,7 @@ public class MenuListControllerTest { PowerMockito.mockStatic(PortalApiConstants.class); Mockito.when(mockedRequest.getParameter("page")).thenReturn("contact"); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); StringWriter sw = new StringWriter(); PrintWriter writer = new PrintWriter(sw); Mockito.when(mockedResponse.getWriter()).thenReturn(writer); @@ -219,7 +219,7 @@ public class MenuListControllerTest { PowerMockito.mockStatic(PortalApiConstants.class); Mockito.when(mockedRequest.getParameter("page")).thenReturn("access"); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); StringWriter sw = new StringWriter(); PrintWriter writer = new PrintWriter(sw); Mockito.when(mockedResponse.getWriter()).thenReturn(writer); @@ -231,7 +231,7 @@ public class MenuListControllerTest { PowerMockito.mockStatic(PortalApiProperties.class); PowerMockito.mockStatic(PortalApiConstants.class); Mockito.when(PortalApiProperties - .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp"); + .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm"); StringWriter sw = new StringWriter(); PrintWriter writer = new PrintWriter(sw); Mockito.when(mockedResponse.getWriter()).thenReturn(writer); diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/readme b/ecomp-sdk/epsdk-app-os/db-scripts/readme index 0330789d..81944bb7 100644 --- a/ecomp-sdk/epsdk-app-os/db-scripts/readme +++ b/ecomp-sdk/epsdk-app-os/db-scripts/readme @@ -9,22 +9,22 @@ Directions: DDL For ONAP Amsterdam instance run EcompSdkDDLMySql_1710_Common.sql add script EcompSdkDDLMySql_1710_OS.sql. -EcompSdkDDLMySql_1710_Common.sql - this is the DDL entries that both Opensource and AT&T have in common +EcompSdkDDLMySql_1710_Common.sql - this is a common DDL file EcompSdkDDLMySql_1710_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder For ONAP Beijing instance run EcompSdkDDLMySql_2_1_Common.sql add script EcompSdkDDLMySql_2_1_OS.sql. -EcompSdkDDLMySql_2_1_Common.sql - this is the DDL entries that both Opensource and AT&T have in common +EcompSdkDDLMySql_2_1_Common.sql - this is a common DDL file EcompSdkDDLMySql_2_1_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder For ONAP Beijing instance run EcompSdkDDLMySql_2_2_common.sql and script EcompSdkDDLMySql_2_2_OS.sql. -EcompSdkDDLMySql_2_2_Common.sql - this is the DDL entries that both Opensource and AT&T have in common +EcompSdkDDLMySql_2_2_Common.sql - this is a common DDL file EcompSdkDDLMySql_2_2_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder For ONAP Casablanca instance run EcompSdkDDLMySql_2_4_common.sql and script EcompSdkDDLMySql_2_4_OS.sql. -EcompSdkDDLMySql_2_4_Common.sql - this is the DDL entries that both Opensource and AT&T have in common +EcompSdkDDLMySql_2_4_Common.sql - this is a common DDL file EcompSdkDDLMySql_2_4_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder DML @@ -63,4 +63,4 @@ EcompSdkMySql_Rollback_2_1_to_1710_Common.sql Our Existing Partner Apps can call the following scripts to upgrade from 2_1 to 2_2 version EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql -EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql \ No newline at end of file +EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties index d7951560..93e82e19 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties @@ -13,19 +13,19 @@ music.cleanup.frequency = 6 #how old of session need to be cleaned up (hour) music.cleanup.threshold = 10 music.enable = false -cassandra.host=135.197.226.103 -zookeeper.host=135.197.226.103, 135.197.226.108, 135.197.226.119 +cassandra.host=localhost +zookeeper.host=localhost1,localhost2,localhost3 cassandra.user=cassandra cassandra.password=cassandra #Music API -#music.endpoint = http://vm-ep-dev4.research.att.com/MUSIC/rest/ +#music.endpoint = http://localhost/MUSIC/rest/ #music.version = v2 #music.keyspace = keyspaces #music.x.minor.version = 3 #music.x.patch.version = 0 -#music.ns = com.att.ecomp.portal.demeter -#music.user.id = m00468@portal.ecomp.att.com -#music.password = friedG33nS- +#music.ns = org.onap.portal +#music.user.id = xxxxxx@org.onap.portal +#music.password = #music.consistency.info = type -#music.consistency.info.value = eventual \ No newline at end of file +#music.consistency.info.value = eventual diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties index 05fd65c2..80a6b2b1 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties @@ -2,7 +2,7 @@ # ============LICENSE_START========================================== # ONAP Portal SDK # =================================================================== -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. # =================================================================== # # Unless otherwise specified, all software contained herein is licensed @@ -35,7 +35,7 @@ # # ### -# Properties read by ECOMP Framework library, ecompFW.jar +# Properties read by ONAP Portal Framework library, ecompFW.jar ########################################################################## # The following properties should NOT be changed by partner applications. @@ -56,10 +56,10 @@ use_rest_for_functional_menu=true portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl # URL of the Portal where this app is onboarded -ecomp_redirect_url = https://portal.onap.org/ecompportal/process_csp +ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm -# URL of the ECOMP Portal REST API -ecomp_rest_url = http://portal.onap.org:50580/ecompportal/auxapi +# URL of the ONAP Portal REST API +ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi # Applications do not need to run a UEB listener after 1607. ueb_listeners_enable = false diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml index 8392e8d4..a87e478d 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,31 @@ + - ecomp-sdk-app-os + ONAPPORTALSDK @@ -35,4 +57,4 @@ /WEB-INF/jsp/error.jsp - \ No newline at end of file + diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java index d60fe567..d250591e 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java @@ -2,7 +2,7 @@ * ============LICENSE_START========================================== * ONAP Portal SDK * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -60,11 +60,11 @@ public class EELFLoggerAdvice { @Autowired private AppService appService; - // DateTime Format according to the ECOMP Application Logging Guidelines. + // DateTime Format according to the ONAP Application Logging Guidelines. private static final SimpleDateFormat ecompLogDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX"); /** - * Gets the current date and time in expected ECOMP log format. + * Gets the current date and time in expected ONAP log format. * * @return Current date and time */ diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java index c92efb79..90addfe5 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java @@ -2,7 +2,7 @@ * ============LICENSE_START========================================== * ONAP Portal SDK * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -208,7 +208,7 @@ public class CipherUtil { * Decrypts the text using the secret key in key.properties file. * * @param message - * The encrypted string that must be decrypted using the ecomp + * The encrypted string that must be decrypted using the ONAP Portal * Encryption Key * @return The String decrypted * @throws CipherUtilException -- cgit 1.2.3-korg