Minor cleanups and renaming in vRouter
Change-Id: I9f5334a0d428f77789880bb9caef5a5d12084f1c
diff --git a/apps/routing/src/main/java/org/onosproject/routing/impl/ControlPlaneRedirectManager.java b/apps/routing/src/main/java/org/onosproject/routing/impl/ControlPlaneRedirectManager.java
index 49dc0ed..bedc798 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/impl/ControlPlaneRedirectManager.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/impl/ControlPlaneRedirectManager.java
@@ -133,10 +133,8 @@
hostService.addListener(hostListener);
interfaceService.addListener(interfaceListener);
- updateConfig(true);
- applicationService.registerDeactivateHook(this.appId, () -> {
- this.updateConfig(false);
- });
+ readConfig();
+ applicationService.registerDeactivateHook(this.appId, () -> provisionDevice(false));
}
@Deactivate
@@ -151,10 +149,8 @@
* Installs or removes interface configuration
* based on the flag used on activate or deactivate.
*
- * @param operation true on activate application, false on deactivate
- * the application
**/
- private void updateConfig(boolean operation) {
+ private void readConfig() {
ApplicationId routingAppId =
coreService.registerApplication(RoutingService.ROUTER_APP_ID);
@@ -170,17 +166,16 @@
ospfEnabled = config.getOspfEnabled();
interfaces = config.getInterfaces();
- updateDevice(operation);
+ provisionDevice(true);
}
/**
* Installs or removes interface configuration for each interface
* based on the flag used on activate or deactivate.
*
- * @param operation true on activate application, false on deactivate
- * the application
+ * @param install true to install flows, false to remove them
**/
- private void updateDevice(boolean operation) {
+ private void provisionDevice(boolean install) {
if (controlPlaneConnectPoint != null &&
deviceService.isAvailable(controlPlaneConnectPoint.deviceId())) {
DeviceId deviceId = controlPlaneConnectPoint.deviceId();
@@ -188,21 +183,17 @@
interfaceService.getInterfaces().stream()
.filter(intf -> intf.connectPoint().deviceId().equals(deviceId))
.filter(intf -> interfaces.isEmpty() || interfaces.contains(intf.name()))
- .forEach(operation ? this::provisionInterface : this::removeInterface);
+ .forEach(intf -> provisionInterface(intf, install));
log.info("Set up interfaces on {}", controlPlaneConnectPoint.deviceId());
}
}
- private void removeInterface(Interface intf) {
- modifyBasicInterfaceForwarding(intf, false);
- updateOspfForwarding(intf, false);
+ private void provisionInterface(Interface intf, boolean install) {
+ updateInterfaceForwarding(intf, install);
+ updateOspfForwarding(intf, install);
}
- private void provisionInterface(Interface intf) {
- modifyBasicInterfaceForwarding(intf, true);
- updateOspfForwarding(intf, true);
- }
/**
* Installs or removes the basic forwarding flows for each interface
* based on the flag used.
@@ -211,7 +202,7 @@
* @param install true to create an add objective, false to create a remove
* objective
**/
- private void modifyBasicInterfaceForwarding(Interface intf, boolean install) {
+ private void updateInterfaceForwarding(Interface intf, boolean install) {
log.debug("Adding interface objectives for {}", intf);
DeviceId deviceId = controlPlaneConnectPoint.deviceId();
@@ -361,6 +352,7 @@
}
return nextId;
}
+
/**
* Builds a forwarding objective from the given selector, treatment and nextId.
*
@@ -404,7 +396,7 @@
case DEVICE_AVAILABILITY_CHANGED:
if (deviceService.isAvailable(event.subject().id())) {
log.info("Device connected {}", event.subject().id());
- updateDevice(true);
+ provisionDevice(true);
}
break;
case DEVICE_UPDATED:
@@ -431,7 +423,7 @@
switch (event.type()) {
case CONFIG_ADDED:
case CONFIG_UPDATED:
- updateConfig(true);
+ readConfig();
break;
case CONFIG_REGISTERED:
case CONFIG_UNREGISTERED:
@@ -494,7 +486,6 @@
return;
}
- Set<Integer> nextIds = peerNextId.get(peer);
checkState(peerNextId.get(peer) != null,
"Peer nextId should not be null");
checkState(peerNextId.get(peer).size() == 2,
@@ -593,12 +584,12 @@
* Update the flows comparing previous event and current event.
*
* @param prevIntf the previous interface event
- * @param intf the current occured update envent
+ * @param intf the current occurred update event
**/
private void updateInterface(Interface prevIntf, Interface intf) {
if (!prevIntf.vlan().equals(intf.vlan()) || !prevIntf.mac().equals(intf)) {
- removeInterface(prevIntf);
- provisionInterface(intf);
+ provisionInterface(prevIntf, false);
+ provisionInterface(intf, true);
} else {
List<InterfaceIpAddress> removeIps =
prevIntf.ipAddressesList().stream()
@@ -609,10 +600,10 @@
.filter(cur -> !prevIntf.ipAddressesList().contains(cur))
.collect(Collectors.toList());
// removing flows with match parameters present in previous subject
- modifyBasicInterfaceForwarding(new Interface(prevIntf.name(), prevIntf.connectPoint(),
+ updateInterfaceForwarding(new Interface(prevIntf.name(), prevIntf.connectPoint(),
removeIps, prevIntf.mac(), prevIntf.vlan()), false);
// adding flows with match parameters present in event subject
- modifyBasicInterfaceForwarding(new Interface(intf.name(), intf.connectPoint(),
+ updateInterfaceForwarding(new Interface(intf.name(), intf.connectPoint(),
addIps, intf.mac(), intf.vlan()), true);
}
}
@@ -626,7 +617,7 @@
switch (event.type()) {
case INTERFACE_ADDED:
if (intf != null && !intf.connectPoint().equals(controlPlaneConnectPoint)) {
- provisionInterface(intf);
+ provisionInterface(intf, true);
}
break;
case INTERFACE_UPDATED:
@@ -636,7 +627,7 @@
break;
case INTERFACE_REMOVED:
if (intf != null && !intf.connectPoint().equals(controlPlaneConnectPoint)) {
- removeInterface(intf);
+ provisionInterface(intf, false);
}
break;
default:
diff --git a/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java b/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java
index 33e4bd7..00924cd 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java
@@ -178,9 +178,7 @@
updateConfig();
- applicationService.registerDeactivateHook(vrouterAppId, () -> {
- this.cleanUp();
- });
+ applicationService.registerDeactivateHook(vrouterAppId, () -> cleanUp());
log.info("Started");
}
@@ -192,8 +190,6 @@
interfaceService.removeListener(internalInterfaceList);
networkConfigService.removeListener(configListener);
- //processIntfFilters(false, configService.getInterfaces()); //TODO necessary?
-
componentConfigService.unregisterProperties(getClass(), false);
log.info("Stopped");
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
index 1a400b6..4618bb0 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SoftRouterPipeline.java
@@ -261,7 +261,7 @@
}
}
- log.debug("adding Port/VLAN/MAC filtering rules in filter table: {}/{}/{}",
+ log.debug("Modifying Port/VLAN/MAC filtering rules in filter table: {}/{}/{}",
p.port(), v.vlanId(), e.mac());
TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
@@ -287,7 +287,6 @@
.fromApp(applicationId)
.makePermanent()
.forTable(FILTER_TABLE).build();
- ops = ops.add(rule);
ops = install ? ops.add(rule) : ops.remove(rule);
// apply filtering flow rules