diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-03-31 16:17:57 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-03-31 17:19:38 -0400 |
| commit | 7d7f8664785f7b3b8cc220716ce90882a53f6b6c (patch) | |
| tree | 73ed510a9a74461e93645b6a66e3ce9917b31462 /restapi-call-node/provider/src/main/resources | |
| parent | 04bbe0c42d211038dba1f6e097bd874c96638243 (diff) | |
[SDNC-5] Rebase sdnc-plugins
Port to OpenDaylight Boron and sync updates since 16.10
Change-Id: Ie55f9ae53eb814d65eafb92aada5721f9b0554e8
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'restapi-call-node/provider/src/main/resources')
3 files changed, 15 insertions, 4 deletions
diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml index 7aa4fc5..f27f118 100644 --- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml +++ b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-context.xml @@ -4,7 +4,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +26,12 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> - <property name="locations" value="file:${SDNC_CONFIG_DIR}/ueb.properties" /> + <property name="locations"> + <list> + <value>file:${SDNC_CONFIG_DIR}/ueb.properties</value> + <value>file:${SDNC_CONFIG_DIR}/dme2.properties</value> + </list> + </property> <property name="ignoreResourceNotFound" value="true" /> <property name="ignoreUnresolvablePlaceholders" value="true" /> </bean> @@ -35,6 +40,10 @@ <bean id="restapiCallNode" class="org.openecomp.sdnc.restapicall.RestapiCallNode"> <property name="uebServers" value="${servers}" /> + <property name="retryPolicyStore" ref="retryPolicyStore"/> </bean> + <bean id="retryPolicyStore" class="org.openecomp.sdnc.restapicall.RetryPolicyStore"> + <property name="proxyServers" value="${proxyUrl}" /> + </bean> </beans> diff --git a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml index aa12761..c2de5bf 100644 --- a/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml +++ b/restapi-call-node/provider/src/main/resources/META-INF/spring/restapi-call-node-osgi-context.xml @@ -4,7 +4,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/restapi-call-node/provider/src/main/resources/northbound-api-template.xml b/restapi-call-node/provider/src/main/resources/northbound-api-template.xml index 3738840..b6a0a67 100644 --- a/restapi-call-node/provider/src/main/resources/northbound-api-template.xml +++ b/restapi-call-node/provider/src/main/resources/northbound-api-template.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ --> <input xmlns="${northbound-xmlNS}"> + <${northbound-Container}> <request-information> <notification-url>${service-topology-operation-input.request-information.notification-url}</notification-url> <request-action>${service-topology-operation-input.request-information.request-action}</request-action> @@ -38,4 +39,5 @@ <subscriber-name>${service-topology-operation-input.service-information.subscriber-name}</subscriber-name> </service-information> ${'northbound-anyData} + </${northbound-Container}> </input> |