From: Dan Timoney <dtimoney@att.com>
Date: Wed, 1 Nov 2017 23:09:40 +0000 (-0400)
Subject: New tunnelxconn assignment
X-Git-Tag: v1.2.1~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=commitdiff_plain;h=a56bab303f781e0c1696f0335eefc7941363d766

New tunnelxconn assignment

Add new assignment (vg-ip) to tunnelxconn assignments container

Change-Id: Ib9439ceb440b508007104b0a8452a9ae64255354
Issue-ID: SDNC-160
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
index 31582d8d..6f776287 100644
--- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
+++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
@@ -821,18 +821,24 @@ module GENERIC-RESOURCE-API {
        }
    }
    grouping tunnelxconn-assignments {
-       leaf vni {
-           description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool";
-           type string;
-       }
-       leaf vgmux-bearer-ip {
-           description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module";
-           type inet:ip-address;
-       }
-       leaf vgmux-lan-ip {
-           description "The Network Controller will look up the vgmux lan ip from the vgmux vg module";
-           type inet:ip-address;
-       }
+	   container tunnelxconn-assignments {
+	       leaf vni {
+	           description "The Network Controller will assign a VNI value from the associated vGMUX VNI pool";
+	           type string;
+	       }
+	       leaf vgmux-bearer-ip {
+	           description "The Network Controller will look up the vgmux bearer ip from the vgmux vf module";
+	           type inet:ip-address;
+	       }
+	       leaf vgmux-lan-ip {
+	           description "The Network Controller will look up the vgmux lan ip from the vgmux vg module";
+	           type inet:ip-address;
+	       }
+	       leaf vg-ip {
+	           description "The Network Controller will assign the VG IP address from local inventory";
+	           type inet:ip-address;
+	       }
+	   }
    }
    grouping brg-operation-information {
        uses sdnc-request-header;
@@ -863,9 +869,11 @@ module GENERIC-RESOURCE-API {
        }
    }
    grouping brg-assignments {
-       leaf vbrg-wan-ip {
-           type inet:ip-address;
-       }
+	   container brg-assignments {
+	       leaf vbrg-wan-ip {
+	           type inet:ip-address;
+	       }
+	   }
    }
    grouping allotted-resource-information {
       container allotted-resource-information {