summaryrefslogtreecommitdiffstats
path: root/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources
diff options
context:
space:
mode:
authorliuqian <liuqian13@huawei.com>2018-05-23 16:18:09 +0800
committerliuqian <liuqian13@huawei.com>2018-05-23 16:18:09 +0800
commitb134e6b307a65cf282e25a1c53f0f68e2807ddec (patch)
tree77f2d1504945fd233c1de2a10dff52131154657e /huawei/vnfmadapter/VnfmadapterService/service/src/main/resources
parent65de5e8a56100c0c44b8fce128d4b8c8e67a2a0c (diff)
add some new function
Change-Id: I02a8a4059d8b372e88f886b5fc668098f3365cbb Issue-ID: VFC-920 Signed-off-by: liuqian <liuqian13@huawei.com>
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/resources')
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/config.properties1
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/spring/Vnfmadapter/services.xml3
2 files changed, 4 insertions, 0 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/config.properties b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/config.properties
new file mode 100644
index 00000000..7f913926
--- /dev/null
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/config.properties
@@ -0,0 +1 @@
+vnf.scaleout.config.vdutype= \ No newline at end of file
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">