TAPI 2.0.2 release candidate

- based on https://github.com/OpenNetworkingFoundation/TAPI/pull/306

Change-Id: Ib668ff5dfdac78d06557c4d932f1fe614cdde344
diff --git a/models/tapi/src/main/yang/tapi-virtual-network@2018-03-07.yang b/models/tapi/src/main/yang/tapi-virtual-network@2018-03-07.yang
index 3157955..162df49 100644
--- a/models/tapi/src/main/yang/tapi-virtual-network@2018-03-07.yang
+++ b/models/tapi/src/main/yang/tapi-virtual-network@2018-03-07.yang
@@ -8,10 +8,10 @@
         prefix tapi-common;

     }

     organization "ONF OTCC (Open Transport Configuration & Control) Project";

-    contact "

-        Project Web: <https://wiki.opennetworking.org/display/OTCC/TAPI>

-        Project List: <mailto:transport-api@opennetworking.org>

-        Editor: Karthik Sethuraman

+    contact "
+        Project Web: <https://wiki.opennetworking.org/display/OTCC/TAPI>
+        Project List: <mailto:transport-api@opennetworking.org>
+        Editor: Karthik Sethuraman
                 <mailto:karthik.sethuraman@necam.com>";

     description "

         This module contains TAPI Virtual Network Model definitions.

@@ -19,37 +19,47 @@
         Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

         License: This module is distributed under the Apache License 2.0";

     revision 2018-03-07 {

-        description "ONF Transport API version 2.0.1

-        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool version .

-        <https://wiki.opennetworking.org/display/OIMT/IISOMI>

+        description "ONF Transport API version 2.0.2
+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool version .
+        <https://wiki.opennetworking.org/display/OIMT/IISOMI>
         Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/change-log.md>";

-        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model
                   <https://github.com/OpenNetworkingFoundation/TAPI/tree/develop/UML>";

     }

     augment "/tapi-common:context" {

         uses virtual-network-context;

         description "Augments the base TAPI Context with VirtualNetworkService information";

     }

+    /*************************

+     * definitions of refrences

+     *************************/

+     grouping virtual-nw-service-ref {

+         leaf virtual-nw-service-id {

+             type leafref {

+                 path '/tapi-common:context/tapi-virtual-network:virtual-nw-service/tapi-virtual-network:uuid';

+             }

+             description "none";

+         }

+         description "none";

+     }

+     

     /***********************

     * package object-classes

-    **********************/

+    **********************/ 

         grouping virtual-network-constraint {

             container src-service-end-point {

                 uses tapi-common:service-interface-point-ref;

                 config false;

                 description "none";

             }

-            leaf sink-service-end-point {

-                type leafref {

-                    path '/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid';

-                }

+            container sink-service-end-point {

+            	uses tapi-common:service-interface-point-ref;

                 config false;

                 description "none";

             }

-            leaf-list diversity-exclusion {

-                type leafref {

-                    path '/tapi-common:context/tapi-virtual-network:virtual-nw-service/tapi-virtual-network:vnw-constraint/tapi-virtual-network:local-id';

-                }

+            list diversity-exclusion {

+                uses virtual-nw-service-ref;

+                key 'virtual-nw-service-id';

                 config false;

                 description "none";

             }

@@ -114,10 +124,8 @@
                 At the lowest level of recursion, a FC represents a cross-connection within an NE.";

         }

         grouping virtual-network-service-end-point {

-            leaf service-interface-point {

-                type leafref {

-                    path '/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid';

-                }

+            container service-interface-point {

+            	uses tapi-common:service-interface-point-ref;

                 config false;

                 description "none";

             }