parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 114 Wiki Activity

Use coordinator_state instead of router_state

Browse Source 
Makes it much clearer what this variable represents.
This commit is contained in:
Joshua Boniface
2023-09-15 16:47:56 -04:00
parent 40b7d68853
commit 254303b9d4
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
node-daemon/pvcnoded/objects/VXNetworkInstance.py
View File

@ -306,11 +306,11 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
if data and self.ip6_gateway != data.decode("ascii"):
orig_gateway = self.ip6_gateway
if self.this_node.router_state in ["primary", "takeover"]:
if self.this_node.coordinator_state in ["primary", "takeover"]:
if orig_gateway:
self.removeGateway6Address()
self.ip6_gateway = data.decode("ascii")
if self.this_node.router_state in ["primary", "takeover"]:
if self.this_node.coordinator_state in ["primary", "takeover"]:
self.createGateway6Address()
if self.dhcp_server_daemon:
self.stopDHCPServer()
@ -333,13 +333,13 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
if (
self.dhcp6_flag
and not self.dhcp_server_daemon
and self.this_node.router_state in ["primary", "takeover"]
and self.this_node.coordinator_state in ["primary", "takeover"]
):
self.startDHCPServer()
elif (
self.dhcp_server_daemon
and not self.dhcp4_flag
and self.this_node.router_state in ["primary", "takeover"]
and self.this_node.coordinator_state in ["primary", "takeover"]
):
self.stopDHCPServer()
@ -371,11 +371,11 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
if data and self.ip4_gateway != data.decode("ascii"):
orig_gateway = self.ip4_gateway
if self.this_node.router_state in ["primary", "takeover"]:
if self.this_node.coordinator_state in ["primary", "takeover"]:
if orig_gateway:
self.removeGateway4Address()
self.ip4_gateway = data.decode("ascii")
if self.this_node.router_state in ["primary", "takeover"]:
if self.this_node.coordinator_state in ["primary", "takeover"]:
self.createGateway4Address()
if self.dhcp_server_daemon:
self.stopDHCPServer()
@ -398,13 +398,13 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
if (
self.dhcp4_flag
and not self.dhcp_server_daemon
and self.this_node.router_state in ["primary", "takeover"]
and self.this_node.coordinator_state in ["primary", "takeover"]
):
self.startDHCPServer()
elif (
self.dhcp_server_daemon
and not self.dhcp6_flag
and self.this_node.router_state in ["primary", "takeover"]
and self.this_node.coordinator_state in ["primary", "takeover"]
):
self.stopDHCPServer()
@ -450,7 +450,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
if self.dhcp_reservations != new_reservations:
old_reservations = self.dhcp_reservations
self.dhcp_reservations = new_reservations
if self.this_node.router_state in ["primary", "takeover"]:
if self.this_node.coordinator_state in ["primary", "takeover"]:
self.updateDHCPReservations(old_reservations, new_reservations)
if self.dhcp_server_daemon:
self.stopDHCPServer()
@ -706,7 +706,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
self.createGateway4Address()
def createGateway6Address(self):
if self.this_node.router_state in ["primary", "takeover"]:
if self.this_node.coordinator_state in ["primary", "takeover"]:
self.logger.out(
"Creating gateway {}/{} on interface {}".format(
self.ip6_gateway, self.ip6_cidrnetmask, self.bridge_nic
@ -719,7 +719,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
)
def createGateway4Address(self):
if self.this_node.router_state in ["primary", "takeover"]:
if self.this_node.coordinator_state in ["primary", "takeover"]:
self.logger.out(
"Creating gateway {}/{} on interface {}".format(
self.ip4_gateway, self.ip4_cidrnetmask, self.bridge_nic
@ -733,7 +733,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
def startDHCPServer(self):
if (
self.this_node.router_state in ["primary", "takeover"]
self.this_node.coordinator_state in ["primary", "takeover"]
and self.nettype == "managed"
):
self.logger.out(