mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-03-20 10:17:16 +01:00
see #2110 VLAN interfaces are disabled in new cluster configuration
This commit is contained in:
parent
91f16fb85a
commit
b116a2ac23
@ -24,10 +24,13 @@
|
||||
*/
|
||||
|
||||
#include "ClusterInterfaceWidget.h"
|
||||
#include "FWBSettings.h"
|
||||
#include "ui_ClusterInterfaceWidget.h"
|
||||
|
||||
#include <QSpacerItem>
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
using namespace libfwbuilder;
|
||||
using namespace std;
|
||||
|
||||
@ -183,7 +186,7 @@ ClusterInterfaceData ClusterInterfaceWidget::getInterfaceData()
|
||||
return res;
|
||||
}
|
||||
|
||||
bool ClusterInterfaceWidget::interfaceSelectable(libfwbuilder::Interface* iface)
|
||||
bool ClusterInterfaceWidget::interfaceSelectable(Interface* iface)
|
||||
{
|
||||
libfwbuilder::Cluster cluster;
|
||||
// cluster.add(iface, false);
|
||||
@ -198,11 +201,16 @@ bool ClusterInterfaceWidget::interfaceSelectable(libfwbuilder::Interface* iface)
|
||||
interfacePropertiesObjectFactory::getInterfacePropertiesObject(
|
||||
os_family));
|
||||
QString err;
|
||||
bool res = int_prop->validateInterface(dynamic_cast<FWObject*>(&cluster),
|
||||
dynamic_cast<FWObject*>(iface), false, err)
|
||||
&& int_prop->isEligibleForCluster(iface);
|
||||
bool res = true;
|
||||
if (st->getBool("Objects/Interface/autoconfigureInterfaces"))
|
||||
res = int_prop->validateInterface(&cluster, iface, false, err);
|
||||
if (res)
|
||||
res = int_prop->isEligibleForCluster(iface);
|
||||
|
||||
if (fwbdebug)
|
||||
qDebug() << "interface" << iface->getName().c_str() << "can be used in cluster:" << res;
|
||||
qDebug() << "interface"
|
||||
<< iface->getName().c_str()
|
||||
<< "can be used in cluster:" << res;
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user