Refactor SR and OFDPA pipeliner
populateRouterMacVlanFilters -> populateVlanMacFilters
hostFwdObjBuilder -> bridgingFwdObjBuilder
getForwardingObjectiveBuilder -> routingFwdObjBuilder
refactor pipeline initialization
Change-Id: I94932cde5155706571085ff41cb4ef63e2a39844
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/CordConfigHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/CordConfigHandler.java
index 618c0f0..34f5d1e 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/CordConfigHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/CordConfigHandler.java
@@ -124,7 +124,7 @@
// Add olt to the subnet of agent
log.info("push subnet for olt {}", agentSubnet);
srManager.deviceConfiguration.addSubnet(connectPoint, agentSubnet);
- srManager.routingRulePopulator.populateRouterMacVlanFilters(connectPoint.deviceId());
+ srManager.routingRulePopulator.populateVlanMacFilters(connectPoint.deviceId());
// Add host information for olt
log.info("push host info for olt {}", macAddress);
@@ -175,7 +175,7 @@
// Remove olt to the subnet of agent
log.info("delete subnet for olt {}", agentSubnet);
srManager.deviceConfiguration.removeSubnet(connectPoint, agentSubnet);
- srManager.routingRulePopulator.populateRouterMacVlanFilters(connectPoint.deviceId());
+ srManager.routingRulePopulator.populateVlanMacFilters(connectPoint.deviceId());
});
}