Changes include:
bug fix for host IP and MAC flows not being generated sometimes in multi-controller scenarios
bug fix for filtering objectives not being sent sometimes when ports become available later
npe fixes in ofdpa driver for cases where selectors or treatments may not be available
new cli command to manually trigger routing and rule population
portstats option on cli to display only those ports with non-zero stats
group cli command tab completion displays choices in lower case (similar to flows)
segment routing cli commands now start with sr-
Change-Id: Idcd641882d180acbd304e5560ed3483b5a943f96
diff --git a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index e6c324d..48bb1a7 100644
--- a/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -434,6 +434,15 @@
return policyHandler.getPolicies();
}
+ @Override
+ public void rerouteNetwork() {
+ cfgListener.configureNetwork();
+ for (Device device : deviceService.getDevices()) {
+ defaultRoutingHandler.populatePortAddressingRules(device.id());
+ }
+ defaultRoutingHandler.startPopulationProcess();
+ }
+
/**
* Returns the tunnel object with the tunnel ID.
*
@@ -567,7 +576,7 @@
* @param portNum port number on device for which NextObjective is queried
* @param treatment the actions to apply on the packets (should include outport)
* @param meta metadata passed into the creation of a Next Objective if necessary
- * @return next objective ID or -1 if it was not found
+ * @return next objective ID or -1 if an error occurred during retrieval or creation
*/
public int getPortNextObjectiveId(DeviceId deviceId, PortNumber portNum,
TrafficTreatment treatment,
@@ -801,9 +810,9 @@
// port addressing rules to the driver as well irrespective of whether
// this instance is the master or not.
defaultRoutingHandler.populatePortAddressingRules(device.id());
- hostHandler.readInitialHosts();
}
if (mastershipService.isLocalMaster(device.id())) {
+ hostHandler.readInitialHosts(device.id());
DefaultGroupHandler groupHandler = groupHandlerMap.get(device.id());
groupHandler.createGroupsFromSubnetConfig();
routingRulePopulator.populateSubnetBroadcastRule(device.id());
@@ -897,6 +906,7 @@
// for any switch (even if this instance is a SLAVE or not even connected
// to the switch). To handle this, a default-group-handler instance is necessary
// per switch.
+ log.debug("Current groupHandlerMap devs: {}", groupHandlerMap.keySet());
if (groupHandlerMap.get(device.id()) == null) {
DefaultGroupHandler groupHandler;
try {
@@ -911,6 +921,8 @@
log.warn(e.getMessage() + " Aborting configureNetwork.");
return;
}
+ log.debug("updating groupHandlerMap with new config for "
+ + "device: {}", device.id());
groupHandlerMap.put(device.id(), groupHandler);
// Also, in some cases, drivers may need extra
@@ -918,9 +930,9 @@
// port addressing rules to the driver as well, irrespective of whether
// this instance is the master or not.
defaultRoutingHandler.populatePortAddressingRules(device.id());
- hostHandler.readInitialHosts();
}
if (mastershipService.isLocalMaster(device.id())) {
+ hostHandler.readInitialHosts(device.id());
DefaultGroupHandler groupHandler = groupHandlerMap.get(device.id());
groupHandler.createGroupsFromSubnetConfig();
routingRulePopulator.populateSubnetBroadcastRule(device.id());