From d70a11fa785aaaa78662e6ca1a4679102893713f Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 16 Nov 2017 15:06:29 -0800 Subject: Update line endings to match .gitattributes Change-Id: I18ceea59b6ff79ec7134a72029e86aa6e69eec7e Issue-ID: INT-278 Signed-off-by: Gary Wu --- .../assets/json_events/dcae_healthcheck.json | 8 +- .../json_events/ves_vfirewall_measurement.json | 70 ++++++------ .../ves_volte_fault_eventlist_batch.json | 124 ++++++++++----------- .../json_events/ves_volte_single_fault_event.json | 68 +++++------ .../ves_volte_single_fault_event_bad.json | 66 +++++------ .../jsoninput/hwvnfm_createtoken.json | 24 ++-- .../tosca-metadata/csar/test_entry.yaml | 46 ++++---- 7 files changed, 203 insertions(+), 203 deletions(-) diff --git a/test/csit/tests/dcaegen2/testcases/assets/json_events/dcae_healthcheck.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/dcae_healthcheck.json index 1c8f2e7ce..d612b0821 100644 --- a/test/csit/tests/dcaegen2/testcases/assets/json_events/dcae_healthcheck.json +++ b/test/csit/tests/dcaegen2/testcases/assets/json_events/dcae_healthcheck.json @@ -1,5 +1,5 @@ -{ - "path": "/reports/dcae/service-instances", - "start": "-24hour", - "end": "now" +{ + "path": "/reports/dcae/service-instances", + "start": "-24hour", + "end": "now" } \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json index 5dbedd3c5..5820fc8b3 100644 --- a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json +++ b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json @@ -1,36 +1,36 @@ -{ - "event": { - "commonEventHeader": { - "reportingEntityName": "VM name will be provided by ECOMP", - "startEpochMicrosec": 1506008587564787, - "lastEpochMicrosec": 1506008587564787, - "eventName": "Measurement_VFirewall_VNicStat", - "eventId": "0b2b5790-3673-480a-a4bd-5a00b88e5af6", - "sourceName": "Dummy VM name - No Metadata available", - "sequence": 18123, - "priority": "Normal", - "functionalRole": "vFirewall", - "domain": "measurementsForVfScaling", - "reportingEntityId": "VM UUID will be provided by ECOMP", - "sourceId": "Dummy VM UUID - No Metadata available", - "version": 1.1 - }, - "measurementsForVfScalingFields": { - "measurementInterval": 10, - "measurementsForVfScalingVersion": 1.1, - "vNicUsageArray": [{ - "multicastPacketsIn": 0, - "bytesIn": 3896, - "unicastPacketsIn": 0, - "multicastPacketsOut": 0, - "broadcastPacketsOut": 0, - "packetsOut": 28, - "bytesOut": 12178, - "broadcastPacketsIn": 0, - "packetsIn": 58, - "unicastPacketsOut": 0, - "vNicIdentifier": "eth0" - }] - } - } +{ + "event": { + "commonEventHeader": { + "reportingEntityName": "VM name will be provided by ECOMP", + "startEpochMicrosec": 1506008587564787, + "lastEpochMicrosec": 1506008587564787, + "eventName": "Measurement_VFirewall_VNicStat", + "eventId": "0b2b5790-3673-480a-a4bd-5a00b88e5af6", + "sourceName": "Dummy VM name - No Metadata available", + "sequence": 18123, + "priority": "Normal", + "functionalRole": "vFirewall", + "domain": "measurementsForVfScaling", + "reportingEntityId": "VM UUID will be provided by ECOMP", + "sourceId": "Dummy VM UUID - No Metadata available", + "version": 1.1 + }, + "measurementsForVfScalingFields": { + "measurementInterval": 10, + "measurementsForVfScalingVersion": 1.1, + "vNicUsageArray": [{ + "multicastPacketsIn": 0, + "bytesIn": 3896, + "unicastPacketsIn": 0, + "multicastPacketsOut": 0, + "broadcastPacketsOut": 0, + "packetsOut": 28, + "bytesOut": 12178, + "broadcastPacketsIn": 0, + "packetsIn": 58, + "unicastPacketsOut": 0, + "vNicIdentifier": "eth0" + }] + } + } } \ No newline at end of file diff --git a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json index 9a711507a..2d931a96a 100644 --- a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json +++ b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json @@ -1,62 +1,62 @@ -{ - "eventList": [ - { - "commonEventHeader": { - "version": 3.0, - "domain": "fault", - "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion", - "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546016", - "sequence": 0, - "priority": "High", - "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", - "reportingEntityName": "EricssonOamVf", - "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", - "sourceName": "scfx0001vm002cap001", - "nfNamingCode": "scfx", - "nfcNamingCode": "ssc", - "startEpochMicrosec": 1413378172000000, - "lastEpochMicrosec": 1413378172000000 - }, - "faultFields": { - "faultFieldsVersion": 2.0, - "alarmCondition": "PilotNumberPoolExhaustion", - "eventSourceType": "other", - "specificProblem": "Calls cannot complete - pilot numbers are unavailable", - "eventSeverity": "CRITICAL", - "vfStatus": "Active", - "alarmAdditionalInformation": [ - { - "name": "PilotNumberPoolSize", - "value": "1000" - } - ] - } - }, - { - "commonEventHeader": { - "version": 3.0, - "domain": "fault", - "eventName": "Fault_MobileCallRecording_RecordingServerUnreachable", - "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546025", - "sequence": 0, - "priority": "High", - "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", - "reportingEntityName": "EricssonOamVf", - "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", - "sourceName": "scfx0001vm002cap001", - "nfNamingCode": "scfx", - "nfcNamingCode": "ssc", - "startEpochMicrosec": 1413378172000010, - "lastEpochMicrosec": 1413378172000010 - }, - "faultFields": { - "faultFieldsVersion": 2.0, - "alarmCondition": "RecordingServerUnreachable", - "eventSourceType": "other", - "specificProblem": "Recording server unreachable", - "eventSeverity": "CRITICAL", - "vfStatus": "Active" - } - } - ] -} +{ + "eventList": [ + { + "commonEventHeader": { + "version": 3.0, + "domain": "fault", + "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion", + "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546016", + "sequence": 0, + "priority": "High", + "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", + "reportingEntityName": "EricssonOamVf", + "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", + "sourceName": "scfx0001vm002cap001", + "nfNamingCode": "scfx", + "nfcNamingCode": "ssc", + "startEpochMicrosec": 1413378172000000, + "lastEpochMicrosec": 1413378172000000 + }, + "faultFields": { + "faultFieldsVersion": 2.0, + "alarmCondition": "PilotNumberPoolExhaustion", + "eventSourceType": "other", + "specificProblem": "Calls cannot complete - pilot numbers are unavailable", + "eventSeverity": "CRITICAL", + "vfStatus": "Active", + "alarmAdditionalInformation": [ + { + "name": "PilotNumberPoolSize", + "value": "1000" + } + ] + } + }, + { + "commonEventHeader": { + "version": 3.0, + "domain": "fault", + "eventName": "Fault_MobileCallRecording_RecordingServerUnreachable", + "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546025", + "sequence": 0, + "priority": "High", + "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", + "reportingEntityName": "EricssonOamVf", + "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", + "sourceName": "scfx0001vm002cap001", + "nfNamingCode": "scfx", + "nfcNamingCode": "ssc", + "startEpochMicrosec": 1413378172000010, + "lastEpochMicrosec": 1413378172000010 + }, + "faultFields": { + "faultFieldsVersion": 2.0, + "alarmCondition": "RecordingServerUnreachable", + "eventSourceType": "other", + "specificProblem": "Recording server unreachable", + "eventSeverity": "CRITICAL", + "vfStatus": "Active" + } + } + ] +} diff --git a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json index a45c51dd9..2ccb3f649 100644 --- a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json +++ b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json @@ -1,34 +1,34 @@ -{ - "event": { - "commonEventHeader": { - "version": 3.0, - "domain": "fault", - "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion", - "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546015", - "sequence": 0, - "priority": "High", - "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", - "reportingEntityName": "EricssonOamVf", - "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", - "sourceName": "scfx0001vm002cap001", - "nfNamingCode": "scfx", - "nfcNamingCode": "ssc", - "startEpochMicrosec": 1413378172000000, - "lastEpochMicrosec": 1413378172000000 - }, - "faultFields": { - "faultFieldsVersion": 2.0, - "alarmCondition": "PilotNumberPoolExhaustion", - "eventSourceType": "other", - "specificProblem": "Calls cannot complete - pilot numbers are unavailable", - "eventSeverity": "CRITICAL", - "vfStatus": "Active", - "alarmAdditionalInformation": [ - { - "name": "PilotNumberPoolSize", - "value": "1000" - } - ] - } - } -} +{ + "event": { + "commonEventHeader": { + "version": 3.0, + "domain": "fault", + "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion", + "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546015", + "sequence": 0, + "priority": "High", + "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", + "reportingEntityName": "EricssonOamVf", + "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", + "sourceName": "scfx0001vm002cap001", + "nfNamingCode": "scfx", + "nfcNamingCode": "ssc", + "startEpochMicrosec": 1413378172000000, + "lastEpochMicrosec": 1413378172000000 + }, + "faultFields": { + "faultFieldsVersion": 2.0, + "alarmCondition": "PilotNumberPoolExhaustion", + "eventSourceType": "other", + "specificProblem": "Calls cannot complete - pilot numbers are unavailable", + "eventSeverity": "CRITICAL", + "vfStatus": "Active", + "alarmAdditionalInformation": [ + { + "name": "PilotNumberPoolSize", + "value": "1000" + } + ] + } + } +} diff --git a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json index fd831cee2..b36c27df0 100644 --- a/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json +++ b/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json @@ -1,34 +1,34 @@ -{ - "event": { - "commonEventHeader": { - "version": 3.0 - "domain": "fault", - "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion", - "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546015", - "sequence": 0, - "priority": "High", - "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", - "reportingEntityName": "EricssonOamVf", - "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", - "sourceName": "scfx0001vm002cap001", - "nfNamingCode": "scfx", - "nfcNamingCode": "ssc", - "startEpochMicrosec": 1413378172000000, - "lastEpochMicrosec": 1413378172000000 - }, - "faultFields": { - "faultFieldsVersion": 2.0, - "alarmCondition": "PilotNumberPoolExhaustion", - "eventSourceType": "other", - "specificProblem": "Calls cannot complete - pilot numbers are unavailable", - "eventSeverity": "CRITICAL", - "vfStatus": "Active", - "alarmAdditionalInformation": [ - { - "name": "PilotNumberPoolSize", - "value": "1000" - } - ] - } - } +{ + "event": { + "commonEventHeader": { + "version": 3.0 + "domain": "fault", + "eventName": "Fault_MobileCallRecording_PilotNumberPoolExhaustion", + "eventId": "ab305d54-85b4-a31b-7db2-fb6b9e546015", + "sequence": 0, + "priority": "High", + "reportingEntityId": "cc305d54-75b4-431b-adb2-eb6b9e541234", + "reportingEntityName": "EricssonOamVf", + "sourceId": "de305d54-75b4-431b-adb2-eb6b9e546014", + "sourceName": "scfx0001vm002cap001", + "nfNamingCode": "scfx", + "nfcNamingCode": "ssc", + "startEpochMicrosec": 1413378172000000, + "lastEpochMicrosec": 1413378172000000 + }, + "faultFields": { + "faultFieldsVersion": 2.0, + "alarmCondition": "PilotNumberPoolExhaustion", + "eventSourceType": "other", + "specificProblem": "Calls cannot complete - pilot numbers are unavailable", + "eventSeverity": "CRITICAL", + "vfStatus": "Active", + "alarmAdditionalInformation": [ + { + "name": "PilotNumberPoolSize", + "value": "1000" + } + ] + } + } } \ No newline at end of file diff --git a/test/csit/tests/vfc/nfvo-driver-svnfm/jsoninput/hwvnfm_createtoken.json b/test/csit/tests/vfc/nfvo-driver-svnfm/jsoninput/hwvnfm_createtoken.json index e9a6c3e92..d21664b09 100644 --- a/test/csit/tests/vfc/nfvo-driver-svnfm/jsoninput/hwvnfm_createtoken.json +++ b/test/csit/tests/vfc/nfvo-driver-svnfm/jsoninput/hwvnfm_createtoken.json @@ -1,13 +1,13 @@ -{ - "auth": { - "identity": { - "methods": ["password"], - "password": { - "user": { - "name": "admin", - "password": "User@12345" - } - } - } - } +{ + "auth": { + "identity": { + "methods": ["password"], + "password": { + "user": { + "name": "admin", + "password": "User@12345" + } + } + } + } } \ No newline at end of file diff --git a/test/csit/tests/vnfsdk-pkgtools/tosca-metadata/csar/test_entry.yaml b/test/csit/tests/vnfsdk-pkgtools/tosca-metadata/csar/test_entry.yaml index d1aed3c18..5c2f8909f 100644 --- a/test/csit/tests/vnfsdk-pkgtools/tosca-metadata/csar/test_entry.yaml +++ b/test/csit/tests/vnfsdk-pkgtools/tosca-metadata/csar/test_entry.yaml @@ -1,23 +1,23 @@ -# -# Copyright (c) 2017 GigaSpaces Technologies Ltd. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -tosca_definitions_version: tosca_simple_yaml_1_0 - -topology_template: - node_templates: - test_node: - type: tosca.nodes.Compute - +# +# Copyright (c) 2017 GigaSpaces Technologies Ltd. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +tosca_definitions_version: tosca_simple_yaml_1_0 + +topology_template: + node_templates: + test_node: + type: tosca.nodes.Compute + -- cgit 1.2.3-korg