|
|
|
@ -61,13 +61,24 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf |
|
|
|
if(assignedAddresses.length == cfg.assignedAddresses.length) { |
|
|
|
if(assignedAddresses.length == cfg.assignedAddresses.length) { |
|
|
|
for(int i = 0; i < assignedAddresses.length; ++i) { |
|
|
|
for(int i = 0; i < assignedAddresses.length; ++i) { |
|
|
|
if(!assignedAddresses[i].equals(cfg.assignedAddresses[i])) { |
|
|
|
if(!assignedAddresses[i].equals(cfg.assignedAddresses[i])) { |
|
|
|
return false; |
|
|
|
aaEqual = false; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
aaEqual = false; |
|
|
|
aaEqual = false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boolean routesEqual = true; |
|
|
|
|
|
|
|
if(routes.length == cfg.routes.length) { |
|
|
|
|
|
|
|
for (int i = 0; i < routes.length; ++i) { |
|
|
|
|
|
|
|
if (!routes[i].equals(cfg.routes[i])) { |
|
|
|
|
|
|
|
routesEqual = false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
routesEqual = false; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return nwid == cfg.nwid && |
|
|
|
return nwid == cfg.nwid && |
|
|
|
mac == cfg.mac && |
|
|
|
mac == cfg.mac && |
|
|
|
name.equals(cfg.name) && |
|
|
|
name.equals(cfg.name) && |
|
|
|
@ -79,7 +90,7 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf |
|
|
|
broadcastEnabled == cfg.broadcastEnabled && |
|
|
|
broadcastEnabled == cfg.broadcastEnabled && |
|
|
|
portError == cfg.portError && |
|
|
|
portError == cfg.portError && |
|
|
|
enabled == cfg.enabled && |
|
|
|
enabled == cfg.enabled && |
|
|
|
aaEqual; |
|
|
|
aaEqual && routesEqual; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public int compareTo(VirtualNetworkConfig cfg) { |
|
|
|
public int compareTo(VirtualNetworkConfig cfg) { |
|
|
|
|