aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/tools
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-06-11 14:22:02 +0300
committerMichael Lando <ml636r@att.com>2017-06-11 17:48:32 +0300
commitb3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch)
tree0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/tools
parentaf9929df75604ce407d0ca542b200630164e0ae6 (diff)
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/tools')
-rw-r--r--openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl1
-rw-r--r--openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml2
-rw-r--r--openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java5
3 files changed, 4 insertions, 4 deletions
diff --git a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
index 6e588eb22a..d525c62474 100644
--- a/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
+++ b/openecomp-be/tools/install/database/schemaTemplates/questionnaire/component.ftl
@@ -136,7 +136,6 @@
"minimum": {
"type": "number",
"minimum": 0,
- "exclusiveMinimum": true,
"maximum": 100
},
"maximum": {
diff --git a/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml b/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml
index 7bc93bddab..1f281c950b 100644
--- a/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml
+++ b/openecomp-be/tools/migration/1702_to_1707_zusammen/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>com.amdocs.zusammen.plugin</groupId>
<artifactId>zusammen-state-store-cassandra-plugin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
diff --git a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
index 283c9cf25d..c43cf32001 100644
--- a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
+++ b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
@@ -78,7 +78,7 @@ public class MigrationMain {
printMessage(logger, "Checking whether a migration has already been run.");
if (MigrationMarker.isMigrated()) {
printMessage(logger, "The DB has already been migrated, this script will now exit.");
- return;
+ System.exit(status);
}
ItemCassandraDao itemCassandraDao = new ItemCassandraDao();
VersionCassandraDao versionCassandraDao = new VersionCassandraDao();
@@ -243,7 +243,8 @@ public class MigrationMain {
new OrchestrationTemplateCandidateCassandraLoader();
orchestrationTemplateCandidateCassandraLoader.list().stream()
- .filter(entity -> needMigration(entity.getId(), entity.getVersion()))
+ .filter(entity -> needMigration(entity.getId(), entity.getVersion()) &&
+ entity.getContentData()!=null && entity.getFilesDataStructure()!=null)
.forEach(entity -> ElementHandler
.save(context, cassandraElementRepository, entity.getId(), entity.getVersion(),
OrchestrationTemplateCandidateConvertor