parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 15 Pull Requests Projects Releases 106 Wiki Activity

Fix up some bugs and split out common daemon functions

This commit is contained in:
Joshua Boniface 2018-09-23 21:19:56 -04:00
parent 106a2327ed
commit b3259a3dcc
3 changed files with 93 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
daemon-common/daemon_lib/common.py Normal file
View File

@ -0,0 +1,32 @@
#!/usr/bin/env python3
# common.py - PVC daemon function library, common fuctions
# Part of the Parallel Virtual Cluster (PVC) system
#
# Copyright (C) 2018 Joshua M. Boniface <joshua@boniface.me>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
###############################################################################
import subprocess
def run_os_command(command_string):
command = command_string.split()
command_output = subprocess.run(
command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE
)
return command_output.returncode

38
router-daemon/pvcrd/Daemon.py
View File

@ -28,9 +28,11 @@ import socket
import psutil import psutil
import configparser import configparser
import time import time
import subprocess
import daemon_lib.ansiiprint as ansiiprint import daemon_lib.ansiiprint as ansiiprint
import daemon_lib.zkhandler as zkhandler import daemon_lib.zkhandler as zkhandler
import daemon_lib.common as common
import pvcrd.VXNetworkInstance as VXNetworkInstance import pvcrd.VXNetworkInstance as VXNetworkInstance
@ -163,35 +165,29 @@ signal.signal(signal.SIGQUIT, cleanup)
# [2] enables or disables a DHCP subnet definition for the network # [2] enables or disables a DHCP subnet definition for the network
# Enable routing
common.run_os_command('sysctl sysctl net.ipv4.ip_forward=1')
common.run_os_command('sysctl sysctl net.ipv6.ip_forward=1')
common.run_os_command('sysctl sysctl net.ipv4.all.send_redirects=1')
common.run_os_command('sysctl sysctl net.ipv6.all.send_redirects=1')
common.run_os_command('sysctl sysctl net.ipv4.all.accept_source_route=1')
common.run_os_command('sysctl sysctl net.ipv6.all.accept_source_route=1')
# Prepare underlying interface # Prepare underlying interface
if config['vni_dev_ip'] == 'dhcp': if config['vni_dev_ip'] == 'dhcp':
vni_dev = config['vni_dev'] vni_dev = config['vni_dev']
ansiiprint.echo('Configuring VNI parent device {} with DHCP IP'.format(vni_dev), '', 'o') ansiiprint.echo('Configuring VNI parent device {} with DHCP IP'.format(vni_dev), '', 'o')
os.system( common.run_os_command('ip link set {0} up'.format(vni_dev))
'ip link set {0} up'.format( common.run_os_command('dhclient {0}'.format(vni_dev))
vni_dev
)
)
os.system(
'dhclient {0}'.format(
vni_dev
)
)
else: else:
vni_dev = config['vni_dev'] vni_dev = config['vni_dev']
vni_dev_ip = config['vni_dev_ip'] vni_dev_ip = config['vni_dev_ip']
ansiiprint.echo('Configuring VNI parent device {} with IP {}'.format(vni_dev, vni_dev_ip), '', 'o') ansiiprint.echo('Configuring VNI parent device {} with IP {}'.format(vni_dev, vni_dev_ip), '', 'o')
os.system( common.run_os_command('ip link set {0} up'.format(vni_dev))
'ip link set {0} up'.format( common.run_os_command('ip address add {0} dev {1}'.format(vni_dev_ip, vni_dev))
vni_dev
) # Disable stonith in corosync
) common.run_os_command('crm configure property stonith-enabled="false"')
os.system(
'ip address add {0} dev {1}'.format(
vni_dev_ip,
vni_dev
)
)
# Prepare VNI list # Prepare VNI list
t_vni = dict() t_vni = dict()

150
router-daemon/pvcrd/VXNetworkInstance.py
View File

@ -23,10 +23,12 @@
import os import os
import sys import sys
import time import time
import subprocess
import apscheduler.schedulers.background import apscheduler.schedulers.background
import daemon_lib.ansiiprint as ansiiprint import daemon_lib.ansiiprint as ansiiprint
import daemon_lib.zkhandler as zkhandler import daemon_lib.zkhandler as zkhandler
import daemon_lib.common as common
class VXNetworkInstance(): class VXNetworkInstance():
# Initialization function # Initialization function
@ -35,6 +37,13 @@ class VXNetworkInstance():
self.zk_conn = zk_conn self.zk_conn = zk_conn
self.vni_dev = config['vni_dev'] self.vni_dev = config['vni_dev']
self.old_description = zkhandler.readdata(self.zk_conn, '/networks/{}'.format(self.vni))
self.description = zkhandler.readdata(self.zk_conn, '/networks/{}'.format(self.vni))
self.ip_gateway = zkhandler.readdata(self.zk_conn, '/networks/{}/ip_gateway'.format(self.vni))
self.ip_network = zkhandler.readdata(self.zk_conn, '/networks/{}/ip_network'.format(self.vni))
self.ip_cidrnetmask = self.ip_network.split('/')[-1]
self.dhcp_flag = ( zkhandler.readdata(self.zk_conn, '/networks/{}/dhcp_flag'.format(self.vni)) == 'True' )
self.vxlan_nic = 'vxlan{}'.format(self.vni) self.vxlan_nic = 'vxlan{}'.format(self.vni)
self.bridge_nic = 'br{}'.format(self.vni) self.bridge_nic = 'br{}'.format(self.vni)
@ -45,144 +54,65 @@ class VXNetworkInstance():
self.update_timer.add_job(self.updateCorosyncResource, 'interval', seconds=1) self.update_timer.add_job(self.updateCorosyncResource, 'interval', seconds=1)
# Zookeper handlers for changed states # Zookeper handlers for changed states
@zk_conn.DataWatch('/networks/{}/description'.format(self.vni)) @zk_conn.DataWatch('/networks/{}'.format(self.vni))
def watch_network_description(data, stat, event=''): def watch_network_description(data, stat, event=''):
try: if self.description != data.decode('ascii'):
self.old_description = self.description
self.description = data.decode('ascii') self.description = data.decode('ascii')
except AttributeError:
self.description = self.vni
self.watch_change = True self.watch_change = True
@zk_conn.DataWatch('/networks/{}/ip_network'.format(self.vni)) @zk_conn.DataWatch('/networks/{}/ip_network'.format(self.vni))
def watch_network_ip_network(data, stat, event=''): def watch_network_ip_network(data, stat, event=''):
try: if self.ip_network != data.decode('ascii'):
ip_network = data.decode('ascii') ip_network = data.decode('ascii')
self.ip_network = ip_network self.ip_network = ip_network
self.ip_cidrnetmask = ip_network.split('/')[-1] self.ip_cidrnetmask = ip_network.split('/')[-1]
except AttributeError:
self.ip_network = ''
self.ip_cidrnetmask = ''
self.watch_change = True self.watch_change = True
@zk_conn.DataWatch('/networks/{}/ip_gateway'.format(self.vni)) @zk_conn.DataWatch('/networks/{}/ip_gateway'.format(self.vni))
def watch_network_gateway(data, stat, event=''): def watch_network_gateway(data, stat, event=''):
try: if self.ip_gateway != data.decode('ascii'):
self.ip_gateway = data.decode('ascii') self.ip_gateway = data.decode('ascii')
except AttributeError:
self.ip_gateway = ''
self.watch_change = True self.watch_change = True
@zk_conn.DataWatch('/networks/{}/dhcp_flag'.format(self.vni)) @zk_conn.DataWatch('/networks/{}/dhcp_flag'.format(self.vni))
def watch_network_dhcp_status(data, stat, event=''): def watch_network_dhcp_status(data, stat, event=''):
try: if self.dhcp_flag != data.decode('ascii'):
dhcp_flag = data.decode('ascii') self.dhcp_flag = ( data.decode('ascii') == 'True' )
self.dhcp_flag = ( dhcp_flag == 'True' )
except AttributeError:
self.dhcp_flag = False
self.watch_change = True self.watch_change = True
def createCorosyncResource(self): def createCorosyncResource(self):
ansiiprint.echo('Creating Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o') ansiiprint.echo('Creating Corosync resource for network {} gateway {} on VNI {}'.format(self.description, self.ip_gateway, self.vni), '', 'o')
os.system( common.run_os_command("""
""" crm configure
echo " primitive vnivip_{} ocf:heartbeat:IPaddr2
configure params ip={} cidr_netmask={} nic={}
primitive vnivip_{0} ocf:heartbeat:IPaddr2 params ip={1} cidr_netmask={2} nic={3} op monitor interval=1s op monitor interval=1s
commit """.format( self.description, self.ip_gateway, self.ip_cidrnetmask, self.bridge_nic))
up self.watch_change = False
resource
start vnivip_{0}
" | crm -f -
""".format(
self.description,
self.ip_gateway,
self.ip_cidrnetmask,
self.bridge_nic
)
)
self.corosync_provisioned = True self.corosync_provisioned = True
def removeCorosyncResource(self): def removeCorosyncResource(self):
ansiiprint.echo('Removing Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o') ansiiprint.echo('Removing Corosync resource for network {} on VNI {}'.format(self.old_description, self.vni), '', 'o')
os.system( common.run_os_command('crm resource stop vnivip_{}'.format(self.old_description))
""" common.run_os_command('crm configure delete vnivip_{}'.format(self.old_description))
echo "
resource
stop vnivip_{0}
up
configure
delete vnivip_{0}
commit
" | crm -f -
""".format(
self.description
)
)
self.corosync_provisioned = False self.corosync_provisioned = False
def createNetwork(self): def createNetwork(self):
ansiiprint.echo('Creating VNI {} device on interface {}'.format(self.vni, self.vni_dev), '', 'o') ansiiprint.echo('Creating VNI {} device on interface {}'.format(self.vni, self.vni_dev), '', 'o')
os.system( common.run_os_command('ip link add {} type vxlan id {} dstport 4789 dev {}'.format(self.vxlan_nic, self.vni, self.vni_dev))
'ip link add {0} type vxlan id {1} dstport 4789 dev {2}'.format( common.run_os_command('brctl addbr {}'.format(self.bridge_nic))
self.vxlan_nic, common.run_os_command('brctl addif {} {}'.format(self.bridge_nic, self.vxlan_nic))
self.vni, common.run_os_command('ip link set {} up'.format(self.vxlan_nic))
self.vni_dev common.run_os_command('ip link set {} up'.format(self.bridge_nic))
)
)
os.system(
'brctl addbr {0}'.format(
self.bridge_nic
)
)
os.system(
'brctl addif {0} {1}'.format(
self.bridge_nic,
self.vxlan_nic
)
)
os.system(
'ip link set {0} up'.format(
self.vxlan_nic
)
)
os.system(
'ip link set {0} up'.format(
self.bridge_nic
)
)
def removeNetwork(self): def removeNetwork(self):
ansiiprint.echo('Removing VNI {} device on interface {}'.format(self.vni, self.vni_dev), '', 'o') ansiiprint.echo('Removing VNI {} device on interface {}'.format(self.vni, self.vni_dev), '', 'o')
os.system( common.run_os_command('ip link set {} down'.format(self.bridge_nic))
'ip link set {0} down'.format( common.run_os_command('ip link set {} down'.format(self.vxlan_nic))
self.bridge_nic common.run_os_command('brctl delif {} {}'.format(self.bridge_nic, self.vxlan_nic))
) common.run_os_command('brctl delbr {}'.format(self.bridge_nic))
) common.run_os_command('ip link delete {}'.format(self.vxlan_nic))
os.system(
'ip link set {0} down'.format(
self.vxlan_nic
)
)
os.system(
'brctl delif {0} {1}'.format(
self.bridge_nic,
self.vxlan_nic
)
)
os.system(
'brctl delbr {0}'.format(
self.bridge_nic
)
)
os.system(
'ip link delete {0}'.format(
self.vxlan_nic
)
)
def updateCorosyncResource(self): def updateCorosyncResource(self):
if self.corosync_provisioned and self.watch_change: if self.corosync_provisioned and self.watch_change:
@ -192,11 +122,11 @@ class VXNetworkInstance():
self.createCorosyncResource() self.createCorosyncResource()
def provision(self): def provision(self):
self.update_timer.start()
self.createNetwork() self.createNetwork()
self.createCorosyncResource() self.createCorosyncResource()
self.update_timer.start()
def deprovision(self): def deprovision(self):
self.update_timer.shutdown() self.update_timer.shutdown()
removeCorosyncResource() self.removeCorosyncResource()
removeNetwork() self.removeNetwork()