From 4a0a39a8f6302299d68104e147c6fd05a7d9b7ff Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 13 Jun 2019 15:44:01 +0200 Subject: Fix missing import in helm_deployment_status.py After recent changes a regression emerged due to not properly imported 'subprocess' module 'check_output' function. Predefined list of available healthcheck modes is also removed to allow passing any mode that will be supported in future by healthcheck script. Change-Id: I2dc681da079f75449f9f2456249d51b3c859f434 Issue-ID: OOM-1806 Signed-off-by: Bartek Grzybowski --- helm_deployment_status.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/helm_deployment_status.py b/helm_deployment_status.py index 8f9a931d..8917e992 100755 --- a/helm_deployment_status.py +++ b/helm_deployment_status.py @@ -25,7 +25,7 @@ import sys import argparse import yaml import requests -from subprocess import Popen,STDOUT,PIPE +from subprocess import Popen,STDOUT,PIPE,check_output import datetime from time import sleep from os.path import expanduser @@ -137,7 +137,7 @@ def check_in_loop(k8s, max_time, sleep_time, verbosity): return ready def check_helm_releases(): - helm = subprocess.check_output(['helm', 'ls']) + helm = check_output(['helm', 'ls']) if helm == '': sys.exit('No Helm releases detected.') helm_releases = csv.DictReader( @@ -180,9 +180,7 @@ def parse_args(): default=expanduser('~') + '/.kube/config', help='path to .kube/config file') parser.add_argument('--health-path', '-hp', help='path to ONAP robot ete-k8s.sh') - parser.add_argument('--health-mode', default='health', help='healthcheck mode', - choices=('health','healthdist','distribute','instantiate','instantiateVFWCL', - 'instantiateDemoVFWCL','portal')) + parser.add_argument('--health-mode', '-hm', default='health', help='healthcheck mode') parser.add_argument('--no-helm', action='store_true', help='Do not check Helm') parser.add_argument('--check-frequency', '-w', default=300, type=int, help='time between readiness checks in seconds') -- cgit 1.2.3-korg