diff options
| author |   Gao Weitao <victor.gao@huawei.com> | 2018-05-23 08:29:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-23 08:29:16 +0000 |
| commit | 427ff5037a70052a524095fb6a1cba53dfb8e8f5 (patch) | |
| tree | 2b629cd67e43ec4fe296279bb5de2f633570dea8 /huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml | |
| parent | 89ad26af6134b817ac2a04eb861d7c5a68f9885d (diff) | |
| parent | b134e6b307a65cf282e25a1c53f0f68e2807ddec (diff) | |
Merge "add some new function"
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml')
| -rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml index e14a37f4..f71aa51a 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml @@ -41,6 +41,8 @@ <import resource="classpath:META-INF/cxf/cxf.xml"/> <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/> + <context:property-placeholder location="classpath:jdbc.properties" ignore-unresolvable="true"/> + <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/> <bean id="source" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> @@ -75,6 +77,7 @@ <bean id="vnfMgr" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.process.VnfMgr"> <property name="vnfmDao" ref="vnfmDao"></property> + <property name="configedVduType" value="${vnf.scaleout.config.vdutype}"></property> </bean> <bean id="VnfRoa" class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.rest.VnfRoa"> |