@@ -202,27 +202,20 @@ func (spec *TelemetrySpecCore) ValidateTelemetryTopology(basePath *field.Path, n
202202
203203 // When a TopologyRef CR is referenced, fail if a different Namespace is
204204 // referenced because is not supported
205- if spec .TopologyRef != nil {
206- if err := topologyv1 .ValidateTopologyNamespace (spec .TopologyRef .Namespace , * basePath , namespace ); err != nil {
207- allErrs = append (allErrs , err )
208- }
209- }
205+ allErrs = append (allErrs , topologyv1 .ValidateTopologyRef (
206+ spec .TopologyRef , * basePath .Child ("topologyRef" ), namespace )... )
210207
211208 // When a TopologyRef CR is referenced with an override to Aodh, fail
212209 // if a different Namespace is referenced because not supported
213- if spec .Autoscaling .Aodh .TopologyRef != nil {
214- if err := topologyv1 .ValidateTopologyNamespace (spec .Autoscaling .Aodh .TopologyRef .Namespace , * basePath , namespace ); err != nil {
215- allErrs = append (allErrs , err )
216- }
217- }
210+ aodhPath := basePath .Child ("autoscaling" ).Child ("aodh" )
211+ allErrs = append (allErrs ,
212+ spec .Autoscaling .Aodh .ValidateTopology (aodhPath , namespace )... )
218213
219214 // When a TopologyRef CR is referenced with an override to Ceilometer,
220215 // fail if a different Namespace is referenced because not supported
221- if spec .Ceilometer .TopologyRef != nil {
222- if err := topologyv1 .ValidateTopologyNamespace (spec .Ceilometer .TopologyRef .Namespace , * basePath , namespace ); err != nil {
223- allErrs = append (allErrs , err )
224- }
225- }
216+ ceilPath := basePath .Child ("ceilometer" )
217+ allErrs = append (allErrs ,
218+ spec .Ceilometer .ValidateTopology (ceilPath , namespace )... )
226219
227220 return allErrs
228221}
@@ -233,27 +226,20 @@ func (spec *TelemetrySpec) ValidateTelemetryTopology(basePath *field.Path, names
233226
234227 // When a TopologyRef CR is referenced, fail if a different Namespace is
235228 // referenced because is not supported
236- if spec .TopologyRef != nil {
237- if err := topologyv1 .ValidateTopologyNamespace (spec .TopologyRef .Namespace , * basePath , namespace ); err != nil {
238- allErrs = append (allErrs , err )
239- }
240- }
229+ allErrs = append (allErrs , topologyv1 .ValidateTopologyRef (
230+ spec .TopologyRef , * basePath .Child ("topologyRef" ), namespace )... )
241231
242232 // When a TopologyRef CR is referenced with an override to Aodh, fail
243233 // if a different Namespace is referenced because not supported
244- if spec .Autoscaling .Aodh .TopologyRef != nil {
245- if err := topologyv1 .ValidateTopologyNamespace (spec .Autoscaling .Aodh .TopologyRef .Namespace , * basePath , namespace ); err != nil {
246- allErrs = append (allErrs , err )
247- }
248- }
234+ aodhPath := basePath .Child ("autoscaling" ).Child ("aodh" )
235+ allErrs = append (allErrs ,
236+ spec .Autoscaling .Aodh .ValidateTopology (aodhPath , namespace )... )
249237
250238 // When a TopologyRef CR is referenced with an override to Ceilometer,
251239 // fail if a different Namespace is referenced because not supported
252- if spec .Ceilometer .TopologyRef != nil {
253- if err := topologyv1 .ValidateTopologyNamespace (spec .Ceilometer .TopologyRef .Namespace , * basePath , namespace ); err != nil {
254- allErrs = append (allErrs , err )
255- }
256- }
240+ ceilPath := basePath .Child ("ceilometer" )
241+ allErrs = append (allErrs ,
242+ spec .Ceilometer .ValidateTopology (ceilPath , namespace )... )
257243
258244 return allErrs
259245}
0 commit comments