Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gNMI-1.4 to validate subcomponents paths. #3132

Merged
merged 10 commits into from
Jun 26, 2024
Merged

Update gNMI-1.4 to validate subcomponents paths. #3132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78a28b4
Add subcomponents/ to README.
SydneyCaulfeild Jun 25, 2024
7151b25
Check that subcomponent exists in telemetry_inventory_test.
SydneyCaulfeild Jun 25, 2024
7de9e63
Update README - validate sucomponent name for any component type.
SydneyCaulfeild Jun 25, 2024
2bcd619
Merge branch 'main' into update-gnmi-1.4-with-subcomponents
SydneyCaulfeild Jun 25, 2024
df33ec3
Fix iteration over subcomponents.
SydneyCaulfeild Jun 25, 2024
06bc90c
Merge branch 'main' into update-gnmi-1.4-with-subcomponents
SydneyCaulfeild Jun 25, 2024
73304b3
Rename variable.
SydneyCaulfeild Jun 25, 2024
89783f8
Add else for empty subcomponent.
SydneyCaulfeild Jun 25, 2024
f3c9223
Access subcomponent directly.
SydneyCaulfeild Jun 25, 2024
c1b2266
Rename function and update comment
SydneyCaulfeild Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions feature/platform/tests/telemetry_inventory_test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ paths:
platform_type: ["SENSOR"]
/components/component/state/temperature/max-time:
platform_type: ["SENSOR"]
/components/component/subcomponents/subcomponent/name:
platform_type: ["CHASSIS", "CONTROLLER_CARD", "CPU", "FABRIC", "FAN", "FAN_TRAY", "INTEGRATED_CIRCUIT", "LINECARD", "POWER_SUPPLY", "SENSOR", "STORAGE", "TRANSCEIVER"]
/components/component/subcomponents/subcomponent/state/name:
platform_type: ["CHASSIS", "CONTROLLER_CARD", "CPU", "FABRIC", "FAN", "FAN_TRAY", "INTEGRATED_CIRCUIT", "LINECARD", "POWER_SUPPLY", "SENSOR", "STORAGE", "TRANSCEIVER"]
/components/component/integrated-circuit/backplane-facing-capacity/state/available-pct:
platform_type: ["INTEGRATED_CIRCUIT"]
/components/component/integrated-circuit/backplane-facing-capacity/state/consumed-capacity:
Expand Down
23 changes: 23 additions & 0 deletions feature/platform/tests/telemetry_inventory_test/telemetry_inventory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ func TestMain(m *testing.M) {
// - integrated-circuit/backplane-facing-capacity/state/consumed-capacity
// - integrated-circuit/backplane-facing-capacity/state/total
// - integrated-circuit/backplane-facing-capacity/state/total-operational-capacity
// - components/component/subcomponents/subcomponent/name
// - components/component/subcomponents/subcomponent/state/name
// - Transceiver
// - Storage
// - Validate telemetry /components/component/storage exists.
Expand Down Expand Up @@ -577,6 +579,26 @@ func TestControllerCardEmpty(t *testing.T) {
}
}

// validateSubcomponentsExistAsComponents checks that if the given component has subcomponents, that
// those subcomponents exist as components on the device (i.e. the leafref is valid).
func validateSubcomponentsExistAsComponents(c *oc.Component, components []*oc.Component, t *testing.T) {
// Note that this will get the subcomponents regardless of whether they are stored in
// subcomponent/name or subcomponent/state/name.
for _, s := range c.Subcomponent {
sName := s.GetName()
if sName != "" {
for _, component := range components {
if component.GetName() == sName {
continue
}
}
t.Errorf("Subcomponent %s not found in list of components", sName)
} else {
t.Errorf("Component %s has empty subcomponent name", c.GetName())
}
}
}

func ValidateComponentState(t *testing.T, dut *ondatra.DUTDevice, cards []*oc.Component, p properties) {
var validCards []*oc.Component
switch p.pType {
Expand All @@ -601,6 +623,7 @@ func ValidateComponentState(t *testing.T, dut *ondatra.DUTDevice, cards []*oc.Co
}
cName := card.GetName()
t.Run(cName, func(t *testing.T) {
validateSubcomponentsExistAsComponents(card, validCards, t)
if p.descriptionValidation {
t.Logf("Component %s Description: %s", cName, card.GetDescription())
if card.GetDescription() == "" {
Expand Down
Loading