diff options
| author |   guochuyicmri <guochuyi@chinamobile.com> | 2018-11-10 13:08:49 +0800 |
|---|---|---|
| committer | guochuyicmri <guochuyi@chinamobile.com> | 2018-11-10 13:08:58 +0800 |
| commit | 6d7f640893af28b22819be48f9eac7f2398341c0 (patch) | |
| tree | ff2f721e54e334e775d38a60cc34dc383dd27e5c | |
| parent | 6cebb4e97b436ed5d7bc4d8ed7866026318a942b (diff) | |
Fix instance instantiation for CCVPN
Change-Id: I10fc88190aba0863332df4d8803f6abdfcf2ad07
Issue-ID: USECASEUI-170
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
| -rw-r--r-- | server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java | 2 | ||||
| -rw-r--r-- | standalone/src/main/assembly/resources/dbscripts/mysql/usecase-ui-createobj.sql | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java index 5c7c50d3..fa9cf6aa 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceLcmService.java @@ -166,7 +166,7 @@ public class DefaultServiceLcmService implements ServiceLcmService { logger.error("DefaultServiceLcmService saveOrUpdateServiceBean serviceBean is null!"); } Transaction tx = session.beginTransaction(); - session.update(serviceBean); + session.saveOrUpdate(serviceBean); tx.commit(); session.flush(); } catch (Exception e) { diff --git a/standalone/src/main/assembly/resources/dbscripts/mysql/usecase-ui-createobj.sql b/standalone/src/main/assembly/resources/dbscripts/mysql/usecase-ui-createobj.sql index dfb33597..a8f7c21f 100644 --- a/standalone/src/main/assembly/resources/dbscripts/mysql/usecase-ui-createobj.sql +++ b/standalone/src/main/assembly/resources/dbscripts/mysql/usecase-ui-createobj.sql @@ -120,7 +120,7 @@ ALTER TABLE `performance_commoneventheader` ADD INDEX `performance_commoneventhe -- ---------------------------- DROP TABLE IF EXISTS `service_instances`; CREATE TABLE `service_instances` ( - `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, + `id` varchar(100) NOT NULL, `serviceInstanceId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `customerId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `serviceType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, @@ -128,6 +128,6 @@ CREATE TABLE `service_instances` ( `operationId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `parentServiceInstanceId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, `status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; |