Rework of the unit tests (mainly IT)

Rework of the unit tests (mainly IT)
+ new example files and test resource config

Change-Id: I4970b3710c7decdc8a3265a86115097d4394ad80
Issue-Id: CLAMP-1
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

1 files changed, 767 insertions, 347 deletions

diff --git a/src/test/resources/example/modelProp.json b/src/test/resources/example/modelProp.json
index 831bf2d7..8b8e984f 100644
--- a/src/test/resources/example/modelProp.json
+++ b/src/test/resources/example/modelProp.json
@@ -1,369 +1,789 @@
 {
-  "Collector_":[
-    {
-      "name":"topicPublishes",
-      "value":"DCAE-COLLECTOR-UCSNMP"
-    }
-  ],
-  "global":[
-    {
-      "name":"service",
-      "value":[
-        "df6fcd2b-1932-429e-bb13-0cd0d32113cb"
-      ]
-    },
-    {
-      "name":"vf",
-      "value":[
-        "4b49acee-cf70-4b20-b956-a4fe0c1a8239"
-      ]
-    },
-    {
-      "name":"location",
-      "value":[
-        "SNDGCA64",
-        "ALPRGAED"
-      ]
-    }
-  ],
-  "StringMatch_":[
+    "Collector_": 
     [
-      {
-        "name":"topicPublishes",
-        "value":"DCAE-CL-EVENT"
-      }
+        {
+            "name": "topicPublishes",
+            "value": "DCAE-COLLECTOR-UCSNMP"
+        }
     ],
-    {
-      "serviceConfigurations":[
-        [
-          {
-            "name":"aaiMatchingFields",
-            "value":[
-              "Identiy"
-            ]
-          },
-          {
-            "name":"aaiSendFields",
-            "value":[
-              "VMID"
-            ]
-          },
-          {
-            "name":"groupNumber",
-            "value":[
-              "1"
-            ]
-          },
-          {
-            "name":"timeWindow",
-            "value":[
-              "1"
+
+    "global": 
+    [
+        {
+            "name": "service",
+            "value": 
+            [
+                "0f983e18-4603-4bb4-a98c-e29691fb16a1"
             ]
-          },
-          {
-            "name":"ageLimit",
-            "value":[
-              "1600"
+        },
+
+        {
+            "name": "vf",
+            "value": 
+            [
+                "6c7aaec2-59eb-41d9-8681-b7f976ab668d"
             ]
-          },
-          {
-            "name":"createClosedLoopEventId",
-            "value":[
-              "Initial"
+        },
+
+        {
+            "name": "actionSet",
+            "value": 
+            [
+                "enbRecipe"
             ]
-          },
-          {
-            "name":"outputEventName",
-            "value":[
-              "OnSet"
+        },
+
+        {
+            "name": "location",
+            "value": 
+            [
+                "SNDGCA64"
             ]
-          },
-          {
-            "stringSet":[
-              {
-                "name":"alarmCondition",
-                "value":[
-                  "Reports a transient alarm condition when an outgoing Ro message send fails"
-                ]
-              },
-              {
-                "name":"eventSeverity",
-                "value":[
-                  "WARNING"
-                ]
-              },
-              {
-                "name":"eventSourceType",
-                "value":[
-                  "f5BigIP"
+        }
+    ],
+
+    "HighlandPark_": 
+    [
+        [
+            {
+                "name": "topicPublishes",
+                "value": "DCAE-HIGHLANDPARK-EVENT-OUTPUT-VOIP"
+            }
+        ],
+
+        {
+            "serviceConfigurations": 
+            [
+                [
+                    {
+                        "name": "alarmCondition",
+                        "value": 
+                        [
+                            "Reports a transient alarm condition when an incoming ACR message is in conflict with former ACR in one diameter session"
+                        ]
+                    },
+
+                    {
+                        "name": "eventSourceType",
+                        "value": 
+                        [
+                            "f5BigIP"
+                        ]
+                    },
+
+                    {
+                        "name": "eventSeverity",
+                        "value": 
+                        [
+                            "NORMAL"
+                        ]
+                    }
+                ],
+
+                [
+                    {
+                        "name": "alarmCondition",
+                        "value": 
+                        [
+                            "Reports a transient alarm condition when an incoming ACR message is in conflict with former ACR in one diameter session"
+                        ]
+                    },
+
+                    {
+                        "name": "eventSourceType",
+                        "value": 
+                        [
+                            "f5BigIP"
+                        ]
+                    },
+
+                    {
+                        "name": "eventSeverity",
+                        "value": 
+                        [
+                            "NORMAL"
+                        ]
+                    }
                 ]
-              }
             ]
-          }
+        }
+    ],
+
+    "StringMatch_": 
+    {
+        "Group1": 
+        [
+            {
+                "name": "rgname",
+                "value": "1493749598520"
+            },
+
+            {
+                "name": "rgfriendlyname",
+                "value": "Group1"
+            },
+
+            {
+                "name": "policyName",
+                "value": "Policy1"
+            },
+
+            {
+                "name": "policyId",
+                "value": "1"
+            },
+
+            {
+                "serviceConfigurations": 
+                [
+                    [
+                        {
+                            "name": "aaiMatchingFields",
+                            "value": 
+                            [
+                                "complex.city",
+                                "vserver.vserver-name"
+                            ]
+                        },
+
+                        {
+                            "name": "aaiSendFields",
+                            "value": 
+                            [
+                                "complex.city",
+                                "vserver.vserver-name"
+                            ]
+                        },
+
+                        {
+                            "name": "timeWindow",
+                            "value": 
+                            [
+                                "100"
+                            ]
+                        },
+
+                        {
+                            "name": "ageLimit",
+                            "value": 
+                            [
+                                "100"
+                            ]
+                        },
+
+                        {
+                            "name": "createClosedLoopEventId",
+                            "value": 
+                            [
+                                "Initial"
+                            ]
+                        },
+
+                        {
+                            "name": "outputEventName",
+                            "value": 
+                            [
+                                "ONSET"
+                            ]
+                        },
+
+                        {
+                            "stringSet": 
+                            [
+                                {
+                                    "name": "alarmCondition",
+                                    "value": 
+                                    [
+                                        "Reports a transient alarm condition when an outgoing Ro message send fails"
+                                    ]
+                                },
+
+                                {
+                                    "name": "eventSeverity",
+                                    "value": 
+                                    [
+                                        "WARNING"
+                                    ]
+                                },
+
+                                {
+                                    "name": "eventSourceType",
+                                    "value": 
+                                    [
+                                        "f5BigIP"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
+                ]
+            }
         ],
+
+        "Group2": 
         [
-          {
-            "name":"aaiMatchingFields",
-            "value":[
-              "VMID"
-            ]
-          },
-          {
-            "name":"aaiSendFields",
-            "value":[
-              "Identiy"
-            ]
-          },
-          {
-            "name":"groupNumber",
-            "value":[
-              "1"
-            ]
-          },
-          {
-            "name":"timeWindow",
-            "value":[
-              "0"
-            ]
-          },
-          {
-            "name":"ageLimit",
-            "value":[
-              "1600"
-            ]
-          },
-          {
-            "name":"createClosedLoopEventId",
-            "value":[
-              "Close"
-            ]
-          },
-          {
-            "name":"outputEventName",
-            "value":[
-              "Abatement"
-            ]
-          },
-          {
-            "stringSet":[
-              {
-                "name":"alarmCondition",
-                "value":[
-                  "Reports a transient alarm condition when an outgoing GTP' message send fails"
+            {
+                "name": "rgname",
+                "value": "1493749665149"
+            },
+
+            {
+                "name": "rgfriendlyname",
+                "value": "Group2"
+            },
+
+            {
+                "name": "policyName",
+                "value": "Policy2"
+            },
+
+            {
+                "name": "policyId",
+                "value": "2"
+            },
+
+            {
+                "serviceConfigurations": 
+                [
+                    [
+                        {
+                            "name": "aaiMatchingFields",
+                            "value": 
+                            [
+                                "cloud-region.identity-url",
+                                "vserver.vserver-name"
+                            ]
+                        },
+
+                        {
+                            "name": "aaiSendFields",
+                            "value": 
+                            [
+                                "cloud-region.identity-url",
+                                "vserver.vserver-name"
+                            ]
+                        },
+
+                        {
+                            "name": "timeWindow",
+                            "value": 
+                            [
+                                "1000"
+                            ]
+                        },
+
+                        {
+                            "name": "ageLimit",
+                            "value": 
+                            [
+                                "1000"
+                            ]
+                        },
+
+                        {
+                            "name": "createClosedLoopEventId",
+                            "value": 
+                            [
+                                "Initial"
+                            ]
+                        },
+
+                        {
+                            "name": "outputEventName",
+                            "value": 
+                            [
+                                "ONSET"
+                            ]
+                        },
+
+                        {
+                            "stringSet": 
+                            [
+                                {
+                                    "name": "alarmCondition",
+                                    "value": 
+                                    [
+                                        "LSS_asdaCommunicationFailure"
+                                    ]
+                                },
+
+                                {
+                                    "name": "eventSeverity",
+                                    "value": 
+                                    [
+                                        "WARNING"
+                                    ]
+                                },
+
+                                {
+                                    "name": "eventSourceType",
+                                    "value": 
+                                    [
+                                        "f5BigIP"
+                                    ]
+                                }
+                            ]
+                        }
+                    ],
+
+                    [
+                        {
+                            "name": "aaiMatchingFields",
+                            "value": 
+                            [
+                                "generic-vnf.vnf-name",
+                                "vserver.vserver-name"
+                            ]
+                        },
+
+                        {
+                            "name": "aaiSendFields",
+                            "value": 
+                            [
+                                "generic-vnf.vnf-name",
+                                "vserver.vserver-name"
+                            ]
+                        },
+
+                        {
+                            "name": "timeWindow",
+                            "value": 
+                            [
+                                "3000"
+                            ]
+                        },
+
+                        {
+                            "name": "ageLimit",
+                            "value": 
+                            [
+                                "3000"
+                            ]
+                        },
+
+                        {
+                            "name": "createClosedLoopEventId",
+                            "value": 
+                            [
+                                "Initial"
+                            ]
+                        },
+
+                        {
+                            "name": "outputEventName",
+                            "value": 
+                            [
+                                "ABATED"
+                            ]
+                        },
+
+                        {
+                            "stringSet": 
+                            [
+                                {
+                                    "name": "alarmCondition",
+                                    "value": 
+                                    [
+                                        "LSS_asdaCommunicationFailure"
+                                    ]
+                                },
+
+                                {
+                                    "name": "eventSeverity",
+                                    "value": 
+                                    [
+                                        "MAJOR"
+                                    ]
+                                },
+
+                                {
+                                    "name": "eventSourceType",
+                                    "value": 
+                                    [
+                                        "f5BigIP"
+                                    ]
+                                }
+                            ]
+                        }
+                    ]
                 ]
-              },
-              {
-                "name":"eventSeverity",
-                "value":[
-                  "NORMAL"
+            }
+        ]
+    },
+
+    "Policy_": 
+    {
+        "Policy1": 
+        [
+            {
+                "name": "pname",
+                "value": "Policy1"
+            },
+
+            {
+                "name": "pid",
+                "value": "1"
+            },
+
+            {
+                "name": "timeout",
+                "value": "500"
+            },
+
+            {
+                "policyConfigurations": 
+                [
+                    [
+                        {
+                            "name": "recipe",
+                            "value": 
+                            [
+                                "restart"
+                            ]
+                        },
+
+                        {
+                            "name": "maxRetries",
+                            "value": 
+                            [
+                                "3"
+                            ]
+                        },
+
+                        {
+                            "name": "retryTimeLimit",
+                            "value": 
+                            [
+                                "180"
+                            ]
+                        },
+
+                        {
+                            "name": "_id",
+                            "value": 
+                            [
+                                "n9bQ4t6"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicy",
+                            "value": 
+                            [
+                                ""
+                            ]
+                        }
+                    ],
+
+                    [
+                        {
+                            "name": "recipe",
+                            "value": 
+                            [
+                                "rebuild"
+                            ]
+                        },
+
+                        {
+                            "name": "maxRetries",
+                            "value": 
+                            [
+                                "3"
+                            ]
+                        },
+
+                        {
+                            "name": "retryTimeLimit",
+                            "value": 
+                            [
+                                "180"
+                            ]
+                        },
+
+                        {
+                            "name": "_id",
+                            "value": 
+                            [
+                                "ItE5xKT"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicy",
+                            "value": 
+                            [
+                                "n9bQ4t6"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicyConditions",
+                            "value": 
+                            [
+                                "Failure_Retries",
+                                "Failure_Timeout",
+                                "Failure_Exception",
+                                "Failure"
+                            ]
+                        }
+                    ]
                 ]
-              },
-              {
-                "name":"eventSourceType",
-                "value":[
-                  "f5BigIP"
+            }
+        ],
+
+        "Policy2": 
+        [
+            {
+                "name": "pname",
+                "value": "Policy2"
+            },
+
+            {
+                "name": "pid",
+                "value": "2"
+            },
+
+            {
+                "name": "timeout",
+                "value": "500"
+            },
+
+            {
+                "policyConfigurations": 
+                [
+                    [
+                        {
+                            "name": "recipe",
+                            "value": 
+                            [
+                                "restart"
+                            ]
+                        },
+
+                        {
+                            "name": "maxRetries",
+                            "value": 
+                            [
+                                "3"
+                            ]
+                        },
+
+                        {
+                            "name": "retryTimeLimit",
+                            "value": 
+                            [
+                                "180"
+                            ]
+                        },
+
+                        {
+                            "name": "_id",
+                            "value": 
+                            [
+                                "n9bQ4t6"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicy",
+                            "value": 
+                            [
+                                ""
+                            ]
+                        }
+                    ],
+
+                    [
+                        {
+                            "name": "recipe",
+                            "value": 
+                            [
+                                "rebuild"
+                            ]
+                        },
+
+                        {
+                            "name": "maxRetries",
+                            "value": 
+                            [
+                                "3"
+                            ]
+                        },
+
+                        {
+                            "name": "retryTimeLimit",
+                            "value": 
+                            [
+                                "180"
+                            ]
+                        },
+
+                        {
+                            "name": "_id",
+                            "value": 
+                            [
+                                "ItE5xKT"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicy",
+                            "value": 
+                            [
+                                "n9bQ4t6"
+                            ]
+                        },
+
+                        {
+                            "name": "parentPolicyConditions",
+                            "value": 
+                            [
+                                "Failure_Retries",
+                                "Failure_Timeout",
+                                "Failure_Exception",
+                                "Failure"
+                            ]
+                        }
+                    ]
                 ]
-              }
-            ]
-          }
+            }
         ]
-      ]
-    }
-  ],
-  "Policy_":[
-    [
-      {
-        "name":"timeout",
-        "value":"500"
-      }
-    ],
+    },
+
+    "TCA_": 
     {
-      "policyConfigurations":[
+        "Narra": 
         [
-          {
-            "name":"recipe",
-            "value":[
-              "restart"
-            ]
-          },
-          {
-            "name":"maxRetries",
-            "value":[
-              "3"
-            ]
-          },
-          {
-            "name":"retryTimeLimit",
-            "value":[
-              "180"
-            ]
-          },
-          {
-            "name":"_id",
-            "value":[
-              "n9bQ4t6"
-            ]
-          },
-          {
-            "name":"parentPolicy",
-            "value":[
-              ""
-            ]
-          }
+            {
+                "name": "tname",
+                "value": "Narra"
+            },
+
+            {
+                "name": "tuuid",
+                "value": "886be8da-14fe-tca1-d04b-d13b55d58df9"
+            },
+
+            {
+                "name": "tnfc",
+                "value": "ENBE"
+            },
+
+            {
+                "name": "tcaEnab",
+                "value": "on"
+            },
+
+            {
+                "name": "tcaPol",
+                "value": "Policy1"
+            },
+
+            {
+                "name": "tcaPolId",
+                "value": "1"
+            },
+
+            {
+                "name": "tcaInt",
+                "value": "2"
+            },
+
+            {
+                "name": "tcaSev",
+                "value": "Warning"
+            },
+
+            {
+                "name": "tcaVio",
+                "value": "3"
+            },
+
+            {
+                "serviceConfigurations": 
+                [
+                    [
+                        "PMRRCCONNESTABFAILCELLLATENCY",
+                        "LESS",
+                        "4",
+                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
+                    ],
+
+                    [
+                        "PMRAATTCBRA",
+                        "GREATER",
+                        "30",
+                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
+                    ]
+                ]
+            }
         ],
+
+        "Srini": 
         [
-          {
-            "name":"recipe",
-            "value":[
-              "rebuild"
-            ]
-          },
-          {
-            "name":"maxRetries",
-            "value":[
-              "3"
-            ]
-          },
-          {
-            "name":"retryTimeLimit",
-            "value":[
-              "180"
-            ]
-          },
-          {
-            "name":"_id",
-            "value":[
-              "ItE5xKT"
-            ]
-          },
-          {
-            "name":"parentPolicy",
-            "value":[
-              "n9bQ4t6"
-            ]
-          },
-          {
-            "name":"parentPolicyConditions",
-            "value":[
-              "Failure_Retries",
-              "Failure_Timeout",
-              "Failure_Exception",
-              "Failure"
-            ]
-          }
+            {
+                "name": "tname",
+                "value": "Srini"
+            },
+
+            {
+                "name": "tuuid",
+                "value": "8b5ba88d-f4b4-tf0e-50b1-78a5a7dd412d"
+            },
+
+            {
+                "name": "tnfc",
+                "value": "ENBE"
+            },
+
+            {
+                "name": "tcaEnab",
+                "value": "on"
+            },
+
+            {
+                "name": "tcaPol",
+                "value": "Policy2"
+            },
+
+            {
+                "name": "tcaPolId",
+                "value": "2"
+            },
+
+            {
+                "name": "tcaInt",
+                "value": "10"
+            },
+
+            {
+                "name": "tcaSev",
+                "value": "Critical"
+            },
+
+            {
+                "name": "tcaVio",
+                "value": "5"
+            },
+
+            {
+                "serviceConfigurations": 
+                [
+                    [
+                        "PMRRCCONNESTABFAILCELLLATENCY",
+                        "EQUAL",
+                        "3",
+                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
+                    ],
+
+                    [
+                        "PMRAATTCBRA",
+                        "GREATER",
+                        "30",
+                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
+                    ]
+                ]
+            }
         ]
-      ]
     }
-   ],
-
-  "TCA_":{  
-      "Narra":[  
-          {
-	        "name": "tname",
-	        "value": "Narra"
-	      },
-	      {
-	        "name": "tuuid",
-	        "value": "886be8da-14fe-tca1-d04b-d13b55d58df9"
-	      },
-	      {
-	        "name": "tnfc",
-	        "value": "ENBE"
-	      },
-	      {
-	        "name": "tcaEnab",
-	        "value": "on"
-	      },
-	      {
-	        "name": "tcaPol",
-	        "value": "Policy1"
-	      },
-	      {
-	        "name": "tcaPolId",
-	        "value": "1"
-	      },
-	      {
-	        "name": "tcaInt",
-	        "value": "2"
-	      },
-	      {
-	        "name": "tcaSev",
-	        "value": "Warning"
-	      },
-	      {
-	        "name": "tcaVio",
-	        "value": "3"
-	      },
-         {  
-            "serviceConfigurations":[  
-               [  
-                  "PMRRCCONNESTABFAILCELLLATENCY",
-                  "LESS",
-                  "4",
-                  "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
-               ],
-               [  
-                  "PMRAATTCBRA",
-            	  "GREATER",
-                  "30",
-                  "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
-               ]
-            ]
-         }
-      ],
-      "Srini":[  
-          {
-	        "name": "tname",
-	        "value": "Srini"
-	      },
-	      {
-	        "name": "tuuid",
-	        "value": "8b5ba88d-f4b4-tf0e-50b1-78a5a7dd412d"
-	      },
-	      {
-	        "name": "tnfc",
-	        "value": "ENBE"
-	      },
-	      {
-	        "name": "tcaEnab",
-	        "value": "on"
-	      },
-	      {
-	        "name": "tcaPol",
-	        "value": "Policy2"
-	      },
-	      {
-	        "name": "tcaPolId",
-	        "value": "2"
-	      },
-	      {
-	        "name": "tcaInt",
-	        "value": "10"
-	      },
-	      {
-	        "name": "tcaSev",
-	        "value": "Critical"
-	      },
-	      {
-	        "name": "tcaVio",
-	        "value": "5"
-	      },
-         {  
-            "serviceConfigurations":[  
-               [  
-                  "PMRRCCONNESTABFAILCELLLATENCY",
-                  "EQUAL",
-                  "3",
-                  "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
-               ],
-               [  
-                  "PMRAATTCBRA",
-                  "GREATER",
-                  "30",
-                  "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
-               ]
-            ]
-         }
-      ]
-   }
 }
\ No newline at end of file