Enhancement #3227
server-manager PPPoE support
| Status: | CLOSED | Start date: | ||
|---|---|---|---|---|
| Priority: | Normal | Due date: | ||
| Assignee: | - | % Done: | 100% | |
| Category: | <multiple packages> | |||
| Target version: | v6.6 | |||
| Resolution: | NEEDINFO: | No |
Description
The Multi WAN configuration page doesn't show PPPoE connections.
Associated revisions
Add PPPoE support to Multi WAN
Add PPPoE support Zones. Refs #3227
Add PPPoE support to Traffic Shaping. Refs #3227
Dashboard: show pppoe device. Refs #3227
Web UI: fix PHP syntax. Refs #3227
Dashboard: exclude zones from interfaces tab. Refs #3227
History
#1
Updated by Filippo Carletti about 6 years ago
- Status changed from NEW to TRIAGED
- Target version set to v6.6
- % Done changed from 0 to 20
Adding xdsl to the types list shows PPPoE links.
#2
Updated by Filippo Carletti about 6 years ago
- Status changed from TRIAGED to ON_DEV
- Assignee set to Filippo Carletti
- % Done changed from 20 to 30
- $types = array('bridge', 'bond', 'vlan', 'ethernet');
+ $types = array('bridge', 'bond', 'vlan', 'ethernet', 'xdsl');
#3
Updated by Filippo Carletti about 6 years ago
- Subject changed from Multi WAN over PPPoE to server-manager PPPoE support
#4
Updated by Filippo Carletti about 6 years ago
Traffic shaping:
--- a/root/usr/share/nethesis/NethServer/Module/TrafficShaping/Interfaces/Modify.php
+++ b/root/usr/share/nethesis/NethServer/Module/TrafficShaping/Interfaces/Modify.php
@@ -35,7 +35,7 @@ class Modify extends \Nethgui\Controller\Table\Modify
public function initialize()
{
- $interfaces = $this->getPlatform()->getDatabase('networks')->getAll('ethernet');
+ $interfaces = iterator_to_array($this->getPlatform()->getTableAdapter('networks', array('ethernet', 'xdsl')));
$parameterSchema = array(
array('device', $this->createValidator()->memberOf(array_keys($interfaces)), \Nethgui\Controller\Table\Modify::KEY),
array('In', Validate::POSITIVE_INTEGER, \Nethgui\Controller\Table\Modify::FIELD),
@@ -61,7 +61,7 @@ class Modify extends \Nethgui\Controller\Table\Modify
$view->setTemplate($templates[$this->getIdentifier()]);
if ($this->getIdentifier() == 'create') {
- $interfaces = $this->getPlatform()->getDatabase('networks')->getAll('ethernet');
+ $interfaces = iterator_to_array($this->getPlatform()->getTableAdapter('networks', array('ethernet', 'xdsl')));
$configured = $this->getPlatform()->getDatabase('tc')->getAll('device');
$tmp = array();
foreach($interfaces as $interface => $props) {
#5
Updated by Filippo Carletti about 6 years ago
Zones:
-- Modify.php 2015-07-17 17:39:55.785534746 +0200
+++ /usr/share/nethesis/NethServer/Module/FirewallObjects/Zones/Modify.php 2015-07-17 17:40:21.640534352 +0200
@@ -71,7 +71,7 @@
private function readInterfaces() {
$ret = array();
- $types = array('bridge', 'bond', 'vlan', 'ethernet');
+ $types = array('bridge', 'bond', 'vlan', 'ethernet', 'xdsl');
$interfaces = $this->getPlatform()->getDatabase('networks')->getAll();
foreach ($interfaces as $key => $props) {
if (in_array($props['type'], $types)) {
#6
Updated by Filippo Carletti about 6 years ago
Changes are on branch b3227.
#7
Updated by Giacomo Sanchietti about 6 years ago
- Category changed from nethserver-firewall-base to <multiple packages>
- Assignee changed from Filippo Carletti to Giacomo Sanchietti
Added pppoe support to Dashboard.
#8
Updated by Giacomo Sanchietti about 6 years ago
- Status changed from ON_DEV to MODIFIED
- % Done changed from 30 to 60
Merged b3227 branch to master in nethserver-firewall-base.
#9
Updated by Giacomo Sanchietti about 6 years ago
- Status changed from MODIFIED to ON_QA
- Assignee deleted (
Giacomo Sanchietti) - % Done changed from 60 to 70
Packages in nethserver-testing:
- nethserver-base-2.8.0-1.1.g6299e2f.ns6.noarch.rpm
nethserver-firewall-base-2.6.5-1.6.ge1c4ec3.ns6.noarch.rpmnethserver-firewall-base-2.6.5-1.7.g4e4b34e.ns6.noarch.rpm- nethserver-firewall-base-2.6.5-1.9.g888c00c.ns6.noarch.rpm
- Configure a PPPoE device
- Create a providerd associated to it
- Check the provider is working
- Configure a PPPoE device
- Create a zone associated to it
- Check the zone is correctly defined in shorewall configuration
- Configure a PPPoE device
- Configure the traffic shaping associated to it
- Check the traffic shaping works correctly
- Configure a PPPoE device
- Check the IP is correctly reported into the Dashboard inside the Interfaces widget
- Check all other interfaces (bridge, bond, vland, ethernet) are correctly displayed
#10
Updated by Nicola Rauso about 6 years ago
- Assignee set to Nicola Rauso
#11
Updated by Nicola Rauso about 6 years ago
- Status changed from ON_QA to VERIFIED
- Assignee deleted (
Nicola Rauso) - % Done changed from 70 to 90
Test case 1
- Configure a PPPoE device
- Create a providerd associated to it
- Check the provider is working
Tested: OK
Test case 2
- Configure a PPPoE device
- Create a zone associated to it
- Check the zone is correctly defined in shorewall configuration
Tested: OK
Test case 3
- Configure a PPPoE device
- Configure the traffic shaping associated to it
- Check the traffic shaping works correctly
Tested: OK
Test case 4
- Configure a PPPoE device
- Check the IP is correctly reported into the Dashboard inside the Interfaces widget
- Check all other interfaces (bridge, bond, vland, ethernet) are correctly displayed
Tested: OK
#12
Updated by Davide Principi almost 6 years ago
- Status changed from VERIFIED to CLOSED
- % Done changed from 90 to 100
In nethserver-updates/6.6
nethserver-firewall-base-2.7.0-1.ns6.noarch.rpm
nethserver-base-2.8.1-1.ns6.noarch.rpm