Fix YAML files linter errors for superfluous spaces/new lines
Change-Id: Id2b6b0966e07104b32c98053de04bd359dfef803
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Issue-ID: INT-1451
diff --git a/test/mocks/datafilecollector-testharness/ftps-sftp-server/docker-compose.yml b/test/mocks/datafilecollector-testharness/ftps-sftp-server/docker-compose.yml
index 466ca56..cdee4d5 100644
--- a/test/mocks/datafilecollector-testharness/ftps-sftp-server/docker-compose.yml
+++ b/test/mocks/datafilecollector-testharness/ftps-sftp-server/docker-compose.yml
@@ -33,4 +33,3 @@
- ./files/onap/ftps/:/srv/
restart: on-failure
command: vsftpd /etc/vsftpd_ssl.conf
-
diff --git a/test/mocks/hvvessimulator/hvves_sim.yaml b/test/mocks/hvvessimulator/hvves_sim.yaml
index c037036..dc868b5 100644
--- a/test/mocks/hvvessimulator/hvves_sim.yaml
+++ b/test/mocks/hvvessimulator/hvves_sim.yaml
@@ -3,7 +3,7 @@
heat_template_version: 2013-05-23
parameters:
- name: { description: Instance name, label: Name, type: string, default: hvves-sim }
+ name: { description: Instance name, label: Name, type: string, default: hvves-sim }
flavor_name: { description: Instance flavor to be used, label: Flavor Name, type: string }
image_name: { description: Ubuntu 16.04 image to be used, label: Image Name, type: string }
private_net_id: { description: Private network id, label: Private Network ID, type: string }
@@ -222,4 +222,3 @@
hvves-sim_public_ip:
description: HV-VES simualtor floating IP
value: { get_attr: [ hvves-sim_public, floating_ip_address ] }
-
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml
index 5dd8e6d..cef9d42 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml
@@ -162,4 +162,3 @@
port_id:
get_resource: PNF_PnP_simualtor_port0
type: OS::Neutron::FloatingIP
-
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
index 110dd16..a4bbcd9 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
@@ -61,4 +61,3 @@
- ./files/onap/:/srv/
restart: on-failure
command: vsftpd /etc/vsftpd_ssl.conf
-
diff --git a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml
index 3ad364d..2eae43f 100644
--- a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml
+++ b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml
@@ -76,7 +76,7 @@
tosca.datatypes.nfv.LocationInfo:
derived_from: tosca.datatypes.Root
- description: Represents geographical information on the location where a PNF is deployed.
+ description: Represents geographical information on the location where a PNF is deployed.
properties:
country_code:
type: string # two-letter ISO 3166 country code
@@ -91,7 +91,7 @@
tosca.datatypes.nfv.CivicAddressElement:
derived_from: tosca.datatypes.Root
- description: Represents an element of a civic location as specified in IETF RFC 4776 [11].
+ description: Represents an element of a civic location as specified in IETF RFC 4776 [11].
properties:
ca_type:
type: string # RFC4776
@@ -116,7 +116,7 @@
node_types:
tosca.nodes.nfv.Cp:
derived_from: tosca.nodes.Root
- description: Provides information regarding the purpose of the connection point
+ description: Provides information regarding the purpose of the connection point
properties:
layer_protocols:
type: list
diff --git a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
index 0df9bd2..c0ca061 100644
--- a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
+++ b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
@@ -415,7 +415,7 @@
description: Configuration parameters for the OperateVnf operation
required: false
change_ext_connectivity:
- type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration
+ type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration
description: Configuration parameters for the changeExtVnfConnectivityOpConfig operation
required: false
@@ -644,7 +644,7 @@
required: true
checksum:
type: string
- description: Checksum of the software image file
+ description: Checksum of the software image file
required: true
container_format:
type: string
@@ -660,7 +660,7 @@
- valid_values: [ aki, ami, ari, iso, qcow2, raw, vdi, vhd, vhdx, vmdk ]
min_disk:
type: scalar-unit.size # Number
- description: The minimal disk size requirement for this software image
+ description: The minimal disk size requirement for this software image
required: true
min_ram:
type: scalar-unit.size # Number
@@ -1195,7 +1195,7 @@
tosca.nodes.nfv.Vdu.Compute:
derived_from: tosca.nodes.Root
- description: Describes the virtual compute part of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC
+ description: Describes the virtual compute part of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC
properties:
name:
type: string
@@ -1304,7 +1304,7 @@
tosca.nodes.nfv.Cp:
derived_from: tosca.nodes.Root
- description: Provides information regarding the purpose of the connection point
+ description: Provides information regarding the purpose of the connection point
properties:
layer_protocols:
type: list
@@ -1435,7 +1435,7 @@
tosca.policies.nfv.VduInstantiationLevels:
derived_from: tosca.policies.Root
- description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1]
+ description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1]
properties:
levels:
type: map # key: levelId
@@ -1447,7 +1447,7 @@
tosca.policies.nfv.VirtualLinkInstantiationLevels:
derived_from: tosca.policies.Root
- description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1].
+ description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1].
properties:
levels:
type: map # key: levelId
@@ -1593,7 +1593,7 @@
tosca.policies.nfv.SupportedVnfInterface:
derived_from: tosca.policies.Root
- description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces
+ description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces
properties:
interface_name:
type: string
@@ -1606,4 +1606,3 @@
description: Provide additional data to access the interface endpoint
required: false
targets: [ tosca.nodes.nfv.VnfExtCp, tosca.nodes.nfv.VduCp ]
-
diff --git a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Events/MyPnf_Pnf_v1.yaml b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Events/MyPnf_Pnf_v1.yaml
index 840f338..8d3002b 100644
--- a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Events/MyPnf_Pnf_v1.yaml
+++ b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Events/MyPnf_Pnf_v1.yaml
@@ -205,9 +205,9 @@
eventSeverity: {presence: required}
vfStatus: {presence: required, value: Active}
alarmAdditionalInformation: {presence: required, structure: {
- keyValuePair: {presence: required, structure: {key: {presence: required, value: source},value: {presence: required}}},
- keyValuePair: {presence: required, structure: {key: {presence: required, value: probableCause},value: {presence: required, value: 'FileError'}}},
- keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalText},value: {presence: optional}}},
- keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalInfo},value: {presence: optional}}}}
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: source}, value: {presence: required}}},
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: probableCause}, value: {presence: required, value: 'FileError'}}},
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalText}, value: {presence: optional}}},
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalInfo}, value: {presence: optional}}}}
}
...
diff --git a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Measurements/PM_Dictionary.yaml b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Measurements/PM_Dictionary.yaml
index f9e41b3..d00a533 100644
--- a/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Measurements/PM_Dictionary.yaml
+++ b/test/mocks/pnf-onboarding/src/main/resources/csarContent/Files/Measurements/PM_Dictionary.yaml
@@ -39,148 +39,148 @@
vendor: Acme
pmDictionaryMeasurements:
- - measType: DRB.UEThpDl
- measDescription: Average DL UE throughput in gNB
- measCondition: See 3GPP TS 28.552
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: kbps
- measObjClass: NRCellDU
- measCollectionMethod: DER
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "Data Radio Bearer"
- measFamily: DRB
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true,
- "acmeParameter3": "acmeParameterValue3"}
+ - measType: DRB.UEThpDl
+ measDescription: Average DL UE throughput in gNB
+ measCondition: See 3GPP TS 28.552
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: kbps
+ measObjClass: NRCellDU
+ measCollectionMethod: DER
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "Data Radio Bearer"
+ measFamily: DRB
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true,
+ "acmeParameter3": "acmeParameterValue3"}
- - measType: VS.ifInDiscards
- measDescription: The number of inbound packets which were chosen to be discarded
- measCondition: The number of inbound packets which were chosen to be
- discarded even though no errors had been detected to prevent
- their being deliverable to a higher-layer protocol. One
- possible reason for discarding such a packet could be to
- free up buffer space.
- Discontinuities in the value of this counter can occur at
- re-initialization of the management system, and at other
- times as indicated by the value of
- ifCounterDiscontinuityTime.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true,
- "acmeParameter3": "acmeParameterValue3"}
+ - measType: VS.ifInDiscards
+ measDescription: The number of inbound packets which were chosen to be discarded
+ measCondition: The number of inbound packets which were chosen to be
+ discarded even though no errors had been detected to prevent
+ their being deliverable to a higher-layer protocol. One
+ possible reason for discarding such a packet could be to
+ free up buffer space.
+ Discontinuities in the value of this counter can occur at
+ re-initialization of the management system, and at other
+ times as indicated by the value of
+ ifCounterDiscontinuityTime.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true,
+ "acmeParameter3": "acmeParameterValue3"}
- - measType: VS.ifInErrors
- measDescription: Number of inbound packets that contained errors
- measCondition: For packet-oriented interfaces, the number of inbound
- packets that contained errors preventing them from being
- deliverable to a higher-layer protocol. For character-
- oriented or fixed-length interfaces, the number of inbound
- transmission units that contained errors preventing them
- from being deliverable to a higher-layer protocol.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: Gauge
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter3": "acmeParameterValue3"}
+ - measType: VS.ifInErrors
+ measDescription: Number of inbound packets that contained errors
+ measCondition: For packet-oriented interfaces, the number of inbound
+ packets that contained errors preventing them from being
+ deliverable to a higher-layer protocol. For character-
+ oriented or fixed-length interfaces, the number of inbound
+ transmission units that contained errors preventing them
+ from being deliverable to a higher-layer protocol.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: Gauge
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter3": "acmeParameterValue3"}
- - measType: VS.ifInUnknownProtos
- measDescription: Number of inbound packets received via an unknown or usupported protocol
- measCondition: For packet-oriented interfaces, the number of packets
- received via the interface which were discarded because of
- an unknown or unsupported protocol. For character-oriented
- or fixed-length interfaces that support protocol
- multiplexing the number of transmission units received via
- the interface which were discarded because of an unknown or
- unsupported protocol. For any interface that does not
- support protocol multiplexing, this counter will always be
- 0.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true}
+ - measType: VS.ifInUnknownProtos
+ measDescription: Number of inbound packets received via an unknown or usupported protocol
+ measCondition: For packet-oriented interfaces, the number of packets
+ received via the interface which were discarded because of
+ an unknown or unsupported protocol. For character-oriented
+ or fixed-length interfaces that support protocol
+ multiplexing the number of transmission units received via
+ the interface which were discarded because of an unknown or
+ unsupported protocol. For any interface that does not
+ support protocol multiplexing, this counter will always be
+ 0.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true}
- - measType: VS.ifHCInBroadcastPkts
- measDescription: Number of the broadcasted inbound packets delivered to the higher (sub-)layer
- measCondition: The number of packets, delivered by this sub-layer to a
- higher (sub-)layer, which were addressed to a broadcast
- address at this sub-layer. This object is a 64-bit version
- of ifInBroadcastPkts.
- Discontinuities in the value of this counter can occur at
- re-initialization of the management system, and at other
- times as indicated by the value of
- ifCounterDiscontinuityTime.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0}
+ - measType: VS.ifHCInBroadcastPkts
+ measDescription: Number of the broadcasted inbound packets delivered to the higher (sub-)layer
+ measCondition: The number of packets, delivered by this sub-layer to a
+ higher (sub-)layer, which were addressed to a broadcast
+ address at this sub-layer. This object is a 64-bit version
+ of ifInBroadcastPkts.
+ Discontinuities in the value of this counter can occur at
+ re-initialization of the management system, and at other
+ times as indicated by the value of
+ ifCounterDiscontinuityTime.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0}
- - measType: VS.ifHCOutBroadcastPkts
- measDescription: Number of the broadcasted outsbound packets delivered to the higher (sub-)layer
- measCondition: The total number of packets that higher-level protocols
- requested be transmitted, and which were addressed to a
- broadcast address at this sub-layer, including those that
- were discarded or not sent. This object is a 64-bit version
- of ifOutBroadcastPkts.
- Discontinuities in the value of this counter can occur at
- re-initialization of the management system, and at other
- times as indicated by the value of
- ifCounterDiscontinuityTime.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true,
- "acmeParameter3": "acmeParameterValue3"}
+ - measType: VS.ifHCOutBroadcastPkts
+ measDescription: Number of the broadcasted outsbound packets delivered to the higher (sub-)layer
+ measCondition: The total number of packets that higher-level protocols
+ requested be transmitted, and which were addressed to a
+ broadcast address at this sub-layer, including those that
+ were discarded or not sent. This object is a 64-bit version
+ of ifOutBroadcastPkts.
+ Discontinuities in the value of this counter can occur at
+ re-initialization of the management system, and at other
+ times as indicated by the value of
+ ifCounterDiscontinuityTime.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true,
+ "acmeParameter3": "acmeParameterValue3"}