Conversation
Summary of ChangesHello @youssefyamoutyy, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request refines the ISIS interface configuration logic by accurately populating interface references. It introduces robust parsing for interface names, including those with sub-interface identifiers, and incorporates deviation handling to ensure compatibility across different device capabilities. The changes aim to improve the reliability and correctness of ISIS interface setups within the test framework. Highlights
Changelog
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Pull Request Functional Test Report for #5098 / c95f5c0Virtual Devices
Hardware Devices
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request enhances ISIS interface configuration by adding support for interface-ref. The changes correctly parse interface names to populate the base interface and subinterface index. However, I've found a potential issue in the logic that handles deviations for interface naming, which could lead to incorrect ISIS interface names when a subinterface is already specified. I've provided a suggestion to simplify the logic and fix this bug. The rest of the changes for populating interface-ref and handling the InterfaceRefConfigUnsupported deviation look good.
| // Parse interface name to extract base interface and subinterface index | ||
| baseIntf := intfName | ||
| subIdx := uint32(0) | ||
| if strings.Contains(intfName, ".") { | ||
| parts := strings.SplitN(intfName, ".", 2) | ||
| baseIntf = parts[0] | ||
| if len(parts) == 2 { | ||
| if v, err := strconv.ParseUint(parts[1], 10, 32); err == nil { | ||
| subIdx = uint32(v) | ||
| } | ||
| } | ||
| } | ||
| if deviations.InterfaceRefInterfaceIDFormat(dut) { | ||
| intfName += ".0" | ||
|
|
||
| // For deviations that require .0 suffix, ensure it's added | ||
| isisIntfName := intfName | ||
| if deviations.ExplicitInterfaceInDefaultVRF(dut) || deviations.InterfaceRefInterfaceIDFormat(dut) { | ||
| if !strings.HasSuffix(intfName, ".0") { | ||
| isisIntfName = intfName + ".0" | ||
| if !strings.Contains(intfName, ".") { | ||
| baseIntf = intfName | ||
| subIdx = 0 | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
The logic for parsing the interface name and handling deviations can be simplified and has a potential bug. When intfName already contains a subinterface (e.g., eth1.1), the current logic for deviations incorrectly appends .0, resulting in an invalid interface name like eth1.1.0. The deviation should likely only apply to base interfaces that don't already have a subinterface specified.
I suggest refactoring this block to be more concise and to correctly handle this edge case. The proposed change first parses the interface and subinterface, then applies the deviation logic only when no subinterface is already present.
| // Parse interface name to extract base interface and subinterface index | |
| baseIntf := intfName | |
| subIdx := uint32(0) | |
| if strings.Contains(intfName, ".") { | |
| parts := strings.SplitN(intfName, ".", 2) | |
| baseIntf = parts[0] | |
| if len(parts) == 2 { | |
| if v, err := strconv.ParseUint(parts[1], 10, 32); err == nil { | |
| subIdx = uint32(v) | |
| } | |
| } | |
| } | |
| if deviations.InterfaceRefInterfaceIDFormat(dut) { | |
| intfName += ".0" | |
| // For deviations that require .0 suffix, ensure it's added | |
| isisIntfName := intfName | |
| if deviations.ExplicitInterfaceInDefaultVRF(dut) || deviations.InterfaceRefInterfaceIDFormat(dut) { | |
| if !strings.HasSuffix(intfName, ".0") { | |
| isisIntfName = intfName + ".0" | |
| if !strings.Contains(intfName, ".") { | |
| baseIntf = intfName | |
| subIdx = 0 | |
| } | |
| } | |
| } | |
| // Parse interface name to extract base interface and subinterface index. | |
| baseIntf := intfName | |
| var subIdx uint32 | |
| if parts := strings.SplitN(intfName, ".", 2); len(parts) == 2 { | |
| baseIntf = parts[0] | |
| if v, err := strconv.ParseUint(parts[1], 10, 32); err == nil { | |
| subIdx = uint32(v) | |
| } | |
| } | |
| // For deviations that require .0 suffix for base interfaces, ensure it's added. | |
| isisIntfName := intfName | |
| if (deviations.ExplicitInterfaceInDefaultVRF(dut) || deviations.InterfaceRefInterfaceIDFormat(dut)) && !strings.Contains(intfName, ".") { | |
| isisIntfName = intfName + ".0" | |
| } |
3 participants
Brief description and need for this PR
This PR enhances the ISIS interface configuration by properly populating the interface-ref with base interface and sub-interface index information. This ensures that ISIS interfaces are correctly configured with their interface references.
Proposed changes
Added proper interface-ref configuration for ISIS interfaces in configureISIS function.
Populated interface-ref with base interface and subinterface index when interface name contains a dot notation.
Added check for InterfaceRefConfigUnsupported deviation to handle devices that don't support interface-ref config.
Ensured ISIS interface configuration properly parses interface names and subinterface indices.