X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Fplugins%2Fyang%2Frw-launchpad.yang;h=7787fa204c83611d4d6546c33eb705349b67e34f;hb=refs%2Fchanges%2F71%2F1271%2F2;hp=0adaee9d21441c9b2aab5babebe2abbdcc957777;hpb=6364d016e7f819903ff29a2ce160cb4cea61bf8f;p=osm%2FSO.git

diff --git a/rwlaunchpad/plugins/yang/rw-launchpad.yang b/rwlaunchpad/plugins/yang/rw-launchpad.yang
index 0adaee9d..7787fa20 100644
--- a/rwlaunchpad/plugins/yang/rw-launchpad.yang
+++ b/rwlaunchpad/plugins/yang/rw-launchpad.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.
@@ -57,16 +57,16 @@ module rw-launchpad
     prefix "rwcal";
   }
 
-  import rw-vnfd {
-    prefix "rw-vnfd";
+  import rw-project-vnfd {
+    prefix "rw-project-vnfd";
   }
 
   import vld {
     prefix "vld";
   }
 
-  import rw-nsd {
-    prefix "rw-nsd";
+  import rw-project-nsd {
+    prefix "rw-project-nsd";
   }
 
   import rw-cloud {
@@ -102,42 +102,57 @@ module rw-launchpad
     prefix "manotypes";
   }
 
+  import rw-project {
+    prefix "rw-project";
+  }
+
+  import rw-project-mano {
+    prefix "rw-project-mano";
+  }
+
+  revision 2017-02-08 {
+    description
+      "Update model to support projects.";
+  }
+
   revision 2015-09-14 {
     description
       "Initial revision.";
   }
 
-  container datacenters {
-    description "OpenMano data centers";
+  augment "/rw-project:project" {
+    container datacenters {
+      description "OpenMano data centers";
 
-    rwpb:msg-new DataCenters;
-    config false;
+      rwpb:msg-new DataCenters;
+      config false;
 
-    list ro-accounts {
-      description
+      list ro-accounts {
+        description
           "A list of OpenMano cloud accounts that have data centers associated
           with them";
 
-      rwpb:msg-new ROAccount;
-      key "name";
+        rwpb:msg-new ROAccount;
+        key "name";
 
-      leaf name {
-        description "The name of the cloud account";
-        type leafref {
-          path "/rw-launchpad:resource-orchestrator/rw-launchpad:name";
+        leaf name {
+          description "The name of the cloud account";
+          type leafref {
+            path "../../../rw-launchpad:resource-orchestrator/rw-launchpad:name";
+          }
         }
-      }
 
-      list datacenters {
-        rwpb:msg-new DataCenter;
-        leaf uuid {
-          description "The UUID of the data center";
-          type yang:uuid;
-        }
+        list datacenters {
+          rwpb:msg-new DataCenter;
+          leaf uuid {
+            description "The UUID of the data center";
+            type yang:uuid;
+          }
 
-        leaf name {
-          description "The name of the data center";
-          type string;
+          leaf name {
+            description "The name of the data center";
+            type string;
+          }
         }
       }
     }
@@ -151,66 +166,70 @@ module rw-launchpad
     }
   }
 
-  container resource-orchestrator {
-    rwpb:msg-new ResourceOrchestrator;
+  augment "/rw-project:project" {
+    container resource-orchestrator {
+      rwpb:msg-new ResourceOrchestrator;
 
-    leaf name {
-       type string;
-    }
-
-    leaf account-type {
-      type resource-orchestrator-account-type;
-    }
+      leaf name {
+        type string;
+      }
 
-    choice resource-orchestrator {
-      description
-        "The resource orchestrator to use by the Launchpad";
-      default rift-ro;
+      leaf account-type {
+        type resource-orchestrator-account-type;
+      }
 
-      case rift-ro {
+      choice resource-orchestrator {
         description
-          "Use the RIFT.io resource orchestrator";
+          "The resource orchestrator to use by the Launchpad";
+        default rift-ro;
+
+        case rift-ro {
+          description
+            "Use the RIFT.io resource orchestrator";
 
-        container rift-ro {
-          leaf rift-ro {
-            type empty;
+          container rift-ro {
+            leaf rift-ro {
+              type empty;
+            }
           }
         }
-      }
 
-      case openmano {
-        description
-          "Use OpenMano as RO";
+        case openmano {
+          description
+            "Use OpenMano as RO";
 
-        container openmano {
-          leaf host {
-            type string;
-            default "localhost";
-          }
+          container openmano {
+            leaf host {
+              type string;
+              default "localhost";
+            }
 
-          leaf port {
-            type uint16;
-            default 9090;
-          }
+            leaf port {
+              type uint16;
+              default 9090;
+            }
 
-          leaf tenant-id {
-            type string {
-              length "36";
+            leaf tenant-id {
+              type string {
+                length "36";
+              }
+              mandatory true;
             }
-            mandatory true;
           }
         }
       }
     }
   }
 
-  container launchpad-config {
-    leaf public-ip {
-      description
+  augment "/rw-project:project" {
+    container launchpad-config {
+      leaf public-ip {
+        description
           "An IP address that can, at least, be reached by the host that the
           launchpad is running on. This is not a mandatory but is required for
           alarms to function correctly.";
-      type string;
+        type string;
+      }
     }
   }
 }