scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-03 20:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

realm.py: adds note to remove halt_on_error in future; changes check on vr_name to gaurd

Browse Source
This commit is contained in:
Jed Reynolds
2021-02-02 15:27:28 -08:00
parent 088659b9ad
commit 2e6a5bd5df
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
py-json/realm.py
View File

@@ -55,7 +55,7 @@ class Realm(LFCliBase):
lfclient_host="localhost", lfclient_host="localhost",
lfclient_port=8080, lfclient_port=8080,
debug_=False, debug_=False,
halt_on_error_=False, halt_on_error_=False, # remove me
_exit_on_error=False, _exit_on_error=False,
_exit_on_fail=False, _exit_on_fail=False,
# _local_realm=None, # _local_realm=None,
@@ -2584,7 +2584,7 @@ class VRProfile(BaseProfile):
def create(self, def create(self,
resource=1, resource=1,
vr_id=0, vr_name=None,
upstream_port="eth1", upstream_port="eth1",
upstream_subnets="20.20.20.0/24", upstream_subnets="20.20.20.0/24",
upstream_nexthop="20.20.20.1", upstream_nexthop="20.20.20.1",
@@ -2598,11 +2598,13 @@ class VRProfile(BaseProfile):
# Create vr # Create vr
if self.debug: if self.debug:
debug = True debug = True
if self.vr_name is not None: if self.vr_name is None:
self.add_vr_data["alias"] = self.vr_name
self.json_post("/cli-json/add_vr", self.add_vr_data, debug_=debug)
else:
raise ValueError("vr_name must be set. Current name: %s" % self.vr_name) raise ValueError("vr_name must be set. Current name: %s" % self.vr_name)
self.add_vr_data["alias"] = self.vr_name
self.json_post("/cli-json/add_vr", self.add_vr_data, debug_=debug)
# Create 1 rdd pair # Create 1 rdd pair
self.create_rdd(resource=resource, ip_addr=rdd_ip, gateway=rdd_gateway, self.create_rdd(resource=resource, ip_addr=rdd_ip, gateway=rdd_gateway,
netmask=rdd_netmask) # rdd0, rdd1; rdd0 gateway, rdd1 connected to network netmask=rdd_netmask) # rdd0, rdd1; rdd0 gateway, rdd1 connected to network