From 68a86bffcc12e3045183562889daab5cdf801477 Mon Sep 17 00:00:00 2001
From: chamarty <ravi.chamarty@riftio.com>
Date: Tue, 17 Jan 2017 18:23:04 +0000
Subject: [PATCH] OSM-SO: Remove meta-data, volume-id, volume boot-parameters

Change-Id: I0b4a4fae261818b884ec8493ba7fd9d1f7cc4622
Signed-off-by: chamarty <ravi.chamarty@riftio.com>
---
 models/plugins/yang/mano-types.yang | 49 -----------------------------
 rwcal/plugins/yang/rwcal.yang       |  1 -
 2 files changed, 50 deletions(-)

diff --git a/models/plugins/yang/mano-types.yang b/models/plugins/yang/mano-types.yang
index fa6f39c9..9209dea9 100644
--- a/models/plugins/yang/mano-types.yang
+++ b/models/plugins/yang/mano-types.yang
@@ -40,12 +40,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 {
@@ -2066,35 +2060,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 +2103,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 +2125,5 @@ module mano-types
       }
     }
 
-    uses custom-meta-data;
   }
 }
diff --git a/rwcal/plugins/yang/rwcal.yang b/rwcal/plugins/yang/rwcal.yang
index 53187502..310c8f52 100644
--- a/rwcal/plugins/yang/rwcal.yang
+++ b/rwcal/plugins/yang/rwcal.yang
@@ -1268,7 +1268,6 @@ module rwcal
         rwpb:field-string-max 64;
         type string;
       }
-      uses manotypes:custom-meta-data;
     } 
   }
 
-- 
2.25.1