Firewall: Interface label not shown in WAN rules

[andre8244]

In case of multiple red interfaces, it is possible to conditionally select which one to use.
At the bottom of Firewall -> WAN page the user can define this kind of rules.
Currently these rules don't show the user-defined label of the interface to use; they just display interface name, e.g. red2, red3...

Proposed solution

• If the user has assigned a label for the interface of a rule, let's show it instead of interface name
• Since a label can't be assigned to PPoE interfaces, let's show PPoE as label for this type of interfaces

Components

nethserver-firewall-base

[nethbot]

in 7.8.2003/testing:

• nethserver-firewall-base-3.9.2-1.2.g3c279cf.ns7.noarch.rpm x86_64 armhfp aarch64
• nethserver-firewall-base-ui-3.9.2-1.2.g3c279cf.ns7.noarch.rpm x86_64 armhfp aarch64

[andre8244]

Test case

• Use a server where you can configure multiple red interfaces (preferably 3)
• Access System -> Network on Cockpit
• Configure an ethernet red interface and assign it a label
• Configure a PPPoE red interface
• Configure another ethernet red interface without assigning it a label
• Go to Firewall -> WAN page
• In Configuration section, verify that PPPoE is displayed as a label for PPPoE interface (at the right of ppp0 (redX) )
• Click Create policy route button and create multiple rules, one for each red interface
• In Rules section, verify the text label at the left of each draggable handle:
  • For ethernet interfaces with a label assigned, it should display the label
  • For ethernet interfaces without a label, it should display REDX (where X is a number)
  • For PPPoE interfaces, ith should display PPPoE

[cotosso]

Everything works as expected.

[nethbot]

in 7.8.2003/updates:

• nethserver-firewall-base-3.9.3-1.ns7.noarch.rpm x86_64 armhfp aarch64
• nethserver-firewall-base-ui-3.9.3-1.ns7.noarch.rpm x86_64 armhfp aarch64