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

Move IP creation/removal to common function

Browse Source
This commit is contained in:
Joshua Boniface
2018-10-27 16:31:31 -04:00
parent a5be42908d
commit d8796fd6d6
3 changed files with 37 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
node-daemon/pvcd/VXNetworkInstance.py
View File

@ -331,27 +331,15 @@ add rule inet filter input meta iifname {bridgenic} counter drop
def createGatewayAddress(self):
if self.this_node.router_state == 'primary':
self.logger.out(
'Creating gateway {} on interface {}'.format(
'Creating gateway {}/{} on interface {}'.format(
self.ip_gateway,
self.ip_cidrnetmask,
self.bridge_nic
),
prefix='VNI {}'.format(self.vni),
state='o'
)
common.run_os_command(
'ip address add {}/{} dev {}'.format(
self.ip_gateway,
self.ip_cidrnetmask,
self.bridge_nic
)
)
common.run_os_command(
'arping -A -c2 -I {} {}'.format(
self.bridge_nic,
self.ip_gateway
),
background=True
)
common.createIPAddress(self.ip_gateway, self.ip_cidrnetmask, self.bridge_nic)
def startDHCPServer(self):
if self.this_node.router_state == 'primary':
@ -454,20 +442,15 @@ add rule inet filter input meta iifname {bridgenic} counter drop
def removeGatewayAddress(self):
self.logger.out(
'Removing gateway {} from interface {}'.format(
'Removing gateway {}/{} from interface {}'.format(
self.ip_gateway,
self.ip_cidrnetmask,
self.bridge_nic
),
prefix='VNI {}'.format(self.vni),
state='o'
)
common.run_os_command(
'ip address delete {}/{} dev {}'.format(
self.ip_gateway,
self.ip_cidrnetmask,
self.bridge_nic
)
)
common.removeIPAddress(self.ip_gateway, self.ip_cidrnetmask, self.bridge_nic)
def stopDHCPServer(self):
if self.dhcp_server_daemon: