NSX|V3: Flat networks do not support DDI

Make sure flat networks & subnets will not create DHCP or metadata
objects.

Change-Id: Ifb28b5fad16c1a8d435f8d9ec5902738fd90641c

vmware_nsx/plugins/nsx_v3/plugin.py

@@ -1021,16 +1021,27 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
                 provider_data['vlan_id'],
                 nsx_id)
 
-    def _is_ddi_supported_on_network(self, context, network_id):
+    def _is_ddi_supported_on_net_with_type(self, context, network_id):
+        net = self.get_network(context, network_id)
         # NSX current does not support transparent VLAN ports for
         # DHCP and metadata
         if cfg.CONF.vlan_transparent:
-            net = self.get_network(context, network_id)
             if net.get('vlan_transparent') is True:
-                return False
+                return False, "VLAN transparent"
+        # NSX current does not support flat network ports for
+        # DHCP and metadata
+        if net.get(pnet.NETWORK_TYPE) == utils.NsxV3NetworkTypes.FLAT:
+            return False, "flat"
+        # supported for overlay networks, and for vlan networks depending on
+        # NSX version
         return (self.nsxlib.feature_supported(
                     nsxlib_consts.FEATURE_VLAN_ROUTER_INTERFACE) or
-                self._is_overlay_network(context, network_id))
+                self._is_overlay_network(context, network_id)), "non-overlay"
+
+    def _is_ddi_supported_on_network(self, context, network_id):
+        result, _ = self._is_ddi_supported_on_net_with_type(
+            context, network_id)
+        return result
 
     def _is_overlay_network(self, context, network_id):
         """Return True if this is an overlay network
@@ -1823,11 +1834,12 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
             self._validate_external_subnet(context,
                                            subnet['subnet']['network_id'])
             lock = 'nsxv3_network_' + subnet['subnet']['network_id']
+            ddi_support, ddi_type = self._is_ddi_supported_on_net_with_type(
+                context, subnet['subnet']['network_id'])
             with locking.LockManager.get_lock(lock):
                 # Check if it is on an overlay network and is the first
                 # DHCP-enabled subnet to create.
-                if self._is_ddi_supported_on_network(
+                if ddi_support:
-                    context, subnet['subnet']['network_id']):
                     network = self._get_network(
                         context, subnet['subnet']['network_id'])
                     if self._has_no_dhcp_enabled_subnet(context, network):
@@ -1858,8 +1870,10 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
                                 "subnet in network %s") %
                                subnet['subnet']['network_id'])
                 else:
-                    msg = _("Native DHCP is not supported for non-overlay "
+                    msg = _("Native DHCP is not supported for %(type)s "
-                            "network %s") % subnet['subnet']['network_id']
+                            "network %(id)s") % {
+                          'id': subnet['subnet']['network_id'],
+                          'type': ddi_type}
                 if msg:
                     LOG.error(msg)
                     raise n_exc.InvalidInput(error_message=msg)
@@ -1914,8 +1928,10 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
                     network = self._get_network(
                         context, orig_subnet['network_id'])
                     if enable_dhcp:
-                        if self._is_ddi_supported_on_network(
+                        (ddi_support,
-                            context, orig_subnet['network_id']):
+                         ddi_type) = self._is_ddi_supported_on_net_with_type(
+                            context, orig_subnet['network_id'])
+                        if ddi_support:
                             if self._has_no_dhcp_enabled_subnet(
                                 context, network):
                                 updated_subnet = super(
@@ -1932,8 +1948,9 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
                                        orig_subnet['network_id'])
                         else:
                             msg = (_("Native DHCP is not supported for "
-                                     "non-overlay network %s") %
+                                     "%(type)s network %(id)s") %
-                                   orig_subnet['network_id'])
+                                   {'id': orig_subnet['network_id'],
+                                    'type': ddi_type})
                         if msg:
                             LOG.error(msg)
                             raise n_exc.InvalidInput(error_message=msg)

vmware_nsx/tests/unit/nsx_v3/test_plugin.py

@@ -760,7 +760,7 @@ class TestSubnetsV2(test_plugin.TestSubnetsV2, NsxV3PluginTestCaseMixin):
             with mock.patch.object(self.plugin,
                                    '_enable_native_dhcp') as enable_dhcp,\
                 self.subnet(network=network, enable_dhcp=False):
-                # Native dhcp should be set for this subnet
+                # Native dhcp should not be set for this subnet
                 self.assertFalse(enable_dhcp.called)
 
     def test_subnet_native_dhcp_with_relay(self):
@@ -773,6 +773,47 @@ class TestSubnetsV2(test_plugin.TestSubnetsV2, NsxV3PluginTestCaseMixin):
                 # Native dhcp should not be set for this subnet
                 self.assertFalse(enable_dhcp.called)
 
+    def test_subnet_native_dhcp_flat_subnet_disabled(self):
+        cfg.CONF.set_override('native_dhcp_metadata', True, 'nsx_v3')
+        providernet_args = {pnet.NETWORK_TYPE: 'flat'}
+        with mock.patch('vmware_nsxlib.v3.core_resources.NsxLibTransportZone.'
+                        'get_transport_type', return_value='VLAN'):
+            with self.network(name='flat_net',
+                              providernet_args=providernet_args,
+                              arg_list=(pnet.NETWORK_TYPE, )) as network:
+                data = {'subnet': {'network_id': network['network']['id'],
+                                   'cidr': '172.20.1.0/24',
+                                   'name': 'sub1',
+                                   'enable_dhcp': False,
+                                   'dns_nameservers': None,
+                                   'allocation_pools': None,
+                                   'tenant_id': 'tenant_one',
+                                   'host_routes': None,
+                                   'ip_version': 4}}
+                self.plugin.create_subnet(
+                    context.get_admin_context(), data)
+
+    def test_subnet_native_dhcp_flat_subnet_enabled(self):
+        cfg.CONF.set_override('native_dhcp_metadata', True, 'nsx_v3')
+        providernet_args = {pnet.NETWORK_TYPE: 'flat'}
+        with mock.patch('vmware_nsxlib.v3.core_resources.NsxLibTransportZone.'
+                        'get_transport_type', return_value='VLAN'):
+            with self.network(name='flat_net',
+                             providernet_args=providernet_args,
+                             arg_list=(pnet.NETWORK_TYPE, )) as network:
+                data = {'subnet': {'network_id': network['network']['id'],
+                                   'cidr': '172.20.1.0/24',
+                                   'name': 'sub1',
+                                   'enable_dhcp': True,
+                                   'dns_nameservers': None,
+                                   'allocation_pools': None,
+                                   'tenant_id': 'tenant_one',
+                                   'host_routes': None,
+                                   'ip_version': 4}}
+                self.assertRaises(n_exc.InvalidInput,
+                                  self.plugin.create_subnet,
+                                  context.get_admin_context(), data)
+
 
 class TestPortsV2(test_plugin.TestPortsV2, NsxV3PluginTestCaseMixin,
                   test_bindings.PortBindingsTestCase,