diff options
author | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2018-02-14 15:31:55 +0100 |
---|---|---|
committer | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2018-02-14 15:31:55 +0100 |
commit | 7c083746477e46a662ce3eb2664a050a210d971f (patch) | |
tree | e25ceb4b93be421155c6c3a15f2f785311b87626 /src/main/resources/clds | |
parent | 9ebb9c1aa320e49c581ba1a66202cc2f2bda0c5a (diff) |
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) <sd378r@intl.att.com>
Diffstat (limited to 'src/main/resources/clds')
-rw-r--r-- | src/main/resources/clds/camel/flexible-flow.xml | 36 | ||||
-rw-r--r-- | src/main/resources/clds/clds-reference.properties | 6 | ||||
-rw-r--r-- | src/main/resources/clds/clds-users.json | 3 |
3 files changed, 40 insertions, 5 deletions
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 00000000..7a3ebdb0 --- /dev/null +++ b/src/main/resources/clds/camel/flexible-flow.xml @@ -0,0 +1,36 @@ +<routes xmlns="http://camel.apache.org/schema/spring"> + <route id="submit"> + <from uri="direct:processSubmit" /> + <choice> + <when> + <simple> ${exchangeProperty.actionCd} == 'SUBMIT' || ${exchangeProperty.actionCd} == 'RESUBMIT'</simple> + <to uri="bean:org.onap.clamp.clds.client.SdcSendReqDelegate" /> + <to uri="bean:org.onap.clamp.clds.client.TcaPolicyDelegate" /> + <to uri="bean:org.onap.clamp.clds.client.HolmesPolicyDelegate" /> + <to uri="bean:org.onap.clamp.clds.client.OperationalPolicyDelegate" /> + </when> + <when> + <simple> ${exchangeProperty.actionCd} == 'DELETE'</simple> + <to uri="bean:org.onap.clamp.clds.client.TcaPolicyDeleteDelegate" /> + <to uri="bean:org.onap.clamp.clds.client.HolmesPolicyDeleteDelegate" /> + <to uri="bean:org.onap.clamp.clds.client.OperationalPolicyDeleteDelegate" /> + </when> + <when> + <simple> ${exchangeProperty.actionCd} == 'UPDATE'</simple> + <to uri="bean:org.onap.clamp.clds.client.TcaPolicyDelegate" /> + <to uri="bean:org.onap.clamp.clds.client.HolmesPolicyDelegate" /> + <to uri="bean:org.onap.clamp.clds.client.OperationalPolicyDelegate" /> + </when> + <when> + <simple> ${exchangeProperty.actionCd} == 'STOP'</simple> + <to uri="bean:org.onap.clamp.clds.client.OperationalPolicyDeleteDelegate" /> + </when> + <when> + <simple> ${exchangeProperty.actionCd} == 'RESTART'</simple> + <to uri="bean:org.onap.clamp.clds.client.OperationalPolicyDelegate" /> + </when> + </choice> + <to uri="bean:org.onap.clamp.clds.client.CldsEventDelegate" /> + </route> + +</routes>
\ 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 95ba919c..09cb5c9e 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 5909e8e7..d2c06c80 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" ] }, { |