Skip to content

Commit 2416231

Browse files
committed
Add annotations for routes and templates and update custom attribute test constant
1 parent 3366d16 commit 2416231

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

app/models/manageiq/providers/openshift/inventory/parser/openshift_parser_mixin.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ def routes
3434

3535
container_route = persister.container_routes.build(h)
3636

37+
annotations = parse_annotations(data)
3738
custom_attributes(container_route, custom_attrs)
39+
custom_attributes(container_route, :annotations => annotations)
3840
taggings(container_route, tags)
3941
end
4042
end
@@ -73,6 +75,8 @@ def templates
7375

7476
container_template = persister.container_templates.build(h)
7577

78+
annotations = parse_annotations(data)
79+
custom_attributes(container_template, :annotations => annotations)
7680
template_parameters(container_template, parameters)
7781
custom_attributes(container_template, custom_attrs)
7882
end

spec/models/manageiq/providers/openshift/container_manager/refresher_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def full_refresh_test
139139
'ContainerReplicator' => 2,
140140
'ContainerBuild' => 2,
141141
'ContainerBuildPod' => 2,
142-
'CustomAttribute' => 17,
142+
'CustomAttribute' => 25,
143143
'ContainerTemplateParameter' => 3,
144144
}
145145
expected_counts = deleted.collect { |k, d| [k, object_counts[k] - d] }.to_h
@@ -487,7 +487,7 @@ def tag_in_category_with_description(category, description)
487487
'ContainerReplicator' => 3,
488488
'ContainerBuild' => 3,
489489
'ContainerBuildPod' => 3,
490-
'CustomAttribute' => 7704,
490+
'CustomAttribute' => 10188,
491491
}
492492
end
493493

0 commit comments

Comments
 (0)