Merge pull request #232 from wazo-platform/WAZO-1551-wazo-sync

WAZO-1551-wazo-sync

Reviewed-by: Francois Blackburn

features/ha/high_availability.feature

@@ -8,7 +8,7 @@ Feature: High availability
     Then there are cron jobs in "/etc/cron.d/xivo-ha-master" on "master"
       | cron job                                                                              |
       | 0 * * * * root /usr/sbin/xivo-master-slave-db-replication {{ slave_voip_ip_address }} |
-      | 0 * * * * root /usr/bin/xivo-sync                                                     |
+      | 0 * * * * root /usr/bin/wazo-sync                                                     |
     Then the provd config "default" has the following values on "master"
       | X_type    | proxy_backup                | registrar_backup            |
       | registrar | {{ slave_voip_ip_address }} | {{ slave_voip_ip_address }} |
@@ -38,14 +38,14 @@ Feature: High availability
     Given the file "/root/.ssh/xivo_id_rsa" does not exist on "master"
     Given the file "/root/.ssh/xivo_id_rsa.pub" does not exist on "master"
     Given the file "/root/.ssh/authorized_keys" does not contain "XiVO HA" on "slave"
-    When I initialize xivo-sync on "master" to "slave"
+    When I initialize wazo-sync on "master" to "slave"
     Then the file "/root/.ssh/xivo_id_rsa" exists on "master"
     Then the file "/root/.ssh/xivo_id_rsa.pub" exists on "master"
     Then the file "/root/.ssh/authorized_keys" contains "XiVO HA" on "slave"
 
     Given the file "/etc/asterisk/extensions_extra.d/acceptance.conf" exists on "master"
     Given the file "/etc/asterisk/extensions_extra.d/acceptance.conf" does not exist on "slave"
-    When I execute "xivo-sync" command on "master"
+    When I execute "wazo-sync" command on "master"
     Then the file "/etc/asterisk/extensions_extra.d/acceptance.conf" exists on "slave"
 
     # Workaround WAZO-2999

wazo_acceptance/prerequisite.py

@@ -343,7 +343,7 @@ def copy_asset_to_server_permanently(context, asset, serverpath):
 
 
 def _configure_ssh_client(context):
-    # For HA tests (xivo-sync -i)
+    # For HA tests (wazo-sync -i)
     _install_packages(context, ['sshpass'])
     content = 'Host *\\\\n  StrictHostKeyChecking no'
     command = ['echo', '-e', content, '>', '/root/.ssh/config']

wazo_acceptance/steps/ha.py

@@ -136,12 +136,12 @@ def confd_is_ready():
     until.assert_(confd_is_ready, timeout=90)
 
 
-@when('I initialize xivo-sync on "{instance_master}" to "{instance_slave}"')
+@when('I initialize wazo-sync on "{instance_master}" to "{instance_slave}"')
 def when_i_initialize_xivo_sync_on_instance(context, instance_master, instance_slave):
     master_context = getattr(context.instances, instance_master)
     slave_context = getattr(context.instances, instance_slave)
     password = slave_context.wazo_config['system_password']
     if not password:
         raise Exception('Missing "system_password" configuration')
-    command = ['sshpass', '-p', password, 'xivo-sync', '-i']
+    command = ['sshpass', '-p', password, 'wazo-sync', '-i']
     master_context.remote_sysutils.send_command(command)