scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-06 21:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve return code for create_l3, sta_connect_example.

Browse Source 
Add TODO for create_l3.py for future work.

Signed-off-by: Ben Greear <greearb@candelatech.com>
This commit is contained in:
Ben Greear
2022-01-31 14:47:19 -08:00
committed by shivam
parent 7db4c9a329
commit f64e7aa11e
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
py-scripts/create_l3.py
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
""" """
Create Layer-3 Cross Connection Using LANforge JSON AP : https://www.candelatech.com/cookbook.php?vol=fire&book=scripted+layer-3+test Create Layer-3 Cross Connection Using LANforge JSON API : https://www.candelatech.com/cookbook.php?vol=fire&book=scripted+layer-3+test
Written by Candela Technologies Inc. Written by Candela Technologies Inc.
Updated by: Erin Grimes Updated by: Erin Grimes
Example Command: Example Command:
@@ -11,9 +11,12 @@ import sys
import os import os
import importlib import importlib
import argparse import argparse
import logging
logger = logging.getLogger(__name__)
if sys.version_info[0] != 3: if sys.version_info[0] != 3:
print("This script requires Python 3") logger.critical("This script requires Python 3")
exit(1) exit(1)
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../")))
@@ -25,6 +28,7 @@ LFUtils = importlib.import_module("py-json.LANforge.LFUtils")
realm = importlib.import_module("py-json.realm") realm = importlib.import_module("py-json.realm")
Realm = realm.Realm Realm = realm.Realm
TestGroupProfile = realm.TestGroupProfile TestGroupProfile = realm.TestGroupProfile
lf_logger_config = importlib.import_module("py-scripts.lf_logger_config")
class CreateL3(Realm): class CreateL3(Realm):
@@ -63,13 +67,13 @@ class CreateL3(Realm):
self.cx_profile.cleanup_prefix() self.cx_profile.cleanup_prefix()
def build(self): def build(self):
self.cx_profile.create(endp_type="lf_udp", if self.cx_profile.create(endp_type="lf_udp",
side_a=self.endp_a, side_a=self.endp_a,
side_b=self.endp_b, side_b=self.endp_b,
sleep_time=0) sleep_time=0):
# self.cx_profile.start_cx() self._pass("Cross-connect build finished")
self._pass("PASS: Cross-connect build finished") else:
self._fail("Cross-connect build did not succeed.")
def main(args): def main(args):
@@ -89,10 +93,15 @@ def main(args):
# ip_var_test.pre_cleanup() # ip_var_test.pre_cleanup()
ip_var_test.build() ip_var_test.build()
if not ip_var_test.passes():
print(ip_var_test.get_fail_message()) # TODO: Delete the thing just created, unless --noclean option was added.
# Similar to how the create_bond.py does it.
if ip_var_test.passes():
logger.info("Created %s stations and connections" % (num_sta))
ip_var_test.exit_success()
else:
ip_var_test.exit_fail() ip_var_test.exit_fail()
print(f'Created {num_sta} stations and connections')
if __name__ == "__main__": if __name__ == "__main__":

11
py-scripts/sta_connect_example.py
View File

@@ -57,14 +57,11 @@ def main():
staConnect.stop() staConnect.stop()
# staConnect.finish() # staConnect.finish()
staConnect.cleanup() staConnect.cleanup()
is_passing = staConnect.passes()
if not is_passing:
# run_results = staConnect.get_failed_result_list()
fail_message = staConnect.get_fail_message()
print("Some tests failed:\n" + fail_message)
else:
print("Tests pass")
if staConnect.passes():
staConnect.exit_success()
else:
staConnect.exit_fail()
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -