From d3f8e2f95e5476161e570ed3d5766c04d8e3ee0b Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Tue, 9 Oct 2018 20:25:58 +0100
Subject: [PATCH] fixed hardcoded /varant in production.ini
---
src/test/clmctest/scripts/test_config_telegraf.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/test/clmctest/scripts/test_config_telegraf.py b/src/test/clmctest/scripts/test_config_telegraf.py
index ca23772..c85b508 100644
--- a/src/test/clmctest/scripts/test_config_telegraf.py
+++ b/src/test/clmctest/scripts/test_config_telegraf.py
@@ -29,6 +29,7 @@ import subprocess
def test_write_telegraf_conf():
# test telegraf monitoring configuration
+ TARGET_ROOT = "/opt/clmc"
TELEGRAF_CONF_DIR = "/etc/telegraf"
LOCATION = "DC1"
SFC_ID = "media_service_A"
@@ -49,21 +50,21 @@ def test_write_telegraf_conf():
assert code == 0, "Failed to create telegraf include dir : " + str(code) + ", cmd=" + cmd
# run write config template script with no telegraf.d directory
- cmd = 'sudo cp /vagrant/scripts/clmc-agent/telegraf.conf /etc/telegraf/'
+ cmd = 'sudo cp ' + TARGET_ROOT + '/scripts/clmc-agent/telegraf.conf /etc/telegraf/'
(out, err, code) = run_command(cmd)
assert code == 0, "Failed to copy telegraf.conf : " + str(code) + ", cmd=" + cmd
- cmd = 'sudo cp /vagrant/scripts/clmc-agent/telegraf_output.conf /etc/telegraf/telegraf.d/'
+ cmd = 'sudo cp ' + TARGET_ROOT + '/scripts/clmc-agent/telegraf_output.conf /etc/telegraf/telegraf.d/'
(out, err, code) = run_command(cmd)
assert code == 0, "Failed to copy telegraf_output.conf : " + str(code) + ", cmd=" + cmd
# run template relacement script with incorrect arguments
- cmd = 'sudo /vagrant/scripts/clmc-agent/configure.sh'
+ cmd = 'sudo ' + TARGET_ROOT + '/scripts/clmc-agent/configure.sh'
(out, err, code) = run_command(cmd)
assert code == 1, "Failed to return error on incorrect arguments : " + str(code) + ", cmd=" + cmd
# run template relacement script with all arguments
- cmd = 'sudo /vagrant/scripts/clmc-agent/configure.sh ' + LOCATION + ' ' + SFC_ID + ' ' + SFC_INSTANCE_ID + ' ' + SF_PACKAGE_ID + ' ' + SF_ID + ' ' + SF_ENDPOINT_ID + ' ' + INFLUXDB_URL
+ cmd = 'sudo ' + TARGET_ROOT + '/scripts/clmc-agent/configure.sh ' + LOCATION + ' ' + SFC_ID + ' ' + SFC_INSTANCE_ID + ' ' + SF_PACKAGE_ID + ' ' + SF_ID + ' ' + SF_ENDPOINT_ID + ' ' + INFLUXDB_URL
(out, err, code) = run_command(cmd)
assert code == 0, "Configure command returned error, output=" + str(out) + ", cmd=" + cmd
--
GitLab