BIND 10 trac670, updated. 0b53561c3b937c5d2585a3c62876b600800815bb [trac670] Cleanup to increase readability

[BIND 10 source code commits]

The branch, trac670 has been updated
       via  0b53561c3b937c5d2585a3c62876b600800815bb (commit)
       via  e111d142cba584e410c5e385c10b714715f55dc4 (commit)
      from  e909ff99007b9b9b26af58848d3fccdb25d4135d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0b53561c3b937c5d2585a3c62876b600800815bb
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Mar 16 15:25:39 2011 +0100

    [trac670] Cleanup to increase readability

commit e111d142cba584e410c5e385c10b714715f55dc4
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Mar 16 14:42:00 2011 +0100

    [trac670] Specification of the configuration

-----------------------------------------------------------------------

Summary of changes:
 src/bin/zonemgr/zonemgr.py.in       |    7 +------
 src/bin/zonemgr/zonemgr.spec.pre.in |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/zonemgr/zonemgr.py.in b/src/bin/zonemgr/zonemgr.py.in
index f9659a3..16796dd 100755
--- a/src/bin/zonemgr/zonemgr.py.in
+++ b/src/bin/zonemgr/zonemgr.py.in
@@ -149,16 +149,13 @@ class ZonemgrRefresh:
 
     def _zone_not_exist(self, zone_name_class):
         """ Zone doesn't belong to zonemgr"""
-        if zone_name_class in self._zonemgr_refresh_info.keys():
-            return False
-        return True
+        return not zone_name_class in self._zonemgr_refresh_info
 
     def zone_refresh_success(self, zone_name_class):
         """Update zone info after zone refresh success"""
         if (self._zone_not_exist(zone_name_class)):
             raise ZonemgrException("[b10-zonemgr] Zone (%s, %s) doesn't "
                                    "belong to zonemgr" % zone_name_class)
-            return
         self.zonemgr_reload_zone(zone_name_class)
         self._set_zone_refresh_timer(zone_name_class)
         self._set_zone_state(zone_name_class, ZONE_OK)
@@ -169,7 +166,6 @@ class ZonemgrRefresh:
         if (self._zone_not_exist(zone_name_class)):
             raise ZonemgrException("[b10-zonemgr] Zone (%s, %s) doesn't "
                                    "belong to zonemgr" % zone_name_class)
-            return
         # Is zone expired?
         if (self._zone_is_expired(zone_name_class)):
             self._set_zone_state(zone_name_class, ZONE_EXPIRED)
@@ -182,7 +178,6 @@ class ZonemgrRefresh:
         if (self._zone_not_exist(zone_name_class)):
             raise ZonemgrException("[b10-zonemgr] Notified zone (%s, %s) "
                                    "doesn't belong to zonemgr" % zone_name_class)
-            return
         self._set_zone_notifier_master(zone_name_class, master)
         self._set_zone_notify_timer(zone_name_class)
 
diff --git a/src/bin/zonemgr/zonemgr.spec.pre.in b/src/bin/zonemgr/zonemgr.spec.pre.in
index 0539ef3..f2f48c2 100644
--- a/src/bin/zonemgr/zonemgr.spec.pre.in
+++ b/src/bin/zonemgr/zonemgr.spec.pre.in
@@ -25,6 +25,32 @@
          "item_type": "real",
          "item_optional": false,
          "item_default": 0.25
+       },
+       {
+         "item_name": "secondary_zones",
+         "item_type": "list",
+         "item_optional": false,
+         "item_default": [],
+         "list_item_spec": {
+           "item_name": "secondary_zone",
+           "item_type": "map",
+           "item_optional": false,
+           "item_default": {},
+           "map_item_spec": [
+             {
+               "item_name": "class",
+               "item_type": "string",
+               "item_optional": false,
+               "item_default": "IN"
+             },
+             {
+               "item_name": "name",
+               "item_type": "string",
+               "item_optional": false,
+               "item_type": ""
+             }
+           ]
+         }
        }
       ],
       "commands": [