From: Sylvain Desbureaux Date: Thu, 21 Oct 2021 05:18:27 +0000 (+0000) Subject: Merge "[COMMON] Fix trailing blanks found by pre-commit" X-Git-Tag: 9.0.0~63 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=2c2be1eea53e97cc1972c0b89571baff92e59484;hp=31bb6fe2a093273e4a10cd0c46adfae75f736cd6 Merge "[COMMON] Fix trailing blanks found by pre-commit" --- diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml index 42692dd544..3941af3747 100644 --- a/kubernetes/aai/components/aai-resources/values.yaml +++ b/kubernetes/aai/components/aai-resources/values.yaml @@ -51,7 +51,7 @@ global: # global defaults # Active spring profiles for the resources microservice profiles: - # aaf-auth profile will be automatically set if aaf enabled is set to true + # aaf-auth profile will be automatically set if aaf enabled is set to true active: production,dmaap #,aaf-auth # Notification event specific properties diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml index 561f203bd0..e88231619b 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/faultMnS.yaml @@ -545,7 +545,7 @@ components: #---- End of definitions to be moved to comDefs.yaml -------------------------------# #---- Definition of AlarmRecord ----------------------------------------------------# - + AlarmId: type: string AlarmType: @@ -729,7 +729,7 @@ components: type: string #---- Definition of alarm notifications --------------------------------------------# - + AlarmNotificationTypes: type: string enum: @@ -801,7 +801,7 @@ components: - perceivedSeverity - serviceUser - serviceProvider - - securityAlarmDetector + - securityAlarmDetector properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -1033,7 +1033,7 @@ components: $ref: '#/components/schemas/AlarmListAlignmentRequirement' #---- Definition of query parameters -----------------------------------------------# - + AlarmAckState: type: string enum: diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml index 070ad09dc0..f826569229 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/genericNrm.yaml @@ -262,7 +262,7 @@ components: enum: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - STREAM_BASED ReportingCtrl: oneOf: - type: object @@ -315,7 +315,7 @@ components: $ref: '#/components/schemas/NotificationType' #-------- Definition of types used in Trace control NRM fragment------------------ - + tjJobType-Type: type: string description: Specifies whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined Trace and MDT job. Applicable for Trace, MDT, RCEF and RLF reporting. See 3GPP TS 32.422 clause 5.9a for additional details. @@ -772,14 +772,14 @@ components: required: - NetworkElement - EventBitmap - + tjMDTAnonymizationOfData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. type: string enum: - NO_IDENTITY - TAC_OF_IMEI - + tjMDTAreaConfigurationForNeighCell-Type: description: Used for logged NR MDT and defines the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. For additional details see 3GPP TS 32.422 clause 5.10.26. type: array @@ -790,12 +790,12 @@ components: type: string cell: type: string - + tjMDTAreaScope-Type: description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2. allOf: - $ref: '#/components/schemas/DnList' - + tjMDTCollectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string @@ -827,7 +827,7 @@ components: - 5120ms - 10240ms - 1min - + tjMDTEventListForTriggeredMeasurement-Type: description: See details in 3GPP TS 32.422 clause 5.10.28. type: string @@ -843,7 +843,7 @@ components: type: integer minimum: 0 maximum: 97 - EventThresholdRSRQ: + EventThresholdRSRQ: type: integer minimum: 0 maximum: 34 @@ -925,7 +925,7 @@ components: - 3600s - 5400s - 7200s - + tjMDTLoggingInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.8. type: string @@ -1258,7 +1258,7 @@ components: tjJobType: $ref: '#/components/schemas/tjJobType-Type' tjListOfInterfaces: - $ref: '#/components/schemas/tjListOfInterfaces-Type' + $ref: '#/components/schemas/tjListOfInterfaces-Type' tjListOfNeTypes: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml index 02ab23ce25..85a8ac1fd5 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/nrNrm.yaml @@ -398,7 +398,7 @@ components: RSSetId: type: integer maximum: 4194303 - + RSSetType: type: string enum: @@ -440,7 +440,7 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE RIMRSScrambleTimerMultiplier: type: integer RIMRSScrambleTimerOffset: @@ -501,12 +501,12 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE enablenearfarIndicationRS2: type: string enum: - ENABLE - - DISABLE + - DISABLE RimRSReportInfo: type: object @@ -521,7 +521,7 @@ components: - RS1 - RS2 - RS1forEnoughMitigation - - RS1forNotEnoughMitigation + - RS1forNotEnoughMitigation RimRSReportConf: type: object @@ -530,7 +530,7 @@ components: type: string enum: - ENABLE - - DISABLE + - DISABLE reportInterval: type: integer nrofRIMRSReportInfo: @@ -1199,7 +1199,7 @@ components: - $ref: 'genericNRM.yaml#/components/schemas/Top-Attr' - type: object properties: - attributes: + attributes: type: object properties: dmroControl: diff --git a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml index 8e03d5ec92..caf83ee62b 100644 --- a/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml +++ b/kubernetes/dcaegen2-services/resources/external/schemas/sa88-rel16/sliceNrm.yaml @@ -297,7 +297,7 @@ components: $ref: '#/components/schemas/SliceProfileList' EPTransport: $ref: '#/components/schemas/EP_Transport-Multiple' - + EP_Transport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -309,11 +309,11 @@ components: ipAddress: $ref: '#/components/schemas/IpAddress' logicInterfaceId: - type: string + type: string nextHopInfo: - type: string + type: string qosProfile: - type: string + type: string EP_Transport-Multiple: type: array diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml index c7ac9ad600..a1833568e9 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml @@ -106,7 +106,7 @@ mariadb-galera: name: &mysqlDbName datarouter user: datarouter # password: - externalSecret: *dbUserSecretName + externalSecret: *dbUserSecretName service: name: *dbServer nfsprovisionerPrefix: dmaap-dr-db diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml index 6904e35bce..fd6de7e5c0 100644 --- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml +++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml @@ -58,4 +58,3 @@ server: # See springboot documentation. port: 8083 - \ No newline at end of file diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml index 9d7e19d73d..74cf74f36d 100644 --- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml +++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml @@ -102,7 +102,7 @@ readiness: initialDelaySeconds: 20 periodSeconds: 10 port: http-api - + service: type: ClusterIP name: policy-clamp-cl-k8s-ppnt