Unit tests fixes and pool updates

src/lib/charm/openstack/designate.py

@@ -247,7 +247,7 @@ class BindRNDCRelationAdapter(openstack_adapters.OpenStackRelationAdapter):
         @returns: dict {'algorithm': rndc_algorithm,
                         'secret': rndc_secret_digest}
         '''
-        return self.relation.rndc_info()
+        return self.relation.rndc_info
 
 
 class DesignateConfigurationAdapter(

src/reactive/designate_handlers.py

@@ -106,10 +106,9 @@ def render_all_configs_single_node(*args):
 def cluster_connected(hacluster):
     '''Configure HA resources in corosync'''
     designate.configure_ha_resources(hacluster)
-    designate.render_full_config(args)
-    designate.update_pools()
     designate.assess_status()
 
+
 @reactive.when('config.changed')
 def config_changed():
     '''When the configuration changes, assess the unit's status to update any

src/reactive/designate_utils.py

@@ -47,7 +47,7 @@ def display_domain_id(domain_name):
     domain_id = get_domain_id(domain_name)
     if domain_id:
         print(domain_id)
-    
+
 
 def create_server(server_name):
     server_id = get_server_id(server_name)
@@ -109,10 +109,12 @@ def get_servers():
             }
     return servers
 
+
 def display_domains():
     for domain in get_domains():
         print(domain)
 
+
 def display_servers():
     for server in get_servers():
         print(server)

unit_tests/__init__.py

@@ -24,6 +24,7 @@ charmhelpers = mock.MagicMock()
 sys.modules['charmhelpers'] = charmhelpers
 sys.modules['charmhelpers.core'] = charmhelpers.core
 sys.modules['charmhelpers.core.hookenv'] = charmhelpers.core.hookenv
+sys.modules['charmhelpers.core.decorators'] = charmhelpers.core.decorators
 sys.modules['charmhelpers.core.host'] = charmhelpers.core.host
 sys.modules['charmhelpers.core.unitdata'] = charmhelpers.core.unitdata
 sys.modules['charmhelpers.core.templating'] = charmhelpers.core.templating
@@ -41,3 +42,15 @@ sys.modules['charmhelpers.cli'] = charmhelpers.cli
 sys.modules['charmhelpers.contrib.hahelpers'] = charmhelpers.contrib.hahelpers
 sys.modules['charmhelpers.contrib.hahelpers.cluster'] = (
     charmhelpers.contrib.hahelpers.cluster)
+
+
+def _fake_retry(num_retries, base_delay=0, exc_type=Exception):
+    def _retry_on_exception_inner_1(f):
+        def _retry_on_exception_inner_2(*args, **kwargs):
+            return f(*args, **kwargs)
+        return _retry_on_exception_inner_2
+    return _retry_on_exception_inner_1
+
+mock.patch(
+    'charmhelpers.core.decorators.retry_on_exception',
+    _fake_retry).start()

unit_tests/test_lib_charm_openstack_designate.py

@@ -370,30 +370,31 @@ class TestDesignateCharm(Helper):
             self.write_key_file.assert_has_calls(calls)
 
     def test_get_domain_id(self):
+        self.patch(designate.DesignateCharm, 'ensure_api_responding')
         self.patch(designate.subprocess, 'check_output')
         self.check_output.return_value = b'hi\n'
         self.assertEqual(designate.DesignateCharm.get_domain_id('domain'),
                          'hi')
         self.check_output.assert_called_with(
             ['reactive/designate_utils.py',
-             'domain-get',
-             'domain'])
+             'domain-get', '--domain-name', 'domain'])
 
     def test_create_domain(self):
+        self.patch(designate.DesignateCharm, 'ensure_api_responding')
         self.patch(designate.subprocess, 'check_call')
         designate.DesignateCharm.create_domain('domain', 'email')
         self.check_call.assert_called_with(
             ['reactive/designate_utils.py',
-             'domain-create',
-             'domain',
-             'email'])
+             'domain-create', '--domain-name', 'domain',
+             '--email', 'email'])
 
     def test_create_server(self):
         self.patch(designate.subprocess, 'check_call')
+        self.patch(designate.DesignateCharm, 'ensure_api_responding')
         designate.DesignateCharm.create_server('nameservername')
         self.check_call.assert_called_with(
             ['reactive/designate_utils.py',
-             'server-create',
+             'server-create', '--server-name',
              'nameservername'])
 
     def test_domain_init_done(self):
@@ -413,6 +414,8 @@ class TestDesignateCharm(Helper):
             'neutron-domain': 'neutrondomain',
             'neutron-domain-email': 'neutronemail',
         }
+        self.patch(designate.DesignateCharm, 'ensure_api_responding')
+        self.ensure_api_responding.return_value = True
         self.patch(designate.hookenv, 'is_leader', return_value=True)
         self.patch(designate.hookenv, 'leader_set')
         self.patch(designate.DesignateCharm, 'create_server')