Since su_failover is not used by amfnd in 4.3 I skipped it. I have patches for
4.4 pending that do use this information.
Thanks,
Hans
On 04/07/2014 11:24 AM, praveen malviya wrote:
> In this patch AMFND changes are missing for su_failover.
> In the V2 it was there.
>
> Thanks,
> Praveen
> On 07-Apr-14 11:05 AM, Hans Feldt wrote:
>> osaf/libs/common/avsv/avsv_d2nedu.c | 8 +++++++-
>> osaf/libs/common/avsv/include/avsv_d2nmsg.h | 1 +
>> osaf/services/saf/avsv/avd/avd_util.c | 1 +
>> 3 files changed, 9 insertions(+), 1 deletions(-)
>>
>>
>> AMF in 4.3 does not have support for SU-Failover, it was added in 4.4. So in
>> 4.4 the AMF node director reads su_failover from IMM when processing the
>> REG_SU
>> message.
>>
>> While anyway changing the messaging version in 4.3 for other reasons (SI
>> rank)
>> we add su_failover and can thereby leverage from that in the 4.4 branch.
>>
>> diff --git a/osaf/libs/common/avsv/avsv_d2nedu.c
>> b/osaf/libs/common/avsv/avsv_d2nedu.c
>> --- a/osaf/libs/common/avsv/avsv_d2nedu.c
>> +++ b/osaf/libs/common/avsv/avsv_d2nedu.c
>> @@ -575,6 +575,7 @@ uint32_t avsv_edp_su_info_msg(EDU_HDL *h
>> uint32_t rc = NCSCC_RC_SUCCESS;
>> AVSV_SU_INFO_MSG *struct_ptr = NULL, **d_ptr = NULL;
>> uint16_t ver2 = AVSV_AVD_AVND_MSG_FMT_VER_2;
>> + uint16_t ver5 = AVSV_AVD_AVND_MSG_FMT_VER_5;
>>
>> EDU_INST_SET avsv_su_info_msg_rules[] = {
>> {EDU_START, avsv_edp_su_info_msg, EDQ_LNKLIST, 0, 0,
>> @@ -595,11 +596,16 @@ uint32_t avsv_edp_su_info_msg(EDU_HDL *h
>> {EDU_EXEC, ncs_edp_ncs_bool, 0, 0, 0,
>> (long)&((AVSV_SU_INFO_MSG *)0)->is_ncs, 0, NULL},
>>
>> + /* Include su_is_external in version 2 and higher */
>> {EDU_VER_GE, NULL, 0, 0, 2, 0, 0, (EDU_EXEC_RTINE)((uint16_t
>> *)(&(ver2)))},
>> -
>> {EDU_EXEC, ncs_edp_ncs_bool, 0, 0, 0,
>> (long)&((AVSV_SU_INFO_MSG *)0)->su_is_external, 0, NULL},
>>
>> + /* Include su_failover in version 5 and higher */
>> + {EDU_VER_GE, NULL, 0, 0, 2, 0, 0, (EDU_EXEC_RTINE)((uint16_t
>> *)(&(ver5)))},
>> + {EDU_EXEC, ncs_edp_ncs_bool, 0, 0, 0,
>> + (long)&((AVSV_SU_INFO_MSG *)0)->su_failover, 0, NULL},
>> +
>> {EDU_TEST_LL_PTR, avsv_edp_su_info_msg, 0, 0, 0,
>> (long)&((AVSV_SU_INFO_MSG *)0)->next, 0, NULL},
>> {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
>> diff --git a/osaf/libs/common/avsv/include/avsv_d2nmsg.h
>> b/osaf/libs/common/avsv/include/avsv_d2nmsg.h
>> --- a/osaf/libs/common/avsv/include/avsv_d2nmsg.h
>> +++ b/osaf/libs/common/avsv/include/avsv_d2nmsg.h
>> @@ -113,6 +113,7 @@ typedef struct avsv_su_info_msg {
>> uint32_t su_restart_max;
>> bool is_ncs;
>> bool su_is_external; /*indicates if this SU is external */
>> + bool su_failover;
>> struct avsv_su_info_msg *next;
>> } AVSV_SU_INFO_MSG;
>>
>> diff --git a/osaf/services/saf/avsv/avd/avd_util.c
>> b/osaf/services/saf/avsv/avd/avd_util.c
>> --- a/osaf/services/saf/avsv/avd/avd_util.c
>> +++ b/osaf/services/saf/avsv/avd/avd_util.c
>> @@ -509,6 +509,7 @@ static uint32_t avd_prep_su_info(AVD_CL_
>> su_info->su_restart_prob = su->sg_of_su->saAmfSGSuRestartProb;
>> su_info->is_ncs = su->sg_of_su->sg_ncs_spec;
>> su_info->su_is_external = su->su_is_external;
>> + su_info->su_failover = su->saAmfSUFailover;
>>
>> su_info->next = su_msg->msg_info.d2n_reg_su.su_list;
>> su_msg->msg_info.d2n_reg_su.su_list = su_info;
>
>
> ------------------------------------------------------------------------------
> Put Bad Developers to Shame
> Dominate Development with Jenkins Continuous Integration
> Continuously Automate Build, Test & Deployment
> Start a new project now. Try Jenkins in the cloud.
> http://p.sf.net/sfu/13600_Cloudbees_APR
> _______________________________________________
> Opensaf-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/opensaf-devel
>
>
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees_APR
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
