Removed unused 'privatekey' variable in EPA04 and EPA05 tests

[osm/tests.git] / robot-systest / resources / sa_08-vnf_with_vnf_indicators_snmp_data.py

diff --git a/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py b/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py
index 449b61e..36dabdb 100644 (file)
--- a/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py
+++ b/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py
@@ -11,23 +11,18 @@
 #   limitations under the License.
 
 from pathlib import Path
-import os
+
+from common_helpers import get_prometheus_info
+
 
 # Prometheus host and port
-if os.environ.get('PROMETHEUS_HOSTNAME', False):
-    prometheus_host = os.environ.get('PROMETHEUS_HOSTNAME')
-    prometheus_port = '9090'
-else:
-    prometheus_host = os.environ.get('OSM_HOSTNAME')
-    prometheus_port = '9091'
+(prometheus_host, prometheus_port) = get_prometheus_info()
 
 # Prometheus metrics to retrieve
 metric_1_name = 'ifInOctets'
 metric_1_filter = 'ifIndex=1'
 metric_2_name = 'ifMtu'
 metric_2_filter = 'ifIndex=2'
-# Get ${HOME} from local machine
-home = str(Path.home())
 # NS and VNF descriptor package folder
 vnfd_pkg = 'snmp_ee_vnf'
 nsd_pkg = 'snmp_ee_ns'