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.

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

Add support for vJunosEvolved #1775

Merged
merged 9 commits into from
Dec 13, 2023
Merged

Add support for vJunosEvolved #1775

merged 9 commits into from
Dec 13, 2023

Conversation

akielaries
Copy link
Contributor

Corresponding PR from hellt/vrnetlab for adding support for Juniper's vJunosEvolved, a virtual instance using PTX10001 as the reference. I used the below file to test and added as a lab example under srlvjunos02:

name: srlvjunos02

topology:
  nodes:
    srl:
      kind: nokia_srlinux
      image: ghcr.io/nokia/srlinux:23.7.1
      startup-config: srl.cli

    vevo:
      kind: vr-juniper_vjunosevolved
      image: vrnetlab/vr-vjunosevolved:23.2R1-S1.8-EVO
      startup-config: vjunos.cfg

  links:
    - endpoints: ["srl:e1-1", "vevo:eth1"]
    - endpoints: ["srl:e1-2", "vevo:eth2"]
    - endpoints: ["srl:e1-3", "vevo:eth3"]

Copy link
Member

@hellt hellt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akielaries thanks
You also have to add the line to mkdocs.yml file for the article to render in the list of kinds and lab examples

README.md Show resolved Hide resolved
schemas/clab.schema.json Outdated Show resolved Hide resolved
@hellt
Copy link
Member

hellt commented Dec 10, 2023

you can also refresh the main branch and rebase your commits on top of it to resolve the testing issue with border0 failure.

@akielaries
Copy link
Contributor Author

Sure thing. I added the vJunosEvolved manual link to the README, a lab-example doc under docs/lab-examples/srl-vjunosevolved.md, and the proper lines in the mkdocs.yml file. Also removed "vr-vjunosevolved", "vr-juniper_vjunosevolved" entry from schemas/clab.schema.json

@steiler
Copy link
Collaborator

steiler commented Dec 11, 2023

@akielaries would you be willing to also make the ssh keys available in the config?
In the PreDeploy(...) function as part of the params you get the ssh keys, that need to be deployed to the node, to allow for password less access. The SRL and SROS nodes do provision ssh keys to date. Would be nice to have that available for the other kinds as well. I'd be happy to assist.

docs/lab-examples/srl-vjunosevolved.md Outdated Show resolved Hide resolved
lab-examples/srlvjunos02/srlvjunos02.clab.yml Outdated Show resolved Hide resolved
nodes/vr_vjunosevolved/vr-vjunosevolved.go Outdated Show resolved Hide resolved
schemas/clab.schema.json Outdated Show resolved Hide resolved
Copy link

codecov bot commented Dec 11, 2023

Codecov Report

Merging #1775 (6692636) into main (de66f5f) will decrease coverage by 0.19%.
Report is 6 commits behind head on main.
The diff coverage is 3.63%.

❗ Current head 6692636 differs from pull request most recent head cd7b0df. Consider uploading reports for the commit cd7b0df to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1775      +/-   ##
==========================================
- Coverage   51.42%   51.24%   -0.19%     
==========================================
  Files         145      146       +1     
  Lines       14132    14187      +55     
==========================================
+ Hits         7268     7270       +2     
- Misses       6046     6098      +52     
- Partials      818      819       +1     
Files Coverage Δ
clab/register.go 100.00% <100.00%> (ø)
nodes/vr_vjunosevolved/vr-vjunosevolved.go 1.85% <1.85%> (ø)

@akielaries
Copy link
Contributor Author

@hellt Sure thing! I went ahead and updated the clab version in the vJunosEvolved lab example doc and removed the vr- prefixes found in references to vJunosEvolved and vJunos-switch.

@steiler I see how the SROS node is doing this but what entry within the lab's .yml definition file would we put to reference SSH keys we want to upload to a given node?

@akielaries akielaries requested a review from hellt December 11, 2023 21:08
@steiler
Copy link
Collaborator

steiler commented Dec 11, 2023

@steiler I see how the SROS node is doing this but what entry within the lab's .yml definition file would we put to reference SSH keys we want to upload to a given node?

In the pre deploy phase you get all the keys we find... *.pub files, agent registered once etc. In srl /sros we install them all for the relevant user.

@hellt
Copy link
Member

hellt commented Dec 13, 2023

Thanks @akielaries
The ssh keys you may work on in a consequent PR

@hellt hellt merged commit 7d5c21a into srl-labs:main Dec 13, 2023
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants