Skip to content

Commit 856ae49

Browse files
committed
Merge pull request #75 from djs55/tunnelling
Minor improvements to the tunnelling doc
2 parents 630f75c + f4d95ac commit 856ae49

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

xapi/design/tunnelling.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ VLANs. The number of possible VLANs on a network, however, is limited, and
1111
setting up a VLAN requires configuring the physical switches in the network.
1212
GRE tunnels provide a similar, though more flexible solution. This document
1313
proposes a design that integrates the use of tunnelling in the XenAPI. The
14-
design relies on the recent introduction of the Open vSwitch in XCP, and
15-
requires an Open vSwitch ([[OpenFlow]]) controller (further referred to as
14+
design relies on the recent introduction of the Open vSwitch, and
15+
requires an Open vSwitch
16+
([OpenFlow](https://www.opennetworking.org/sdn-resources/openflow)) controller
17+
(further referred to as
1618
_the controller_) to set up and maintain the actual GRE tunnels.
1719

1820
We suggest following the way VLANs are modelled in the datamodel. Introducing a
@@ -81,14 +83,14 @@ tunnelling functionality is enabled) a key `network_backend` is added to the
8183
not be set up, an error code (to be defined) will be written to
8284
`tunnel.status:error`, and `tunnel.status:active` will be `"false"`.
8385

84-
XAPI
86+
Xapi
8587
----
8688

8789
### tunnel.create
8890

89-
* Fails with OPENVSWITCH_NOT_ACTIVE if the Open vSwitch networking sub-system
91+
* Fails with `OPENVSWITCH_NOT_ACTIVE` if the Open vSwitch networking sub-system
9092
is not active (the host uses linux bridging).
91-
* Fails with IS_TUNNEL_ACCESS_PIF if the specified transport PIF is a tunnel access PIF.
93+
* Fails with `IS_TUNNEL_ACCESS_PIF` if the specified transport PIF is a tunnel access PIF.
9294
* Takes care of creating and connecting the new tunnel and PIF objects.
9395
* Sets a random MAC on the access PIF.
9496
* IP configuration of the tunnel
@@ -107,10 +109,10 @@ XAPI
107109

108110
### PIF.plug on a tunnel access PIF
109111

110-
* Fails with TRANSPORT_PIF_NOT_CONFIGURED if the underlying transport PIF has
112+
* Fails with `TRANSPORT_PIF_NOT_CONFIGURED` if the underlying transport PIF has
111113
`PIF.ip_configuration_mode = None`, as this interface needs to be configured
112114
for the tunnelling to work. Otherwise, the transport PIF will be plugged.
113-
* XAPI requests `interface-reconfigure` to "bring up" the tunnel access PIF,
115+
* Xapi requests `interface-reconfigure` to "bring up" the tunnel access PIF,
114116
which causes it to create a local bridge.
115117
* No link will be made between the
116118
new bridge and the physical interface by `interface-reconfigure`. The
@@ -121,7 +123,7 @@ XAPI
121123

122124
### PIF.unplug on a tunnel access PIF
123125

124-
* XAPI requests `interface-reconfigure` to "bring down" the tunnel PIF, which
126+
* Xapi requests `interface-reconfigure` to "bring down" the tunnel PIF, which
125127
causes it to destroy the local bridge.
126128
* `PIF.currently_attached` is set to `false`.
127129

@@ -131,12 +133,12 @@ XAPI
131133

132134
### PIF.forget on a tunnel access of transport PIF
133135

134-
* Fails with PIF_TUNNEL_STILL_EXISTS.
136+
* Fails with `PIF_TUNNEL_STILL_EXISTS`.
135137

136138
### VLAN.create
137139

138140
* Tunnels can only exist on top of physical/VLAN/Bond PIFs, and not the other
139-
way around. `VLAN.create` fails with IS_TUNNEL_ACCESS_PIF if given an
141+
way around. `VLAN.create` fails with `IS_TUNNEL_ACCESS_PIF` if given an
140142
underlying PIF that is a tunnel access PIF.
141143

142144
### Pool join
@@ -187,9 +189,9 @@ CLI
187189
---
188190

189191
New `xe` commands (analogous to `xe vlan-`):
192+
190193
* `tunnel-create`
191194
* `tunnel-destroy`
192195
* `tunnel-list`
193196
* `tunnel-param-get`
194197
* `tunnel-param-list`
195-

0 commit comments

Comments
 (0)