From d4a7658f72decfef05d15973d5cee13910eb47ae Mon Sep 17 00:00:00 2001 From: Kailun Qin Date: Tue, 27 Mar 2018 18:23:01 +0800 Subject: Port nfvo/vnf_functest for framework merge Merged VNF onboarding test functions and frameworks locating separately in nfvo/vnf_functest and vnfsdk/vnf-sdk-function-test seed code. 1) Reconstructed by aligning with the original interface and sequence design; 2) Replaced Restful calls with local invokes; 3) Implemented DB support (PostgreSQL) for persistent recording; 4) Added unit tests associated; 5) Unified package names to "onap"; 6) Fixed several inherent issues. Issue-ID: VNFSDK-178 Change-Id: I2147c5df8dd400adef71dafca9073b12d992d2df Signed-off-by: Kailun Qin --- .../src/main/assembly/conf/environment/environment.json | 6 ++++++ .../standalone/src/main/assembly/conf/vnfsdkfunctest.yml | 15 ++++++++++----- distribution/standalone/src/main/assembly/run.bat | 2 +- distribution/standalone/src/main/assembly/run.sh | 2 +- distribution/standalone/src/main/assembly/stop.bat | 2 +- distribution/standalone/src/main/assembly/stop.sh | 2 +- 6 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 distribution/standalone/src/main/assembly/conf/environment/environment.json (limited to 'distribution/standalone/src') diff --git a/distribution/standalone/src/main/assembly/conf/environment/environment.json b/distribution/standalone/src/main/assembly/conf/environment/environment.json new file mode 100644 index 0000000..a990796 --- /dev/null +++ b/distribution/standalone/src/main/assembly/conf/environment/environment.json @@ -0,0 +1,6 @@ +{ + "remoteIp": "127.0.0.1", + "userName": "functest", + "password": "password", + "path": "/home/root1/test/" +} \ No newline at end of file diff --git a/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml b/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml index 3e1a439..93e4d36 100644 --- a/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml +++ b/distribution/standalone/src/main/assembly/conf/vnfsdkfunctest.yml @@ -3,12 +3,11 @@ template: Hello, %s! defaultName: ${DW_DEFAULT_NAME:-Stranger} -msbServerAddr: http://127.0.0.1:80 #database database: # the name of your JDBC driver - driverClass: com.mysql.jdbc.Driver + driverClass: org.postgresql.Driver # the username user: functest @@ -17,7 +16,13 @@ database: password: functest # the JDBC URL - url: jdbc:mysql://127.0.0.1:3306/functest + url: jdbc:postgresql://localhost:5432/functest + + # any properties specific to your JDBC driver: + properties: + charSet: UTF-8 + hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect #org.hibernate.dialect.MySQL5InnoDBDialect +# hibernate.hbm2ddl.auto: create # use the simple server factory if you only want to run on a single port #server: @@ -27,7 +32,7 @@ database: # port: 8080 server: type: simple - rootPath: '/openoapi/vnfsdk/v1/*' + rootPath: '/api/vnfsdk/v1/*' applicationContextPath: / adminContextPath: /admin connector: @@ -44,7 +49,7 @@ logging: loggers: # Sets the level for 'com.example.app' to DEBUG. - org.openo.vnfsdk.functest.VnfSdkFunTestApp: INFO + org.onap.vnfsdk.functest.VnfSdkFunTestApp: INFO appenders: - type: console diff --git a/distribution/standalone/src/main/assembly/run.bat b/distribution/standalone/src/main/assembly/run.bat index 1fda07c..5099274 100644 --- a/distribution/standalone/src/main/assembly/run.bat +++ b/distribution/standalone/src/main/assembly/run.bat @@ -29,7 +29,7 @@ set class_path=%RUNHOME%;%RUNHOME%vnf-sdk-function-test.jar echo ### jvm_opts: %jvm_opts% echo ### class_path: %class_path% -%JAVA% -classpath %class_path% %jvm_opts% org.openo.vnfsdk.functest.VnfSdkFuncTestApp server %RUNHOME%conf/vnfsdkfunctest.yml +%JAVA% -classpath %class_path% %jvm_opts% org.onap.vnfsdk.functest.VnfSdkFuncTestApp server %RUNHOME%conf/vnfsdkfunctest.yml IF ERRORLEVEL 1 goto showerror exit diff --git a/distribution/standalone/src/main/assembly/run.sh b/distribution/standalone/src/main/assembly/run.sh index b1329c0..99bf172 100644 --- a/distribution/standalone/src/main/assembly/run.sh +++ b/distribution/standalone/src/main/assembly/run.sh @@ -27,5 +27,5 @@ port=8701 echo @JAVA_OPTS@ $JAVA_OPTS export CLASSPATH=CLASSPATH:"$JAVA_HOME/jre/lib" echo @CLASSPATH@ $CLASSPATH -"$JAVA" $JAVA_OPTS -cp $RUNHOME/vnf-sdk-function-test org.openo.vnfsdk.functest.VnfSdkFuncTestApp server "$RUNHOME/conf/vnfsdkfunctest.yml" +"$JAVA" $JAVA_OPTS -cp $RUNHOME/vnf-sdk-function-test org.onap.vnfsdk.functest.VnfSdkFuncTestApp server "$RUNHOME/conf/vnfsdkfunctest.yml" diff --git a/distribution/standalone/src/main/assembly/stop.bat b/distribution/standalone/src/main/assembly/stop.bat index ed702ff..5058cc8 100644 --- a/distribution/standalone/src/main/assembly/stop.bat +++ b/distribution/standalone/src/main/assembly/stop.bat @@ -18,7 +18,7 @@ title stopping vnfsdk-functest set HOME=%~dp0 -set Main_Class="org.openo.vnfsdk.functest.VnfSdkFuncTestApp" +set Main_Class="org.onap.vnfsdk.functest.VnfSdkFuncTestApp" echo ================== extsys-service info ============================================= echo HOME=$HOME diff --git a/distribution/standalone/src/main/assembly/stop.sh b/distribution/standalone/src/main/assembly/stop.sh index 36099c1..6970a54 100644 --- a/distribution/standalone/src/main/assembly/stop.sh +++ b/distribution/standalone/src/main/assembly/stop.sh @@ -17,7 +17,7 @@ DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` -Main_Class="org.openo.vnfsdk.functest.VnfSdkFuncTestApp" +Main_Class="org.onap.vnfsdk.functest.VnfSdkFuncTestApp" echo ================== catalog-service info ============================================= echo HOME=$HOME -- cgit 1.2.3-korg