Codestin Search App

agvarghe-cisco · 2022-10-18T11:54:30Z

Changes for Vendor specific component names

coveralls · 2022-10-18T12:01:14Z

Pull Request Test Coverage Report for Build 4187548594

0 of 0 changed or added relevant lines in 0 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage remained the same at 57.219%

Totals
Change from base Build 4185323784:	0.0%
Covered Lines:	1181
Relevant Lines:	2064

💛 - Coveralls

xw-g · 2022-10-21T19:55:56Z

maybe @dplore and @bstoll can help share opinions about handling vendor names?

prinikasn · 2023-01-10T17:04:21Z

+			"Supervisor":  "Chassis",
+			"SwitchChip":  "Linecard",
+		},
+	}


Should there be a default component list and a vendor specific list? With this change we are restricting only to ARISTA and CISCO

The code should be refactored to find components by the openconfig defined types. For example, a NOS (network operating system) should use the appropriate type for their CONTROLLER_CARD and will use a NOS specific 'name' value for the. (routing-engine vs. supervisor, etc).

https://openconfig.net/projects/models/schemadocs/yangdoc/openconfig-platform.html#openconfig-platform-types-identities

Example code to look up component name based on component identity (type):

featureprofiles/internal/components/components.go

Lines 40 to 59 in 04860e1

func FindComponentsByType(t *testing.T, dut *ondatra.DUTDevice, cType oc.E_PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT) []string {

components := gnmi.GetAll[*oc.Component](t, dut, gnmi.OC().ComponentAny().State())

var s []string

for _, c := range components {

if c.GetType() == nil {

t.Logf("Component %s type is missing from telemetry", c.GetName())

continue

}

t.Logf("Component %s has type: %v", c.GetName(), c.GetType())

switch v := c.GetType().(type) {

case oc.E_PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT:

if v == cType {

s = append(s, c.GetName())

}

default:

t.Logf("Detected non-hardware component: (%T, %v)", c.GetType(), c.GetType())

}

}

return s

}

@dplore , Changed to using FindComponentsByType

prinikasn

Does the regex under subtest TestSupervisorLastRebootInfo also need to be updated?

prinikasn · 2023-01-10T22:35:52Z


-	r := regexp.MustCompile("^CPU")
+	supervisorMap := map[ondatra.Vendor]string{
+		ondatra.ARISTA: "^Supervisor[0-9]",


Shouldnt this be "^CPU" ?

There should be a lookup for a component with identity "CPU". Supervisor is an Arista EOS name for an OpenConfig "CONTROLLER_CARD".

Similar discussions in #829

Changed to oc.PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT_CPU for CPU component

prinikasn · 2023-01-13T23:58:30Z

-		t.Fatalf("Get CPU list for %q: got 0, want > 0", dut.Model())
-	}
+	cpus := components.FindComponentsByType(t, dut, cpuType)
+	t.Logf("Found card list: %v", cpus)


nit. "Found CPU list" ? Since this is looking for CPU?

prinikasn · 2023-01-14T00:01:52Z

-	if len(cpus) == 0 {
-		t.Fatalf("Get CPU list for %q: got 0, want > 0", dut.Model())
-	}
+	cpus := components.FindComponentsByType(t, dut, cpuType)


Also, should we keep the check for cpus length here? It seems right now if there is some error and 0 CPU found, this test will pass w/o actually testing anything (which is not ideal)

Sim. applicable for all len check in other subtests

aaronmillisor · 2023-01-19T02:36:56Z

+	linecardType    = oc.PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT_LINECARD
+	powerSupplyType = oc.PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT_POWER_SUPPLY
+	fabricType      = oc.PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT_FABRIC
+	fabricChipType  = oc.PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT_FRU


Shouldn't fabric chip type be "integrated circuit" ?

xw-g · 2023-02-07T17:16:47Z

@MarcCharlebois can you help review it for Nokia? Thanks.

MarcCharlebois · 2023-02-10T23:35:57Z

@MarcCharlebois can you help review it for Nokia? Thanks.

Perhaps not specifically to this PR, but relating to this test. In this replace, there's no value set in /components/component[name="whatevername"]/config/name, other p4rt tests handle that.

featureprofiles/feature/gnmi/ate_tests/telemetry_basic_check_test/telemetry_basic_check_test.go

Line 700 in 41d8328

    
           gnmi.Replace(t, dut, gnmi.OC().Component(*p4rtNodeName).IntegratedCircuit().Config(), ic)

My suggestion is to replace how the component is created and update the Replace call for the comp

func TestP4rtNodeID(t *testing.T) {
	// TODO: add p4rtNodeName to Ondatra's netutil
	dut := ondatra.DUT(t, "dut")
	d := &oc.Root{}
	comp := d.GetOrCreateComponent(*p4rtNodeName)
	comp.Name = ygot.String(*p4rtNodeName)
	ic := comp.GetOrCreateIntegratedCircuit()

			gnmi.Replace(t, dut, gnmi.OC().Component(*p4rtNodeName).Config(), comp)

If required, I can raise a PR for that - else we can take care of it in this one.

thesrinath · 2023-02-15T00:31:29Z

 )

+const (
+	chasisType      = oc.PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT_CHASSIS


fix typo for chassis

guoshiuan · 2023-02-15T18:45:24Z

/gcbrun

guoshiuan · 2023-02-15T19:35:18Z

The internal test result: b/264892365.

thesrinath · 2023-02-15T19:47:19Z

/gcbrun

* Changes for Vendor specific component names * Review comments * Review comments * Review comments * Changing fabric chip type as integrated circuit * Add check for switchchip and fabricchip parent component * Modifying parent component check * Optimize run time * Changes to p4rt test * Fix Typo --------- Co-authored-by: vbhan-cisco <[email protected]>

Reference: openconfig#652

) * Replicate PR545/546 in OTG telemetry basic test References: - #545 - #546 * Replicate PR642 in OTG telemetry basic test Reference: #642 * Replicate PR890 in OTG telemetry basic test Reference: #890 * Replicate PR1025 in OTG telemetry basic test Reference: #1025 * Replicate PR652 in OTG telemetry basic test Reference: #652 * Replicate PR1196 in OTG telemetry basic test Reference: #1196 * Replicate PR1195 in OTG telemetry basic test Reference: #1195 * Replicate PR1211 in OTG telemetry basic test Reference: #1211 * Replicate PR1248 in OTG telemetry basic test Reference: #1248 * Replicate PR1212 in OTG telemetry basic test Reference: #1212 * Replicate PR1317 in OTG telemetry basic test Reference: #1317 * Remove extra subintf enabled bit not guarded by correct deviations

* Changes for Vendor specific component names * Review comments * Review comments * Review comments * Changing fabric chip type as integrated circuit * Add check for switchchip and fabricchip parent component * Modifying parent component check * Optimize run time * Changes to p4rt test * Fix Typo --------- Co-authored-by: vbhan-cisco <[email protected]>

) * Replicate PR545/546 in OTG telemetry basic test References: - #545 - #546 * Replicate PR642 in OTG telemetry basic test Reference: #642 * Replicate PR890 in OTG telemetry basic test Reference: #890 * Replicate PR1025 in OTG telemetry basic test Reference: #1025 * Replicate PR652 in OTG telemetry basic test Reference: #652 * Replicate PR1196 in OTG telemetry basic test Reference: #1196 * Replicate PR1195 in OTG telemetry basic test Reference: #1195 * Replicate PR1211 in OTG telemetry basic test Reference: #1211 * Replicate PR1248 in OTG telemetry basic test Reference: #1248 * Replicate PR1212 in OTG telemetry basic test Reference: #1212 * Replicate PR1317 in OTG telemetry basic test Reference: #1317 * Remove extra subintf enabled bit not guarded by correct deviations

Changes for Vendor specific component names

660db22

agvarghe-cisco requested a review from a team as a code owner October 18, 2022 11:54

agvarghe-cisco requested a review from hariramnat October 18, 2022 11:54

agvarghe-cisco changed the title ~~Changes for Vendor specific component names~~ gNMI-1.10 - Changes for Vendor specific component names Oct 18, 2022

Merge branch 'openconfig:main' into component_vendor_name

734bedd

prinikasn reviewed Jan 10, 2023

View reviewed changes

prinikasn requested review from vosipchu and removed request for hariramnat January 10, 2023 17:09

prinikasn reviewed Jan 10, 2023

View reviewed changes

mojiiba added the cisco-pr label Jan 11, 2023

Merge branch 'openconfig:main' into component_vendor_name

06bf29b

agvarghe-cisco requested a review from a team January 12, 2023 06:53

agvarghe-cisco added 2 commits January 12, 2023 20:55

Review comments

7d1e121

Review comments

717d95d

prinikasn reviewed Jan 13, 2023

View reviewed changes

prinikasn reviewed Jan 14, 2023

View reviewed changes

agvarghe-cisco and others added 2 commits January 17, 2023 21:27

Review comments

522ace3

Merge branch 'openconfig:main' into component_vendor_name

1ee52c3

aaronmillisor reviewed Jan 19, 2023

View reviewed changes

agvarghe-cisco and others added 4 commits January 20, 2023 20:47

Changing fabric chip type as integrated circuit

a9e88f6

Merge branch 'openconfig:main' into component_vendor_name

4fefa08

Merge branch 'openconfig:main' into component_vendor_name

ba247e7

Add check for switchchip and fabricchip parent component

6e425ed

agvarghe-cisco requested review from aaronmillisor and prinikasn and removed request for aaronmillisor January 25, 2023 10:57

agvarghe-cisco requested a review from aaronmillisor January 25, 2023 10:58

agvarghe-cisco and others added 5 commits January 27, 2023 14:49

Modifying parent component check

10937e6

Merge branch 'openconfig:main' into component_vendor_name

f18089e

Optimize run time

839bc96

Merge branch 'main' into component_vendor_name

b7bf66e

Merge branch 'main' into component_vendor_name

41d8328

xw-g requested review from Hobbydos and removed request for aaronmillisor February 7, 2023 17:16

agvarghe-cisco and others added 3 commits February 14, 2023 09:49

Merge branch 'main' into component_vendor_name

df75caf

Changes to p4rt test

53f7f34

Merge branch 'main' into component_vendor_name

66cebd3

thesrinath reviewed Feb 15, 2023

View reviewed changes

agvarghe-cisco and others added 2 commits February 15, 2023 10:09

Merge branch 'main' into component_vendor_name

4e168ef

Fix Typo

af955c5

guoshiuan approved these changes Feb 15, 2023

View reviewed changes

Merge branch 'main' into component_vendor_name

4b46d68

thesrinath approved these changes Feb 15, 2023

View reviewed changes

thesrinath merged commit 5e1e9ec into openconfig:main Feb 15, 2023

LimeHat mentioned this pull request Mar 17, 2023

gnmi-1.10: update TestSoftwareVersion() in ATE version of the test #1279

Closed

jasdeep-hundal added a commit to jasdeep-hundal/featureprofiles that referenced this pull request Apr 11, 2023

Replicate PR652 in OTG telemetry basic test

41937b7

Reference: openconfig#652

jasdeep-hundal added a commit to jasdeep-hundal/featureprofiles that referenced this pull request Apr 12, 2023

Replicate PR652 in OTG telemetry basic test

4cb3e28

Reference: openconfig#652

	func FindComponentsByType(t testing.T, dut ondatra.DUTDevice, cType oc.E_PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT) []string {
	components := gnmi.GetAll[*oc.Component](t, dut, gnmi.OC().ComponentAny().State())
	var s []string
	for _, c := range components {
	if c.GetType() == nil {
	t.Logf("Component %s type is missing from telemetry", c.GetName())
	continue
	}
	t.Logf("Component %s has type: %v", c.GetName(), c.GetType())
	switch v := c.GetType().(type) {
	case oc.E_PlatformTypes_OPENCONFIG_HARDWARE_COMPONENT:
	if v == cType {
	s = append(s, c.GetName())
	}
	default:
	t.Logf("Detected non-hardware component: (%T, %v)", c.GetType(), c.GetType())
	}
	}
	return s
	}

Uh oh!

Conversation

agvarghe-cisco commented Oct 18, 2022

Uh oh!

coveralls commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 4187548594

💛 - Coveralls

Uh oh!

xw-g commented Oct 21, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

prinikasn left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xw-g commented Feb 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MarcCharlebois commented Feb 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

guoshiuan commented Feb 15, 2023

Uh oh!

guoshiuan commented Feb 15, 2023

Uh oh!

thesrinath commented Feb 15, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

coveralls commented Oct 18, 2022 •

edited

Loading

xw-g commented Feb 7, 2023 •

edited

Loading

MarcCharlebois commented Feb 10, 2023 •

edited

Loading