mirror of
https://github.com/Telecominfraproject/wlan-lanforge-scripts.git
synced 2025-11-03 04:07:52 +00:00
Revert "Improved error detection algorithm."
This reverts commit fb0b4abb72.
This commit is contained in:
@@ -126,19 +126,26 @@ function run_test() {
|
||||
echo_print
|
||||
echo "$i"
|
||||
$i > "${TEST_DIR}/${NAME}.txt" 2> "${TEST_DIR}/${NAME}_stderr.txt"
|
||||
locallines==$(grep -v '^\s*$' "${TEST_DIR}/${NAME}_stderr.txt" | wc -l)
|
||||
retval=$?
|
||||
grep -i fail "${TEST_DIR}/${NAME}.txt" && retval=1
|
||||
chmod 664 "${TEST_DIR}/${NAME}.txt"
|
||||
if (( $locallines > 1 )); then
|
||||
stdoutlength=$(wc -c "${URL}/${NAME}.txt")
|
||||
if (( $retval == 0 )); then
|
||||
results+=("<tr><td>${CURR_TEST_NAME}</td><td class='scriptdetails'>${i}</td>
|
||||
<td class='success'>Success</td>
|
||||
<td><a href=\"${URL}/${NAME}.txt\" target=\"_blank\">STDOUT</a></td>
|
||||
<td></td>
|
||||
<td>${stdoutlength}</td>
|
||||
<td></td></tr>")
|
||||
else
|
||||
stderrlength=$(wc -c "${URL}/${NAME}_stderr.txt")
|
||||
results+=("<tr><td>${CURR_TEST_NAME}</td><td class='scriptdetails'>${i}</td>
|
||||
<td class='failure'>Failure</td>
|
||||
<td><a href=\"${URL}/${NAME}.txt\" target=\"_blank\">STDOUT</a></td>
|
||||
<td><a href=\"${URL}/${NAME}_stderr.txt\" target=\"_blank\">STDERR</a></td></tr>")
|
||||
<td><a href=\"${URL}/${NAME}_stderr.txt\" target=\"_blank\">STDERR</a></td>
|
||||
<td>${stdoutlength}</td>
|
||||
<td>${stderrlength}</td></tr>")
|
||||
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@@ -183,6 +190,8 @@ function html_generator() {
|
||||
<th onclick=\"sortTable(2)\">Status</th>
|
||||
<th onclick=\"sortTable(3)\">STDOUT</th>
|
||||
<th onclick=\"sortTable(4)\">STDERR</th>
|
||||
<th onclick=\"sortTable(3)\">STDOUT length</th>
|
||||
<th onclick=\"sortTable(4)\">STDERR length</th>
|
||||
</tr>"
|
||||
tail="</body>
|
||||
</html>"
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Script for creating a variable number of bridges.
|
||||
"""
|
||||
|
||||
import sys
|
||||
import os
|
||||
import argparse
|
||||
|
||||
if sys.version_info[0] != 3:
|
||||
print("This script requires Python 3")
|
||||
exit(1)
|
||||
|
||||
if 'py-json' not in sys.path:
|
||||
sys.path.append(os.path.join(os.path.abspath('..'), 'py-json'))
|
||||
import LANforge
|
||||
from LANforge.lfcli_base import LFCliBase
|
||||
from LANforge import LFUtils
|
||||
from realm import Realm
|
||||
import time
|
||||
import pprint
|
||||
|
||||
|
||||
class RemoveEndp(Realm):
|
||||
def __init__(self,
|
||||
endp_name,
|
||||
_host=1,
|
||||
_debug_on=False):
|
||||
super().__init__(_host)
|
||||
self.endp_name = endp_name
|
||||
self.debug = _debug_on
|
||||
if self.debug:
|
||||
print("----- Endpoint List ----- ----- ----- ----- ----- ----- \n")
|
||||
pprint.pprint(self.endp_name)
|
||||
print("---- ~Endpoint List ----- ----- ----- ----- ----- ----- \n")
|
||||
|
||||
|
||||
def build(self):
|
||||
# Build bridges
|
||||
|
||||
data = {
|
||||
"endp_name": self.endp_name
|
||||
}
|
||||
self.json_post("cli-json/rm_endp", data)
|
||||
|
||||
|
||||
|
||||
|
||||
def main():
|
||||
parser = LFCliBase.create_basic_argparse(
|
||||
prog='create_bridge.py',
|
||||
formatter_class=argparse.RawTextHelpFormatter,
|
||||
epilog='''\
|
||||
Create bridges
|
||||
''',
|
||||
|
||||
description='''\
|
||||
create_bridge.py
|
||||
--------------------
|
||||
Command example:
|
||||
./remove_endp.py
|
||||
--endp_name br0
|
||||
''')
|
||||
required = parser.add_argument_group('required arguments')
|
||||
required.add_argument('--endp_name', help='Name of the endpoint you want to remove', required=True)
|
||||
args = parser.parse_args()
|
||||
|
||||
if (args.endp_name is None):
|
||||
raise ValueError("--endp_name required")
|
||||
|
||||
remove_endp = RemoveEndp(endp_name=args.endp_name,
|
||||
_debug_on=args.debug)
|
||||
|
||||
remove_endp.build()
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user