Merge from OSM SO master

[osm/SO.git] / models / plugins / yang / rw-nsd.yang

diff --git a/models/plugins/yang/rw-nsd.yang b/models/plugins/yang/rw-nsd.yang
index 4475928..d59168d 100644 (file)
--- a/models/plugins/yang/rw-nsd.yang
+++ b/models/plugins/yang/rw-nsd.yang
@@ -1,7 +1,7 @@
 
 /*
  * 
- *   Copyright 2016 RIFT.IO Inc
+ *   Copyright 2016-2017 RIFT.IO Inc
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -23,16 +23,17 @@ module rw-nsd
   namespace "http://riftio.com/ns/riftware-1.0/rw-nsd";
   prefix "rw-nsd";
 
-  import nsd {
-    prefix "nsd";
+  import rw-nsd-base {
+    prefix "rw-nsd-base";
   }
 
-  import ietf-yang-types {
-    prefix "yang";
+  import nsd {
+    prefix "nsd";
   }
 
-  import mano-types {
-    prefix "manotypes";
+  revision 2017-02-28 {
+    description
+      "Update model to support projects.";
   }
 
   revision 2015-09-10 {
@@ -44,13 +45,7 @@ module rw-nsd
   }
 
   augment /nsd:nsd-catalog/nsd:nsd {
-    uses manotypes:control-param;
-    uses manotypes:action-param;
-    leaf meta {
-      description
-        "Any meta-data needed by the UI";
-      type string;
-    }
+    uses rw-nsd-base:rw-nsd-ext;
   }
 }