diff options
author | 2017-11-05 23:17:21 +0800 | |
---|---|---|
committer | 2017-11-05 23:37:09 +0800 | |
commit | 029a1743a0e3e5c81a232c2153ea9d1b808ba7b6 (patch) | |
tree | eadb5e5ee59c462a34d179c5873e9b6ae5a7b71a /nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release | |
parent | 98b79d96202bc04aec130bf7df6cfc3c78b58ec9 (diff) |
Update db process part
Change-Id: Ie66c98744f3b27c9abf4e6bb24d1be84580ccb91
Issue-ID: VFC-544
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release')
-rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml | 3 | ||||
-rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml index 825cbc01..4c503eb2 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.xml @@ -32,13 +32,14 @@ <Service name="Catalina"> <Connector connectionTimeout="20000" port="8486" protocol="HTTP/1.1" redirectPort="8443" /> <Connector port="8821" protocol="AJP/1.3" redirectPort="8443" /> +<!-- <Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" clientAuth="true" keystoreFile="conf/server.p12" keystorePass="Changeme_123" keystoreType="PKCS12" truststoreFile="conf/trust.jks" truststoreType="JKS" truststorePass="Changeme_123" sslProtocol="TLS" ciphers="TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA" connectionTimeout="20000"/> - +--> <Engine defaultHost="localhost" name="Catalina"> <Realm className="org.apache.catalina.realm.LockOutRealm"> <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" /> diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql index 2f2c8913..8a3b2a28 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/db/mysql/db-schema.sql @@ -36,21 +36,21 @@ set Names 'utf8'; /******************drop old table and create new***************************/ -DROP TABLE IF EXISTS vnfm_job_execution_record; -CREATE TABLE `vnfm_job_execution_record` ( - `jobId` int(11) auto_increment primary key, - `vnfInstanceId` varchar(60) DEFAULT NULL, - `vnfmExecutionId` varchar(60) DEFAULT NULL, - `vnfmInterfceName` varchar(60) DEFAULT NULL, +DROP TABLE IF EXISTS vnfm_job_execution_info; +CREATE TABLE `vnfm_job_execution_info` ( + `job_id` int(11) auto_increment primary key, + `vnf_instance_id` varchar(60) DEFAULT NULL, + `vnfm_execution_id` varchar(60) DEFAULT NULL, + `vnfm_interface_name` varchar(60) DEFAULT NULL, `status` varchar(24) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -DROP TABLE IF EXISTS vnfm_resource_record; -CREATE TABLE `vnfm_resource_record` ( +DROP TABLE IF EXISTS vnfm_resource_info; +CREATE TABLE `vnfm_resource_info` ( `id` int(11) auto_increment primary key, `type` enum ('VDU','VL','CP','Storage') DEFAULT NULL, - `resourceDefinitionId` varchar(60) DEFAULT NULL, + `resource_definition_id` varchar(60) DEFAULT NULL, `vdu` varchar(60) DEFAULT NULL, `status` varchar(24) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file |