Improve unit-test coverage

Change-Id: I734ed2d92e8ba00f0fb9ee6085835472352cc5e6
Issue-ID: VFC-724
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>

2 files changed, 49 insertions, 8 deletions

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
index 5665ff0b..7ed68a98 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
@@ -16,21 +16,24 @@
 
 server.error.whitelabel.enabled=false
 ## for MySql Database begin ##
-spring.jpa.show-sql=true
-spring.jpa.generate-ddl=true
-spring.jpa.hibernate.ddl-auto=update  
-spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect  
+#spring.jpa.show-sql=true
+#spring.jpa.generate-ddl=true
+#spring.jpa.hibernate.ddl-auto=update  
+#spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect  
 spring.jackson.serialization.indent_output=false
 
+#mybatis configuration
+mybatis.type-aliases-package=org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean
+spring.datasource.driverClassName = com.mysql.jdbc.Driver
 
 spring.datasource.username=vnfm
 spring.datasource.password=vnfmpass
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vnfm_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round&useSSL=false
 
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.tomcat.max-wait=30000
-spring.datasource.tomcat.max-active=20
-spring.datasource.tomcat.test-on-borrow=true
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.tomcat.max-wait=30000
+#spring.datasource.tomcat.max-active=20
+#spring.datasource.tomcat.test-on-borrow=true
 ## for MySql Database end ##
 
 ## for logging begin ##
@@ -64,3 +67,10 @@ type=vdu
 sizeOfStorage=40
 virtualMemSize=8192
 numVirtualCpu=4
+
+##OperateTaskProgress
+initialProgress=10
+instantiateTimeInterval=60000
+terminateTimeInterval=8000
+
+driverApiUriFront=http://127.0.0.1:8486
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/logback.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/logback.xml
new file mode 100644
index 00000000..d1be476b
--- /dev/null
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/logback.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>  
+<configuration>  
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />  
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">  
+        <encoder>  
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>  
+            <charset>UTF-8</charset>  
+        </encoder>  
+    </appender>  
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">  
+        <file>${catalina.base}/logs/vfcadaptor.log</file>  
+        <rollingPolicy
+      class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <fileNamePattern>${catalina.base}/logs/vfcadaptor.%i.log.zip
+      </fileNamePattern>
+      <minIndex>1</minIndex>
+      <maxIndex>9</maxIndex>
+    </rollingPolicy> 
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">  
+            <maxFileSize>10MB</maxFileSize>  
+        </triggeringPolicy>  
+        <encoder>  
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{req.method} %X{req.remoteHost} %X{req.requestURI} [%t] %-5level %logger{50} %line - %m%n</pattern>  
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->  
+        </encoder>  
+    </appender>  
+    <root level="INFO">  
+        <appender-ref ref="CONSOLE"></appender-ref>  
+        <appender-ref ref="FILE"></appender-ref>  
+    </root>  
+</configuration>  
\ No newline at end of file