From: Eddy Hautot <eh552t@intl.att.com>
Date: Tue, 24 Apr 2018 16:10:08 +0000 (+0000)
Subject: Merge changes I09044986,Ib63b98f1,Ib974f943
X-Git-Tag: 6.0.0~11^2~771
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e265dec047435408d2349e9f101349bcfbd3ef6c;p=policy%2Fclamp.git

Merge changes I09044986,Ib63b98f1,Ib974f943

* changes:
  Remove eNodeB
  Remove enodeB code
  Remove bad test
---

e265dec047435408d2349e9f101349bcfbd3ef6c
diff --cc src/main/resources/application.properties
index c1c01161f,457ddbd44..2ff9205dc
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@@ -168,22 -168,11 +168,11 @@@ clamp.config.op.operationTopic=APPC-C
  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:8085/sdc/v1/catalog/
 -clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8085
 -clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8085/sdc/v1/catalog/services
 +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