[Kimchi-devel] [PATCH v2] [Kimchi 1/3] Adding 'passthrough' forward mode to Macvtap: doc changes

dhbarboza82 at gmail.com dhbarboza82 at gmail.com
Wed May 18 19:32:41 UTC 2016


From: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>

This patch makes changes in docs/API.md, API.json and i18n.py
to add a new forward mode in macvtap networks called 'passthrough'.

A new 'forward_mode' attribute was added. This attribute is optional
and it is only valid when connection is 'macvtap'. If not present,
the current default value 'bridge' for the forwarding mode of the
'macvtap' network is used.

Signed-off-by: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>
---
 API.json    | 6 ++++++
 docs/API.md | 1 +
 i18n.py     | 1 +
 3 files changed, 8 insertions(+)

diff --git a/API.json b/API.json
index 40278bb..88b0b36 100644
--- a/API.json
+++ b/API.json
@@ -397,6 +397,12 @@
                     "maximum": 4094,
                     "minimum": 1,
                     "error": "KCHNET0015E"
+                },
+                "forward_mode": {
+                    "description": "Forward mode for macvtap networks. If not present, macvtap forward mode defaults to 'bridge'.",
+                    "type": "string",
+                    "pattern": "^bridge|passthrough$",
+                    "error": "KCHNET0033E"
                 }
             }
         },
diff --git a/docs/API.md b/docs/API.md
index 83f9d38..9e5dc3e 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -701,6 +701,7 @@ A interface represents available interface on host.
                                For "macvtap" and "bridge" connections, only
                                one interface will be allowed in this array.
     * vlan_id *(optional)*: VLAN tagging ID for the macvtap bridge network.
+    * forward_mode *(optional)*: Forward mode for macvtap networks. Allowed values are 'bridge' and 'passthrough'. If not present, macvtap forward mode defaults to 'bridge'.
 
 ### Resource: Network
 
diff --git a/i18n.py b/i18n.py
index cfbc81e..1774afe 100644
--- a/i18n.py
+++ b/i18n.py
@@ -282,6 +282,7 @@ messages = {
     "KCHNET0030E": _("Only one interface is allowed for 'bridge' and 'macvtap' networks."),
     "KCHNET0031E": _("Subnet is not a valid parameter for this type of virtual network."),
     "KCHNET0032E": _("VLAN ID and interfaces are not valid parameters for this type of virtual network."),
+    "KCHNET0033E": _("Invalid macvtap forward mode. Valid values: 'bridge' and 'passthrough'."),
 
     "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"),
 
-- 
2.5.5




More information about the Kimchi-devel mailing list