X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fsrc%2Fmain%2Fyang%2Fopenflow-action.yang;h=bb43ed402485cf40d59a8ff7ba16441004186d68;hb=c4d0bf06488e8ae51519e4ebc7ad5c75c7c4ae50;hp=a5dfcbfdd084949a92f802bf491c3c7154b4fc33;hpb=6be98a78909fc981038293e508a9fc5831a52cbc;p=openflowjava.git

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index a5dfcbfd..bb43ed40 100644
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -8,17 +8,16 @@ module openflow-action {
         description "Initial model";
     }
 
-    /*
     identity output {
         description " Output to switch port. ";
         base oft:action;
     }
     identity copy_ttl_out {
-        description " Copy TTL "outwards" -- from next-to-outermost to outermost ";
+        description " Copy TTL \"outwards\" -- from next-to-outermost to outermost ";
         base oft:action;
     }
     identity copy_ttl_in {
-        description " Copy TTL "inwards" -- from outermost to next-to-outermost ";
+        description " Copy TTL \"inwards\" -- from outermost to next-to-outermost ";
         base oft:action;
     }
     identity set_mpls_ttl {
@@ -77,7 +76,7 @@ module openflow-action {
         description "";
         base oft:action;
     }
-    */
+    
     grouping output {
         description 
             "Action structure for OFPAT_OUTPUT, which sends packets out 'port'.
@@ -133,20 +132,26 @@ module openflow-action {
     }
 
     grouping push-pbb {
-
+        leaf ethertype {
+            type oft:ether-type;
+        }
     }
 
     grouping push-mpls {
-
+        leaf ethertype {
+            type oft:ether-type;
+        }
     }
 
     grouping push-vlan {
-
+        leaf ethertype {
+            type oft:ether-type;
+        }
     }
 
     grouping pop-mpls {
         leaf ethertype {
-            type uint16; // TODO: define ethertype type
+            type oft:ether-type;
         }
     }
 
@@ -159,46 +164,15 @@ module openflow-action {
     
     grouping action-header {
         leaf type {
-            type action-type;
-        }
-    }
-    
-    typedef action-type {
-        /* ofp_action_type */
-        type enumeration {
-            enum OUTPUT {
-                description "Output to switch port.";
-            }
-            enum SET_VLAN_VID {
-                description "Set the 802.1q VLAN id.";
-            }
-            enum SET_VLAN_PCP {
-                description "Set the 802.1q priority.";
-            }
-            enum STRIP_VLAN {
-                description "Strip the 802.1q header.";
-            }
-            enum SET_DL_SRC {
-                description "Ethernet source address.";
-            }
-            enum SET_DL_DST {
-                description "Ethernet destination address.";
+            type identityref {
+                base oft:action;
             }
-            enum SET_NW_SRC {
-                description "IP source address.";
-            }
-            enum SET_NW_DST {
-                description "IP destination address.";
-            }
-            enum SET_TP_SRC {
-                description "TCP/UDP source port.";
-            }
-            enum SET_TP_DST {
-                description "TCP/UDP destination port.";
-            }
-            enum OFPAT_VENDOR {
-                value 65535; // 0xffff
+        }
+        choice action-type {
+            case output {
+                uses output;
             }
         }
     }
+    
 }
\ No newline at end of file