Deduce whether DVR is enabled from neutron-api config

Add helper to detect presence of OVN in deployment

unit_tests/utilities/test_zaza_utilities_openstack.py

@@ -160,7 +160,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
 
         # Already exists
         network = openstack_utils.create_external_network(
-            self.neutronclient, self.project_id, False)
+            self.neutronclient, self.project_id)
         self.assertEqual(network, self.network["network"])
         self.neutronclient.create_network.assert_not_called()
 
@@ -170,7 +170,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
         network_msg = copy.deepcopy(self.network)
         network_msg["network"].pop("id")
         network = openstack_utils.create_external_network(
-            self.neutronclient, self.project_id, False)
+            self.neutronclient, self.project_id)
         self.assertEqual(network, self.network["network"])
         self.neutronclient.create_network.assert_called_once_with(
             network_msg)
@@ -1194,3 +1194,12 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
             mock.call('ovn-chassis'),
             mock.call('ovn-dedicated-chassis'),
         ])
+
+    def test_dvr_enabled(self):
+        self.patch_object(openstack_utils, 'get_application_config_option')
+        openstack_utils.dvr_enabled()
+        self.get_application_config_option.assert_called_once_with(
+            'neutron-api', 'enable-dvr')
+
+    def test_ovn_present(self):
+        pass

zaza/openstack/charm_tests/neutron/setup.py

@@ -25,7 +25,6 @@ from zaza.openstack.utilities import (
     juju as juju_utils,
     openstack as openstack_utils,
 )
-import zaza.model as model
 
 
 # The overcloud network configuration settings are declared.
@@ -74,10 +73,6 @@ def basic_overcloud_network():
     network_config.update(DEFAULT_UNDERCLOUD_NETWORK_CONFIG)
     # Environment specific settings
     network_config.update(generic_utils.get_undercloud_env_vars())
-    # Deployed model settings
-    if (model.get_application_config('neutron-api')
-            .get('enable-dvr').get('value')):
-        network_config.update({"dvr_enabled": True})
 
     # Get keystone session
     keystone_session = openstack_utils.get_overcloud_keystone_session()

zaza/openstack/configure/network.py

@@ -129,7 +129,6 @@ def setup_sdn(network_config, keystone_session=None):
     ext_network = openstack_utils.create_external_network(
         neutron_client,
         project_id,
-        network_config.get("dvr_enabled", False),
         network_config["external_net_name"])
     openstack_utils.create_external_subnet(
         neutron_client,
@@ -226,7 +225,6 @@ def setup_gateway_ext_port(network_config, keystone_session=None):
     openstack_utils.configure_gateway_ext_port(
         nova_client,
         neutron_client,
-        dvr_mode=network_config.get("dvr_enabled", False),
         net_id=net_id,
         add_dataport_to_netplan=add_dataport_to_netplan)
 

zaza/openstack/utilities/openstack.py

@@ -462,20 +462,44 @@ def get_ovn_uuids():
     )
 
 
+def dvr_enabled():
+    """Check whether DVR is enabled in deployment.
+
+    :returns: True when DVR is enabled, False otherwise
+    :rtype: bool
+    """
+    return get_application_config_option('neutron-api', 'enable-dvr')
+
+
+def ovn_present():
+    """Check whether OVN is present in deployment.
+
+    :returns: True when OVN is present, False otherwise
+    :rtype: bool
+    """
+    try:
+        for name in ('ovn-chassis', 'ovn-dedicated-chassis'):
+            model.get_application(name)
+            return True
+    except KeyError:
+        return False
+    else:
+        raise RuntimeError('Unable to determine whether or not OVN is present '
+                           'in deployment')
+
+
 BRIDGE_MAPPINGS = 'bridge-mappings'
 NEW_STYLE_NETWORKING = 'physnet1:br-ex'
 
 
-def deprecated_external_networking(dvr_mode=False):
+def deprecated_external_networking():
     """Determine whether deprecated external network mode is in use.
 
-    :param dvr_mode: Using DVR mode or not
-    :type dvr_mode: boolean
     :returns: True or False
     :rtype: boolean
     """
     bridge_mappings = None
-    if dvr_mode:
+    if dvr_enabled():
         bridge_mappings = get_application_config_option('neutron-openvswitch',
                                                         BRIDGE_MAPPINGS)
     else:
@@ -514,17 +538,15 @@ def get_admin_net(neutron_client):
             return net
 
 
-def add_interface_to_netplan(server_name, mac_address, dvr_mode=None):
+def add_interface_to_netplan(server_name, mac_address):
     """In guest server_name, add nic with mac_address to netplan.
 
     :param server_name: Hostname of instance
     :type server_name: string
     :param mac_address: mac address of nic to be added to netplan
     :type mac_address: string
-    :param dvr_mode: Using DVR mode or not
-    :type dvr_mode: boolean
     """
-    if dvr_mode:
+    if dvr_enabled():
         application_name = 'neutron-openvswitch'
     else:
         application_name = 'neutron-gateway'
@@ -572,8 +594,7 @@ def add_interface_to_netplan(server_name, mac_address, dvr_mode=None):
     model.run_on_unit(unit_name, "sudo netplan apply")
 
 
-def configure_gateway_ext_port(novaclient, neutronclient,
-                               dvr_mode=None, net_id=None,
+def configure_gateway_ext_port(novaclient, neutronclient, net_id=None,
                                add_dataport_to_netplan=False):
     """Configure the neturong-gateway external port.
 
@@ -581,20 +602,20 @@ def configure_gateway_ext_port(novaclient, neutronclient,
     :type novaclient: novaclient.Client object
     :param neutronclient: Authenticated neutronclient
     :type neutronclient: neutronclient.Client object
-    :param dvr_mode: Using DVR mode or not
-    :type dvr_mode: boolean
     :param net_id: Network ID
     :type net_id: string
     """
-    if dvr_mode:
+    if dvr_enabled():
         uuids = get_ovs_uuids()
         # If dvr, do not attempt to persist nic in netplan
         # https://github.com/openstack-charmers/zaza-openstack-tests/issues/78
         add_dataport_to_netplan = False
+        application_name = 'neutron-openvswitch'
     else:
         uuids = get_gateway_uuids()
+        application_name = 'neutron-gateway'
 
-    deprecated_extnet_mode = deprecated_external_networking(dvr_mode)
+    deprecated_extnet_mode = deprecated_external_networking()
 
     config_key = 'data-port'
     if deprecated_extnet_mode:
@@ -627,8 +648,7 @@ def configure_gateway_ext_port(novaclient, neutronclient,
             if add_dataport_to_netplan:
                 mac_address = get_mac_from_port(port, neutronclient)
                 add_interface_to_netplan(server.name,
-                                         mac_address=mac_address,
-                                         dvr_mode=dvr_mode)
+                                         mac_address=mac_address)
     ext_br_macs = []
     for port in neutronclient.list_ports(network_id=net_id)['ports']:
         if 'ext-port' in port['name']:
@@ -638,10 +658,6 @@ def configure_gateway_ext_port(novaclient, neutronclient,
                 ext_br_macs.append('br-ex:{}'.format(port['mac_address']))
     ext_br_macs.sort()
     ext_br_macs_str = ' '.join(ext_br_macs)
-    if dvr_mode:
-        application_name = 'neutron-openvswitch'
-    else:
-        application_name = 'neutron-gateway'
 
     if ext_br_macs:
         logging.info('Setting {} on {} external port to {}'.format(
@@ -715,16 +731,13 @@ def create_project_network(neutron_client, project_id, net_name='private',
     return network
 
 
-def create_external_network(neutron_client, project_id, dvr_mode,
-                            net_name='ext_net'):
+def create_external_network(neutron_client, project_id, net_name='ext_net'):
     """Create the external network.
 
     :param neutron_client: Authenticated neutronclient
     :type neutron_client: neutronclient.Client object
     :param project_id: Project ID
     :type project_id: string
-    :param dvr_mode: Using DVR mode or not
-    :type dvr_mode: boolean
     :param net_name: Network name
     :type net_name: string
     :returns: Network object