Fix ping pong desc generation error

[osm/SO.git] / models / plugins / yang / mano-types.yang

diff --git a/models/plugins/yang/mano-types.yang b/models/plugins/yang/mano-types.yang
index fa6f39c..89fbca0 100644 (file)
--- a/models/plugins/yang/mano-types.yang
+++ b/models/plugins/yang/mano-types.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.
@@ -31,6 +31,15 @@ module mano-types
     prefix "rwpb";
   }
 
+  import rw-project {
+    prefix "rw-project";
+  }
+
+  revision 2017-02-08 {
+    description
+      "Update model to support projects.";
+  }
+
   revision 2015-04-23 {
     description
       "Initial revision. This YANG file defines
@@ -40,12 +49,6 @@ module mano-types
       "Derived from earlier versions of base YANG files";
   }
 
-  typedef meta-data-type {
-    type enumeration {
-      enum STRING;
-      enum JSON;
-    }
-  }
   typedef package-type {
       description "Type of descriptor being on-boarded";
       type enumeration {
@@ -1197,9 +1200,11 @@ module mano-types
       }
 
       leaf http-endpoint-ref {
-        type leafref {
-          path "../../http-endpoint/path";
-        }
+        // TODO (Philip): Fix this
+        // type leafref {
+        //   path "../../http-endpoint/path";
+        // }
+        type string;
       }
 
       leaf json-query-method {
@@ -2066,35 +2071,10 @@ module mano-types
     }
   }
 
-  grouping custom-meta-data {
-    description "Grouping for instance-specific meta data";
-    list custom-meta-data {
-      description
-          "List of meta-data to be associated with the instance";
-      key "name";
-      leaf name {
-        description "Name of the meta-data parameter";
-        type string;
-      }
-
-      leaf data-type {
-        description "Data-type the meta-data parameter";
-        type manotypes:meta-data-type;
-        default "STRING";
-      }
-
-      leaf value {
-        description "Value of the meta-data parameter";
-        type string;
-      }
-    }
-  }
-
   grouping supplemental-boot-data {
     description "Grouping for custom vim data";
     container supplemental-boot-data {
       uses manotypes:config-file;
-      uses manotypes:custom-meta-data;
       leaf boot-data-drive {
         description "Some VIMs implement additional drives to host config-files or meta-data";
         type boolean;
@@ -2134,25 +2114,8 @@ module mano-types
         uses image-properties;
       }
 
-      case volume {
-        leaf volume-ref {
-          description "Reference for pre-existing volume in VIM";
-          type string;
-        }
-      }
     }
 
-    leaf boot-volume {
-      description "This flag indicates if this is boot volume or not";
-      type boolean;
-    }
-
-    leaf boot-priority {
-      description "Boot priority associated with volume";
-      type int32;
-    }
-
-
     leaf device_bus {
       description "Type of disk-bus on which this disk is exposed to guest";
       type enumeration {
@@ -2173,6 +2136,16 @@ module mano-types
       }
     }
 
-    uses custom-meta-data;
+  }
+
+  grouping rpc-project-name {
+    leaf project-name {
+      mandatory true;
+      description
+        "Project to which this belongs";
+      type leafref {
+        path "/rw-project:project/rw-project:name";
+      }
+    }
   }
 }