Merge "Removed enumeration ALL from FlowWildCardsV10"

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

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 6b10162209e594d67fa7ebe7343efc3c7691f0ac..f8c9a4689314368dc512b059f654933d7fa2640d 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -5,7 +5,7 @@ module openflow-action {
     import openflow-types { prefix oft; }
 
     revision "2013-07-31" {
-        description "Initial model";
+        description "OpenFlow 1.3 - action model";
     }
 
     identity output {
@@ -76,19 +76,68 @@ module openflow-action {
         description "";
         base oft:action;
     }
-
+    
     container actions-container {
-        uses action-header;
-    }
-
-    grouping action-header {
-        container action {
-            leaf type {
-                type identityref {
-                    base oft:action;
+        uses actions;
+    }
+    
+    grouping actions {
+        list actions-list {
+            key "action";
+            container action {
+                leaf type {
+                    type identityref {
+                        base oft:action;
+                    }
                 }
             }
         }
     }
+    
+    // OF1.0 structures
+    identity set_vlan_vid {
+        description "";
+        base oft:action;
+    }
+    identity set_vlan_pcp {
+        description "";
+        base oft:action;
+    }
+    identity strip_vlan {
+        description "";
+        base oft:action;
+    }
+    identity set_dl_src {
+        description "";
+        base oft:action;
+    }
+    identity set_dl_dst {
+        description "";
+        base oft:action;
+    }
+    identity set_nw_src {
+        description "";
+        base oft:action;
+    }
+    identity set_nw_dst {
+        description "";
+        base oft:action;
+    }
+    identity set_nw_tos {
+        description "";
+        base oft:action;
+    }
+    identity set_tp_src {
+        description "";
+        base oft:action;
+    }
+    identity set_tp_dst {
+        description "";
+        base oft:action;
+    }
+    identity enqueue {
+        description "";
+        base oft:action;
+    }
 
 }
\ No newline at end of file