summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
a16d597)
Change-Id: I43a9792a1fa5066ad8116376c9b36a2be7854d57
Signed-off-by: Faseela K <faseela.k@ericsson.com>
if(L2vlan.class.equals(ifType)){
IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
LOG.trace("L2Vlan: {}",vlanIface);
if(L2vlan.class.equals(ifType)){
IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
LOG.trace("L2Vlan: {}",vlanIface);
- long vlanVid = (vlanIface == null) ? 0 : vlanIface.getVlanId().getValue();
+ long vlanVid = (vlanIface == null) ? 0 :
+ vlanIface.getVlanId() == null ? 0 : vlanIface.getVlanId().getValue();
if (vlanVid != 0) {
listActionInfo.add(new ActionInfo(ActionType.push_vlan, new String[] {}, actionKeyStart));
actionKeyStart++;
if (vlanVid != 0) {
listActionInfo.add(new ActionInfo(ActionType.push_vlan, new String[] {}, actionKeyStart));
actionKeyStart++;
public static void startLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker,
Interface trunkInterface) {
//LLDP monitoring for the trunk interface
public static void startLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker,
Interface trunkInterface) {
//LLDP monitoring for the trunk interface
- String trunkInterfaceName = trunkInterface.getName();
+ /*String trunkInterfaceName = trunkInterface.getName();
IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class);
if(ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)) {
MonitorStartInput lldpMonitorInput = new MonitorStartInputBuilder().setConfig(new ConfigBuilder()
IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class);
if(ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)) {
MonitorStartInput lldpMonitorInput = new MonitorStartInputBuilder().setConfig(new ConfigBuilder()
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Exception when starting monitoring", e);
}
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Exception when starting monitoring", e);
}
}
public static void stopLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker,
Interface trunkInterface) {
}
public static void stopLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker,
Interface trunkInterface) {
- IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class);
+ /*IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class);
if(!ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)){
return;
}
if(!ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)){
return;
}
removeMonitorIdFromInterfaceMonitorIdMap(dataBroker, interfaceName, monitorId);
return;
}
removeMonitorIdFromInterfaceMonitorIdMap(dataBroker, interfaceName, monitorId);
return;
}
}
public static String getInterfaceFromMonitorId(DataBroker broker, Long monitorId) {
}
public static String getInterfaceFromMonitorId(DataBroker broker, Long monitorId) {