-
Notifications
You must be signed in to change notification settings - Fork 373
SR-SIM classic CLI support #2916
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.
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
Open
sacckth
wants to merge
21
commits into
main
Choose a base branch
from
sr-sim-classic-cli
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,087
−350
Open
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
d55ab6b
Add workflow_dispatch to build-containerlab.yml
wisotzky 671a78e
classic cli support
wisotzky 9805982
ansible inventory to differentiate between classic vs md
wisotzky b58c8e5
Revert changes
wisotzky a6ed388
- Change env var name to match CLAB syntax
8e09861
update srsim tests
5260633
fix typo
5990212
fixed on the spot issue robot issue:
86cd6aa
render classic config pre-deploy
wisotzky 860d018
added support for admin save via ssh and tls certs are now admin up
27f44f0
fix test d'ohh
364348f
add mixed mode to the picture because why not?
e28985a
Refactored 4 functions in `sros.go` to improve readability and code e…
afdcb12
more Claude simplifications
98626bb
Update nodes/sros/ssh.go
sacckth a33069e
test seemed not to be checking for the right string
72e9ff8
gnmic comming to the rescue
1fb9a87
make format
5fe9d82
add IXR classic support
530c422
...with startup config
c812d4e
...with startup config and proper gnmic flahs
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -90,30 +90,14 @@ func (c *CLab) generateAnsibleInventory(w io.Writer) error { | |||||
| } | ||||||
|
|
||||||
| for _, n := range c.Nodes { | ||||||
| kind, props := c.getAnsibleKindAndProps(n.Config()) | ||||||
| inv.Kinds[kind] = props | ||||||
|
|
||||||
| ansibleNode := &AnsibleInventoryNode{ | ||||||
| NodeConfig: n.Config(), | ||||||
| } | ||||||
|
|
||||||
| // add AnsibleKindProps to the inventory struct | ||||||
| // the ansibleKindProps is passed as a ref and is populated | ||||||
| // down below | ||||||
| ansibleKindProps := &AnsibleKindProps{} | ||||||
| inv.Kinds[n.Config().Kind] = ansibleKindProps | ||||||
|
|
||||||
| // add username and password to kind properties | ||||||
| // assumption is that all nodes of the same kind have the same credentials | ||||||
| nodeRegEntry := c.Reg.Kind(n.Config().Kind) | ||||||
| if nodeRegEntry != nil { | ||||||
| ansibleKindProps.Username = nodeRegEntry.GetCredentials().GetUsername() | ||||||
| ansibleKindProps.Password = nodeRegEntry.GetCredentials().GetPassword() | ||||||
| } | ||||||
|
|
||||||
| // add network_os to the node | ||||||
| ansibleKindProps.setNetworkOS(n.Config().Kind) | ||||||
| // add ansible_connection to the node | ||||||
| ansibleKindProps.setAnsibleConnection(n.Config().Kind) | ||||||
|
|
||||||
| inv.Nodes[n.Config().Kind] = append(inv.Nodes[n.Config().Kind], ansibleNode) | ||||||
| inv.Nodes[kind] = append(inv.Nodes[kind], ansibleNode) | ||||||
|
|
||||||
| if n.Config().Labels["ansible-group"] != "" { | ||||||
| inv.Groups[n.Config().Labels["ansible-group"]] = | ||||||
|
|
@@ -148,24 +132,39 @@ func (c *CLab) generateAnsibleInventory(w io.Writer) error { | |||||
| return err | ||||||
| } | ||||||
|
|
||||||
| // setNetworkOS sets the network_os variable for the kind. | ||||||
| func (n *AnsibleKindProps) setNetworkOS(kind string) { | ||||||
| switch kind { | ||||||
| case "nokia_srlinux", "srl": | ||||||
| n.NetworkOS = "nokia.srlinux.srlinux" | ||||||
| case "nokia_sros", "vr-sros", "nokia_srsim": | ||||||
| n.NetworkOS = "nokia.sros.md" | ||||||
| // Determine Ansible kind and properties for containerlab node | ||||||
| func (c *CLab) getAnsibleKindAndProps(cfg *clabtypes.NodeConfig) (string, *AnsibleKindProps) { | ||||||
| ansibleGroup := cfg.Kind | ||||||
| ansibleProps := &AnsibleKindProps{} | ||||||
|
|
||||||
| // Set `ansible_user` and `ansible_password` | ||||||
| // Assumption: All nodes of the same kind share same credentials | ||||||
| nodeRegEntry := c.Reg.Kind(ansibleGroup) | ||||||
| if nodeRegEntry != nil { | ||||||
| ansibleProps.Username = nodeRegEntry.GetCredentials().GetUsername() | ||||||
| ansibleProps.Password = nodeRegEntry.GetCredentials().GetPassword() | ||||||
| } | ||||||
|
|
||||||
| // Generally we use the containerlab kind for grouping in Ansible Inventory. | ||||||
| // Special case: For SROS we differentiate between classic and model-driven. | ||||||
| if cfg.Env["CLAB_SROS_CONFIG_MODE"] == "classic" { | ||||||
|
||||||
| if cfg.Env["CLAB_SROS_CONFIG_MODE"] == "classic" { | |
| if strings.EqualFold(cfg.Env["CLAB_SROS_CONFIG_MODE"], "classic") { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The function comment should document the special handling of classic mode SROS nodes where the ansible group name is modified from the original kind. For example: "Determine Ansible kind and properties for containerlab node. For SROS nodes with CLAB_SROS_CONFIG_MODE=classic, returns 'nokia_srsim_classic' as the kind to enable proper Ansible network_os grouping."