Mass replace CRLF->LF

[openflowjava.git] / openflow-protocol-api / src / main / yang / openflow-types.yang

diff --git a/openflow-protocol-api/src/main/yang/openflow-types.yang b/openflow-protocol-api/src/main/yang/openflow-types.yang
index 48fd179c2bb22c33359d87d41b9594c2abe4d90b..1a0240896d57b0c12e9311a601fffb2a86c679d7 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-types.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-types.yang
@@ -198,11 +198,11 @@
         base oft:match-type-base;
     }
 
-    identity instruction {
+    identity instruction-base {
         description "Base identity for instruction types";
     }
 
-    identity action {
+    identity action-base {
         description "Base identity for action types";
     }
 
@@ -226,7 +226,13 @@
     typedef ether-type {
         type uint16;
     }
-
+    typedef experimenter-id {
+        description "This type represents experimenter ID used in experimenter messages.
+                     It also represents vendor ID - as it is the same for OF version 1.3+.
+                     (VENDOR naming convention has been changed in OF v1.3 specification
+                      to EXPERIMENTER)";
+        type uint32;
+    }
     typedef error-type {
         type enumeration {
             enum HELLO_FAILED {
@@ -1645,7 +1651,7 @@
                 position 0;
             }
             bit no-stp {
-                description" Disable 802.1D spanning tree on port.";
+                description "Disable 802.1D spanning tree on port.";
                 position 1;
             }
             bit no-recv {