Skip to content

Commit 56550c3

Browse files
authored
Add 7 nodes SRv6 testbed configuration based on Force 10 hwsku (sonic-net#15908)
In sonic-net#15349 and sonic-net#15723 , the 7-nodes testbed for SRv6 based on Cisco VS hwsku was added with the corresponding tests. In this PR, a testbed with similar config to the cisco one, but based on Force 10 hwsku, is introduced. The cisco vs testbed requires specific SONiC image and data plane emulation toolset from Cisco to work. Therefore, for the sake of testing the control plane only using SONiC images with the vs hwsku, this testbed is added. Additionally, tests for SRv6 that don't require data plane (i.e. non-traffic-check cases) are enabled for the new Force 10 testbed. What is the motivation for this PR? Enable the control plane test for SRv6 with a vs hwsku, without any specific emulation software. How did you do it? Duplicate the configuration from the cisco vs testbed, and modify it for Force 10 VS hwsku. How did you verify/test it? SRv6 functionality was tested manually first: IPv4 routes were injected from the PTF mimicing CE devices into one of the PE devices, and SRv6 encapsulation enabled routes were observed on other PE devices. Therefore, those routes were successfully propagated via BGP. The test cases introduced from sonic-net#15723 passed, except the ones that require the data plane which isn't available currently with a vs hwsku. Any platform specific information? The DUT and cEOS images were built from https://github.com/eddieruan-alibaba/sonic-buildimage , not from sonic-net/sonic-sonic-buildimage . Supported testbed topology if it's a new test case? Not applicable. Documentation https://github.com/sonic-net/sonic-mgmt/blob/master/docs/testplan/srv6/SRv6-phoenixwing-ptf-testplan.md Signed-off-by: Charlie Jiang <w@chariri.moe>
1 parent f9d284e commit 56550c3

File tree

15 files changed

+3503
-7
lines changed

15 files changed

+3503
-7
lines changed

ansible/lab

+10
Original file line numberDiff line numberDiff line change
@@ -234,3 +234,13 @@ sonic_cisco_vs:
234234
hwsku: cisco-8101-p4-32x100-vs
235235
ansible_host: 10.250.0.125
236236
ansible_hostv6: fec0::ffff:afa:13
237+
vlab-c-02:
238+
ansible_host: 10.250.0.125
239+
ansible_hostv6: fec0::ffff:afb:8
240+
type: kvm
241+
hwsku: Force10-S6000
242+
serial_port: 9025
243+
ansible_password: password
244+
ansible_user: admin
245+
ansible_ssh_user: admin
246+
ansible_altpassword: admin

ansible/roles/vm_set/tasks/docker.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
- name: Add docker official GPG key
2-
apt_key: url=https://download.docker.com/linux/ubuntu/gpg state=present
3-
become: yes
4-
environment: "{{ proxy_env | default({}) }}"
5-
61
- name: Check docker repository
72
find:
83
paths: /etc/apt/sources.list.d/
@@ -19,6 +14,12 @@
1914
msg: "Docker repository does not exist"
2015
when: docker_repo.matched == 0
2116

17+
- name: Add docker official GPG key
18+
apt_key: url=https://download.docker.com/linux/ubuntu/gpg state=present
19+
become: yes
20+
environment: "{{ proxy_env | default({}) }}"
21+
when: docker_repo.matched == 0
22+
2223
- name: Add docker repository for 16.04
2324
apt_repository:
2425
repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable

0 commit comments

Comments
 (0)