Merge dev/fluorine work across to master

[unimgr.git] / nrp-api / src / main / yang / nrp-interface.yang

diff --git a/nrp-api/src/main/yang/nrp-interface.yang b/nrp-api/src/main/yang/nrp-interface.yang
index ae3cf31e0921a2fb71f201f06802e67399a17810..6c4e86d9040f9c2f8aa010cdd9fdfcf230a8a42b 100644 (file)
--- a/nrp-api/src/main/yang/nrp-interface.yang
+++ b/nrp-api/src/main/yang/nrp-interface.yang
@@ -16,9 +16,9 @@ module nrp-interface {
         MEF NRM Classes
         MEF-Types Enumerations
         MEF-Common Classes";
-    revision 2017-12-21 {
-        description "MEF NRP 1.0.beta";
-        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
+    revision 2018-03-21 {
+        description "MEF NRP R2";
+        reference "MEF 60, ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
     }
     augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input" {
         uses nrp-connectivity-service-attrs;
@@ -48,35 +48,60 @@ module nrp-interface {
         uses nrp-sip-attrs;
         description "none";
     }
-    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+
+    augment "/tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip" {
         uses nrp-sip-attrs;
         description "none";
     }
-    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+
+    augment "/tapi-common:get-service-interface-point-list/tapi-common:output/tapi-common:sip" {
         uses nrp-sip-attrs;
         description "none";
     }
+
+    /*
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+        uses nrp-sip-attrs;
+        description "none";
+    }*/
     augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service" {
         uses nrp-connectivity-service-attrs;
         description "none";
     }
+
+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input" {
+        uses nrp-connectivity-service-attrs;
+        description "none";
+    }
     augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
-        uses nrp-sip-attrs;
+        uses nrp-connectivity-service-end-point-attrs;
         description "none";
     }
     augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
-        uses nrp-sip-attrs;
+        uses nrp-connectivity-service-end-point-attrs;
         description "none";
     }
-    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input" {
+    augment "/tapi-connectivity:delete-connectivity-service/tapi-connectivity:output/tapi-connectivity:service" {
         uses nrp-connectivity-service-attrs;
         description "none";
     }
-    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+    augment "/tapi-connectivity:delete-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
         uses nrp-connectivity-service-end-point-attrs;
         description "none";
     }
-    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+    augment "/tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service" {
+        uses nrp-connectivity-service-attrs;
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        uses nrp-connectivity-service-end-point-attrs;
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service" {
+        uses nrp-connectivity-service-attrs;
+        description "none";
+    }
+    augment "/tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
         uses nrp-connectivity-service-end-point-attrs;
         description "none";
     }