From 1fc37da6ed8e76a134aa3c34e25a0bf0fe52cbb0 Mon Sep 17 00:00:00 2001 From: eh552t Date: Thu, 31 Aug 2017 15:22:00 +0200 Subject: Change configuration for Clamp integration Put default configuration for clamp integration directly in the properties files Change-Id: Id945159720e5e5cfbc7ddd44f8d31c6f5c6361a0 Signed-off-by: eh552t Issue-Id: CLAMP-47 --- src/main/resources/application.properties | 8 ++--- .../resources/clds/clds-policy-config.properties | 22 ++++++------- src/main/resources/clds/clds-reference.properties | 36 +++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/main') diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9ed7c6ede..d10b4f422 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -27,16 +27,16 @@ info.build.description=@project.description@ info.build.version=@project.version@ ### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time). -### (See below for the parameter 'server.http.port' if you want to have both enabled) +### (See below for the parameter 'server.http.port' if you want to have both enabled) ### To have only HTTP, keep the lines server.ssl.* commented ### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location server.port=8080 -### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port') +### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port') #server.ssl.key-store=file:/tmp/mykey.jks #server.ssl.key-store-password=pass #server.ssl.key-password=pass -### In order to be user friendly when HTTPS is enabled, +### In order to be user friendly when HTTPS is enabled, ### you can add another HTTP port that will be automatically redirected to HTTPS ### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...) #server.http-to-https-redirection.port=8090 @@ -128,7 +128,7 @@ async.core.pool.size=10 async.max.pool.size=20 async.queue.capacity=500 -org.onap.clamp.config.dcae.url=http://localhost:9000/closedloop-dcae-services +org.onap.clamp.config.dcae.url=http://dcae.api.simpledemo.openecomp.org:9000/closedloop-dcae-services #GRM Edge endpoint details service.name=ajsc6camundademo diff --git a/src/main/resources/clds/clds-policy-config.properties b/src/main/resources/clds/clds-policy-config.properties index 969410761..fa2634be2 100644 --- a/src/main/resources/clds/clds-policy-config.properties +++ b/src/main/resources/clds/clds-policy-config.properties @@ -5,25 +5,25 @@ # Copyright (C) 2017 AT&T Intellectual Property. All rights # reserved. # ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END============================================ # =================================================================== # ECOMP is a trademark and service mark of AT&T Intellectual Property. ### # Configuration Settings for Policy Engine Components -PDP_URL1=https://localhost:8081/pdp/ , testpdp, alpha123 -PDP_URL2=https://localhost:8081/pdp/ , testpdp, alpha456 -PAP_URL=https://localhost:8081/pap/ , testpap, alpha123 +PDP_URL1=https://vm1.policy.simpledemo.openecomp.org:8081/pdp/ , testpdp, alpha123 +PDP_URL2=https://vm1.policy.simpledemo.openecomp.org:8081/pdp/ , testpdp, alpha456 +PAP_URL=https://vm1.policy.simpledemo.openecomp.org:8081/pap/ , testpap, alpha123 NOTIFICATION_TYPE=websocket NOTIFICATION_UEB_SERVERS=localhost NOTIFICATION_TOPIC= diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties index e9718e483..df29279c9 100644 --- a/src/main/resources/clds/clds-reference.properties +++ b/src/main/resources/clds/clds-reference.properties @@ -5,23 +5,23 @@ # Copyright (C) 2017 AT&T Intellectual Property. All rights # reserved. # ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END============================================ # =================================================================== # ECOMP is a trademark and service mark of AT&T Intellectual Property. ### -# +# # Poperties for CLDS # # @@ -34,7 +34,7 @@ dcae.decode.service_ids={"vUSP":["vUSP - vCTS"],"Trinity":["ASBGv TLS VNF","ASBG # sdc.template={} sdc.decode.service_ids={} -# +# # # General Policy request properties # @@ -49,7 +49,7 @@ policy.op.policyNamePrefix=Config_BRMS_Param_ # tca.template={"service":"MThresholdCrossingConfiguration","location":"Edge","uuid":"TestUUID","policyName":"???","description":"from clds","configName":"MThresholdCrossingConfiguration","templateVersion":"5.2.0.1","priority":"4","version":"5.2.0.1","policyScope":"resource=F5,service=vSCP,type=configuration,closedLoopControlName=vSCP_F5_Firewall_d925ed73-8231-4d02-9545-db4e101f88f8","content":{"$class": "com.att.ecomp.dcae.clamp.common.MThresholdCrossingConfiguration","domain":"measurementsForVfScaling","policyScope":"pnf=eNodeB;type=configuration","policyName":"policy.dcae.configuration","policyVersion":"1.0.0","subscriberContentType": "application/json","subscriberConsumerId": "c13","subscriberConsumerGroup": "OpenDCAE-c13","subscriberTimeoutMS": "-1","subscriberMessageLimit": "-1","subscriberPollingInterval": "20000","publisherContentType": "application/json","publisherMaxBatchSize": "10","publisherMaxRecoveryQueueSize": "100000","publisherPollingInterval": "20000","publisherAlertWindowingTime": "86400","signatures":[]}} tca.signature.template={"nfNamingCode":"ENBE","target":"common_id","targetType":"eNodeB","useCaseName":"???","signatureName":"???","signatureUuid":"???","closedLoopControlName":"???","severity":"???","version":"1.0.2","maxInterval":1200,"minMessageViolations":4,"thresholds":[]} -# +# # String Match MicroService Policy request build properties # # default @@ -62,8 +62,8 @@ sm.sc.template={} sm.rulegroup=true # by service: vSCP sm.rulegroup.vSCP=false -# -# +# +# # Operational Policy request build properties # op.policyDescription=from clds @@ -86,9 +86,9 @@ op.eNodeB.limit=2 op.eNodeB.period=10s # # Sdc service properties -sdc.catalog.url=http://127.0.0.1:8080/sdc/v1/catalog/ -sdc.hostUrl=http://127.0.0.1:8080 -sdc.serviceUrl=http://127.0.0.1:8080/sdc/v1/catalog/services +sdc.catalog.url=http://sdc.api.simpledemo.openecomp.org:8080/sdc/v1/catalog/ +sdc.hostUrl=http://sdc.api.simpledemo.openecomp.org:8080 +sdc.serviceUrl=http://sdc.api.simpledemo.openecomp.org:8080/sdc/v1/catalog/services sdc.serviceUsername=test sdc.servicePassword=123456 sdc.artifactLabel=blueprintclampcockpit @@ -110,8 +110,8 @@ action.insert.test.event=false CLDS_SERVICE_CACHE_MAX_SECONDS=5 #DCAE Inventory Url Properties -DCAE_INVENTORY_URL = https://127.0.0.1:8080 +DCAE_INVENTORY_URL = https://dcae.api.simpledemo.openecomp.org:8080 #DCAE Dispatcher Url Properties -DCAE_DISPATCHER_URL = https://127.0.0.1:8443 +DCAE_DISPATCHER_URL = https://dcae.api.simpledemo.openecomp.org:8443 -- cgit 1.2.3-korg