Merge changes I09044986,Ib63b98f1,Ib974f943

* changes:
  Remove eNodeB
  Remove enodeB code
  Remove bad test

diff --combined src/main/resources/application.properties
index c1c0116,457ddbd..2ff9205
--- 1/src/main/resources/application.properties
--- 2/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@@ -125,9 -125,9 +125,9 @@@ clamp.config.sdc.decode.service_ids=cla
  #\r
  #\r
  # Configuration Settings for Policy Engine Components\r
 -clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123\r
 -clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123\r
 -clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8085/pap/ , testpap, alpha123\r
 +clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
 +clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123\r
 +clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123\r
  clamp.config.policy.notificationType=websocket\r
  clamp.config.policy.notificationUebServers=localhost\r
  clamp.config.policy.notificationTopic=\r
@@@ -168,22 -168,11 +168,11 @@@ clamp.config.op.operationTopic=APPC-C
  clamp.config.op.notificationTopic=POLICY-CL-MGT\r
  clamp.config.op.controller=amsterdam\r
  clamp.config.op.policy.appc=APPC\r
- # by service: vSCP\r
- clamp.config.op.templateName.vSCP=ClosedLoopTemplate\r
- clamp.config.op.controller.vSCP=1607-f5fw\r
- clamp.config.op.eNodeB.templateName=ClosedLoopControlName\r
- clamp.config.op.eNodeB.operationTopic=com.onap.sdnr.RanCLRequest-v00\r
- clamp.config.op.eNodeB.notificationTopic=com.onap-policy.IST-ENODEB-CL\r
- clamp.config.op.eNodeB.controller=amsterdam\r
- clamp.config.op.eNodeB.recipe=classpath:/clds/templates/op-eNodeB-recipe.json\r
- clamp.config.op.eNodeB.timeWindow=35\r
- clamp.config.op.eNodeB.limit=2\r
- clamp.config.op.eNodeB.period=10s\r
  #\r
  # Sdc service properties\r
 -clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8085/sdc/v1/catalog/\r
 -clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8085\r
 -clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8085/sdc/v1/catalog/services\r
 +clamp.config.sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/\r
 +clamp.config.sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080\r
 +clamp.config.sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services\r
  clamp.config.sdc.serviceUsername=clamp\r
  clamp.config.sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981\r
  clamp.config.sdc.artifactLabel=blueprintclampcockpit\r
@@@ -207,12 -196,12 +196,12 @@@ clamp.config.action.insert.test.event=f
  clamp.config.clds.service.cache.invalidate.after.seconds=120\r
  \r
  #DCAE Inventory Url Properties\r
 -clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8085\r
 +clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080\r
  clamp.config.dcae.intentory.retry.interval=10000\r
  clamp.config.dcae.intentory.retry.limit=3\r
  \r
  #DCAE Dispatcher Url Properties\r
 -clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8085\r
 +clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8080\r
  clamp.config.dcae.header.requestId = X-ECOMP-RequestID\r
  \r
  #Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !\r