Merge "Wait for aaf if enabled"
authorBorislav Glozman <Borislav.Glozman@amdocs.com>
Thu, 8 Nov 2018 07:01:24 +0000 (07:01 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 8 Nov 2018 07:01:24 +0000 (07:01 +0000)
31 files changed:
kubernetes/aaf/charts/aaf-cm/values.yaml
kubernetes/aaf/charts/aaf-fs/values.yaml
kubernetes/aaf/charts/aaf-gui/values.yaml
kubernetes/aaf/charts/aaf-hello/values.yaml
kubernetes/aaf/charts/aaf-locate/values.yaml
kubernetes/aaf/charts/aaf-oauth/values.yaml
kubernetes/aaf/charts/aaf-service/values.yaml
kubernetes/aaf/values.yaml
kubernetes/aai/charts/aai-resources/values.yaml
kubernetes/appc/values.yaml
kubernetes/clamp/charts/clamp-dash-kibana/values.yaml
kubernetes/clamp/charts/clamp-dash-logstash/values.yaml
kubernetes/clamp/values.yaml
kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
kubernetes/dmaap/charts/message-router/values.yaml
kubernetes/policy/resources/config/pe/push-policies.sh
kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
kubernetes/portal/charts/portal-app/values.yaml
kubernetes/portal/charts/portal-mariadb/values.yaml
kubernetes/portal/charts/portal-sdk/values.yaml
kubernetes/portal/charts/portal-widget/values.yaml
kubernetes/sdnc/charts/sdnc-portal/values.yaml
kubernetes/uui/values.yaml
kubernetes/vvp/charts/vvp-ci-uwsgi/values.yaml
kubernetes/vvp/charts/vvp-cms-uwsgi/values.yaml
kubernetes/vvp/charts/vvp-em-uwsgi/values.yaml
kubernetes/vvp/charts/vvp-gitlab/values.yaml
kubernetes/vvp/charts/vvp-imagescanner/values.yaml
kubernetes/vvp/charts/vvp-jenkins/values.yaml
kubernetes/vvp/charts/vvp-postgres/values.yaml
kubernetes/vvp/values.yaml

index 6bd03cf..117427a 100644 (file)
@@ -25,7 +25,7 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_cm:2.1.7-SNAPSHOT
+image: onap/aaf/aaf_cm:2.1.6
 aaf_register_as: "aaf-cm.onap"
 pullPolicy: Always
 
index 07e832b..ad2e2d7 100644 (file)
@@ -25,7 +25,7 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_fs:2.1.7-SNAPSHOT
+image: onap/aaf/aaf_fs:2.1.6
 aaf_register_as: "aaf-fs.onap"
 pullPolicy: Always
 
index dd8162b..c0dbb53 100644 (file)
@@ -26,7 +26,7 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_gui:2.1.7-SNAPSHOT
+image: onap/aaf/aaf_gui:2.1.6
 aaf_register_as: "aaf-gui.onap"
 pullPolicy: Always
 
index fb5914d..a21db5e 100644 (file)
@@ -25,7 +25,7 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_hello:2.1.7-SNAPSHOT
+image: onap/aaf/aaf_hello:2.1.6
 aaf_register_as: "aaf-hello.onap"
 pullPolicy: Always
 
index e65d6e3..924eb4d 100644 (file)
@@ -25,7 +25,7 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_locate:2.1.7-SNAPSHOT
+image: onap/aaf/aaf_locate:2.1.6
 aaf_register_as: "aaf-locate.onap"
 pullPolicy: Always
 
index 99de329..dce0297 100644 (file)
@@ -25,7 +25,7 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_oauth:2.1.7-SNAPSHOT
+image: onap/aaf/aaf_oauth:2.1.6
 aaf_register_as: "aaf-oauth.onap"
 pullPolicy: Always
 
index a3f1545..e898bb5 100644 (file)
@@ -25,7 +25,7 @@ flavor: small
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_service:2.1.7-SNAPSHOT
+image: onap/aaf/aaf_service:2.1.6
 aaf_register_as: "aaf-service.onap"
 pullPolicy: Always
 
index ea0827f..1c4bc5c 100644 (file)
@@ -21,7 +21,7 @@ global:
   readinessImage: readiness-check:2.0.0
   ubuntuInitRepository: registry.hub.docker.com
   ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
-  configImage: onap/aaf/aaf_config:2.1.7-SNAPSHOT
+  configImage: onap/aaf/aaf_config:2.1.6
   persistence:
     enabled: true
 
index 5055fed..546b56d 100644 (file)
@@ -22,7 +22,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/aai-resources:1.3.1
+image: onap/aai-resources:1.3.3
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
index ad6070a..d6719c1 100644 (file)
@@ -31,7 +31,7 @@ global:
 flavor: small
 # application image
 repository: nexus3.onap.org:10001
-image: onap/appc-image:1.4.1-SNAPSHOT-latest
+image: onap/appc-image:1.4.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index d1e85aa..fd73ae2 100644 (file)
@@ -33,7 +33,7 @@ busyboxImage: library/busybox:latest
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp-dashboard-kibana:3.0.1
+image: onap/clamp-dashboard-kibana:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index a05564a..cce1dec 100644 (file)
@@ -29,7 +29,7 @@ global:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp-dashboard-logstash:3.0.1
+image: onap/clamp-dashboard-logstash:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 24462d8..3609487 100644 (file)
@@ -28,7 +28,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/clamp:3.0.1
+image: onap/clamp:3.0.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 9ddbe0d..e6264fa 100644 (file)
@@ -80,10 +80,10 @@ image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.5
 # Use to override default setting in blueprints
 componentImages:
   config_binding_service: onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.3
-  datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0.4
+  datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0.3
   deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:3.0.3
-  holmes_rules: onap/holmes/rule-management:1.2.0
-  holmes_engine: onap/holmes/engine-management:1.2.0
+  holmes_rules: onap/holmes/rule-management:1.2.3
+  holmes_engine: onap/holmes/engine-management:1.2.2
   inventory: onap/org.onap.dcaegen2.platform.inventory-api:3.0.4
   policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.4.0
   service_change_handler: onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5
index 9ba3488..bd1c660 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-mr:1.1.7
+image: onap/dmaap/dmaap-mr:1.1.8
 pullPolicy: Always
 
 kafka:
index bdf5933..050ee6c 100644 (file)
@@ -209,6 +209,21 @@ curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'A
     "description": "ONAP_VPG_NAMING_TIMESTAMP"
 }' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/createPolicy'
 
+sleep 2
+
+echo "Create SDNC vSN Naming Policy"
+curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+    "configBody": "{\"service\":\"SDNC-GenerateName\",\"version\":\"CSIT\",\"content\":{\"policy-instance-name\":\"ONAP_vSN_NAMING_TIMESTAMP\",\"naming-models\":[{\"naming-properties\":[{\"property-name\":\"AIC_CLOUD_REGION\"},{\"property-name\":\"nfRole\"},{\"property-name\":\"TIMESTAMP\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNF\",\"nfRole\":\"vSN\",\"naming-recipe\":\"AIC_CLOUD_REGION|DELIMITER|nfRole|DELIMITER|TIMESTAMP\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"ENTIRETY\",\"start-value\":\"001\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}},{\"property-name\":\"NFC_NAMING_CODE\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"VNFC\",\"nfRole\":\"vSN\",\"naming-recipe\":\"VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"},{\"property-name\":\"VF_MODULE_LABEL\"},{\"property-name\":\"VF_MODULE_TYPE\"},{\"property-name\":\"SEQUENCE\",\"increment-sequence\":{\"max\":\"zzz\",\"scope\":\"PRECEEDING\",\"start-value\":\"01\",\"length\":\"3\",\"increment\":\"1\",\"sequence-type\":\"alpha-numeric\"}}],\"naming-type\":\"VF-MODULE\",\"nfRole\":\"vSN\",\"naming-recipe\":\"VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"}],\"naming-type\":\"KEY\",\"nfRole\":\"vSN\",\"naming-recipe\":\"VNF_NAME\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"protected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"protected_private_net_id\",\"nfRole\":\"vSN\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"},{\"naming-properties\":[{\"property-name\":\"VNF_NAME\"},{\"property-value\":\"unprotected\",\"property-name\":\"CONSTANT\"},{\"property-value\":\"_\",\"property-name\":\"DELIMITER\"}],\"naming-type\":\"unprotected_private_net_id\",\"nfRole\":\"vSN\",\"naming-recipe\":\"VNF_NAME|DELIMITER|CONSTANT\"}]}}",
+    "policyName": "SDNC_Policy.ONAP_vSN_NAMING_TIMESTAMP",
+    "policyConfigType": "MicroService",
+    "onapName": "SDNC",
+    "riskLevel": "4",
+    "riskType": "test",
+    "guard": "false",
+    "priority": "4",
+    "description": "ONAP_vSN_NAMING_TIMESTAMP"
+}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/createPolicy'
+
 #########################################Creating OOF PCI Policies##########################################
 sleep 2
 
@@ -451,6 +466,15 @@ curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'A
   "policyType": "MicroService"
 }' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/pushPolicy'
 
+sleep 10
+
+echo "pushPolicy : PUT : SDNC_Policy.ONAP_vSN_NAMING_TIMESTAMP"
+curl -k -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{
+  "pdpGroup": "default",
+  "policyName": "SDNC_Policy.ONAP_vSN_NAMING_TIMESTAMP",
+  "policyType": "MicroService"
+}' 'https://{{.Values.global.pdp.nameOverride}}:{{.Values.config.pdpPort}}/pdp/api/pushPolicy'
+
 #########################################Pushing OOF PCI Policies##########################################
 sleep 10
 
index 0ec43f5..9c9a6ff 100755 (executable)
@@ -25,7 +25,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/pomba-context-aggregator:1.3.3
+image: onap/pomba-context-aggregator:1.3.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 13d0138..2123dd7 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-app:2.3.0
+image: onap/portal-app:2.3.1
 pullPolicy: Always
 
 # default number of instances
index c9acba5..4b4463a 100644 (file)
@@ -24,7 +24,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-db:2.3.0
+image: onap/portal-db:2.3.1
 pullPolicy: Always
 
 readinessImage: readiness-check:2.0.0
index 772f191..63f7a49 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-sdk:2.3.0
+image: onap/portal-sdk:2.3.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index f6581db..f356796 100644 (file)
@@ -29,7 +29,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-wms:2.3.0
+image: onap/portal-wms:2.3.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index ac183f0..2c46307 100644 (file)
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/admportal-sdnc-image:1.3.4
+image: onap/admportal-sdnc-image:1.4.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index faab73a..a1341d0 100644 (file)
@@ -25,7 +25,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/usecase-ui:1.2.0
+image: onap/usecase-ui:1.2.1
 pullPolicy: Always
 
 # application configuration
index 7aa5881..1b58dd5 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vvp/test-engine:1.0.0-latest
+image: onap/vvp/test-engine:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 860ee41..e57b173 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vvp/cms:1.0.0-latest
+image: onap/vvp/cms:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index dd01834..a96ca26 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vvp/engagementmgr:1.0.0-latest
+image: onap/vvp/engagementmgr:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index eec4f0a..4855c88 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vvp/gitlab:1.0.0-latest
+image: onap/vvp/gitlab:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 0f7d354..ed62413 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vvp/image-scanner:1.0.0-latest
+image: onap/vvp/image-scanner:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 7ca82e4..083f88a 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vvp/jenkins:1.0.0-latest
+image: onap/vvp/jenkins:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index a41d923..000c049 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001 
-image: onap/vvp/postgresql:1.0.0-latest
+image: onap/vvp/postgresql:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index f3bc61d..740811e 100644 (file)
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/vvp/portal:1.0.0-latest
+image: onap/vvp/portal:1.0.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required