diff options
author | 2018-03-29 00:35:42 -0400 | |
---|---|---|
committer | 2018-03-29 00:37:49 -0400 | |
commit | c076f7ddb4cc27a3f626e5c9c96084f8109b6330 (patch) | |
tree | 4a76f334ec79377435398db8d373f5864e6c39f4 /veslibrary/ves_clibrary/VESreporting_vLB | |
parent | 628dd1bb98a25508f6fae41fe4ab249338abf53b (diff) |
Update C library with https batch
Issue-ID: VNFSDK-122
Change-Id: I74556357e5fb534f64476edf34395343453a96e5
Signed-Off-by: Gokul Singaraju <gs244f@att.com>
Diffstat (limited to 'veslibrary/ves_clibrary/VESreporting_vLB')
4 files changed, 14 insertions, 8 deletions
diff --git a/veslibrary/ves_clibrary/VESreporting_vLB/Makefile b/veslibrary/ves_clibrary/VESreporting_vLB/Makefile index faf004c..dbc6b1b 100644 --- a/veslibrary/ves_clibrary/VESreporting_vLB/Makefile +++ b/veslibrary/ves_clibrary/VESreporting_vLB/Makefile @@ -18,8 +18,7 @@ CC=gcc ARCH=$(shell getconf LONG_BIT) -#CODE_ROOT=$(CURDIR)/../../.. -CODE_ROOT=../VES5.0/evel/evel-library +CODE_ROOT=$(CURDIR)/../evel/evel-library LIBS_DIR=$(CODE_ROOT)/libs/x86_$(ARCH) INCLUDE_DIR=$(CODE_ROOT)/code/evel_library diff --git a/veslibrary/ves_clibrary/VESreporting_vLB/go-client.sh b/veslibrary/ves_clibrary/VESreporting_vLB/go-client.sh index 3d1b159..116f890 100755 --- a/veslibrary/ves_clibrary/VESreporting_vLB/go-client.sh +++ b/veslibrary/ves_clibrary/VESreporting_vLB/go-client.sh @@ -1,6 +1,6 @@ #!/bin/bash -export LD_LIBRARY_PATH="/opt/VES/libs/x86_64/" +export LD_LIBRARY_PATH="/opt/VES/evel/evel-library/libs/x86_64/" DCAE_COLLECTOR_IP=$(cat /opt/config/dcae_collector_ip.txt) DCAE_COLLECTOR_PORT=$(cat /opt/config/dcae_collector_port.txt) ./vpp_measurement_reporter $DCAE_COLLECTOR_IP $DCAE_COLLECTOR_PORT eth1 diff --git a/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml b/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml index 65ee26b..70c906c 100644 --- a/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml +++ b/veslibrary/ves_clibrary/VESreporting_vLB/pom.xml @@ -26,14 +26,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.openecomp.demo.vnf</groupId> + <groupId>org.onap.demo.vnf</groupId> <artifactId>demo-aggregator</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openecomp.demo.vnf.ves</groupId> + <groupId>org.onap.demo.vnf.ves5</groupId> <artifactId>ves_vlb_reporting</artifactId> <build> diff --git a/veslibrary/ves_clibrary/VESreporting_vLB/vpp_measurement_reporter.c b/veslibrary/ves_clibrary/VESreporting_vLB/vpp_measurement_reporter.c index c0c6e01..14ca294 100644 --- a/veslibrary/ves_clibrary/VESreporting_vLB/vpp_measurement_reporter.c +++ b/veslibrary/ves_clibrary/VESreporting_vLB/vpp_measurement_reporter.c @@ -3,7 +3,6 @@ * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * - * Unless otherwise specified, all software contained herein is * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -140,9 +139,17 @@ int main(int argc, char** argv) 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 */ @@ -207,7 +214,7 @@ int main(int argc, char** argv) packets_out_this_round = 0; } - vpp_m = evel_new_measurement(READ_INTERVAL,"Measurement_vVNF","TrafficStats_1.2.3.4"); + vpp_m = evel_new_measurement(READ_INTERVAL,"vLoadBalancer","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); |