Update from master

[osm/tests.git] / robot-systest / resources / sa_02-vnf_with_vim_metrics_and_autoscaling_data.py

diff --git a/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py b/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
index 2821a60..a7a3456 100644 (file)
--- a/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
+++ b/robot-systest/resources/sa_02-vnf_with_vim_metrics_and_autoscaling_data.py
@@ -10,31 +10,13 @@
 #   See the License for the specific language governing permissions and
 #   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 metric and threshold
-metric_name = 'osm_cpu_utilization'
-metric_threshold = 60
-# Get ${HOME} from local machine
-home = str(Path.home())
-# NS and VNF descriptor package folder
-vnfd_pkg = 'hackfest_basic_metrics_vnf'
-nsd_pkg = 'hackfest_basic_metrics_ns'
-# NS and VNF descriptor id
-vnfd_name = 'hackfest_basic_metrics-vnf'
-nsd_name = 'hackfest_basic-ns-metrics'
-# NS instance name
-ns_name = 'sa_02-vnf_with_vim_metrics_and_autoscaling_test'
-# SSH keys to be used
-publickey = home + '/.ssh/id_rsa.pub'
-privatekey = home + '/.ssh/id_rsa'
 
+# Prometheus host and port
+(
+    prometheus_host,
+    prometheus_port,
+    prometheus_user,
+    prometheus_password,
+) = get_prometheus_info()