Merge "Test of conversing of yang + xml files to json 2."

[controller.git] / opendaylight / md-sal / model / model-flow-base / src / main / yang / port-types.yang

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
index af7c4dff531998dc150976f7c527e2258975e21f..8338d185cc36abbbbc34613fe1e3df84d805550a 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
@@ -2,9 +2,8 @@ module opendaylight-port-types {
     namespace "urn:opendaylight:flow:types:port";
     prefix port-types;
 
-    import yang-ext {prefix ext;}
-    import ietf-inet-types {prefix inet;}
-    import ietf-yang-types {prefix yang;}
+    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
+    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     
     revision "2013-09-25" {
         description "Initial revision of Port Inventory model";
@@ -21,10 +20,10 @@ module opendaylight-port-types {
     }
     
     typedef port-state {
-            type enumeration {
-                enum LINK-DOWN;
-                enum BLOCKED;
-                enum LIVE;
+        type enumeration {
+            enum link-down;
+            enum blocked;
+            enum live;
         }
     }
 
@@ -126,10 +125,22 @@ module opendaylight-port-types {
                 uses common-port;
                 
                 leaf mask {
-                    type uint32;
+                    type port-config;
                     description "Bitmap of OFPPC-* flags to be changed";
-                }       
-            }
+                }      
+                
+                leaf container-name {
+                    type string; 
+                }
+            
+                leaf port-name {
+                    type string; 
+                } 
+
+                leaf barrier {
+                    type boolean; 
+                } 
+            }            
         }    
     }
 }
\ No newline at end of file