[DCAE] Update k8s blueprint to support 1.3.1 Version of PMSH MS

Issue-ID: DCAEGEN2-2713
Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech>
Change-Id: Iea543d00e58da0022e28f45dbc11087bfe573e8f

diff --git a/Changelog.md b/Changelog.md
index 30090d8..62e16db 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
          - [DCAEGEN2-2732](https://jira.onap.org/browse/DCAEGEN2-2732) - PM-Mapper 1.6.0 Utilize SDK/Dmaap client 
          - [DCAEGEN2-2675](https://jira.onap.org/browse/DCAEGEN2-2675) - RESTConf 1.2.5 - xml parsing vulnerability
          - [DCAEGEN2-2590](https://jira.onap.org/browse/DCAEGEN2-2590) - TCA-Gen2 1.3.0 - vulnerability removal
+         - [DCAEGEN2-2713](https://jira.onap.org/browse/DCAEGEN2-2713) - PMSH 1.3.1 - policy config consolidation under app-config
 
 ## [3.0.4] - 2021-03-10
          - [DCAEGEN2-2656](https://jira.onap.org/browse/DCAEGEN2-2656) - fix CRITICAL weak-cryptography issues identified in sonarcloud (hostname verification in DFC)

diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml
index 3e46d13..6d1132b 100644 (file)
--- a/blueprints/k8s-pmsh.yaml
+++ b/blueprints/k8s-pmsh.yaml
@@ -1,6 +1,6 @@
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2020 Nordix Foundation.
+#  Copyright (C) 2020-2021 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ inputs:
   tag_version:
     type: string
     description: Docker image to be used
-    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.1.2'
+    default: 'nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.3.1'
   replicas:
     type: integer
     description: Number of instances
@@ -122,6 +122,14 @@ node_templates:
         cert_path: '/opt/app/pmsh/etc/certs/cert.pem'
         key_path: '/opt/app/pmsh/etc/certs/key.pem'
         ca_cert_path: '/opt/app/pmsh/etc/certs/cacert.pem'
+        pmsh_policy:
+          subscription:
+            subscriptionName: ExtraPM-All-gNB-R2B
+            administrativeState: LOCKED
+            fileBasedGP: 15
+            fileLocation: "/pm/pm.xml"
+            nfFilter: { "nfNames": [ "^pnf.*","^vnf.*" ],"modelInvariantIDs": [ ],"modelVersionIDs": [ ],"modelNames": [ ] }
+            measurementGroups: [ { "measurementGroup": { "measurementTypes": [ { "measurementType": "countera" },{ "measurementType": "counterb" } ],"managedObjectDNsBasic": [ { "DN": "dna" },{ "DN": "dnb" } ] } },{ "measurementGroup": { "measurementTypes": [ { "measurementType": "counterc" },{ "measurementType": "counterd" } ],"managedObjectDNsBasic": [ { "DN": "dnc" },{ "DN": "dnd" } ] } } ]
         streams_publishes:
           policy_pm_publisher:
             type: message_router