diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-09 17:14:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-09 17:14:03 +0000 |
| commit | f8121ee981888179e785ba509263273f75b5ed6d (patch) | |
| tree | 5e40d95d8f0c1c1c20956bd67f70774972bb5eb5 /neutron/plugins | |
| parent | 8e2e8ce72d0871559e3e6fd68ff9cfc6176bc358 (diff) | |
| parent | 5c697b8d60571ef4a052586a73edd3d513d0d635 (diff) | |
| download | neutron-f8121ee981888179e785ba509263273f75b5ed6d.tar.gz | |
Merge "allow manila ports to do multiple port binding for ML2"
Diffstat (limited to 'neutron/plugins')
| -rw-r--r-- | neutron/plugins/ml2/common/constants.py | 3 | ||||
| -rw-r--r-- | neutron/plugins/ml2/plugin.py | 19 |
2 files changed, 13 insertions, 9 deletions
diff --git a/neutron/plugins/ml2/common/constants.py b/neutron/plugins/ml2/common/constants.py index f9e627ff59..a6b015a7a6 100644 --- a/neutron/plugins/ml2/common/constants.py +++ b/neutron/plugins/ml2/common/constants.py @@ -14,6 +14,9 @@ from neutron_lib import constants DEFAULT_DEVICE_OWNER = '' +# TODO(carthaca): use from neutron-lib once +# change id I9be781d99a08a6a015c3747eb15f20bc356cf08e has been released +DEVICE_OWNER_MANILA_PREFIX = "manila:" # TODO(liuyulong): move to neutron-lib or common constants NO_PBLOCKS_TYPES = [ diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index 148b508419..4ecc5fbcb3 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -2615,11 +2615,12 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, self.mechanism_manager.update_network_postcommit(mech_context) @staticmethod - def _validate_compute_port(port): - if not port['device_owner'].startswith( - const.DEVICE_OWNER_COMPUTE_PREFIX): + def _validate_port_supports_multiple_bindings(port): + if not port['device_owner'].startswith(( + const.DEVICE_OWNER_COMPUTE_PREFIX, + ml2_consts.DEVICE_OWNER_MANILA_PREFIX)): msg = _('Invalid port %s. Operation only valid on compute ' - 'ports') % port['id'] + 'and shared filesystem ports') % port['id'] raise exc.BadRequest(resource='port', msg=msg) def _make_port_binding_dict(self, binding, fields=None): @@ -2659,7 +2660,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, attrs = binding[pbe_ext.RESOURCE_NAME] with db_api.CONTEXT_WRITER.using(context): port_db = self._get_port(context, port_id) - self._validate_compute_port(port_db) + self._validate_port_supports_multiple_bindings(port_db) if self._get_binding_for_host(port_db.port_bindings, attrs[pbe_ext.HOST]): raise exc.PortBindingAlreadyExists( @@ -2707,7 +2708,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, port = ports_obj.Port.get_object(context, id=port_id) if not port: raise exc.PortNotFound(port_id=port_id) - self._validate_compute_port(port) + self._validate_port_supports_multiple_bindings(port) filters = filters or {} pager = base_obj.Pager(sorts, limit, page_reverse, marker) bindings = ports_obj.PortBinding.get_objects( @@ -2722,7 +2723,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, port = ports_obj.Port.get_object(context, id=port_id) if not port: raise exc.PortNotFound(port_id=port_id) - self._validate_compute_port(port) + self._validate_port_supports_multiple_bindings(port) binding = ports_obj.PortBinding.get_object(context, host=host, port_id=port_id) if not binding: @@ -2740,7 +2741,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, attrs = binding[pbe_ext.RESOURCE_NAME] with db_api.CONTEXT_WRITER.using(context): port_db = self._get_port(context, port_id) - self._validate_compute_port(port_db) + self._validate_port_supports_multiple_bindings(port_db) original_binding = self._get_binding_for_host( port_db.port_bindings, host) if not original_binding: @@ -2777,7 +2778,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, if isinstance(port_id, dict): port_id = port_id['port_id'] port_db = self._get_port(context, port_id) - self._validate_compute_port(port_db) + self._validate_port_supports_multiple_bindings(port_db) active_binding = p_utils.get_port_binding_by_status_and_host( port_db.port_bindings, const.ACTIVE) if host == (active_binding and active_binding.host): |