From 1cfb08779ea0e00be69e072a940b3063e049fe6b Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Wed, 31 Jan 2018 17:19:00 +0200 Subject: org.onap migration Change-Id: I52f0b2851f2c765752b6d21f49b32136d7d72a3d Issue-ID: VID-86 Signed-off-by: Ofir Sonsino --- .../org/onap/portalapp/conf/ExternalAppConfig.java | 248 ++++++ .../portalapp/conf/ExternalAppInitializer.java | 47 ++ .../portalapp/conf/HibernateMappingLocations.java | 57 ++ .../portalapp/lm/FusionLicenseManagerImpl.java | 70 ++ .../onap/portalapp/lm/LicenseableClassImpl.java | 62 ++ .../onap/portalapp/login/LoginStrategyImpl.java | 69 ++ .../org/onap/portalapp/scheduler/Register.java | 72 ++ .../onap/portalapp/scheduler/RegistryAdapter.java | 92 +++ .../onap/portalapp/service/AdminAuthExtension.java | 65 ++ .../portalapp/conf/ExternalAppConfig.java | 249 ------ .../portalapp/conf/ExternalAppInitializer.java | 47 -- .../portalapp/conf/HibernateMappingLocations.java | 57 -- .../portalapp/lm/FusionLicenseManagerImpl.java | 70 -- .../portalapp/lm/LicenseableClassImpl.java | 62 -- .../portalapp/login/LoginStrategyImpl.java | 69 -- .../openecomp/portalapp/scheduler/Register.java | 71 -- .../portalapp/scheduler/RegistryAdapter.java | 92 --- .../portalapp/service/AdminAuthExtension.java | 64 -- .../src/main/resources/portal.properties | 2 +- .../src/main/resources/portal_template.properties | 2 +- epsdk-app-onap/src/main/resources/vid-data.sql | 386 ++++++++++ epsdk-app-onap/src/main/resources/vid-schema.sql | 492 +++++++----- epsdk-app-onap/src/main/swm/common/common.sh | 35 - epsdk-app-onap/src/main/swm/common/localize.sh | 33 - .../src/main/swm/common/localize_asdc.sh | 68 -- .../src/main/swm/common/localize_cache.sh | 41 - .../src/main/swm/common/localize_log4j.sh | 54 -- .../src/main/swm/common/localize_logback.sh | 46 -- .../src/main/swm/common/localize_portal.sh | 84 --- .../src/main/swm/common/localize_quartz.sh | 67 -- .../src/main/swm/common/localize_system.sh | 178 ----- .../src/main/swm/deinstall/postproc/post_proc | 4 - .../src/main/swm/deinstall/preproc/pre_proc | 4 - epsdk-app-onap/src/main/swm/descriptor.xml | 34 - .../src/main/swm/fallback/postproc/post_proc | 1 - .../src/main/swm/fallback/preproc/pre_proc | 1 - .../src/main/swm/initinst/postproc/post_proc | 7 - .../src/main/swm/initinst/preproc/pre_proc | 7 - .../src/main/swm/install/postproc/post_proc | 38 - .../src/main/swm/install/preproc/pre_proc | 18 - epsdk-app-onap/src/main/swm/notes.txt | 52 -- .../src/main/webapp/WEB-INF/conf/system.properties | 1 - .../main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp | 31 +- .../main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp | 236 +++++- .../webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp | 837 +++++++++++++++++++++ .../WEB-INF/jsp/createnewserviceinstance.jsp | 146 ++++ .../main/webapp/WEB-INF/jsp/searchexistingsi.jsp | 81 ++ .../src/main/webapp/WEB-INF/jsp/serviceModels.jsp | 63 +- .../main/webapp/WEB-INF/jsp/subscriberdetails.jsp | 184 +++++ .../src/main/webapp/WEB-INF/jsp/testViewEdit.jsp | 6 +- .../src/main/webapp/WEB-INF/jsp/welcome.jsp | 19 +- .../app/fusion/external/ebz/angular_js/app.js | 2 +- .../angular-bootstrap-multiselect.min.js | 1 - 53 files changed, 3037 insertions(+), 1787 deletions(-) create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/Register.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java create mode 100644 epsdk-app-onap/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java delete mode 100755 epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java delete mode 100755 epsdk-app-onap/src/main/swm/common/common.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize_asdc.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize_cache.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize_log4j.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize_logback.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize_portal.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize_quartz.sh delete mode 100755 epsdk-app-onap/src/main/swm/common/localize_system.sh delete mode 100755 epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc delete mode 100755 epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc delete mode 100755 epsdk-app-onap/src/main/swm/descriptor.xml delete mode 100755 epsdk-app-onap/src/main/swm/fallback/postproc/post_proc delete mode 100755 epsdk-app-onap/src/main/swm/fallback/preproc/pre_proc delete mode 100755 epsdk-app-onap/src/main/swm/initinst/postproc/post_proc delete mode 100755 epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc delete mode 100755 epsdk-app-onap/src/main/swm/install/postproc/post_proc delete mode 100755 epsdk-app-onap/src/main/swm/install/preproc/pre_proc delete mode 100755 epsdk-app-onap/src/main/swm/notes.txt create mode 100644 epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp create mode 100644 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp create mode 100644 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp create mode 100644 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp delete mode 100644 epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js (limited to 'epsdk-app-onap/src/main') diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java new file mode 100644 index 00000000..eb110931 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -0,0 +1,248 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.onap.portalapp.conf; + +import java.util.ArrayList; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.sql.DataSource; + +import org.onap.portalapp.login.LoginStrategyImpl; +import org.onap.portalapp.scheduler.RegistryAdapter; +import org.openecomp.portalsdk.core.auth.LoginStrategy; +import org.openecomp.portalsdk.core.conf.AppConfig; +import org.openecomp.portalsdk.core.conf.Configurable; +import org.openecomp.portalsdk.core.lm.FusionLicenseManager; +import org.openecomp.portalsdk.core.lm.FusionLicenseManagerUtils; +//import org.openecomp.portalsdk.core.lm.LicenseableClassImpl; +import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.util.CacheManager; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.context.annotation.Profile; +import org.springframework.context.annotation.PropertySource; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; +import org.springframework.core.io.Resource; +import org.springframework.jdbc.datasource.init.DataSourceInitializer; +import org.springframework.jdbc.datasource.init.DatabasePopulator; +import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; +import org.springframework.web.servlet.ViewResolver; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.openecomp.portalsdk.core.service.DataAccessService; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +/** + * ECOMP Portal SDK sample application. ECOMP Portal SDK core AppConfig class to + * reuse interceptors, view resolvers and other features defined there. + */ +@Configuration +@EnableWebMvc +@ComponentScan(basePackages = "org.openecomp") +@PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true) +@Profile("src") +@EnableAsync +@EnableScheduling +public class ExternalAppConfig extends AppConfig implements Configurable { + + private RegistryAdapter schedulerRegistryAdapter; + /** The Constant LOG. */ + private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppConfig.class); + + /** The vid schema script. */ + @Value("classpath:vid-schema.sql") + private Resource vidSchemaScript; + + /** The vid data script. */ + @Value("classpath:vid-data.sql") + private Resource vidDataScript; + + /** + * The Class InnerConfiguration. + */ + @Configuration + @Import(SystemProperties.class) + static class InnerConfiguration { + } + + /** + * View resolver. + * + * @return the view resolver + * @see org.openecomp.portalsdk.core.conf.AppConfig#viewResolver() + */ + public ViewResolver viewResolver() { + return super.viewResolver(); + } + + /** + * @see org.openecomp.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry) + * + * @param registry + */ + public void addResourceHandlers(ResourceHandlerRegistry registry) { + super.addResourceHandlers(registry); + } + + /** + * @see org.openecomp.portalsdk.core.conf.AppConfig#dataAccessService() + */ + public DataAccessService dataAccessService() { + // Echo the JDBC URL to assist developers when starting the app. + System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is " + + SystemProperties.getProperty(SystemProperties.DB_CONNECTIONURL)); + return super.dataAccessService(); + } + + /** + * Creates a new list with a single entry that is the external app + * definitions.xml path. + * + * @return List of String, size 1 + */ + public List addTileDefinitions() { + List definitions = new ArrayList(); + definitions.add("/WEB-INF/defs/definitions.xml"); + return definitions; + } + + /** + * Adds request interceptors to the specified registry by calling + * {@link AppConfig#addInterceptors(InterceptorRegistry)}, but excludes + * certain paths from the session timeout interceptor. + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + super.setExcludeUrlPathsForSessionTimeout("/login_external", "*/login_external.htm", "login", "/login.htm", + "/api*", "/single_signon.htm", "/single_signon"); + super.addInterceptors(registry); + } + + /** + * Creates and returns a new instance of a {@link CacheManager} class. + * + * @return New instance of {@link CacheManager} + */ + @Bean + public AbstractCacheManager cacheManager() { + return new CacheManager(); + } + + + + + /** + * Creates and returns a new instance of a {@link FusionLicenseManager}. + * + * @return New instance of {@link FusionLicenseManager}. + */ +// @Bean +// public FusionLicenseManager fusionLicenseManager() { +// return new FusionLicenseManagerImpl(); +// } + + /** + * Creates and returns a new instance of a + * {@link FusionLicenseManagerUtils}. + * + * @return New instance of {@link FusionLicenseManagerUtils}. + */ +// @Bean +// public FusionLicenseManagerUtils fusionLicenseManagerUtils() { +// return new FusionLicenseManagerUtils(); +// } + + /** + * Creates and returns a new instance of a {@link SchedulerFactoryBean} and + * populates it with triggers. + * + * @return New instance of {@link SchedulerFactoryBean} + * @throws Exception + */ + // @Bean // ANNOTATION COMMENTED OUT + // APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION + public SchedulerFactoryBean schedulerFactoryBean() throws Exception { + SchedulerFactoryBean scheduler = new SchedulerFactoryBean(); + scheduler.setTriggers(schedulerRegistryAdapter.getTriggers()); + scheduler.setConfigLocation(appApplicationContext.getResource("WEB-INF/conf/quartz.properties")); + scheduler.setDataSource(dataSource()); + return scheduler; + } + + /** + * Data source initializer. + * + * @param dataSource the data source + * @return the data source initializer + */ + @Bean + public DataSourceInitializer dataSourceInitializer(DataSource dataSource) { + + LOG.info("Initializing VID data source"); + + final DataSourceInitializer initializer = new DataSourceInitializer(); + initializer.setDataSource(dataSource); + initializer.setDatabasePopulator(databasePopulator()); + return initializer; + } + + /** + * Database populator. + * + * @return the database populator + */ + public DatabasePopulator databasePopulator() { + LOG.info("Populating VID data source"); + + final ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); + populator.addScript(vidSchemaScript); + populator.addScript(vidDataScript); + return populator; + } + + /** + * Sets the scheduler registry adapter. + * + * @param schedulerRegistryAdapter + */ + @Autowired + public void setSchedulerRegistryAdapter(final RegistryAdapter schedulerRegistryAdapter) { + this.schedulerRegistryAdapter = schedulerRegistryAdapter; + } + + /** + * Creates the LoginStrategy + * @return instance of LoginStrategy + */ + @Bean + public LoginStrategy loginStrategy() { + + return new LoginStrategyImpl(); + } +} diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java new file mode 100644 index 00000000..347bb51e --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java @@ -0,0 +1,47 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.onap.portalapp.conf; + +import org.openecomp.portalsdk.core.conf.AppInitializer; + +public class ExternalAppInitializer extends AppInitializer { + + @Override + protected Class[] getRootConfigClasses() { + return super.getRootConfigClasses(); + } + + @Override + protected Class[] getServletConfigClasses() { + Class appConfigClass = ExternalAppConfig.class; + // Show something on stdout to indicate the app is starting. + System.out.println("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName()); + return new Class[] { appConfigClass }; + } + + /* + * URL request will direct to the Spring dispatcher for processing + */ + @Override + protected String[] getServletMappings() { + return super.getServletMappings(); + } + +} diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java new file mode 100644 index 00000000..e0e09d6a --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java @@ -0,0 +1,57 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.onap.portalapp.conf; + +import org.springframework.context.annotation.Profile; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.stereotype.Component; + +import org.openecomp.portalsdk.core.conf.HibernateMappingLocatable; + +@Component +@Profile("src") +public class HibernateMappingLocations implements HibernateMappingLocatable { + + /* + * (non-Javadoc) + * + * @see org.openecomp.portalsdk.core.conf.HibernateMappingLocatable# + * getMappingLocations() + */ + @Override + public Resource[] getMappingLocations() { + return new Resource[] { new ClassPathResource("../fusion/orm/Fusion.hbm.xml"), + new ClassPathResource("../fusion/orm/Workflow.hbm.xml"), + new ClassPathResource("../fusion/orm/RNoteBookIntegration.hbm.xml") }; + } + + /* + * (non-Javadoc) + * + * @see org.openecomp.portalsdk.core.conf.HibernateMappingLocatable# + * getPackagesToScan() + */ + @Override + public String[] getPackagesToScan() { + return new String[] { "org.openecomp" }; + } + +} diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java new file mode 100644 index 00000000..75569d4c --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java @@ -0,0 +1,70 @@ +package org.onap.portalapp.lm; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.servlet.ServletContext; + +import org.openecomp.portalsdk.core.lm.FusionLicenseManager; +import org.springframework.stereotype.Component; + +/* + * Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface. + */ + +@Component +public class FusionLicenseManagerImpl implements FusionLicenseManager { + + @Override + public void initKeyStoreParam() { + + } + + @Override + public void initCipherParam() { + + } + + @Override + public void initLicenseParam() { + + } + + @Override + public void doInitWork() { + + } + + @Override + public int installLicense() { + return 0; + } + + @Override + public synchronized int verifyLicense(ServletContext context) { + return 0; + } + + @Override + public void generateLicense(Map clientInfoMap, List ipAddressList) throws Exception { + + } + + @Override + public String nvl(String s) { + return null; + } + + @Override + public Date getExpiredDate() { + return null; + } + + @Override + public void setExpiredDate(Date expiredDate) { + + } + + +} diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java new file mode 100644 index 00000000..856d8e0e --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java @@ -0,0 +1,62 @@ +/*- + * ================================================================================ + * eCOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.onap.portalapp.lm; + +import java.io.FileNotFoundException; +import java.io.InputStream; + +import org.openecomp.portalsdk.core.lm.LicenseableClass; + +/* + * Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface. + */ + +public class LicenseableClassImpl implements LicenseableClass { + + public String getApplicationName() { + return ""; + } + + public InputStream getPublicKeystoreAsInputStream() throws FileNotFoundException { + return null; + } + + public String getAlias() { + return ""; + } + + public String getKeyPasswd() { + return ""; + } + + public String getPublicKeystorePassword() { + return ""; + } + + public String getCipherParamPassword() { + return ""; + } + + @SuppressWarnings("rawtypes") + public Class getClassToLicense() { + return this.getClass(); + } +} + diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java new file mode 100644 index 00000000..b0420229 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java @@ -0,0 +1,69 @@ +package org.onap.portalapp.login; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.openecomp.portalsdk.core.auth.LoginStrategy; +import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; +import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; +import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants; +import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties; +import org.springframework.web.servlet.ModelAndView; + +public class LoginStrategyImpl extends LoginStrategy { + + @Override + public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception { + //'login' for opensource is same as 'external' login. + return doExternalLogin(request, response); + } + + @Override + public String getUserId(HttpServletRequest request) throws PortalAPIException { + // Check ECOMP Portal cookie + if (!isLoginCookieExist(request)) + return null; + + String userid = null; + try { + userid = getUserIdFromCookie(request); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return userid; + } + + private static String getUserIdFromCookie(HttpServletRequest request) throws Exception { + String userId = ""; + Cookie[] cookies = request.getCookies(); + Cookie userIdcookie = null; + if (cookies != null) + for (Cookie cookie : cookies) + if (cookie.getName().equals(USER_ID)) + userIdcookie = cookie; + if(userIdcookie!=null){ + userId = CipherUtil.decrypt(userIdcookie.getValue()); + } + return userId; + + } + + private static boolean isLoginCookieExist(HttpServletRequest request) { + Cookie ep = getCookie(request, EP_SERVICE); + return (ep != null); + } + + private static Cookie getCookie(HttpServletRequest request, String cookieName) { + Cookie[] cookies = request.getCookies(); + if (cookies != null) + for (Cookie cookie : cookies) + if (cookie.getName().equals(cookieName)) + return cookie; + + return null; + } + + +} diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/Register.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/Register.java new file mode 100644 index 00000000..165f3318 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/Register.java @@ -0,0 +1,72 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.onap.portalapp.scheduler; + +import java.util.ArrayList; +import java.util.List; + +import org.openecomp.portalapp.scheduler.LogRegistry; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.openecomp.portalsdk.core.scheduler.Registerable; +import org.openecomp.portalsdk.core.util.SystemProperties; +import org.quartz.Trigger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.DependsOn; +import org.springframework.stereotype.Component; + +@Component +@DependsOn({ "logRegistry", "systemProperties" }) +public class Register implements Registerable { + + EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(Register.class); + + private List scheduleTriggers = new ArrayList(); + Trigger trigger[] = new Trigger[1]; + + @Autowired + private LogRegistry logRegistry; + + @Override + public Trigger[] getTriggers() { + return getScheduleTriggers().toArray(trigger); + } + + @Override + public void registerTriggers() { + // if the property value is not available; the cron will not be added + // and can be ignored. its safe to ignore the exceptions + try { + if (SystemProperties.getProperty(SystemProperties.LOG_CRON) != null) + getScheduleTriggers().add(logRegistry.getTrigger()); + } catch (IllegalStateException ies) { + logger.info(EELFLoggerDelegate.debugLogger, ("Log Cron not available")); + } + + } + + public List getScheduleTriggers() { + return scheduleTriggers; + } + + public void setScheduleTriggers(List scheduleTriggers) { + this.scheduleTriggers = scheduleTriggers; + } + +} diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java new file mode 100644 index 00000000..2cb5d89f --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java @@ -0,0 +1,92 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.onap.portalapp.scheduler; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.openecomp.portalsdk.core.scheduler.Registerable; +import org.openecomp.portalsdk.workflow.services.WorkflowScheduleService; +import org.quartz.Trigger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; +import org.springframework.stereotype.Component; + +@Component +public class RegistryAdapter { + + @Autowired + private Registerable registry; + + @Autowired + private WorkflowScheduleService workflowScheduleService; + + private SchedulerFactoryBean schedulerBean; + + Trigger trigger[] = new Trigger[1]; + + public Trigger[] getTriggers() { + + registry.registerTriggers(); + + List allTriggers = new ArrayList(); + + List coreTriggers = addCoreTriggers(); + final Trigger[] extTriggerArray = registry.getTriggers(); + + allTriggers.addAll(Arrays.asList(extTriggerArray)); + allTriggers.addAll(coreTriggers); + + return allTriggers.toArray(trigger); + } + + public List addCoreTriggers() { + // On startup of the application after crash recovery, invoke workflow + // schedule trigger + List triggers = getWorkflowScheduleService().triggerWorkflowScheduling(); + return triggers; + } + + public void setSchedulerBean(SchedulerFactoryBean _schedulerBean) { + schedulerBean = _schedulerBean; + } + + public SchedulerFactoryBean getSchedulerBean() { + return schedulerBean; + } + + public Registerable getRegistry() { + return registry; + } + + public void setRegistry(Registerable registry) { + this.registry = registry; + } + + public WorkflowScheduleService getWorkflowScheduleService() { + return workflowScheduleService; + } + + public void setWorkflowScheduleService(WorkflowScheduleService workflowScheduleService) { + this.workflowScheduleService = workflowScheduleService; + } + +} diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java new file mode 100644 index 00000000..e3dbdf82 --- /dev/null +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java @@ -0,0 +1,65 @@ +/*- + * ================================================================================ + * ECOMP Portal SDK + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +package org.onap.portalapp.service; + +import java.util.Set; + +import org.openecomp.portalapp.service.IAdminAuthExtension; +import org.openecomp.portalsdk.core.domain.Role; +import org.openecomp.portalsdk.core.domain.User; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Service("adminAuthExtension") +@Transactional +/** + * Provides empty implementations of the methods in IAdminAuthExtension. + */ +public class AdminAuthExtension implements IAdminAuthExtension { + + EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AdminAuthExtension.class); + + /* + * (non-Javadoc) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User) + */ + public void saveUserExtension(User user) { + logger.debug("saveUserExtension"); + } + + /* + * (non-Javadoc) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User) + */ + public void editUserExtension(User user) { + logger.debug("editUserExtension"); + } + + /* + * (non-Javadoc) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User) + */ + public void saveUserRoleExtension(Set roles, User user) { + logger.debug("saveUserRoleExtension"); + } + +} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java deleted file mode 100755 index f713cf11..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java +++ /dev/null @@ -1,249 +0,0 @@ -/*- - * ================================================================================ - * ECOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -package org.openecomp.portalapp.conf; - -import java.util.ArrayList; -import java.util.List; -import javax.annotation.PostConstruct; -import javax.sql.DataSource; - -//import org.openecomp.portalapp.lm.FusionLicenseManagerImpl; -import org.openecomp.portalapp.login.LoginStrategyImpl; -import org.openecomp.portalapp.scheduler.RegistryAdapter; -import org.openecomp.portalsdk.core.auth.LoginStrategy; -import org.openecomp.portalsdk.core.conf.AppConfig; -import org.openecomp.portalsdk.core.conf.Configurable; -import org.openecomp.portalsdk.core.lm.FusionLicenseManager; -import org.openecomp.portalsdk.core.lm.FusionLicenseManagerUtils; -//import org.openecomp.portalsdk.core.lm.LicenseableClassImpl; -import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager; -import org.openecomp.portalsdk.core.service.DataAccessService; -import org.openecomp.portalsdk.core.util.CacheManager; -import org.openecomp.portalsdk.core.util.SystemProperties; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.Profile; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; -import org.springframework.core.io.Resource; -import org.springframework.jdbc.datasource.init.DataSourceInitializer; -import org.springframework.jdbc.datasource.init.DatabasePopulator; -import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.quartz.SchedulerFactoryBean; -import org.springframework.web.servlet.ViewResolver; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.openecomp.portalsdk.core.service.DataAccessService; -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -/** - * ECOMP Portal SDK sample application. ECOMP Portal SDK core AppConfig class to - * reuse interceptors, view resolvers and other features defined there. - */ -@Configuration -@EnableWebMvc -@ComponentScan(basePackages = "org.openecomp") -@PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true) -@Profile("src") -@EnableAsync -@EnableScheduling -public class ExternalAppConfig extends AppConfig implements Configurable { - - private RegistryAdapter schedulerRegistryAdapter; - /** The Constant LOG. */ - private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppConfig.class); - - /** The vid schema script. */ - @Value("classpath:vid-schema.sql") - private Resource vidSchemaScript; - - /** The vid data script. */ - @Value("classpath:vid-data.sql") - private Resource vidDataScript; - - /** - * The Class InnerConfiguration. - */ - @Configuration - @Import(SystemProperties.class) - static class InnerConfiguration { - } - - /** - * View resolver. - * - * @return the view resolver - * @see org.openecomp.portalsdk.core.conf.AppConfig#viewResolver() - */ - public ViewResolver viewResolver() { - return super.viewResolver(); - } - - /** - * @see org.openecomp.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry) - * - * @param registry - */ - public void addResourceHandlers(ResourceHandlerRegistry registry) { - super.addResourceHandlers(registry); - } - - /** - * @see org.openecomp.portalsdk.core.conf.AppConfig#dataAccessService() - */ - public DataAccessService dataAccessService() { - // Echo the JDBC URL to assist developers when starting the app. - System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is " - + SystemProperties.getProperty(SystemProperties.DB_CONNECTIONURL)); - return super.dataAccessService(); - } - - /** - * Creates a new list with a single entry that is the external app - * definitions.xml path. - * - * @return List of String, size 1 - */ - public List addTileDefinitions() { - List definitions = new ArrayList(); - definitions.add("/WEB-INF/defs/definitions.xml"); - return definitions; - } - - /** - * Adds request interceptors to the specified registry by calling - * {@link AppConfig#addInterceptors(InterceptorRegistry)}, but excludes - * certain paths from the session timeout interceptor. - */ - @Override - public void addInterceptors(InterceptorRegistry registry) { - super.setExcludeUrlPathsForSessionTimeout("/login_external", "*/login_external.htm", "login", "/login.htm", - "/api*", "/single_signon.htm", "/single_signon"); - super.addInterceptors(registry); - } - - /** - * Creates and returns a new instance of a {@link CacheManager} class. - * - * @return New instance of {@link CacheManager} - */ - @Bean - public AbstractCacheManager cacheManager() { - return new CacheManager(); - } - - - - - /** - * Creates and returns a new instance of a {@link FusionLicenseManager}. - * - * @return New instance of {@link FusionLicenseManager}. - */ -// @Bean -// public FusionLicenseManager fusionLicenseManager() { -// return new FusionLicenseManagerImpl(); -// } - - /** - * Creates and returns a new instance of a - * {@link FusionLicenseManagerUtils}. - * - * @return New instance of {@link FusionLicenseManagerUtils}. - */ -// @Bean -// public FusionLicenseManagerUtils fusionLicenseManagerUtils() { -// return new FusionLicenseManagerUtils(); -// } - - /** - * Creates and returns a new instance of a {@link SchedulerFactoryBean} and - * populates it with triggers. - * - * @return New instance of {@link SchedulerFactoryBean} - * @throws Exception - */ - // @Bean // ANNOTATION COMMENTED OUT - // APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION - public SchedulerFactoryBean schedulerFactoryBean() throws Exception { - SchedulerFactoryBean scheduler = new SchedulerFactoryBean(); - scheduler.setTriggers(schedulerRegistryAdapter.getTriggers()); - scheduler.setConfigLocation(appApplicationContext.getResource("WEB-INF/conf/quartz.properties")); - scheduler.setDataSource(dataSource()); - return scheduler; - } - - /** - * Data source initializer. - * - * @param dataSource the data source - * @return the data source initializer - */ - @Bean - public DataSourceInitializer dataSourceInitializer(DataSource dataSource) { - - LOG.info("Initializing VID data source"); - - final DataSourceInitializer initializer = new DataSourceInitializer(); - initializer.setDataSource(dataSource); - initializer.setDatabasePopulator(databasePopulator()); - return initializer; - } - - /** - * Database populator. - * - * @return the database populator - */ - public DatabasePopulator databasePopulator() { - LOG.info("Populating VID data source"); - - final ResourceDatabasePopulator populator = new ResourceDatabasePopulator(); - populator.addScript(vidSchemaScript); - populator.addScript(vidDataScript); - return populator; - } - - /** - * Sets the scheduler registry adapter. - * - * @param schedulerRegistryAdapter - */ - @Autowired - public void setSchedulerRegistryAdapter(final RegistryAdapter schedulerRegistryAdapter) { - this.schedulerRegistryAdapter = schedulerRegistryAdapter; - } - - /** - * Creates the LoginStrategy - * @return instance of LoginStrategy - */ - @Bean - public LoginStrategy loginStrategy() { - - return new LoginStrategyImpl(); - } -} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java deleted file mode 100755 index 6e5354a3..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * ================================================================================ - * ECOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -package org.openecomp.portalapp.conf; - -import org.openecomp.portalsdk.core.conf.AppInitializer; - -public class ExternalAppInitializer extends AppInitializer { - - @Override - protected Class[] getRootConfigClasses() { - return super.getRootConfigClasses(); - } - - @Override - protected Class[] getServletConfigClasses() { - Class appConfigClass = ExternalAppConfig.class; - // Show something on stdout to indicate the app is starting. - System.out.println("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName()); - return new Class[] { appConfigClass }; - } - - /* - * URL request will direct to the Spring dispatcher for processing - */ - @Override - protected String[] getServletMappings() { - return super.getServletMappings(); - } - -} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java deleted file mode 100755 index bc751f75..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java +++ /dev/null @@ -1,57 +0,0 @@ -/*- - * ================================================================================ - * ECOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -package org.openecomp.portalapp.conf; - -import org.springframework.context.annotation.Profile; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.stereotype.Component; - -import org.openecomp.portalsdk.core.conf.HibernateMappingLocatable; - -@Component -@Profile("src") -public class HibernateMappingLocations implements HibernateMappingLocatable { - - /* - * (non-Javadoc) - * - * @see org.openecomp.portalsdk.core.conf.HibernateMappingLocatable# - * getMappingLocations() - */ - @Override - public Resource[] getMappingLocations() { - return new Resource[] { new ClassPathResource("../fusion/orm/Fusion.hbm.xml"), - new ClassPathResource("../fusion/orm/Workflow.hbm.xml"), - new ClassPathResource("../fusion/orm/RNoteBookIntegration.hbm.xml") }; - } - - /* - * (non-Javadoc) - * - * @see org.openecomp.portalsdk.core.conf.HibernateMappingLocatable# - * getPackagesToScan() - */ - @Override - public String[] getPackagesToScan() { - return new String[] { "org.openecomp" }; - } - -} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java deleted file mode 100755 index e6a39366..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.openecomp.portalapp.lm; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.servlet.ServletContext; - -import org.openecomp.portalsdk.core.lm.FusionLicenseManager; -import org.springframework.stereotype.Component; - -/* - * Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface. - */ - -@Component -public class FusionLicenseManagerImpl implements FusionLicenseManager { - - @Override - public void initKeyStoreParam() { - - } - - @Override - public void initCipherParam() { - - } - - @Override - public void initLicenseParam() { - - } - - @Override - public void doInitWork() { - - } - - @Override - public int installLicense() { - return 0; - } - - @Override - public synchronized int verifyLicense(ServletContext context) { - return 0; - } - - @Override - public void generateLicense(Map clientInfoMap, List ipAddressList) throws Exception { - - } - - @Override - public String nvl(String s) { - return null; - } - - @Override - public Date getExpiredDate() { - return null; - } - - @Override - public void setExpiredDate(Date expiredDate) { - - } - - -} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java deleted file mode 100755 index d688987f..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * ================================================================================ - * eCOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -package org.openecomp.portalapp.lm; - -import java.io.FileNotFoundException; -import java.io.InputStream; - -import org.openecomp.portalsdk.core.lm.LicenseableClass; - -/* - * Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface. - */ - -public class LicenseableClassImpl implements LicenseableClass { - - public String getApplicationName() { - return ""; - } - - public InputStream getPublicKeystoreAsInputStream() throws FileNotFoundException { - return null; - } - - public String getAlias() { - return ""; - } - - public String getKeyPasswd() { - return ""; - } - - public String getPublicKeystorePassword() { - return ""; - } - - public String getCipherParamPassword() { - return ""; - } - - @SuppressWarnings("rawtypes") - public Class getClassToLicense() { - return this.getClass(); - } -} - diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java deleted file mode 100755 index e004c241..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.openecomp.portalapp.login; - -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.openecomp.portalsdk.core.auth.LoginStrategy; -import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; -import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; -import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants; -import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties; -import org.springframework.web.servlet.ModelAndView; - -public class LoginStrategyImpl extends LoginStrategy { - - @Override - public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception { - //'login' for opensource is same as 'external' login. - return doExternalLogin(request, response); - } - - @Override - public String getUserId(HttpServletRequest request) throws PortalAPIException { - // Check ECOMP Portal cookie - if (!isLoginCookieExist(request)) - return null; - - String userid = null; - try { - userid = getUserIdFromCookie(request); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return userid; - } - - private static String getUserIdFromCookie(HttpServletRequest request) throws Exception { - String userId = ""; - Cookie[] cookies = request.getCookies(); - Cookie userIdcookie = null; - if (cookies != null) - for (Cookie cookie : cookies) - if (cookie.getName().equals(USER_ID)) - userIdcookie = cookie; - if(userIdcookie!=null){ - userId = CipherUtil.decrypt(userIdcookie.getValue()); - } - return userId; - - } - - private static boolean isLoginCookieExist(HttpServletRequest request) { - Cookie ep = getCookie(request, EP_SERVICE); - return (ep != null); - } - - private static Cookie getCookie(HttpServletRequest request, String cookieName) { - Cookie[] cookies = request.getCookies(); - if (cookies != null) - for (Cookie cookie : cookies) - if (cookie.getName().equals(cookieName)) - return cookie; - - return null; - } - - -} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java deleted file mode 100755 index acf934dd..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/Register.java +++ /dev/null @@ -1,71 +0,0 @@ -/*- - * ================================================================================ - * ECOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -package org.openecomp.portalapp.scheduler; - -import java.util.ArrayList; -import java.util.List; - -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.core.scheduler.Registerable; -import org.openecomp.portalsdk.core.util.SystemProperties; -import org.quartz.Trigger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.DependsOn; -import org.springframework.stereotype.Component; - -@Component -@DependsOn({ "logRegistry", "systemProperties" }) -public class Register implements Registerable { - - EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(Register.class); - - private List scheduleTriggers = new ArrayList(); - Trigger trigger[] = new Trigger[1]; - - @Autowired - private LogRegistry logRegistry; - - @Override - public Trigger[] getTriggers() { - return getScheduleTriggers().toArray(trigger); - } - - @Override - public void registerTriggers() { - // if the property value is not available; the cron will not be added - // and can be ignored. its safe to ignore the exceptions - try { - if (SystemProperties.getProperty(SystemProperties.LOG_CRON) != null) - getScheduleTriggers().add(logRegistry.getTrigger()); - } catch (IllegalStateException ies) { - logger.info(EELFLoggerDelegate.debugLogger, ("Log Cron not available")); - } - - } - - public List getScheduleTriggers() { - return scheduleTriggers; - } - - public void setScheduleTriggers(List scheduleTriggers) { - this.scheduleTriggers = scheduleTriggers; - } - -} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java deleted file mode 100755 index 902c545d..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java +++ /dev/null @@ -1,92 +0,0 @@ -/*- - * ================================================================================ - * ECOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -package org.openecomp.portalapp.scheduler; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.openecomp.portalsdk.core.scheduler.Registerable; -import org.openecomp.portalsdk.workflow.services.WorkflowScheduleService; -import org.quartz.Trigger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.quartz.SchedulerFactoryBean; -import org.springframework.stereotype.Component; - -@Component -public class RegistryAdapter { - - @Autowired - private Registerable registry; - - @Autowired - private WorkflowScheduleService workflowScheduleService; - - private SchedulerFactoryBean schedulerBean; - - Trigger trigger[] = new Trigger[1]; - - public Trigger[] getTriggers() { - - registry.registerTriggers(); - - List allTriggers = new ArrayList(); - - List coreTriggers = addCoreTriggers(); - final Trigger[] extTriggerArray = registry.getTriggers(); - - allTriggers.addAll(Arrays.asList(extTriggerArray)); - allTriggers.addAll(coreTriggers); - - return allTriggers.toArray(trigger); - } - - public List addCoreTriggers() { - // On startup of the application after crash recovery, invoke workflow - // schedule trigger - List triggers = getWorkflowScheduleService().triggerWorkflowScheduling(); - return triggers; - } - - public void setSchedulerBean(SchedulerFactoryBean _schedulerBean) { - schedulerBean = _schedulerBean; - } - - public SchedulerFactoryBean getSchedulerBean() { - return schedulerBean; - } - - public Registerable getRegistry() { - return registry; - } - - public void setRegistry(Registerable registry) { - this.registry = registry; - } - - public WorkflowScheduleService getWorkflowScheduleService() { - return workflowScheduleService; - } - - public void setWorkflowScheduleService(WorkflowScheduleService workflowScheduleService) { - this.workflowScheduleService = workflowScheduleService; - } - -} diff --git a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java deleted file mode 100755 index 4145aa3d..00000000 --- a/epsdk-app-onap/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java +++ /dev/null @@ -1,64 +0,0 @@ -/*- - * ================================================================================ - * ECOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -package org.openecomp.portalapp.service; - -import java.util.Set; - -import org.openecomp.portalsdk.core.domain.Role; -import org.openecomp.portalsdk.core.domain.User; -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - - -@Service("adminAuthExtension") -@Transactional -/** - * Provides empty implementations of the methods in IAdminAuthExtension. - */ -public class AdminAuthExtension implements IAdminAuthExtension { - - EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AdminAuthExtension.class); - - /* - * (non-Javadoc) - * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User) - */ - public void saveUserExtension(User user) { - logger.debug("saveUserExtension"); - } - - /* - * (non-Javadoc) - * @see org.openecomp.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User) - */ - public void editUserExtension(User user) { - logger.debug("editUserExtension"); - } - - /* - * (non-Javadoc) - * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User) - */ - public void saveUserRoleExtension(Set roles, User user) { - logger.debug("saveUserRoleExtension"); - } - -} diff --git a/epsdk-app-onap/src/main/resources/portal.properties b/epsdk-app-onap/src/main/resources/portal.properties index 824fd730..40582111 100755 --- a/epsdk-app-onap/src/main/resources/portal.properties +++ b/epsdk-app-onap/src/main/resources/portal.properties @@ -30,7 +30,7 @@ use_rest_for_functional_menu=true ########################################################################## # Name of java class that implements the OnBoardingApiService interface. -portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl +portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl # Log On for single sign on ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm diff --git a/epsdk-app-onap/src/main/resources/portal_template.properties b/epsdk-app-onap/src/main/resources/portal_template.properties index ed694014..d01413aa 100755 --- a/epsdk-app-onap/src/main/resources/portal_template.properties +++ b/epsdk-app-onap/src/main/resources/portal_template.properties @@ -1,6 +1,6 @@ # Properties read by ECOMP Framework library, ecompFW.jar -portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl +portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl portal.api.prefix = /api max.idle.time = 5 user.attribute.name = user_attribute diff --git a/epsdk-app-onap/src/main/resources/vid-data.sql b/epsdk-app-onap/src/main/resources/vid-data.sql index 497ca202..8f0eabee 100755 --- a/epsdk-app-onap/src/main/resources/vid-data.sql +++ b/epsdk-app-onap/src/main/resources/vid-data.sql @@ -28,8 +28,11 @@ DELETE FROM `fn_tab`; DELETE FROM `fn_function`; DELETE FROM `fn_lu_alert_method`; DELETE FROM `fn_lu_activity`; +DELETE FROM `fn_lu_call_times`; +DELETE FROM `fn_lu_country`; DELETE FROM `fn_lu_menu_set`; DELETE FROM `fn_lu_priority`; +DELETE FROM `fn_lu_state`; DELETE FROM `fn_lu_tab_set`; -- @@ -44,6 +47,31 @@ REPLACE INTO `cr_raptor_action_img` VALUES ('DELETE','/static/fusion/raptor/img/ INSERT IGNORE INTO `fn_app` VALUES (1,'Default',null,'Some Default Description','Some Default Note',null,null,null,'ECPP','?',1,'okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX'); +-- +-- Dumping data for table `vid_workflow` +-- +INSERT INTO `vid_workflow` (`WORKFLOW_DB_ID`, `WORKFLOW_APP_NAME`) VALUES (1, 'Update') ON DUPLICATE KEY UPDATE WORKFLOW_APP_NAME='Update'; +INSERT INTO `vid_workflow` (`WORKFLOW_DB_ID`, `WORKFLOW_APP_NAME`) VALUES (2, 'Replace') ON DUPLICATE KEY UPDATE WORKFLOW_APP_NAME='Replace'; +INSERT INTO `vid_workflow` (`WORKFLOW_DB_ID`, `WORKFLOW_APP_NAME`) VALUES (3, 'VNF In Place Software Update') ON DUPLICATE KEY UPDATE WORKFLOW_APP_NAME='VNF In Place Software Update'; + + +-- +-- Dumping data for table `vid_category_parameter` +-- +INSERT INTO `vid_category_parameter` (`CATEGORY_ID`, `NAME`, `ID_SUPPORTED`, `FAMILY`,`CREATED_DATE`, `MODIFIED_DATE`) VALUES (1, 'platform', 0, 'PARAMETER_STANDARDIZATION','2017-09-12 17:01:13', '2017-09-12 17:01:13') ON DUPLICATE KEY UPDATE NAME='platform'; +INSERT INTO `vid_category_parameter` (`CATEGORY_ID`, `NAME`, `ID_SUPPORTED`, `FAMILY`,`CREATED_DATE`, `MODIFIED_DATE`) VALUES (2, 'project', 0, 'PARAMETER_STANDARDIZATION','2017-09-12 18:23:54', '2017-09-13 15:05:25') ON DUPLICATE KEY UPDATE NAME='project'; +INSERT INTO `vid_category_parameter` (`CATEGORY_ID`, `NAME`, `ID_SUPPORTED`, `FAMILY`,`CREATED_DATE`, `MODIFIED_DATE`) VALUES (3, 'lineOfBusiness', 0,'PARAMETER_STANDARDIZATION', '2017-09-12 18:24:14', '2017-09-12 18:24:15') ON DUPLICATE KEY UPDATE NAME='lineOfBusiness'; +INSERT INTO `vid_category_parameter` (`CATEGORY_ID`, `NAME`, `ID_SUPPORTED`, `FAMILY`,`CREATED_DATE`, `MODIFIED_DATE`) VALUES (4, 'owningEntity', 1, 'PARAMETER_STANDARDIZATION', '2017-09-12 18:24:26', '2017-09-12 18:24:28') ON DUPLICATE KEY UPDATE NAME='owningEntity'; +INSERT INTO `vid_category_parameter` (`CATEGORY_ID`, `NAME`, `ID_SUPPORTED`, `FAMILY`,`CREATED_DATE`, `MODIFIED_DATE`) VALUES (5,'operational-environment-type', 0,'TENANT_ISOLATION', '2017-11-12 18:24:26', '2017-11-12 18:24:28') ON DUPLICATE KEY UPDATE NAME='operational-environment-type'; +INSERT INTO `vid_category_parameter` (`CATEGORY_ID`, `NAME`, `ID_SUPPORTED`, `FAMILY`,`CREATED_DATE`, `MODIFIED_DATE`) VALUES (6,'workload-context', 0, 'TENANT_ISOLATION','2017-11-12 18:24:26', '2017-11-12 18:24:28') ON DUPLICATE KEY UPDATE NAME='workload-context'; + +-- +-- Dumping data for table `vid_category_parameter_option` +-- +INSERT INTO `vid_category_parameter_option` (`CATEGORY_OPT_APP_ID`, `NAME`, `CATEGORY_ID`) VALUES ('ECOMP', 'ECOMP', '6') ON DUPLICATE KEY UPDATE NAME='ECOMP'; +INSERT INTO `vid_category_parameter_option` (`CATEGORY_OPT_APP_ID`, `NAME`, `CATEGORY_ID`) VALUES ('DEV', 'DEV', '6') ON DUPLICATE KEY UPDATE NAME='DEV'; +INSERT INTO `vid_category_parameter_option` (`CATEGORY_OPT_APP_ID`, `NAME`, `CATEGORY_ID`) VALUES ('TEST', 'TEST', '6') ON DUPLICATE KEY UPDATE NAME='TEST'; +INSERT INTO `vid_category_parameter_option` (`CATEGORY_OPT_APP_ID`, `NAME`, `CATEGORY_ID`) VALUES ('VNF', 'VNF', '5') ON DUPLICATE KEY UPDATE NAME='VNF'; -- -- Dumping data for table `fn_function` @@ -84,6 +112,8 @@ INSERT INTO `fn_function` VALUES ('menu_test','Test Menu') ON DUPLICATE KEY UPDA INSERT INTO `fn_function` VALUES ('menu_viewlog','Log Menu') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Log Menu'; INSERT INTO `fn_function` VALUES ('view_reports','View Raptor reports') ON DUPLICATE KEY UPDATE FUNCTION_NAME='View Raptor reports'; INSERT INTO `fn_function` VALUES ('menu_searchexisting', 'Search for Existing Service Instances') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Search for Existing Service Instances'; +INSERT INTO `fn_function` VALUES ('menu_changemanagement','VNF Changes') ON DUPLICATE KEY UPDATE FUNCTION_NAME='VNF Changes'; +INSERT INTO `fn_function` VALUES ('menu_testenvironment','Test Environments') ON DUPLICATE KEY UPDATE FUNCTION_NAME='Test Environments'; -- -- Dumping data for table `fn_lu_activity` @@ -110,6 +140,303 @@ REPLACE INTO `fn_lu_alert_method` VALUES ('PAGER','Pager'); REPLACE INTO `fn_lu_alert_method` VALUES ('PHONE','Phone'); REPLACE INTO `fn_lu_alert_method` VALUES ('SMS','SMS'); +-- +-- Dumping data for table `fn_lu_call_times` +-- +REPLACE INTO `fn_lu_call_times` VALUES (1,20,'20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (2,40,'40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (3,60,'1 hr'); +REPLACE INTO `fn_lu_call_times` VALUES (4,80,'1 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (5,100,'1 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (6,120,'2 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (7,140,'2 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (8,160,'2 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (9,180,'3 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (10,200,'3 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (11,220,'3 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (12,240,'4 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (13,260,'4 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (14,280,'4 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (15,300,'5 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (16,320,'5 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (17,340,'5 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (18,360,'6 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (19,380,'6 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (20,400,'6 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (21,420,'7 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (22,440,'7 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (23,460,'7 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (24,480,'8 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (25,500,'8 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (26,520,'8 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (27,540,'9 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (28,560,'9 hr 20 min'); +REPLACE INTO `fn_lu_call_times` VALUES (29,580,'9 hr 40 min'); +REPLACE INTO `fn_lu_call_times` VALUES (30,600,'10 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (31,10,'10 min'); +REPLACE INTO `fn_lu_call_times` VALUES (32,5,'5 min'); +REPLACE INTO `fn_lu_call_times` VALUES (33,1200,'20 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (34,1800,'30 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (35,2400,'40 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (36,3000,'50 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (37,4200,'70 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (38,4800,'80 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (39,5400,'90 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (40,6000,'100 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (41,7200,'120 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (42,9600,'160 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (43,10800,'180 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (44,12000,'200 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (45,18000,'300 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (46,24000,'400 hrs'); +REPLACE INTO `fn_lu_call_times` VALUES (47,30000,'500 hrs'); + +-- +-- Dumping data for table `fn_lu_country` +-- +REPLACE INTO `fn_lu_country` VALUES ('AD','Andorra','Andorra',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AE','United Arab Emirates','United Arab Emirates',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AF','Afghanistan','Afghanistan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AG','Antigua and Barbuda','Antigua and Barbuda',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AI','Anguilla','Anguilla',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AL','Albania','Albania',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AM','Armenia','Armenia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AN','Netherlands Antilles','Netherlands Antilles',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AO','Angola','Angola',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AQ','Antarctica','Antarctica',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AR','Argentina','Argentina',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AS','American Samoa','American Samoa',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AT','Austria','Austria',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AU','Australia','Australia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AW','Aruba','Aruba',NULL); +REPLACE INTO `fn_lu_country` VALUES ('AZ','Azerbaidjan','Azerbaidjan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BA','Bosnia-Herzegovina','Bosnia-Herzegovina',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BB','Barbados','Barbados',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BD','Bangladesh','Bangladesh',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BE','Belgium','Belgium',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BF','Burkina Faso','Burkina Faso',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BG','Bulgaria','Bulgaria',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BH','Bahrain','Bahrain',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BI','Burundi','Burundi',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BJ','Benin','Benin',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BM','Bermuda','Bermuda',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BN','Brunei Darussalam','Brunei Darussalam',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BO','Bolivia','Bolivia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BR','Brazil','Brazil',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BS','Bahamas','Bahamas',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BT','Bhutan','Bhutan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BV','Bouvet Island','Bouvet Island',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BW','Botswana','Botswana',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BY','Belarus','Belarus',NULL); +REPLACE INTO `fn_lu_country` VALUES ('BZ','Belize','Belize',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CA','Canada','Canada',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CC','Cocos (Keeling) Islands','Cocos (Keeling) Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CF','Central African Republic','Central African Republic',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CG','Congo','Congo',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CH','Switzerland','Switzerland',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CI','Ivory Coast (Cote D\'Ivoire)','Ivory Coast (Cote D\'Ivoire)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CK','Cook Islands','Cook Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CL','Chile','Chile',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CM','Cameroon','Cameroon',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CN','China','China','China'); +REPLACE INTO `fn_lu_country` VALUES ('CO','Colombia','Colombia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CR','Costa Rica','Costa Rica',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CS','Former Czechoslovakia','Former Czechoslovakia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CU','Cuba','Cuba',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CV','Cape Verde','Cape Verde',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CX','Christmas Island','Christmas Island',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CY','Cyprus','Cyprus',NULL); +REPLACE INTO `fn_lu_country` VALUES ('CZ','Czech Republic','Czech Republic',NULL); +REPLACE INTO `fn_lu_country` VALUES ('DE','Germany','Germany',NULL); +REPLACE INTO `fn_lu_country` VALUES ('DJ','Djibouti','Djibouti',NULL); +REPLACE INTO `fn_lu_country` VALUES ('DK','Denmark','Denmark',NULL); +REPLACE INTO `fn_lu_country` VALUES ('DM','Dominica','Dominica',NULL); +REPLACE INTO `fn_lu_country` VALUES ('DO','Dominican Republic','Dominican Republic',NULL); +REPLACE INTO `fn_lu_country` VALUES ('DZ','Algeria','Algeria',NULL); +REPLACE INTO `fn_lu_country` VALUES ('EC','Ecuador','Ecuador',NULL); +REPLACE INTO `fn_lu_country` VALUES ('EE','Estonia','Estonia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('EG','Egypt','Egypt',NULL); +REPLACE INTO `fn_lu_country` VALUES ('EH','Western Sahara','Western Sahara',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ER','Eritrea','Eritrea',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ES','Spain','Spain',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ET','Ethiopia','Ethiopia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('FI','Finland','Finland',NULL); +REPLACE INTO `fn_lu_country` VALUES ('FJ','Fiji','Fiji',NULL); +REPLACE INTO `fn_lu_country` VALUES ('FK','Falkland Islands','Falkland Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('FM','Micronesia','Micronesia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('FO','Faroe Islands','Faroe Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('FR','France','France',NULL); +REPLACE INTO `fn_lu_country` VALUES ('FX','France (European Territory)','France (European Territory)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GA','Gabon','Gabon',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GB','Great Britain','Great Britain',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GD','Grenada','Grenada',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GE','Georgia','Georgia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GF','French Guyana','French Guyana',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GH','Ghana','Ghana',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GI','Gibraltar','Gibraltar',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GL','Greenland','Greenland',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GM','Gambia','Gambia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GN','Guinea','Guinea',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GP','Guadeloupe (French)','Guadeloupe (French)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GQ','Equatorial Guinea','Equatorial Guinea',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GR','Greece','Greece',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GS','S. Georgia and S. Sandwich Isls.','S. Georgia and S. Sandwich Isls.',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GT','Guatemala','Guatemala',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GU','Guam (USA)','Guam (USA)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GW','Guinea Bissau','Guinea Bissau',NULL); +REPLACE INTO `fn_lu_country` VALUES ('GY','Guyana','Guyana',NULL); +REPLACE INTO `fn_lu_country` VALUES ('HK','Hong Kong','Hong Kong',NULL); +REPLACE INTO `fn_lu_country` VALUES ('HM','Heard and McDonald Islands','Heard and McDonald Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('HN','Honduras','Honduras',NULL); +REPLACE INTO `fn_lu_country` VALUES ('HR','Croatia','Croatia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('HT','Haiti','Haiti',NULL); +REPLACE INTO `fn_lu_country` VALUES ('HU','Hungary','Hungary',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ID','Indonesia','Indonesia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IE','Ireland','Ireland',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IL','Israel','Israel',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IN','India','India',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IO','British Indian Ocean Territory','British Indian Ocean Territory',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IQ','Iraq','Iraq',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IR','Iran','Iran',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IS','Iceland','Iceland',NULL); +REPLACE INTO `fn_lu_country` VALUES ('IT','Italy','Italy',NULL); +REPLACE INTO `fn_lu_country` VALUES ('JM','Jamaica','Jamaica',NULL); +REPLACE INTO `fn_lu_country` VALUES ('JO','Jordan','Jordan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('JP','Japan','Japan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KE','Kenya','Kenya',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KG','Kyrgyzstan','Kyrgyzstan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KH','Cambodia','Cambodia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KI','Kiribati','Kiribati',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KM','Comoros','Comoros',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KN','Saint Kitts and Nevis Anguilla','Saint Kitts and Nevis Anguilla',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KP','North Korea','North Korea',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KR','South Korea','South Korea',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KW','Kuwait','Kuwait',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KY','Cayman Islands','Cayman Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('KZ','Kazakhstan','Kazakhstan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LA','Laos','Laos',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LB','Lebanon','Lebanon',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LC','Saint Lucia','Saint Lucia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LI','Liechtenstein','Liechtenstein',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LK','Sri Lanka','Sri Lanka',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LR','Liberia','Liberia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LS','Lesotho','Lesotho',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LT','Lithuania','Lithuania',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LU','Luxembourg','Luxembourg',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LV','Latvia','Latvia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('LY','Libya','Libya',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MA','Morocco','Morocco',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MC','Monaco','Monaco',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MD','Moldavia','Moldavia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MG','Madagascar','Madagascar',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MH','Marshall Islands','Marshall Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MK','Macedonia','Macedonia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ML','Mali','Mali',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MM','Myanmar','Myanmar',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MN','Mongolia','Mongolia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MO','Macau','Macau',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MP','Northern Mariana Islands','Northern Mariana Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MQ','Martinique (French)','Martinique (French)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MR','Mauritania','Mauritania',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MS','Montserrat','Montserrat',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MT','Malta','Malta',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MU','Mauritius','Mauritius',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MV','Maldives','Maldives',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MW','Malawi','Malawi',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MX','Mexico','Mexico','Mexico'); +REPLACE INTO `fn_lu_country` VALUES ('MY','Malaysia','Malaysia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('MZ','Mozambique','Mozambique',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NA','Namibia','Namibia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NC','New Caledonia (French)','New Caledonia (French)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NE','Niger','Niger',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NF','Norfolk Island','Norfolk Island',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NG','Nigeria','Nigeria',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NI','Nicaragua','Nicaragua',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NL','Netherlands','Netherlands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NO','Norway','Norway',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NP','Nepal','Nepal',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NR','Nauru','Nauru',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NU','Niue','Niue',NULL); +REPLACE INTO `fn_lu_country` VALUES ('NZ','New Zealand','New Zealand',NULL); +REPLACE INTO `fn_lu_country` VALUES ('OM','Oman','Oman',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PA','Panama','Panama',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PE','Peru','Peru',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PF','Polynesia (French)','Polynesia (French)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PG','Papua New Guinea','Papua New Guinea',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PH','Philippines','Philippines',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PK','Pakistan','Pakistan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PL','Poland','Poland',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PM','Saint Pierre and Miquelon','Saint Pierre and Miquelon',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PN','Pitcairn Island','Pitcairn Island',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PR','Puerto Rico','Puerto Rico',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PT','Portugal','Portugal',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PW','Palau','Palau',NULL); +REPLACE INTO `fn_lu_country` VALUES ('PY','Paraguay','Paraguay',NULL); +REPLACE INTO `fn_lu_country` VALUES ('QA','Qatar','Qatar',NULL); +REPLACE INTO `fn_lu_country` VALUES ('RE','Reunion (French)','Reunion (French)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('RO','Romania','Romania',NULL); +REPLACE INTO `fn_lu_country` VALUES ('RU','Russian Federation','Russian Federation',NULL); +REPLACE INTO `fn_lu_country` VALUES ('RW','Rwanda','Rwanda',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SA','Saudi Arabia','Saudi Arabia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SB','Solomon Islands','Solomon Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SC','Seychelles','Seychelles',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SD','Sudan','Sudan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SE','Sweden','Sweden',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SG','Singapore','Singapore',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SH','Saint Helena','Saint Helena',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SI','Slovenia','Slovenia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SJ','Svalbard and Jan Mayen Islands','Svalbard and Jan Mayen Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SK','Slovak Republic','Slovak Republic',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SL','Sierra Leone','Sierra Leone',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SM','San Marino','San Marino',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SN','Senegal','Senegal',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SO','Somalia','Somalia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SR','Suriname','Suriname',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ST','Saint Tome (Sao Tome) and Principe','Saint Tome (Sao Tome) and Principe',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SU','Former USSR','Former USSR',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SV','El Salvador','El Salvador',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SY','Syria','Syria',NULL); +REPLACE INTO `fn_lu_country` VALUES ('SZ','Swaziland','Swaziland',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TC','Turks and Caicos Islands','Turks and Caicos Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TD','Chad','Chad',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TF','French Southern Territories','French Southern Territories',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TG','Togo','Togo',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TH','Thailand','Thailand',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TJ','Tadjikistan','Tadjikistan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TK','Tokelau','Tokelau',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TM','Turkmenistan','Turkmenistan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TN','Tunisia','Tunisia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TO','Tonga','Tonga',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TP','East Timor','East Timor',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TR','Turkey','Turkey',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TT','Trinidad and Tobago','Trinidad and Tobago',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TV','Tuvalu','Tuvalu',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TW','Taiwan','Taiwan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('TZ','Tanzania','Tanzania',NULL); +REPLACE INTO `fn_lu_country` VALUES ('UA','Ukraine','Ukraine',NULL); +REPLACE INTO `fn_lu_country` VALUES ('UG','Uganda','Uganda',NULL); +REPLACE INTO `fn_lu_country` VALUES ('UK','United Kingdom','United Kingdom',NULL); +REPLACE INTO `fn_lu_country` VALUES ('UM','USA Minor Outlying Islands','USA Minor Outlying Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('US','United States','United States','USA'); +REPLACE INTO `fn_lu_country` VALUES ('UY','Uruguay','Uruguay',NULL); +REPLACE INTO `fn_lu_country` VALUES ('UZ','Uzbekistan','Uzbekistan',NULL); +REPLACE INTO `fn_lu_country` VALUES ('VA','Vatican City State','Vatican City State',NULL); +REPLACE INTO `fn_lu_country` VALUES ('VC','Saint Vincent and Grenadines','Saint Vincent and Grenadines',NULL); +REPLACE INTO `fn_lu_country` VALUES ('VE','Venezuela','Venezuela',NULL); +REPLACE INTO `fn_lu_country` VALUES ('VG','Virgin Islands (British)','Virgin Islands (British)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('VI','Virgin Islands (USA)','Virgin Islands (USA)',NULL); +REPLACE INTO `fn_lu_country` VALUES ('VN','Vietnam','Vietnam',NULL); +REPLACE INTO `fn_lu_country` VALUES ('VU','Vanuatu','Vanuatu',NULL); +REPLACE INTO `fn_lu_country` VALUES ('WF','Wallis and Futuna Islands','Wallis and Futuna Islands',NULL); +REPLACE INTO `fn_lu_country` VALUES ('WS','Samoa','Samoa',NULL); +REPLACE INTO `fn_lu_country` VALUES ('YE','Yemen','Yemen',NULL); +REPLACE INTO `fn_lu_country` VALUES ('YT','Mayotte','Mayotte',NULL); +REPLACE INTO `fn_lu_country` VALUES ('YU','Yugoslavia','Yugoslavia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ZA','South Africa','South Africa',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ZM','Zambia','Zambia',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ZR','Zaire','Zaire',NULL); +REPLACE INTO `fn_lu_country` VALUES ('ZW','Zimbabwe','Zimbabwe',NULL); + -- -- Dumping data for table `fn_lu_menu_set` -- @@ -124,6 +451,62 @@ REPLACE INTO `fn_lu_priority` VALUES (30,'High','Y',30); REPLACE INTO `fn_lu_priority` VALUES (40,'Urgent','Y',40); REPLACE INTO `fn_lu_priority` VALUES (50,'Fatal','Y',50); +-- +-- Dumping data for table `fn_lu_state` +-- +REPLACE INTO `fn_lu_state` VALUES ('AK','AK - Alaska'); +REPLACE INTO `fn_lu_state` VALUES ('AL','AL - Alabama'); +REPLACE INTO `fn_lu_state` VALUES ('AR','AR - Arkansas'); +REPLACE INTO `fn_lu_state` VALUES ('AZ','AZ - Arizona'); +REPLACE INTO `fn_lu_state` VALUES ('CA','CA - California'); +REPLACE INTO `fn_lu_state` VALUES ('CO','CO - Colorado'); +REPLACE INTO `fn_lu_state` VALUES ('CT','CT - Connecticut'); +REPLACE INTO `fn_lu_state` VALUES ('DC','DC - District Of Columbia'); +REPLACE INTO `fn_lu_state` VALUES ('DE','DE - Delaware'); +REPLACE INTO `fn_lu_state` VALUES ('FL','FL - Florida'); +REPLACE INTO `fn_lu_state` VALUES ('GA','GA - Georgia'); +REPLACE INTO `fn_lu_state` VALUES ('HI','HI - Hawaii'); +REPLACE INTO `fn_lu_state` VALUES ('IA','IA - Iowa'); +REPLACE INTO `fn_lu_state` VALUES ('ID','ID - Idaho'); +REPLACE INTO `fn_lu_state` VALUES ('IL','IL - Illinois'); +REPLACE INTO `fn_lu_state` VALUES ('IN','IN - Indiana'); +REPLACE INTO `fn_lu_state` VALUES ('KS','KS - Kansas'); +REPLACE INTO `fn_lu_state` VALUES ('KY','KY - Kentucky'); +REPLACE INTO `fn_lu_state` VALUES ('LA','LA - Louisiana'); +REPLACE INTO `fn_lu_state` VALUES ('MA','MA - Massachusetts'); +REPLACE INTO `fn_lu_state` VALUES ('MD','MD - Maryland'); +REPLACE INTO `fn_lu_state` VALUES ('ME','ME - Maine'); +REPLACE INTO `fn_lu_state` VALUES ('MI','MI - Michigan'); +REPLACE INTO `fn_lu_state` VALUES ('MN','MN - Minnesota'); +REPLACE INTO `fn_lu_state` VALUES ('MO','MO - Missouri'); +REPLACE INTO `fn_lu_state` VALUES ('MS','MS - Mississippi'); +REPLACE INTO `fn_lu_state` VALUES ('MT','MT - Montana'); +REPLACE INTO `fn_lu_state` VALUES ('NC','NC - North Carolina'); +REPLACE INTO `fn_lu_state` VALUES ('ND','ND - North Dakota'); +REPLACE INTO `fn_lu_state` VALUES ('NE','NE - Nebraska'); +REPLACE INTO `fn_lu_state` VALUES ('NH','NH - New Hampshire'); +REPLACE INTO `fn_lu_state` VALUES ('NJ','NJ - New Jersey'); +REPLACE INTO `fn_lu_state` VALUES ('NM','NM - New Mexico'); +REPLACE INTO `fn_lu_state` VALUES ('NV','NV - Nevada'); +REPLACE INTO `fn_lu_state` VALUES ('NY','NY - New York'); +REPLACE INTO `fn_lu_state` VALUES ('OH','OH - Ohio'); +REPLACE INTO `fn_lu_state` VALUES ('OK','OK - Oklahoma'); +REPLACE INTO `fn_lu_state` VALUES ('OR','OR - Oregon'); +REPLACE INTO `fn_lu_state` VALUES ('PA','PA - Pennsylvania'); +REPLACE INTO `fn_lu_state` VALUES ('PR','PR - Puerto Rico'); +REPLACE INTO `fn_lu_state` VALUES ('RI','RI - Rhode Island'); +REPLACE INTO `fn_lu_state` VALUES ('SC','SC - South Carolina'); +REPLACE INTO `fn_lu_state` VALUES ('SD','SD - South Dakota'); +REPLACE INTO `fn_lu_state` VALUES ('TN','TN - Tennessee'); +REPLACE INTO `fn_lu_state` VALUES ('TX','TX - Texas'); +REPLACE INTO `fn_lu_state` VALUES ('UT','UT - Utah'); +REPLACE INTO `fn_lu_state` VALUES ('VA','VA - Virginia'); +REPLACE INTO `fn_lu_state` VALUES ('VI','VI-Virgin Island'); +REPLACE INTO `fn_lu_state` VALUES ('VT','VT - Vermont'); +REPLACE INTO `fn_lu_state` VALUES ('WA','WA - Washington'); +REPLACE INTO `fn_lu_state` VALUES ('WI','WI - Wisconsin'); +REPLACE INTO `fn_lu_state` VALUES ('WV','WV - West Virginia'); +REPLACE INTO `fn_lu_state` VALUES ('WY','WY - Wyoming'); -- -- Dumping data for table `fn_lu_tab_set` @@ -305,6 +688,9 @@ REPLACE INTO `fn_role_function` VALUES (16,'menu_viewlog'); REPLACE INTO `fn_role_function` VALUES ('1', 'menu_searchexisting'); REPLACE INTO `fn_role_function` VALUES ('16', 'menu_searchexisting'); +update fn_menu set active_yn = 'Y' where label = 'Admin'; +update fn_menu set active_yn = 'Y' where label = 'Root'; +update fn_menu set action = 'admin' where label = 'Admin'; -- -- Dumping data for table `fn_tab` diff --git a/epsdk-app-onap/src/main/resources/vid-schema.sql b/epsdk-app-onap/src/main/resources/vid-schema.sql index 6ca06b19..efd4d05f 100755 --- a/epsdk-app-onap/src/main/resources/vid-schema.sql +++ b/epsdk-app-onap/src/main/resources/vid-schema.sql @@ -66,8 +66,8 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_folder` ( `PARENT_FOLDER_ID` INT(11) NULL DEFAULT NULL, `PUBLIC_YN` VARCHAR(1) NOT NULL DEFAULT 'N', PRIMARY KEY (`FOLDER_ID`), - INDEX `fk_parent_key_cr_folder` (`PARENT_FOLDER_ID` ASC), - CONSTRAINT `fk_parent_key_cr_folder` + INDEX `FK_PARENT_KEY_CR_FOLDER` (`PARENT_FOLDER_ID` ASC), + CONSTRAINT `FK_PARENT_KEY_CR_FOLDER` FOREIGN KEY (`PARENT_FOLDER_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_folder` (`FOLDER_ID`)) ENGINE = InnoDB @@ -94,11 +94,11 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_hist_user_map` ( `HIST_ID` INT(11) NOT NULL, `USER_ID` INT(11) NOT NULL, PRIMARY KEY (`HIST_ID`, `USER_ID`), - INDEX `sys_c0014617` (`USER_ID` ASC), - CONSTRAINT `sys_c0014616` + INDEX `SYS_C0014617` (`USER_ID` ASC), + CONSTRAINT `SYS_C0014616` FOREIGN KEY (`HIST_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_report_file_history` (`HIST_ID`), - CONSTRAINT `sys_c0014617` + CONSTRAINT `SYS_C0014617` FOREIGN KEY (`USER_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`)) ENGINE = InnoDB @@ -167,7 +167,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report` ( `DASHBOARD_TYPE_YN` VARCHAR(1) NULL DEFAULT 'N', `DASHBOARD_YN` VARCHAR(1) NULL DEFAULT 'N', PRIMARY KEY (`REP_ID`), - INDEX `cr_report_create_idpublic_yntitle` (`CREATE_ID` ASC, `PUBLIC_YN` ASC, `TITLE` ASC)) + INDEX `CR_REPORT_CREATE_IDPUBLIC_YNTITLE` (`CREATE_ID` ASC, `PUBLIC_YN` ASC, `TITLE` ASC)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -181,7 +181,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_access` ( `USER_ID` DECIMAL(11,0) NULL DEFAULT NULL, `READ_ONLY_YN` VARCHAR(1) NOT NULL DEFAULT 'N', PRIMARY KEY (`REP_ID`, `ORDER_NO`), - CONSTRAINT `fk_cr_repor_ref_8550_cr_repor` + CONSTRAINT `FK_CR_REPOR_REF_8550_CR_REPOR` FOREIGN KEY (`REP_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) ENGINE = InnoDB @@ -213,8 +213,8 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_email_sent_log` ( `ACCESS_FLAG` VARCHAR(1) NOT NULL DEFAULT 'Y', `TOUCH_DATE` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`LOG_ID`), - INDEX `fk_cr_report_rep_id` (`REP_ID` ASC), - CONSTRAINT `fk_cr_report_rep_id` + INDEX `FK_CR_REPORT_REP_ID` (`REP_ID` ASC), + CONSTRAINT `FK_CR_REPORT_REP_ID` FOREIGN KEY (`REP_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) ENGINE = InnoDB @@ -241,12 +241,12 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_file_history` ( `DELETED_YN` CHAR(1) NULL DEFAULT 'N', `DELETED_BY` DECIMAL(38,0) NULL DEFAULT NULL, PRIMARY KEY (`HIST_ID`), - INDEX `sys_c0014614` (`FILE_TYPE_ID` ASC), - INDEX `sys_c0014615` (`REP_ID` ASC), - CONSTRAINT `sys_c0014614` + INDEX `SYS_C0014614` (`FILE_TYPE_ID` ASC), + INDEX `SYS_C0014615` (`REP_ID` ASC), + CONSTRAINT `SYS_C0014614` FOREIGN KEY (`FILE_TYPE_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_lu_file_type` (`LOOKUP_ID`), - CONSTRAINT `sys_c0014615` + CONSTRAINT `SYS_C0014615` FOREIGN KEY (`REP_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) ENGINE = InnoDB @@ -262,8 +262,8 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_log` ( `ACTION` VARCHAR(2000) NOT NULL, `ACTION_VALUE` VARCHAR(50) NULL DEFAULT NULL, `FORM_FIELDS` VARCHAR(4000) NULL DEFAULT NULL, - INDEX `fk_cr_repor_ref_17645_cr_repor` (`REP_ID` ASC), - CONSTRAINT `fk_cr_repor_ref_17645_cr_repor` + INDEX `FK_CR_REPOR_REF_17645_CR_REPOR` (`REP_ID` ASC), + CONSTRAINT `FK_CR_REPOR_REF_17645_CR_REPOR` FOREIGN KEY (`REP_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) ENGINE = InnoDB @@ -292,8 +292,8 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_schedule` ( `ENCRYPT_YN` CHAR(1) NULL DEFAULT 'N', `ATTACHMENT_YN` CHAR(1) NULL DEFAULT 'Y', PRIMARY KEY (`SCHEDULE_ID`), - INDEX `fk_cr_repor_ref_14707_cr_repor` (`REP_ID` ASC), - CONSTRAINT `fk_cr_repor_ref_14707_cr_repor` + INDEX `FK_CR_REPOR_REF_14707_CR_REPOR` (`REP_ID` ASC), + CONSTRAINT `FK_CR_REPOR_REF_14707_CR_REPOR` FOREIGN KEY (`REP_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_report` (`REP_ID`)) ENGINE = InnoDB @@ -309,7 +309,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_report_schedule_users` ( `ROLE_ID` DECIMAL(11,0) NULL DEFAULT NULL, `ORDER_NO` DECIMAL(11,0) NOT NULL, PRIMARY KEY (`SCHEDULE_ID`, `REP_ID`, `USER_ID`, `ORDER_NO`), - CONSTRAINT `fk_cr_repor_ref_14716_cr_repor` + CONSTRAINT `FK_CR_REPOR_REF_14716_CR_REPOR` FOREIGN KEY (`SCHEDULE_ID`) REFERENCES `vid_openecomp_epsdk`.`cr_report_schedule` (`SCHEDULE_ID`)) ENGINE = InnoDB @@ -343,12 +343,12 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_table_join` ( `SRC_TABLE_NAME` VARCHAR(30) NOT NULL, `DEST_TABLE_NAME` VARCHAR(30) NOT NULL, `JOIN_EXPR` VARCHAR(500) NOT NULL, - INDEX `cr_table_join_dest_table_name` (`DEST_TABLE_NAME` ASC), - INDEX `cr_table_join_src_table_name` (`SRC_TABLE_NAME` ASC), - CONSTRAINT `fk_cr_table_ref_311_cr_tab` + INDEX `CR_TABLE_JOIN_DEST_TABLE_NAME` (`DEST_TABLE_NAME` ASC), + INDEX `CR_TABLE_JOIN_SRC_TABLE_NAME` (`SRC_TABLE_NAME` ASC), + CONSTRAINT `FK_CR_TABLE_REF_311_CR_TAB` FOREIGN KEY (`SRC_TABLE_NAME`) REFERENCES `vid_openecomp_epsdk`.`cr_table_source` (`TABLE_NAME`), - CONSTRAINT `fk_cr_table_ref_315_cr_tab` + CONSTRAINT `FK_CR_TABLE_REF_315_CR_TAB` FOREIGN KEY (`DEST_TABLE_NAME`) REFERENCES `vid_openecomp_epsdk`.`cr_table_source` (`TABLE_NAME`)) ENGINE = InnoDB @@ -361,7 +361,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`cr_table_role` ( `TABLE_NAME` VARCHAR(30) NOT NULL, `ROLE_ID` DECIMAL(11,0) NOT NULL, PRIMARY KEY (`TABLE_NAME`, `ROLE_ID`), - CONSTRAINT `fk_cr_table_ref_32384_cr_table` + CONSTRAINT `FK_CR_TABLE_REF_32384_CR_TABLE` FOREIGN KEY (`TABLE_NAME`) REFERENCES `vid_openecomp_epsdk`.`cr_table_source` (`TABLE_NAME`)) ENGINE = InnoDB @@ -383,74 +383,7 @@ ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; -- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.demo_bar_chart --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_bar_chart` ( - `label` VARCHAR(20) NULL DEFAULT NULL, - `value` DECIMAL(25,15) NULL DEFAULT NULL) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.demo_bar_chart_inter --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_bar_chart_inter` ( - `spam_date` DATE NULL DEFAULT NULL, - `num_rpt_sources` DECIMAL(10,0) NULL DEFAULT NULL, - `num_det_sources` DECIMAL(10,0) NULL DEFAULT NULL) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.demo_line_chart --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_line_chart` ( - `series` VARCHAR(20) NULL DEFAULT NULL, - `log_date` DATE NULL DEFAULT NULL, - `data_value` DECIMAL(10,5) NULL DEFAULT NULL) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.demo_pie_chart --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_pie_chart` ( - `legend` VARCHAR(20) NULL DEFAULT NULL, - `data_value` DECIMAL(10,5) NULL DEFAULT NULL) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.demo_scatter_chart --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_scatter_chart` ( - `rainfall` DECIMAL(10,2) NULL DEFAULT NULL, - `key_value` VARCHAR(20) NULL DEFAULT NULL, - `measurements` DECIMAL(10,2) NULL DEFAULT NULL) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.demo_scatter_plot --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_scatter_plot` ( - `SERIES` VARCHAR(20) NULL DEFAULT NULL, - `VALUEX` DECIMAL(25,15) NULL DEFAULT NULL, - `VALUEY` DECIMAL(25,15) NULL DEFAULT NULL) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.demo_util_chart --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`demo_util_chart` ( - `traffic_date` DATE NULL DEFAULT NULL, - `util_perc` DECIMAL(10,5) NULL DEFAULT NULL) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.fn_app +-- Table vid_portal.fn_app -- ---------------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_app` ( `APP_ID` INT(11) NOT NULL AUTO_INCREMENT, @@ -477,6 +410,21 @@ ENGINE = InnoDB AUTO_INCREMENT = 2 DEFAULT CHARACTER SET = utf8; +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_app_mme_cpu +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_app_mme_cpu` ( + `MME` VARCHAR(200) NULL DEFAULT NULL, + `YEARMONTH` INT(11) NULL DEFAULT NULL, + `SCTP_CPU` INT(11) NULL DEFAULT NULL, + `AP_CPU` INT(11) NULL DEFAULT NULL, + `DP_CPU` INT(11) NULL DEFAULT NULL, + `ROUTER_CPU` INT(11) NULL DEFAULT NULL, + `PEB_CPU` INT(11) NULL DEFAULT NULL, + `SAU` INT(11) NULL DEFAULT NULL) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + -- ---------------------------------------------------------------------------- -- Table vid_openecomp_epsdk.fn_audit_action -- ---------------------------------------------------------------------------- @@ -519,14 +467,14 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_audit_log` ( `AFFECTED_RECORD_ID_BK` VARCHAR(500) NULL DEFAULT NULL, `AFFECTED_RECORD_ID` VARCHAR(4000) NULL DEFAULT NULL, PRIMARY KEY (`LOG_ID`), - INDEX `fn_audit_log_activity_cd` (`ACTIVITY_CD` ASC), - INDEX `fn_audit_log_user_id` (`USER_ID` ASC), + INDEX `FN_AUDIT_LOG_ACTIVITY_CD` (`ACTIVITY_CD` ASC), + INDEX `FN_AUDIT_LOG_USER_ID` (`USER_ID` ASC), + CONSTRAINT `FK_FN_AUDIT_REF_205_FN_LU_AC` + FOREIGN KEY (`ACTIVITY_CD`) + REFERENCES `vid_openecomp_epsdk`.`fn_lu_activity` (`ACTIVITY_CD`), CONSTRAINT `FK_FN_AUDIT_REF_209_FN_USER` FOREIGN KEY (`USER_ID`) - REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), - CONSTRAINT `fk_fn_audit_ref_205_fn_lu_ac` - FOREIGN KEY (`ACTIVITY_CD`) - REFERENCES `vid_openecomp_epsdk`.`fn_lu_activity` (`ACTIVITY_CD`)) + REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -604,6 +552,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_datasource` ( `DS_TYPE` VARCHAR(20) NULL DEFAULT NULL, PRIMARY KEY (`ID`)) ENGINE = InnoDB +AUTO_INCREMENT = 4 DEFAULT CHARACTER SET = utf8; -- ---------------------------------------------------------------------------- @@ -616,6 +565,76 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_function` ( ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_license +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_license` ( + `id` DECIMAL(11,0) NOT NULL, + `app_id` DECIMAL(11,0) NOT NULL, + `ip_address` VARCHAR(100) NOT NULL, + `quantum_version_id` DECIMAL(11,0) NOT NULL, + `created_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `modified_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `created_id` DECIMAL(11,0) NULL DEFAULT NULL, + `modified_id` DECIMAL(11,0) NULL DEFAULT NULL, + `end_date` TIMESTAMP NOT NULL DEFAULT '2036-01-19 03:14:07', + PRIMARY KEY (`id`), + INDEX `fn_license_r02` (`quantum_version_id` ASC), + CONSTRAINT `fn_license_r02` + FOREIGN KEY (`quantum_version_id`) + REFERENCES `vid_openecomp_epsdk`.`fn_license_version` (`id`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_license_app +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_license_app` ( + `id` DECIMAL(11,0) NOT NULL, + `app_name` VARCHAR(100) NOT NULL, + `ctxt_name` VARCHAR(100) NULL DEFAULT NULL, + INDEX `fn_license_app_ID` (`id` ASC)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_license_contact +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_license_contact` ( + `id` INT(11) NOT NULL, + `license_id` INT(11) NULL DEFAULT NULL, + `sbcid` VARCHAR(20) NULL DEFAULT NULL, + PRIMARY KEY (`id`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_license_history +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_license_history` ( + `license_id` DECIMAL(11,0) NULL DEFAULT NULL, + `app_id` DECIMAL(11,0) NULL DEFAULT NULL, + `ip_address` VARCHAR(100) NULL DEFAULT NULL, + `quantum_version_id` DECIMAL(11,0) NULL DEFAULT NULL, + `created_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `modified_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + `created_id` DECIMAL(11,0) NULL DEFAULT NULL, + `modified_id` DECIMAL(11,0) NULL DEFAULT NULL, + `id` DECIMAL(11,0) NOT NULL, + PRIMARY KEY (`id`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_license_version +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_license_version` ( + `id` DECIMAL(11,0) NOT NULL, + `quantum_version` VARCHAR(25) NULL DEFAULT NULL, + PRIMARY KEY (`id`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + -- ---------------------------------------------------------------------------- -- Table vid_openecomp_epsdk.fn_lu_activity -- ---------------------------------------------------------------------------- @@ -647,22 +666,46 @@ ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; -- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.fn_lu_menu_set +-- Table vid_openecomp_epsdk.fn_lu_call_times -- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_menu_set` ( - `MENU_SET_CD` VARCHAR(10) NOT NULL, - `MENU_SET_NAME` VARCHAR(50) NOT NULL, - PRIMARY KEY (`MENU_SET_CD`)) +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_call_times` ( + `CALL_TIME_ID` DECIMAL(10,0) NOT NULL, + `CALL_TIME_AMOUNT` DECIMAL(10,0) NOT NULL, + `CALL_TIME_DISPLAY` VARCHAR(50) NOT NULL, + PRIMARY KEY (`CALL_TIME_ID`)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; -- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.fn_lu_message_location +-- Table vid_openecomp_epsdk.fn_lu_city -- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_message_location` ( - `message_location_id` DECIMAL(11,0) NOT NULL, - `message_location_descr` VARCHAR(30) NOT NULL, - PRIMARY KEY (`message_location_id`)) +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_city` ( + `CITY_CD` VARCHAR(2) NOT NULL, + `CITY` VARCHAR(100) NOT NULL, + `STATE_CD` VARCHAR(2) NOT NULL, + PRIMARY KEY (`CITY_CD`, `STATE_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_country +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_country` ( + `COUNTRY_CD` VARCHAR(3) NOT NULL, + `COUNTRY` VARCHAR(100) NOT NULL, + `FULL_NAME` VARCHAR(100) NULL DEFAULT NULL, + `WEBPHONE_COUNTRY_LABEL` VARCHAR(30) NULL DEFAULT NULL, + PRIMARY KEY (`COUNTRY_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_menu_set +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_menu_set` ( + `MENU_SET_CD` VARCHAR(10) NOT NULL, + `MENU_SET_NAME` VARCHAR(50) NOT NULL, + PRIMARY KEY (`MENU_SET_CD`)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -688,6 +731,16 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_role_type` ( ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.fn_lu_state +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_lu_state` ( + `STATE_CD` VARCHAR(2) NOT NULL, + `STATE` VARCHAR(100) NOT NULL, + PRIMARY KEY (`STATE_CD`)) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8; + -- ---------------------------------------------------------------------------- -- Table vid_openecomp_epsdk.fn_lu_tab_set -- ---------------------------------------------------------------------------- @@ -730,7 +783,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_menu` ( PRIMARY KEY (`MENU_ID`), INDEX `FK_FN_MENU_REF_196_FN_MENU` (`PARENT_ID` ASC), INDEX `FK_FN_MENU_MENU_SET_CD` (`MENU_SET_CD` ASC), - INDEX `fn_menu_function_cd` (`FUNCTION_CD` ASC), + INDEX `FN_MENU_FUNCTION_CD` (`FUNCTION_CD` ASC), CONSTRAINT `FK_FN_MENU_MENU_SET_CD` FOREIGN KEY (`MENU_SET_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_lu_menu_set` (`MENU_SET_CD`), @@ -741,7 +794,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_menu` ( FOREIGN KEY (`FUNCTION_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`)) ENGINE = InnoDB -AUTO_INCREMENT = 150039 +AUTO_INCREMENT = 150029 DEFAULT CHARACTER SET = utf8; -- ---------------------------------------------------------------------------- @@ -752,7 +805,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_org` ( `ORG_NAME` VARCHAR(50) NOT NULL, `ACCESS_CD` VARCHAR(10) NULL DEFAULT NULL, PRIMARY KEY (`ORG_ID`), - INDEX `fn_org_access_cd` (`ACCESS_CD` ASC)) + INDEX `FN_ORG_ACCESS_CD` (`ACCESS_CD` ASC)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -817,12 +870,12 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_fired_triggers` ( `IS_NONCONCURRENT` VARCHAR(1) NULL DEFAULT NULL, `REQUESTS_RECOVERY` VARCHAR(1) NULL DEFAULT NULL, PRIMARY KEY (`SCHED_NAME`, `ENTRY_ID`), - INDEX `idx_fn_qz_ft_trig_inst_name` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC), - INDEX `idx_fn_qz_ft_inst_job_req_rcvry` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC, `REQUESTS_RECOVERY` ASC), - INDEX `idx_fn_qz_ft_j_g` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC), - INDEX `idx_fn_qz_ft_jg` (`SCHED_NAME` ASC, `JOB_GROUP` ASC), - INDEX `idx_fn_qz_ft_t_g` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC), - INDEX `idx_fn_qz_ft_tg` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC)) + INDEX `IDX_FN_QZ_FT_TRIG_INST_NAME` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC), + INDEX `IDX_FN_QZ_FT_INST_JOB_REQ_RCVRY` (`SCHED_NAME` ASC, `INSTANCE_NAME` ASC, `REQUESTS_RECOVERY` ASC), + INDEX `IDX_FN_QZ_FT_J_G` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC), + INDEX `IDX_FN_QZ_FT_JG` (`SCHED_NAME` ASC, `JOB_GROUP` ASC), + INDEX `IDX_FN_QZ_FT_T_G` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC), + INDEX `IDX_FN_QZ_FT_TG` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -841,8 +894,8 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_job_details` ( `REQUESTS_RECOVERY` VARCHAR(1) NOT NULL, `JOB_DATA` BLOB NULL DEFAULT NULL, PRIMARY KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`), - INDEX `idx_fn_qz_j_req_recovery` (`SCHED_NAME` ASC, `REQUESTS_RECOVERY` ASC), - INDEX `idx_fn_qz_j_grp` (`SCHED_NAME` ASC, `JOB_GROUP` ASC)) + INDEX `IDX_FN_QZ_J_REQ_RECOVERY` (`SCHED_NAME` ASC, `REQUESTS_RECOVERY` ASC), + INDEX `IDX_FN_QZ_J_GRP` (`SCHED_NAME` ASC, `JOB_GROUP` ASC)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -941,20 +994,18 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_qz_triggers` ( `MISFIRE_INSTR` SMALLINT(2) NULL DEFAULT NULL, `JOB_DATA` BLOB NULL DEFAULT NULL, PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`), - INDEX `idx_fn_qz_t_j` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC), - INDEX `idx_fn_qz_t_jg` (`SCHED_NAME` ASC, `JOB_GROUP` ASC), - INDEX `idx_fn_qz_t_c` (`SCHED_NAME` ASC, `CALENDAR_NAME` ASC), - INDEX `idx_fn_qz_t_g` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC), - INDEX `idx_fn_qz_t_state` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC), - INDEX `idx_fn_qz_t_n_state` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC), - INDEX `idx_fn_qz_t_n_g_state` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC), - INDEX `idx_fn_qz_t_next_fire_time` (`SCHED_NAME` ASC, `NEXT_FIRE_TIME` ASC), - INDEX `idx_fn_qz_t_nft_st` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC, `NEXT_FIRE_TIME` ASC), - INDEX `idx_fn_qz_t_nft_misfire` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC), - INDEX `idx_fn_qz_t_nft_st_misfire` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_STATE` ASC), - INDEX `idx_fn_qz_t_nft_st_misfire_grp` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_GROUP` ASC, - -`TRIGGER_STATE` ASC), + INDEX `IDX_FN_QZ_T_J` (`SCHED_NAME` ASC, `JOB_NAME` ASC, `JOB_GROUP` ASC), + INDEX `IDX_FN_QZ_T_JG` (`SCHED_NAME` ASC, `JOB_GROUP` ASC), + INDEX `IDX_FN_QZ_T_C` (`SCHED_NAME` ASC, `CALENDAR_NAME` ASC), + INDEX `IDX_FN_QZ_T_G` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC), + INDEX `IDX_FN_QZ_T_STATE` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC), + INDEX `IDX_FN_QZ_T_N_STATE` (`SCHED_NAME` ASC, `TRIGGER_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC), + INDEX `IDX_FN_QZ_T_N_G_STATE` (`SCHED_NAME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC), + INDEX `IDX_FN_QZ_T_NEXT_FIRE_TIME` (`SCHED_NAME` ASC, `NEXT_FIRE_TIME` ASC), + INDEX `IDX_FN_QZ_T_NFT_ST` (`SCHED_NAME` ASC, `TRIGGER_STATE` ASC, `NEXT_FIRE_TIME` ASC), + INDEX `IDX_FN_QZ_T_NFT_MISFIRE` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC), + INDEX `IDX_FN_QZ_T_NFT_ST_MISFIRE` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_STATE` ASC), + INDEX `IDX_FN_QZ_T_NFT_ST_MISFIRE_GRP` (`SCHED_NAME` ASC, `MISFIRE_INSTR` ASC, `NEXT_FIRE_TIME` ASC, `TRIGGER_GROUP` ASC, `TRIGGER_STATE` ASC), CONSTRAINT `fn_qz_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME` , `JOB_NAME` , `JOB_GROUP`) REFERENCES `vid_openecomp_epsdk`.`fn_qz_job_details` (`SCHED_NAME` , `JOB_NAME` , `JOB_GROUP`)) @@ -968,8 +1019,8 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_restricted_url` ( `RESTRICTED_URL` VARCHAR(250) NOT NULL, `FUNCTION_CD` VARCHAR(30) NOT NULL, PRIMARY KEY (`RESTRICTED_URL`, `FUNCTION_CD`), - INDEX `fk_restricted_url_function_cd` (`FUNCTION_CD` ASC), - CONSTRAINT `fk_restricted_url_function_cd` + INDEX `FK_RESTRICTED_URL_FUNCTION_CD` (`FUNCTION_CD` ASC), + CONSTRAINT `FK_RESTRICTED_URL_FUNCTION_CD` FOREIGN KEY (`FUNCTION_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`)) ENGINE = InnoDB @@ -980,7 +1031,7 @@ DEFAULT CHARACTER SET = utf8; -- ---------------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_role` ( `ROLE_ID` INT(11) NOT NULL AUTO_INCREMENT, - `ROLE_NAME` VARCHAR(50) NOT NULL, + `ROLE_NAME` VARCHAR(255) NOT NULL, `ACTIVE_YN` VARCHAR(1) NOT NULL DEFAULT 'Y', `PRIORITY` DECIMAL(4,0) NULL DEFAULT NULL, PRIMARY KEY (`ROLE_ID`)) @@ -988,6 +1039,9 @@ ENGINE = InnoDB AUTO_INCREMENT = 17 DEFAULT CHARACTER SET = utf8; +ALTER TABLE `vid_openecomp_epsdk`.`fn_role` MODIFY `ROLE_NAME` VARCHAR (255); + + -- ---------------------------------------------------------------------------- -- Table vid_openecomp_epsdk.fn_role_composite -- ---------------------------------------------------------------------------- @@ -1012,12 +1066,12 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_role_function` ( `ROLE_ID` INT(11) NOT NULL, `FUNCTION_CD` VARCHAR(30) NOT NULL, PRIMARY KEY (`ROLE_ID`, `FUNCTION_CD`), - INDEX `fn_role_function_function_cd` (`FUNCTION_CD` ASC), - INDEX `fn_role_function_role_id` (`ROLE_ID` ASC), + INDEX `FN_ROLE_FUNCTION_FUNCTION_CD` (`FUNCTION_CD` ASC), + INDEX `FN_ROLE_FUNCTION_ROLE_ID` (`ROLE_ID` ASC), CONSTRAINT `FK_FN_ROLE__REF_198_FN_ROLE` FOREIGN KEY (`ROLE_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`), - CONSTRAINT `fk_fn_role__ref_201_fn_funct` + CONSTRAINT `FK_FN_ROLE__REF_201_FN_FUNCT` FOREIGN KEY (`FUNCTION_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`)) ENGINE = InnoDB @@ -1053,12 +1107,12 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_tab` ( `PARENT_TAB_CD` VARCHAR(30) NULL DEFAULT NULL, `TAB_SET_CD` VARCHAR(30) NULL DEFAULT NULL, PRIMARY KEY (`TAB_CD`), - INDEX `fk_fn_tab_function_cd` (`FUNCTION_CD` ASC), - INDEX `fk_fn_tab_set_cd` (`TAB_SET_CD` ASC), - CONSTRAINT `fk_fn_tab_function_cd` + INDEX `FK_FN_TAB_FUNCTION_CD` (`FUNCTION_CD` ASC), + INDEX `FK_FN_TAB_SET_CD` (`TAB_SET_CD` ASC), + CONSTRAINT `FK_FN_TAB_FUNCTION_CD` FOREIGN KEY (`FUNCTION_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_function` (`FUNCTION_CD`), - CONSTRAINT `fk_fn_tab_set_cd` + CONSTRAINT `FK_FN_TAB_SET_CD` FOREIGN KEY (`TAB_SET_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_lu_tab_set` (`TAB_SET_CD`)) ENGINE = InnoDB @@ -1071,7 +1125,7 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_tab_selected` ( `SELECTED_TAB_CD` VARCHAR(30) NOT NULL, `TAB_URI` VARCHAR(40) NOT NULL, PRIMARY KEY (`SELECTED_TAB_CD`, `TAB_URI`), - CONSTRAINT `fk_fn_tab_selected_tab_cd` + CONSTRAINT `FK_FN_TAB_SELECTED_TAB_CD` FOREIGN KEY (`SELECTED_TAB_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_tab` (`TAB_CD`)) ENGINE = InnoDB @@ -1124,37 +1178,38 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_user` ( `FIN_LOC_CODE` VARCHAR(10) NULL DEFAULT NULL, `SILO_STATUS` VARCHAR(10) NULL DEFAULT NULL, PRIMARY KEY (`USER_ID`), - UNIQUE INDEX `fn_user_hrid` (`HRID` ASC), - UNIQUE INDEX `fn_user_login_id` (`LOGIN_ID` ASC), - INDEX `fn_user_address_id` (`ADDRESS_ID` ASC), - INDEX `fn_user_alert_method_cd` (`ALERT_METHOD_CD` ASC), - INDEX `fn_user_org_id` (`ORG_ID` ASC), - INDEX `fk_fn_user_ref_197_fn_user` (`MANAGER_ID` ASC), - INDEX `fk_fn_user_ref_198_fn_user` (`CREATED_ID` ASC), - INDEX `fk_fn_user_ref_199_fn_user` (`MODIFIED_ID` ASC), - INDEX `fk_timezone` (`TIMEZONE` ASC), - CONSTRAINT `fk_fn_user_ref_110_fn_org` + UNIQUE INDEX `FN_USER_HRID` (`HRID` ASC), + UNIQUE INDEX `FN_USER_LOGIN_ID` (`LOGIN_ID` ASC), + INDEX `FN_USER_ADDRESS_ID` (`ADDRESS_ID` ASC), + INDEX `FN_USER_ALERT_METHOD_CD` (`ALERT_METHOD_CD` ASC), + INDEX `FN_USER_ORG_ID` (`ORG_ID` ASC), + INDEX `FK_FN_USER_REF_197_FN_USER` (`MANAGER_ID` ASC), + INDEX `FK_FN_USER_REF_198_FN_USER` (`CREATED_ID` ASC), + INDEX `FK_FN_USER_REF_199_FN_USER` (`MODIFIED_ID` ASC), + INDEX `FK_TIMEZONE` (`TIMEZONE` ASC), + CONSTRAINT `FK_FN_USER_REF_110_FN_ORG` FOREIGN KEY (`ORG_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_org` (`ORG_ID`), - CONSTRAINT `fk_fn_user_ref_123_fn_lu_al` + CONSTRAINT `FK_FN_USER_REF_123_FN_LU_AL` FOREIGN KEY (`ALERT_METHOD_CD`) REFERENCES `vid_openecomp_epsdk`.`fn_lu_alert_method` (`ALERT_METHOD_CD`), - CONSTRAINT `fk_fn_user_ref_197_fn_user` + CONSTRAINT `FK_FN_USER_REF_197_FN_USER` FOREIGN KEY (`MANAGER_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), - CONSTRAINT `fk_fn_user_ref_198_fn_user` + CONSTRAINT `FK_FN_USER_REF_198_FN_USER` FOREIGN KEY (`CREATED_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), - CONSTRAINT `fk_fn_user_ref_199_fn_user` + CONSTRAINT `FK_FN_USER_REF_199_FN_USER` FOREIGN KEY (`MODIFIED_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), - CONSTRAINT `fk_timezone` + CONSTRAINT `FK_TIMEZONE` FOREIGN KEY (`TIMEZONE`) REFERENCES `vid_openecomp_epsdk`.`fn_lu_timezone` (`TIMEZONE_ID`)) ENGINE = InnoDB -AUTO_INCREMENT = 2 +AUTO_INCREMENT = 3 DEFAULT CHARACTER SET = utf8; + -- ---------------------------------------------------------------------------- -- Table vid_openecomp_epsdk.fn_user_pseudo_role -- ---------------------------------------------------------------------------- @@ -1162,11 +1217,11 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_user_pseudo_role` ( `PSEUDO_ROLE_ID` INT(11) NOT NULL, `USER_ID` INT(11) NOT NULL, PRIMARY KEY (`PSEUDO_ROLE_ID`, `USER_ID`), - INDEX `fk_pseudo_role_user_id` (`USER_ID` ASC), - CONSTRAINT `fk_pseudo_role_pseudo_role_id` + INDEX `FK_PSEUDO_ROLE_USER_ID` (`USER_ID` ASC), + CONSTRAINT `FK_PSEUDO_ROLE_PSEUDO_ROLE_ID` FOREIGN KEY (`PSEUDO_ROLE_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`), - CONSTRAINT `fk_pseudo_role_user_id` + CONSTRAINT `FK_PSEUDO_ROLE_USER_ID` FOREIGN KEY (`USER_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`)) ENGINE = InnoDB @@ -1181,16 +1236,16 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_user_role` ( `PRIORITY` DECIMAL(4,0) NULL DEFAULT NULL, `APP_ID` INT(11) NOT NULL DEFAULT '1', PRIMARY KEY (`USER_ID`, `ROLE_ID`, `APP_ID`), - INDEX `fn_user_role_role_id` (`ROLE_ID` ASC), - INDEX `fn_user_role_user_id` (`USER_ID` ASC), - INDEX `fk_fn_user__ref_178_fn_app_IDX` (`APP_ID` ASC), + INDEX `FN_USER_ROLE_ROLE_ID` (`ROLE_ID` ASC), + INDEX `FN_USER_ROLE_USER_ID` (`USER_ID` ASC), + INDEX `FK_FN_USER__REF_178_FN_APP_idx` (`APP_ID` ASC), CONSTRAINT `FK_FN_USER__REF_172_FN_USER` FOREIGN KEY (`USER_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_user` (`USER_ID`), CONSTRAINT `FK_FN_USER__REF_175_FN_ROLE` FOREIGN KEY (`ROLE_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_role` (`ROLE_ID`), - CONSTRAINT `fk_fn_user__ref_178_fn_app` + CONSTRAINT `FK_FN_USER__REF_178_FN_APP` FOREIGN KEY (`APP_ID`) REFERENCES `vid_openecomp_epsdk`.`fn_app` (`APP_ID`)) ENGINE = InnoDB @@ -1218,26 +1273,12 @@ ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; -- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.rcloudinvocation --- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`rcloudinvocation` ( - `id` VARCHAR(128) NOT NULL, - `created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `userinfo` VARCHAR(2048) NOT NULL, - `notebookid` VARCHAR(128) NOT NULL, - `parameters` VARCHAR(2048) NULL DEFAULT NULL, - `tokenreaddate` TIMESTAMP NULL DEFAULT NULL, - PRIMARY KEY (`id`)) -ENGINE = InnoDB -DEFAULT CHARACTER SET = utf8; - --- ---------------------------------------------------------------------------- --- Table vid_openecomp_epsdk.rcloudnotebook +-- Table vid_openecomp_epsdk.fn_xmltype -- ---------------------------------------------------------------------------- -CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`rcloudnotebook` ( - `notebookname` VARCHAR(128) NOT NULL, - `notebookid` VARCHAR(128) NOT NULL, - PRIMARY KEY (`notebookname`)) +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`fn_xmltype` ( + `ID` DECIMAL(10,0) NOT NULL, + `XML_DOCUMENT` TEXT NULL DEFAULT NULL, + UNIQUE INDEX `FN_XMLTYPE_ID` (`ID` ASC)) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -1257,16 +1298,87 @@ CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` ( `IDLE_CONNECTION_TEST_PERIOD` INT(11) NOT NULL) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.vid_vnf +-- ---------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`vid_vnf` ( + `VNF_DB_ID` int(11) NOT NULL AUTO_INCREMENT, + `VNF_APP_UUID` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `VNF_APP_INVARIANT_UUID` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, + `CREATED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFIED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`VNF_DB_ID`), + UNIQUE KEY `vid_vnf_VNF_ID_uindex` (`VNF_APP_UUID`,`VNF_APP_INVARIANT_UUID`) +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8; -- ---------------------------------------------------------------------------- --- View vid_openecomp_epsdk.v_url_access +-- Table vid_openecomp_epsdk.vid_workflow +-- ---------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`vid_workflow` ( + `WORKFLOW_DB_ID` int(11) NOT NULL AUTO_INCREMENT, + `WORKFLOW_APP_NAME` varchar(50) COLLATE utf8_bin NOT NULL, + `CREATED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFIED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`WORKFLOW_DB_ID`), + UNIQUE KEY `vid_workflow_workflow_uuid_uindex` (`WORKFLOW_APP_NAME`), + UNIQUE KEY `vid_workflow_WORKFLOW_ID_uindex` (`WORKFLOW_DB_ID`) +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.vid_vnf_workflow +-- ---------------------------------------------------------------------------- + + +CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`vid_vnf_workflow` ( + `VNF_DB_ID` int(11) NOT NULL, + `WORKFLOW_DB_ID` int(11) NOT NULL, + KEY `vid_vnf_workflow_vid_vnf_VND_ID_fk` (`VNF_DB_ID`), + KEY `vid_vnf_workflow_vid_workflow_WORKFLOW_ID_fk` (`WORKFLOW_DB_ID`), + CONSTRAINT `vid_vnf_workflow_vid_vnf_VND_ID_fk` FOREIGN KEY (`VNF_DB_ID`) REFERENCES `vid_vnf` (`VNF_DB_ID`), + CONSTRAINT `vid_vnf_workflow_vid_workflow_WORKFLOW_ID_fk` FOREIGN KEY (`WORKFLOW_DB_ID`) REFERENCES `vid_openecomp_epsdk`.`vid_workflow` (`WORKFLOW_DB_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + + +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.vid_category_parameter -- ---------------------------------------------------------------------------- -CREATE OR REPLACE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `v_url_access` AS select distinct `m`.`ACTION` AS -`URL`,`m`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_menu` `m` where (`m`.`ACTION` is not null) union select distinct -`t`.`ACTION` AS `URL`,`t`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_tab` `t` where (`t`.`ACTION` is not null) union select +CREATE TABLE IF NOT EXISTS `vid_category_parameter` ( + `CATEGORY_ID` INT(11) NOT NULL AUTO_INCREMENT, + `NAME` VARCHAR(255) NULL COLLATE 'utf8_bin', + `ID_SUPPORTED` TINYINT(1) NOT NULL DEFAULT '0', + `CREATED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFIED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`CATEGORY_ID`) +) COLLATE='utf8_bin' ENGINE=InnoDB AUTO_INCREMENT=5; -`r`.`RESTRICTED_URL` AS `URL`,`r`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_restricted_url` `r`; +------------------------------------------------------------------------------- + +ALTER TABLE `vid_category_parameter` + ADD COLUMN if not exists `FAMILY` ENUM('PARAMETER_STANDARDIZATION','TENANT_ISOLATION') NOT NULL DEFAULT 'PARAMETER_STANDARDIZATION' AFTER `ID_SUPPORTED`; +-- ---------------------------------------------------------------------------- +-- Table vid_openecomp_epsdk.vid_category_parameter +-- ---------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `vid_category_parameter_option` ( + `CATEGORY_OPT_DB_ID` INT(11) NOT NULL AUTO_INCREMENT, + `CATEGORY_OPT_APP_ID` VARCHAR(50) NOT NULL COLLATE 'utf8_bin', + `NAME` VARCHAR(50) NULL COLLATE 'utf8_bin', + `CATEGORY_ID` INT(11) NOT NULL DEFAULT '0', + `CREATED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `MODIFIED_DATE` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`CATEGORY_OPT_DB_ID`), + UNIQUE INDEX `APP_ID_CATEGORY_UNIQUE` (`CATEGORY_ID`, `CATEGORY_OPT_APP_ID`), + UNIQUE INDEX `NAME_CATEGORY_UNIQUE` (`CATEGORY_ID`, `NAME`), + CONSTRAINT `FK_OWNING_ENTITY_OPTIONS_TO_OE` FOREIGN KEY (`CATEGORY_ID`) REFERENCES `vid_openecomp_epsdk`.`vid_category_parameter` (`CATEGORY_ID`) +) COLLATE='utf8_bin' ENGINE=InnoDB AUTO_INCREMENT=25; + + +-- ---------------------------------------------------------------------------- +-- View vid_openecomp_epsdk.v_url_access +-- ---------------------------------------------------------------------------- +CREATE OR REPLACE ALGORITHM=UNDEFINED SQL SECURITY DEFINER VIEW `v_url_access` AS select distinct `m`.`ACTION` AS `URL`,`m`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_menu` `m` where (`m`.`ACTION` is not null) union select distinct `t`.`ACTION` AS `URL`,`t`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_tab` `t` where (`t`.`ACTION` is not null) union select `r`.`RESTRICTED_URL` AS `URL`,`r`.`FUNCTION_CD` AS `FUNCTION_CD` from `fn_restricted_url` `r`; SET FOREIGN_KEY_CHECKS = 1; diff --git a/epsdk-app-onap/src/main/swm/common/common.sh b/epsdk-app-onap/src/main/swm/common/common.sh deleted file mode 100755 index 4b98a5ea..00000000 --- a/epsdk-app-onap/src/main/swm/common/common.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -if [[ "${INSTALL_ROOT}" = */ ]]; then - export ROOT_DIR=${INSTALL_ROOT}opt/app/vid/portal -else - export ROOT_DIR=${INSTALL_ROOT}/opt/app/vid/portal -fi - -export JAVA_HOME=/opt/app/java/jdk/jdk180 - - -OS=`uname` - -if [ "${OS}" = "SunOS" ]; then - CURRENT_USER=`/usr/xpg4/bin/id -un` - CURRENT_GROUP=`/usr/xpg4/bin/id -gn` -else - CURRENT_USER=`id -un` - CURRENT_GROUP=`id -gn` -fi - -export CURRENT_USER CURRENT_GROUP -export TOMCAT_HOME=/opt/app/vid/tomcat - -if [ -z "${VID_ENDPOINT_NAME}" ]; then - VID_ENDPOINT_NAME="vid" -fi - -# Fail - used to quickly exit with a rc and error message -fail() { - rc=$1 - shift; - echo "ERROR: $@" - exit $rc -} diff --git a/epsdk-app-onap/src/main/swm/common/localize.sh b/epsdk-app-onap/src/main/swm/common/localize.sh deleted file mode 100755 index 711287e1..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -COMMON_DIR="$(dirname "$AFTSWM_ACTIONHANDLER_SCRIPT")/../../common" - -source "${COMMON_DIR}/localize_logback.sh" || { - echo "ERROR: Localizing logback.xml failed" - exit 1 -} - -source "${COMMON_DIR}/localize_portal.sh" || { - echo "ERROR: Localizing portal.properties failed" - exit 1 -} - -source "${COMMON_DIR}/localize_quartz.sh" || { - echo "ERROR: Localizing quartz.properties failed" - exit 1 -} - -source "${COMMON_DIR}/localize_system.sh" || { - echo "ERROR: Localizing system.properties failed" - exit 1 -} - -source "${COMMON_DIR}/localize_cache.sh" || { - echo "ERROR: Localizing cache.ccf failed" - exit 1 -} - -source "${COMMON_DIR}/localize_asdc.sh" || { - echo "ERROR: Localizing asdc.properties failed" - exit 1 -} diff --git a/epsdk-app-onap/src/main/swm/common/localize_asdc.sh b/epsdk-app-onap/src/main/swm/common/localize_asdc.sh deleted file mode 100755 index 5774e5a0..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize_asdc.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties -TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc_template.properties -BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties.bk.1 -BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/asdc.properties.bk.2 - -echo "Localizing the SDC client configuration" - -if [ -z "${ASDC_CLIENT_TYPE}" ]; then - ASDC_CLIENT_TYPE=REST -fi - -if [ "${ASDC_CLIENT_TYPE}" = "REST" ]; then - if [ -z "${ASDC_CLIENT_REST_HOST}" ]; then - echo 'ASDC_CLIENT_REST_HOST must be provided when ASDC_CLIENT_TYPE=REST' - exit 1 - fi - - if [ -z "${ASDC_CLIENT_REST_AUTH}" ]; then - echo 'ASDC_CLIENT_REST_AUTH must be provided when ASDC_CLIENT_TYPE=REST' - exit 2 - fi - - if [ -z "${ASDC_CLIENT_REST_PROTOCOL}" ]; then - ASDC_CLIENT_REST_PROTOCOL=http - fi - - if [ -z "${ASDC_CLIENT_REST_PORT}" ]; then - ASDC_CLIENT_REST_PORT=8080 - fi -else - ASDC_CLIENT_REST_HOST="" - ASDC_CLIENT_REST_AUTH="" - ASDC_CLIENT_REST_PROTOCOL="http" - ASDC_CLIENT_REST_PORT="8080" -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${BACKUP1_CONFIG_FILE} ]; then - cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { - echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" - exit 2 - } -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${FINAL_CONFIG_FILE} ]; then - cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { - echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" - exit 3 - } -fi - -sed -e 's ${ASDC_CLIENT_TYPE} '${ASDC_CLIENT_TYPE}' g' \ - -e 's ${ASDC_CLIENT_REST_HOST} '${ASDC_CLIENT_REST_HOST}' g' \ - -e 's ${ASDC_CLIENT_REST_PORT} '${ASDC_CLIENT_REST_PORT}' g' \ - -e 's ${ASDC_CLIENT_REST_PROTOCOL} '${ASDC_CLIENT_REST_PROTOCOL}' g' \ - -e 's/${ASDC_CLIENT_REST_AUTH}/'"${ASDC_CLIENT_REST_AUTH}"'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_cache.sh b/epsdk-app-onap/src/main/swm/common/localize_cache.sh deleted file mode 100755 index 00069f89..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize_cache.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf -TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache_template.ccf -BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf.bk.1 -BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/cache.ccf.bk.2 - -echo "Localizing the VID cache configuration" - -if [ -z "${CACHE_DIRECTORY}" ]; then - CACHE_DIRECTORY=${ROOT_DIR}/cache -fi - -mkdir -p "${CACHE_DIRECTORY}" - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${BACKUP1_CONFIG_FILE} ]; then - cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { - echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" - exit 1 - } -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${FINAL_CONFIG_FILE} ]; then - cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { - echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" - exit 2 - } -fi - -sed -e 's,${CACHE_DIRECTORY},'${CACHE_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 3 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_log4j.sh b/epsdk-app-onap/src/main/swm/common/localize_log4j.sh deleted file mode 100755 index 1b044aa6..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize_log4j.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties -TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j_template.properties -BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties.bk.1 -BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/log4j.properties.bk.2 - -echo "Localizing the VID log4j configuration" - -if [ -z "${LOG4J_LOGLEVEL}" ]; then - LOG4J_LOGLEVEL=INFO -fi - - -if [ -z "${LOG4J_APPENDER}" ]; then - LOG4J_APPENDER=rollingfile -fi - -if [ -z "${LOG4J_LOGS_DIRECTORY}" ]; then - LOG4J_LOGS_DIRECTORY=${ROOT_DIR}/logs -fi - -mkdir -p ${LOG4J_LOGS_DIRECTORY} - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${BACKUP1_CONFIG_FILE} ]; then - cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { - echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" - exit 1 - } -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${FINAL_CONFIG_FILE} ]; then - cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { - echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" - exit 2 - } -fi - -sed -e 's/${LOG4J_LOGLEVEL}/'${LOG4J_LOGLEVEL}'/g' \ - -e 's/${LOG4J_APPENDER}/'${LOG4J_APPENDER}'/g' \ - -e 's,${LOG4J_LOGS_DIRECTORY},'${LOG4J_LOGS_DIRECTORY}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 3 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." - - diff --git a/epsdk-app-onap/src/main/swm/common/localize_logback.sh b/epsdk-app-onap/src/main/swm/common/localize_logback.sh deleted file mode 100755 index bda2486d..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize_logback.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml -TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback_template.xml -BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml.bk.1 -BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/logback.xml.bk.2 - -echo "Localizing the VID logback configuration" - -if [ -z "${VID_LOG_DIR}" ]; then - VID_LOG_DIR="${ROOT_DIR}/logs" -fi - -if [ -z "${VID_LOG_LEVEL}" ]; then - VID_LOG_LEVEL="INFO" -fi - -mkdir -p "${VID_LOG_DIR}" - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${BACKUP1_CONFIG_FILE} ]; then - cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { - echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" - exit 1 - } -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${FINAL_CONFIG_FILE} ]; then - cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { - echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" - exit 2 - } -fi - -sed -e 's/${VID_LOG_LEVEL}/'${VID_LOG_LEVEL}'/g' \ - -e 's,${VID_LOG_DIR},'${VID_LOG_DIR}',g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 3 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_portal.sh b/epsdk-app-onap/src/main/swm/common/localize_portal.sh deleted file mode 100755 index 27ea24a1..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize_portal.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties -TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal_template.properties -BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties.bk.1 -BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/classes/portal.properties.bk.2 - -echo "Localizing the VID portal configuration" - -if [ -z "${VID_ECOMP_REDIRECT_URL}" ]; then - VID_ECOMP_REDIRECT_URL=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm -fi - -if [ -z "${VID_WJ_LOGOUT_URL}" ]; then - VID_WJ_LOGOUT_URL=https://portal.openecomp.org/ecompportal/ecompportal/process_csp -fi - -if [ -z "${VID_ECOMP_REST_URL}" ]; then - VID_ECOMP_REST_URL=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi -fi - -if [ -z "${VID_UEB_URL_LIST}" ]; then - VID_UEB_URL_LIST=ueb.openecomp.org -fi - -if [ -z "${VID_UEB_CONSUMER_GROUP}" ]; then - VID_UEB_CONSUMER_GROUP=VID -fi - -if [ -z "${VID_ECOMP_PORTAL_INBOX_NAME}" ]; then - VID_ECOMP_PORTAL_INBOX_NAME=ECOMP-PORTAL-INBOX-DEV-LOCAL -fi - -if [ -z "${VID_UEB_APP_KEY}" ]; then - VID_UEB_APP_KEY=sYH0NJnsKmJC1B2A -fi - -if [ -z "${VID_UEB_APP_SECRET}" ]; then - VID_UEB_APP_SECRET=YOtknsT2wVFz9WISlSPDaAtd -fi - -if [ -z "${VID_UEB_APP_MAILBOX_NAME}" ]; then - VID_UEB_APP_MAILBOX_NAME="ECOMP-PORTAL-OUTBOX-90" -fi - -if [ -z "${VID_UEB_LISTENERS_ENABLE}" ]; then - VID_UEB_LISTENERS_ENABLE="false" -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${BACKUP1_CONFIG_FILE} ]; then - cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { - echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" - exit 2 - } -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${FINAL_CONFIG_FILE} ]; then - cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { - echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" - exit 3 - } -fi - -sed -e 's ${VID_WJ_LOGOUT_URL} '${VID_WJ_LOGOUT_URL}' g' \ - -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ - -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ - -e 's ${VID_UEB_URL_LIST} '${VID_UEB_URL_LIST}' g' \ - -e 's ${VID_ECOMP_PORTAL_INBOX_NAME} '${VID_ECOMP_PORTAL_INBOX_NAME}' g' \ - -e 's ${VID_UEB_APP_KEY} '${VID_UEB_APP_KEY}' g' \ - -e 's ${VID_UEB_APP_SECRET} '${VID_UEB_APP_SECRET}' g' \ - -e 's ${VID_UEB_APP_MAILBOX_NAME} '${VID_UEB_APP_MAILBOX_NAME}' g' \ - -e 's ${VID_UEB_LISTENERS_ENABLE} '${VID_UEB_LISTENERS_ENABLE}' g' \ - -e 's/${VID_UEB_CONSUMER_GROUP}/'${VID_UEB_CONSUMER_GROUP}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." diff --git a/epsdk-app-onap/src/main/swm/common/localize_quartz.sh b/epsdk-app-onap/src/main/swm/common/localize_quartz.sh deleted file mode 100755 index 9a646867..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize_quartz.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties -TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz_template.properties -BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties.bk.1 -BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/quartz.properties.bk.2 - -echo "Localizing the VID quartz configuration" - -if [ -z "${VID_MYSQL_HOST}" ]; then - VID_MYSQL_HOST=localhost -fi - -if [ -z "${VID_MYSQL_PORT}" ]; then - VID_MYSQL_PORT=3306 -fi - -if [ -z "${VID_MYSQL_DBNAME}" ]; then - VID_MYSQL_DBNAME=vid_portal -fi - -if [ -z "${VID_MYSQL_USER}" ]; then - VID_MYSQL_USER=$(id -un) -fi - -if [ -z "${VID_MYSQL_MAXCONNECTIONS}" ]; then - VID_MYSQL_MAXCONNECTIONS=5 -fi - -if [ -z "${VID_MYSQL_PASS}" ]; then - echo "Missing required parameter VID_MYSQL_PASS" - exit 1 -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${BACKUP1_CONFIG_FILE} ]; then - cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { - echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" - exit 2 - } -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${FINAL_CONFIG_FILE} ]; then - cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { - echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" - exit 3 - } -fi - -sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ - -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ - -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ - -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ - -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ - -e 's/${VID_MYSQL_MAXCONNECTIONS}/'${VID_MYSQL_MAXCONNECTIONS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." - - diff --git a/epsdk-app-onap/src/main/swm/common/localize_system.sh b/epsdk-app-onap/src/main/swm/common/localize_system.sh deleted file mode 100755 index c9d0afd8..00000000 --- a/epsdk-app-onap/src/main/swm/common/localize_system.sh +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/bash - -FINAL_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties -TEMPLATE_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system_template.properties -BACKUP1_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties.bk.1 -BACKUP2_CONFIG_FILE=${ROOT_DIR}/war/WEB-INF/conf/system.properties.bk.2 - -echo "Localizing the VID system configuration" - -if [ -z "${VID_MYSQL_HOST}" ]; then - VID_MYSQL_HOST=localhost -fi - -if [ -z "${VID_MYSQL_PORT}" ]; then - VID_MYSQL_PORT=3306 -fi - -if [ -z "${VID_MYSQL_DBNAME}" ]; then - VID_MYSQL_DBNAME=vid_portal -fi - -if [ -z "${VID_MYSQL_USER}" ]; then - VID_MYSQL_USER=vid_admin -fi - -if [ -z "${VID_MYSQL_MAXCONNECTIONS}" ]; then - VID_MYSQL_MAXCONNECTIONS=5 -fi - -if [ -z "${VID_AAI_HOST}" ]; then - VID_AAI_HOST=aai.api.openecomp.org -fi - -if [ -z "${VID_AAI_PORT}" ]; then - VID_AAI_PORT=8443 -fi - -if [ -z "${VID_APP_DISPLAY_NAME}" ]; then - VID_APP_DISPLAY_NAME=VID -fi - -if [ -z "${VID_ECOMP_SHARED_CONTEXT_REST_URL}" ]; then - VID_ECOMP_SHARED_CONTEXT_REST_URL="https://portal.openecomp.org:8080/ecompportal/context" -fi - -if [ -z "${VID_ECOMP_REDIRECT_URL}" ]; then - VID_ECOMP_REDIRECT_URL=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm -fi - -if [ -z "${VID_ECOMP_REST_URL}" ]; then - VID_ECOMP_REST_URL=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi -fi - -if [ -z "${VID_MSO_SERVER_URL}" ]; then - VID_MSO_SERVER_URL=https://mso.api.openecomp.org:8443 -fi - -if [ -z "${VID_TRUSTSTORE_FILE}" ]; then - VID_TRUSTSTORE_FILE=${ROOT_DIR}/etc/vid_keystore.jks -fi - -if [ -z "${VID_MYLOGIN_FEED_DIRECTORY}" ]; then - VID_MYLOGIN_FEED_DIRECTORY=/tmp/MyLogins -fi - -if [ -z "${VID_TRUSTSTORE_PASS}" ]; then - echo "ERROR: Missing required parameter VID_TRUSTSTORE_PASS" - exit 1 -fi - -if [ -z "${VID_MSO_USER}" ]; then - echo "ERROR: Missing required parameter VID_MSO_USER" - exit 1 -fi - -if [ -z "${VID_MSO_PASS}" ]; then - echo "ERROR: Missing required parameter VID_MSO_PASS"; - exit 1 -fi - -if [ -z "${VID_MYSQL_PASS}" ]; then - echo "ERROR: Missing required parameter VID_MYSQL_PASS" - exit 1 -fi - -if [ -z "${MSO_DME2_CLIENT_TIMEOUT}" ]; then - echo "ERROR: Missing required parameter MSO_DME2_CLIENT_TIMEOUT" - exit 1 -fi - -if [ -z "${MSO_DME2_CLIENT_READ_TIMEOUT}" ]; then - echo "ERROR: Missing required parameter MSO_DME2_CLIENT_READ_TIMEOUT" - exit 1 -fi - -if [ -z "${MSO_DME2_SERVER_URL}" ]; then - echo "ERROR: Missing required parameter MSO_DME2_SERVER_URL" - exit 1 -fi -if [ -z "${MSO_DME2_ENABLED}" ]; then - echo "ERROR: Missing required parameter MSO_DME2_ENABLED" - exit 1 -fi -if [ -z "${MSO_POLLING_INTERVAL_MSECS}" ]; then - MSO_POLLING_INTERVAL_MSECS=10000 -fi - -if [ -z "${AAI_TRUSTSTORE_FILENAME}" ]; then - AAI_TRUSTSTORE_FILENAME=tomcat_keystore -fi - -if [ -z "${AAI_TRUSTSTORE_PASSWD_X}" ]; then - AAI_TRUSTSTORE_PASSWD_X=70c87528c88dcd9f9c2558d30e817868 -fi - -if [ -z "${AAI_KEYSTORE_FILENAME}" ]; then - AAI_KEYSTORE_FILENAME=aai-client-cert.p12 -fi - -if [ -z "${AAI_KEYSTORE_PASSWD_X}" ]; then - AAI_KEYSTORE_PASSWD_X=70c87528c88dcd9f9c2558d30e817868 -fi - -mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}" - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF PREVIOUS BACKUP FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${BACKUP1_CONFIG_FILE} ]; then - cp -f ${BACKUP1_CONFIG_FILE} ${BACKUP2_CONFIG_FILE} || { - echo "ERROR: Could not copy ${BACKUP1_CONFIG_FILE} to ${BACKUP2_CONFIG_FILE}" - exit 2 - } -fi - -#------------------------------------------------------------------------ -#- MAKE A BACKUP OF CURRENT FILE, IF EXISTS -#------------------------------------------------------------------------ -if [ -f ${FINAL_CONFIG_FILE} ]; then - cp -f ${FINAL_CONFIG_FILE} ${BACKUP1_CONFIG_FILE} || { - echo "ERROR: Could not copy ${FINAL_CONFIG_FILE} to ${BACKUP1_CONFIG_FILE}" - exit 3 - } -fi - -sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \ - -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \ - -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \ - -e 's/${VID_MYSQL_USER}/'${VID_MYSQL_USER}'/g' \ - -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \ - -e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \ - -e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \ - -e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \ - -e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \ - -e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \ - -e 's/${AAI_KEYSTORE_PASSWD_X}/'${AAI_KEYSTORE_PASSWD_X}'/g' \ - -e 's/${VID_APP_DISPLAY_NAME}/'${VID_APP_DISPLAY_NAME}'/g' \ - -e 's ${VID_ECOMP_SHARED_CONTEXT_REST_URL} '${VID_ECOMP_SHARED_CONTEXT_REST_URL}' g' \ - -e 's ${VID_ECOMP_REDIRECT_URL} '${VID_ECOMP_REDIRECT_URL}' g' \ - -e 's ${VID_ECOMP_REST_URL} '${VID_ECOMP_REST_URL}' g' \ - -e 's ${VID_MSO_SERVER_URL} '${VID_MSO_SERVER_URL}' g' \ - -e 's/${VID_MSO_USER}/'${VID_MSO_USER}'/g' \ - -e 's/${VID_MSO_PASS}/'${VID_MSO_PASS}'/g' \ - -e 's,${VID_MYLOGIN_FEED_DIRECTORY},'${VID_MYLOGIN_FEED_DIRECTORY}',g' \ - -e 's,${MSO_DME2_CLIENT_TIMEOUT},'${MSO_DME2_CLIENT_TIMEOUT}',g' \ - -e 's,${MSO_DME2_CLIENT_READ_TIMEOUT},'${MSO_DME2_CLIENT_READ_TIMEOUT}',g' \ - -e 's,${MSO_DME2_SERVER_URL},'${MSO_DME2_SERVER_URL}',g' \ - -e 's,${MSO_DME2_ENABLED},'${MSO_DME2_ENABLED}',g' \ - -e 's,${MSO_POLLING_INTERVAL_MSECS},'${MSO_POLLING_INTERVAL_MSECS}',g' \ - -e 's,${VID_TRUSTSTORE_FILE},'${VID_TRUSTSTORE_FILE}',g' \ - -e 's/${VID_TRUSTSTORE_PASS}/'${VID_TRUSTSTORE_PASS}'/g' ${TEMPLATE_CONFIG_FILE} > ${FINAL_CONFIG_FILE} || { - echo "ERROR: Could not process template file ${TEMPLATE_CONFIG_FILE} into ${FINAL_CONFIG_FILE}" - exit 4 - } - -echo "Localized ${FINAL_CONFIG_FILE} successfully." - - diff --git a/epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc b/epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc deleted file mode 100755 index 103d18d3..00000000 --- a/epsdk-app-onap/src/main/swm/deinstall/postproc/post_proc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd ../../common -exec sh -x ./deinstall_postproc.sh \ No newline at end of file diff --git a/epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc b/epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc deleted file mode 100755 index ce87ecff..00000000 --- a/epsdk-app-onap/src/main/swm/deinstall/preproc/pre_proc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd ../../common -exec sh -x ./deinstall_preproc.sh \ No newline at end of file diff --git a/epsdk-app-onap/src/main/swm/descriptor.xml b/epsdk-app-onap/src/main/swm/descriptor.xml deleted file mode 100755 index 7c09ef3a..00000000 --- a/epsdk-app-onap/src/main/swm/descriptor.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/epsdk-app-onap/src/main/swm/fallback/postproc/post_proc b/epsdk-app-onap/src/main/swm/fallback/postproc/post_proc deleted file mode 100755 index 96b4b06a..00000000 --- a/epsdk-app-onap/src/main/swm/fallback/postproc/post_proc +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh \ No newline at end of file diff --git a/epsdk-app-onap/src/main/swm/fallback/preproc/pre_proc b/epsdk-app-onap/src/main/swm/fallback/preproc/pre_proc deleted file mode 100755 index 96b4b06a..00000000 --- a/epsdk-app-onap/src/main/swm/fallback/preproc/pre_proc +++ /dev/null @@ -1 +0,0 @@ -#!/bin/sh \ No newline at end of file diff --git a/epsdk-app-onap/src/main/swm/initinst/postproc/post_proc b/epsdk-app-onap/src/main/swm/initinst/postproc/post_proc deleted file mode 100755 index a986928c..00000000 --- a/epsdk-app-onap/src/main/swm/initinst/postproc/post_proc +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -source ${DIR}/../../install/postproc/post_proc || { - echo "INITINST post_proc script failed"; exit 1 -} diff --git a/epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc b/epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc deleted file mode 100755 index 983d0c53..00000000 --- a/epsdk-app-onap/src/main/swm/initinst/preproc/pre_proc +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" - -source "${DIR}/../../install/preproc/pre_proc" || { - echo "INITINST pre_proc script failed"; exit 1 -} diff --git a/epsdk-app-onap/src/main/swm/install/postproc/post_proc b/epsdk-app-onap/src/main/swm/install/postproc/post_proc deleted file mode 100755 index 370d44b6..00000000 --- a/epsdk-app-onap/src/main/swm/install/postproc/post_proc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -COMMON_SCRIPT=${DIR}/../../common/common.sh - -source "${COMMON_SCRIPT}" || { - echo "ERROR: Common script failed" - exit 1 -} - -mkdir -p "${TOMCAT_HOME}/temp" - -#Extract the WAR so it can be customized by the localization script -mkdir -p ${ROOT_DIR}/war -cp "${ROOT_DIR}/lib/vid.war" "${ROOT_DIR}/war/${VID_ENDPOINT_NAME}.war" -cd "${ROOT_DIR}/war" -${JAVA_HOME}/bin/jar -xf ${VID_ENDPOINT_NAME}.war -rm ${ROOT_DIR}/war/${VID_ENDPOINT_NAME}.war - -LOCALIZE_SCRIPT=$(dirname "$AFTSWM_ACTIONHANDLER_SCRIPT")/../../common/localize.sh - - -source "${LOCALIZE_SCRIPT}" || { - echo "ERROR: Localization script failed" - exit 2 -} - -#Create the customized WAR and deploy it to Tomcat -mkdir -p "${ROOT_DIR}/deployed" -cd "${ROOT_DIR}/war" -${JAVA_HOME}/bin/jar -cvf "${ROOT_DIR}/deployed/${VID_ENDPOINT_NAME}.war" . -cd -rm -rf "${ROOT_DIR}/war" -mv -f "${ROOT_DIR}/deployed/${VID_ENDPOINT_NAME}.war" "${TOMCAT_HOME}/webapps" - -if [ -f "${TOMCAT_HOME}/bin/startup.sh" ]; then - "${TOMCAT_HOME}/bin/startup.sh" -fi diff --git a/epsdk-app-onap/src/main/swm/install/preproc/pre_proc b/epsdk-app-onap/src/main/swm/install/preproc/pre_proc deleted file mode 100755 index a09a9c46..00000000 --- a/epsdk-app-onap/src/main/swm/install/preproc/pre_proc +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -COMMON_SCRIPT=${DIR}/../../common/common.sh - -source "${COMMON_SCRIPT}" || { - echo "ERROR: Common script failed" - exit 1 -} - -if [ -f "${TOMCAT_HOME}/bin/shutdown.sh" ]; then - "${TOMCAT_HOME}/bin/shutdown.sh" - - if [ -d "${TOMCAT_HOME}/webapps/${VID_ENDPOINT_NAME}" ]; then - rm -r "${TOMCAT_HOME}/webapps/${VID_ENDPOINT_NAME}" - fi -fi - diff --git a/epsdk-app-onap/src/main/swm/notes.txt b/epsdk-app-onap/src/main/swm/notes.txt deleted file mode 100755 index f0a8fa97..00000000 --- a/epsdk-app-onap/src/main/swm/notes.txt +++ /dev/null @@ -1,52 +0,0 @@ -This package will install the Virtual Infrastructure Deployment (VID) war to the local tomcat server. -The Tomcat server is marked as a dependency of this package and will be installed automatically on the -target server if it has not already been installed. The current version of Tomcat used by VID -is 8.0.36. MariaDB is also necessary for VID and can be installed by whichever method you choose. - -The following are variables that can be set to customize your installation of VID: - -Variable Default Description - -ASDC_CLIENT_REST_AUTH unset Basic authentication header value (e.g. Basic asdfoijwelkjsg=) -ASDC_CLIENT_REST_HOST unset Host where the SDC Catalog Service is running -ASDC_CLIENT_REST_PORT 8080 Port where the SDC Catalog Service is running -ASDC_CLIENT_TYPE REST Set to IN_MEMORY for testing, REST for connecting with an actual SDC Catalog Service - -MSO_DME2_CLIENT_READ_TIMEOUT unset Time in ms before DME2 MSO read requests timeout -MSO_DME2_CLIENT_TIMEOUT unset Time in ms before DME2 MSO requests timeout -MSO_DME2_ENABLED unset Whether the enable the MSO DME2 client or not -MSO_DME2_SERVER_URL unset The server URL for connecting to the MSO service -MSO_POLLING_INTERVAL_MSECS 10000 The interval at which to poll MSO for orchestration requests -VID_MSO_PASS unset The password for connecting with the MSO service -VID_MSO_SERVER_URL unset The server URL for connecting with the MSO service -VID_MSO_USER unset The user name for connecting with the MSO service - -VID_LOG_DIR ${ROOT_DIR}/logs The directory to store log files in -VID_LOG_LEVEL INFO The level at which to log (follows logback logging levels) -VID_ECOMP_REDIRECT_URL https://portal.openecomp.org/ecompportal/ecompportal/process_csp See ECOMP SDK Documentation -VID_ECOMP_REST_URL https://portal.openecomp.org/ecompportal/auxapi See ECOMP SDK Documentation -VID_ENDPOINT_NAME vid http://{host}:{port}/{VID_ENDPOINT_NAME} - -VID_MYSQL_HOST unset The host where the VID MariaDB instance is running -VID_MYSQL_MAXCONNECTIONS 5 The maximum connections to use to connect to the MariaDB instance -VID_MYSQL_PORT 3306 The port where the VID MariaDB instance is running -VID_MYSQL_DBNAME vid_portal The database name (i.e. CREATE DATABASE ${VID_MYSQL_DBNAME} -VID_MYSQL_USER vidadmin The user to connect as to the MariaDB instance -VID_MYSQL_PASS unset The password for the ${VID_MYSQL_USER} @ ${VID_MYSQL_HOST} - -VID_AAI_HOST unset The host where the A&AI service is running -VID_AAI_PORT 8443 The port where the A&AI service is running -VID_TRUSTSTORE_PASS unset The password for the VID truststore (A&AI client) -VID_TRUSTSTORE_FILE unset The location on the file system of the truststore (A&AI client) -AAI_TRUSTSTORE_FILENAME tomcat_keystore A file name -AAI_TRUSTSTORE_PASSWD_X (dev env creds) A password -AAI_KEYSTORE_FILENAME aai-client-cert.p12 A file name -AAI_KEYSTORE_PASSWD_X (dev env creds) A password - -VID_UEB_URL_LIST ueb.openecomp.org The hosts where UEB is running -VID_UEB_CONSUMER_GROUP VID The UEB consumer group name to use -VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX-DEV-LOCAL A UEB Topic to send messages to the ECOMP portal on -VID_UEB_APP_KEY sYH0NJnsKmJC1B2A The UEB App Key (mandatory) -VID_UEB_APP_SECRET YOtknsT2wVFz9WISlSPDaAtd The UEB App Secret -VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90 A UEB Topic to listen for messages from the ECOMP portal on -VID_UEB_LISTENERS_ENABLE false Enable the UEB listeners for the specified mailboxes (In 1610, this should always be false) 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 7a6d5d9c..86e18940 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -169,7 +169,6 @@ mso.restapi.get.man.tasks=/tasks/v1 vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks mso.dme2.client.timeout=30000 mso.dme2.client.read.timeout=120000 -vid.truststore.filename=vid_keystore.jks vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/ scheduler.get.time.slots=/v1/ChangeManagement/schedules/ diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp index 33bb38d0..9cb68150 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/footer.jsp @@ -1,17 +1,34 @@ - + + + + + + + +
-
\ No newline at end of file + \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp index 94213a2a..483922fc 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ds2/header.jsp @@ -1 +1,235 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
\ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp new file mode 100644 index 00000000..ad3201cf --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp @@ -0,0 +1,837 @@ +<%-- + ================================================================================ + eCOMP Portal SDK + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ================================================================================ + --%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ page isELIgnored="false"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%> +<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%> +<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%> + + + + + +<%-- --%> + + + + + + + + + + + + + + + +<%----%> + + + + + + + + + +" /> +" /> + +<% + String contactUsLink = SystemProperties.getProperty(SystemProperties.CONTACT_US_LINK); + String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL); + String portalUrl = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/process_csp"; + String getAccessLink = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/get_access"; +%> + + + + +<%@include file="/WEB-INF/fusion/jsp/ebz/loginSnippet.html" %> + +
+
+ +
+
+
+ + +
+
+
+
+
  • + + ECOMP Portal +
    • +
    +
    + +
    +
    + + +
    + +
    + + +
    +
    + +
    +
    +

    + Manage favorites on ECOMP Portal. +

    +
    +
    + +
    +
    +
    + +

    No Favorites

    +

    Manage favorites on ECOMP Portal.

    +
    +
    +
    +
    + +
    +
    +
    +
    +
  • + Unable to load menus +
    • +
    + +
    +
  • +
    + + +
    +
    • +
  •  
    • +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    + + + +     {{app_name}} + +
    +
    +
    +
    + + + + + +
    +
    +
    +
    +
    +
    +
    +
    + \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp new file mode 100644 index 00000000..fd2030e6 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp @@ -0,0 +1,146 @@ + + +
    + +

    Create New Service Instance

    + + +
    + + + + + + + + + + + + + + + +
    + + +
    + +
    + +
    		+ + + + +
    + +
    + +
    + +
    + +
    + + + +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp new file mode 100644 index 00000000..ca840e62 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +
    + + + +
    + +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp index d0c36d47..88131c59 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp @@ -1,3 +1,4 @@ + @@ -7,20 +8,22 @@ - + + - + + @@ -33,40 +36,56 @@ - + + + - + + + + + + + - + + + - + + + + + + + <%@ page import="org.openecomp.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> @@ -81,18 +100,20 @@
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp new file mode 100644 index 00000000..ca92b152 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp @@ -0,0 +1,184 @@ +<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %> +
    +
    +

    Selected Subscriber's Service Instance Details:

    +
    + + + + + + + + + + + + + + + + + + + + +
    View/EditGlobal Customer IDSubscriber NameService TypeService Instance ID
    + + {{disData.globalCustomerId}}{{disData.subscriberName}}{{disData.serviceType}}{{disData.serviceInstanceId}}
    +
    +
    + + + +
    +
    + +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp index 59c8a317..2c802226 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -54,7 +54,7 @@
    -
    +
    diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp index ad5331d9..b505909f 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -1,23 +1,27 @@ +
    -

    ONAP

    +

    AT&T Domain 2.0 Network


    Welcome to VID


    The Virtual Infrastructure Deployment (VID) application allows infrastructure service deployment operators to instantiate service instances and their constituent parts for Distributed service models required by the - ONAP service operations that manage them, such as Mobility Network Services, etc. - The models are defined by ONAP component SDC. The service + internal AT&T service operations organizations that manage them, such as Mobility Network Services, + Netbond Services, or FlexReach Services. The models are defined by ECOMP component ASDC. The service deployment operator selects the service operations owner and model that they wish to instantiate. After - entry of appropriate data, the operator instructs VID to direct another ONAP component, MSO, to instantiate + entry of appropriate data, the operator instructs VID to direct another ECOMP component, MSO, to instantiate the selected service model. Once the service instance has been instantiated, the service operator can instruct VID to direct MSO to instantiate the service instance's component VNFs, VF Modules, Networks and Volume Groups. The VID user can also search for, and display, existing service instances and direct the instantiation of subsequent instance components.

    - -

    Contact Us

    - Please click here to contact us. +

    About VID

    + VID was originally developed for the October 2016 release by an integrated IT and Labs team, under the + direction of Steve Smokowski and Vivian Pressley. +

    +

    Contact Us

    + Please click here to contact us. @@ -26,6 +30,7 @@
    +


    diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js index 59e27470..e5db518d 100755 --- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js @@ -1,5 +1,5 @@ angular.module('att.abs.helper', []); angular.module('quantum', []); var app=angular.module("abs", ["att.abs", "att.abs.helper","modalServices", /*'ngAnimate','ngTouch',*/ 'ui.bootstrap', - "att.gridster","checklist-model","ngRoute", "ngCookies", 'btorfs.multiselect']); + "att.gridster","checklist-model","ngRoute", "ngCookies", 'btorfs.multiselect','ngFileUpload']); diff --git a/epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js b/epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js deleted file mode 100644 index b9be2c7e..00000000 --- a/epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(){"use strict";var a=angular.module("btorfs.multiselect",["btorfs.multiselect.templates"]);a.getRecursiveProperty=function(a,b){return b.split(".").reduce(function(a,b){return a?a[b]:null},a)},a.directive("multiselect",["$filter","$document","$log",function(b,c,d){return{restrict:"AE",scope:{options:"=",displayProp:"@",idProp:"@",searchLimit:"=?",selectionLimit:"=?",showSelectAll:"=?",showUnselectAll:"=?",showSearch:"=?",searchFilter:"=?",disabled:"=?ngDisabled",labels:"=?",showTooltip:"=?",placeholder:"@?"},require:"ngModel",templateUrl:"multiselect.html",link:function(b,e,f,g){b.selectionLimit=b.selectionLimit||0,b.searchLimit=b.searchLimit||25,b.searchFilter="",b.resolvedOptions=[],"function"!=typeof b.options&&(b.resolvedOptions=b.options),"undefined"!=typeof f.disabled&&(b.disabled=!0);var h=function(a){e[0].contains(a.target)||b.$apply(function(){b.open=!1})};c.on("click",h);var i=function(){g.$viewValue?(b.selectedOptions=b.resolvedOptions.filter(function(a){for(var c=b.getId(a),d=0;d1){var a=angular.isDefined(b.selectedOptions)?b.selectedOptions.length:0;return 0===a?b.labels&&b.labels.select?b.labels.select:b.placeholder||"Select":a+" "+(b.labels&&b.labels.itemsSelected?b.labels.itemsSelected:"selected")}return b.labels&&b.labels.select?b.labels.select:b.placeholder||"Select"},b.selectAll=function(){b.selectedOptions=b.resolvedOptions.slice(),b.unselectedOptions=[]},b.unselectAll=function(){b.selectedOptions=[],b.unselectedOptions=b.resolvedOptions.slice()},b.toggleItem=function(a){"undefined"==typeof b.selectedOptions&&(b.selectedOptions=[]);var c=b.selectedOptions.indexOf(a),d=c!==-1;if(d)b.unselectedOptions.push(b.selectedOptions[c]),b.selectedOptions.splice(c,1);else if(!d&&(0===b.selectionLimit||b.selectedOptions.lengthb.searchLimit)return!1;var d=b.getDisplay(c);if(d){var e=d.toLowerCase().indexOf(b.searchFilter.toLowerCase())>-1;return e&&a++,e}}}}}}])}(),angular.module("btorfs.multiselect.templates",["multiselect.html"]),angular.module("multiselect.html",[]).run(["$templateCache",function(a){a.put("multiselect.html",'
    \n \n \n
    \n')}]); \ No newline at end of file -- cgit 1.2.3-korg