From 08635c52d6ab5c8238da72aa65f52e2759770292 Mon Sep 17 00:00:00 2001
From: Ryan Moats <rmoats@us.ibm.com>
Date: Tue, 21 Jul 2015 12:58:15 -0500
Subject: [PATCH] Update yang to catch lost pieces in part VI

These are needed to allow part VII to merge

Change-Id: If7ce638c9be7a38f3afb7d00eb546e4a3551c1b2
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
---
 model/src/main/yang/neutron-L3-ext.yang       |  8 ++++----
 model/src/main/yang/neutron-binding.yang      |  8 ++++----
 model/src/main/yang/neutron-provider-ext.yang | 10 +++++-----
 model/src/main/yang/neutron-provider.yang     |  5 +++++
 model/src/main/yang/neutron.yang              |  2 ++
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/model/src/main/yang/neutron-L3-ext.yang b/model/src/main/yang/neutron-L3-ext.yang
index b726ea88e..9220ad853 100644
--- a/model/src/main/yang/neutron-L3-ext.yang
+++ b/model/src/main/yang/neutron-L3-ext.yang
@@ -14,6 +14,7 @@ module neutron-L3-ext {
     prefix neutron-L3-ext;
 
     import neutron { prefix "neutron"; }
+    import yang-ext { prefix "ext"; }
 
     organization "OpenDaylight Neutron Group";
 
@@ -29,10 +30,9 @@ module neutron-L3-ext {
     }
 
     augment "/neutron:neutron/neutron:networks/neutron:network"{
-        description "
-          This module augments the networks container in the neutron-networks
-          module with router information.
-          ";
+        description "This module augments the networks container
+                in the neutron-networks module with router information.";
+        ext:augment-identifier "network-l3-extension";
         leaf external {
             description "If true, it indicates that the router is externally accessible.";
             type boolean;
diff --git a/model/src/main/yang/neutron-binding.yang b/model/src/main/yang/neutron-binding.yang
index 008294579..dc311c1e9 100644
--- a/model/src/main/yang/neutron-binding.yang
+++ b/model/src/main/yang/neutron-binding.yang
@@ -14,6 +14,7 @@ module neutron-binding {
     prefix neutron-binding;
 
     import ietf-yang-types { prefix "yang"; }
+    import yang-ext { prefix "ext"; }
     import neutron { prefix "neutron"; }
 
 
@@ -60,10 +61,9 @@ module neutron-binding {
     }
 
     augment "/neutron:neutron/neutron:ports/neutron:port"{
-        description "
-          This module augments the ports container in the neutron-ports
-          module with binding information.
-          ";
+        description "This module augments the ports container in
+                the neutron-ports module with binding information.";
+        ext:augment-identifier "port-binding-extension";
         uses binding-attributes;
     }
 }
diff --git a/model/src/main/yang/neutron-provider-ext.yang b/model/src/main/yang/neutron-provider-ext.yang
index 554c94692..5d113e800 100644
--- a/model/src/main/yang/neutron-provider-ext.yang
+++ b/model/src/main/yang/neutron-provider-ext.yang
@@ -15,6 +15,7 @@ module neutron-provider-ext {
 
     import neutron { prefix "neutron"; }
     import neutron-provider { prefix "provider"; }
+    import yang-ext { prefix "ext"; }
 
     organization "OpenDaylight Neutron Group";
 
@@ -30,13 +31,12 @@ module neutron-provider-ext {
     }
 
     augment "/neutron:neutron/neutron:networks/neutron:network"{
-        description "
-          This module augments the networks container in the neutron-networks
-          module with provider information.
-          ";
+        description "This module augments the networks container
+                in the neutron-networks module with provider information.";
+        ext:augment-identifier "network-provider-extension";
         list segments {
             description "List of provider network(s) associated with this network.";
-            key segmentation-id;
+            key segmentation-index;
             uses provider:provider-attributes;
         }
         uses provider:provider-attributes;
diff --git a/model/src/main/yang/neutron-provider.yang b/model/src/main/yang/neutron-provider.yang
index 316eef94b..cbd0d7a2d 100644
--- a/model/src/main/yang/neutron-provider.yang
+++ b/model/src/main/yang/neutron-provider.yang
@@ -49,5 +49,10 @@ module neutron-provider {
                         is vlan, this ID is a vlan identifier. If network-type is gre,
                         this ID is a gre key.";
         }
+        leaf segmentation-index {
+            type uint32;
+            description "A hidden counter to act as a key, because
+                        segmentation id is not required.";
+        }
     }
 }
diff --git a/model/src/main/yang/neutron.yang b/model/src/main/yang/neutron.yang
index cb23ebf67..6861cea9e 100644
--- a/model/src/main/yang/neutron.yang
+++ b/model/src/main/yang/neutron.yang
@@ -21,6 +21,7 @@ module neutron {
     import neutron-L3 { prefix "l3"; }
     import neutron-metering { prefix "metering"; }
     import neutron-lbaasv2 { prefix "lbaasv2"; }
+    import neutron-provider { prefix "provider"; }
 
     organization "OpenDaylight Neutron Group";
 
@@ -44,5 +45,6 @@ module neutron {
         uses secgroups:security-rules-attributes;
         uses subnets:subnets-attributes;
         uses lbaasv2:lbaas-attributes;
+        uses provider:provider-attributes;
     }
 }
-- 
2.36.6