mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-12-12 04:41:34 +01:00
Code Issues Projects Releases Wiki Activity

CORD-1149 Allow configuring multiple IPv4/IPv6 addresses on one interface

Browse Source 
We had this limit before because we derived VLAN from subnet.
We no longer do that and thus user should be free to config 0+ IPv4/IPv6 addresses

Change-Id: I144c618112e4b437ebf64ea3b5ab05a83263cb17
This commit is contained in:
Charles Chan 2017-04-24 16:21:01 -07:00 committed by Charles Chan
parent ef19de1e84
commit c53d617a29
1 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
View File

@ -57,9 +57,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
public class DeviceConfiguration implements DeviceProperties { public class DeviceConfiguration implements DeviceProperties {
private static final String ERROR_CONFIG = "Configuration error."; private static final String ERROR_CONFIG = "Configuration error.";
private static final String TOO_MANY_SUBNET = ERROR_CONFIG + " Too many subnets configured on {}";
private static final String NO_SUBNET = "No subnet configured on {}"; private static final String NO_SUBNET = "No subnet configured on {}";
private static final String MISCONFIGURED = "Subnets are not configured correctly for {}";
private static final Logger log = LoggerFactory.getLogger(DeviceConfiguration.class); private static final Logger log = LoggerFactory.getLogger(DeviceConfiguration.class);
private final List<Integer> allSegmentIds = new ArrayList<>(); private final List<Integer> allSegmentIds = new ArrayList<>();
@ -440,7 +438,7 @@ public class DeviceConfiguration implements DeviceProperties {
* @param deviceId Device ID * @param deviceId Device ID
* @param port Port number * @param port Port number
* @return The subnets configured on given port or empty set if * @return The subnets configured on given port or empty set if
* the port is unconfigured, misconfigured or suppressed. * the port is unconfigured or suppressed.
*/ */
public Set<IpPrefix> getPortSubnets(DeviceId deviceId, PortNumber port) { public Set<IpPrefix> getPortSubnets(DeviceId deviceId, PortNumber port) {
ConnectPoint connectPoint = new ConnectPoint(deviceId, port); ConnectPoint connectPoint = new ConnectPoint(deviceId, port);
@ -458,14 +456,9 @@ public class DeviceConfiguration implements DeviceProperties {
if (subnets.isEmpty()) { if (subnets.isEmpty()) {
log.debug(NO_SUBNET, connectPoint); log.debug(NO_SUBNET, connectPoint);
return Collections.emptySet(); return Collections.emptySet();
} else if (subnets.size() > 2) {
log.warn(TOO_MANY_SUBNET, connectPoint);
return Collections.emptySet();
} else if (verifySubnets(subnets)) {
return subnets;
} }
log.warn(MISCONFIGURED, connectPoint);
return Collections.emptySet(); return subnets;
} }
/** /**
@ -498,30 +491,6 @@ public class DeviceConfiguration implements DeviceProperties {
.findFirst().orElse(null); .findFirst().orElse(null);
} }
/**
* Utility to verify the configuration of a given port.
*
* @param subnets the subnets set to verify
* @return true if the configured subnets are ok. False otherwise.
*/
private boolean verifySubnets(Set<IpPrefix> subnets) {
Set<Ip4Prefix> ip4Prefices = subnets.stream()
.filter(IpPrefix::isIp4)
.map(IpPrefix::getIp4Prefix)
.collect(Collectors.toSet());
if (ip4Prefices.size() > 1) {
return false;
}
Set<Ip6Prefix> ip6Prefices = subnets.stream()
.filter(IpPrefix::isIp6)
.map(IpPrefix::getIp6Prefix)
.collect(Collectors.toSet());
if (ip6Prefices.size() > 1) {
return false;
}
return !(ip4Prefices.isEmpty() && ip6Prefices.isEmpty());
}
/** /**
* Returns the router ip address of segment router that has the * Returns the router ip address of segment router that has the
* specified ip address in its subnets. * specified ip address in its subnets.