From 34400eeebc299cbf8e4335a7bee937753554bed5 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Thu, 16 Nov 2017 13:22:49 +0100 Subject: Rework CryptoUtils CryptoUtils now takes the key from a file located in the resource not in spring file Change-Id: I002978d292550e6173efb4324cbb977f35d7e753 Issue-ID: CLAMP-74 Signed-off-by: Determe, Sebastien (sd378r) --- src/main/resources/clds/clds-policy-config.properties | 4 +++- src/main/resources/clds/clds-reference.properties | 7 ++++--- src/main/resources/clds/key.properties | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/clds/key.properties (limited to 'src/main/resources/clds') diff --git a/src/main/resources/clds/clds-policy-config.properties b/src/main/resources/clds/clds-policy-config.properties index b812ffa70..54b927727 100644 --- a/src/main/resources/clds/clds-policy-config.properties +++ b/src/main/resources/clds/clds-policy-config.properties @@ -20,6 +20,7 @@ # =================================================================== # ECOMP is a trademark and service mark of AT&T Intellectual Property. ### + # Configuration Settings for Policy Engine Components PDP_URL1=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 PDP_URL2=http://vm1.policy.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 @@ -28,7 +29,8 @@ NOTIFICATION_UEB_SERVERS=localhost NOTIFICATION_TOPIC= CLIENT_ID=myclientid # base64 encoding -CLIENT_KEY=ChlakDuk +#CLIENT_KEY=ChlakDuk +CLIENT_KEY=5CE79532B3A2CB4D132FC0C04BF916A7 #DEVL for development #TEST for Test environments #PROD for prod environments diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties index 72308a94a..a8382cb0a 100644 --- a/src/main/resources/clds/clds-reference.properties +++ b/src/main/resources/clds/clds-reference.properties @@ -81,14 +81,14 @@ 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=test -sdc.servicePassword=A7CADD84A22398C980847A54D23E24E9 +sdc.servicePassword=aa2871669d793c7fb7abbcda31b88b4c29bf2982755b25f08f8d0130539c11b0 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={"DC1":"Data Center 1","DC2":"Data Center 2","DC3":"Data Center 3"} @@ -104,5 +104,6 @@ CLDS_SERVICE_CACHE_MAX_SECONDS=30 DCAE_INVENTORY_URL = https://dcae.api.simpledemo.onap.org:8080 #DCAE Dispatcher Url Properties -DCAE_DISPATCHER_URL = https://dcae.api.simpledemo.onap.org:8443 +DCAE_DISPATCHER_URL = https://dcae.api.simpledemo.onap.org:8443 +dcae.header.requestId = "X-ECOMP-RequestID" diff --git a/src/main/resources/clds/key.properties b/src/main/resources/clds/key.properties new file mode 100644 index 000000000..dda811040 --- /dev/null +++ b/src/main/resources/clds/key.properties @@ -0,0 +1 @@ +org.onap.clamp.encryption.aes.key=aa3871669d893c7fb8abbcda31b88b4f \ No newline at end of file -- cgit 1.2.3-korg