Patch 1:Added lbaasv2 to neutron top-level

Patch 2: Fixed flavio's comments by changing attrs =>attributes

Change-Id: Ie64a62df08da3f522db71aa657998bb1994447e4
Signed-off-by: Kiran Sreenivasa <kkoushik@brocade.com>

diff --git a/model/src/main/yang/neutron-lbaasv2.yang b/model/src/main/yang/neutron-lbaasv2.yang
index a0e97ca57d051ff3ab1fadcb5a9676d21cf07fa4..22a1571c5f0a3722908f68362b97b29c3793ce65 100644 (file)
--- a/model/src/main/yang/neutron-lbaasv2.yang
+++ b/model/src/main/yang/neutron-lbaasv2.yang
@@ -261,7 +261,7 @@ module neutron-lbaasv2 {
             description "List of pools associated with this healthmonitor.";
         }
     }
-    grouping lbaas-attrs {
+    grouping lbaas-attributes {
         container loadbalancer {
             description "Container for Loadbalancers.";
             list loadbalancers {

diff --git a/model/src/main/yang/neutron.yang b/model/src/main/yang/neutron.yang
index 0488dfcb363b7d8877b5a322d8156ad69c5e436a..19c1f267736aeb5a544baefbc5b6f588a5d8aac8 100644 (file)
--- a/model/src/main/yang/neutron.yang
+++ b/model/src/main/yang/neutron.yang
@@ -24,6 +24,7 @@ module neutron {
     import neutron-secgroups { prefix "secgroups"; }
     import neutron-L3 { prefix "l3"; }
     import neutron-metering { prefix "metering"; }
+    import neutron-lbaasv2 { prefix "lbaasv2"; }
 
     organization "OpenDaylight Neutron Group";
 
@@ -46,5 +47,6 @@ module neutron {
         uses secgroups:security-groups-attributes;
         uses secgroups:security-rules-attributes;
         uses subnets:subnets-attributes;
+        uses lbaasv2:lbaas-attributes;
     }
 }
\ No newline at end of file