diff --git a/py-json/LANforge/LFUtils.py b/py-json/LANforge/LFUtils.py index e0f3f63f..03236b9a 100644 --- a/py-json/LANforge/LFUtils.py +++ b/py-json/LANforge/LFUtils.py @@ -2,6 +2,7 @@ # Define useful common methods - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - import sys +import os if sys.version_info[0] != 3: print("This script requires Python 3") exit() @@ -318,4 +319,61 @@ def waitUntilPortsAppear(resource_id=1, base_url="http://localhost:8080", port_l print("These stations appeared: "+", ".join(found_stations)) return None - ### +def removePort(resource, port_name, baseurl="http://localhost:8080/"): + lf_r = LFRequest.LFRequest(baseurl+"cli-json/rm_vlan") + lf_r.addPostData({ + "shelf": 1, + "resource": resource, + "port": port_name + }) + lf_r.jsonPost(False) + +def removePortByName(port_name, baseurl="http://localhost:8080/"): + if ((port_name is None) or (port_name == "")): + print("No port name") + return; + if (port_name.index(".") < 0): + print("removePortByName: Please use short EID port names like: 2.sta1") + return + + resource = port_name[0 : port_name.index(".")] + name = port_name[port_name.index(".")+1 : ] + if (name.index(".") >= 0): + name = name[name.index(".")+1 : ] + lf_r = LFRequest.LFRequest(baseurl+"cli-json/rm_vlan") + lf_r.addPostData({ + "shelf": 1, + "resource": resource, + "port": name + }) + lf_r.jsonPost(True) + +def removeCX(mgrURL, cxNames): + for name in cxNames: + #print(f"Removing CX {name}") + data = { + "test_mgr":"all", + "cx_name":name + } + lf_r = LFRequest.LFRequest(mgrURL+"cli-json/rm_cx") + lf_r.addPostData(data) + lf_r.jsonPost() + +def removeEndps(mgrURL, endpNames): + for name in endpNames: + #print(f"Removing endp {name}") + data = { + "endp_name":name + } + lf_r = LFRequest.LFRequest(mgrURL+"cli-json/rm_endp") + lf_r.addPostData(data) + lf_r.jsonPost() + + +def execWrap(cmd): + if os.system(cmd) != 0: + print("\nError with " + cmd + ",bye\n") + exit(1) + + +###