2017-03-15 15:57:01 +03:00
|
|
|
# -*- Mode: Python -*-
|
2020-07-29 21:50:24 +03:00
|
|
|
# vim: filetype=python
|
2017-03-15 15:57:01 +03:00
|
|
|
|
2017-01-13 17:41:23 +03:00
|
|
|
##
|
|
|
|
# = Rocker switch device
|
|
|
|
##
|
|
|
|
|
2015-06-11 04:21:21 +03:00
|
|
|
##
|
2016-11-17 18:54:53 +03:00
|
|
|
# @RockerSwitch:
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Rocker switch information.
|
|
|
|
#
|
|
|
|
# @name: switch name
|
|
|
|
#
|
|
|
|
# @id: switch ID
|
|
|
|
#
|
|
|
|
# @ports: number of front-panel ports
|
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'struct': 'RockerSwitch',
|
|
|
|
'data': { 'name': 'str', 'id': 'uint64', 'ports': 'uint32' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @query-rocker:
|
|
|
|
#
|
|
|
|
# Return rocker switch information.
|
|
|
|
#
|
|
|
|
# Returns: @Rocker information
|
|
|
|
#
|
|
|
|
# Since: 2.4
|
2016-06-23 16:11:47 +03:00
|
|
|
#
|
2024-07-17 05:13:08 +03:00
|
|
|
# .. qmp-example::
|
2016-06-23 16:11:47 +03:00
|
|
|
#
|
2024-02-16 17:58:34 +03:00
|
|
|
# -> { "execute": "query-rocker", "arguments": { "name": "sw1" } }
|
|
|
|
# <- { "return": {"name": "sw1", "ports": 2, "id": 1327446905938}}
|
2015-06-11 04:21:21 +03:00
|
|
|
##
|
|
|
|
{ 'command': 'query-rocker',
|
|
|
|
'data': { 'name': 'str' },
|
|
|
|
'returns': 'RockerSwitch' }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerPortDuplex:
|
|
|
|
#
|
|
|
|
# An eumeration of port duplex states.
|
|
|
|
#
|
|
|
|
# @half: half duplex
|
|
|
|
#
|
|
|
|
# @full: full duplex
|
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'enum': 'RockerPortDuplex', 'data': [ 'half', 'full' ] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerPortAutoneg:
|
|
|
|
#
|
|
|
|
# An eumeration of port autoneg states.
|
|
|
|
#
|
|
|
|
# @off: autoneg is off
|
|
|
|
#
|
|
|
|
# @on: autoneg is on
|
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'enum': 'RockerPortAutoneg', 'data': [ 'off', 'on' ] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerPort:
|
|
|
|
#
|
|
|
|
# Rocker switch port information.
|
|
|
|
#
|
|
|
|
# @name: port name
|
|
|
|
#
|
|
|
|
# @enabled: port is enabled for I/O
|
|
|
|
#
|
|
|
|
# @link-up: physical link is UP on port
|
|
|
|
#
|
|
|
|
# @speed: port link speed in Mbps
|
|
|
|
#
|
|
|
|
# @duplex: port link duplex
|
|
|
|
#
|
|
|
|
# @autoneg: port link autoneg
|
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'struct': 'RockerPort',
|
|
|
|
'data': { 'name': 'str', 'enabled': 'bool', 'link-up': 'bool',
|
|
|
|
'speed': 'uint32', 'duplex': 'RockerPortDuplex',
|
|
|
|
'autoneg': 'RockerPortAutoneg' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @query-rocker-ports:
|
|
|
|
#
|
2016-06-23 16:12:36 +03:00
|
|
|
# Return rocker switch port information.
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2016-06-23 16:12:36 +03:00
|
|
|
# Returns: a list of @RockerPort information
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Since: 2.4
|
2016-06-23 16:12:36 +03:00
|
|
|
#
|
2024-07-17 05:13:08 +03:00
|
|
|
# .. qmp-example::
|
2016-06-23 16:12:36 +03:00
|
|
|
#
|
2024-02-16 17:58:34 +03:00
|
|
|
# -> { "execute": "query-rocker-ports", "arguments": { "name": "sw1" } }
|
|
|
|
# <- { "return": [ {"duplex": "full", "enabled": true, "name": "sw1.1",
|
|
|
|
# "autoneg": "off", "link-up": true, "speed": 10000},
|
|
|
|
# {"duplex": "full", "enabled": true, "name": "sw1.2",
|
|
|
|
# "autoneg": "off", "link-up": true, "speed": 10000}
|
|
|
|
# ]}
|
2015-06-11 04:21:21 +03:00
|
|
|
##
|
|
|
|
{ 'command': 'query-rocker-ports',
|
|
|
|
'data': { 'name': 'str' },
|
|
|
|
'returns': ['RockerPort'] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerOfDpaFlowKey:
|
|
|
|
#
|
|
|
|
# Rocker switch OF-DPA flow key
|
|
|
|
#
|
|
|
|
# @priority: key priority, 0 being lowest priority
|
|
|
|
#
|
|
|
|
# @tbl-id: flow table ID
|
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @in-pport: physical input port
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @tunnel-id: tunnel ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @vlan-id: VLAN ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @eth-type: Ethernet header type
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @eth-src: Ethernet header source MAC address
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @eth-dst: Ethernet header destination MAC address
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @ip-proto: IP Header protocol field
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @ip-tos: IP header TOS field
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @ip-dst: IP header destination address
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
qapi: convert "Note" sections to plain rST
We do not need a dedicated section for notes. By eliminating a specially
parsed section, these notes can be treated as normal rST paragraphs in
the new QMP reference manual, and can be placed and styled much more
flexibly.
Convert all existing "Note" and "Notes" sections to pure rST. As part of
the conversion, capitalize the first letter of each sentence and add
trailing punctuation where appropriate to ensure notes look sensible and
consistent in rendered HTML documentation. Markup is also re-aligned to
the de-facto standard of 3 spaces for directives.
Update docs/devel/qapi-code-gen.rst to reflect the new paradigm, and
update the QAPI parser to prohibit "Note" sections while suggesting a
new syntax. The exact formatting to use is a matter of taste, but a good
candidate is simply:
.. note:: lorem ipsum ...
... dolor sit amet ...
... consectetur adipiscing elit ...
... but there are other choices, too. The Sphinx readthedocs theme
offers theming for the following forms (capitalization unimportant); all
are adorned with a (!) symbol () in the title bar for rendered HTML
docs.
See
https://sphinx-rtd-theme.readthedocs.io/en/stable/demo/demo.html#admonitions
for examples of each directive/admonition in use.
These are rendered in orange:
.. Attention:: ...
.. Caution:: ...
.. WARNING:: ...
These are rendered in red:
.. DANGER:: ...
.. Error:: ...
These are rendered in green:
.. Hint:: ...
.. Important:: ...
.. Tip:: ...
These are rendered in blue:
.. Note:: ...
.. admonition:: custom title
admonition body text
This patch uses ".. note::" almost everywhere, with just two "caution"
directives. Several instances of "Notes:" have been converted to
merely ".. note::", or multiple ".. note::" where appropriate.
".. admonition:: notes" is used in a few places where we had an
ordered list of multiple notes that would not make sense as
standalone/separate admonitions. Two "Note:" following "Example:"
have been turned into ordinary paragraphs within the example.
NOTE: Because qapidoc.py does not attempt to preserve source ordering of
sections, the conversion of Notes from a "tagged section" to an
"untagged section" means that rendering order for some notes *may
change* as a result of this patch. The forthcoming qapidoc.py rewrite
strictly preserves source ordering in the rendered documentation, so
this issue will be rectified in the new generator.
Signed-off-by: John Snow <jsnow@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com> [for block*.json]
Message-ID: <20240626222128.406106-11-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message clarified slightly, period added to one more note]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2024-06-27 01:21:16 +03:00
|
|
|
# .. note:: Optional members may or may not appear in the flow key
|
|
|
|
# depending if they're relevant to the flow key.
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'struct': 'RockerOfDpaFlowKey',
|
|
|
|
'data' : { 'priority': 'uint32', 'tbl-id': 'uint32', '*in-pport': 'uint32',
|
|
|
|
'*tunnel-id': 'uint32', '*vlan-id': 'uint16',
|
|
|
|
'*eth-type': 'uint16', '*eth-src': 'str', '*eth-dst': 'str',
|
|
|
|
'*ip-proto': 'uint8', '*ip-tos': 'uint8', '*ip-dst': 'str' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerOfDpaFlowMask:
|
|
|
|
#
|
|
|
|
# Rocker switch OF-DPA flow mask
|
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @in-pport: physical input port
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @tunnel-id: tunnel ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @vlan-id: VLAN ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @eth-src: Ethernet header source MAC address
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @eth-dst: Ethernet header destination MAC address
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @ip-proto: IP Header protocol field
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @ip-tos: IP header TOS field
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
qapi: convert "Note" sections to plain rST
We do not need a dedicated section for notes. By eliminating a specially
parsed section, these notes can be treated as normal rST paragraphs in
the new QMP reference manual, and can be placed and styled much more
flexibly.
Convert all existing "Note" and "Notes" sections to pure rST. As part of
the conversion, capitalize the first letter of each sentence and add
trailing punctuation where appropriate to ensure notes look sensible and
consistent in rendered HTML documentation. Markup is also re-aligned to
the de-facto standard of 3 spaces for directives.
Update docs/devel/qapi-code-gen.rst to reflect the new paradigm, and
update the QAPI parser to prohibit "Note" sections while suggesting a
new syntax. The exact formatting to use is a matter of taste, but a good
candidate is simply:
.. note:: lorem ipsum ...
... dolor sit amet ...
... consectetur adipiscing elit ...
... but there are other choices, too. The Sphinx readthedocs theme
offers theming for the following forms (capitalization unimportant); all
are adorned with a (!) symbol () in the title bar for rendered HTML
docs.
See
https://sphinx-rtd-theme.readthedocs.io/en/stable/demo/demo.html#admonitions
for examples of each directive/admonition in use.
These are rendered in orange:
.. Attention:: ...
.. Caution:: ...
.. WARNING:: ...
These are rendered in red:
.. DANGER:: ...
.. Error:: ...
These are rendered in green:
.. Hint:: ...
.. Important:: ...
.. Tip:: ...
These are rendered in blue:
.. Note:: ...
.. admonition:: custom title
admonition body text
This patch uses ".. note::" almost everywhere, with just two "caution"
directives. Several instances of "Notes:" have been converted to
merely ".. note::", or multiple ".. note::" where appropriate.
".. admonition:: notes" is used in a few places where we had an
ordered list of multiple notes that would not make sense as
standalone/separate admonitions. Two "Note:" following "Example:"
have been turned into ordinary paragraphs within the example.
NOTE: Because qapidoc.py does not attempt to preserve source ordering of
sections, the conversion of Notes from a "tagged section" to an
"untagged section" means that rendering order for some notes *may
change* as a result of this patch. The forthcoming qapidoc.py rewrite
strictly preserves source ordering in the rendered documentation, so
this issue will be rectified in the new generator.
Signed-off-by: John Snow <jsnow@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com> [for block*.json]
Message-ID: <20240626222128.406106-11-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message clarified slightly, period added to one more note]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2024-06-27 01:21:16 +03:00
|
|
|
# .. note:: Optional members may or may not appear in the flow mask
|
|
|
|
# depending if they're relevant to the flow mask.
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'struct': 'RockerOfDpaFlowMask',
|
|
|
|
'data' : { '*in-pport': 'uint32', '*tunnel-id': 'uint32',
|
|
|
|
'*vlan-id': 'uint16', '*eth-src': 'str', '*eth-dst': 'str',
|
|
|
|
'*ip-proto': 'uint8', '*ip-tos': 'uint8' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerOfDpaFlowAction:
|
|
|
|
#
|
|
|
|
# Rocker switch OF-DPA flow action
|
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @goto-tbl: next table ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @group-id: group ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @tunnel-lport: tunnel logical port ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @vlan-id: VLAN ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @new-vlan-id: new VLAN ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @out-pport: physical output port
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
qapi: convert "Note" sections to plain rST
We do not need a dedicated section for notes. By eliminating a specially
parsed section, these notes can be treated as normal rST paragraphs in
the new QMP reference manual, and can be placed and styled much more
flexibly.
Convert all existing "Note" and "Notes" sections to pure rST. As part of
the conversion, capitalize the first letter of each sentence and add
trailing punctuation where appropriate to ensure notes look sensible and
consistent in rendered HTML documentation. Markup is also re-aligned to
the de-facto standard of 3 spaces for directives.
Update docs/devel/qapi-code-gen.rst to reflect the new paradigm, and
update the QAPI parser to prohibit "Note" sections while suggesting a
new syntax. The exact formatting to use is a matter of taste, but a good
candidate is simply:
.. note:: lorem ipsum ...
... dolor sit amet ...
... consectetur adipiscing elit ...
... but there are other choices, too. The Sphinx readthedocs theme
offers theming for the following forms (capitalization unimportant); all
are adorned with a (!) symbol () in the title bar for rendered HTML
docs.
See
https://sphinx-rtd-theme.readthedocs.io/en/stable/demo/demo.html#admonitions
for examples of each directive/admonition in use.
These are rendered in orange:
.. Attention:: ...
.. Caution:: ...
.. WARNING:: ...
These are rendered in red:
.. DANGER:: ...
.. Error:: ...
These are rendered in green:
.. Hint:: ...
.. Important:: ...
.. Tip:: ...
These are rendered in blue:
.. Note:: ...
.. admonition:: custom title
admonition body text
This patch uses ".. note::" almost everywhere, with just two "caution"
directives. Several instances of "Notes:" have been converted to
merely ".. note::", or multiple ".. note::" where appropriate.
".. admonition:: notes" is used in a few places where we had an
ordered list of multiple notes that would not make sense as
standalone/separate admonitions. Two "Note:" following "Example:"
have been turned into ordinary paragraphs within the example.
NOTE: Because qapidoc.py does not attempt to preserve source ordering of
sections, the conversion of Notes from a "tagged section" to an
"untagged section" means that rendering order for some notes *may
change* as a result of this patch. The forthcoming qapidoc.py rewrite
strictly preserves source ordering in the rendered documentation, so
this issue will be rectified in the new generator.
Signed-off-by: John Snow <jsnow@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com> [for block*.json]
Message-ID: <20240626222128.406106-11-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message clarified slightly, period added to one more note]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2024-06-27 01:21:16 +03:00
|
|
|
# .. note:: Optional members may or may not appear in the flow action
|
|
|
|
# depending if they're relevant to the flow action.
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'struct': 'RockerOfDpaFlowAction',
|
|
|
|
'data' : { '*goto-tbl': 'uint32', '*group-id': 'uint32',
|
|
|
|
'*tunnel-lport': 'uint32', '*vlan-id': 'uint16',
|
|
|
|
'*new-vlan-id': 'uint16', '*out-pport': 'uint32' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerOfDpaFlow:
|
|
|
|
#
|
|
|
|
# Rocker switch OF-DPA flow
|
|
|
|
#
|
|
|
|
# @cookie: flow unique cookie ID
|
|
|
|
#
|
|
|
|
# @hits: count of matches (hits) on flow
|
|
|
|
#
|
|
|
|
# @key: flow key
|
|
|
|
#
|
|
|
|
# @mask: flow mask
|
|
|
|
#
|
|
|
|
# @action: flow action
|
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'struct': 'RockerOfDpaFlow',
|
|
|
|
'data': { 'cookie': 'uint64', 'hits': 'uint64', 'key': 'RockerOfDpaFlowKey',
|
|
|
|
'mask': 'RockerOfDpaFlowMask', 'action': 'RockerOfDpaFlowAction' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @query-rocker-of-dpa-flows:
|
|
|
|
#
|
|
|
|
# Return rocker OF-DPA flow information.
|
|
|
|
#
|
|
|
|
# @name: switch name
|
|
|
|
#
|
2023-04-28 13:54:29 +03:00
|
|
|
# @tbl-id: flow table ID. If tbl-id is not specified, returns flow
|
|
|
|
# information for all tables.
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2016-06-23 16:14:30 +03:00
|
|
|
# Returns: rocker OF-DPA flow information
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Since: 2.4
|
2016-06-23 16:14:30 +03:00
|
|
|
#
|
2024-07-17 05:13:08 +03:00
|
|
|
# .. qmp-example::
|
2016-06-23 16:14:30 +03:00
|
|
|
#
|
2024-02-16 17:58:34 +03:00
|
|
|
# -> { "execute": "query-rocker-of-dpa-flows",
|
|
|
|
# "arguments": { "name": "sw1" } }
|
|
|
|
# <- { "return": [ {"key": {"in-pport": 0, "priority": 1, "tbl-id": 0},
|
|
|
|
# "hits": 138,
|
|
|
|
# "cookie": 0,
|
|
|
|
# "action": {"goto-tbl": 10},
|
|
|
|
# "mask": {"in-pport": 4294901760}
|
|
|
|
# },
|
2024-06-27 01:21:14 +03:00
|
|
|
# {...},
|
2024-02-16 17:58:34 +03:00
|
|
|
# ]}
|
2015-06-11 04:21:21 +03:00
|
|
|
##
|
|
|
|
{ 'command': 'query-rocker-of-dpa-flows',
|
|
|
|
'data': { 'name': 'str', '*tbl-id': 'uint32' },
|
|
|
|
'returns': ['RockerOfDpaFlow'] }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @RockerOfDpaGroup:
|
|
|
|
#
|
|
|
|
# Rocker switch OF-DPA group
|
|
|
|
#
|
|
|
|
# @id: group unique ID
|
|
|
|
#
|
|
|
|
# @type: group type
|
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @vlan-id: VLAN ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @pport: physical port number
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @index: group index, unique with group type
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @out-pport: output physical port number
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @group-id: next group ID
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @set-vlan-id: VLAN ID to set
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @pop-vlan: pop VLAN headr from packet
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @group-ids: list of next group IDs
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @set-eth-src: set source MAC address in Ethernet header
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @set-eth-dst: set destination MAC address in Ethernet header
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2017-03-15 15:57:06 +03:00
|
|
|
# @ttl-check: perform TTL check
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
qapi: convert "Note" sections to plain rST
We do not need a dedicated section for notes. By eliminating a specially
parsed section, these notes can be treated as normal rST paragraphs in
the new QMP reference manual, and can be placed and styled much more
flexibly.
Convert all existing "Note" and "Notes" sections to pure rST. As part of
the conversion, capitalize the first letter of each sentence and add
trailing punctuation where appropriate to ensure notes look sensible and
consistent in rendered HTML documentation. Markup is also re-aligned to
the de-facto standard of 3 spaces for directives.
Update docs/devel/qapi-code-gen.rst to reflect the new paradigm, and
update the QAPI parser to prohibit "Note" sections while suggesting a
new syntax. The exact formatting to use is a matter of taste, but a good
candidate is simply:
.. note:: lorem ipsum ...
... dolor sit amet ...
... consectetur adipiscing elit ...
... but there are other choices, too. The Sphinx readthedocs theme
offers theming for the following forms (capitalization unimportant); all
are adorned with a (!) symbol () in the title bar for rendered HTML
docs.
See
https://sphinx-rtd-theme.readthedocs.io/en/stable/demo/demo.html#admonitions
for examples of each directive/admonition in use.
These are rendered in orange:
.. Attention:: ...
.. Caution:: ...
.. WARNING:: ...
These are rendered in red:
.. DANGER:: ...
.. Error:: ...
These are rendered in green:
.. Hint:: ...
.. Important:: ...
.. Tip:: ...
These are rendered in blue:
.. Note:: ...
.. admonition:: custom title
admonition body text
This patch uses ".. note::" almost everywhere, with just two "caution"
directives. Several instances of "Notes:" have been converted to
merely ".. note::", or multiple ".. note::" where appropriate.
".. admonition:: notes" is used in a few places where we had an
ordered list of multiple notes that would not make sense as
standalone/separate admonitions. Two "Note:" following "Example:"
have been turned into ordinary paragraphs within the example.
NOTE: Because qapidoc.py does not attempt to preserve source ordering of
sections, the conversion of Notes from a "tagged section" to an
"untagged section" means that rendering order for some notes *may
change* as a result of this patch. The forthcoming qapidoc.py rewrite
strictly preserves source ordering in the rendered documentation, so
this issue will be rectified in the new generator.
Signed-off-by: John Snow <jsnow@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com> [for block*.json]
Message-ID: <20240626222128.406106-11-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message clarified slightly, period added to one more note]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2024-06-27 01:21:16 +03:00
|
|
|
# .. note:: Optional members may or may not appear in the group depending
|
|
|
|
# if they're relevant to the group type.
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Since: 2.4
|
|
|
|
##
|
|
|
|
{ 'struct': 'RockerOfDpaGroup',
|
|
|
|
'data': { 'id': 'uint32', 'type': 'uint8', '*vlan-id': 'uint16',
|
|
|
|
'*pport': 'uint32', '*index': 'uint32', '*out-pport': 'uint32',
|
|
|
|
'*group-id': 'uint32', '*set-vlan-id': 'uint16',
|
|
|
|
'*pop-vlan': 'uint8', '*group-ids': ['uint32'],
|
|
|
|
'*set-eth-src': 'str', '*set-eth-dst': 'str',
|
|
|
|
'*ttl-check': 'uint8' } }
|
|
|
|
|
|
|
|
##
|
|
|
|
# @query-rocker-of-dpa-groups:
|
|
|
|
#
|
|
|
|
# Return rocker OF-DPA group information.
|
|
|
|
#
|
|
|
|
# @name: switch name
|
|
|
|
#
|
2023-04-28 13:54:29 +03:00
|
|
|
# @type: group type. If type is not specified, returns group
|
|
|
|
# information for all group types.
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
2016-06-23 16:17:32 +03:00
|
|
|
# Returns: rocker OF-DPA group information
|
2015-06-11 04:21:21 +03:00
|
|
|
#
|
|
|
|
# Since: 2.4
|
2016-06-23 16:17:32 +03:00
|
|
|
#
|
2024-07-17 05:13:08 +03:00
|
|
|
# .. qmp-example::
|
2016-06-23 16:17:32 +03:00
|
|
|
#
|
2024-02-16 17:58:34 +03:00
|
|
|
# -> { "execute": "query-rocker-of-dpa-groups",
|
|
|
|
# "arguments": { "name": "sw1" } }
|
|
|
|
# <- { "return": [ {"type": 0, "out-pport": 2,
|
|
|
|
# "pport": 2, "vlan-id": 3841,
|
|
|
|
# "pop-vlan": 1, "id": 251723778},
|
|
|
|
# {"type": 0, "out-pport": 0,
|
|
|
|
# "pport": 0, "vlan-id": 3841,
|
|
|
|
# "pop-vlan": 1, "id": 251723776},
|
|
|
|
# {"type": 0, "out-pport": 1,
|
|
|
|
# "pport": 1, "vlan-id": 3840,
|
|
|
|
# "pop-vlan": 1, "id": 251658241},
|
|
|
|
# {"type": 0, "out-pport": 0,
|
|
|
|
# "pport": 0, "vlan-id": 3840,
|
|
|
|
# "pop-vlan": 1, "id": 251658240}
|
|
|
|
# ]}
|
2015-06-11 04:21:21 +03:00
|
|
|
##
|
|
|
|
{ 'command': 'query-rocker-of-dpa-groups',
|
|
|
|
'data': { 'name': 'str', '*type': 'uint8' },
|
|
|
|
'returns': ['RockerOfDpaGroup'] }
|