Merge branch 'v2.0'

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

diff --git a/models/plugins/yang/rw-nsr.yang b/models/plugins/yang/rw-nsr.yang
index ae2c92a..472332e 100644 (file)
--- a/models/plugins/yang/rw-nsr.yang
+++ b/models/plugins/yang/rw-nsr.yang
@@ -1,6 +1,6 @@
 
 /*
- * 
+ *
  *   Copyright 2016 RIFT.IO Inc
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -64,8 +64,8 @@ module rw-nsr
       key "id";
       description
         "Recent operational events for this network service.
-        Though the model does not impose any restrictions on the numbe of events, 
-        the max operational events will be limited to the most recent 10"; 
+        Though the model does not impose any restrictions on the numbe of events,
+        the max operational events will be limited to the most recent 10";
 
       leaf id {
         description "The id of the instance";
@@ -95,28 +95,6 @@ module rw-nsr
     }
   }
 
-  grouping nsd-ref-count {
-    list nsd-ref-count {
-      key "nsd-id-ref";
-      description "This table maintains the number of NSRs used by each NSD";
-
-      leaf nsd-id-ref {
-        description "Reference to NSD";
-        type leafref {
-          path "/nsd:nsd-catalog/nsd:nsd/nsd:id";
-        }
-      }
-      leaf instance-ref-count {
-        description
-          "Reference count for the number of NSRs refering this NSD.
-           Every NS record instantiated using this descriptor takes
-           a reference on the NSD and releases the reference when the
-           network service is terminated. This desciptor cannot be
-           deleted when this counter is non zero";
-        type uint64;
-      }
-    }
-  }
 
   grouping rw-ns-instance-config {
     leaf cloud-account {
@@ -137,9 +115,9 @@ module rw-nsr
          by multiple cloud accounts when that becomes available.";
       type string;
     }
-      
+
     list vnf-cloud-account-map {
-      description 
+      description
           "Mapping VNF to Cloud Account where VNF will be instantiated";
 
       key "member-vnf-index-ref";
@@ -178,13 +156,13 @@ module rw-nsr
     }
 
     list vl-cloud-account-map {
-      description 
+      description
           "Mapping VL to Cloud Account where VL will be instantiated";
 
       key "vld-id-ref";
 
       leaf vld-id-ref {
-        description 
+        description
             "A reference to a vld.
             leafref path ../../nsd/vld/id";
         type string;
@@ -218,7 +196,7 @@ module rw-nsr
 
   augment /nsr:start-network-service/nsr:input{
     uses rw-ns-instance-config;
-  } 
+  }
 
   augment /nsr:ns-instance-opdata/nsr:nsr {
     uses manotypes:action-param;
@@ -229,7 +207,7 @@ module rw-nsr
         "The SDN account associted with the cloud account using which an
          NS was instantiated.";
       type leafref {
-        path "/rw-sdn:sdn-account/rw-sdn:name";
+        path "/rw-sdn:sdn/rw-sdn:account/rw-sdn:name";
       }
     }
 
@@ -381,9 +359,6 @@ module rw-nsr
     uses operational-events;
   }
 
-  augment /nsr:ns-instance-opdata {
-    uses nsd-ref-count;
-  }
 
   augment /nsr:ns-instance-opdata/nsr:nsr/nsr:vlr {
     leaf assigned-subnet {
@@ -438,7 +413,7 @@ module rw-nsr
 
   notification nsm-notification {
     description "Notification for NSM Events.
-        The timestamp of this event is automatically expressed 
+        The timestamp of this event is automatically expressed
         in human readble format - 1970-01-01T00:00:00Z";
 
     leaf event {