summaryrefslogtreecommitdiffstats
path: root/app/monitoring/checks
diff options
context:
space:
mode:
authoryayogev <yaronyogev@gmail.com>2018-02-27 17:00:05 +0200
committeryayogev <yaronyogev@gmail.com>2018-02-27 17:00:05 +0200
commit648a394f7a318443dfd82f790f83a79616c26905 (patch)
tree719508e9d99771c3de056a9c2914d461c35fb967 /app/monitoring/checks
parent100add41cfe2b987524b190c1c92771a3c4f1d5f (diff)
US3541 merge various fixes to OPNFV branch
timestamp of last commit tt was merged: 26-Jan-2018 16:25. Change-Id: I7b0bf7885d7d0badb81c794a52c480b905d78459 Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/monitoring/checks')
-rw-r--r--app/monitoring/checks/check_instance_communictions.py4
-rwxr-xr-xapp/monitoring/checks/check_ping.py2
-rwxr-xr-xapp/monitoring/checks/check_pnic_ovs.py4
-rwxr-xr-xapp/monitoring/checks/check_pnic_vpp.py2
-rw-r--r--app/monitoring/checks/check_vconnector.py2
-rwxr-xr-xapp/monitoring/checks/check_vedge_ovs.py2
-rwxr-xr-xapp/monitoring/checks/check_vedge_vpp.py2
-rwxr-xr-xapp/monitoring/checks/check_vnic_vconnector.py2
-rwxr-xr-xapp/monitoring/checks/check_vnic_vpp.py2
-rw-r--r--app/monitoring/checks/check_vservice.py2
10 files changed, 12 insertions, 12 deletions
diff --git a/app/monitoring/checks/check_instance_communictions.py b/app/monitoring/checks/check_instance_communictions.py
index d3a94b7..4ce5165 100644
--- a/app/monitoring/checks/check_instance_communictions.py
+++ b/app/monitoring/checks/check_instance_communictions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
@@ -31,7 +31,7 @@ arp_mac_pos = arp_headers.index('HWaddress')
arp_flags_pos = arp_headers.index('Flags')
-def check_vnic_tuple(vnic_and_service: str):
+def check_vnic_tuple(vnic_and_service):
tuple_parts = vnic_and_service.split(',')
local_service_id = tuple_parts[0]
mac_address = tuple_parts[1]
diff --git a/app/monitoring/checks/check_ping.py b/app/monitoring/checks/check_ping.py
index 35e7234..fbf1304 100755
--- a/app/monitoring/checks/check_ping.py
+++ b/app/monitoring/checks/check_ping.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
diff --git a/app/monitoring/checks/check_pnic_ovs.py b/app/monitoring/checks/check_pnic_ovs.py
index c26e42f..7cfa699 100755
--- a/app/monitoring/checks/check_pnic_ovs.py
+++ b/app/monitoring/checks/check_pnic_ovs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
@@ -15,7 +15,7 @@ import subprocess
from binary_converter import binary2str
-def nic_not_found(name: str, output: str):
+def nic_not_found(name, output):
print("Error finding NIC {}{}{}\n".format(name, ': ' if output else '',
output))
return 2
diff --git a/app/monitoring/checks/check_pnic_vpp.py b/app/monitoring/checks/check_pnic_vpp.py
index 942fdc2..3db4e49 100755
--- a/app/monitoring/checks/check_pnic_vpp.py
+++ b/app/monitoring/checks/check_pnic_vpp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
diff --git a/app/monitoring/checks/check_vconnector.py b/app/monitoring/checks/check_vconnector.py
index 237a195..961d7ad 100644
--- a/app/monitoring/checks/check_vconnector.py
+++ b/app/monitoring/checks/check_vconnector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
diff --git a/app/monitoring/checks/check_vedge_ovs.py b/app/monitoring/checks/check_vedge_ovs.py
index 849af66..33d3f71 100755
--- a/app/monitoring/checks/check_vedge_ovs.py
+++ b/app/monitoring/checks/check_vedge_ovs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
diff --git a/app/monitoring/checks/check_vedge_vpp.py b/app/monitoring/checks/check_vedge_vpp.py
index 346feae..94d5977 100755
--- a/app/monitoring/checks/check_vedge_vpp.py
+++ b/app/monitoring/checks/check_vedge_vpp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
diff --git a/app/monitoring/checks/check_vnic_vconnector.py b/app/monitoring/checks/check_vnic_vconnector.py
index 76efd0b..fc8721f 100755
--- a/app/monitoring/checks/check_vnic_vconnector.py
+++ b/app/monitoring/checks/check_vnic_vconnector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
diff --git a/app/monitoring/checks/check_vnic_vpp.py b/app/monitoring/checks/check_vnic_vpp.py
index 0f77ddd..22cc31d 100755
--- a/app/monitoring/checks/check_vnic_vpp.py
+++ b/app/monitoring/checks/check_vnic_vpp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #
diff --git a/app/monitoring/checks/check_vservice.py b/app/monitoring/checks/check_vservice.py
index a95a46a..2a30a53 100644
--- a/app/monitoring/checks/check_vservice.py
+++ b/app/monitoring/checks/check_vservice.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
###############################################################################
# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) #
# and others #