From: Sébastien Determe <sd378r@intl.att.com>
Date: Wed, 25 Apr 2018 09:13:26 +0000 (+0000)
Subject: Merge "Fix nexus iq issues"
X-Git-Tag: v2.0.0~34
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=879691ba309eb305c4dd24dc3d0b2c091a8a118c;hp=4e2bcb267c9101fdfd7e9b53950c2c95a2d9b495;p=clamp.git

Merge "Fix nexus iq issues"
---

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ec053e02..aa928207 100644
--- 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
 #
 #
 # Configuration Settings for Policy Engine Components
-clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123
-clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8085/pdp/ , testpdp, alpha123
-clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8085/pap/ , testpap, alpha123
+clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
+clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
+clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123
 clamp.config.policy.notificationType=websocket
 clamp.config.policy.notificationUebServers=localhost
 clamp.config.policy.notificationTopic=
@@ -170,9 +170,9 @@ clamp.config.op.controller=amsterdam
 clamp.config.op.policy.appc=APPC
 #
 # 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
@@ -196,12 +196,12 @@ 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:8085
+clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080
 clamp.config.dcae.intentory.retry.interval=10000
 clamp.config.dcae.intentory.retry.limit=3
 
 #DCAE Dispatcher Url Properties
-clamp.config.dcae.dispatcher.url=http://dcae.api.simpledemo.onap.org:8085
+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 !
diff --git a/src/main/resources/clds/templates/tca-policy-template.json b/src/main/resources/clds/templates/tca-policy-template.json
index f91f2399..575d1707 100644
--- 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 275b6a4c..559aacb2 100644
--- 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 6b273073..18eec888 100644
--- 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",