merge from v1.1

[osm/SO.git] / common / plugins / yang / rw-sdn.yang

diff --git a/common/plugins/yang/rw-sdn.yang b/common/plugins/yang/rw-sdn.yang
index 5b82d47..6475cc5 100644 (file)
--- a/common/plugins/yang/rw-sdn.yang
+++ b/common/plugins/yang/rw-sdn.yang
@@ -28,14 +28,6 @@ module rw-sdn
     prefix "rwpb";
   }
 
-  import rw-cli-ext {
-    prefix "rwcli";
-  }
-
-  import rw-yang-types {
-    prefix "rwt";
-  }
-
   import rwsdn {
     prefix "rwsdn";
   }
@@ -45,16 +37,17 @@ module rw-sdn
       "Initial revision.";
   }
 
-  list sdn-account {
-    rwpb:msg-new SDNAccountConfig;
+  container sdn {
+    list account {
+      rwpb:msg-new SDNAccountConfig;
+      key "name";
+      leaf name {
+       type string;
+      }
 
-    key "name";
-    leaf name {
-      type string;
+      uses rwsdn:sdn-provider-auth;
+      uses rwsdn:connection-status;
     }
-
-    uses rwsdn:sdn-provider-auth;
-    uses rwsdn:connection-status;
   }
 
   rpc update-sdn-status {