Packet-In/Out Support and Removed default Leaf rules as it is overriding ONU default 4091 flows
Bug fixes in pon resource manager
Change-Id: Iafbbfa7360fec3b5f3f4d591f65cbcd8c8215eec
diff --git a/rw_core/core/logical_device_agent.go b/rw_core/core/logical_device_agent.go
index 7b2783e..1555ca5 100644
--- a/rw_core/core/logical_device_agent.go
+++ b/rw_core/core/logical_device_agent.go
@@ -1058,8 +1058,6 @@
for deviceId := range deviceNodeIds {
if deviceId == ld.RootDeviceId {
rules.AddFlowsAndGroup(deviceId, agent.rootDeviceDefaultRules())
- } else {
- rules.AddFlowsAndGroup(deviceId, agent.leafDeviceDefaultRules(deviceId))
}
}
return rules
@@ -1110,8 +1108,6 @@
for deviceId := range deviceNodeIds {
if deviceId == agent.rootDeviceId {
rules.AddFlowsAndGroup(deviceId, agent.rootDeviceDefaultRules())
- } else {
- rules.AddFlowsAndGroup(deviceId, agent.leafDeviceDefaultRules(deviceId))
}
}
agent.DefaultFlowRules = rules
@@ -1137,8 +1133,6 @@
for deviceId := range deviceNodeIds {
if deviceId == agent.rootDeviceId {
rules.AddFlowsAndGroup(deviceId, agent.rootDeviceDefaultRules())
- } else {
- rules.AddFlowsAndGroup(deviceId, agent.leafDeviceDefaultRules(deviceId))
}
}
agent.DefaultFlowRules = rules
diff --git a/rw_core/utils/flow_utils.go b/rw_core/utils/flow_utils.go
index 0c485bb..c2c9287 100644
--- a/rw_core/utils/flow_utils.go
+++ b/rw_core/utils/flow_utils.go
@@ -171,9 +171,11 @@
func (dr *DeviceRules) Copy() *DeviceRules {
copyDR := NewDeviceRules()
- for key, val := range dr.Rules {
- if val != nil {
- copyDR.Rules[key] = val.Copy()
+ if dr != nil {
+ for key, val := range dr.Rules {
+ if val != nil {
+ copyDR.Rules[key] = val.Copy()
+ }
}
}
return copyDR