Révision cb38423a
fix #143 - properly escape rulename for interfaces
| manifests/bridges.pp | ||
|---|---|---|
| 10 | 10 |
$bridges = $interfaces.filter |$items| { $items =~ $bridgenames }
|
| 11 | 11 |
|
| 12 | 12 |
$bridges.each |String $bridge| {
|
| 13 |
$bridge_rulename = regsubst($bridge, '-', '_', 'G') |
|
| 13 |
$bridge_rulename = regsubst($bridge, '-|:', '_', 'G')
|
|
| 14 | 14 |
nftables::rule { "default_fwd-bridge_${bridge_rulename}_${bridge_rulename}":
|
| 15 | 15 |
order => '08', |
| 16 | 16 |
content => "iifname ${bridge} oifname ${bridge} accept",
|
| spec/classes/bridges_spec.rb | ||
|---|---|---|
| 16 | 16 |
'lo' => {},
|
| 17 | 17 |
'br0' => {},
|
| 18 | 18 |
'br1-2' => {},
|
| 19 |
'br1-2:1' => {},
|
|
| 19 | 20 |
} } |
| 20 | 21 |
) |
| 21 | 22 |
end |
| ... | ... | |
| 36 | 37 |
content: 'iifname br1-2 oifname br1-2 accept' |
| 37 | 38 |
) |
| 38 | 39 |
} |
| 40 |
|
|
| 41 |
it {
|
|
| 42 |
expect(subject).to contain_nftables__rule('default_fwd-bridge_br1_2_1_br1_2_1').with(
|
|
| 43 |
order: '08', |
|
| 44 |
content: 'iifname br1-2:1 oifname br1-2:1 accept' |
|
| 45 |
) |
|
| 46 |
} |
|
| 39 | 47 |
end |
| 40 | 48 |
end |
| 41 | 49 |
end |
Formats disponibles : Unified diff