From 8d5dd448588cca26cbb76ef9b4877ef1469471c6 Mon Sep 17 00:00:00 2001
From: "Brandon, Bruce (bb2697)" <bb2697@att.com>
Date: Fri, 4 Jan 2019 15:27:33 +0000
Subject: [PATCH] GR-API additions

Add neutron-network-id to GR-API Yang and mapping from network-id

Change-Id: I10137f0d31d76ad973f04efbc6cf07cfd051ce1a
Issue-ID: SDNC-557
Signed-off-by: Brandon, Bruce (bb2697) <bb2697@att.com>
---
 .../model/src/main/yang/GENERIC-RESOURCE-API.yang  | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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 2d7fe246..e1958aac 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
@@ -399,6 +399,10 @@ module GENERIC-RESOURCE-API {
                   type string;
                   mandatory true;
                }
+               leaf neutron-network-id {
+                  description "Neutron-network-id assigned by PO/RO";
+                  type string;
+               }
                uses vpn-bindings;
                leaf vlan-tag-id {
                   type uint32;
@@ -1292,6 +1296,20 @@ module GENERIC-RESOURCE-API {
             description "network-collection-customization-uuid stored in Network IsntanceGroup.customization-uuid in A&AI";
             type string;
          }
+         container networks {
+            list network {
+               key "network-id";
+               leaf network-id {
+                  description "Index into network-topology-identifier structure";
+                  type string;
+                  mandatory true;
+               }
+               leaf neutron-network-id {
+                  description "Neutron-network-id assigned by PO/RO";
+                  type string;
+               }
+            }
+         }
          container vnf-floating-ip {
             uses ip-addresses;
          }
@@ -1332,6 +1350,10 @@ module GENERIC-RESOURCE-API {
             type string;
             mandatory true;
          }
+         leaf neutron-network-id {
+            description "Neutron network id assigned by PO/RP";
+            type string;
+         }
          leaf network-name {
             description "Subinterface network name";
             type uint32;
-- 
2.16.6