Add support for bridge-only VNIs
This commit is contained in:
parent
318a2353ea
commit
946442ae38
|
@ -616,8 +616,14 @@ def cli_network():
|
||||||
help='Description of the network; must be unique and not contain whitespace.'
|
help='Description of the network; must be unique and not contain whitespace.'
|
||||||
)
|
)
|
||||||
@click.option(
|
@click.option(
|
||||||
'-n', '--domain', 'domain',
|
'-p', '--type', 'nettype',
|
||||||
required=True,
|
required=True,
|
||||||
|
type=click.Choice(['managed', 'bridged']),
|
||||||
|
help='Network type; managed networks control IP addressing; bridged networks are simple vLAN bridges. All subsequent options are unused for bridged networks.'
|
||||||
|
)
|
||||||
|
@click.option(
|
||||||
|
'-n', '--domain', 'domain',
|
||||||
|
default=None,
|
||||||
help='Domain name of the network.'
|
help='Domain name of the network.'
|
||||||
)
|
)
|
||||||
@click.option(
|
@click.option(
|
||||||
|
@ -643,7 +649,7 @@ def cli_network():
|
||||||
@click.option(
|
@click.option(
|
||||||
'--dhcp/--no-dhcp', 'dhcp_flag',
|
'--dhcp/--no-dhcp', 'dhcp_flag',
|
||||||
is_flag=True,
|
is_flag=True,
|
||||||
default=None,
|
default=False,
|
||||||
help='Enable/disable IPv4 DHCP for clients on subnet.'
|
help='Enable/disable IPv4 DHCP for clients on subnet.'
|
||||||
)
|
)
|
||||||
@click.option(
|
@click.option(
|
||||||
|
@ -659,23 +665,29 @@ def cli_network():
|
||||||
@click.argument(
|
@click.argument(
|
||||||
'vni'
|
'vni'
|
||||||
)
|
)
|
||||||
def net_add(vni, description, domain, ip_network, ip_gateway, ip6_network, ip6_gateway, dhcp_flag, dhcp_start, dhcp_end):
|
def net_add(vni, description, nettype, domain, ip_network, ip_gateway, ip6_network, ip6_gateway, dhcp_flag, dhcp_start, dhcp_end):
|
||||||
"""
|
"""
|
||||||
Add a new virtual network with VXLAN identifier VNI to the cluster.
|
Add a new virtual network with VXLAN identifier VNI to the cluster.
|
||||||
|
|
||||||
Example:
|
Examples:
|
||||||
pvc network add 1001 --domain test.local --ipnet 10.1.1.0/24 --gateway 10.1.1.1
|
|
||||||
|
pvc network add 101 --type bridged
|
||||||
|
|
||||||
|
> Creates vLAN 101 and a simple bridge on the VNI dev interface.
|
||||||
|
|
||||||
|
pvc network add 1001 --type managed --domain test.local --ipnet 10.1.1.0/24 --gateway 10.1.1.1
|
||||||
|
|
||||||
|
> Creates a VXLAN with ID 1001 on the VNI dev interface, with IPv4 managed networking.
|
||||||
|
|
||||||
IPv6 is fully supported with --ipnet6 and --gateway6 in addition to or instead of IPv4. PVC will configure DHCPv6 in a semi-managed configuration for the network if set.
|
IPv6 is fully supported with --ipnet6 and --gateway6 in addition to or instead of IPv4. PVC will configure DHCPv6 in a semi-managed configuration for the network if set.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if not ip_network and not ip6_network:
|
if nettype == 'managed' and not ip_network and not ip6_network:
|
||||||
click.echo('Usage: pvc network add [OPTIONS] VNI')
|
|
||||||
click.echo()
|
|
||||||
click.echo('Error: At least one of "-i" / "--ipnet" or "-i6" / "--ipnet6" must be specified.')
|
click.echo('Error: At least one of "-i" / "--ipnet" or "-i6" / "--ipnet6" must be specified.')
|
||||||
|
exit(1)
|
||||||
|
|
||||||
zk_conn = pvc_common.startZKConnection(zk_host)
|
zk_conn = pvc_common.startZKConnection(zk_host)
|
||||||
retcode, retmsg = pvc_network.add_network(zk_conn, vni, description, domain, ip_network, ip_gateway, ip6_network, ip6_gateway, dhcp_flag, dhcp_start, dhcp_end)
|
retcode, retmsg = pvc_network.add_network(zk_conn, vni, description, nettype, domain, ip_network, ip_gateway, ip6_network, ip6_gateway, dhcp_flag, dhcp_start, dhcp_end)
|
||||||
cleanup(retcode, retmsg, zk_conn)
|
cleanup(retcode, retmsg, zk_conn)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
|
@ -132,6 +132,7 @@ def getNetworkACLs(zk_conn, vni, _direction):
|
||||||
|
|
||||||
def getNetworkInformation(zk_conn, vni):
|
def getNetworkInformation(zk_conn, vni):
|
||||||
description = zkhandler.readdata(zk_conn, '/networks/{}'.format(vni))
|
description = zkhandler.readdata(zk_conn, '/networks/{}'.format(vni))
|
||||||
|
nettype = zkhandler.readdata(zk_conn, '/networks/{}/nettype'.format(vni))
|
||||||
domain = zkhandler.readdata(zk_conn, '/networks/{}/domain'.format(vni))
|
domain = zkhandler.readdata(zk_conn, '/networks/{}/domain'.format(vni))
|
||||||
ip6_network = zkhandler.readdata(zk_conn, '/networks/{}/ip6_network'.format(vni))
|
ip6_network = zkhandler.readdata(zk_conn, '/networks/{}/ip6_network'.format(vni))
|
||||||
ip6_gateway = zkhandler.readdata(zk_conn, '/networks/{}/ip6_gateway'.format(vni))
|
ip6_gateway = zkhandler.readdata(zk_conn, '/networks/{}/ip6_gateway'.format(vni))
|
||||||
|
@ -141,7 +142,7 @@ def getNetworkInformation(zk_conn, vni):
|
||||||
dhcp4_flag = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_flag'.format(vni))
|
dhcp4_flag = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_flag'.format(vni))
|
||||||
dhcp4_start = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_start'.format(vni))
|
dhcp4_start = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_start'.format(vni))
|
||||||
dhcp4_end = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_end'.format(vni))
|
dhcp4_end = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_end'.format(vni))
|
||||||
return description, domain, ip6_network, ip6_gateway, dhcp6_flag, ip4_network, ip4_gateway, dhcp4_flag, dhcp4_start, dhcp4_end
|
return description, nettype, domain, ip6_network, ip6_gateway, dhcp6_flag, ip4_network, ip4_gateway, dhcp4_flag, dhcp4_start, dhcp4_end
|
||||||
|
|
||||||
def getDHCPLeaseInformation(zk_conn, vni, mac_address):
|
def getDHCPLeaseInformation(zk_conn, vni, mac_address):
|
||||||
hostname = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_leases/{}/hostname'.format(vni, mac_address))
|
hostname = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_leases/{}/hostname'.format(vni, mac_address))
|
||||||
|
@ -164,7 +165,7 @@ def getACLInformation(zk_conn, vni, direction, description):
|
||||||
return order, description, rule
|
return order, description, rule
|
||||||
|
|
||||||
def formatNetworkInformation(zk_conn, vni, long_output):
|
def formatNetworkInformation(zk_conn, vni, long_output):
|
||||||
description, domain, ip6_network, ip6_gateway, dhcp6_flag, ip4_network, ip4_gateway, dhcp4_flag, dhcp4_start, dhcp4_end = getNetworkInformation(zk_conn, vni)
|
description, nettype, domain, ip6_network, ip6_gateway, dhcp6_flag, ip4_network, ip4_gateway, dhcp4_flag, dhcp4_start, dhcp4_end = getNetworkInformation(zk_conn, vni)
|
||||||
|
|
||||||
if dhcp6_flag == "True":
|
if dhcp6_flag == "True":
|
||||||
dhcp6_flag_colour = ansiprint.green()
|
dhcp6_flag_colour = ansiprint.green()
|
||||||
|
@ -182,38 +183,40 @@ def formatNetworkInformation(zk_conn, vni, long_output):
|
||||||
ainformation.append('')
|
ainformation.append('')
|
||||||
# Basic information
|
# Basic information
|
||||||
ainformation.append('{}VNI:{} {}'.format(ansiprint.purple(), ansiprint.end(), vni))
|
ainformation.append('{}VNI:{} {}'.format(ansiprint.purple(), ansiprint.end(), vni))
|
||||||
|
ainformation.append('{}Type:{} {}'.format(ansiprint.purple(), ansiprint.end(), nettype))
|
||||||
ainformation.append('{}Description:{} {}'.format(ansiprint.purple(), ansiprint.end(), description))
|
ainformation.append('{}Description:{} {}'.format(ansiprint.purple(), ansiprint.end(), description))
|
||||||
ainformation.append('{}Domain:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain))
|
if nettype == 'managed':
|
||||||
if ip6_network != "None":
|
ainformation.append('{}Domain:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain))
|
||||||
ainformation.append('')
|
if ip6_network != "None":
|
||||||
ainformation.append('{}IPv6 network:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip6_network))
|
ainformation.append('')
|
||||||
ainformation.append('{}IPv6 gateway:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip6_gateway))
|
ainformation.append('{}IPv6 network:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip6_network))
|
||||||
ainformation.append('{}DHCPv6 enabled:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), dhcp6_flag_colour, dhcp6_flag, colour_off))
|
ainformation.append('{}IPv6 gateway:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip6_gateway))
|
||||||
if ip4_network != "None":
|
ainformation.append('{}DHCPv6 enabled:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), dhcp6_flag_colour, dhcp6_flag, colour_off))
|
||||||
ainformation.append('')
|
if ip4_network != "None":
|
||||||
ainformation.append('{}IPv4 network:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip4_network))
|
ainformation.append('')
|
||||||
ainformation.append('{}IPv4 gateway:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip4_gateway))
|
ainformation.append('{}IPv4 network:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip4_network))
|
||||||
ainformation.append('{}DHCPv4 enabled:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), dhcp4_flag_colour, dhcp4_flag, colour_off))
|
ainformation.append('{}IPv4 gateway:{} {}'.format(ansiprint.purple(), ansiprint.end(), ip4_gateway))
|
||||||
if dhcp4_flag == "True":
|
ainformation.append('{}DHCPv4 enabled:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), dhcp4_flag_colour, dhcp4_flag, colour_off))
|
||||||
ainformation.append('{}DHCPv4 range:{} {} - {}'.format(ansiprint.purple(), ansiprint.end(), dhcp4_start, dhcp4_end))
|
if dhcp4_flag == "True":
|
||||||
|
ainformation.append('{}DHCPv4 range:{} {} - {}'.format(ansiprint.purple(), ansiprint.end(), dhcp4_start, dhcp4_end))
|
||||||
|
|
||||||
if long_output:
|
if long_output:
|
||||||
dhcp4_reservations_list = getNetworkDHCPReservations(zk_conn, vni)
|
dhcp4_reservations_list = getNetworkDHCPReservations(zk_conn, vni)
|
||||||
if dhcp4_reservations_list:
|
if dhcp4_reservations_list:
|
||||||
ainformation.append('')
|
ainformation.append('')
|
||||||
ainformation.append('{}Client DHCPv4 reservations:{}'.format(ansiprint.bold(), ansiprint.end()))
|
ainformation.append('{}Client DHCPv4 reservations:{}'.format(ansiprint.bold(), ansiprint.end()))
|
||||||
ainformation.append('')
|
ainformation.append('')
|
||||||
# Only show static reservations in the detailed information
|
# Only show static reservations in the detailed information
|
||||||
dhcp4_reservations_string = formatDHCPLeaseList(zk_conn, vni, dhcp4_reservations_list, reservations=True)
|
dhcp4_reservations_string = formatDHCPLeaseList(zk_conn, vni, dhcp4_reservations_list, reservations=True)
|
||||||
for line in dhcp4_reservations_string.split('\n'):
|
for line in dhcp4_reservations_string.split('\n'):
|
||||||
ainformation.append(line)
|
ainformation.append(line)
|
||||||
|
|
||||||
firewall_rules = zkhandler.listchildren(zk_conn, '/networks/{}/firewall_rules'.format(vni))
|
firewall_rules = zkhandler.listchildren(zk_conn, '/networks/{}/firewall_rules'.format(vni))
|
||||||
if firewall_rules:
|
if firewall_rules:
|
||||||
ainformation.append('')
|
ainformation.append('')
|
||||||
ainformation.append('{}Network firewall rules:{}'.format(ansiprint.bold(), ansiprint.end()))
|
ainformation.append('{}Network firewall rules:{}'.format(ansiprint.bold(), ansiprint.end()))
|
||||||
ainformation.append('')
|
ainformation.append('')
|
||||||
formatted_firewall_rules = get_list_firewall_rules(zk_conn, vni)
|
formatted_firewall_rules = get_list_firewall_rules(zk_conn, vni)
|
||||||
|
|
||||||
# Join it all together
|
# Join it all together
|
||||||
information = '\n'.join(ainformation)
|
information = '\n'.join(ainformation)
|
||||||
|
@ -221,6 +224,7 @@ def formatNetworkInformation(zk_conn, vni, long_output):
|
||||||
|
|
||||||
def formatNetworkList(zk_conn, net_list):
|
def formatNetworkList(zk_conn, net_list):
|
||||||
net_list_output = []
|
net_list_output = []
|
||||||
|
nettype = dict()
|
||||||
description = dict()
|
description = dict()
|
||||||
domain = dict()
|
domain = dict()
|
||||||
v6_flag = dict()
|
v6_flag = dict()
|
||||||
|
@ -243,7 +247,7 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
# Gather information for printing
|
# Gather information for printing
|
||||||
for net in net_list:
|
for net in net_list:
|
||||||
# get info
|
# get info
|
||||||
description[net], domain[net], ip6_network[net], ip6_gateway[net], dhcp6_flag[net], ip4_network[net], ip4_gateway[net], dhcp4_flag[net], dhcp4_start[net], dhcp4_end[net] = getNetworkInformation(zk_conn, net)
|
description[net], nettype[net], domain[net], ip6_network[net], ip6_gateway[net], dhcp6_flag[net], ip4_network[net], ip4_gateway[net], dhcp4_flag[net], dhcp4_start[net], dhcp4_end[net] = getNetworkInformation(zk_conn, net)
|
||||||
|
|
||||||
if ip4_network[net] != "None":
|
if ip4_network[net] != "None":
|
||||||
v4_flag_colour[net] = ansiprint.green()
|
v4_flag_colour[net] = ansiprint.green()
|
||||||
|
@ -274,8 +278,9 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
# Determine optimal column widths
|
# Determine optimal column widths
|
||||||
# Dynamic columns: node_name, hypervisor, migrated
|
# Dynamic columns: node_name, hypervisor, migrated
|
||||||
net_vni_length = 5
|
net_vni_length = 5
|
||||||
net_description_length = 13
|
net_description_length = 12
|
||||||
net_domain_length = 8
|
net_nettype_length = 8
|
||||||
|
net_domain_length = 6
|
||||||
net_v6_flag_length = 6
|
net_v6_flag_length = 6
|
||||||
net_dhcp6_flag_length = 7
|
net_dhcp6_flag_length = 7
|
||||||
net_v4_flag_length = 6
|
net_v4_flag_length = 6
|
||||||
|
@ -298,6 +303,7 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
net_list_output_header = '{bold}\
|
net_list_output_header = '{bold}\
|
||||||
{net_vni: <{net_vni_length}} \
|
{net_vni: <{net_vni_length}} \
|
||||||
{net_description: <{net_description_length}} \
|
{net_description: <{net_description_length}} \
|
||||||
|
{net_nettype: <{net_nettype_length}} \
|
||||||
{net_domain: <{net_domain_length}} \
|
{net_domain: <{net_domain_length}} \
|
||||||
{net_v6_flag: <{net_v6_flag_length}} \
|
{net_v6_flag: <{net_v6_flag_length}} \
|
||||||
{net_dhcp6_flag: <{net_dhcp6_flag_length}} \
|
{net_dhcp6_flag: <{net_dhcp6_flag_length}} \
|
||||||
|
@ -308,6 +314,7 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
end_bold=ansiprint.end(),
|
end_bold=ansiprint.end(),
|
||||||
net_vni_length=net_vni_length,
|
net_vni_length=net_vni_length,
|
||||||
net_description_length=net_description_length,
|
net_description_length=net_description_length,
|
||||||
|
net_nettype_length=net_nettype_length,
|
||||||
net_domain_length=net_domain_length,
|
net_domain_length=net_domain_length,
|
||||||
net_v6_flag_length=net_v6_flag_length,
|
net_v6_flag_length=net_v6_flag_length,
|
||||||
net_dhcp6_flag_length=net_dhcp6_flag_length,
|
net_dhcp6_flag_length=net_dhcp6_flag_length,
|
||||||
|
@ -315,6 +322,7 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
net_dhcp4_flag_length=net_dhcp4_flag_length,
|
net_dhcp4_flag_length=net_dhcp4_flag_length,
|
||||||
net_vni='VNI',
|
net_vni='VNI',
|
||||||
net_description='Description',
|
net_description='Description',
|
||||||
|
net_nettype='Type',
|
||||||
net_domain='Domain',
|
net_domain='Domain',
|
||||||
net_v6_flag='IPv6',
|
net_v6_flag='IPv6',
|
||||||
net_dhcp6_flag='DHCPv6',
|
net_dhcp6_flag='DHCPv6',
|
||||||
|
@ -327,6 +335,7 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
'{bold}\
|
'{bold}\
|
||||||
{net_vni: <{net_vni_length}} \
|
{net_vni: <{net_vni_length}} \
|
||||||
{net_description: <{net_description_length}} \
|
{net_description: <{net_description_length}} \
|
||||||
|
{net_nettype: <{net_nettype_length}} \
|
||||||
{net_domain: <{net_domain_length}} \
|
{net_domain: <{net_domain_length}} \
|
||||||
{v6_flag_colour}{net_v6_flag: <{net_v6_flag_length}}{colour_off} \
|
{v6_flag_colour}{net_v6_flag: <{net_v6_flag_length}}{colour_off} \
|
||||||
{dhcp6_flag_colour}{net_dhcp6_flag: <{net_dhcp6_flag_length}}{colour_off} \
|
{dhcp6_flag_colour}{net_dhcp6_flag: <{net_dhcp6_flag_length}}{colour_off} \
|
||||||
|
@ -337,6 +346,7 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
end_bold='',
|
end_bold='',
|
||||||
net_vni_length=net_vni_length,
|
net_vni_length=net_vni_length,
|
||||||
net_description_length=net_description_length,
|
net_description_length=net_description_length,
|
||||||
|
net_nettype_length=net_nettype_length,
|
||||||
net_domain_length=net_domain_length,
|
net_domain_length=net_domain_length,
|
||||||
net_v6_flag_length=net_v6_flag_length,
|
net_v6_flag_length=net_v6_flag_length,
|
||||||
net_dhcp6_flag_length=net_dhcp6_flag_length,
|
net_dhcp6_flag_length=net_dhcp6_flag_length,
|
||||||
|
@ -344,6 +354,7 @@ def formatNetworkList(zk_conn, net_list):
|
||||||
net_dhcp4_flag_length=net_dhcp4_flag_length,
|
net_dhcp4_flag_length=net_dhcp4_flag_length,
|
||||||
net_vni=net,
|
net_vni=net,
|
||||||
net_description=description[net],
|
net_description=description[net],
|
||||||
|
net_nettype=nettype[net],
|
||||||
net_domain=domain[net],
|
net_domain=domain[net],
|
||||||
net_v6_flag=v6_flag[net],
|
net_v6_flag=v6_flag[net],
|
||||||
v6_flag_colour=v6_flag_colour[net],
|
v6_flag_colour=v6_flag_colour[net],
|
||||||
|
@ -545,8 +556,8 @@ def isValidIP(ipaddr):
|
||||||
#
|
#
|
||||||
# Direct functions
|
# Direct functions
|
||||||
#
|
#
|
||||||
def add_network(zk_conn, vni, description, domain,
|
def add_network(zk_conn, vni, description, nettype,
|
||||||
ip4_network, ip4_gateway, ip6_network, ip6_gateway,
|
domain, ip4_network, ip4_gateway, ip6_network, ip6_gateway,
|
||||||
dhcp4_flag, dhcp4_start, dhcp4_end):
|
dhcp4_flag, dhcp4_start, dhcp4_end):
|
||||||
# Ensure start and end DHCP ranges are set if the flag is set
|
# Ensure start and end DHCP ranges are set if the flag is set
|
||||||
if dhcp4_flag and ( not dhcp4_start or not dhcp4_end ):
|
if dhcp4_flag and ( not dhcp4_start or not dhcp4_end ):
|
||||||
|
@ -572,6 +583,7 @@ def add_network(zk_conn, vni, description, domain,
|
||||||
# Add the new network to Zookeeper
|
# Add the new network to Zookeeper
|
||||||
zkhandler.writedata(zk_conn, {
|
zkhandler.writedata(zk_conn, {
|
||||||
'/networks/{}'.format(vni): description,
|
'/networks/{}'.format(vni): description,
|
||||||
|
'/networks/{}/nettype'.format(vni): nettype,
|
||||||
'/networks/{}/domain'.format(vni): domain,
|
'/networks/{}/domain'.format(vni): domain,
|
||||||
'/networks/{}/ip6_network'.format(vni): ip6_network,
|
'/networks/{}/ip6_network'.format(vni): ip6_network,
|
||||||
'/networks/{}/ip6_gateway'.format(vni): ip6_gateway,
|
'/networks/{}/ip6_gateway'.format(vni): ip6_gateway,
|
||||||
|
@ -624,7 +636,7 @@ def modify_network(zk_conn, vni, **parameters):
|
||||||
zk_data.update({'/networks/{}/dhcp_end'.format(vni): parameters['dhcp_end']})
|
zk_data.update({'/networks/{}/dhcp_end'.format(vni): parameters['dhcp_end']})
|
||||||
|
|
||||||
zkhandler.writedata(zk_conn, zk_data)
|
zkhandler.writedata(zk_conn, zk_data)
|
||||||
|
|
||||||
return True, 'Network "{}" modified successfully!'.format(vni)
|
return True, 'Network "{}" modified successfully!'.format(vni)
|
||||||
|
|
||||||
def remove_network(zk_conn, network):
|
def remove_network(zk_conn, network):
|
||||||
|
@ -685,7 +697,7 @@ def remove_dhcp_reservation(zk_conn, network, reservation):
|
||||||
ipaddress = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_reservations/{}/ipaddr'.format(net_vni, macaddr))
|
ipaddress = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_reservations/{}/ipaddr'.format(net_vni, macaddr))
|
||||||
if reservation == macaddr or reservation == hostname or reservation == ipaddress:
|
if reservation == macaddr or reservation == hostname or reservation == ipaddress:
|
||||||
match_description = macaddr
|
match_description = macaddr
|
||||||
|
|
||||||
if not match_description:
|
if not match_description:
|
||||||
return False, 'ERROR: No DHCP reservation exists matching "{}"!'.format(reservation)
|
return False, 'ERROR: No DHCP reservation exists matching "{}"!'.format(reservation)
|
||||||
|
|
||||||
|
@ -721,7 +733,7 @@ def add_acl(zk_conn, network, direction, description, rule, order):
|
||||||
# Convert passed-in order to an integer
|
# Convert passed-in order to an integer
|
||||||
else:
|
else:
|
||||||
order = int(order)
|
order = int(order)
|
||||||
|
|
||||||
# Insert into the array at order-1
|
# Insert into the array at order-1
|
||||||
full_acl_list.insert(order, {'direction': direction, 'description': description})
|
full_acl_list.insert(order, {'direction': direction, 'description': description})
|
||||||
|
|
||||||
|
@ -772,7 +784,7 @@ def remove_acl(zk_conn, network, rule, direction):
|
||||||
for acl in acl_list:
|
for acl in acl_list:
|
||||||
if acl['description'] == rule:
|
if acl['description'] == rule:
|
||||||
match_description = acl['description']
|
match_description = acl['description']
|
||||||
|
|
||||||
if not match_description:
|
if not match_description:
|
||||||
return False, 'ERROR: No firewall rule exists matching description "{}"!'.format(rule)
|
return False, 'ERROR: No firewall rule exists matching description "{}"!'.format(rule)
|
||||||
|
|
||||||
|
@ -862,7 +874,7 @@ def get_list_dhcp(zk_conn, network, limit, only_static=False):
|
||||||
limit = limit + '.*'
|
limit = limit + '.*'
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return False, 'Regex Error: {}'.format(e)
|
return False, 'Regex Error: {}'.format(e)
|
||||||
|
|
||||||
|
|
||||||
for lease in full_dhcp_list:
|
for lease in full_dhcp_list:
|
||||||
valid_lease = False
|
valid_lease = False
|
||||||
|
|
|
@ -689,24 +689,24 @@ if enable_networking:
|
||||||
for network in new_network_list:
|
for network in new_network_list:
|
||||||
if not network in network_list:
|
if not network in network_list:
|
||||||
d_network[network] = VXNetworkInstance.VXNetworkInstance(network, zk_conn, config, logger, this_node)
|
d_network[network] = VXNetworkInstance.VXNetworkInstance(network, zk_conn, config, logger, this_node)
|
||||||
print(network)
|
if config['daemon_mode'] == 'coordinator' and d_network[network].nettype == 'managed':
|
||||||
if config['daemon_mode'] == 'coordinator':
|
|
||||||
dns_aggregator.add_network(d_network[network])
|
dns_aggregator.add_network(d_network[network])
|
||||||
# Start primary functionality
|
# Start primary functionality
|
||||||
if this_node.router_state == 'primary':
|
if this_node.router_state == 'primary' and d_network[network].nettype == 'managed':
|
||||||
d_network[network].createGateways()
|
d_network[network].createGateways()
|
||||||
d_network[network].startDHCPServer()
|
d_network[network].startDHCPServer()
|
||||||
|
|
||||||
# Remove any deleted networks from the list
|
# Remove any deleted networks from the list
|
||||||
for network in network_list:
|
for network in network_list:
|
||||||
if not network in new_network_list:
|
if not network in new_network_list:
|
||||||
# Stop primary functionality
|
if d_network[network].nettype == 'managed':
|
||||||
if this_node.router_state == 'primary':
|
# Stop primary functionality
|
||||||
d_network[network].stopDHCPServer()
|
if this_node.router_state == 'primary':
|
||||||
d_network[network].removeGateways()
|
d_network[network].stopDHCPServer()
|
||||||
dns_aggregator.remove_network(d_network[network])
|
d_network[network].removeGateways()
|
||||||
# Stop general functionality
|
dns_aggregator.remove_network(d_network[network])
|
||||||
d_network[network].removeFirewall()
|
# Stop general functionality
|
||||||
|
d_network[network].removeFirewall()
|
||||||
d_network[network].removeNetwork()
|
d_network[network].removeNetwork()
|
||||||
# Delete the object
|
# Delete the object
|
||||||
del(d_network[network])
|
del(d_network[network])
|
||||||
|
|
|
@ -39,6 +39,53 @@ class VXNetworkInstance(object):
|
||||||
self.this_node = this_node
|
self.this_node = this_node
|
||||||
self.vni_dev = config['vni_dev']
|
self.vni_dev = config['vni_dev']
|
||||||
|
|
||||||
|
self.nettype = zkhandler.readdata(self.zk_conn, '/networks/{}/nettype'.format(self.vni))
|
||||||
|
if self.nettype == 'bridged':
|
||||||
|
self.logger.out(
|
||||||
|
'Creating new bridged network',
|
||||||
|
prefix='VNI {}'.format(self.vni),
|
||||||
|
state='o'
|
||||||
|
)
|
||||||
|
self.init_bridged()
|
||||||
|
elif self.nettype == 'managed':
|
||||||
|
self.logger.out(
|
||||||
|
'Creating new managed network',
|
||||||
|
prefix='VNI {}'.format(self.vni),
|
||||||
|
state='o'
|
||||||
|
)
|
||||||
|
self.init_managed()
|
||||||
|
else:
|
||||||
|
self.logger.out(
|
||||||
|
'Invalid network type {}'.format(self.nettype),
|
||||||
|
prefix='VNI {}'.format(self.vni),
|
||||||
|
state='o'
|
||||||
|
)
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Initialize a bridged network
|
||||||
|
def init_bridged(self):
|
||||||
|
self.old_description = None
|
||||||
|
self.description = None
|
||||||
|
|
||||||
|
self.vlan_nic = 'vlan{}'.format(self.vni)
|
||||||
|
self.bridge_nic = 'br{}'.format(self.vni)
|
||||||
|
|
||||||
|
# Zookeper handlers for changed states
|
||||||
|
@self.zk_conn.DataWatch('/networks/{}'.format(self.vni))
|
||||||
|
def watch_network_description(data, stat, event=''):
|
||||||
|
if event and event.type == 'DELETED':
|
||||||
|
# The key has been deleted after existing before; terminate this watcher
|
||||||
|
# because this class instance is about to be reaped in Daemon.py
|
||||||
|
return False
|
||||||
|
|
||||||
|
if data and self.description != data.decode('ascii'):
|
||||||
|
self.old_description = self.description
|
||||||
|
self.description = data.decode('ascii')
|
||||||
|
|
||||||
|
self.createNetworkBridged()
|
||||||
|
|
||||||
|
# Initialize a managed network
|
||||||
|
def init_managed(self):
|
||||||
self.old_description = None
|
self.old_description = None
|
||||||
self.description = None
|
self.description = None
|
||||||
self.domain = None
|
self.domain = None
|
||||||
|
@ -56,11 +103,11 @@ class VXNetworkInstance(object):
|
||||||
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)
|
||||||
|
|
||||||
self.nftables_netconf_filename = '{}/networks/{}.nft'.format(config['nft_dynamic_directory'], self.vni)
|
self.nftables_netconf_filename = '{}/networks/{}.nft'.format(self.config['nft_dynamic_directory'], self.vni)
|
||||||
self.firewall_rules = []
|
self.firewall_rules = []
|
||||||
|
|
||||||
self.dhcp_server_daemon = None
|
self.dhcp_server_daemon = None
|
||||||
self.dnsmasq_hostsdir = '{}/{}'.format(config['dnsmasq_dynamic_directory'], self.vni)
|
self.dnsmasq_hostsdir = '{}/{}'.format(self.config['dnsmasq_dynamic_directory'], self.vni)
|
||||||
self.dhcp_reservations = []
|
self.dhcp_reservations = []
|
||||||
|
|
||||||
# Create the network hostsdir
|
# Create the network hostsdir
|
||||||
|
@ -279,7 +326,7 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
|
||||||
self.firewall_rules_out = new_rules
|
self.firewall_rules_out = new_rules
|
||||||
self.updateFirewallRules()
|
self.updateFirewallRules()
|
||||||
|
|
||||||
self.createNetwork()
|
self.createNetworkManaged()
|
||||||
self.createFirewall()
|
self.createFirewall()
|
||||||
|
|
||||||
def getvni(self):
|
def getvni(self):
|
||||||
|
@ -363,7 +410,52 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
|
||||||
nftables_base_filename = '{}/base.nft'.format(self.config['nft_dynamic_directory'])
|
nftables_base_filename = '{}/base.nft'.format(self.config['nft_dynamic_directory'])
|
||||||
common.reload_firewall_rules(self.logger, nftables_base_filename)
|
common.reload_firewall_rules(self.logger, nftables_base_filename)
|
||||||
|
|
||||||
def createNetwork(self):
|
# Create bridged network configuration
|
||||||
|
def createNetworkBridged(self):
|
||||||
|
self.logger.out(
|
||||||
|
'Creating VLAN device on interface {}'.format(
|
||||||
|
self.vni_dev
|
||||||
|
),
|
||||||
|
prefix='VNI {}'.format(self.vni),
|
||||||
|
state='o'
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'ip link add link {} name {} type vlan id {}'.format(
|
||||||
|
self.vni_dev,
|
||||||
|
self.vlan_nic,
|
||||||
|
self.vni
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'brctl addbr {}'.format(
|
||||||
|
self.bridge_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'brctl addif {} {}'.format(
|
||||||
|
self.bridge_nic,
|
||||||
|
self.vlan_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'ip link set {} mtu 8800 up'.format(
|
||||||
|
self.vlan_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'ip link set {} mtu 8800 up'.format(
|
||||||
|
self.bridge_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
# Disable IPv6 DAD on bridge NICs
|
||||||
|
'sysctl net.ipv6.conf.{}.accept_dad=0'.format(
|
||||||
|
self.bridge_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create managed network configuration
|
||||||
|
def createNetworkManaged(self):
|
||||||
self.logger.out(
|
self.logger.out(
|
||||||
'Creating VXLAN device on interface {}'.format(
|
'Creating VXLAN device on interface {}'.format(
|
||||||
self.vni_dev
|
self.vni_dev
|
||||||
|
@ -526,7 +618,51 @@ add rule inet filter forward ip6 saddr {netaddr6} counter jump {vxlannic}-out
|
||||||
logfile='{}/dnsmasq-{}.log'.format(self.config['dnsmasq_log_directory'], self.vni)
|
logfile='{}/dnsmasq-{}.log'.format(self.config['dnsmasq_log_directory'], self.vni)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Remove network
|
||||||
def removeNetwork(self):
|
def removeNetwork(self):
|
||||||
|
if self.nettype == 'bridged':
|
||||||
|
self.removeNetworkBridged()
|
||||||
|
elif self.nettype == 'managed':
|
||||||
|
self.removeNetworkManaged()
|
||||||
|
|
||||||
|
# Remove bridged network configuration
|
||||||
|
def removeNetworkBridged(self):
|
||||||
|
self.logger.out(
|
||||||
|
'Removing VNI device on interface {}'.format(
|
||||||
|
self.vni_dev
|
||||||
|
),
|
||||||
|
prefix='VNI {}'.format(self.vni),
|
||||||
|
state='o'
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'ip link set {} down'.format(
|
||||||
|
self.bridge_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'ip link set {} down'.format(
|
||||||
|
self.vlan_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'brctl delif {} {}'.format(
|
||||||
|
self.bridge_nic,
|
||||||
|
self.vlan_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'brctl delbr {}'.format(
|
||||||
|
self.bridge_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
common.run_os_command(
|
||||||
|
'ip link delete {}'.format(
|
||||||
|
self.vlan_nic
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Remove managed network configuration
|
||||||
|
def removeNetworkManaged(self):
|
||||||
self.logger.out(
|
self.logger.out(
|
||||||
'Removing VNI device on interface {}'.format(
|
'Removing VNI device on interface {}'.format(
|
||||||
self.vni_dev
|
self.vni_dev
|
||||||
|
|
Loading…
Reference in New Issue