Remove the clds-reference.properties

Remove clds-reference.properties and merge it into
application.properties

Issue-ID: CLAMP-136
Change-Id: I8dc6deffdca47dc50d1473ccbe9a94dc91d7d5d9
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

2 files changed, 89 insertions, 115 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2ac53e0b3..8c8b1968f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -106,17 +106,99 @@ async.core.pool.size=10
 async.max.pool.size=20

 async.queue.capacity=500

 

-org.onap.clamp.config.files.cldsReference=classpath:/clds/clds-reference.properties

 org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties

 org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json

 org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties

 org.onap.clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json

 

+# Properties for Clamp

+# DCAE request build properties

+#

+clamp.config.dcae.template=classpath:/clds/templates/dcae-template.json

+clamp.config.dcae.decode.service_ids=classpath:/clds/templates/dcae-decode-service_ids.json

+clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment-template.json

+#

+# SDC request blueprint properties

+#

+clamp.config.sdc.template=classpath:/clds/templates/sdc-template.json

+clamp.config.sdc.decode.service_ids=classpath:/clds/templates/sdc-decode-service_ids.json

+#

+#

+# General Policy request properties

+#

+clamp.config.policy.onap.name=DCAE

+clamp.config.policy.pdp.group=default

+clamp.config.policy.ms.type=MicroService

+clamp.config.policy.ms.policyNamePrefix=Config_MS_

+clamp.config.policy.op.type=BRMS_Param

+clamp.config.policy.op.policyNamePrefix=Config_BRMS_Param_

+

+# TCA MicroService Policy request build properties

+#

+clamp.config.tca.policyid.prefix=DCAE.Config_

+clamp.config.tca.policy.template=classpath:/clds/templates/tca-policy-template.json

+clamp.config.tca.template=classpath:/clds/templates/tca-template.json

+clamp.config.tca.thresholds.template=classpath:/clds/templates/tca-thresholds-template.json

+

+#

+#

+# Operational Policy request build properties

+#

+clamp.config.op.policyDescription=from clds

+# default

+clamp.config.op.templateName=ClosedLoopvUSP

+clamp.config.op.operationTopic=APPC-CL

+clamp.config.op.notificationTopic=POLICY-CL-MGT

+clamp.config.op.controller=amsterdam

+clamp.config.op.policy.appc=APPC

+# by service: vSCP

+clamp.config.op.templateName.vSCP=ClosedLoopTemplate

+clamp.config.op.controller.vSCP=1607-f5fw

+clamp.config.op.eNodeB.templateName=ClosedLoopControlName

+clamp.config.op.eNodeB.operationTopic=com.onap.sdnr.RanCLRequest-v00

+clamp.config.op.eNodeB.notificationTopic=com.onap-policy.IST-ENODEB-CL

+clamp.config.op.eNodeB.controller=amsterdam

+clamp.config.op.eNodeB.recipe=classpath:/clds/templates/op-eNodeB-recipe.json

+clamp.config.op.eNodeB.timeWindow=35

+clamp.config.op.eNodeB.limit=2

+clamp.config.op.eNodeB.period=10s

+#

+# Sdc service properties

+clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/

+clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080

+clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services

+clamp.config.sdc.serviceUsername=clamp

+clamp.config.sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981

+clamp.config.sdc.artifactLabel=blueprintclampcockpit

+clamp.config.sdc.sdcX-InstanceID=CLAMP

+clamp.config.sdc.artifactType=DCAE_INVENTORY_BLUEPRINT

+clamp.config.sdc.locationArtifactLabel=locationclampcockpit

+clamp.config.sdc.locationArtifactType=DCAE_INVENTORY_JSON

+clamp.config.sdc.InstanceID=X-ECOMP-InstanceID

+clamp.config.sdc.header.requestId = X-ECOMP-RequestID

+#

+#

+clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json

+clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json

+#

+# if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request

+clamp.config.action.test.override=false

+# if action.insert.test.event is true, then insert event even if the action is set to test

+clamp.config.action.insert.test.event=false

+clamp.config.clds.service.cache.invalidate.after.seconds=120

+

+#DCAE Inventory Url Properties

+clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080

+

+#DCAE Dispatcher Url Properties

+clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080

+clamp.config.dcae.header.requestId = X-ECOMP-RequestID

+

 #Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !

-CLDS_PERMISSION_TYPE_CL=permission-type-cl

-CLDS_PERMISSION_TYPE_CL_MANAGE=permission-type-cl-manage

-CLDS_PERMISSION_TYPE_CL_EVENT=permission-type-cl-event

-CLDS_PERMISSION_TYPE_FILTER_VF=permission-type-filter-vf

-CLDS_PERMISSION_TYPE_TEMPLATE=permission-type-template

+clamp.config.security.permission.type.cl=permission-type-cl

+clamp.config.security.permission.type.cl.manage=permission-type-cl-manage

+clamp.config.security.permission.type.cl.event=permission-type-cl-event

+clamp.config.security.permission.type.filter.vf=permission-type-filter-vf

+clamp.config.security.permission.type.template=permission-type-template

 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties

-CLDS_PERMISSION_INSTANCE=dev
\ No newline at end of file
+clamp.config.security.permission.instance=dev
\ No newline at end of file
diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties
deleted file mode 100644
index 3716a29dc..000000000
--- a/src/main/resources/clds/clds-reference.properties
+++ /dev/null
@@ -1,108 +0,0 @@
-###

-# ============LICENSE_START=======================================================

-# ONAP CLAMP

-# ================================================================================

-# Copyright (C) 2017-2018 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.

-# 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

-# limitations under the License.

-# ============LICENSE_END============================================

-# ===================================================================

-# ECOMP is a trademark and service mark of AT&T Intellectual Property.

-###

-

-#

-# Poperties for CLDS

-#

-#

-# DCAE request build properties

-#

-dcae.template=classpath:/clds/templates/dcae-template.json

-dcae.decode.service_ids=classpath:/clds/templates/dcae-decode-service_ids.json

-dcae.deployment.template=classpath:/clds/templates/dcae-deployment-template.json

-#

-# SDC request blueprint properties

-#

-sdc.template=classpath:/clds/templates/sdc-template.json

-sdc.decode.service_ids=classpath:/clds/templates/sdc-decode-service_ids.json

-#

-#

-# General Policy request properties

-#

-policy.onap.name=DCAE

-policy.pdp.group=default

-policy.ms.type=MicroService

-policy.ms.policyNamePrefix=Config_MS_

-policy.op.type=BRMS_Param

-policy.op.policyNamePrefix=Config_BRMS_Param_

-

-# TCA MicroService Policy request build properties

-#

-tca.policyid.prefix=DCAE.Config_

-tca.policy.template=classpath:/clds/templates/tca-policy-template.json

-tca.template=classpath:/clds/templates/tca-template.json

-tca.thresholds.template=classpath:/clds/templates/tca-thresholds-template.json

-

-#

-#

-# Operational Policy request build properties

-#

-op.policyDescription=from clds

-# default

-op.templateName=ClosedLoopvUSP

-op.operationTopic=APPC-CL

-op.notificationTopic=POLICY-CL-MGT

-op.controller=amsterdam

-op.policy.appc=APPC

-# by service: vSCP

-op.templateName.vSCP=ClosedLoopTemplate

-op.controller.vSCP=1607-f5fw

-op.eNodeB.templateName=ClosedLoopControlName

-op.eNodeB.operationTopic=com.onap.sdnr.RanCLRequest-v00

-op.eNodeB.notificationTopic=com.onap-policy.IST-ENODEB-CL

-op.eNodeB.controller=amsterdam

-op.eNodeB.recipe=classpath:/clds/templates/op-eNodeB-recipe.json

-op.eNodeB.timeWindow=35

-op.eNodeB.limit=2

-op.eNodeB.period=10s

-#

-# Sdc service properties

-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=clamp

-sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981

-sdc.artifactLabel=blueprintclampcockpit

-sdc.sdcX-InstanceID=CLAMP

-sdc.artifactType=DCAE_INVENTORY_BLUEPRINT

-sdc.locationArtifactLabel=locationclampcockpit

-sdc.locationArtifactType=DCAE_INVENTORY_JSON

-sdc.InstanceID=X-ECOMP-InstanceID

-sdc.header.requestId = X-ECOMP-RequestID

-#

-#

-ui.location.default=classpath:/clds/templates/ui-location-default.json

-ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json

-#

-# if action.test.override is true, then any action will be marked as test=true (even if incoming action request had test=false); otherwise, test flag will be unchanged on the action request

-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.invalidate.after.seconds=120

-

-#DCAE Inventory Url Properties

-dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080
-

-#DCAE Dispatcher Url Properties

-dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080

-dcae.header.requestId = X-ECOMP-RequestID