Bug 4043 - remote ip prefix of security group is type of ietf ip-prefix

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

diff --git a/model/src/main/yang/neutron-fwaas.yang b/model/src/main/yang/neutron-fwaas.yang
index 7ff6882931afaee4cfd44bf2c9dbf550390af0e5..abced7b4655adb9825b27542779dad803b662682 100644 (file)
--- a/model/src/main/yang/neutron-fwaas.yang
+++ b/model/src/main/yang/neutron-fwaas.yang
@@ -44,7 +44,7 @@ module neutron-fwaas {
         }
     }
 
-    grouping firewallpolicy-attributes {
+    grouping firewall-policy-attributes {
         leaf descr {
             type string;
             description "Detailed description of the firewall policy.";
@@ -63,7 +63,7 @@ module neutron-fwaas {
         }
     }
 
-    grouping firewallrule-attributes {
+    grouping firewall-rule-attributes {
         leaf descr {
             type string;
             description "Detailed description of the firewall rule.";
@@ -118,7 +118,7 @@ module neutron-fwaas {
         }
     }
 
-    grouping fwaas-attributes {
+    grouping firewalls-attributes {
         container firewalls {
             list firewall {
                 key "uuid";
@@ -127,18 +127,22 @@ module neutron-fwaas {
                 uses firewall-attributes;
             }
         }
+    }
+    grouping policies-attributes {
         container firewall-policies {
             list firewall-policy {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses firewallpolicy-attributes;
+                uses firewall-policy-attributes;
             }
         }
+    }
+    grouping rules-attributes {
         container firewall-rules {
             list firewall-rule {
                 key "uuid";
                 uses attrs:base-attributes;
-                uses firewallrule-attributes;
+                uses firewall-rule-attributes;
             }
         }
     }