Yang model fixed

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

diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index 3ebb549b4aee081a3cf96cf8195486a9deca2ac8..bbd61a9e7cbc46235a0474267bdc68e661594d8b 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -5,7 +5,7 @@ module openflow-instruction {
     import openflow-types { prefix oft; }
 
     revision "2013-07-31" {
-       // description "Initial model";
+       // description "OpenFlow 1.3 - instruction model";
     }
 
     identity goto_table {
@@ -37,57 +37,17 @@ module openflow-instruction {
         base oft:instruction;
     }
 
-    // Structures
-
-    grouping goto-table {
-        description " Setup the next table in the lookup pipeline";
-        leaf table {
-            type oft:table-id; // 
-        }
-    }
-    grouping write-metadata {
-        description " Setup the metadata field for use later in     pipeline";
-        leaf metadata {
-            type oft:metadata;
-        }
-        leaf mask {
-            type oft:metadata;
-        }
-    }
-    grouping actions {
-        leaf type {
-            type enumeration {
-                enum write {
-                    description " Write the action(s) onto the datapath action set";            
-                }
-                enum apply {
-                    description " Applies the action(s) immediately";
-                }
-                enum clear {
-                    description " Clears all actions from the datapath action set";
-                }
-            }
-        }
-        list action {
-            // TBD
-        }
-    }
-    
-    grouping meter {
-        description " Apply meter (rate limiter)";
-        leaf meter-id {
-            type oft:meter-id;
-        }
-    }
-
-    container instruction {
+    container instruction-container {
         uses instructions;
     }
 
     grouping instructions {
-        leaf type {
-            type identityref {
-                base oft:instruction;
+        list instructions {
+            key "type";
+            leaf type {
+                type identityref {
+                    base oft:instruction;
+                }
             }
         }
     }