From: Gokul Singaraju <goksing@gmail.com>
Date: Thu, 24 Aug 2017 03:39:11 +0000 (-0400)
Subject: Add nfcnaming to Firewall Loadbalancer 5.0 samples
X-Git-Tag: 1.0.0-Amsterdam~193^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f4fce38c771bd63b56c86425bd841083735843d0;p=demo.git

Add nfcnaming to Firewall Loadbalancer 5.0 samples

Issue-Id: VNFRQTS-79
Change-Id: Ic6b8be1a76dfc9a9934d1f1766efe5f6086085d4
Signed-Off-by: Gokul singaraju <goksing@gmail.com>
---

diff --git a/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c b/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c
index 05f52af5..8604d0cd 100644
--- a/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c
+++ b/vnfs/VESreporting_vFW5.0/vpp_measurement_reporter.c
@@ -245,7 +245,7 @@ int main(int argc, char** argv)
       packets_out_this_round = 0;
     }
 
-    vpp_m = evel_new_measurement(READ_INTERVAL);
+    vpp_m = evel_new_measurement(READ_INTERVAL,"Measurement_vVNF","TrafficStats_1.2.3.4");
     vnic_performance = (MEASUREMENT_VNIC_PERFORMANCE *)evel_measurement_new_vnic_performance("eth0", "true");
     evel_meas_vnic_performance_add(vpp_m, vnic_performance);
 
@@ -277,6 +277,8 @@ int main(int argc, char** argv)
       evel_last_epoch_set(&vpp_m->header, epoch_now);
       epoch_start = epoch_now;
 
+      evel_nfcnamingcode_set(&vpp_m->header, "vVNF");
+      evel_nfnamingcode_set(&vpp_m->header, "vVNF");
       //strcpy(vpp_m_header->reporting_entity_id.value, "No UUID available");
       //strcpy(vpp_m_header->reporting_entity_name, hostname);
       evel_reporting_entity_name_set(&vpp_m->header, "fwll");
diff --git a/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c b/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c
index afbbce8d..98450f0f 100644
--- a/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c
+++ b/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c
@@ -206,7 +206,7 @@ int main(int argc, char** argv)
       packets_out_this_round = 0;
     }
 
-    vpp_m = evel_new_measurement(READ_INTERVAL);
+    vpp_m = evel_new_measurement(READ_INTERVAL,"Measurement_vVNF","TrafficStats_1.2.3.4");
     vnic_performance = (MEASUREMENT_VNIC_PERFORMANCE *)evel_measurement_new_vnic_performance("eth0", "true");
     evel_meas_vnic_performance_add(vpp_m, vnic_performance);
 
@@ -237,9 +237,11 @@ int main(int argc, char** argv)
       evel_last_epoch_set(&vpp_m->header, epoch_now);
       epoch_start = epoch_now;
 
+      evel_nfcnamingcode_set(&vpp_m->header, "vVNF");
+      evel_nfnamingcode_set(&vpp_m->header, "vVNF");
       //strcpy(vpp_m_header->reporting_entity_id.value, "No UUID available");
       //strcpy(vpp_m_header->reporting_entity_name, hostname);
-      evel_reporting_entity_name_set(&vpp_m->header, hostname);
+      evel_reporting_entity_name_set(&vpp_m->header, "lbll");
       evel_reporting_entity_id_set(&vpp_m->header, "No UUID available");
       evel_rc = evel_post_event(vpp_m_header);