Skip to content

add Force10-S6100 64 port kvm into virtual testbed #794

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.

Sign up for GitHub

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

Merged
lguohan merged 1 commit into from
Jan 30, 2019
Merged

add Force10-S6100 64 port kvm into virtual testbed #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ansible/doc/README.testbed.VsSetup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ $ ./testbed-cli.sh -m veos.vtb start-vms server_1 password.txt
```
- please note: Here "password.txt" is the ansible vault password file name/path. Ansible allows user use ansible vault to encrypt password files. By default, this shell script require a password file. If you are not using ansible vault, just create an empty file and pass the filename to the command line. The file name and location is created and maintained by user.

## Deploy T0 topology

```
$ ./testbed-cli.sh -t vtestbed.csv -m veos.vtb add-topo vms-kvm-t0 password.txt
```

Check that all VMs are up and running:
```
$ ansible -m ping -i veos.vtb server_1
Expand All @@ -154,6 +148,13 @@ VM0100 | SUCCESS => {
}
```


## Deploy T0 topology

```
$ ./testbed-cli.sh -t vtestbed.csv -m veos.vtb add-topo vms-kvm-t0 password.txt
```

## Deploy minigraph on the DUT

```
Expand Down
3 changes: 2 additions & 1 deletion ansible/lab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ iface_speed='40000'

[sonic_s6100]
lab-s6100-01 ansible_host=10.251.0.190
vlab-02 ansible_host=10.250.0.102

[sonic_s6100:vars]
hwsku="Force10-S6100"
Expand All @@ -35,7 +36,7 @@ sonic_a7260
[ptf]
ptf_ptf1 ansible_host=10.255.0.188 ansible_ssh_user=root ansible_ssh_pass=root
ptf_vms1-1 ansible_host=10.255.0.178 ansible_ssh_user=root ansible_ssh_pass=root
ptf_vms6-1 ansible_host=10.250.0.102 ansible_ssh_user=root ansible_ssh_pass=root
ptf_vms6-1 ansible_host=10.250.0.100 ansible_ssh_user=root ansible_ssh_pass=root

[lab:children]
sonic
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/vm_set/tasks/start_sonic_vm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
copy: src={{ src_disk_image }} dest={{ disk_image }} remote_src=True
when: not file_stat.stat.exists

- name: Get DUT port alias
port_alias: hwsku={{ hostvars[dut_name].hwsku }}
connection: local

- name: Define vm {{ dut_name }}
virt: name={{ dut_name }}
command=define
Expand Down
97 changes: 3 additions & 94 deletions ansible/roles/vm_set/templates/sonic.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>{{ dut_name }}</name>
<memory unit='KiB'>2048000</memory>
<currentMemory unit='KiB'>2048000</currentMemory>
<vcpu placement='static'>1</vcpu>
<vcpu placement='static'>2</vcpu>
<resource>
<partition>/machine</partition>
</resource>
Expand Down Expand Up @@ -33,102 +33,11 @@
<interface type='ethernet'>
<model type='e1000' />
</interface>
{% for i in range(port_alias|length) %}
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
<interface type='ethernet' >
<model type='e1000' />
</interface>
{% endfor %}
<controller type='usb' index='0'/>
<memballoon model='virtio'>
<alias name='balloon0'/>
Expand Down
3 changes: 2 additions & 1 deletion ansible/veos.vtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ server_1
topologies=['t1', 't1-lag', 't1-64-lag', 't0', 't0-16', 't0-56', 't0-52', 'ptf32', 'ptf64', 't0-64', 't0-64-32', 't0-116']

[sonic]
vlab-01 ansible_host=10.250.0.101 type=kvm
vlab-01 ansible_host=10.250.0.101 type=kvm hwsku=Force10-S6000
vlab-02 ansible_host=10.250.0.102 type=kvm hwsku=Force10-S6100
1 change: 1 addition & 0 deletions ansible/vtestbed.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# conf-name,group-name,topo,ptf_image_name,ptf_ip,server,vm_base,dut,comment
vms-kvm-t0,vms6-1,t0,docker-ptf-brcm,10.250.0.102/24,server_1,VM0100,vlab-01,Tests virtual switch vm
vms-kvm-t0-64,vms6-1,t0-64,docker-ptf-brcm,10.250.0.102/24,server_1,VM0100,vlab-02,Tests virtual switch vm