From b4ae28e528c9b856909d62f0f1bca9d95271a778 Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Sat, 24 Feb 2018 23:40:13 +0000
Subject: [PATCH] various updates to pytest
---
Vagrantfile | 18 +--
scripts/apache/install-apache.sh | 29 -----
scripts/influx/install-clmc-agent.sh | 70 -----------
scripts/influx/install-clmc-service.sh | 41 -------
scripts/influx/start-clmc-service.sh | 31 -----
.../influx/telegraf_ipendpoint_template.conf | 112 ------------------
test/services/loadtest-streaming/install.sh | 4 +-
test/streaming-sim/rspec.yml | 2 +-
8 files changed, 11 insertions(+), 296 deletions(-)
delete mode 100755 scripts/apache/install-apache.sh
delete mode 100755 scripts/influx/install-clmc-agent.sh
delete mode 100755 scripts/influx/install-clmc-service.sh
delete mode 100755 scripts/influx/start-clmc-service.sh
delete mode 100644 scripts/influx/telegraf_ipendpoint_template.conf
diff --git a/Vagrantfile b/Vagrantfile
index af4f48e..54e08e9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -27,29 +27,29 @@ require 'getoptlong'
require 'yaml'
# Custom options:
-# --infra <infradir>
+# --fixture <fixturedir>
# Set defaults
-DEFAULT_INFRA = "streaming"
+DEFAULT_FIXTURE = "streaming"
# Define custom options
opts = GetoptLong.new(
- [ '--infra', GetoptLong::OPTIONAL_ARGUMENT]
+ [ '--fixture', GetoptLong::OPTIONAL_ARGUMENT]
)
# Retrieve custom option values
-infra = DEFAULT_INFRA
+fixture = DEFAULT_FIXTURE
opts.each do |opt, arg|
case opt
- when '--infra'
- infra = arg
+ when '--fixture'
+ fixture = arg
end
end
# load custom config file
-puts "loading custom infrastructure configuration: #{infra}"
-puts "custom config file: /infra/#{infra}/rspec.yml"
-host_rspec_file = "infra/#{infra}/rspec.yml"
+puts "loading custom infrastructure configuration: #{fixture}"
+puts "custom config file: /test/#{fixture}/rspec.yml"
+host_rspec_file = "test/#{fixture}/rspec.yml"
hosts = YAML.load_file(host_rspec_file)
# Start creating VMS using xenial64 as the base box
diff --git a/scripts/apache/install-apache.sh b/scripts/apache/install-apache.sh
deleted file mode 100755
index 735fc0a..0000000
--- a/scripts/apache/install-apache.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-#/////////////////////////////////////////////////////////////////////////
-#//
-#// (c) University of Southampton IT Innovation Centre, 2017
-#//
-#// Copyright in this software belongs to University of Southampton
-#// IT Innovation Centre of Gamma House, Enterprise Road,
-#// Chilworth Science Park, Southampton, SO16 7NS, UK.
-#//
-#// This software may not be used, sold, licensed, transferred, copied
-#// or reproduced in whole or in part in any manner or form or in or
-#// on any media by any person other than in accordance with the terms
-#// of the Licence Agreement supplied with the software, or otherwise
-#// without the prior written consent of the copyright owners.
-#//
-#// This software is distributed WITHOUT ANY WARRANTY, without even the
-#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#// PURPOSE, except where stated in the Licence Agreement supplied with
-#// the software.
-#//
-#// Created By : Michael Boniface
-#// Created Date : 23/01/2018
-#// Created for Project : FLAME
-#//
-#/////////////////////////////////////////////////////////////////////////
-
-# Install apache
-sudo apt-get update
-sudo apt-get -y install apache2
\ No newline at end of file
diff --git a/scripts/influx/install-clmc-agent.sh b/scripts/influx/install-clmc-agent.sh
deleted file mode 100755
index ab3d0bd..0000000
--- a/scripts/influx/install-clmc-agent.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#/////////////////////////////////////////////////////////////////////////
-#//
-#// (c) University of Southampton IT Innovation Centre, 2017
-#//
-#// Copyright in this software belongs to University of Southampton
-#// IT Innovation Centre of Gamma House, Enterprise Road,
-#// Chilworth Science Park, Southampton, SO16 7NS, UK.
-#//
-#// This software may not be used, sold, licensed, transferred, copied
-#// or reproduced in whole or in part in any manner or form or in or
-#// on any media by any person other than in accordance with the terms
-#// of the Licence Agreement supplied with the software, or otherwise
-#// without the prior written consent of the copyright owners.
-#//
-#// This software is distributed WITHOUT ANY WARRANTY, without even the
-#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#// PURPOSE, except where stated in the Licence Agreement supplied with
-#// the software.
-#//
-#// Created By : Michael Boniface
-#// Created Date : 13/12/2017
-#// Created for Project : FLAME
-#//
-#/////////////////////////////////////////////////////////////////////////
-
-# Install telegraf
-if [ "$#" -ne 9 ]; then
- echo "Error: illegal number of arguments: "$#
- echo "Usage: install-clmc-agent.sh TELEGRAF_CONF_FILE LOCATION SFC_ID SFC_ID_INSTANCE SF_ID SF_ID_INSTANCE IP_ENDPOINT_ID INFLUXDB_URL DATABASE_NAME"
- exit
-fi
-
-TELEGRAF_CONF_FILE=$1
-LOCATION=$2
-SFC_ID=$3
-SFC_ID_INSTANCE=$4
-SF_ID=$5
-SF_ID_INSTANCE=$6
-IP_ENDPOINT_ID=$7
-INFLUXDB_URL=$8
-DATABASE_NAME=$9
-
-if [ ! -f $TELEGRAF_CONF_FILE]; then
- echo "Error: Telegraf conf template file not found: "$TELEGRAF_CONF_FILE
- exit
-fi
-
-wget https://dl.influxdata.com/telegraf/releases/telegraf_1.3.2-1_amd64.deb
-dpkg -i telegraf_1.3.2-1_amd64.deb
-
-# Copy configuration
-echo "Telegraf config file: " $TELEGRAF_CONF_FILE
-cp $TELEGRAF_CONF_FILE /etc/telegraf/telegraf.conf
-
-echo "INFLUXDB_URL: " $INFLUXDB_URL
-echo "DATABASE_NAME: " $DATABASE_NAME
-
-# Replace template parameters
-sed -i 's/{{LOCATION}}/'$LOCATION'/g' /etc/telegraf/telegraf.conf
-sed -i 's/{{SFC_ID}}/'$SFC_ID'/g' /etc/telegraf/telegraf.conf
-sed -i 's/{{SFC_ID_INSTANCE}}/'$SFC_ID_INSTANCE'/g' /etc/telegraf/telegraf.conf
-sed -i 's/{{SF_ID}}/'$SF_ID'/g' /etc/telegraf/telegraf.conf
-sed -i 's/{{SF_ID_INSTANCE}}/'$SF_ID_INSTANCE'/g' /etc/telegraf/telegraf.conf
-sed -i 's/{{IP_ENDPOINT_ID}}/'$IP_ENDPOINT_ID'/g' /etc/telegraf/telegraf.conf
-sed -i 's|{{INFLUXDB_URL}}|'$INFLUXDB_URL'|g' /etc/telegraf/telegraf.conf
-sed -i 's/{{DATABASE_NAME}}/'$DATABASE_NAME'/g' /etc/telegraf/telegraf.conf
-
-# Start telegraf
-systemctl start telegraf
\ No newline at end of file
diff --git a/scripts/influx/install-clmc-service.sh b/scripts/influx/install-clmc-service.sh
deleted file mode 100755
index 42e247a..0000000
--- a/scripts/influx/install-clmc-service.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#/////////////////////////////////////////////////////////////////////////
-#//
-#// (c) University of Southampton IT Innovation Centre, 2017
-#//
-#// Copyright in this software belongs to University of Southampton
-#// IT Innovation Centre of Gamma House, Enterprise Road,
-#// Chilworth Science Park, Southampton, SO16 7NS, UK.
-#//
-#// This software may not be used, sold, licensed, transferred, copied
-#// or reproduced in whole or in part in any manner or form or in or
-#// on any media by any person other than in accordance with the terms
-#// of the Licence Agreement supplied with the software, or otherwise
-#// without the prior written consent of the copyright owners.
-#//
-#// This software is distributed WITHOUT ANY WARRANTY, without even the
-#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#// PURPOSE, except where stated in the Licence Agreement supplied with
-#// the software.
-#//
-#// Created By : Michael Boniface
-#// Created Date : 13/12/2017
-#// Created for Project : FLAME
-#//
-#/////////////////////////////////////////////////////////////////////////
-
-# install python for the simulator
-apt-get update
-apt-get -y install python
-
-# install influx
-wget https://dl.influxdata.com/influxdb/releases/influxdb_1.2.4_amd64.deb
-dpkg -i influxdb_1.2.4_amd64.deb
-
-# install kapacitor
-wget https://dl.influxdata.com/kapacitor/releases/kapacitor_1.3.1_amd64.deb
-dpkg -i kapacitor_1.3.1_amd64.deb
-
-# install Chronograf
-wget https://dl.influxdata.com/chronograf/releases/chronograf_1.3.3.0_amd64.deb
-dpkg -i chronograf_1.3.3.0_amd64.deb
diff --git a/scripts/influx/start-clmc-service.sh b/scripts/influx/start-clmc-service.sh
deleted file mode 100755
index f92c6b5..0000000
--- a/scripts/influx/start-clmc-service.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-#/////////////////////////////////////////////////////////////////////////
-#//
-#// (c) University of Southampton IT Innovation Centre, 2018
-#//
-#// Copyright in this software belongs to University of Southampton
-#// IT Innovation Centre of Gamma House, Enterprise Road,
-#// Chilworth Science Park, Southampton, SO16 7NS, UK.
-#//
-#// This software may not be used, sold, licensed, transferred, copied
-#// or reproduced in whole or in part in any manner or form or in or
-#// on any media by any person other than in accordance with the terms
-#// of the Licence Agreement supplied with the software, or otherwise
-#// without the prior written consent of the copyright owners.
-#//
-#// This software is distributed WITHOUT ANY WARRANTY, without even the
-#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#// PURPOSE, except where stated in the Licence Agreement supplied with
-#// the software.
-#//
-#// Created By : Simon Crowle
-#// Created Date : 03/11/2018
-#// Created for Project : FLAME
-#//
-#/////////////////////////////////////////////////////////////////////////
-
-echo Starting TICK stack services...
-
-systemctl start influxdb
-systemctl start kapacitor
-systemctl start chronograf
\ No newline at end of file
diff --git a/scripts/influx/telegraf_ipendpoint_template.conf b/scripts/influx/telegraf_ipendpoint_template.conf
deleted file mode 100644
index 2358dcc..0000000
--- a/scripts/influx/telegraf_ipendpoint_template.conf
+++ /dev/null
@@ -1,112 +0,0 @@
-# Telegraf configuration
-
-# Telegraf is entirely plugin driven. All metrics are gathered from the
-# declared inputs, and sent to the declared outputs.
-
-# Plugins must be declared in here to be active.
-# To deactivate a plugin, comment out the name and any variables.
-
-# Use 'telegraf -config telegraf.conf -test' to see what metrics a config
-# file would generate.
-
-# Global tags can be specified here in key="value" format.
-[global_tags]
- # location of the data centre
- location="{{LOCATION}}"
- # media service template id
- sfc="{{SFC_ID}}"
- # media service instance
- sfc_i="{{SFC_ID_INSTANCE}}"
- # service function type
- sf="{{SF_ID}}"
- # service function instance id
- sf_i="{{SF_ID_INSTANCE}}"
- # ipendpoint id aka surrogate instance
- ipendpoint="{{IP_ENDPOINT_ID}}"
-
-# Configuration for telegraf agent
-[agent]
- ## Default data collection interval for all inputs
- interval = "10s"
- ## Rounds collection interval to 'interval'
- ## ie, if interval="10s" then always collect on :00, :10, :20, etc.
- round_interval = true
-
- ## Telegraf will cache metric_buffer_limit metrics for each output, and will
- ## flush this buffer on a successful write.
- metric_buffer_limit = 1000
- ## Flush the buffer whenever full, regardless of flush_interval.
- flush_buffer_when_full = true
-
- ## Collection jitter is used to jitter the collection by a random amount.
- ## Each plugin will sleep for a random time within jitter before collecting.
- ## This can be used to avoid many plugins querying things like sysfs at the
- ## same time, which can have a measurable effect on the system.
- collection_jitter = "0s"
-
- ## Default flushing interval for all outputs. You shouldn't set this below
- ## interval. Maximum flush_interval will be flush_interval + flush_jitter
- flush_interval = "10s"
- ## Jitter the flush interval by a random amount. This is primarily to avoid
- ## large write spikes for users running a large number of telegraf instances.
- ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s
- flush_jitter = "0s"
-
- ## Logging configuration:
- ## Run telegraf in debug mode
- debug = false
- ## Run telegraf in quiet mode
- quiet = false
- ## Specify the log file name. The empty string means to log to stdout.
- logfile = "G:/Telegraf/telegraf.log"
-
- ## Override default hostname, if empty use os.Hostname()
- hostname = ""
-
-
-###############################################################################
-# OUTPUTS #
-###############################################################################
-
-# Configuration for influxdb server to send metrics to
-[[outputs.influxdb]]
- # The full HTTP or UDP endpoint URL for your InfluxDB instance.
- # Multiple urls can be specified but it is assumed that they are part of the same
- # cluster, this means that only ONE of the urls will be written to each interval.
- # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example
- urls = ["{{INFLUXDB_URL}}"] # required
- # The target database for metrics (telegraf will create it if not exists)
- database = "{{DATABASE_NAME}}" # required
- # Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h".
- # note: using second precision greatly helps InfluxDB compression
- precision = "s"
-
- ## Write timeout (for the InfluxDB client), formatted as a string.
- ## If not provided, will default to 5s. 0s means no timeout (not recommended).
- timeout = "5s"
- # username = "telegraf"
- # password = "metricsmetricsmetricsmetrics"
- # Set the user agent for HTTP POSTs (can be useful for log differentiation)
- # user_agent = "telegraf"
- # Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
- # udp_payload = 512
-
-
-###############################################################################
-# INPUTS #
-###############################################################################
-# # Influx HTTP write listener
-[[inputs.http_listener]]
- ## Address and port to host HTTP listener on
- service_address = ":8186"
-
- ## timeouts
- read_timeout = "10s"
- write_timeout = "10s"
-
- ## HTTPS
- #tls_cert= "/etc/telegraf/cert.pem"
- #tls_key = "/etc/telegraf/key.pem"
-
- ## MTLS
- #tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
diff --git a/test/services/loadtest-streaming/install.sh b/test/services/loadtest-streaming/install.sh
index 8c1f2fb..7d6ef6d 100755
--- a/test/services/loadtest-streaming/install.sh
+++ b/test/services/loadtest-streaming/install.sh
@@ -23,10 +23,8 @@
#// Created for Project : FLAME
#//
#/////////////////////////////////////////////////////////////////////////
-
set -euo pipefail
echo "REPO_ROOT:"$REPO_ROOT
-
eval '$REPO_ROOT/test/services/vlc/install.sh'
-eval '$REPO_ROOT/test/services/jmeter/install.sh'
+eval '$REPO_ROOT/test/services/pytest/install.sh'
\ No newline at end of file
diff --git a/test/streaming-sim/rspec.yml b/test/streaming-sim/rspec.yml
index cd62eeb..5709115 100644
--- a/test/streaming-sim/rspec.yml
+++ b/test/streaming-sim/rspec.yml
@@ -28,7 +28,7 @@ hosts:
ipendpoint_id: "adaptive_streaming_I1_apache1"
influxdb_url: "http://192.168.50.10:8086"
database_name: "CLMCMetrics"
- - name: ipendpoint12
+ - name: ipendpoint2
cpus: 1
memory: 2048
disk: "10GB"
--
GitLab