updating pomba validation rules

Change-Id: I73620ed7abe2cc91334b5b80e4b89f1afc24fe5f
Issue-ID: LOG-703
Signed-off-by: Pierre Rioux <pierre.rioux@amdocs.com>

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 ec38724..f74d832 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
@@ -87,7 +87,7 @@ entity {
 
 rule {
   name        'SDC-AAI-vnfc-type'
 
 rule {
   name        'SDC-AAI-vnfc-type'

-  category    'INVALID_VALUE'
+  category    'VNFC Consistency'

   description 'Validate that each VNFC instance in AAI conforms to a VNFC type defined in SDC model'
   errorText   'AAI VNFC instance includes non-specified type in design SDC model'
   severity    'ERROR'
   description 'Validate that each VNFC instance in AAI conforms to a VNFC type defined in SDC model'
   errorText   'AAI VNFC instance includes non-specified type in design SDC model'
   severity    'ERROR'


@@ -102,13 +102,13 @@ rule {
         def aaiTypes = getVnfcTypes(slurper.parseText(aaiList.toString()))
 
         // each type in AAI must exist in SDC
         def aaiTypes = getVnfcTypes(slurper.parseText(aaiList.toString()))
 
         // each type in AAI must exist in SDC

-        return aaiTypes.containsAll(sdcTypes)
+        return sdcTypes.containsAll(aaiTypes)

                 '''
 }
 
 rule {
   name        'SDC-AAI-vnfc-node-count'
                 '''
 }
 
 rule {
   name        'SDC-AAI-vnfc-node-count'

-  category    'INVALID_VALUE'
+  category    'VNFC Consistency'

   description 'Validate that for each VNFC node defined in SDC model, there is at least one VNFC instance in AAI'
   errorText   'Design has specified types but not all of them exist in AAI'
   severity    'WARNING'
   description 'Validate that for each VNFC node defined in SDC model, there is at least one VNFC instance in AAI'
   errorText   'Design has specified types but not all of them exist in AAI'
   severity    'WARNING'


@@ -132,7 +132,7 @@ rule {
 
 rule {
   name        'SDC-AAI-vf-module-instance-check'
 
 rule {
   name        'SDC-AAI-vf-module-instance-check'

-  category    'INVALID_VALUE'
+  category    'VF Consistency'

   description 'Validate that each VF module instance in AAI conforms to a VF module defined in SDC service model'
   errorText   'One or more AAI VF module instance(s) not defined in SDC model'
   severity    'CRITICAL'
   description 'Validate that each VF module instance in AAI conforms to a VF module defined in SDC service model'
   errorText   'One or more AAI VF module instance(s) not defined in SDC model'
   severity    'CRITICAL'


@@ -153,7 +153,7 @@ rule {
 
 rule {
   name        'NDCB-AAI-attribute-comparison'
 
 rule {
   name        'NDCB-AAI-attribute-comparison'

-  category    'INVALID_VALUE'
+  category    'Attribute Mismatch'

   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'
   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'