diff options
| author |   Kailun Qin <kailun.qin@intel.com> | 2018-03-27 18:23:01 +0800 |
|---|---|---|
| committer | Kailun Qin <kailun.qin@intel.com> | 2018-03-28 23:34:40 +0800 |
| commit | d4a7658f72decfef05d15973d5cee13910eb47ae (patch) | |
| tree | e9b872d3e58a8fc3c420b0ee020267a22a8c8136 /vnf-sdk-function-test/conf | |
| parent | 29078dd84779639f98739d508e947db0662473df (diff) | |
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 <kailun.qin@intel.com>
Diffstat (limited to 'vnf-sdk-function-test/conf')
| -rw-r--r-- | vnf-sdk-function-test/conf/environment/environment.json | 6 | ||||
| -rw-r--r-- | vnf-sdk-function-test/conf/robot/robotMetaData.json | 8 | ||||
| -rw-r--r-- | vnf-sdk-function-test/conf/vnfsdkfunctest.yml | 15 |
3 files changed, 20 insertions, 9 deletions
diff --git a/vnf-sdk-function-test/conf/environment/environment.json b/vnf-sdk-function-test/conf/environment/environment.json new file mode 100644 index 0000000..a990796 --- /dev/null +++ b/vnf-sdk-function-test/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/vnf-sdk-function-test/conf/robot/robotMetaData.json b/vnf-sdk-function-test/conf/robot/robotMetaData.json index 2aa85b0..f322830 100644 --- a/vnf-sdk-function-test/conf/robot/robotMetaData.json +++ b/vnf-sdk-function-test/conf/robot/robotMetaData.json @@ -1,6 +1,6 @@ { - "FRAMEWORK_TYPE": "robot", - "MAIN_SCRIPT": "main.robot", - "DIR_RESULT": "D:\\Pitchi_docs\\remote\\", - "DIR_REMOTE": "/home/root1/test/" + "FRAMEWORK_TYPE": "robot", + "MAIN_SCRIPT": "main.robot", + "DIR_RESULT": "D:\\Pitchi_docs\\remote\\", + "DIR_REMOTE": "/home/root1/test/" }
\ No newline at end of file diff --git a/vnf-sdk-function-test/conf/vnfsdkfunctest.yml b/vnf-sdk-function-test/conf/vnfsdkfunctest.yml index 3e1a439..93e4d36 100644 --- a/vnf-sdk-function-test/conf/vnfsdkfunctest.yml +++ b/vnf-sdk-function-test/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 |