diff options
| -rw-r--r-- | docs/docs_vCPE.rst | 2 | ||||
| -rwxr-xr-x | test/vcpe/healthcheck-k8s.py | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docs/docs_vCPE.rst b/docs/docs_vCPE.rst index 939adde8b..20e9b496d 100644 --- a/docs/docs_vCPE.rst +++ b/docs/docs_vCPE.rst @@ -146,7 +146,7 @@ Here are the main steps to run the use case in Integration lab environment, wher :: - healthcheck-k8s.py onap + healthcheck-k8s.py --namespace <namespace name> --environment <env name> 15. Instantiate vCPE customer service. Input the BRG MAC when prompt diff --git a/test/vcpe/healthcheck-k8s.py b/test/vcpe/healthcheck-k8s.py index d16128510..45832418b 100755 --- a/test/vcpe/healthcheck-k8s.py +++ b/test/vcpe/healthcheck-k8s.py @@ -12,7 +12,7 @@ def parse_args(): Parse command line arguments :return: arguments """ - parser = argparse.ArgumentParser(description='Processing arguments for vCPE healthcheck') + parser = argparse.ArgumentParser(description='Processing arguments for vCPE healthcheck',formatter_class=argparse.ArgumentDefaultsHelpFormatter) parser.add_argument('--namespace', default="onap", metavar=('<namespace_name>'), help='Namespace name for existing ONAP deployment') @@ -30,21 +30,20 @@ environment = args.environment print('Checking vGMUX REST API from SDNC') cmd = 'curl -s -u admin:admin -X GET http://10.0.101.21:8183/restconf/config/ietf-interfaces:interfaces' -ret = commands.getstatusoutput("kubectl -n {0} exec {1}-sdnc-sdnc-0 -- bash -c '{2}'".format(args.namespace, args.environment, cmd)) +ret = commands.getstatusoutput("kubectl -n {0} exec {1}-sdnc-sdnc-0 -- bash -c '{2}'".format(namespace, environment, cmd)) sz = ret[-1].split('\n')[-1] print(json.dumps(json.loads(sz), indent=4)) print('\n') print('Checking vBRG REST API from SDNC') cmd = 'curl -s -u admin:admin -X GET http://10.3.0.2:8183/restconf/config/ietf-interfaces:interfaces' -ret = commands.getstatusoutput("kubectl -n {0} exec {1}-sdnc-sdnc-0 -- bash -c '{2}'".format(args.namespace, args.environment, cmd)) +ret = commands.getstatusoutput("kubectl -n {0} exec {1}-sdnc-sdnc-0 -- bash -c '{2}'".format(namespace, environment, cmd)) sz = ret[-1].split('\n')[-1] print(json.dumps(json.loads(sz), indent=4)) print('\n') print('Checking SDNC DB for vBRG MAC address') -cmd = "kubectl -n {0} exec {1}-mariadb-galera-mariadb-galera-0 -- mysql -uroot -psecretpassword sdnctl -e 'select * from DHCP_MAP'".format(args.namespace, args.environment) +cmd = "kubectl -n {0} exec {1}-mariadb-galera-mariadb-galera-0 -- mysql -uroot -psecretpassword sdnctl -e 'select * from DHCP_MAP'".format(namespace, environment) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) (output, error) = p.communicate() print(output) - |