From 7c083746477e46a662ce3eb2664a050a210d971f Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Wed, 14 Feb 2018 15:31:55 +0100 Subject: Remove Camunda and replace by Camel The camunda has been replaced by Camel so that DB could be removed. Also the unit tests has been reworked and maven dependencies have been changed Issue-ID: CLAMP-85 Change-Id: I781c3c83cecbdae3535c7e036e62ae83c6b6852f Signed-off-by: Determe, Sebastien (sd378r) --- src/main/resources/META-INF/processes.xml | 37 --- src/main/resources/application.properties | 29 +- src/main/resources/bpmn/clds-process-action.bpmn | 384 ---------------------- src/main/resources/clds/camel/flexible-flow.xml | 36 ++ src/main/resources/clds/clds-reference.properties | 6 +- src/main/resources/clds/clds-users.json | 3 +- 6 files changed, 44 insertions(+), 451 deletions(-) delete mode 100644 src/main/resources/META-INF/processes.xml delete mode 100644 src/main/resources/bpmn/clds-process-action.bpmn create mode 100644 src/main/resources/clds/camel/flexible-flow.xml (limited to 'src/main/resources') diff --git a/src/main/resources/META-INF/processes.xml b/src/main/resources/META-INF/processes.xml deleted file mode 100644 index 921a1029b..000000000 --- a/src/main/resources/META-INF/processes.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - default - bpmn/clds-process-action.bpmn - - true - false - - - - diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1db0875a3..dd4ea6d36 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -62,8 +62,6 @@ server.port=8080 server.contextPath=/ #Modified engine-rest applicationpath -#camel.component.servlet.mapping.context-path=/restservices/clds/v1/* -spring.jersey.application-path=/restservices/clds/v1 spring.profiles.active=clamp-default,clamp-spring-authentication #The max number of active threads in this pool @@ -78,34 +76,15 @@ server.context_parameters.p-name=value #context parameter with p-name as key and camel.springboot.consumer-template-cache-size=1000 camel.springboot.producer-template-cache-size=1000 -camel.springboot.jmx-enabled=true +camel.springboot.jmx-enabled=false camel.defaultthreadpool.poolsize=10 camel.defaultthreadpool.maxpoolsize=20 camel.defaultthreadpool.maxqueuesize=1000 camel.defaultthreadpool.keepaliveTime=60 camel.defaultthreadpool.rejectpolicy=CallerRuns - -#server.port=0 -#Camunda Process Engine DataSource connection Details -spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.camunda.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647 -spring.datasource.camunda.username=camunda -spring.datasource.camunda.password=e1bb2a8381d1aa6c09879bd627db3bb560ad29e8a3343fe6aa7e6a7ba622da4e -spring.datasource.camunda.validationQuery=SELECT 1 -spring.datasource.camunda.validationQueryTimeout=20000 -spring.datasource.camunda.validationInterval=30000 -spring.datasource.camunda.testWhileIdle = true -spring.datasource.camunda.minIdle = 0 -spring.datasource.camunda.initialSize=0 -# Automatically test whether a connection provided is good or not -spring.datasource.camunda.testOnBorrow=true -spring.datasource.camunda.ignoreExceptionOnPreLoad=true - -#Camunda application properties -#Camunda history level -camunda.bpm.history-level=auto -camunda.bpm.database.type=mariadb -camunda.bpm.database.schema-update=true +#camel.springboot.xmlRoutes = false +camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml +#camel.springboot.typeConversion = false #clds datasource connection details spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver diff --git a/src/main/resources/bpmn/clds-process-action.bpmn b/src/main/resources/bpmn/clds-process-action.bpmn deleted file mode 100644 index 11edc0714..000000000 --- a/src/main/resources/bpmn/clds-process-action.bpmn +++ /dev/null @@ -1,384 +0,0 @@ - - - - - - - - - ExclusiveGateway_2 - EndEvent_1 - insEvent - ExclusiveGateway_3 - sendOpPolicyReqDistribute - StartEvent_1 - ServiceTask_0x8ypxf - sendTcaReqDistribute - sendHolmesReqDistribute - - - sendTcaReqDelete - sendOpPolicyReqDelete - sendHolmesReqDelete - - - sendOpPolicyReqUpdate - sendTcaReqUpdate - sendHolmesReqUpdate - - - sendOpPolicyReqStop - - - sendOpPolicyReqRestart - - - - SequenceFlow_2 - SequenceFlow_4 - SequenceFlow_27 - SequenceFlow_29 - SequenceFlow_31 - SequenceFlow_15 - SequenceFlow_1xlfq66 - - - - - - SequenceFlow_16 - - - - - SENT - - - SequenceFlow_7 - SequenceFlow_16 - - - - SequenceFlow_10 - SequenceFlow_28 - SequenceFlow_30 - SequenceFlow_32 - SequenceFlow_6 - SequenceFlow_7 - - - - SequenceFlow_1tu9g11 - SequenceFlow_10 - - - - SequenceFlow_0ejpmee - SequenceFlow_28 - - - - - - - SequenceFlow_29 - SequenceFlow_30 - - - - - - - SequenceFlow_31 - SequenceFlow_32 - - - - - - - SequenceFlow_2 - - - - - - - - - - - - SequenceFlow_4 - SequenceFlow_1xlfq66 - SequenceFlow_0w39hon - - - - - SequenceFlow_15 - SequenceFlow_0tpegxf - - - - SequenceFlow_0w39hon - SequenceFlow_1rga27p - - - - SequenceFlow_1rga27p - SequenceFlow_1tu9g11 - - - SequenceFlow_1mtizad - SequenceFlow_6 - - - SequenceFlow_0tpegxf - SequenceFlow_1mtizad - - - - SequenceFlow_27 - SequenceFlow_1kegg6u - - - SequenceFlow_1kegg6u - SequenceFlow_0ejpmee - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/clds/camel/flexible-flow.xml b/src/main/resources/clds/camel/flexible-flow.xml new file mode 100644 index 000000000..7a3ebdb0a --- /dev/null +++ b/src/main/resources/clds/camel/flexible-flow.xml @@ -0,0 +1,36 @@ + + + + + + ${exchangeProperty.actionCd} == 'SUBMIT' || ${exchangeProperty.actionCd} == 'RESUBMIT' + + + + + + + ${exchangeProperty.actionCd} == 'DELETE' + + + + + + ${exchangeProperty.actionCd} == 'UPDATE' + + + + + + ${exchangeProperty.actionCd} == 'STOP' + + + + ${exchangeProperty.actionCd} == 'RESTART' + + + + + + + \ No newline at end of file diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties index 95ba919c8..09cb5c9ea 100644 --- a/src/main/resources/clds/clds-reference.properties +++ b/src/main/resources/clds/clds-reference.properties @@ -80,8 +80,8 @@ op.eNodeB.period=10s sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/ sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080 sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services -sdc.serviceUsername=test -sdc.servicePassword=aa2871669d793c7fb7abbcda31b88b4c29bf2982755b25f08f8d0130539c11b0 +sdc.serviceUsername=clamp +sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981 sdc.artifactLabel=blueprintclampcockpit sdc.sdcX-InstanceID=CLAMP sdc.artifactType=DCAE_INVENTORY_BLUEPRINT @@ -98,7 +98,7 @@ ui.alarm.default={"Reports a transient alarm condition when an incoming CDR cann action.test.override=false # if action.insert.test.event is true, then insert event even if the action is set to test action.insert.test.event=false -CLDS_SERVICE_CACHE_MAX_SECONDS=30 +clds.service.cache.invalidate.after.seconds=120 #DCAE Inventory Url Properties DCAE_INVENTORY_URL = http://dcae.api.simpledemo.onap.org:8080 diff --git a/src/main/resources/clds/clds-users.json b/src/main/resources/clds/clds-users.json index 5909e8e78..d2c06c808 100644 --- a/src/main/resources/clds/clds-users.json +++ b/src/main/resources/clds/clds-users.json @@ -7,8 +7,7 @@ "permission-type-cl|dev|update", "permission-type-cl-manage|dev|*", "permission-type-filter-vf|dev|*", - "permission-type-template|dev|read", - "permission-type-template|dev|update" + "permission-type-template|dev|read" ] }, { -- cgit 1.2.3-korg