---
src/amf/amfd/sg_2n_fsm.cc | 2 +-
src/amf/amfd/siass.cc | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/amf/amfd/sg_2n_fsm.cc b/src/amf/amfd/sg_2n_fsm.cc
index 72edf9d..a218786 100644
--- a/src/amf/amfd/sg_2n_fsm.cc
+++ b/src/amf/amfd/sg_2n_fsm.cc
@@ -127,7 +127,7 @@ AVD_SU_SI_STATE avd_su_fsm_state_determine(AVD_SU *su) {
absent_flag, excessive_flag);
if (absent_flag == true) {
fsm_state = AVD_SU_SI_STATE_ABSENT;
- } if (excessive_flag == true) {
+ } else if (excessive_flag == true) {
fsm_state = AVD_SU_SI_STATE_EXCESSIVE;
} else if (true == modify_flag) {
/* Rule 1. => If any one of the SUSI is Mod, then SU will be said to be
diff --git a/src/amf/amfd/siass.cc b/src/amf/amfd/siass.cc
index c3f04a6..ffde7b1 100644
--- a/src/amf/amfd/siass.cc
+++ b/src/amf/amfd/siass.cc
@@ -348,6 +348,9 @@ bool avd_susi_validate_absent_assignment(AVD_SU *su, AVD_SI
*si,
su->sg_of_su->any_assignment_assigned() == false) {
goto done;
}
+ // Skip if any excessive assignment exists
+ if (su->sg_of_su->any_assignment_excessive())
+ goto done;
// Support: 2N, NoRed, NwayActive. Not support: NpM, Nway
if (su->sg_of_su->sg_redundancy_model == SA_AMF_NPM_REDUNDANCY_MODEL ||
su->sg_of_su->sg_redundancy_model == SA_AMF_N_WAY_REDUNDANCY_MODEL) {
--
2.7.4
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
