From 8a54006e88440215666ec7f26858605bd7d679b8 Mon Sep 17 00:00:00 2001 From: Aimee Ukasick Date: Tue, 23 May 2017 17:59:45 -0500 Subject: WIP Update to 5 VDUs Update to use JSON schema 5.1 (separate update to Barometer plugin) Update so container is correctly referenced as 'onap-demo' Add output statement to facilitate debuggin; web servers working Disable credential validation in monitor.py Updated start.sh based on Bryan's changes Start.sh: pull latest barometer collectd plugin patch - various improvements in setup_agent() - remove GuestRunning from collectd config - add setup of InfluxDB and Grafana to monitor - add setup of agents in vFW and vLB ves_onap_demo.sh: fixed tacker not being configured (also Models patches) - add security groups for monitor incoming traffic evel_demo.c: update to latest schema, remove demo code monitor.py: integrate InfluxDB and Grafana Dashboard.json: file to import into Grafana infsetup.py: setup script for the veseventsdb database Refactoring to have junphost interact direct with VMs etc as needed. Update dashboard.json with current dashboard design. ves_onap_demo.sh: - fix method of checking if vnf has been deleted - reduce RAM size in onap.demo flavor to save headroom in virtual deploy - fix copy of public key to /opt/tacker JIRA: VES-11 Change-Id: I210d566f52e2ef7a504b78033d822cf7430631b6 Signed-off-by: Aimee Ukasick Signed-off-by: Bryan Sullivan --- .../blueprints/tosca-vnfd-onap-demo/vLB/Makefile | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 tests/onap-demo/blueprints/tosca-vnfd-onap-demo/vLB/Makefile (limited to 'tests/onap-demo/blueprints/tosca-vnfd-onap-demo/vLB/Makefile') diff --git a/tests/onap-demo/blueprints/tosca-vnfd-onap-demo/vLB/Makefile b/tests/onap-demo/blueprints/tosca-vnfd-onap-demo/vLB/Makefile new file mode 100644 index 0000000..8ecbffd --- /dev/null +++ b/tests/onap-demo/blueprints/tosca-vnfd-onap-demo/vLB/Makefile @@ -0,0 +1,41 @@ + +############################################################################# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# 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 +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +############################################################################# + +CC=gcc +ARCH=$(shell getconf LONG_BIT) +#CODE_ROOT=$(CURDIR)/../../.. +CODE_ROOT=../VES/evel/evel-library +LIBS_DIR=$(CODE_ROOT)/libs/x86_$(ARCH) +INCLUDE_DIR=$(CODE_ROOT)/code/evel_library + +#****************************************************************************** +# Standard compiler flags. * +#****************************************************************************** +CPPFLAGS= +CFLAGS=-Wall -g -fPIC + +all: vpp_measurement_reporter + +clean: + rm -f vpp_measurement_reporter + +vpp_measurement_reporter: vpp_measurement_reporter.c + $(CC) $(CPPFLAGS) $(CFLAGS) -o vpp_measurement_reporter \ + -L $(LIBS_DIR) \ + -I $(INCLUDE_DIR) \ + vpp_measurement_reporter.c -lm -lpthread -level -lcurl -- cgit 1.2.3-korg