From 648f099dd6c0a4b6d91f194258e646204441dc0c Mon Sep 17 00:00:00 2001 From: ChrisC Date: Fri, 22 Mar 2019 12:46:57 +0100 Subject: [PATCH] Fix casablanca certs Adding new certs for Casablanca (expiry is march 21st 2020) Issue-ID: CLAMP-335 Change-Id: I47935d0ff18441b9f0fedff4ee7dc88a38570e54 Signed-off-by: ChrisC --- docs/index.rst | 10 ++-- docs/release-notes.rst | 25 ++++++++-- pom.xml | 4 +- src/main/resources/application.properties | 6 +-- src/main/resources/clds/aaf/org.onap.clamp.keyfile | 54 ++++++++++----------- src/main/resources/clds/aaf/org.onap.clamp.p12 | Bin 3982 -> 4107 bytes src/main/resources/clds/aaf/truststoreONAPall.jks | Bin 114865 -> 117990 bytes version.properties | 20 ++++---- 8 files changed, 67 insertions(+), 52 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 677c32b1..0a465ab8 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,6 +1,6 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +.. Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved. CLAMP - Closed Loop Automation Management Platform ================================================== @@ -173,8 +173,8 @@ This file is a JSON that must be specified to Spring config, here is an example: Multiple controllers can be configured so that Clamp is able to receive the notifications from different SDC servers. Each Clamp existing in a cluster should have different consumerGroup and consumerId so that they can each consume the SDC notification. -The environmentName is normally the Dmaap Topic used by SDC. -If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) +The environmentName is normally the Dmaap Topic used by SDC. +If the sdcAddress is not specified or not available (connection failure) the messageBusAddresses will be used (Dmaap servers) Administration -------------- @@ -189,7 +189,7 @@ For OOM, the URL is https://:30258/designer/index.html Default password : password - With AAF enabled, the certificate p12 must be added to the browser - ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "China in the Spring" + ca path: src/main/resources/clds/aaf/org.onap.clamp.p12, password "pZ[![d{HI69azXF3dqXQoE)8" Or get it from this page : https://wiki.onap.org/display/DW/Control+Loop+Flows+and+Models+for+Casablanca Human Interfaces @@ -198,7 +198,7 @@ Human Interfaces User Interface (CLAMP Designer) - serve to configure control loop CLAMP UI is used to configure the Control Loop designed and distributed by SDC. From that UI it's possible to distribute the configuration policies and control the life-cycle of the DCAE Micro Services. - + The following actions are done using the UI: * Design a control loop flow by selecting a predefined template from a list diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 11ecb70f..21d1d8ba 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,10 +1,25 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 -.. Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +.. Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved. Release Notes ============= +Version: 3.0.4 - maintenance release +------------------------------------ + +:Release Date: 2019-04-06 + +**New Features** +none + +**Bug Fixes** +none + +**Known Issues** +CLAMP certificates have been renewed to extend their expiry dates + - `CLAMP-335 `_ Update Certificates on Casablanca release. + Version: 3.0.3 - maintenance release ------------------------------------ @@ -18,7 +33,7 @@ none none **Known Issues** -one documentation issue was fixed, this issue does not require a new docker image: +one documentation issue was fixed, this issue does not require a new docker image: - `CLAMP-257 `_ User Manual for CLAMP : nothing on readthedocs. Version: 3.0.3 @@ -51,7 +66,7 @@ The main goal of the Casablanca release was to: **Security Notes** -CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. +CLAMP code has been formally scanned during build time using NexusIQ and all Critical vulnerabilities have been addressed, items that remain open have been assessed for risk and actions to be taken in future release. The CLAMP open Critical security vulnerabilities and their risk assessment have been documented as part of the `project `_. Quick Links: @@ -116,9 +131,9 @@ CLAMP code has been formally scanned during build time using NexusIQ and all Cri Quick Links: - `CLAMP project page `_ - + - `Passing Badge information for CLAMP `_ - + - `Project Vulnerability Review Table for CLAMP `_ **Upgrade Notes** diff --git a/pom.xml b/pom.xml index 480f83cf..d2f45218 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP CLAMP ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights + Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ 4.0.0 org.onap.clamp clds - 3.0.3-SNAPSHOT + 3.0.4-SNAPSHOT clamp diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 263c09d3..98631c51 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP CLAMP # ================================================================================ -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights +# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights # reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -58,8 +58,8 @@ server.port=8443 ## Config part for Server certificates # Can be a classpath parameter instead of file:/ server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12 -server.ssl.key-store-password=China in the Spring -server.ssl.key-password=China in the Spring +server.ssl.key-store-password=pZ[![d{HI69azXF3dqXQoE)8 +server.ssl.key-password=pZ[![d{HI69azXF3dqXQoE)8 server.ssl.key-store-type=PKCS12 server.ssl.key-alias=clamp@clamp.onap.org diff --git a/src/main/resources/clds/aaf/org.onap.clamp.keyfile b/src/main/resources/clds/aaf/org.onap.clamp.keyfile index 45cdcb60..9363f1db 100644 --- a/src/main/resources/clds/aaf/org.onap.clamp.keyfile +++ b/src/main/resources/clds/aaf/org.onap.clamp.keyfile @@ -1,27 +1,27 @@ -HTQLJHUg5Du0VM7wHY5cBMTgupk6ujhSoAgx5BTHp9wt9CoWvD72ScIciyldEH9R2QZIL9ZvpVo0 -h2o-hSQueaVjPcIFUhVIl4HWmNC6I2YAlNkwy3VMl1g9otKaOTgo3ChsFUVq7ACIrcr2977wo4B_ -FeHa0lInuaLoEjHMP1fszTWYBBx9oY3K9s-9MQQyCo6bFV-4L733sPeE60j20FWoygUwvIqxp3Pc -Bmnm1AtcrhGH0elqDg9qNjmnmC3gxZaGpGiclaEds_lVu57RIXwtTHgYyMbJzfP-Ziq3T7i8d-h3 -JZThj1l9JvDLYm2z0BEXuQ3Owvn4m98cWB9P5esJOKYEvsfIGK_Fd6uT04fzkeDT1wNV4-Swuorr -ymZQxnvHbUAp91NJEa3EtWTuBxNeoqV0cw97WkAYn95pgjH4ZVhBdczclS-EStFJyYOHtTRAs1A_ -8i36GiuUPHn3KolkRF2GvtZfwNj5AYfcUKhqULJ-T_is2KKYnGwQ2iaItX2852o4zlzkMXFMkt5C -qbsDmrU7F5zxn4HG6yShW5sIXgAcS9cyIs8IFgHtkYauDJlKZWynhzqibh3-bzPyfFmreTHxQ-Av -Lgp5sAtf1B9_1feVyE78bmQ3IMtxE-YkV8RYPDJzKw0nIdjce7j89azNq_as5JMfCCHSlYcKRs8O -Nrh8gXYun28iUL_kwEUWK0WohPgwQBb46_Hkc6a0aSYbuFA_7qgprPB9wmAlHtuqnCAb2vk8GT-h -07DB6yPGgzE-OgXUzLIWHXVzPO6SjOg3ifYpCRigOsNqkV1paBBOzje7dn2RnpgaRJS3zupTMnqF -g5N9qCgubxRlII626-Dc_i5X1OAWPzJK8UZPuxRAg3YVJNHluB3O0Q2Uo14RkO3a2Tn_Ce9XoTUJ -Jqi_qZWytIB9sHMNM7KvcRxGedLqd_230O3zV7rTa4Up0BFoMyHmnf2SZu96x_Yz_n_AWhiaALvE -ON_nTxPEOHfEfrNzo7pCwIaI5gM6eu_S24aZTf4L-5tekqH7l1PEbKr2QP4XfTZBN4FgNExgGpzG -the3zv4k7hJeWe7GbtMmnZXIQUJkZVTHBwqvHkqtN9cBWpihCNVmI3zKq6Bsy6Us0SDZ686kpeVS -s9eyrzj6uLPE65mQxCpoMt6G4HSjzMqA3HOX_7ixBBhtdVi5-X7NeTigr-uaZg67yP3cSikfFf9w -dyFuMjg29jtlaTNzOov8HFrcLq01N3fpwDkSU_2TmLndU-FMat78CMCLW5QuS1KF3hC9T8wzKWS_ -WHK2oMA3SqWyqnj_cE_T4Ql_VKL3nkvf_bzTvLso_BWodUw2A-eO-1qjtCHp3nnTdSVH06E3_eRH -BuKWEt0MLyNpm88OD0tgOC3fn7casioynQLoFatta5nlQfj4nsAXj2bD6CrohtDhjOKXqHxDU6s7 -adtNoBGyEK5FKy3HtHMC7KXsK_6wbYUluz93nCNMok696HIHojNUydGFqfr2HluQTi0S3uHnD_pS --QM8DbsFi8oIztn6Er4CFFJQ-tUuDyX6ahfY5gWLqCgRM7RzrkoHY7b4vkHxZTBLZlPGWfRtG0vc -GTSqIRNI2Z_Zte5-wW7T9vfFVBsArF0SJWOrlUqf7fGN1_2H9B9aIpLEMaHF7EEp1OP6_SNnfuhB -K31EFy0VW0eGnLezpd3HT540kznub7h_m6phZaqeZJxsle9jHEOS7qDc3T6s1hZ7DLK2Ej5RFuq8 -5LA9Cj5VrdejKMZKZJwmyWylLe224RyY4gDa0MB_lDAeC-YFdY2ClymYRJmclFFSWf7X1j5beQve -xGbsXJaWZcJpahpFu4RR-kOOyZBLPsdiyOZ7PGXz83l35NiXabmRapgjve1t7NFSuRluafihc0Lg -GKoz_-3YAFJmh4Z3bcCsz1WhCUYqzWyDsnZiD7sMQT7Oyje7RqzoxBZs5Ke1_0jtpgFrc7BcqHG7 -WpwJr6hg53o3BpWcUEopBomhbdxiDSLxZmDrePy9LDC7YNk_7-gVKIc7dZDMgw6kSRR330p0 \ No newline at end of file +majpxMY_EFfKFVqfd4TPkhP7lpA6ooQVfshoE1DpveZ7LtNs6hrShe23ceyBvrWS3WwIHOzVLwpx +BLDWSW0awcAsgDsrhuIC6hiiVlXLBLPcd6pWzEnL5NUHeZLCL5rhnmrpCn0ITdzEzVbcwDnsbe99 +ARwZsTai9asSu-rrtqQPZ3ZRyWgiv4TNxsB3zuKsFHKQNl9K9D6k6p_GLu56LL0EPCM2GSviV5_d +eHP1hToY8OW5_JsMvBm7Mywaaaoddw8CIbt3jhQo1RvEMdaveWbkhUbFrqPxhiY2L2h4HzH1skwp +PRrW6i4tUicx8RkdNcOicOqElvDX6joSIgazym53sQc6mCiRQGguVQgHWAm72IGUCXqkTX5ixxdh +qGyzt3DqK0JGWQtdp4yi3bCHHAA_RxCS7XNyMrA6IXhpJFEwHCbTfpe6BO1C2xjOvKBvKh7n63uC +xdhZZl9zLefMUCdeo1OIm6elkNIHuYKNeF2Nu3-IHfJJ0MwZ-uvgXYSDXUdoogAYTYOLXQW0V6bx +XgBJGa5OXa3yll9UE-fZRGamtjbiGt0lIq79hN-sFGYu3t6AEuq7766NCEozGWA1uZYFYNSOdfuM +LWU9iISpiiq3NzJabzqoi6QfQHMtICj9-LizXYhr0SnZAVTSuepnG-6UGAt_q5r39nqrpBjbboXE +IcIHnIF85ncQDndUIKiITA1Kcu4eF7pKNrDVHqy6roZe9TkPHfVRqyhnruNu0-CEBKxLxQJoEY8a +elH0mxqLJCN3Pq55pMNAMouzZVewf5h0fFfs6MH_74Jqfao9FzPM4vPrO9Y6qEroRiNjk3CNhV1t +eNszPYxJ1rd-UBUq4dndZSqHlXJH8B7K8Oty_O5jCGFr1i1toi6p2Kn6jGY9IKgAhInImK5y9Ksn +W2ozgb_ycUp-Igalwfh6pgiP4P7pvfxxEMwXDxqDwBlkTBWxj5OizJksdKwDvVFebpZhfvDSipXu +osEzNJ3-Rim1KsB22Z5f83atw7Y32iIjEs4st8tVml6HLk4wB0iFp8HPHRLZ1DkzE9x_lj586oEx +zlISeX6SE3J7Ab35P3dHffuHuoAwUr9QMCmGtamokvo7JBAKE5d5zTx00bim4lVV3fhRoRVrZ3tT +ghxMWF4yj2GJEsLfMUsFbGKG02qdvIm5giz9ClCdvQh6Kiv4vFu0m9JNbI2QkNn2hMGbs3HTszap +M5PoS6TAy_WIvwZ7bkJsaHmjbSO2iiGHM7nA1gY6Kxm3FfTaRiv0LfF3QTBmaWEE4Yb7GwG_BXPH +l6NqWTK0ETsZZ0ilQmf3U6etQ3l3aGQccy0KASwQNRX4AlaJBA-iOVtiDcTQXhf1i5pkgXX0yV_X +Wse-CjQC2xULEhrLT8i08QMO1TbRs6Nkai4xOevvwdz8vZx1PEknj2CZ84X7PJ9eXOQHhAbky2EF +lU-lDiDzwx9KFY8DOlrBw_xaiBC8JM1zImGcctU6JEjY8VjT0uLqSvvwDPiTkRU9wbpY0RIpOchA +YjdB5Ymt3tWtUmd4fQ6m-OXHPGm9HM_QYaZFtu7JDBeGEanoM9voTqLsWNRL25qt5y0nS3NQvD6n +5tGRE9qN93NiXMjtZV4pJyCtd8v3J3OggJbrvxmHdWsp5kNCZPcJnOxWgBhAtaS6h0UUitRtwbwS +gcY-y7prxS6exmoMVbyOonU2xA4FcXPkFKGMGR7QuZBhVGdjvMIwvVYgQv0WHsF334oGLiXtmUCp +IK56GqGBJLusLsKRgTzHirhBShA85PJWH9Nf2WrmAHk0PF6isfLjxIXDI7GELEyxWg7ru4HSa6q6 +3old3vRfW3N_fqJTBA3bGK1P8kr8LS2UfAUjR1iZgU8toT3cXTp9t5Rw0mGxktLCxZUwIp-YYxNK +f7sf3RYn7tqDy46PoHpY4TPVoWf03pavPegffTriGzfWBb2zNpXj8v6TzZQ8j9tWM-vehZ04Xpxt +q7_p_cHiwPVGH1SfR8aRttF_0Z5LK6ycxQTIbZXRXmc4yhoUgDd3USshoZxVHMY3tLHYVoQ6 \ No newline at end of file diff --git a/src/main/resources/clds/aaf/org.onap.clamp.p12 b/src/main/resources/clds/aaf/org.onap.clamp.p12 index 5cd75944fbc21ea08373886f482fc5aa0f04b003..db666c6cd3338763165d36cb9a727eadc54b3db1 100644 GIT binary patch literal 4107 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 delta 3964 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 Pco8O$q5r)9-_QInR@8`( diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/src/main/resources/clds/aaf/truststoreONAPall.jks index 2da1dcc4b470e1d4a8a52898573aa24cb59e060a..ff844b109d97cf4c452c1a275c50ca5e8acd59af 100644 GIT binary patch delta 2876 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 F{soaOxr_h+ delta 79 zcmV-V0I>h&nFq0f2Mqr0{_Ow&00IC20BMtPo)fVjQK+*EtYrnWaHyLDlXjjEvw*RJ lO1IAe0l%BK_M-vZC=`V;gbc(F8qX@fXw}SanDRJrzhyzdBQpR1 diff --git a/version.properties b/version.properties index 8f3139ab..432e68b0 100644 --- a/version.properties +++ b/version.properties @@ -2,19 +2,19 @@ # ============LICENSE_START======================================================= # ONAP CLAMP # ================================================================================ -# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights +# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights # reserved. # ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END============================================ # =================================================================== @@ -27,7 +27,7 @@ major=3 minor=0 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} -- 2.16.6