[VOL-1668] Remove default flow rules from the Core
This commit cleans up the default flow rules that started with
VOL-1628.
Change-Id: I965e07b9bd2be1f25dca2cdf18a90aa4c16eea88
diff --git a/rw_core/flow_decomposition/flow_decomposer.go b/rw_core/flow_decomposition/flow_decomposer.go
index 06d1b8b..98d5092 100644
--- a/rw_core/flow_decomposition/flow_decomposer.go
+++ b/rw_core/flow_decomposition/flow_decomposer.go
@@ -41,9 +41,8 @@
}
//DecomposeRules decomposes per-device flows and flow-groups from the flows and groups defined on a logical device
-func (fd *FlowDecomposer) DecomposeRules(agent coreIf.LogicalDeviceAgent, flows ofp.Flows, groups ofp.FlowGroups, includeDefaultFlows bool) *fu.DeviceRules {
- rules := agent.GetAllDefaultRules()
- deviceRules := rules.Copy()
+func (fd *FlowDecomposer) DecomposeRules(agent coreIf.LogicalDeviceAgent, flows ofp.Flows, groups ofp.FlowGroups) *fu.DeviceRules {
+ deviceRules := *fu.NewDeviceRules()
devicesToUpdate := make(map[string]string)
groupMap := make(map[uint32]*ofp.OfpGroupEntry)
@@ -60,12 +59,7 @@
devicesToUpdate[deviceId] = deviceId
}
}
- if includeDefaultFlows {
- return deviceRules
- }
- updatedDeviceRules := deviceRules.FilterRules(devicesToUpdate)
-
- return updatedDeviceRules
+ return deviceRules.FilterRules(devicesToUpdate)
}
// Handles special case of any controller-bound flow for a parent device