From fdf059ff402165ad3d2a06d045e0db50ee62d8dd Mon Sep 17 00:00:00 2001 From: Bruce Davie Date: Thu, 1 May 2014 18:37:24 -0700 Subject: [PATCH] vtep: clean up whitespace Signed-off-by: Bruce Davie Signed-off-by: Ben Pfaff --- vtep/vtep.ovsschema | 104 ++++++++++----------- vtep/vtep.xml | 218 ++++++++++++++++++++++---------------------- 2 files changed, 161 insertions(+), 161 deletions(-) diff --git a/vtep/vtep.ovsschema b/vtep/vtep.ovsschema index 4a25f2f4a..94494abd1 100644 --- a/vtep/vtep.ovsschema +++ b/vtep/vtep.ovsschema @@ -1,6 +1,6 @@ { "name": "hardware_vtep", - "cksum": "3096797177 6063", + "cksum": "1687941026 6625", "tables": { "Global": { "columns": { @@ -8,47 +8,47 @@ "type": {"key": {"type": "uuid", "refTable": "Manager"}, "min": 0, "max": "unlimited"}}, - "switches": { - "type": {"key": {"type": "uuid", "refTable": "Physical_Switch"}, - "min": 0, "max": "unlimited"}} + "switches": { + "type": {"key": {"type": "uuid", "refTable": "Physical_Switch"}, + "min": 0, "max": "unlimited"}} }, "maxRows": 1, "isRoot": true}, "Physical_Switch": { "columns": { - "ports": { - "type": {"key": {"type": "uuid", "refTable": "Physical_Port"}, - "min": 0, "max": "unlimited"}}, + "ports": { + "type": {"key": {"type": "uuid", "refTable": "Physical_Port"}, + "min": 0, "max": "unlimited"}}, "name": {"type": "string"}, "description": {"type": "string"}, "management_ips": { - "type": {"key": {"type": "string"}, "min": 0, "max": "unlimited"}}, + "type": {"key": {"type": "string"}, "min": 0, "max": "unlimited"}}, "tunnel_ips": { - "type": {"key": {"type": "string"}, "min": 0, "max": "unlimited"}}, + "type": {"key": {"type": "string"}, "min": 0, "max": "unlimited"}}, "switch_fault_status": { "type": { "key": "string", "min": 0, "max": "unlimited"}, - "ephemeral": true}}, + "ephemeral": true}}, "indexes": [["name"]]}, "Physical_Port": { "columns": { "name": {"type": "string"}, "description": {"type": "string"}, - "vlan_bindings": { - "type": {"key": {"type": "integer", - "minInteger": 0, "maxInteger": 4095}, - "value": {"type": "uuid", "refTable": "Logical_Switch"}, - "min": 0, "max": "unlimited"}}, + "vlan_bindings": { + "type": {"key": {"type": "integer", + "minInteger": 0, "maxInteger": 4095}, + "value": {"type": "uuid", "refTable": "Logical_Switch"}, + "min": 0, "max": "unlimited"}}, "vlan_stats": { - "type": {"key": {"type": "integer", - "minInteger": 0, "maxInteger": 4095}, - "value": {"type": "uuid", - "refTable": "Logical_Binding_Stats"}, - "min": 0, "max": "unlimited"}}, + "type": {"key": {"type": "integer", + "minInteger": 0, "maxInteger": 4095}, + "value": {"type": "uuid", + "refTable": "Logical_Binding_Stats"}, + "min": 0, "max": "unlimited"}}, "port_fault_status": { "type": { "key": "string", "min": 0, "max": "unlimited"}, - "ephemeral": true}}}, + "ephemeral": true}}}, "Logical_Binding_Stats": { "columns": { "bytes_from_local": {"type": "integer"}, @@ -59,66 +59,66 @@ "columns": { "name": {"type": "string"}, "description": {"type": "string"}, - "tunnel_key": {"type": {"key": "integer", "min": 0, "max": 1}}}, + "tunnel_key": {"type": {"key": "integer", "min": 0, "max": 1}}}, "isRoot": true, "indexes": [["name"]]}, "Ucast_Macs_Local": { "columns": { "MAC": {"type": "string"}, - "logical_switch": { + "logical_switch": { "type": {"key": {"type": "uuid", - "refTable": "Logical_Switch"}}}, - "locator": { + "refTable": "Logical_Switch"}}}, + "locator": { "type": {"key": {"type": "uuid", - "refTable": "Physical_Locator"}}}, + "refTable": "Physical_Locator"}}}, "ipaddr": {"type": "string"}}, "isRoot": true}, "Ucast_Macs_Remote": { "columns": { "MAC": {"type": "string"}, - "logical_switch": { + "logical_switch": { "type": {"key": {"type": "uuid", - "refTable": "Logical_Switch"}}}, - "locator": { + "refTable": "Logical_Switch"}}}, + "locator": { "type": {"key": {"type": "uuid", - "refTable": "Physical_Locator"}}}, + "refTable": "Physical_Locator"}}}, "ipaddr": {"type": "string"}}, "isRoot": true}, "Mcast_Macs_Local": { "columns": { "MAC": {"type": "string"}, - "logical_switch": { + "logical_switch": { "type": {"key": {"type": "uuid", - "refTable": "Logical_Switch"}}}, - "locator_set": { + "refTable": "Logical_Switch"}}}, + "locator_set": { "type": {"key": {"type": "uuid", - "refTable": "Physical_Locator_Set"}}}, + "refTable": "Physical_Locator_Set"}}}, "ipaddr": {"type": "string"}}, "isRoot": true}, "Mcast_Macs_Remote": { "columns": { "MAC": {"type": "string"}, - "logical_switch": { + "logical_switch": { "type": {"key": {"type": "uuid", - "refTable": "Logical_Switch"}}}, - "locator_set": { + "refTable": "Logical_Switch"}}}, + "locator_set": { "type": {"key": {"type": "uuid", - "refTable": "Physical_Locator_Set"}}}, + "refTable": "Physical_Locator_Set"}}}, "ipaddr": {"type": "string"}}, "isRoot": true}, "Logical_Router": { "columns": { "name": {"type": "string"}, "description": {"type": "string"}, - "switch_binding": { - "type": {"key": {"type": "string"}, - "value": {"type": "uuid", + "switch_binding": { + "type": {"key": {"type": "string"}, + "value": {"type": "uuid", "refTable": "Logical_Switch"}, - "min": 0, "max": "unlimited"}}, - "static_routes": { - "type": {"key": {"type": "string"}, - "value": {"type" : "string"}, - "min": 0, "max": "unlimited"}}}, + "min": 0, "max": "unlimited"}}, + "static_routes": { + "type": {"key": {"type": "string"}, + "value": {"type" : "string"}, + "min": 0, "max": "unlimited"}}}, "isRoot": true, "indexes": [["name"]]}, "Arp_Sources_Local": { @@ -138,9 +138,9 @@ "Physical_Locator_Set": { "columns": { "locators": { - "type": {"key": {"type": "uuid", "refTable": "Physical_Locator"}, - "min": 1, "max": "unlimited"}, - "mutable": false}}}, + "type": {"key": {"type": "uuid", "refTable": "Physical_Locator"}, + "min": 1, "max": "unlimited"}, + "mutable": false}}}, "Physical_Locator": { "columns": { "encapsulation_type": { @@ -148,12 +148,12 @@ "key": { "enum": ["set", ["vxlan_over_ipv4"]], "type": "string"}}, - "mutable": false}, + "mutable": false}, "dst_ip": {"type": "string", "mutable": false}, - "bfd": { + "bfd": { "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}, - "bfd_status": { + "bfd_status": { "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}}, "indexes": [["encapsulation_type", "dst_ip"]]}, diff --git a/vtep/vtep.xml b/vtep/vtep.xml index 8ae6af7eb..06bca0f76 100644 --- a/vtep/vtep.xml +++ b/vtep/vtep.xml @@ -80,8 +80,8 @@ (not a DNS name).

- SSL key and certificate configuration happens outside the - database. + SSL key and certificate configuration happens outside the + database.

@@ -266,19 +266,19 @@ - Symbolic name for the switch, such as its hostname. + Symbolic name for the switch, such as its hostname. - An extended description for the switch, such as its switch login - banner. + An extended description for the switch, such as its switch login + banner.

- An entry in this column indicates to the NVC that this switch - has encountered a fault. The switch must clear this column - when the fault has been cleared. + An entry in this column indicates to the NVC that this switch + has encountered a fault. The switch must clear this column + when the fault has been cleared.

@@ -320,33 +320,33 @@ - Symbolic name for the port. The name ought to be unique within a given - , but the database is not capable of - enforcing this. + Symbolic name for the port. The name ought to be unique within a given + , but the database is not capable of + enforcing this. - An extended description for the port. + An extended description for the port.

- An entry in this column indicates to the NVC that the physical port has - encountered a fault. The switch must clear this column when the errror - has been cleared. + An entry in this column indicates to the NVC that the physical port has + encountered a fault. The switch must clear this column when the errror + has been cleared.

-

- Indicates that a VLAN-to-logical-switch mapping requested by - the controller could not be instantiated by the switch - because of a conflict with local configuration. -

+

+ Indicates that a VLAN-to-logical-switch mapping requested by + the controller could not be instantiated by the switch + because of a conflict with local configuration. +

-

- Indicates that an error has occurred on the port but that no - more specific information is available. -

+

+ Indicates that an error has occurred on the port but that no + more specific information is available. +

@@ -445,12 +445,12 @@ - Symbolic name for the logical switch. + Symbolic name for the logical switch. - An extended description for the logical switch, such as its switch - login banner. + An extended description for the logical switch, such as its switch + login banner. @@ -528,15 +528,15 @@

- A MAC address that has been learned by the VTEP. + A MAC address that has been learned by the VTEP.

- The keyword unknown-dst is used as a special - ``Ethernet address'' that indicates the locations to which - packets in a logical switch whose destination addresses do not - otherwise appear in (for - unicast addresses) or (for - multicast addresses) should be sent. + The keyword unknown-dst is used as a special + ``Ethernet address'' that indicates the locations to which + packets in a logical switch whose destination addresses do not + otherwise appear in (for + unicast addresses) or (for + multicast addresses) should be sent.

@@ -570,15 +570,15 @@

- A MAC address that has been learned by the NVC. + A MAC address that has been learned by the NVC.

- The keyword unknown-dst is used as a special - ``Ethernet address'' that indicates the locations to which - packets in a logical switch whose destination addresses do not - otherwise appear in (for - unicast addresses) or (for - multicast addresses) should be sent. + The keyword unknown-dst is used as a special + ``Ethernet address'' that indicates the locations to which + packets in a logical switch whose destination addresses do not + otherwise appear in (for + unicast addresses) or (for + multicast addresses) should be sent.

@@ -623,11 +623,11 @@ - Symbolic name for the logical router. + Symbolic name for the logical router. - An extended description for the logical router. + An extended description for the logical router. @@ -743,43 +743,43 @@

- BFD, defined in RFC 5880, allows point to point detection of - connectivity failures by occasional transmission of BFD control - messages. VTEPs are expected to implement BFD. + BFD, defined in RFC 5880, allows point to point detection of + connectivity failures by occasional transmission of BFD control + messages. VTEPs are expected to implement BFD.

- BFD operates by regularly transmitting BFD control messages at a - rate negotiated independently in each direction. Each endpoint - specifies the rate at which it expects to receive control messages, - and the rate at which it's willing to transmit them. An endpoint - which fails to receive BFD control messages for a period of three - times the expected reception rate will signal a connectivity - fault. In the case of a unidirectional connectivity issue, the - system not receiving BFD control messages will signal the problem - to its peer in the messages it transmits. + BFD operates by regularly transmitting BFD control messages at a + rate negotiated independently in each direction. Each endpoint + specifies the rate at which it expects to receive control messages, + and the rate at which it's willing to transmit them. An endpoint + which fails to receive BFD control messages for a period of three + times the expected reception rate will signal a connectivity + fault. In the case of a unidirectional connectivity issue, the + system not receiving BFD control messages will signal the problem + to its peer in the messages it transmits.

- A hardware VTEP is expected to use BFD to determine reachability of - devices at the end of the tunnels with which it exchanges data. This - can enable the VTEP to choose a functioning service node among a set of - service nodes providing high availability. It also enables the NVC to - report the health status of tunnels. + A hardware VTEP is expected to use BFD to determine reachability of + devices at the end of the tunnels with which it exchanges data. This + can enable the VTEP to choose a functioning service node among a set of + service nodes providing high availability. It also enables the NVC to + report the health status of tunnels.

- In most cases the BFD peer of a hardware VTEP will be an Open vSwitch - instance. The Open vSwitch implementation of BFD aims to comply - faithfully with the requirements put forth in RFC 5880. Open vSwitch - does not implement the optional Authentication or ``Echo Mode'' - features. + In most cases the BFD peer of a hardware VTEP will be an Open vSwitch + instance. The Open vSwitch implementation of BFD aims to comply + faithfully with the requirements put forth in RFC 5880. Open vSwitch + does not implement the optional Authentication or ``Echo Mode'' + features.

-

- A controller sets up key-value pairs in the - column to enable and configure BFD. +

+ A controller sets up key-value pairs in the + column to enable and configure BFD.

@@ -843,55 +843,55 @@ 00:23:20:00:00:01. - + Set to an IPv4 address to set the IP address used as source for transmitted BFD packets. The default is 169.254.1.0. - + - + Set to an IPv4 address to set the IP address used as destination for transmitted BFD packets. The default is 169.254.1.1. - + -

- The VTEP sets key-value pairs in the - column to report the status of BFD on this interface. When BFD is - not enabled, with , the switch clears - all key-value pairs from . -

- - - Reports the state of the BFD session. The BFD session is fully - healthy and negotiated if UP. - - - - Reports whether the BFD session believes this may be used to forward traffic. Typically - this means the local session is signaling UP, and the - remote system isn't signaling a problem such as concatenated path - down. - - - - In case of a problem, set to a short message that reports what the - local BFD session thinks is wrong. - - - - Reports the state of the remote endpoint's BFD session. - - - - In case of a problem, set to a short message that reports what the - remote endpoint's BFD session thinks is wrong. - +

+ The VTEP sets key-value pairs in the + column to report the status of BFD on this interface. When BFD is + not enabled, with , the switch clears + all key-value pairs from . +

+ + + Reports the state of the BFD session. The BFD session is fully + healthy and negotiated if UP. + + + + Reports whether the BFD session believes this may be used to forward traffic. Typically + this means the local session is signaling UP, and the + remote system isn't signaling a problem such as concatenated path + down. + + + + In case of a problem, set to a short message that reports what the + local BFD session thinks is wrong. + + + + Reports the state of the remote endpoint's BFD session. + + + + In case of a problem, set to a short message that reports what the + remote endpoint's BFD session thinks is wrong. + -- 2.43.0