From 6dc58fd625279f8ffe1060170418686034db0af4 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 2 Oct 2019 12:08:49 +0100 Subject: Fix name convention issue Rename modules: workflow-designer-init to sdc-workflow-designer-init workflow-designer-be to sdc-workflow-designer-be workflow-designer-ui to sdc-workflow-designer-ui Rename docker images: onap/workflow-init to onap/sdc-workflow-init onap/workflow-backend to onap/sdc-workflow-backend onap/workflow-frontend to onap/sdc-workflow-frontend List of changed files: modified: README.md modified: docker-compose/debug.yml modified: docker-compose/docker-compose.yml modified: pom.xml modified: sdc-workflow-bdd/pom.xml modified: sdc-workflow-designer-be/pom.xml modified: sdc-workflow-designer-init/pom.xml modified: sdc-workflow-designer-ui/pom.xml modified: sdc-workflow-designer-ui/src/main/frontend/yarn.lock modified: version.properties All others changes are relaited to rename/move. Change-Id: Ic989b6347b815f85e77e23fc8d7884c05b650a27 Issue-ID: SDC-2334 Issue-ID: SDC-2335 Signed-off-by: Vasyl Razinkov --- workflow-designer-init/src/main/docker/Dockerfile | 12 --- .../src/main/docker/create_keyspaces.cql | 12 --- .../src/main/docker/create_tables.cql | 112 --------------------- workflow-designer-init/src/main/docker/start.sh | 38 ------- 4 files changed, 174 deletions(-) delete mode 100644 workflow-designer-init/src/main/docker/Dockerfile delete mode 100644 workflow-designer-init/src/main/docker/create_keyspaces.cql delete mode 100644 workflow-designer-init/src/main/docker/create_tables.cql delete mode 100644 workflow-designer-init/src/main/docker/start.sh (limited to 'workflow-designer-init/src') diff --git a/workflow-designer-init/src/main/docker/Dockerfile b/workflow-designer-init/src/main/docker/Dockerfile deleted file mode 100644 index b5ee15ad..00000000 --- a/workflow-designer-init/src/main/docker/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM python:2.7-alpine3.8 - -RUN pip install cqlsh==5.0.4 && \ - mkdir ~/.cassandra/ && \ - echo '[cql]' > ~/.cassandra/cqlshrc && \ - echo 'version=3.4.4' >> ~/.cassandra/cqlshrc - -COPY create_keyspaces.cql create_tables.cql start.sh ./ - -RUN chmod 744 start.sh - -ENTRYPOINT ["./start.sh"] diff --git a/workflow-designer-init/src/main/docker/create_keyspaces.cql b/workflow-designer-init/src/main/docker/create_keyspaces.cql deleted file mode 100644 index 47406973..00000000 --- a/workflow-designer-init/src/main/docker/create_keyspaces.cql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE KEYSPACE IF NOT EXISTS WORKFLOW -WITH DURABLE_WRITES = TRUE -AND REPLICATION = { - 'class' : 'SimpleStrategy', - 'replication_factor' : 1 -}; - -CREATE KEYSPACE IF NOT EXISTS ZUSAMMEN_WORKFLOW -WITH REPLICATION = { - 'class' : 'SimpleStrategy', - 'replication_factor' : 1 -}; diff --git a/workflow-designer-init/src/main/docker/create_tables.cql b/workflow-designer-init/src/main/docker/create_tables.cql deleted file mode 100644 index ad9a5cb4..00000000 --- a/workflow-designer-init/src/main/docker/create_tables.cql +++ /dev/null @@ -1,112 +0,0 @@ -USE WORKFLOW; - -CREATE TABLE IF NOT EXISTS UNIQUE_VALUE ( - TYPE TEXT, - VALUE TEXT, - PRIMARY KEY (( TYPE, VALUE )) -); - -USE ZUSAMMEN_WORKFLOW; - -CREATE TABLE IF NOT EXISTS ITEM ( - ITEM_ID TEXT PRIMARY KEY, - ITEM_INFO TEXT, - CREATION_TIME TIMESTAMP, - MODIFICATION_TIME TIMESTAMP -); - -CREATE TABLE IF NOT EXISTS VERSION ( - SPACE TEXT, - ITEM_ID TEXT, - VERSION_ID TEXT, - BASE_VERSION_ID TEXT, - INFO TEXT, - RELATIONS TEXT, - CREATION_TIME TIMESTAMP, - MODIFICATION_TIME TIMESTAMP, - PRIMARY KEY (( SPACE, ITEM_ID ), VERSION_ID) -); - -CREATE TABLE IF NOT EXISTS VERSION_ELEMENTS ( - SPACE TEXT, - ITEM_ID TEXT, - VERSION_ID TEXT, - REVISION_ID TEXT, - ELEMENT_IDS MAP, - DIRTY_ELEMENT_IDS SET, - STAGE_ELEMENT_IDS SET, - CONFLICT_ELEMENT_IDS SET, - PUBLISH_TIME TIMESTAMP, - USER TEXT, - MESSAGE TEXT, - PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID ), REVISION_ID) -); - -CREATE TABLE IF NOT EXISTS ELEMENT_NAMESPACE ( - ITEM_ID TEXT, - ELEMENT_ID TEXT, - NAMESPACE TEXT, - PRIMARY KEY (( ITEM_ID, ELEMENT_ID )) -); - -CREATE TABLE IF NOT EXISTS ELEMENT ( - SPACE TEXT, - ITEM_ID TEXT, - VERSION_ID TEXT, - ELEMENT_ID TEXT, - REVISION_ID TEXT, - PARENT_ID TEXT, - NAMESPACE TEXT, - INFO TEXT, - RELATIONS TEXT, - DATA BLOB, - SEARCHABLE_DATA BLOB, - VISUALIZATION BLOB, - SUB_ELEMENT_IDS SET, - ELEMENT_HASH TEXT, - PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID, ELEMENT_ID ), REVISION_ID) -); - -CREATE TABLE IF NOT EXISTS ELEMENT_SYNCHRONIZATION_STATE ( - SPACE TEXT, - ITEM_ID TEXT, - VERSION_ID TEXT, - ELEMENT_ID TEXT, - REVISION_ID TEXT, - PUBLISH_TIME TIMESTAMP, - DIRTY BOOLEAN, - PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID ), ELEMENT_ID, REVISION_ID) -); - -CREATE TABLE IF NOT EXISTS ELEMENT_STAGE ( - SPACE TEXT, - ITEM_ID TEXT, - VERSION_ID TEXT, - ELEMENT_ID TEXT, - PARENT_ID TEXT, - NAMESPACE TEXT, - INFO TEXT, - RELATIONS TEXT, - DATA BLOB, - SEARCHABLE_DATA BLOB, - VISUALIZATION BLOB, - SUB_ELEMENT_IDS SET, - ELEMENT_HASH TEXT, - PUBLISH_TIME TIMESTAMP, - ACTION TEXT, - CONFLICTED BOOLEAN, - CONFLICT_DEPENDENT_IDS SET, - PRIMARY KEY (( SPACE, ITEM_ID, VERSION_ID, ELEMENT_ID )) -); - -CREATE TABLE IF NOT EXISTS VERSION_STAGE ( - SPACE TEXT, - ITEM_ID TEXT, - VERSION_ID TEXT, - BASE_VERSION_ID TEXT, - CREATION_TIME TIMESTAMP, - MODIFICATION_TIME TIMESTAMP, - PUBLISH_TIME TIMESTAMP, - ACTION TEXT, - PRIMARY KEY (( SPACE, ITEM_ID ), VERSION_ID) -); diff --git a/workflow-designer-init/src/main/docker/start.sh b/workflow-designer-init/src/main/docker/start.sh deleted file mode 100644 index 8acb2cf6..00000000 --- a/workflow-designer-init/src/main/docker/start.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -is_cs_unauthenticated=1 -FALSE=0 -if [[ -z "${CS_AUTHENTICATE}" || "${CS_AUTHENTICATE}" == "false" ]]; then - is_cs_unauthenticated=$FALSE -fi - -if [ $is_cs_unauthenticated -eq $FALSE ]; then - echo "Establishing unsecured connection to Cassandra" -fi - -if [[ $is_cs_unauthenticated -eq 1 && -z "${CS_USER}" ]]; then - echo "CS_USER environment variable must be set" - exit 1 -fi - -if [[ $is_cs_unauthenticated -eq 1 && -z "${CS_PASSWORD}" ]]; then - echo "CS_PASSWORD environment variable must be set" - exit 1 -fi - -if [[ -z "${CS_HOST}" ]]; then - echo "CS_HOST environment variable must be set" - exit 1 -fi - -cql_from_file() { - - if [ $is_cs_unauthenticated -eq 1 ]; then - cqlsh -u ${CS_USER} -p ${CS_PASSWORD} -f $1 ${CS_HOST} ${CS_PORT} - else - cqlsh -f $1 ${CS_HOST} ${CS_PORT} - fi -} - -cql_from_file /create_keyspaces.cql -cql_from_file /create_tables.cql -- cgit 1.2.3-korg