make neutron.yang consistent

[neutron.git] / model / src / main / yang / neutron.yang

diff --git a/model/src/main/yang/neutron.yang b/model/src/main/yang/neutron.yang
index a093109070b460626aa21aea5f0cc5e0196589c6..a6294cd85d9a9adbd1a0ad25cc015b1cb1124032 100644 (file)
--- a/model/src/main/yang/neutron.yang
+++ b/model/src/main/yang/neutron.yang
@@ -12,11 +12,9 @@ module neutron {
 
     namespace "urn:opendaylight:neutron";
 
-    prefix neutron-L3;
+    prefix neutron;
 
-    import ietf-yang-types { prefix "yang";}
-    // It requires rfc6991 (revision 2013-07-15), but odl don't have it, so this patch verify build will fail.
-    import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; }
+    import neutron-extensions { prefix "extensions"; }
     import neutron-networks { prefix "networks"; }
     import neutron-ports { prefix "ports"; }
     import neutron-subnets { prefix "subnets"; }
@@ -24,6 +22,13 @@ module neutron {
     import neutron-L3 { prefix "l3"; }
     import neutron-metering { prefix "metering"; }
     import neutron-lbaasv2 { prefix "lbaasv2"; }
+    import neutron-l2gateways { prefix "l2gateways"; }
+    import neutron-vpnaas { prefix "vpnaas"; }
+    import neutron-fwaas { prefix "fwaas"; }
+    import neutron-bgpvpns { prefix "bgpvpns"; }
+    import neutron-hostconfig { prefix "hostconfig"; }
+    import neutron-sfc-flow-classifier { prefix "sfc-flow-classifier"; }
+    import neutron-sfc { prefix "sfc"; }
 
     organization "OpenDaylight Neutron Group";
 
@@ -31,21 +36,35 @@ module neutron {
 
     description "This YANG module defines a top level for the neutron models in opendaylight.";
 
-    revision "2015-03-25" {
+    revision "2015-07-12" {
         description
-                "Initial version of top level neutron model";
+                "OpenDaylight Beryllium release";
     }
 
     container neutron {
+        uses extensions:extensions-attributes;
         uses networks:networks-attributes;
+        uses subnets:subnets-attributes;
+        uses ports:ports-attributes;
         uses l3:routers-attributes;
         uses l3:floatingips-attributes;
         uses metering:metering-labels-attributes;
         uses metering:metering-rules-attributes;
-        uses ports:ports-attributes;
         uses secgroups:security-groups-attributes;
         uses secgroups:security-rules-attributes;
-        uses subnets:subnets-attributes;
+        uses fwaas:firewalls-attributes;
+        uses fwaas:policies-attributes;
+        uses fwaas:rules-attributes;
         uses lbaasv2:lbaas-attributes;
+        uses vpnaas:vpnservices-attributes;
+        uses vpnaas:ikepolicies-attributes;
+        uses vpnaas:ipsecpolicies-attributes;
+        uses vpnaas:ipsecconnections-attributes;
+        uses bgpvpns:bgpvpns-attributes;
+        uses l2gateways:l2gateways-attributes;
+        uses l2gateways:l2gateway-connections-attributes;
+        uses hostconfig:hostconfig-attributes;
+        uses sfc-flow-classifier:sfc-flow-classifiers-attributes;
+        uses sfc:sfc-attributes;
     }
-}
\ No newline at end of file
+}