Merge changes Ib3c339b2,I47888da8,Ifdc5a4d9,I2f7b7417,If10e2dff, ...

* changes:
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers
  Remove ECOMP in headers

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ec053e0..aa92820 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -125,9 +125,9 @@ clamp.config.sdc.decode.service_ids=classpath:/clds/templates/sdc-decode-service
 #\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
@@ -170,9 +170,9 @@ clamp.config.op.controller=amsterdam
 clamp.config.op.policy.appc=APPC\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
@@ -196,12 +196,12 @@ clamp.config.action.insert.test.event=false
 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

diff --git a/src/main/resources/clds/templates/tca-policy-template.json b/src/main/resources/clds/templates/tca-policy-template.json
index f91f239..575d170 100644 (file)
--- a/src/main/resources/clds/templates/tca-policy-template.json
+++ b/src/main/resources/clds/templates/tca-policy-template.json
@@ -4,6 +4,7 @@
        "location": "SampleServiceLocation",
        "configName": "SampleConfigName",
        "uuid": "test",
+       "policyScope":"CLAMP",
        "templateVersion": "OpenSource.version.1",
        "policyName": "???",
        "description": "MicroService Policy",

diff --git a/src/test/resources/clds/templates/tca-policy-template.json b/src/test/resources/clds/templates/tca-policy-template.json
index 275b6a4..559aacb 100644 (file)
--- a/src/test/resources/clds/templates/tca-policy-template.json
+++ b/src/test/resources/clds/templates/tca-policy-template.json
@@ -4,6 +4,7 @@
        "location": "SampleServiceLocation",
        "configName": "SampleConfigName",
        "uuid": "test",
+       "policyScope": "CLAMP",
        "templateVersion": "OpenSource.version.1",
        "policyName": "MicroService",
        "description": "MicroService Policy",

diff --git a/src/test/resources/example/tca-policy-req/tca-policy-expected.json b/src/test/resources/example/tca-policy-req/tca-policy-expected.json
index 6b27307..18eec88 100644 (file)
--- a/src/test/resources/example/tca-policy-req/tca-policy-expected.json
+++ b/src/test/resources/example/tca-policy-req/tca-policy-expected.json
@@ -4,6 +4,7 @@
   "location": "SampleServiceLocation",
   "configName": "SampleConfigName",
   "uuid": "test",
+  "policyScope": "CLAMP",
   "templateVersion": "OpenSource.version.1",
   "policyName": "example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4",
   "description": "MicroService Policy",