From cb40cd40f576c9a624cea022f1bab84cebfedd25 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Mon, 10 Sep 2018 17:16:05 -0400 Subject: [PATCH] Update VES agents to VES 5.4.1 - Add fields for backup entity in vFWCL and vLB evel_initialize Change-Id: I7710e083ce3a5e503ce92e8ea5f0f7096c5846e0 Issue-ID: CERT-15 Signed-off-by: Marco Platania --- .../VESreporting_vFW5.0/vpp_measurement_reporter.c | 40 +++++++++++++--------- .../VESreporting_vLB5.0/vpp_measurement_reporter.c | 40 +++++++++++++--------- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c b/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c index 4cc4ab85..6f6a7c04 100644 --- a/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c +++ b/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c @@ -188,23 +188,29 @@ int main(int argc, char** argv) /* Initialize */ /**************************************************************************/ if(evel_initialize(fqdn, /* FQDN */ - port, /* Port */ - NULL, /* optional path */ - NULL, /* optional topic */ - 100, /* Ring Buffer size */ - 0, /* HTTPS? */ - NULL, /* cert file */ - NULL, /* key file */ - NULL, /* ca info */ - NULL, /* ca file */ - 0, /* verify peer */ - 0, /* verify host */ - "", /* Username */ - "", /* Password */ - NULL, /* Source ip */ - EVEL_SOURCE_VIRTUAL_MACHINE, /* Source type */ - "vFirewall", /* Role */ - 1)) /* Verbosity */ + port, /* Port */ + "", /* Backup FQDN */ + 5555, /* Backup Port */ + NULL, /* optional path */ + NULL, /* optional topic */ + 100, /* Ring Buffer size */ + 0, /* HTTPS? */ + 0, /* Active mode */ + NULL, /* cert file */ + NULL, /* key file */ + NULL, /* ca info */ + NULL, /* ca file */ + 0, /* verify peer */ + 0, /* verify host */ + "", /* Username */ + "", /* Password */ + "", /* Backup Username */ + "", /* Backup Password */ + NULL, /* Source ip */ + NULL, /* Backup Source IP */ + EVEL_SOURCE_VIRTUAL_MACHINE, /* Source type */ + "vFirewall", /* Role */ + 1)) /* Verbosity */ { fprintf(stderr, "\nFailed to initialize the EVEL library!!!\n"); exit(-1); diff --git a/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c b/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c index 14ca2944..7e83d1e8 100644 --- a/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c +++ b/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c @@ -136,23 +136,29 @@ int main(int argc, char** argv) /* Initialize */ /**************************************************************************/ if(evel_initialize(fqdn, /* FQDN */ - port, /* Port */ - NULL, /* optional path */ - NULL, /* optional topic */ - 100, /* Ring buffer size */ - 0, /* HTTPS? */ - NULL, /* cert file */ - NULL, /* key file */ - NULL, /* ca info */ - NULL, /* ca file */ - 0, /* verify peer */ - 0, /* verify host */ - "", /* Username */ - "", /* Password */ - NULL, /* Source IP */ - EVEL_SOURCE_VIRTUAL_MACHINE, /* Source type */ - "vLoadBalancer", /* Role */ - 1)) /* Verbosity */ + port, /* Port */ + "", /* Backup FQDN */ + 5566, /* Backup Port */ + NULL, /* optional path */ + NULL, /* optional topic */ + 100, /* Ring Buffer size */ + 0, /* HTTPS? */ + 0, /* Active mode */ + NULL, /* cert file */ + NULL, /* key file */ + NULL, /* ca info */ + NULL, /* ca file */ + 0, /* verify peer */ + 0, /* verify host */ + "", /* Username */ + "", /* Password */ + "", /* Backup Username */ + "", /* Backup Password */ + NULL, /* Source ip */ + NULL, /* Backup Source IP */ + EVEL_SOURCE_VIRTUAL_MACHINE, /* Source type */ + "vLoadBalancer", /* Role */ + 1)) /* Verbosity */ { fprintf(stderr, "\nFailed to initialize the EVEL library!!!\n"); exit(-1); -- 2.16.6