From eaea5ad06aa510cbf36bb95c920932ab6de0e6de Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Mon, 18 Sep 2017 12:27:51 +0200 Subject: Reformat the JSON and fix checkstyle issue All Json used in the tests have been reformatted. Also some checkstyle bugs have been fixed Change-Id: I48373d9d53d39244c62b9b88b1cf62c15c766cb3 Issue-ID: CLAMP-54 Signed-off-by: Determe, Sebastien (sd378r) --- .../example/model-properties/modelBpmn.json | 74 ++-- .../example/model-properties/modelBpmnProp.json | 374 ++++++++++---------- .../model-properties/modelBpmnPropWithGlobal.json | 382 ++++++++++----------- 3 files changed, 415 insertions(+), 415 deletions(-) (limited to 'src/test/resources/example/model-properties') diff --git a/src/test/resources/example/model-properties/modelBpmn.json b/src/test/resources/example/model-properties/modelBpmn.json index 4737174c5..823641c73 100644 --- a/src/test/resources/example/model-properties/modelBpmn.json +++ b/src/test/resources/example/model-properties/modelBpmn.json @@ -1,38 +1,38 @@ { - "collector": [ - { - "id": "Collector_1c72ct5", - "from": "StartEvent_1" - } - ], - "stringMatch": [ - { - "id": "StringMatch_05arstl", - "from": "Collector_1c72ct5" - } - ], - "policy": [ - { - "id": "Policy_0honxgv", - "from": "TCA_1jy9to4" - } - ], - "tca": [ - { - "id": "TCA_1jy9to4", - "from": "Holmes_0i4n2mm" - } - ], - "holmes": [ - { - "id": "Holmes_0i4n2mm", - "from": "VesCollector_0orydnh" - } - ], - "vesCollector": [ - { - "id": "VesCollector_0orydnh", - "from": "StringMatch_05arstl" - } - ] -} \ No newline at end of file + "collector": [ + { + "id": "Collector_1c72ct5", + "from": "StartEvent_1" + } + ], + "stringMatch": [ + { + "id": "StringMatch_05arstl", + "from": "Collector_1c72ct5" + } + ], + "policy": [ + { + "id": "Policy_0honxgv", + "from": "TCA_1jy9to4" + } + ], + "tca": [ + { + "id": "TCA_1jy9to4", + "from": "Holmes_0i4n2mm" + } + ], + "holmes": [ + { + "id": "Holmes_0i4n2mm", + "from": "VesCollector_0orydnh" + } + ], + "vesCollector": [ + { + "id": "VesCollector_0orydnh", + "from": "StringMatch_05arstl" + } + ] +} diff --git a/src/test/resources/example/model-properties/modelBpmnProp.json b/src/test/resources/example/model-properties/modelBpmnProp.json index 7e799aa8b..413d34009 100644 --- a/src/test/resources/example/model-properties/modelBpmnProp.json +++ b/src/test/resources/example/model-properties/modelBpmnProp.json @@ -1,188 +1,188 @@ { - "Collector_1c72ct5": [ - { - "name": "topicPublishes", - "value": "DCAE-COLLECTOR-UCSNMP" - } - ], - "StringMatch_05arstl": { - "group1": [ - { - "name": "rgname", - "value": "1505133578560" - }, - { - "name": "rgfriendlyname", - "value": "group1" - }, - { - "name": "policyName", - "value": "policy1" - }, - { - "name": "policyId", - "value": "0" - }, - { - "serviceConfigurations": [ - [ - { - "name": "aaiMatchingFields", - "value": [ - "complex.city" - ] - }, - { - "name": "aaiSendFields", - "value": [ - "cloud-region.identity-url" - ] - }, - { - "name": "timeWindow", - "value": [ - "0" - ] - }, - { - "name": "ageLimit", - "value": [ - "1600" - ] - }, - { - "name": "createClosedLoopEventId", - "value": [ - "Initial" - ] - }, - { - "name": "outputEventName", - "value": [ - "" - ] - }, - { - "stringSet": [ - { - - }, - { - "name": "eventSeverity", - "value": [ - "NORMAL" - ] - }, - { - "name": "eventSourceType", - "value": [ - "" - ] - } - ] - } - ] - ] - } - ] - }, - "Policy_0honxgv": { - "policy1": [ - { - "name": "pname", - "value": "policy1" - }, - { - "name": "pid", - "value": "0" - }, - { - "name": "timeout", - "value": "345" - }, - { - "policyConfigurations": [ - [ - { - "name": "maxRetries", - "value": [ - "3" - ] - }, - { - "name": "retryTimeLimit", - "value": [ - "180" - ] - }, - { - "name": "_id", - "value": [ - "dGLuNqg" - ] - }, - { - "name": "parentPolicy", - "value": [ - "" - ] - } - ] - ] - } - ] - }, - "TCA_1jy9to4": { - "tca1": [ - { - "name": "tname", - "value": "tca1" - }, - { - "name": "tuuid", - "value": "f43e3499-8c9c-teed-bb41-a0cb38ebf0d3" - }, - { - "name": "tnfc", - "value": "" - }, - { - "name": "tcaEnab", - "value": "on" - }, - { - "name": "tcaPol", - "value": "policy1" - }, - { - "name": "tcaPolId", - "value": "0" - }, - { - "name": "tcaInt", - "value": "1" - }, - { - "name": "tcaSev", - "value": "NORMAL" - }, - { - "name": "tcaVio", - "value": "1" - }, - { - "serviceConfigurations": [] - } - ] - }, - "Holmes_0i4n2mm": [ - { - "name": "correlationalLogic", - "value": "blabla" - }, - { - "name": "operationalPolicy", - "value": "policy1" - } - ] -} \ No newline at end of file + "Collector_1c72ct5": [ + { + "name": "topicPublishes", + "value": "DCAE-COLLECTOR-UCSNMP" + } + ], + "StringMatch_05arstl": { + "group1": [ + { + "name": "rgname", + "value": "1505133578560" + }, + { + "name": "rgfriendlyname", + "value": "group1" + }, + { + "name": "policyName", + "value": "policy1" + }, + { + "name": "policyId", + "value": "0" + }, + { + "serviceConfigurations": [ + [ + { + "name": "aaiMatchingFields", + "value": [ + "complex.city" + ] + }, + { + "name": "aaiSendFields", + "value": [ + "cloud-region.identity-url" + ] + }, + { + "name": "timeWindow", + "value": [ + "0" + ] + }, + { + "name": "ageLimit", + "value": [ + "1600" + ] + }, + { + "name": "createClosedLoopEventId", + "value": [ + "Initial" + ] + }, + { + "name": "outputEventName", + "value": [ + "" + ] + }, + { + "stringSet": [ + { + }, + { + "name": "eventSeverity", + "value": [ + "NORMAL" + ] + }, + { + "name": "eventSourceType", + "value": [ + "" + ] + } + ] + } + ] + ] + } + ] + }, + "Policy_0honxgv": { + "policy1": [ + { + "name": "pname", + "value": "policy1" + }, + { + "name": "pid", + "value": "0" + }, + { + "name": "timeout", + "value": "345" + }, + { + "policyConfigurations": [ + [ + { + "name": "maxRetries", + "value": [ + "3" + ] + }, + { + "name": "retryTimeLimit", + "value": [ + "180" + ] + }, + { + "name": "_id", + "value": [ + "dGLuNqg" + ] + }, + { + "name": "parentPolicy", + "value": [ + "" + ] + } + ] + ] + } + ] + }, + "TCA_1jy9to4": { + "tca1": [ + { + "name": "tname", + "value": "tca1" + }, + { + "name": "tuuid", + "value": "f43e3499-8c9c-teed-bb41-a0cb38ebf0d3" + }, + { + "name": "tnfc", + "value": "" + }, + { + "name": "tcaEnab", + "value": "on" + }, + { + "name": "tcaPol", + "value": "policy1" + }, + { + "name": "tcaPolId", + "value": "0" + }, + { + "name": "tcaInt", + "value": "1" + }, + { + "name": "tcaSev", + "value": "NORMAL" + }, + { + "name": "tcaVio", + "value": "1" + }, + { + "serviceConfigurations": [ + ] + } + ] + }, + "Holmes_0i4n2mm": [ + { + "name": "correlationalLogic", + "value": "blabla" + }, + { + "name": "operationalPolicy", + "value": "policy1" + } + ] +} diff --git a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json b/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json index 5abb28a8c..3846f7cf5 100644 --- a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json +++ b/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json @@ -1,192 +1,192 @@ { - "collector": { - "topicPublishes": { - "DCAE-COLLECTOR-UCSNMP": "DCAE-COLLECTOR-UCSNMP", - "GFP-IP-AIC-SNMP-TRAPS": "GFP-IP-AIC-SNMP-TRAPS", - "AIC-SNMP-TRAPS": "AIC-SNMP-TRAPS" - } - }, - "string_match": { - "topicPublishes": { - "DCAE-CL-EVENT": "DCAE-CL-EVENT" - }, - "aaiMatchingFields": { - "cloud-region.identity-url": "cloud-region.identity-url", - "complex.city": "complex.city", - "complex.physical-location-id": "complex.physical-location-id", - "complex.state": "complex.state", - "generic-vnf.service-id": "generic-vnf.service-id", - "generic-vnf.vnf-name": "generic-vnf.vnf-name", - "generic-vnf.vnf-type": "generic-vnf.vnf-type", - "tenant.tenant-id": "tenant.tenant-id", - "vserver.in-maint": "vserver.in-maint", - "vserver.is-closed-loop-disabled": "vserver.is-closed-loop-disabled", - "vserver.l-interface.interface-name": "vserver.l-interface.interface-name", - "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address": "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address", - "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address": "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address", - "vserver.l-interface.network-name": "vserver.l-interface.network-name", - "vserver.prov-status": "vserver.prov-status", - "vserver.selflink": "vserver.selflink", - "vserver.vserver-id": "vserver.vserver-id", - "vserver.vserver-name": "vserver.vserver-name" - }, - "aaiSendFields": { - "cloud-region.identity-url": "cloud-region.identity-url", - "complex.city": "complex.city", - "complex.physical-location-id": "complex.physical-location-id", - "complex.state": "complex.state", - "generic-vnf.service-id": "generic-vnf.service-id", - "generic-vnf.vnf-name": "generic-vnf.vnf-name", - "generic-vnf.vnf-type": "generic-vnf.vnf-type", - "tenant.tenant-id": "tenant.tenant-id", - "vserver.in-maint": "vserver.in-maint", - "vserver.is-closed-loop-disabled": "vserver.is-closed-loop-disabled", - "vserver.l-interface.interface-name": "vserver.l-interface.interface-name", - "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address": "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address", - "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address": "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address", - "vserver.l-interface.network-name": "vserver.l-interface.network-name", - "vserver.prov-status": "vserver.prov-status", - "vserver.selflink": "vserver.selflink", - "vserver.vserver-id": "vserver.vserver-id", - "vserver.vserver-name": "vserver.vserver-name" - }, - "eventSourceType": { - "f5BigIP": "f5BigIP", - "vSBG_Alarms": "vSBG_Alarms", - "vCTS_Alarms": "vCTS_Alarms" - }, - "eventSeverity": { - "NORMAL": "NORMAL", - "not-NORMAL": "not-NORMAL", - "OK": "OK", - "WARNING": "WARNING", - "MINOR": "MINOR", - "MAJOR": "MAJOR", - "CRITICAL": "CRITICAL" - }, - "timeWindow": 0, - "ageLimit": 1600, - "outputEventName": { - "": "", - "ONSET": "ONSET", - "ABATED": "ABATED" - }, - "createClosedLoopEventId": { - "Initial": "Initial", - "Close": "Close" - } - }, - "tca": { - "tname": "New_Set", - "tcaInt": "1", - "tcaVio": "1", - "tcaSev": { - "NORMAL": "NORMAL", - "CRITICAL": "CRITICAL", - "MAJOR": "MAJOR", - "MINOR": "MINOR", - "WARNING": "WARNING" - }, - "fieldPath": { - "FIELDPATH_test_1": "FIELDPATH_test_1", - "FIELDPATH_test_2": "FIELDPATH_test_2" - }, - "operator": { - ">": "GREATER", - "=": "EQUAL", - "<": "LESS" - }, - "opsPolicy": { - "POLICY_test_X": "POLICY_test_X", - "POLICY_test_Y": "POLICY_test_Y" - } - }, - "global": [ - { - "name": "actionSet", - "value": [ - "vnfRecipe" - ] - }, - { - "name": "location", - "value": [ - "SNDGCA64", - "ALPRGAED" - ] - }, - { - "name": "vf", - "value": [ - "f5213e3a-9191-4362-93b5-b67f8d770e44" - ] - }, - { - "name": "location", - "value": [ - "SNDGCA64", - "ALPRGAED", - "LSLEILAA", - "MDTWNJC1" - ] - } - ], - "policy": { - "pname": "0", - "timeout": 345, - "vnfRecipe": { - "": "", - "restart": "Restart", - "rebuild": "Rebuild", - "migrate": "Migrate", - "healthCheck": "Health Check", - "evacuate": "Evacuate" - }, - "enbRecipe": { - "": "", - "reset": "Reset" - }, - "maxRetries": "3", - "retryTimeLimit": 180, - "resource": { - "vCTS": "vCTS", - "v3CDB": "v3CDB", - "vUDR": "vUDR", - "vCOM": "vCOM", - "vRAR": "vRAR", - "vLCS": "vLCS", - "vUDR-BE": "vUDR-BE", - "vDBE": "vDBE" - }, - "parentPolicyConditions": { - "Failure_Retries": "Failure: Max Retries Exceeded", - "Failure_Timeout": "Failure: Time Limit Exceeded", - "Failure_Guard": "Failure: Guard", - "Failure_Exception": "Failure: Exception", - "Failure": "Failure: Other", - "Success": "Success" - } - }, - "shared": { - "byService": { - "": { - "vf": { - "": "" - }, - "location": { - "": "" - }, - "alarmCondition": { - "": "" - } - } - }, - "byVf": { - "": { - "vfc": { - "": "" - } - } - } - } -} \ No newline at end of file + "collector": { + "topicPublishes": { + "DCAE-COLLECTOR-UCSNMP": "DCAE-COLLECTOR-UCSNMP", + "GFP-IP-AIC-SNMP-TRAPS": "GFP-IP-AIC-SNMP-TRAPS", + "AIC-SNMP-TRAPS": "AIC-SNMP-TRAPS" + } + }, + "string_match": { + "topicPublishes": { + "DCAE-CL-EVENT": "DCAE-CL-EVENT" + }, + "aaiMatchingFields": { + "cloud-region.identity-url": "cloud-region.identity-url", + "complex.city": "complex.city", + "complex.physical-location-id": "complex.physical-location-id", + "complex.state": "complex.state", + "generic-vnf.service-id": "generic-vnf.service-id", + "generic-vnf.vnf-name": "generic-vnf.vnf-name", + "generic-vnf.vnf-type": "generic-vnf.vnf-type", + "tenant.tenant-id": "tenant.tenant-id", + "vserver.in-maint": "vserver.in-maint", + "vserver.is-closed-loop-disabled": "vserver.is-closed-loop-disabled", + "vserver.l-interface.interface-name": "vserver.l-interface.interface-name", + "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address": "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address", + "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address": "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address", + "vserver.l-interface.network-name": "vserver.l-interface.network-name", + "vserver.prov-status": "vserver.prov-status", + "vserver.selflink": "vserver.selflink", + "vserver.vserver-id": "vserver.vserver-id", + "vserver.vserver-name": "vserver.vserver-name" + }, + "aaiSendFields": { + "cloud-region.identity-url": "cloud-region.identity-url", + "complex.city": "complex.city", + "complex.physical-location-id": "complex.physical-location-id", + "complex.state": "complex.state", + "generic-vnf.service-id": "generic-vnf.service-id", + "generic-vnf.vnf-name": "generic-vnf.vnf-name", + "generic-vnf.vnf-type": "generic-vnf.vnf-type", + "tenant.tenant-id": "tenant.tenant-id", + "vserver.in-maint": "vserver.in-maint", + "vserver.is-closed-loop-disabled": "vserver.is-closed-loop-disabled", + "vserver.l-interface.interface-name": "vserver.l-interface.interface-name", + "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address": "vserver.l-interface.l3-interface-ipv4-address-list.l3-inteface-ipv4-address", + "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address": "vserver.l-interface.l3-interface-ipv6-address-list.l3-inteface-ipv6-address", + "vserver.l-interface.network-name": "vserver.l-interface.network-name", + "vserver.prov-status": "vserver.prov-status", + "vserver.selflink": "vserver.selflink", + "vserver.vserver-id": "vserver.vserver-id", + "vserver.vserver-name": "vserver.vserver-name" + }, + "eventSourceType": { + "f5BigIP": "f5BigIP", + "vSBG_Alarms": "vSBG_Alarms", + "vCTS_Alarms": "vCTS_Alarms" + }, + "eventSeverity": { + "NORMAL": "NORMAL", + "not-NORMAL": "not-NORMAL", + "OK": "OK", + "WARNING": "WARNING", + "MINOR": "MINOR", + "MAJOR": "MAJOR", + "CRITICAL": "CRITICAL" + }, + "timeWindow": 0, + "ageLimit": 1600, + "outputEventName": { + "": "", + "ONSET": "ONSET", + "ABATED": "ABATED" + }, + "createClosedLoopEventId": { + "Initial": "Initial", + "Close": "Close" + } + }, + "tca": { + "tname": "New_Set", + "tcaInt": "1", + "tcaVio": "1", + "tcaSev": { + "NORMAL": "NORMAL", + "CRITICAL": "CRITICAL", + "MAJOR": "MAJOR", + "MINOR": "MINOR", + "WARNING": "WARNING" + }, + "fieldPath": { + "FIELDPATH_test_1": "FIELDPATH_test_1", + "FIELDPATH_test_2": "FIELDPATH_test_2" + }, + "operator": { + ">": "GREATER", + "=": "EQUAL", + "<": "LESS" + }, + "opsPolicy": { + "POLICY_test_X": "POLICY_test_X", + "POLICY_test_Y": "POLICY_test_Y" + } + }, + "global": [ + { + "name": "actionSet", + "value": [ + "vnfRecipe" + ] + }, + { + "name": "location", + "value": [ + "SNDGCA64", + "ALPRGAED" + ] + }, + { + "name": "vf", + "value": [ + "f5213e3a-9191-4362-93b5-b67f8d770e44" + ] + }, + { + "name": "location", + "value": [ + "SNDGCA64", + "ALPRGAED", + "LSLEILAA", + "MDTWNJC1" + ] + } + ], + "policy": { + "pname": "0", + "timeout": 345, + "vnfRecipe": { + "": "", + "restart": "Restart", + "rebuild": "Rebuild", + "migrate": "Migrate", + "healthCheck": "Health Check", + "evacuate": "Evacuate" + }, + "enbRecipe": { + "": "", + "reset": "Reset" + }, + "maxRetries": "3", + "retryTimeLimit": 180, + "resource": { + "vCTS": "vCTS", + "v3CDB": "v3CDB", + "vUDR": "vUDR", + "vCOM": "vCOM", + "vRAR": "vRAR", + "vLCS": "vLCS", + "vUDR-BE": "vUDR-BE", + "vDBE": "vDBE" + }, + "parentPolicyConditions": { + "Failure_Retries": "Failure: Max Retries Exceeded", + "Failure_Timeout": "Failure: Time Limit Exceeded", + "Failure_Guard": "Failure: Guard", + "Failure_Exception": "Failure: Exception", + "Failure": "Failure: Other", + "Success": "Success" + } + }, + "shared": { + "byService": { + "": { + "vf": { + "": "" + }, + "location": { + "": "" + }, + "alarmCondition": { + "": "" + } + } + }, + "byVf": { + "": { + "vfc": { + "": "" + } + } + } + } +} -- cgit 1.2.3-korg