Skip to content
Snippets Groups Projects
Commit f8de58c8 authored by MJB's avatar MJB
Browse files

Updated streaming-sim test to use IP addresses within the rspec file rather than hard coded

parent fb33da19
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/services/ipendpoint/telegraf_ipendpoint.conf
+ 0
− 65
View file @ f8de58c8
###############################################################################
# INPUTS #
###############################################################################
# # Read metrics about network interface usage
[[inputs.net]]
# ## By default, telegraf gathers stats from any up interface (excluding loopback)
# ## Setting interfaces will tell it to gather these explicit interfaces,
# ## regardless of status.
# ##
# # interfaces = ["eth0"]
# Read metrics about cpu usage
[[inputs.cpu]]
## Whether to report per-cpu stats or not
percpu = true
## Whether to report total system cpu stats or not
totalcpu = true
## If true, collect raw CPU time metrics.
collect_cpu_time = false
## If true, compute and report the sum of all non-idle CPU states.
#report_active = false
# Read metrics about disk usage by mount point
[[inputs.disk]]
## By default, telegraf gather stats for all mountpoints.
## Setting mountpoints will restrict the stats to the specified mountpoints.
# mount_points = ["/"]
## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
## present on /run, /var/run, /dev/shm or /dev).
ignore_fs = ["tmpfs", "devtmpfs", "devfs"]
# Read metrics about disk IO by device
[[inputs.diskio]]
## By default, telegraf will gather stats for all devices including
## disk partitions.
## Setting devices will restrict the stats to the specified devices.
# devices = ["sda", "sdb"]
## Uncomment the following line if you need disk serial numbers.
# skip_serial_number = false
#
## On systems which support it, device metadata can be added in the form of
## tags.
## Currently only Linux is supported via udev properties. You can view
## available properties for a device by running:
## 'udevadm info -q property -n /dev/sda'
# device_tags = ["ID_FS_TYPE", "ID_FS_USAGE"]
#
## Using the same metadata source as device_tags, you can also customize the
## name of the device via templates.
## The 'name_templates' parameter is a list of templates to try and apply to
## the device. The template may contain variables in the form of '$PROPERTY' or
## '${PROPERTY}'. The first template which does not contain any variables not
## present for the device is used as the device name tag.
## The typical use case is for LVM volumes, to get the VG/LV name instead of
## the near-meaningless DM-0 name.
# name_templates = ["$ID_FS_LABEL","$DM_VG_NAME/$DM_LV_NAME"]
# Read metrics about memory usage
[[inputs.mem]]
# no configuration
# # Influx HTTP write listener
[[inputs.http_listener]]
## Address and port to host HTTP listener on
......
test/streaming-sim/StreamingSim.py
+ 27
− 15
View file @ f8de58c8
......@@ -15,10 +15,10 @@ DEFAULT_REQUEST_RATE_INC_PERIOD = 10
SIMULATION_TIME_SEC = 60 * 60
# CLMC parameters
INFLUX_DB_URL = 'http://192.168.50.10:8086'
INFLUX_DB_URL = 'http://172.23.1.20:8086'
INFLUX_DB_NAME = 'CLMCMetrics'
AGENT_URL1 = 'http://192.168.50.11:8186'
AGENT_URL2 = 'http://192.168.50.12:8186'
AGENT1_URL = 'http://172.23.1.21:8186'
AGENT2_URL = 'http://172.23.1.22:8186'
class Sim(object):
......@@ -26,7 +26,7 @@ class Sim(object):
Simulator for services
"""
def __init__(self, influx_url, influx_db_name):
def __init__(self, influx_url, influx_db_name, agent1_url, agent2_url):
"""
Sets up the simulator object
......@@ -35,6 +35,8 @@ class Sim(object):
"""
self.influx_db_name = influx_db_name
self.agent1_url = agent1_url
self.agent2_url = agent2_url
# influx db client is created on initialisation, which will handle the influx DB queries
url_object = urllib.parse.urlparse(influx_url)
......@@ -61,10 +63,10 @@ class Sim(object):
# segment_size : the length of video requested at a time
# bit_rate: MPEG-2 High 1080p 25fps = 80Mbps
ip_endpoints = [{'agent_url': AGENT_URL1, 'location': 'DC1', 'cpu': 16,
ip_endpoints = [{'agent_url': self.agent1_url, 'location': 'DC1', 'cpu': 16,
'mem': '8GB', 'storage': '1TB', 'request_queue': 0, 'request_arrival_rate': 0,
'segment_size': 2, 'video_bit_rate': 80, 'packet_size': 1500},
{'agent_url': AGENT_URL2, 'location': 'DC2', 'cpu': 4,
{'agent_url': self.agent2_url, 'location': 'DC2', 'cpu': 4,
'mem': '8GB', 'storage': '1TB', 'request_queue': 0, 'request_arrival_rate': 0,
'segment_size': 2, 'video_bit_rate': 80, 'packet_size': 1500}
]
......@@ -223,26 +225,34 @@ class Sim(object):
@pytest.fixture(scope='module')
def run_simulation_fixture():
def run_simulation_fixture(streaming_sim_config):
"""
A fixture, which checks if the the DB has been created, if not it runs the simulator with a 10 seconds timeout after that
"""
influx_db_url = "http://" + streaming_sim_config['hosts'][0]['ip_address'] + ":8086"
agent1_url = "http://" + streaming_sim_config['hosts'][1]['ip_address'] + ":8186"
agent2_url = "http://" + streaming_sim_config['hosts'][2]['ip_address'] + ":8186"
global INFLUX_DB_URL
global INFLUX_DB_NAME
global SIMULATION_TIME_SEC
global AGENT1_URL
global AGENT2_URL
simulator = Sim(INFLUX_DB_URL, INFLUX_DB_NAME)
simulator = Sim(influx_db_url, INFLUX_DB_NAME, agent1_url, agent2_url)
dbs = simulator.db_client.get_list_database()
dbs = [db.get("name") for db in dbs]
if INFLUX_DB_NAME not in dbs:
simulator.reset()
simulator.run(SIMULATION_TIME_SEC)
# This check needed to be disabled as the CLMCMetrics database is always created when
# the test starts, irrespective of whether this is the 1st time or not
# if INFLUX_DB_NAME not in dbs:
simulator.reset()
simulator.run(SIMULATION_TIME_SEC)
print("10 seconds timeout is given so that the data could properly be inserted into the database.")
import time
time.sleep(10)
print("10 seconds timeout is given so that the data could properly be inserted into the database.")
import time
time.sleep(10)
def run_simulation(generate=True):
......@@ -254,8 +264,10 @@ def run_simulation(generate=True):
global INFLUX_DB_NAME
global INFLUX_DB_URL
global SIMULATION_TIME_SEC
global AGENT1_URL
global AGENT2_URL
simulator = Sim(INFLUX_DB_URL, INFLUX_DB_NAME)
simulator = Sim(INFLUX_DB_URL, INFLUX_DB_NAME, AGENT1_URL, AGENT2_URL)
if generate:
simulator.reset()
......
test/streaming-sim/rspec.yml
+ 5
− 5
View file @ f8de58c8
......@@ -10,7 +10,7 @@ hosts:
host: 8888
- guest: 9092
host: 9092
ip_address: "192.168.50.10"
ip_address: "203.0.113.100"
- name: ipendpoint1
cpus: 1
memory: 2048
......@@ -19,14 +19,14 @@ hosts:
forward_ports:
- guest: 80
host: 8081
ip_address: "192.168.50.11"
ip_address: "203.0.113.101"
location: "DC1"
sfc_id: "MS_Template_1"
sfc_id_instance: "MS_I1"
sf_id: "adaptive_streaming"
sf_id_instance: "adaptive_streaming_I1"
ipendpoint_id: "adaptive_streaming_I1_apache1"
influxdb_url: "http://192.168.50.10:8086"
influxdb_url: "http://203.0.113.100:8086"
database_name: "CLMCMetrics"
- name: ipendpoint2
cpus: 1
......@@ -36,12 +36,12 @@ hosts:
forward_ports:
- guest: 80
host: 8082
ip_address: "192.168.50.12"
ip_address: "203.0.113.102"
location: "DC2"
sfc_id: "MS_Template_1"
sfc_id_instance: "MS_I1"
sf_id: "adaptive_streaming"
sf_id_instance: "adaptive_streaming_I1"
ipendpoint_id: "adaptive_streaming_I1_apache2"
influxdb_url: "http://192.168.50.10:8086"
influxdb_url: "http://203.0.113.100:8086"
database_name: "CLMCMetrics"
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment