Skip to content

Commit

Permalink
Migrate lwaftr testing config files
Browse files Browse the repository at this point in the history 
This migrates the test data (config files) to the latest iteration
of the snabb-softwire-v2 schema. These changes most notably are the
addition of the "instance" and "queue" lists with the splitting of
the interface containers into instance spcecific and global.

The migration now also requires an option passing to the configuration
to be able to successfully migrate. This option is:

	/softwire-config/instance[device=PCI DEVICE]

A second optional option which when supplied configures the lwaftr
in the traditional/regular way of having a interface for interal (ipv6)
traffic and an interface for the external (ipv4) traffic. If not supplied
the lwaftr will be configured in on-a-stick mode. The option is:

	/softwire-config/instance/queue/external-interface[device=PCI DEVICE]

These options are provided with the new "-o" or "--option" flag with the
argument being these paths but with "PCI DEVICE" replace with the device.
  • Loading branch information
Jessica Tallon committed Jul 31, 2017
1 parent ec7ec0f commit 48a7687
Show file tree
Hide file tree
Showing 36 changed files with 760 additions and 400 deletions.
30 changes: 20 additions & 10 deletions src/program/lwaftr/tests/data/big_mtu_no_icmp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,28 +115,38 @@ softwire-config {
packets 600000;
}
generate-icmp-errors false;
ip 10.10.10.10;
mac 12:12:12:12:12:12;
mtu 1960;
next-hop {
mac 68:68:68:68:68:68;
}
reassembly {
max-fragments-per-packet 40;
}
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
}
internal-interface {
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
}
}
}
internal-interface {
allow-incoming-icmp false;
error-rate-limiting {
packets 600000;
}
generate-icmp-errors false;
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
mtu 2000;
next-hop {
mac 44:44:44:44:44:44;
}
reassembly {
max-fragments-per-packet 40;
}
Expand Down
30 changes: 20 additions & 10 deletions src/program/lwaftr/tests/data/icmp_endaddr.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,37 @@ softwire-config {
error-rate-limiting {
packets 600000;
}
ip 10.10.10.10;
mac 12:12:12:12:12:12;
mtu 2000;
next-hop {
mac 68:68:68:68:68:68;
}
reassembly {
max-fragments-per-packet 40;
}
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
}
internal-interface {
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
}
}
}
internal-interface {
allow-incoming-icmp false;
error-rate-limiting {
packets 600000;
}
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
mtu 2000;
next-hop {
mac 44:44:44:44:44:44;
}
reassembly {
max-fragments-per-packet 40;
}
Expand Down
30 changes: 20 additions & 10 deletions src/program/lwaftr/tests/data/icmp_on_fail.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,25 +114,35 @@ softwire-config {
error-rate-limiting {
packets 600000;
}
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
reassembly {
max-fragments-per-packet 40;
}
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
}
internal-interface {
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
}
}
}
internal-interface {
allow-incoming-icmp false;
error-rate-limiting {
packets 600000;
}
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
reassembly {
max-fragments-per-packet 40;
}
Expand Down
34 changes: 22 additions & 12 deletions src/program/lwaftr/tests/data/lwaftr-vlan.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,41 @@ softwire-config {
packets 600000;
}
generate-icmp-errors false;
ip 10.0.1.1;
mac 02:aa:aa:aa:aa:aa;
next-hop {
mac 02:99:99:99:99:99;
}
reassembly {
max-fragments-per-packet 40;
}
vlan-tag 164;
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.0.1.1;
mac 02:aa:aa:aa:aa:aa;
next-hop {
mac 02:99:99:99:99:99;
}
vlan-tag 164;
}
internal-interface {
ip fe80::100;
mac 02:aa:aa:aa:aa:aa;
next-hop {
mac 02:99:99:99:99:99;
}
vlan-tag 125;
}
}
}
internal-interface {
allow-incoming-icmp false;
error-rate-limiting {
packets 600000;
}
generate-icmp-errors false;
ip fe80::100;
mac 02:aa:aa:aa:aa:aa;
mtu 9500;
next-hop {
mac 02:99:99:99:99:99;
}
reassembly {
max-fragments-per-packet 40;
}
vlan-tag 125;
}
}
30 changes: 20 additions & 10 deletions src/program/lwaftr/tests/data/no_hairpin.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,27 +115,37 @@ softwire-config {
packets 600000;
}
generate-icmp-errors false;
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
reassembly {
max-fragments-per-packet 40;
}
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
}
internal-interface {
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
}
}
}
internal-interface {
allow-incoming-icmp false;
error-rate-limiting {
packets 600000;
}
generate-icmp-errors false;
hairpinning false;
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
reassembly {
max-fragments-per-packet 40;
}
Expand Down
30 changes: 20 additions & 10 deletions src/program/lwaftr/tests/data/no_icmp.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,26 +115,36 @@ softwire-config {
packets 600000;
}
generate-icmp-errors false;
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
reassembly {
max-fragments-per-packet 40;
}
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
}
internal-interface {
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
}
}
}
internal-interface {
allow-incoming-icmp false;
error-rate-limiting {
packets 600000;
}
generate-icmp-errors false;
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
reassembly {
max-fragments-per-packet 40;
}
Expand Down
30 changes: 20 additions & 10 deletions src/program/lwaftr/tests/data/no_icmp_maxfrags1.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,26 +115,36 @@ softwire-config {
packets 600000;
}
generate-icmp-errors false;
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
reassembly {
max-fragments-per-packet 1;
}
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
}
internal-interface {
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
}
}
}
internal-interface {
allow-incoming-icmp false;
error-rate-limiting {
packets 600000;
}
generate-icmp-errors false;
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
reassembly {
max-fragments-per-packet 1;
max-packets 10;
Expand Down
30 changes: 20 additions & 10 deletions src/program/lwaftr/tests/data/no_icmp_with_filters_accept.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,30 @@ softwire-config {
}
generate-icmp-errors false;
ingress-filter ip;
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
reassembly {
max-fragments-per-packet 40;
}
}
instance {
device 0000:82:00.0;
queue {
id 1;
external-interface {
ip 10.10.10.10;
mac 12:12:12:12:12:12;
next-hop {
mac 68:68:68:68:68:68;
}
}
internal-interface {
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
}
}
}
internal-interface {
allow-incoming-icmp false;
egress-filter ip6;
Expand All @@ -134,11 +149,6 @@ softwire-config {
}
generate-icmp-errors false;
ingress-filter ip6;
ip 8:9:a:b:c:d:e:f;
mac 22:22:22:22:22:22;
next-hop {
mac 44:44:44:44:44:44;
}
reassembly {
max-fragments-per-packet 40;
}
Expand Down
Loading

0 comments on commit 48a7687

Please sign in to comment.