vtep: add fault notifications to physical switch and ports

Add a "switch_fault" and "port_fault" column to the appropriate
tables in the VTEP schema.

Signed-off-by: Bruce Davie <bdavie@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/vtep/vtep.ovsschema b/vtep/vtep.ovsschema
index d03d96d..017183a 100644 (file)
--- a/vtep/vtep.ovsschema
+++ b/vtep/vtep.ovsschema
@@ -1,6 +1,6 @@
 {
   "name": "hardware_vtep",
-  "cksum": "825115144 5318",
+  "cksum": "1365749839 5604",
   "tables": {
     "Global": {
       "columns": {
@@ -24,7 +24,11 @@
         "management_ips": {
          "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}},
       "indexes": [["name"]]},
     "Physical_Port": {
       "columns": {
@@ -40,7 +44,11 @@
                           "minInteger": 0, "maxInteger": 4095},
                   "value": {"type": "uuid",
                             "refTable": "Logical_Binding_Stats"},
-                  "min": 0, "max": "unlimited"}}}},
+                  "min": 0, "max": "unlimited"}},
+        "port_fault_status": {
+          "type": {
+            "key": "string", "min": 0, "max": "unlimited"},
+           "ephemeral": true}}},
     "Logical_Binding_Stats": {
       "columns": {
         "bytes_from_local": {"type": "integer"},
@@ -154,4 +162,4 @@
           "ephemeral": true}},
       "indexes": [["target"]],
       "isRoot": false}},
-  "version": "1.0.0"}
+  "version": "1.1.0"}

diff --git a/vtep/vtep.xml b/vtep/vtep.xml
index 3940479..db8d408 100644 (file)
--- a/vtep/vtep.xml
+++ b/vtep/vtep.xml
@@ -274,6 +274,29 @@
        banner.
       </column>
     </group>
+    <group title="Error Notification">
+      <p>
+       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.
+      </p>
+
+      <column name="switch_fault_status" key="mac_table_exhaustion">
+        Indicates that the switch has been unable to process MAC
+        entries requested by the NVC due to lack of table resources.
+      </column>
+
+      <column name="switch_fault_status" key="tunnel_exhaustion">
+        Indicates that the switch has been unable to create tunnels
+        requested by the NVC due to lack of resources.
+      </column>
+
+      <column name="switch_fault_status" key="unspecified_fault">
+        Indicates that an error has occurred in the switch but that no
+        more specific information is available.
+      </column>
+
+    </group>
   </table>
 
   <table name="Physical_Port" title="A port within a physical switch.">
@@ -306,6 +329,27 @@
        An extended description for the port.
       </column>
     </group>
+    <group title="Error Notification">
+      <p>
+       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.
+      </p>
+      <column name="port_fault_status" key="invalid_vlan_map">
+       <p>
+         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.
+       </p>
+      </column>
+      <column name="port_fault_status" key="unspecified_fault">
+       <p>
+         Indicates that an error has occurred on the port but that no
+         more specific information is available.
+       </p>
+      </column>
+    </group>
+
   </table>
 
   <table name="Logical_Binding_Stats" title="Statistics for a VLAN on a physical port bound to a logical network.">
@@ -453,7 +497,7 @@
     </p>
 
     <column name="MAC">
-      A MAC address that has been learned by the NSC.
+      A MAC address that has been learned by the NVC.
     </column>
 
     <column name="logical_switch">
@@ -526,7 +570,7 @@
 
     <column name="MAC">
       <p>
-       A MAC address that has been learned by the NSC.
+       A MAC address that has been learned by the NVC.
       </p>
       <p>
        The keyword <code>unknown-dst</code> is used as a special