merge from v1.1

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

diff --git a/common/plugins/yang/rw-cloud.yang b/common/plugins/yang/rw-cloud.yang
index f580e93..2c7ce6f 100644 (file)
--- a/common/plugins/yang/rw-cloud.yang
+++ b/common/plugins/yang/rw-cloud.yang
@@ -25,15 +25,7 @@ module rw-cloud
 
 
   import rw-pb-ext {
-    prefix "rwpb";
-  }
-
-  import rw-cli-ext {
-    prefix "rwcli";
-  }
-
-  import rw-yang-types {
-    prefix "rwt";
+    prefix "rw-pb-ext";
   }
 
   import rwcal {
@@ -50,9 +42,9 @@ module rw-cloud
   }
 
   container cloud {
-    rwpb:msg-new CloudConfig;
+    rw-pb-ext:msg-new CloudConfig;
     list account {
-      rwpb:msg-new CloudAccount;
+      rw-pb-ext:msg-new CloudAccount;
       description "Configure Cloud Accounts";
 
       max-elements 16;
@@ -68,7 +60,7 @@ module rw-cloud
       leaf sdn-account {
         description "Configured SDN account associated with this cloud account";
         type leafref {
-          path "/rw-sdn:sdn-account/rw-sdn:name";
+          path "/rw-sdn:sdn/rw-sdn:account/rw-sdn:name";
         }
       }