update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try

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

diff --git a/models/plugins/yang/rw-vlr.yang b/models/plugins/yang/rw-vlr.yang
index 755bb81..65679b2 100644 (file)
--- a/models/plugins/yang/rw-vlr.yang
+++ b/models/plugins/yang/rw-vlr.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.
@@ -27,10 +27,18 @@ module rw-vlr
     prefix "manotypes";
   }
 
+  import ietf-inet-types {
+    prefix "inet";
+  }
+
   import vlr {
     prefix "vlr";
   }
 
+  import vnfd-base {
+    prefix "vnfd-base";
+  }
+
   import rw-cloud {
     prefix "rw-cloud";
   }
@@ -39,6 +47,15 @@ module rw-vlr
     prefix "yang";
   }
 
+  import rw-project {
+    prefix "rw-project";
+  }
+
+  revision 2017-02-08 {
+    description
+      "Update model to support projects.";
+  }
+
   revision 2015-09-30 {
     description
       "Initial revision. This YANG file augments
@@ -47,21 +64,12 @@ module rw-vlr
       "Derived from earlier versions of base YANG files";
   }
 
-  augment /vlr:vlr-catalog/vlr:vlr {
-    leaf cloud-account {
-      description
-        "The cloud account to use when requesting resources for
-         this vlr";
-      type leafref {
-        path "/rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
-      }
-    }
-    leaf om-datacenter {
+  augment /rw-project:project/vlr:vlr-catalog/vlr:vlr {
+
+    leaf datacenter {
       description
-          "Openmano datacenter name to use when instantiating
-          the network service.  This is only used when openmano
-          is selected as the cloud account.  This should be superceded
-          by multiple cloud accounts when that becomes available.";
+          "Datacenter name to use when instantiating
+          the network service.";
       type string;
     }
 
@@ -81,6 +89,29 @@ module rw-vlr
         "The error message in case of a failed VLR operational status";
       type string;
     }
+
+    list virtual-connection-points {
+      key name;
+      uses vnfd-base:common-connection-point;
+
+      leaf-list associated-cps {
+        type string;
+      }
+
+      leaf connection-point-id {
+        description "VIM identifier for connection point";
+        type string;
+      }
+      
+      leaf ip-address {
+        description "IP Address of virtual connection point";
+        type inet:ip-address;
+      }
+      leaf mac-address {
+        description "MAC Address of the virtual connection point";
+        type string;
+      }
+    }
   }
 }