Merge "Added couple of codec classes for table feature property,group feature and...

[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 3791f565ef49ca4f9827705b4b5da90b110895ae..740496dd525719738f7d31ae9e68112de68f8412 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-types.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-types.yang
@@ -14,7 +14,7 @@ module openflow-types {
 
     typedef special-port-number {
         type enumeration {
-            enum in_port { 
+            enum in-port { 
                 //value "4294967288";
                 //description "Send the packet out the input port. This virtual port must be explicitly used in order to send back out of the input port."
             }
@@ -65,39 +65,39 @@ module openflow-types {
                 position 0;
                 //description "10 Mb half-duplex rate support.";
             }
-            bit 10mb_fd { 
+            bit 10mb-fd { 
                 position 1;
                 //description "10 Mb full-duplex rate support.";
             }
-            bit 100mb_hd { 
+            bit 100mb-hd { 
                 position 2;
                 //description "100 Mb half-duplex rate support.";
             }
-            bit 100mb_fd { 
+            bit 100mb-fd { 
                 position 3;
                 //description "100 Mb full-duplex rate support.";
             }
-            bit 1gb_hd { 
+            bit 1gb-hd { 
                 position 4;
                 //description "1 Gb half-duplex rate support.";
             }
-            bit 1gb_fd { 
+            bit 1gb-fd { 
                 position 5;
                 //description "1 Gb full-duplex rate support.";
             }
-            bit 10gb_fd { 
+            bit 10gb-fd { 
                 position 6;
                 //description "10 Gb full-duplex rate support.";
             }
-            bit 40gb_fd { 
+            bit 40gb-fd { 
                 position 7;
                 //description "40 Gb full-duplex rate support.";
             }
-            bit 100gb_fd { 
+            bit 100gb-fd { 
                 position 8;
                 //description "100 Gb full-duplex rate support.";
             }
-            bit 1tb_fd { 
+            bit 1tb-fd { 
                 position 9;
                 //description "1 Tb full-duplex rate support.";
             }
@@ -121,39 +121,39 @@ module openflow-types {
                 position 14;
                 //description "Pause.";
             }
-            bit pause_asym { 
+            bit pause-asym { 
                 position 15;
                 //description "Asymmetric pause.";
             }
         }
     }
 
-    typedef port_config {
+    typedef port-config {
         description 
            "Flags to indicate behavior of the physical port. These flags are
             describe the current configuration and used port_mod message 
             to configure the port's behavior.";
         type bits {
-            bit port_down { 
+            bit port-down { 
                 //description " Port is administratively down.";
                 position 0;
             }
-            bit no_recv { 
+            bit no-recv { 
                 //description " Drop all packets received by port.";
                 position 2;
             }
-            bit no_fwd { 
+            bit no-fwd { 
                 //description " Drop packets forwarded to port.";
                 position 5;
             }
-            bit no_packet_in { 
+            bit no-packet-in { 
                 //description "Do not send packet-in msgs for port.";
                 position 6;
             }
         }
     }
 
-    typedef ofp_port_state {
+    typedef port-state {
         description 
             "Current state of the physical port. These are not configurable from
             the controller.";
@@ -204,6 +204,21 @@ module openflow-types {
     typedef metadata {
         type binary;
     }
-
-
+    
+    typedef table-id {
+        type uint32;
+    }
+    typedef meter-id {
+        type uint32;
+    }
+    typedef queue-id {
+        type uint32;
+    }
+    typedef group-id {
+        type uint32;
+    }
+    
+    typedef ether-type {
+        type uint16;
+    }
 }
\ No newline at end of file