[VOL-3437] Implement (incremental) flow config removal with according OMCI VLAN configuration and some further code corrections and smaller functional extensions -> version 0.1.13-dev135, now merged with [VOL-3586] und included correction for missing Techprofile configuration at disable/enable procedure
Signed-off-by: mpagenko <michael.pagenkopf@adtran.com>
Change-Id: I438a72867d5da83c505a30169d7d5aba8f8ee8c2
diff --git a/internal/pkg/onuadaptercore/onu_device_entry.go b/internal/pkg/onuadaptercore/onu_device_entry.go
index df496a8..90ba235 100644
--- a/internal/pkg/onuadaptercore/onu_device_entry.go
+++ b/internal/pkg/onuadaptercore/onu_device_entry.go
@@ -195,19 +195,10 @@
isActive uint8
}
-type uniVlanFlowParams struct {
- TpID uint16 `json:"tp_id"`
- MatchVid uint32 `json:"match_vid"` //use uint32 types for allowing immediate bitshifting
- MatchPcp uint32 `json:"match_pcp"`
- TagsToRemove uint32 `json:"tags_to_revome"`
- SetVid uint32 `json:"set_vid"`
- SetPcp uint32 `json:"set_pcp"`
-}
-
type uniPersConfig struct {
PersUniID uint8 `json:"uni_id"`
PersTpPath string `json:"tp_path"`
- PersFlowParams []uniVlanFlowParams `json:"flow_params"`
+ PersFlowParams []uniVlanFlowParams `json:"flow_params"` //as defined in omci_ani_config.go
}
type onuPersistentData struct {
@@ -486,7 +477,7 @@
}
logger.Debugw("RebootResponse data", log.Fields{"device-id": oo.deviceID, "data-fields": msgObj})
if msgObj.Result != me.Success {
- logger.Errorw("Omci RebootResponse Error ", log.Fields{"device-id": oo.deviceID, "Error": msgObj.Result})
+ logger.Errorw("Omci RebootResponse result error", log.Fields{"device-id": oo.deviceID, "Error": msgObj.Result})
// possibly force FSM into abort or ignore some errors for some messages? store error for mgmt display?
return fmt.Errorf("omci RebootResponse result error indication %s for device %s",
msgObj.Result, oo.deviceID)
@@ -494,7 +485,7 @@
return nil
}
}
- logger.Warnw("Reboot response error", log.Fields{"for device-id": oo.deviceID})
+ logger.Warnw("Reboot response message type error", log.Fields{"for device-id": oo.deviceID})
return fmt.Errorf("unexpected OmciResponse type received %s", oo.deviceID)
}
}