Add support for bridge-only VNIs

client-cli/pvc.py

@@ -616,8 +616,14 @@ def cli_network():
     help='Description of the network; must be unique and not contain whitespace.'
 )
 @click.option(
-    '-n', '--domain', 'domain',
+    '-p', '--type', 'nettype',
     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.'
 )
 @click.option(
@@ -643,7 +649,7 @@ def cli_network():
 @click.option(
     '--dhcp/--no-dhcp', 'dhcp_flag',
     is_flag=True,
-    default=None,
+    default=False,
     help='Enable/disable IPv4 DHCP for clients on subnet.'
 )
 @click.option(
@@ -659,23 +665,29 @@ def cli_network():
 @click.argument(
     '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.
 
-    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.
     """
 
-    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.')
+        exit(1)
 
     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)
 
 ###############################################################################

client-common/network.py

@@ -132,6 +132,7 @@ def getNetworkACLs(zk_conn, vni, _direction):
 
 def getNetworkInformation(zk_conn, 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))
     ip6_network = zkhandler.readdata(zk_conn, '/networks/{}/ip6_network'.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_start = zkhandler.readdata(zk_conn, '/networks/{}/dhcp4_start'.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):
     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
 
 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":
         dhcp6_flag_colour = ansiprint.green()
@@ -182,7 +183,9 @@ def formatNetworkInformation(zk_conn, vni, long_output):
     ainformation.append('')
     # Basic information
     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))
+    if nettype == 'managed':
         ainformation.append('{}Domain:{}         {}'.format(ansiprint.purple(), ansiprint.end(), domain))
         if ip6_network != "None":
             ainformation.append('')
@@ -221,6 +224,7 @@ def formatNetworkInformation(zk_conn, vni, long_output):
 
 def formatNetworkList(zk_conn, net_list):
     net_list_output = []
+    nettype = dict()
     description = dict()
     domain = dict()
     v6_flag = dict()
@@ -243,7 +247,7 @@ def formatNetworkList(zk_conn, net_list):
     # Gather information for printing
     for net in net_list:
         # 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":
             v4_flag_colour[net] = ansiprint.green()
@@ -274,8 +278,9 @@ def formatNetworkList(zk_conn, net_list):
     # Determine optimal column widths
     # Dynamic columns: node_name, hypervisor, migrated
     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_dhcp6_flag_length = 7
     net_v4_flag_length = 6
@@ -298,6 +303,7 @@ def formatNetworkList(zk_conn, net_list):
     net_list_output_header = '{bold}\
 {net_vni: <{net_vni_length}} \
 {net_description: <{net_description_length}} \
+{net_nettype: <{net_nettype_length}} \
 {net_domain: <{net_domain_length}}  \
 {net_v6_flag: <{net_v6_flag_length}} \
 {net_dhcp6_flag: <{net_dhcp6_flag_length}} \
@@ -308,6 +314,7 @@ def formatNetworkList(zk_conn, net_list):
         end_bold=ansiprint.end(),
         net_vni_length=net_vni_length,
         net_description_length=net_description_length,
+        net_nettype_length=net_nettype_length,
         net_domain_length=net_domain_length,
         net_v6_flag_length=net_v6_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_vni='VNI',
         net_description='Description',
+        net_nettype='Type',
         net_domain='Domain',
         net_v6_flag='IPv6',
         net_dhcp6_flag='DHCPv6',
@@ -327,6 +335,7 @@ def formatNetworkList(zk_conn, net_list):
             '{bold}\
 {net_vni: <{net_vni_length}} \
 {net_description: <{net_description_length}} \
+{net_nettype: <{net_nettype_length}} \
 {net_domain: <{net_domain_length}}  \
 {v6_flag_colour}{net_v6_flag: <{net_v6_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='',
                 net_vni_length=net_vni_length,
                 net_description_length=net_description_length,
+                net_nettype_length=net_nettype_length,
                 net_domain_length=net_domain_length,
                 net_v6_flag_length=net_v6_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_vni=net,
                 net_description=description[net],
+                net_nettype=nettype[net],
                 net_domain=domain[net],
                 net_v6_flag=v6_flag[net],
                 v6_flag_colour=v6_flag_colour[net],
@@ -545,8 +556,8 @@ def isValidIP(ipaddr):
 #
 # 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):
     # Ensure start and end DHCP ranges are set if the flag is set
     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
     zkhandler.writedata(zk_conn, {
         '/networks/{}'.format(vni): description,
+        '/networks/{}/nettype'.format(vni): nettype,
         '/networks/{}/domain'.format(vni): domain,
         '/networks/{}/ip6_network'.format(vni): ip6_network,
         '/networks/{}/ip6_gateway'.format(vni): ip6_gateway,

node-daemon/pvcd/Daemon.py

@@ -689,17 +689,17 @@ if enable_networking:
         for network in new_network_list:
             if not network in network_list:
                 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])
                 # 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].startDHCPServer()
 
         # Remove any deleted networks from the list
         for network in network_list:
             if not network in new_network_list:
+                if d_network[network].nettype == 'managed':
                     # Stop primary functionality
                     if this_node.router_state == 'primary':
                         d_network[network].stopDHCPServer()

node-daemon/pvcd/VXNetworkInstance.py

@@ -39,6 +39,53 @@ class VXNetworkInstance(object):
         self.this_node = this_node
         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.description = None
         self.domain = None
@@ -56,11 +103,11 @@ class VXNetworkInstance(object):
         self.vxlan_nic = 'vxlan{}'.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.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 = []
 
         # 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.updateFirewallRules()
 
-        self.createNetwork()
+        self.createNetworkManaged()
         self.createFirewall()
 
     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'])
         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(
             'Creating VXLAN device on interface {}'.format(
                 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)
             )
 
+    # Remove network
     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(
             'Removing VNI device on interface {}'.format(
                 self.vni_dev