In ticket 3255, the csi attribute message was changed its format without
updating the message version.
This ticket will update the message version and warrant the backward compatible.
---
src/amf/amfd/mds.cc | 3 ++-
src/amf/amfd/mds.h | 2 +-
src/amf/amfnd/avnd_mds.h | 4 ++--
src/amf/amfnd/mds.cc | 6 ++++--
src/amf/common/amf_d2nmsg.h | 1 +
src/amf/common/d2nedu.c | 18 ++++++++++++++++--
6 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/amf/amfd/mds.cc b/src/amf/amfd/mds.cc
index 83d06ef2b..96165eaae 100644
--- a/src/amf/amfd/mds.cc
+++ b/src/amf/amfd/mds.cc
@@ -49,7 +49,8 @@ const MDS_CLIENT_MSG_FORMAT_VER avd_avnd_msg_fmt_map_table[]
= {
AVSV_AVD_AVND_MSG_FMT_VER_1, AVSV_AVD_AVND_MSG_FMT_VER_2,
AVSV_AVD_AVND_MSG_FMT_VER_3, AVSV_AVD_AVND_MSG_FMT_VER_4,
AVSV_AVD_AVND_MSG_FMT_VER_5, AVSV_AVD_AVND_MSG_FMT_VER_6,
- AVSV_AVD_AVND_MSG_FMT_VER_7};
+ AVSV_AVD_AVND_MSG_FMT_VER_7, AVSV_AVD_AVND_MSG_FMT_VER_8,
+ AVSV_AVD_AVND_MSG_FMT_VER_9};
const MDS_CLIENT_MSG_FORMAT_VER avd_avd_msg_fmt_map_table[] = {
AVD_AVD_MSG_FMT_VER_1, AVD_AVD_MSG_FMT_VER_2, AVD_AVD_MSG_FMT_VER_3,
diff --git a/src/amf/amfd/mds.h b/src/amf/amfd/mds.h
index 47df29674..2ac8e3d4c 100644
--- a/src/amf/amfd/mds.h
+++ b/src/amf/amfd/mds.h
@@ -36,7 +36,7 @@
#define AVD_MDS_SUB_PART_VERSION 7
#define AVD_AVND_SUBPART_VER_MIN 1
-#define AVD_AVND_SUBPART_VER_MAX 7
+#define AVD_AVND_SUBPART_VER_MAX 9
#define AVD_AVD_SUBPART_VER_MIN 1
#define AVD_AVD_SUBPART_VER_MAX 6
diff --git a/src/amf/amfnd/avnd_mds.h b/src/amf/amfnd/avnd_mds.h
index 14dbf9e11..a2f43f5e0 100644
--- a/src/amf/amfnd/avnd_mds.h
+++ b/src/amf/amfnd/avnd_mds.h
@@ -33,10 +33,10 @@
#define AMF_AMFND_AVND_MDS_H_
/* In Service upgrade support */
-#define AVND_MDS_SUB_PART_VERSION 8
+#define AVND_MDS_SUB_PART_VERSION 9
#define AVND_AVD_SUBPART_VER_MIN 1
-#define AVND_AVD_SUBPART_VER_MAX 8
+#define AVND_AVD_SUBPART_VER_MAX 9
#define AVND_AVND_SUBPART_VER_MIN 1
#define AVND_AVND_SUBPART_VER_MAX 1
diff --git a/src/amf/amfnd/mds.cc b/src/amf/amfnd/mds.cc
index 86d207c29..43d1dbedc 100644
--- a/src/amf/amfnd/mds.cc
+++ b/src/amf/amfnd/mds.cc
@@ -45,14 +45,16 @@ const MDS_CLIENT_MSG_FORMAT_VER
avnd_avd_msg_fmt_map_table[] = {
AVSV_AVD_AVND_MSG_FMT_VER_1, AVSV_AVD_AVND_MSG_FMT_VER_2,
AVSV_AVD_AVND_MSG_FMT_VER_3, AVSV_AVD_AVND_MSG_FMT_VER_4,
AVSV_AVD_AVND_MSG_FMT_VER_4, AVSV_AVD_AVND_MSG_FMT_VER_6,
- AVSV_AVD_AVND_MSG_FMT_VER_7, AVSV_AVD_AVND_MSG_FMT_VER_8};
+ AVSV_AVD_AVND_MSG_FMT_VER_7, AVSV_AVD_AVND_MSG_FMT_VER_8,
+ AVSV_AVD_AVND_MSG_FMT_VER_9};
/* messages from director */
const MDS_CLIENT_MSG_FORMAT_VER avd_avnd_msg_fmt_map_table[] = {
AVSV_AVD_AVND_MSG_FMT_VER_1, AVSV_AVD_AVND_MSG_FMT_VER_2,
AVSV_AVD_AVND_MSG_FMT_VER_3, AVSV_AVD_AVND_MSG_FMT_VER_4,
AVSV_AVD_AVND_MSG_FMT_VER_5, AVSV_AVD_AVND_MSG_FMT_VER_6,
- AVSV_AVD_AVND_MSG_FMT_VER_7, AVSV_AVD_AVND_MSG_FMT_VER_8};
+ AVSV_AVD_AVND_MSG_FMT_VER_7, AVSV_AVD_AVND_MSG_FMT_VER_8,
+ AVSV_AVD_AVND_MSG_FMT_VER_9};
const MDS_CLIENT_MSG_FORMAT_VER avnd_avnd_msg_fmt_map_table[] = {
AVSV_AVND_AVND_MSG_FMT_VER_1};
diff --git a/src/amf/common/amf_d2nmsg.h b/src/amf/common/amf_d2nmsg.h
index 187279d2a..957d3a326 100644
--- a/src/amf/common/amf_d2nmsg.h
+++ b/src/amf/common/amf_d2nmsg.h
@@ -53,6 +53,7 @@ extern "C" {
#define AVSV_AVD_AVND_MSG_FMT_VER_6 6
#define AVSV_AVD_AVND_MSG_FMT_VER_7 7
#define AVSV_AVD_AVND_MSG_FMT_VER_8 8
+#define AVSV_AVD_AVND_MSG_FMT_VER_9 9
/* Internode/External Components Validation result */
typedef enum {
diff --git a/src/amf/common/d2nedu.c b/src/amf/common/d2nedu.c
index 1c6dc528b..179e4c61c 100644
--- a/src/amf/common/d2nedu.c
+++ b/src/amf/common/d2nedu.c
@@ -60,6 +60,7 @@ uint32_t avsv_edp_dnd_msg(EDU_HDL *hdl, EDU_TKN *edu_tkn,
NCSCONTEXT ptr,
uint16_t ver3 = AVSV_AVD_AVND_MSG_FMT_VER_3;
uint16_t ver5 = AVSV_AVD_AVND_MSG_FMT_VER_5;
uint16_t ver6 = AVSV_AVD_AVND_MSG_FMT_VER_6;
+ uint16_t ver9 = AVSV_AVD_AVND_MSG_FMT_VER_9;
EDU_INST_SET avsv_dnd_msg_rules[] = {
{EDU_START, avsv_edp_dnd_msg, 0, 0, 0, sizeof(AVSV_DND_MSG), 0,
@@ -553,10 +554,23 @@ uint32_t avsv_edp_dnd_msg(EDU_HDL *hdl, EDU_TKN *edu_tkn,
NCSCONTEXT ptr,
(long)&((AVSV_DND_MSG *)0)
->msg_info.d2n_compcsi_assign_msg_info.csi_name,
0, NULL},
+ {EDU_VER_GE, NULL, 0, 0, 2, 0, 0,
+ (EDU_EXEC_RTINE)((uint16_t *)(&(ver9)))},
+ /* AVSV_D2N_COMPCSI_ASSIGN_MSG_INFO (cnt)
+ * for message has version greater than
+ * or equal to 9
+ */
{EDU_EXEC, avsv_edp_csi_attr_info, 0, 0, EDU_EXIT,
(long)&((AVSV_DND_MSG *)0)
->msg_info.d2n_compcsi_assign_msg_info.info.attrs,
0, NULL},
+ /* AVSV_D2N_COMPCSI_ASSIGN_MSG_INFO (cnt)
+ * for message has version less than 9
+ */
+ {EDU_EXEC, avsv_edp_csi_attr_info, 0, 0, 0,
+ (long)&((AVSV_DND_MSG *)0)
+ ->msg_info.d2n_compcsi_assign_msg_info.info.attrs,
+ 0, NULL},
/* AVSV_D2N_CONTAINED_SU_MSG_INFO*/
{EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
@@ -595,7 +609,7 @@ uint32_t avsv_edp_dnd_msg(EDU_HDL *hdl, EDU_TKN *edu_tkn,
NCSCONTEXT ptr,
struct_ptr = ptr;
}
rc = m_NCS_EDU_RUN_RULES(hdl, edu_tkn, avsv_dnd_msg_rules, struct_ptr,
- ptr_data_len, buf_env, op, o_err);
+ ptr_data_len, buf_env, op, o_err);
return rc;
}
@@ -644,7 +658,7 @@ int avsv_dnd_msg_test_type_fnc(NCSCONTEXT arg)
LCL_JMP_OFFSET_AVSV_N2D_ND_SISU_STATE_INFO_MSG = 125,
LCL_JMP_OFFSET_AVSV_N2D_ND_CSICOMP_STATE_INFO_MSG = 131,
LCL_JMP_OFFSET_AVSV_D2N_COMPCSI_ASSIGN_MSG = 137,
- LCL_JMP_OFFSET_AVSV_D2N_CONTAINED_SU_MSG = 143 };
+ LCL_JMP_OFFSET_AVSV_D2N_CONTAINED_SU_MSG = 145 };
AVSV_DND_MSG_TYPE type;
if (arg == NULL)
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
