X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=openflowjava.git;a=blobdiff_plain;f=openflow-protocol-api%2Fsrc%2Fmain%2Fyang%2Fopenflow-protocol.yang;fp=openflow-protocol-api%2Fsrc%2Fmain%2Fyang%2Fopenflow-protocol.yang;h=32070d14cf900c973825c3fe47985df02d7e7e3a;hp=300dd7fef9ecd4cce5fd905cb566f9a27fa00cc7;hb=05bc9fb5cb06c747be728f8d695d2723db911514;hpb=cd45764e40ef43a4a43979b3e8f04e8b0865739f

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 300dd7fe..32070d14 100644
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -213,14 +213,11 @@
                 uses ofHeader;
                 
                 leaf experimenter {
-                    type uint32;
+                    type oft:experimenter-id;
                 }
                 leaf exp_type {
                     type uint32;
                 }
-                leaf data {
-                    type binary;
-                }
             }
         /* Switch configuration messages. */
             grouping features-request {
@@ -682,15 +679,7 @@
                     }
                     case multipart-request-experimenter-case {
                         container multipart-request-experimenter {
-                            leaf experimenter {
-                                type uint32;
-                            }
-                            leaf exp-type {
-                                type uint32;
-                            }
-                            leaf data {
-                                type binary;
-                            }
+                            // empty body - used for experimenter augmentation
                         }
                     }
                 }
@@ -1057,15 +1046,7 @@
                     }
                     case multipart-reply-experimenter-case {
                         container multipart-reply-experimenter {
-                            leaf experimenter {
-                                type uint32;
-                            }
-                            leaf exp-type {
-                                type uint32;
-                            }
-                            leaf data {
-                                type binary;
-                            }
+                            // empty body - used for experimenter augmentation
                         }
                     }
                 }
@@ -1212,6 +1193,9 @@
                 }
             }
             
+            container meter-band-container {
+                uses meter-band-header;
+            }
             grouping meter-band-header {
                 choice meter-band {
                     case meter-band-drop-case {
@@ -1230,12 +1214,6 @@
                     case meter-band-experimenter-case {
                         container meter-band-experimenter {
                             uses meter-band-commons;
-                            leaf experimenter {
-                                type uint32;
-                            }
-                            leaf data {
-                            	type binary;
-                            }
                         }
                     }
                 }