Merge "Add AAI credentials to POMBA SD"

diff --git a/kubernetes/appc/charts/appc-ansible-server/resources/config/RestServer_config b/kubernetes/appc/charts/appc-ansible-server/resources/config/RestServer_config
index 73d963d..74fcc49 100644 (file)
--- a/kubernetes/appc/charts/appc-ansible-server/resources/config/RestServer_config
+++ b/kubernetes/appc/charts/appc-ansible-server/resources/config/RestServer_config
@@ -29,14 +29,14 @@ id: sdnc
 psswd: sdnc
 
 # Mysql
-host:  {{.Values.config.mysqlServiceName}}
+host:  {{.Values.config.mariadbGaleraSVCName}}
 user:  appc
 passwd:        appc
 db:    ansible
 
 # Playbooks
 from_files:            yes
-ansible_path:          /opt/onap/sdnc/Playbooks
+ansible_path:          /opt/onap/ccsdk/Playbooks
 ansible_inv:           Ansible_inventory
 ansible_temp:          PlaybooksTemp
 timeout_seconds:       60

diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
index b7dfcf7..ca8498b 100644 (file)
--- a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
       containers:
         - name: {{ include "common.name" . }}
           command: ["/bin/bash"]
-          args: ["-c", "cd /opt/onap/sdnc && ./startAnsibleServer.sh"]
+          args: ["-c", "cd /opt/onap/ccsdk && ./startAnsibleServer.sh"]
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:

diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index 768f295..a14b1b7 100644 (file)
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -31,7 +31,7 @@ pullPolicy: Always
 # application images
 repository: nexus3.onap.org:10001
 
-image: onap/dmaap/buscontroller:1.0.17
+image: onap/dmaap/buscontroller:1.0.19
 
 
 # application configuration

diff --git a/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy b/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy
index 3f91f8b..ec38724 100644 (file)
--- a/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy
+++ b/kubernetes/pomba/charts/pomba-validation-service/resources/bundleconfig/etc/rules/poa-event/default-rules.groovy
@@ -154,8 +154,8 @@ rule {
 rule {
   name        'NDCB-AAI-attribute-comparison'
   category    'INVALID_VALUE'
-  description 'Verify that every attribute in Network-Discovery is the same as in AAI'
-  errorText   'Some attributes in Network-Discovery are not equal to attributes in AAI'
+  description 'Verify that all attributes in Network-Discovery are the same as in AAI'
+  errorText   'Error found with attribute "{0}"; value "{1}" does not exist in Network-Discovery'
   severity    'ERROR'
   attributes  'ndcbItems', 'aaiItems'
   validate    '''
@@ -214,11 +214,14 @@ rule {
         java.util.Map aai = getAttributes(slurper.parseText(aaiItems.toString()))
 
         boolean result = true
+        List<String> details = new ArrayList<>();
         ndcb.any{ ndcbKey, ndcbValueList ->
           def aaiValueList = aai.get("$ndcbKey")
           aaiValueList.each{ aaiValue ->
             if(!ndcbValueList.any{ it == "$aaiValue" }) {
               result = false
+              details.add("$ndcbKey")
+              details.add("$aaiValue")
             }
           }
           if(result == false) {
@@ -226,6 +229,6 @@ rule {
             return true
           }
         }
-        return result
+        return new Tuple2(result, details)
         '''
-}
+}
\ No newline at end of file

diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
index 55c3811..1f14dd3 100644 (file)
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
       containers:
         - name: {{ include "common.name" . }}
           command: ["/bin/bash"]
-          args: ["-c", "cd /opt/onap/sdnc && ./startAnsibleServer.sh"]
+          args: ["-c", "cd /opt/onap/ccsdk && ./startAnsibleServer.sh"]
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports: