projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the way to access juju data in k8s_08 testsuite.
[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
..
15a4477
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
@@
-11,19
+11,19
@@
# limitations under the License.
from pathlib import Path
# limitations under the License.
from pathlib import Path
-import os
+
+from common_helpers import get_prometheus_info
+
# Prometheus host and port
# 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 polling interval and retries
+prometheus_poll_retries = '15 times'
+prometheus_poll_timeout = '1 minute'
# Prometheus metric and threshold
metric_name = 'osm_cpu_utilization'
# Prometheus metric and threshold
metric_name = 'osm_cpu_utilization'
-metric_threshold =
6
0
+metric_threshold =
4
0
# Get ${HOME} from local machine
home = str(Path.home())
# NS and VNF descriptor package folder
# Get ${HOME} from local machine
home = str(Path.home())
# NS and VNF descriptor package folder
@@
-37,4
+37,3
@@
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'
# SSH keys to be used
publickey = home + '/.ssh/id_rsa.pub'
privatekey = home + '/.ssh/id_rsa'
-