diff options
9 files changed, 102 insertions, 151 deletions
diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile index a115b5f0..02cc98f2 100755 --- a/deliveries/src/main/docker/docker-files/Dockerfile +++ b/deliveries/src/main/docker/docker-files/Dockerfile @@ -6,82 +6,88 @@ RUN apt-get update && apt-get install -y \ COPY conf.d/ /etc/onap/vid/conf.d/
-RUN sed -i 's/# alias/alias/g' /root/.bashrc
-
-ENV JAVA_OPTS="-Xmx1536m -Xms1536m -Dlogback.configurationFile=/etc/onap/vid/conf.d/logback.xml"
+# MariaDB variables
+ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
+ VID_MYSQL_PORT="3306" \
+ VID_MYSQL_DBNAME="vid_portal" \
+ VID_MYSQL_USER="vidadmin" \
+ VID_MYSQL_PASS="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" \
+ VID_MYSQL_MAXCONNECTIONS="5"
+
+# General variables
+ENV VID_APP_DISPLAY_NAME="VID" \
+ VID_MYLOGIN_FEED_DIRECTORY="/tmp/MyLogins" \
+ VID_ROLE_ACCESS_CENTRALIZED="local" \
+ VID_DECRYPTION_KEY="AGLDdG4D04BKm2IxIWEr8o=" \
+ VID_ECOMP_PORTAL_INBOX_NAME="ECOMP-PORTAL-INBOX"
ENV ROOT_DIR /opt/app/vid
-
-ENV ASDC_CLIENT_TYPE REST
-ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.onap.org
-#old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z
-ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
-ENV ASDC_CLIENT_REST_PROTOCOL http
-ENV ASDC_CLIENT_REST_PORT 8080
-ENV ASDC_CLIENT_MODEL_NAMESPACE org.onap
-
-ENV CACHE_DIRECTORY $ROOT_DIR/cache
-
-ENV LOG4J_LOGLEVEL INFO
-ENV LOG4J_APPENDER rollingfile
-ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs
-
-ENV VID_AAI_URL https://aai.api.simpledemo.onap.org:8443
-ENV VID_APP_DISPLAY_NAME VID
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context
-ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra
-ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins
-ENV VID_MSO_USER InfraPortalClient
-ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
-ENV MSO_DME2_CLIENT_TIMEOUT 10000
-ENV MSO_DME2_CLIENT_READ_TIMEOUT 10000
-ENV MSO_DME2_SERVER_URL http://localhost:8081
-ENV MSO_DME2_ENABLED false
-ENV MSO_POLLING_INTERVAL_MSECS 10000
-ENV AAI_TRUSTSTORE_FILENAME tomcat_keystore
-ENV AAI_TRUSTSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
-ENV AAI_KEYSTORE_FILENAME tomcat_keystore
-ENV AAI_KEYSTORE_PASSWD_X OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
-ENV AAI_VID_UID VID
-ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9
-ENV AAI_USE_CLIENT_CERT false
-ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED
-ENV VID_ECOMP_REDIRECT_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
-ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/context
-ENV VID_ROLE_ACCESS_CENTRALIZED local
-ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com
-
-ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=
-ENV VID_UEB_URL_LIST ueb.api.simpledemo.onap.org
-ENV VID_UEB_CONSUMER_GROUP VID
-ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX
-ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD
-ENV VID_UEB_APP_SECRET S31PrbOzGgL4hg4owgtx47Da
-ENV VID_UEB_APP_MAILBOX_NAME ECOMP-PORTAL-OUTBOX-90
-ENV VID_UEB_LISTENERS_ENABLE false
-
-ENV VID_LOG_DIR ${ROOT_DIR}/logs
-ENV VID_LOG_LEVEL INFO
-
-ENV VID_MYSQL_HOST vid-mariadb-docker-instance
-ENV VID_MYSQL_PORT 3306
-ENV VID_MYSQL_DBNAME vid_portal
-ENV VID_MYSQL_USER vidadmin
-ENV VID_MYSQL_MAXCONNECTIONS 5
-ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
-ENV VID_KEYSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.jks
-ENV VID_KEYSTORE_PASSWORD Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-ENV VID_TRUSTSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.trust.jks
-ENV VID_TRUSTSTORE_PASSWORD OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2
-ENV VID_TOMCAT_PATH /usr/local/tomcat/conf/
-ENV CATALINA_OPTS "-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}"
+ENV CACHE_DIRECTORY="$ROOT_DIR/cache"
+
+# Keystore variables
+ENV VID_KEYSTORE_FILENAME="${ROOT_DIR}/etc/org.onap.vid.jks" \
+ VID_TRUSTSTORE_FILENAME="${ROOT_DIR}/etc/org.onap.vid.trust.jks" \
+ VID_KEYSTORE_PASSWORD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" \
+ VID_TRUSTSTORE_PASSWORD="OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2" \
+ VID_TOMCAT_PATH="/usr/local/tomcat/conf/"
+
+# Logging variables
+ENV VID_LOG_DIR="${ROOT_DIR}/logs" \
+ VID_LOG_LEVEL="INFO" \
+ LOG4J_LOGLEVEL="INFO" \
+ LOG4J_APPENDER="rollingfile" \
+ LOG4J_LOGS_DIRECTORY="${ROOT_DIR}/logs"
+
+# UEB variables
+ENV VID_UEB_URL_LIST="ueb.api.simpledemo.onap.org" \
+ VID_UEB_CONSUMER_GROUP="VID" \
+ VID_UEB_APP_KEY="2Re7Pvdkgw5aeAUD" \
+ VID_UEB_APP_SECRET="S31PrbOzGgL4hg4owgtx47Da" \
+ VID_UEB_APP_MAILBOX_NAME="ECOMP-PORTAL-OUTBOX-90" \
+ VID_UEB_LISTENERS_ENABLE="false"
+
+# SDC variables
+ENV ASDC_CLIENT_REST_PROTOCOL="http" \
+ ASDC_CLIENT_REST_HOST="c2.vm1.sdc.simpledemo.onap.org" \
+ ASDC_CLIENT_REST_PORT="8080" \
+ ASDC_CLIENT_REST_AUTH="Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=" \
+ ASDC_CLIENT_MODEL_NAMESPACE="org.onap" \
+ ASDC_CLIENT_TYPE="REST"
+
+# AAI variables
+ENV VID_AAI_URL="https://aai.api.simpledemo.onap.org:8443" \
+ AAI_TRUSTSTORE_FILENAME="tomcat_keystore" \
+ AAI_KEYSTORE_FILENAME="tomcat_keystore" \
+ AAI_TRUSTSTORE_PASSWD_X="OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp" \
+ AAI_KEYSTORE_PASSWD_X="OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp" \
+ AAI_VID_PASSWD_X="OBF:1jm91i0v1jl9" \
+ AAI_VID_UID="VID" \
+ AAI_USE_CLIENT_CERT="false" \
+ AAI_VNF_PROV_STATUS="PREPROV,NVTPROV,PROV,CAPPED"
+
+# SO environment variables
+ENV VID_MSO_SERVER_URL="http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra" \
+ MSO_DME2_SERVER_URL="http://localhost:8081" \
+ VID_MSO_PASS="OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz" \
+ MSO_DME2_CLIENT_TIMEOUT="10000" \
+ MSO_DME2_CLIENT_READ_TIMEOUT="10000" \
+ MSO_POLLING_INTERVAL_MSECS="10000" \
+ VID_MSO_USER="InfraPortalClient" \
+ MSO_DME2_ENABLED="false"
+
+# Portal variables
+ENV VID_CONTACT_US_LINK="https://todo_contact_us_link.com" \
+ VID_ECOMP_REDIRECT_URL="http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm" \
+ VID_ECOMP_REST_URL="http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi" \
+ VID_ECOMP_SHARED_CONTEXT_REST_URL="http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/context"
+
+# Custom options
+ENV JAVA_OPTS="-Xmx1536m -Xms1536m"
+ENV CATALINA_OPTS="-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}"
ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME}
ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME}
ADD maven/config/server.xml ${VID_TOMCAT_PATH}
-
ADD maven/scripts/*.sh /tmp/vid/
ADD maven/artifacts/vid.war /tmp/vid/stage/
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 index 3fa08396..e29218d9 100644 --- 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 @@ -82,8 +82,7 @@ import java.util.List; @EnableAspectJAutoProxy(proxyTargetClass=true) public class ExternalAppConfig extends AppConfig implements Configurable { - private RegistryAdapter schedulerRegistryAdapter; - /** The Constant LOG. */ + /** The Constant LOG. */ private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppConfig.class); /** The vid schema script. */ @@ -103,30 +102,12 @@ public class ExternalAppConfig extends AppConfig implements Configurable { } /** - * @see org.onap.portalsdk.core.conf.AppConfig#viewResolver() - */ - @Override - public ViewResolver viewResolver() { - return super.viewResolver(); - } - - /** - * @see org.onap.portalsdk.core.conf.AppConfig#addResourceHandlers(ResourceHandlerRegistry) - * - * @param registry - */ - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - super.addResourceHandlers(registry); - } - - /** * @see org.onap.portalsdk.core.conf.AppConfig#dataAccessService() */ @Override public DataAccessService dataAccessService() { // Echo the JDBC URL to assist developers when starting the app. - System.out.println("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is " + LOG.info("ExternalAppConfig: " + SystemProperties.DB_CONNECTIONURL + " is " + SystemProperties.getProperty(SystemProperties.DB_CONNECTIONURL)); return super.dataAccessService(); } @@ -173,6 +154,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable { * @return New instance of {@link SchedulerFactoryBean} */ @Bean + @DependsOn("dataSourceInitializer") public SchedulerFactoryBean schedulerFactoryBean() { SchedulerFactoryBean schedulerFactory = new SchedulerFactoryBean(); schedulerFactory.setJobFactory(new SpringBeanJobFactory()); @@ -210,25 +192,6 @@ public class ExternalAppConfig extends AppConfig implements Configurable { populator.addScript(vidDataScript); return populator; } - - - /*@Bean - public SpringLiquibase liquibaseBean(DataSource dataSource) { - SpringLiquibase springLiquibase = new SpringLiquibase(); - springLiquibase.setDataSource(dataSource); - springLiquibase.setChangeLog("classpath:db-master-changelog.xml"); - return springLiquibase; - }*/ - - /** - * Sets the scheduler registry adapter. - * - * @param schedulerRegistryAdapter - */ - @Autowired - public void setSchedulerRegistryAdapter(final RegistryAdapter schedulerRegistryAdapter) { - this.schedulerRegistryAdapter = schedulerRegistryAdapter; - } @Bean public LoginStrategy loginStrategy() { 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 index dc6973fe..7c1b5c69 100644 --- 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 @@ -38,43 +38,22 @@ package org.onap.portalapp.conf; import org.onap.portalsdk.core.conf.AppInitializer; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import java.util.TimeZone; public class ExternalAppInitializer extends AppInitializer { - @Override - protected Class<?>[] getRootConfigClasses() { - return super.getRootConfigClasses(); - } + private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppInitializer.class); @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()); + LOG.info("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(); - } - -// @Override -// public void onStartup(ServletContext servletContext) throws ServletException { -// super.onStartup(servletContext); -// setDefaultTimeZoneToUTC(); -// servletContext.addFilter("requestFromLocalhost", LocalhostFilter.class) -// .addMappingForUrlPatterns(null, false, -// String.format("/%s/%s/*", ChangeManagementController.CHANGE_MANAGEMENT, ChangeManagementController.VNF_WORKFLOW_RELATION), -// String.format("/%s/*", RoleGeneratorController.GENERATE_ROLE_SCRIPT), -// String.format("/%s/*", MaintenanceController.MAINTENANCE)); -// } - //set time zone to UTC so Dates would be written to DB in UTC timezone private void setDefaultTimeZoneToUTC() { System.setProperty("user.timezone", "UTC"); diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java index 71ab7359..d9d1b6dc 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java @@ -89,13 +89,13 @@ public class SecurityXssFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - if (request.getMethod().equalsIgnoreCase("POST") || request.getMethod().equalsIgnoreCase("PUT")) { + if ("POST".equalsIgnoreCase(request.getMethod())|| "PUT".equalsIgnoreCase(request.getMethod())) { HttpServletRequest requestToCache = new ContentCachingRequestWrapper(request); HttpServletResponse responseToCache = new ContentCachingResponseWrapper(response); filterChain.doFilter(requestToCache, responseToCache); String requestData = getRequestData(requestToCache); - String responseData = getResponseData(responseToCache); + getResponseData(responseToCache); if (StringUtils.isNotBlank(requestData) && validator.denyXSS(requestData)) { throw new SecurityException(BAD_REQUEST); } diff --git a/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java b/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java index 120ea25e..693df2f2 100644 --- a/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java +++ b/epsdk-app-onap/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java @@ -72,7 +72,6 @@ public class ExternalAppConfigTest { // default test testSubject = createTestSubject(); - testSubject.setSchedulerRegistryAdapter(schedulerRegistryAdapter); } @Test diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js index 06622cfb..366965c8 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js @@ -3,6 +3,7 @@ * VID
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1368,11 +1369,11 @@ Private metthods function _setPnf(data) { // data is the $scope.service.instance object
return PnfService.getPnfs(data)
.then(
- function success(response) {
+ function (response) {
return response.data;
// * can add here changes on the data that are needed to the view ( filter, ect..)
},
- function error(error) {
+ function (error) {
console.error(error);
}
);
@@ -1382,11 +1383,11 @@ Private metthods function _setCr(data) { // data is the $scope.service.instance object
return CrService.getCr(data)
.then(
- function success(response) {
+ function (response) {
return response.data.results;
// * can add here changes on the data that are needed to the view ( filter, ect..)
},
- function error(error) {
+ function (error) {
console.error(error);
}
);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js index f0a6ebdf..6c4d2900 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js @@ -3,6 +3,7 @@ * VID
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -50,7 +51,7 @@ $scope.status = FIELD.STATUS.FETCHING_SERVICE_CATALOG_ASDC;
$http.get(pathQuery)
- .then(function successCallback(response) {
+ .then(function (response) {
$scope.services = [];
if (response.data && angular.isArray(response.data.services)) {
wholeData = response.data.services;
@@ -82,7 +83,7 @@ $scope.isSpinnerVisible = false;
}
$scope.deployButtonType = response.data.readOnly ? 'disabled' : 'primary';
- }, function errorCallback(response) {
+ }, function (response) {
console.log("Error: " + response);
});
};
@@ -145,7 +146,7 @@ console.log("Instantiating SDC service " + service.uuid);
$http.get(COMPONENT.SERVICES_PATH + service.uuid)
- .then(function successCallback(getServiceResponse) {
+ .then(function (getServiceResponse) {
var serviceModel = getServiceResponse.data;
@@ -239,7 +240,7 @@ }
}
});
- }, function errorCallback(response) {
+ }, function (response) {
console.log("Error: " + response);
});
};
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js index ec4799b1..bb3acad1 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js @@ -3,6 +3,7 @@ * VID
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -197,7 +198,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", console.log("Instantiating ASDC service " + service.uuid);
$http.get('rest/models/services/' + service.uuid)
- .then(function successCallback(getServiceResponse) {
+ .then(function (getServiceResponse) {
getServiceResponse.data['service'].serviceTypeName = $scope.serviceTypeName;
getServiceResponse.data['service'].createSubscriberName = $scope.createSubscriberName;
var serviceModel = getServiceResponse.data;
@@ -278,7 +279,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", }
});
- }, function errorCallback(response) {
+ }, function (response) {
$log.error("Error: ", response);
});
};
@@ -661,7 +662,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", return $http({
method: 'GET',
url: pathQuery
- }).then(function successCallback(response) {
+ }).then(function (response) {
if (response.headers()['content-type'].includes('json')) {
vidService.setModel(response.data);
console.log("aaiSubscriber getAsdcModel DONE!!!!");
@@ -696,10 +697,10 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", $scope.getTenants = function (globalCustomerId) {
$http.get(FIELD.ID.AAI_GET_TENTANTS + globalCustomerId)
- .then(function successCallback(response) {
+ .then(function (response) {
return response.data;
//$location.path("/instantiate");
- }, function errorCallback(response) {
+ }, function (response) {
//TODO
});
}
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js index 32c34e9a..2c5d3ae3 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js @@ -3,6 +3,7 @@ * VID
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -164,7 +165,7 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService, $compile if (parameter.value) {
return "<select" + attributeString + " style='" + selectStyle
+ additionalStyle + "'>" + "<option value=true>true</option>"
- + "<option value=false>false</option>";
+ + "<option value=false>false</option>"
+ "</select>";
}else{
return "<select" + attributeString + " style='" + selectStyle
|