diff options
5 files changed, 6 insertions, 5 deletions
diff --git a/epsdk-app-onap/src/main/resources/portal_template.properties b/epsdk-app-onap/src/main/resources/portal_template.properties index c26be554..ed694014 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.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl
+portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
portal.api.prefix = /api
max.idle.time = 5
user.attribute.name = user_attribute
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 c0e9e347..e7623665 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 @@ -111,7 +111,7 @@ element_map_icon_path = app/fusionapp/icons/ #aai.oldserver.url.base=https://aai.api.openecomp.org:8443/aai/servers/
#aai.oldserver.url=https://aai.api.openecomp.org:8443/aai/servers/v3/
aai.server.url.base=https://104.239.249.183:8443/aai/
-aai.server.url=https://104.239.249.183:8443/aai/v8/
+aai.server.url=https://104.239.249.183:8443/aai/v11/
aai.oldserver.url.base=https://104.239.249.183:8443/aai/servers/
aai.oldserver.url=https://104.239.249.183:8443/aai/servers/v3/
aai.truststore.filename=tomcat_keystore
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties index 2eabd461..a872ef2d 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties @@ -64,7 +64,7 @@ element_map_icon_path = app/vid/icons/ #aai related properties
aai.server.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/
-aai.server.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/v8/
+aai.server.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/v11/
aai.oldserver.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/
aai.oldserver.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/v3/
aai.truststore.filename=${AAI_TRUSTSTORE_FILENAME}
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js index 65e15f27..03ec788b 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js @@ -398,7 +398,8 @@ appDS2.factory("FIELD", [ "PARAMETER", function(PARAMETER) { id : ID.SUBSCRIBER_NAME,
type : PARAMETER.SELECT,
prompt : PROMPT.SUBSCRIBER_NAME,
- isRequired : true
+ isRequired : true,
+ isSingleOptionAutoSelected : false
},
TENANT_DISABLED : {
name : NAME.TENANT,
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 b6a360f4..69a0ae52 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 @@ -247,7 +247,7 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService) { }
if (UtilityService.hasContents(parameter.prompt)) {
- if (!(IS_SINGLE_OPTION_AUTO_SELECTED && parameter.optionList.length === 1)) {
+ if (!(IS_SINGLE_OPTION_AUTO_SELECTED && parameter.optionList.length === 1) || !(parameter.isSingleOptionAutoSelected && parameter.optionList.length === 1)) {
html += "<option value=''>" + parameter.prompt + "</option>";
}
}
|