Merge "Neutron port hints"

Author: Zuul

openstackclient/network/v2/port.py

@@ -322,6 +322,22 @@ def _add_updatable_args(parser):
         action='store_true',
         help=_("NUMA affinity policy using legacy mode to schedule this port"),
     )
+    parser.add_argument(
+        '--hint',
+        metavar='<alias=value>',
+        action=JSONKeyValueAction,
+        default={},
+        help=_(
+            'Port hints as ALIAS=VALUE or as JSON. '
+            'Valid hint aliases/values: '
+            'ovs-tx-steering=thread, ovs-tx-steering=hash. '
+            'Valid JSON values are as specified by the Neutron API. '
+            '(requires port-hints extension) '
+            '(requires port-hint-ovs-tx-steering extension for alias: '
+            'ovs-tx-steering) '
+            '(repeat option to set multiple hints)'
+        ),
+    )
 
 
 # TODO(abhiraut): Use the SDK resource mapped attribute names once the
@@ -350,6 +366,34 @@ def _convert_extra_dhcp_options(parsed_args):
     return dhcp_options
 
 
+# When we have multiple hints, we'll need to refactor this to allow
+# arbitrary combinations. But until then let's have it as simple as possible.
+def _validate_port_hints(hints):
+    if hints not in (
+        {},
+        # by hint alias
+        {'ovs-tx-steering': 'thread'},
+        {'ovs-tx-steering': 'hash'},
+        # by fully specified value of the port's hints field
+        {'openvswitch': {'other_config': {'tx-steering': 'thread'}}},
+        {'openvswitch': {'other_config': {'tx-steering': 'hash'}}},
+    ):
+        msg = _("Invalid value to --hints, see --help for valid values.")
+        raise argparse.ArgumentTypeError(msg)
+
+
+# When we have multiple hints, we'll need to refactor this to expand aliases
+# without losing other hints. But until then let's have it as simple as
+# possible.
+def _expand_port_hint_aliases(hints):
+    if hints == {'ovs-tx-steering': 'thread'}:
+        return {'openvswitch': {'other_config': {'tx-steering': 'thread'}}}
+    elif hints == {'ovs-tx-steering': 'hash'}:
+        return {'openvswitch': {'other_config': {'tx-steering': 'hash'}}}
+    else:
+        return hints
+
+
 class CreatePort(command.ShowOne, common.NeutronCommandWithExtraArgs):
     _description = _("Create a new port")
 
@@ -527,6 +571,29 @@ def take_action(self, parsed_args):
                 parsed_args.qos_policy, ignore_missing=False
             ).id
 
+        if parsed_args.hint:
+            _validate_port_hints(parsed_args.hint)
+            expanded_hints = _expand_port_hint_aliases(parsed_args.hint)
+            try:
+                client.find_extension('port-hints', ignore_missing=False)
+            except Exception as e:
+                msg = _('Not supported by Network API: %(e)s') % {'e': e}
+                raise exceptions.CommandError(msg)
+            if (
+                'openvswitch' in expanded_hints
+                and 'other_config' in expanded_hints['openvswitch']
+                and 'tx-steering'
+                in expanded_hints['openvswitch']['other_config']
+            ):
+                try:
+                    client.find_extension(
+                        'port-hint-ovs-tx-steering', ignore_missing=False
+                    )
+                except Exception as e:
+                    msg = _('Not supported by Network API: %(e)s') % {'e': e}
+                    raise exceptions.CommandError(msg)
+            attrs['hints'] = expanded_hints
+
         set_tags_in_post = bool(
             client.find_extension('tag-ports-during-bulk-creation')
         )
@@ -972,6 +1039,29 @@ def take_action(self, parsed_args):
         if parsed_args.data_plane_status:
             attrs['data_plane_status'] = parsed_args.data_plane_status
 
+        if parsed_args.hint:
+            _validate_port_hints(parsed_args.hint)
+            expanded_hints = _expand_port_hint_aliases(parsed_args.hint)
+            try:
+                client.find_extension('port-hints', ignore_missing=False)
+            except Exception as e:
+                msg = _('Not supported by Network API: %(e)s') % {'e': e}
+                raise exceptions.CommandError(msg)
+            if (
+                'openvswitch' in expanded_hints
+                and 'other_config' in expanded_hints['openvswitch']
+                and 'tx-steering'
+                in expanded_hints['openvswitch']['other_config']
+            ):
+                try:
+                    client.find_extension(
+                        'port-hint-ovs-tx-steering', ignore_missing=False
+                    )
+                except Exception as e:
+                    msg = _('Not supported by Network API: %(e)s') % {'e': e}
+                    raise exceptions.CommandError(msg)
+            attrs['hints'] = expanded_hints
+
         attrs.update(
             self._parse_extra_properties(parsed_args.extra_properties)
         )
@@ -1083,6 +1173,12 @@ def get_parser(self, prog_name):
             default=False,
             help=_("Clear host binding for the port."),
         )
+        parser.add_argument(
+            '--hints',
+            action='store_true',
+            default=False,
+            help=_("Clear hints for the port."),
+        )
 
         _tag.add_tag_option_to_parser_for_unset(parser, _('port'))
 
@@ -1143,6 +1239,8 @@ def take_action(self, parsed_args):
             attrs['numa_affinity_policy'] = None
         if parsed_args.host:
             attrs['binding:host_id'] = None
+        if parsed_args.hints:
+            attrs['hints'] = None
 
         attrs.update(
             self._parse_extra_properties(parsed_args.extra_properties)

openstackclient/tests/unit/network/v2/fakes.py

@@ -1778,6 +1778,7 @@ def create_one_port(attrs=None):
                 'subnet_id': 'subnet-id-' + uuid.uuid4().hex,
             }
         ],
+        'hints': {},
         'id': 'port-id-' + uuid.uuid4().hex,
         'mac_address': 'fa:16:3e:a9:4e:72',
         'name': 'port-name-' + uuid.uuid4().hex,