1
=== modified file '.bzrignore'
2
--- .bzrignore	2015-02-06 07:28:54 +0000
3
+++ .bzrignore	2015-04-17 10:12:07 +0000
4
@@ -2,3 +2,6 @@
5
2
.coverage
2
.coverage
6
3
.pydevproject
3
.pydevproject
7
4
.project
4
.project
8
5
*.pyc
9
6
*.pyo
10
7
__pycache__
11
5
8
12
=== modified file 'Makefile'
13
--- Makefile	2014-10-02 16:12:44 +0000
14
+++ Makefile	2015-04-17 10:12:07 +0000
15
@@ -9,6 +9,12 @@
16
9
unit_test:
9
unit_test:
17
10
	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
10
	@$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests
18
11
11
19
12
test:
20
13
	@echo Starting amulet tests...
21
14
	#NOTE(beisner): can remove -v after bug 1320357 is fixed
22
15
	#   https://bugs.launchpad.net/amulet/+bug/1320357
23
16
	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 900
24
17
25
12
bin/charm_helpers_sync.py:
18
bin/charm_helpers_sync.py:
26
13
	@mkdir -p bin
19
	@mkdir -p bin
27
14
	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
20
	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
28
@@ -16,6 +22,7 @@
29
16
22
30
17
sync: bin/charm_helpers_sync.py
23
sync: bin/charm_helpers_sync.py
31
18
	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
24
	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
32
25
	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
33
19
26
34
20
publish: lint
27
publish: lint
35
21
	bzr push lp:charms/trusty/percona-cluster
28
	bzr push lp:charms/trusty/percona-cluster
36
22
29
37
=== added file 'charm-helpers-tests.yaml'
38
--- charm-helpers-tests.yaml	1970-01-01 00:00:00 +0000
39
+++ charm-helpers-tests.yaml	2015-04-17 10:12:07 +0000
40
@@ -0,0 +1,5 @@
41
1
branch: lp:charm-helpers
42
2
destination: tests/charmhelpers
43
3
include:
44
4
    - contrib.amulet
45
5
    - contrib.openstack.amulet
46
0
6
47
=== modified file 'copyright'
48
--- copyright	2013-09-19 15:40:50 +0000
49
+++ copyright	2015-04-17 10:12:07 +0000
50
@@ -15,3 +15,25 @@
51
15
 .
15
 .
52
16
 You should have received a copy of the GNU General Public License
16
 You should have received a copy of the GNU General Public License
53
17
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
54
18
55
19
Files: ocf/percona/mysql_monitor
56
20
Copyright: Copyright (c) 2013, Percona inc., Yves Trudeau, Michael Coburn
57
21
License: GPL-2
58
22
 This program is free software; you can redistribute it and/or modify
59
23
 it under the terms of version 2 of the GNU General Public License as
60
24
 published by the Free Software Foundation.
61
25
62
26
 This program is distributed in the hope that it would be useful, but
63
27
 WITHOUT ANY WARRANTY; without even the implied warranty of
64
28
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
65
29
66
30
 Further, this software is distributed without any warranty that it is
67
31
 free of the rightful claim of any third person regarding infringement
68
32
 or the like.  Any license provided herein, whether implied or
69
33
 otherwise, applies only to this software file.  Patent licenses, if
70
34
 any, provided herein do not apply to combinations of this program with
71
35
 other software, or any other product whatsoever.
72
36
73
37
 You should have received a copy of the GNU General Public License
74
38
 along with this program; if not, write the Free Software Foundation,
75
39
 Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
76
18
40
77
=== modified file 'hooks/percona_hooks.py'
78
--- hooks/percona_hooks.py	2015-04-15 11:01:49 +0000
79
+++ hooks/percona_hooks.py	2015-04-17 10:12:07 +0000
80
@@ -50,6 +50,7 @@
81
50
    assert_charm_supports_ipv6,
50
    assert_charm_supports_ipv6,
82
51
    unit_sorted,
51
    unit_sorted,
83
52
    get_db_helper,
52
    get_db_helper,
84
53
    install_mysql_ocf,
85
53
)
54
)
86
54
from charmhelpers.contrib.database.mysql import (
55
from charmhelpers.contrib.database.mysql import (
87
55
    PerconaClusterHelper,
56
    PerconaClusterHelper,
88
@@ -72,6 +73,13 @@
89
72
hooks = Hooks()
73
hooks = Hooks()
90
73
74
91
74
LEADER_RES = 'grp_percona_cluster'
75
LEADER_RES = 'grp_percona_cluster'
92
76
RES_MONITOR_PARAMS = ('params user="sstuser" password="%(sstpass)s" '
93
77
                      'pid="/var/run/mysqld/mysqld.pid" '
94
78
                      'socket="/var/run/mysqld/mysqld.sock" '
95
79
                      'max_slave_lag="5" '
96
80
                      'cluster_type="pxc" '
97
81
                      'op monitor interval="1s" timeout="30s" '
98
82
                      'OCF_CHECK_LEVEL="1"')
99
75
83
100
76
84
101
77
@hooks.hook('install')
85
@hooks.hook('install')
102
@@ -155,6 +163,13 @@
103
155
        for unit in related_units(r_id):
163
        for unit in related_units(r_id):
104
156
            shared_db_changed(r_id, unit)
164
            shared_db_changed(r_id, unit)
105
157
165
106
166
    # (re)install pcmkr agent
107
167
    install_mysql_ocf()
108
168
109
169
    if relation_ids('ha'):
110
170
        # make sure all the HA resources are (re)created
111
171
        ha_relation_joined()
112
172
113
158
173
114
159
@hooks.hook('cluster-relation-joined')
174
@hooks.hook('cluster-relation-joined')
115
160
def cluster_joined(relation_id=None):
175
def cluster_joined(relation_id=None):
116
@@ -387,17 +402,34 @@
117
387
        vip_params = 'params ip="%s" cidr_netmask="%s" nic="%s"' % \
402
        vip_params = 'params ip="%s" cidr_netmask="%s" nic="%s"' % \
118
388
                     (vip, vip_cidr, vip_iface)
403
                     (vip, vip_cidr, vip_iface)
119
389
404
122
390
    resources = {'res_mysql_vip': res_mysql_vip}
405
    resources = {'res_mysql_vip': res_mysql_vip,
123
391
    resource_params = {'res_mysql_vip': vip_params}
406
                 'res_mysql_monitor': 'ocf:percona:mysql_monitor'}
124
407
    db_helper = get_db_helper()
125
408
    cfg_passwd = config('sst-password')
126
409
    sstpsswd = db_helper.get_mysql_password(username='sstuser',
127
410
                                            password=cfg_passwd)
128
411
    resource_params = {'res_mysql_vip': vip_params,
129
412
                       'res_mysql_monitor':
130
413
                           RES_MONITOR_PARAMS % {'sstpass': sstpsswd}}
131
392
    groups = {'grp_percona_cluster': 'res_mysql_vip'}
414
    groups = {'grp_percona_cluster': 'res_mysql_vip'}
132
393
415
133
416
    clones = {'cl_mysql_monitor': 'res_mysql_monitor meta interleave=true'}
134
417
135
418
    colocations = {'vip_mysqld': 'inf: grp_percona_cluster cl_mysql_monitor'}
136
419
137
420
    locations = {'loc_percona_cluster':
138
421
                 'grp_percona_cluster rule inf: writable eq 1'}
139
422
140
394
    for rel_id in relation_ids('ha'):
423
    for rel_id in relation_ids('ha'):
141
395
        relation_set(relation_id=rel_id,
424
        relation_set(relation_id=rel_id,
142
396
                     corosync_bindiface=corosync_bindiface,
425
                     corosync_bindiface=corosync_bindiface,
143
397
                     corosync_mcastport=corosync_mcastport,
426
                     corosync_mcastport=corosync_mcastport,
144
398
                     resources=resources,
427
                     resources=resources,
145
399
                     resource_params=resource_params,
428
                     resource_params=resource_params,
147
400
                     groups=groups)
429
                     groups=groups,
148
430
                     clones=clones,
149
431
                     colocations=colocations,
150
432
                     locations=locations)
151
401
433
152
402
434
153
403
@hooks.hook('ha-relation-changed')
435
@hooks.hook('ha-relation-changed')
154
404
436
155
=== modified file 'hooks/percona_utils.py'
156
--- hooks/percona_utils.py	2015-02-05 09:59:36 +0000
157
+++ hooks/percona_utils.py	2015-04-17 10:12:07 +0000
158
@@ -4,10 +4,12 @@
159
4
import socket
4
import socket
160
5
import tempfile
5
import tempfile
161
6
import os
6
import os
162
7
import shutil
163
7
from charmhelpers.core.host import (
8
from charmhelpers.core.host import (
164
8
    lsb_release
9
    lsb_release
165
9
)
10
)
166
10
from charmhelpers.core.hookenv import (
11
from charmhelpers.core.hookenv import (
167
12
    charm_dir,
168
11
    unit_get,
13
    unit_get,
169
12
    relation_ids,
14
    relation_ids,
170
13
    related_units,
15
    related_units,
171
@@ -229,3 +231,18 @@
172
229
    """Return a sorted list of unit names."""
231
    """Return a sorted list of unit names."""
173
230
    return sorted(
232
    return sorted(
174
231
        units, lambda a, b: cmp(int(a.split('/')[-1]), int(b.split('/')[-1])))
233
        units, lambda a, b: cmp(int(a.split('/')[-1]), int(b.split('/')[-1])))
175
234
176
235
177
236
def install_mysql_ocf():
178
237
    dest_dir = '/usr/lib/ocf/resource.d/percona/'
179
238
    for fname in ['ocf/percona/mysql_monitor']:
180
239
        src_file = os.path.join(charm_dir(), fname)
181
240
        if not os.path.isdir(dest_dir):
182
241
            os.makedirs(dest_dir)
183
242
184
243
        dest_file = os.path.join(dest_dir, os.path.basename(src_file))
185
244
        if not os.path.exists(dest_file):
186
245
            log('Installing %s' % dest_file, level='INFO')
187
246
            shutil.copy(src_file, dest_file)
188
247
        else:
189
248
            log("'%s' already exists, skipping" % dest_file, level='INFO')
190
232
249
191
=== added directory 'ocf'
192
=== added directory 'ocf/percona'
193
=== added file 'ocf/percona/mysql_monitor'
194
--- ocf/percona/mysql_monitor	1970-01-01 00:00:00 +0000
195
+++ ocf/percona/mysql_monitor	2015-04-17 10:12:07 +0000
196
@@ -0,0 +1,636 @@
197
1
#!/bin/bash
198
2
#
199
3
#
200
4
#	MySQL_Monitor agent, set writeable and readable attributes based on the 
201
5
#   state of the local MySQL, running and read_only or not.  The agent basis is
202
6
#   the original "Dummy" agent written by Lars Marowsky-Brée and part of the
203
7
#   Pacemaker distribution.  Many functions are from mysql_prm.
204
8
#
205
9
#
206
10
# Copyright (c) 2013, Percona inc., Yves Trudeau, Michael Coburn
207
11
#
208
12
# This program is free software; you can redistribute it and/or modify
209
13
# it under the terms of version 2 of the GNU General Public License as
210
14
# published by the Free Software Foundation.
211
15
#
212
16
# This program is distributed in the hope that it would be useful, but
213
17
# WITHOUT ANY WARRANTY; without even the implied warranty of
214
18
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
215
19
#
216
20
# Further, this software is distributed without any warranty that it is
217
21
# free of the rightful claim of any third person regarding infringement
218
22
# or the like.  Any license provided herein, whether implied or
219
23
# otherwise, applies only to this software file.  Patent licenses, if
220
24
# any, provided herein do not apply to combinations of this program with
221
25
# other software, or any other product whatsoever.
222
26
#
223
27
# You should have received a copy of the GNU General Public License
224
28
# along with this program; if not, write the Free Software Foundation,
225
29
# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
226
30
#
227
31
# Version: 20131119163921
228
32
#
229
33
# See usage() function below for more details...
230
34
#
231
35
# OCF instance parameters:
232
36
#
233
37
#  OCF_RESKEY_state
234
38
#  OCF_RESKEY_user
235
39
#  OCF_RESKEY_password
236
40
#  OCF_RESKEY_client_binary
237
41
#  OCF_RESKEY_pid
238
42
#  OCF_RESKEY_socket
239
43
#  OCF_RESKEY_reader_attribute
240
44
#  OCF_RESKEY_reader_failcount
241
45
#  OCF_RESKEY_writer_attribute
242
46
#  OCF_RESKEY_max_slave_lag
243
47
#  OCF_RESKEY_cluster_type
244
48
#  
245
49
#######################################################################
246
50
# Initialization:
247
51
248
52
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
249
53
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
250
54
251
55
#######################################################################
252
56
253
57
HOSTOS=`uname`
254
58
if [ "X${HOSTOS}" = "XOpenBSD" ];then
255
59
OCF_RESKEY_client_binary_default="/usr/local/bin/mysql"
256
60
OCF_RESKEY_pid_default="/var/mysql/mysqld.pid"
257
61
OCF_RESKEY_socket_default="/var/run/mysql/mysql.sock"
258
62
else
259
63
OCF_RESKEY_client_binary_default="/usr/bin/mysql"
260
64
OCF_RESKEY_pid_default="/var/run/mysql/mysqld.pid"
261
65
OCF_RESKEY_socket_default="/var/lib/mysql/mysql.sock"
262
66
fi
263
67
OCF_RESKEY_reader_attribute_default="readable"
264
68
OCF_RESKEY_writer_attribute_default="writable"
265
69
OCF_RESKEY_reader_failcount_default="1"
266
70
OCF_RESKEY_user_default="root"
267
71
OCF_RESKEY_password_default=""
268
72
OCF_RESKEY_max_slave_lag_default="3600"
269
73
OCF_RESKEY_cluster_type_default="replication"
270
74
271
75
: ${OCF_RESKEY_state=${HA_RSCTMP}/mysql-monitor-${OCF_RESOURCE_INSTANCE}.state}
272
76
: ${OCF_RESKEY_client_binary=${OCF_RESKEY_client_binary_default}}
273
77
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
274
78
: ${OCF_RESKEY_socket=${OCF_RESKEY_socket_default}}
275
79
: ${OCF_RESKEY_reader_attribute=${OCF_RESKEY_reader_attribute_default}}
276
80
: ${OCF_RESKEY_reader_failcount=${OCF_RESKEY_reader_failcount_default}}
277
81
: ${OCF_RESKEY_writer_attribute=${OCF_RESKEY_writer_attribute_default}}
278
82
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
279
83
: ${OCF_RESKEY_password=${OCF_RESKEY_password_default}}
280
84
: ${OCF_RESKEY_max_slave_lag=${OCF_RESKEY_max_slave_lag_default}}
281
85
: ${OCF_RESKEY_cluster_type=${OCF_RESKEY_cluster_type_default}}
282
86
283
87
MYSQL="$OCF_RESKEY_client_binary -A -S $OCF_RESKEY_socket --connect_timeout=10 --user=$OCF_RESKEY_user --password=$OCF_RESKEY_password "
284
88
HOSTNAME=`uname -n`
285
89
CRM_ATTR="${HA_SBIN_DIR}/crm_attribute -N $HOSTNAME "
286
90
287
91
meta_data() {
288
92
	cat <<END
289
93
<?xml version="1.0"?>
290
94
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
291
95
<resource-agent name="mysql_monitor" version="0.9">
292
96
<version>1.0</version>
293
97
294
98
<longdesc lang="en">
295
99
This agent monitors the local MySQL instance and set the writable and readable
296
100
attributes according to what it finds.  It checks if MySQL is running and if
297
101
it is read-only or not.
298
102
</longdesc>
299
103
<shortdesc lang="en">Agent monitoring mysql</shortdesc>
300
104
301
105
<parameters>
302
106
<parameter name="state" unique="1">
303
107
<longdesc lang="en">
304
108
Location to store the resource state in.
305
109
</longdesc>
306
110
<shortdesc lang="en">State file</shortdesc>
307
111
<content type="string" default="${HA_RSCTMP}/Mysql-monitor-${OCF_RESOURCE_INSTANCE}.state" />
308
112
</parameter>
309
113
310
114
<parameter name="user" unique="0">
311
115
<longdesc lang="en">
312
116
MySQL user to connect to the local MySQL instance to check the slave status and 
313
117
if the read_only variable is set.  It requires the replication client priviledge.
314
118
</longdesc>
315
119
<shortdesc lang="en">MySQL user</shortdesc>
316
120
<content type="string" default="${OCF_RESKEY_user_default}" />
317
121
</parameter>
318
122
319
123
<parameter name="password" unique="0">
320
124
<longdesc lang="en">
321
125
Password of the mysql user to connect to the local MySQL instance
322
126
</longdesc>
323
127
<shortdesc lang="en">MySQL password</shortdesc>
324
128
<content type="string" default="${OCF_RESKEY_password_default}" />
325
129
</parameter>
326
130
327
131
<parameter name="client_binary" unique="0">
328
132
<longdesc lang="en">
329
133
MySQL Client Binary path.
330
134
</longdesc>
331
135
<shortdesc lang="en">MySQL client binary path</shortdesc>
332
136
<content type="string" default="${OCF_RESKEY_client_binary_default}" />
333
137
</parameter>
334
138
335
139
<parameter name="socket" unique="0">
336
140
<longdesc lang="en">
337
141
Unix socket to use in order to connect to MySQL on the host
338
142
</longdesc>
339
143
<shortdesc lang="en">MySQL socket</shortdesc>
340
144
<content type="string" default="${OCF_RESKEY_socket_default}" />
341
145
</parameter>
342
146
343
147
<parameter name="pid" unique="0">
344
148
<longdesc lang="en">
345
149
MySQL pid file, used to verify MySQL is running.
346
150
</longdesc>
347
151
<shortdesc lang="en">MySQL pid file</shortdesc>
348
152
<content type="string" default="${OCF_RESKEY_pid_default}" />
349
153
</parameter>
350
154
351
155
<parameter name="reader_attribute" unique="0">
352
156
<longdesc lang="en">
353
157
The reader attribute in the cib that can be used by location rules to allow or not
354
158
reader VIPs on a host.
355
159
</longdesc>
356
160
<shortdesc lang="en">Reader attribute</shortdesc>
357
161
<content type="string" default="${OCF_RESKEY_reader_attribute_default}" />
358
162
</parameter>
359
163
360
164
<parameter name="writer_attribute" unique="0">
361
165
<longdesc lang="en">
362
166
The reader attribute in the cib that can be used by location rules to allow or not
363
167
reader VIPs on a host.
364
168
</longdesc>
365
169
<shortdesc lang="en">Writer attribute</shortdesc>
366
170
<content type="string" default="${OCF_RESKEY_writer_attribute_default}" />
367
171
</parameter>
368
172
369
173
<parameter name="max_slave_lag" unique="0" required="0">
370
174
<longdesc lang="en">
371
175
The maximum number of seconds a replication slave is allowed to lag
372
176
behind its master in order to have a reader VIP on it.
373
177
</longdesc>
374
178
<shortdesc lang="en">Maximum time (seconds) a MySQL slave is allowed
375
179
to lag behind a master</shortdesc>
376
180
<content type="integer" default="${OCF_RESKEY_max_slave_lag_default}"/>
377
181
</parameter>
378
182
379
183
<parameter name="cluster_type" unique="0" required="0">
380
184
<longdesc lang="en">
381
185
Type of cluster, three possible values: pxc, replication, read-only.  "pxc" is 
382
186
for Percona XtraDB cluster, it uses the clustercheck script and set the 
383
187
reader_attribute and writer_attribute according to the return code.  
384
188
"replication" checks the read-only state and the slave status, only writable 
385
189
node(s) will get the writer_attribute (and the reader_attribute) and on the 
386
190
read-only nodes, replication status will be checked and the reader_attribute set 
387
191
according to the state.  "read-only" will just check if the read-only variable, 
388
192
if read/write, it will get both the writer_attribute and reader_attribute set, if
389
193
read-only it will get only the reader_attribute.
390
194
</longdesc>
391
195
<shortdesc lang="en">Type of cluster</shortdesc>
392
196
<content type="string" default="${OCF_RESKEY_cluster_type_default}"/>
393
197
</parameter>
394
198
395
199
</parameters>
396
200
397
201
<actions>
398
202
<action name="start"        timeout="20" />
399
203
<action name="stop"         timeout="20" />
400
204
<action name="monitor"      timeout="20" interval="10" depth="0" />
401
205
<action name="reload"       timeout="20" />
402
206
<action name="migrate_to"   timeout="20" />
403
207
<action name="migrate_from" timeout="20" />
404
208
<action name="meta-data"    timeout="5" />
405
209
<action name="validate-all"   timeout="20" />
406
210
</actions>
407
211
</resource-agent>
408
212
END
409
213
}
410
214
411
215
#######################################################################
412
216
# Non API functions
413
217
414
218
# Extract fields from slave status
415
219
parse_slave_info() {
416
220
    # Extracts field $1 from result of "SHOW SLAVE STATUS\G" from file $2
417
221
    sed -ne "s/^.* $1: \(.*\)$/\1/p" < $2
418
222
}
419
223
420
224
# Read the slave status and 
421
225
get_slave_info() {
422
226
423
227
    local mysql_options tmpfile
424
228
            
425
229
    if [ "$master_log_file" -a "$master_host" ]; then
426
230
        # variables are already defined, get_slave_info has been run before
427
231
        return $OCF_SUCCESS
428
232
    else
429
233
        tmpfile=`mktemp ${HA_RSCTMP}/check_slave.${OCF_RESOURCE_INSTANCE}.XXXXXX`
430
234
431
235
        mysql_run -Q -sw -O $MYSQL $MYSQL_OPTIONS_REPL \
432
236
        -e 'SHOW SLAVE STATUS\G' > $tmpfile
433
237
434
238
        if [ -s $tmpfile ]; then
435
239
            master_host=`parse_slave_info Master_Host $tmpfile`
436
240
            slave_sql=`parse_slave_info Slave_SQL_Running $tmpfile`
437
241
            slave_io=`parse_slave_info Slave_IO_Running $tmpfile`
438
242
            slave_io_state=`parse_slave_info Slave_IO_State $tmpfile`
439
243
            last_errno=`parse_slave_info Last_Errno $tmpfile`
440
244
            secs_behind=`parse_slave_info Seconds_Behind_Master $tmpfile`
441
245
            ocf_log debug "MySQL instance has a non empty slave status"
442
246
        else
443
247
            # Instance produced an empty "SHOW SLAVE STATUS" output --
444
248
            # instance is not a slave
445
249
            
446
250
            ocf_log err "check_slave invoked on an instance that is not a replication slave."
447
251
	        rm -f $tmpfile
448
252
            return $OCF_ERR_GENERIC
449
253
        fi
450
254
        rm -f $tmpfile
451
255
        return $OCF_SUCCESS
452
256
    fi
453
257
}
454
258
455
259
get_read_only() {
456
260
    # Check if read-only is set
457
261
    local read_only_state
458
262
459
263
    read_only_state=`mysql_run -Q -sw -O $MYSQL -N $MYSQL_OPTIONS_REPL \
460
264
        -e "SHOW VARIABLES like 'read_only'" | awk '{print $2}'`
461
265
462
266
    if [ "$read_only_state" = "ON" ]; then
463
267
        return 0
464
268
    else
465
269
        return 1
466
270
    fi
467
271
}
468
272
469
273
# get the attribute controlling the readers VIP
470
274
get_reader_attr() {
471
275
    local attr_value
472
276
    local rc
473
277
474
278
    attr_value=`$CRM_ATTR -l reboot --name ${OCF_RESKEY_reader_attribute} --query -q`
475
279
    rc=$?
476
280
    if [ "$rc" -eq "0" ]; then
477
281
        echo $attr_value
478
282
    else
479
283
        echo -1
480
284
    fi
481
285
482
286
}
483
287
484
288
# Set the attribute controlling the readers VIP
485
289
set_reader_attr() {
486
290
    local curr_attr_value
487
291
488
292
    curr_attr_value=$(get_reader_attr)
489
293
    
490
294
    if [ "$1" -eq "0" ]; then
491
295
        if [ "$curr_attr_value" -gt "0" ]; then
492
296
            curr_attr_value=$((${curr_attr_value}-1))    
493
297
            $CRM_ATTR -l reboot --name ${OCF_RESKEY_reader_attribute} -v $curr_attr_value
494
298
        else
495
299
            $CRM_ATTR -l reboot --name ${OCF_RESKEY_reader_attribute} -v 0
496
300
        fi
497
301
    else
498
302
        if [ "$curr_attr_value" -ne "$OCF_RESKEY_reader_failcount" ]; then
499
303
            $CRM_ATTR -l reboot --name ${OCF_RESKEY_reader_attribute} -v $OCF_RESKEY_reader_failcount
500
304
        fi
501
305
    fi
502
306
503
307
}
504
308
505
309
# get the attribute controlling the writer VIP
506
310
get_writer_attr() {
507
311
    local attr_value
508
312
    local rc
509
313
510
314
    attr_value=`$CRM_ATTR -l reboot --name ${OCF_RESKEY_writer_attribute} --query -q`
511
315
    rc=$?
512
316
    if [ "$rc" -eq "0" ]; then
513
317
        echo $attr_value
514
318
    else
515
319
        echo -1
516
320
    fi
517
321
518
322
}
519
323
520
324
# Set the attribute controlling the writer VIP
521
325
set_writer_attr() {
522
326
    local curr_attr_value
523
327
524
328
    curr_attr_value=$(get_writer_attr)
525
329
    
526
330
    if [ "$1" -ne "$curr_attr_value" ]; then
527
331
        if [ "$1" -eq "0" ]; then
528
332
            $CRM_ATTR -l reboot --name ${OCF_RESKEY_writer_attribute} -v 0
529
333
        else
530
334
            $CRM_ATTR -l reboot --name ${OCF_RESKEY_writer_attribute} -v 1
531
335
        fi
532
336
    fi
533
337
}
534
338
535
339
#
536
340
# mysql_run: Run a mysql command, log its output and return the proper error code.
537
341
# Usage:   mysql_run [-Q] [-info|-warn|-err] [-O] [-sw] <command>
538
342
#       -Q: don't log the output of the command if it succeeds
539
343
#       -info|-warn|-err: log the output of the command at given
540
344
#               severity if it fails (defaults to err)
541
345
#       -O: echo the output of the command
542
346
#       -sw: Suppress 5.6 client warning when password is used on the command line
543
347
# Adapted from ocf_run.
544
348
#
545
349
mysql_run() {
546
350
        local rc
547
351
        local output outputfile
548
352
        local verbose=1
549
353
        local returnoutput
550
354
        local loglevel=err
551
355
        local suppress_56_password_warning
552
356
        local var
553
357
554
358
        for var in 1 2 3 4
555
359
        do
556
360
            case "$1" in
557
361
                "-Q")
558
362
                    verbose=""
559
363
                    shift 1;;
560
364
                "-info"|"-warn"|"-err")
561
365
                    loglevel=`echo $1 | sed -e s/-//g`
562
366
                    shift 1;;
563
367
                "-O")
564
368
                    returnoutput=1
565
369
                    shift 1;;
566
370
                "-sw")
567
371
                    suppress_56_password_warning=1
568
372
                    shift 1;;
569
373
570
374
                *)
571
375
                    ;;
572
376
            esac
573
377
        done
574
378
575
379
        outputfile=`mktemp ${HA_RSCTMP}/mysql_run.${OCF_RESOURCE_INSTANCE}.XXXXXX`
576
380
        error=`"$@" 2>&1 1>$outputfile`
577
381
        rc=$?
578
382
        if [ "$suppress_56_password_warning" -eq 1 ]; then
579
383
                error=`echo "$error" | egrep -v '^Warning: Using a password on the command line'`
580
384
        fi
581
385
        output=`cat $outputfile`
582
386
        rm -f $outputfile
583
387
584
388
        if [ $rc -eq 0 ]; then
585
389
            if [ "$verbose" -a ! -z "$output" ]; then
586
390
                ocf_log info "$output"
587
391
            fi
588
392
589
393
            if [ "$returnoutput" -a ! -z "$output" ]; then
590
394
                echo "$output"
591
395
            fi
592
396
593
397
            MYSQL_LAST_ERR=$OCF_SUCCESS
594
398
            return $OCF_SUCCESS
595
399
        else
596
400
            if [ ! -z "$error" ]; then                 
597
401
                ocf_log $loglevel "$error"
598
402
                regex='^ERROR ([[:digit:]]{4}).*'
599
403
                if [[ $error =~ $regex ]]; then
600
404
                    mysql_code=${BASH_REMATCH[1]}
601
405
                    if [ -n "$mysql_code" ]; then
602
406
                        MYSQL_LAST_ERR=$mysql_code
603
407
                        return $rc
604
408
                    fi
605
409
                fi
606
410
            else
607
411
                ocf_log $loglevel "command failed: $*"
608
412
            fi
609
413
            # No output to parse so return the standard exit code.
610
414
            MYSQL_LAST_ERR=$rc
611
415
            return $rc
612
416
        fi
613
417
}
614
418
615
419
616
420
617
421
618
422
#######################################################################
619
423
# API functions
620
424
621
425
mysql_monitor_usage() {
622
426
	cat <<END
623
427
usage: $0 {start|stop|monitor|migrate_to|migrate_from|validate-all|meta-data}
624
428
625
429
Expects to have a fully populated OCF RA-compliant environment set.
626
430
END
627
431
}
628
432
629
433
mysql_monitor_start() {
630
434
    
631
435
    # Initialise the attribute in the cib if they are not already there.
632
436
    if [ $(get_reader_attr) -eq -1 ]; then
633
437
        set_reader_attr 0
634
438
    fi
635
439
    
636
440
    if [ $(get_writer_attr) -eq -1 ]; then
637
441
        set_writer_attr 0
638
442
    fi
639
443
    
640
444
    mysql_monitor
641
445
    mysql_monitor_monitor
642
446
    if [ $? =  $OCF_SUCCESS ]; then
643
447
	return $OCF_SUCCESS
644
448
    fi
645
449
    touch ${OCF_RESKEY_state}
646
450
}
647
451
648
452
mysql_monitor_stop() {
649
453
    
650
454
    set_reader_attr 0
651
455
    set_writer_attr 0
652
456
    
653
457
    mysql_monitor_monitor
654
458
    if [ $? =  $OCF_SUCCESS ]; then
655
459
	rm ${OCF_RESKEY_state}
656
460
    fi
657
461
    return $OCF_SUCCESS
658
462
659
463
}
660
464
661
465
# Monitor MySQL, not the agent itself
662
466
mysql_monitor() {
663
467
    if [  -e $OCF_RESKEY_pid ]; then
664
468
        pid=`cat $OCF_RESKEY_pid`;
665
469
        if [ -d /proc -a -d /proc/1 ]; then
666
470
            [ "u$pid" != "u" -a -d /proc/$pid ]
667
471
        else
668
472
            kill -s 0 $pid >/dev/null 2>&1
669
473
        fi
670
474
671
475
        if [ $? -eq 0 ]; then
672
476
673
477
            case ${OCF_RESKEY_cluster_type} in
674
478
            'replication'|'REPLICATION')
675
479
                if get_read_only; then
676
480
                    # a slave?
677
481
                    
678
482
                    set_writer_attr 0
679
483
                    
680
484
                    get_slave_info
681
485
                    rc=$?
682
486
683
487
                    if [ $rc -eq 0 ]; then
684
488
                       # show slave status is not empty
685
489
                       # Is there a master_log_file defined?  (master_log_file is deleted 
686
490
                       # by reset slave
687
491
                       if [ "$master_log_file" ]; then
688
492
                          # is read_only but no slave config...
689
493
                          
690
494
                          set_reader_attr 0
691
495
                          
692
496
                       else
693
497
                          # has a slave config
694
498
                          
695
499
                          if [ "$slave_sql" = 'Yes' -a "$slave_io" = 'Yes' ]; then
696
500
                              # $secs_behind can be NULL so must be tested only
697
501
                              # if replication is OK
698
502
                              if [ $secs_behind -gt $OCF_RESKEY_max_slave_lag ]; then
699
503
                                  set_reader_attr 0
700
504
                              else
701
505
                                  set_reader_attr 1
702
506
                              fi
703
507
                          else
704
508
                              set_reader_attr 0
705
509
                          fi
706
510
                       fi
707
511
                    else
708
512
                       # "SHOW SLAVE STATUS" returns an empty set if instance is not a
709
513
                       # replication slave
710
514
                       
711
515
                       set_reader_attr 0
712
516
                       
713
517
                    fi
714
518
                else
715
519
                    # host is RW
716
520
                    set_reader_attr 1
717
521
                    set_writer_attr 1
718
522
                fi
719
523
                ;;
720
524
                
721
525
            'pxc'|'PXC')
722
526
                pxcstat=`/usr/bin/clustercheck $OCF_RESKEY_user $OCF_RESKEY_password `
723
527
                if [ $? -eq 0 ]; then
724
528
                    set_reader_attr 1
725
529
                    set_writer_attr 1
726
530
                else
727
531
                    set_reader_attr 0
728
532
                    set_writer_attr 0
729
533
                fi
730
534
                
731
535
                ;;
732
536
                
733
537
            'read-only'|'READ-ONLY')
734
538
                if get_read_only; then
735
539
                    set_reader_attr 1
736
540
                    set_writer_attr 0                    
737
541
                else
738
542
                    set_reader_attr 1
739
543
                    set_writer_attr 1
740
544
                fi
741
545
                ;;
742
546
                
743
547
            esac
744
548
        else
745
549
            ocf_log $1 "MySQL is not running, but there is a pidfile"
746
550
            set_reader_attr 0
747
551
            set_writer_attr 0
748
552
        fi
749
553
    else
750
554
        ocf_log $1 "MySQL is not running"
751
555
        set_reader_attr 0
752
556
        set_writer_attr 0
753
557
    fi
754
558
}
755
559
    
756
560
mysql_monitor_monitor() {
757
561
	# Monitor _MUST!_ differentiate correctly between running
758
562
	# (SUCCESS), failed (ERROR) or _cleanly_ stopped (NOT RUNNING).
759
563
	# That is THREE states, not just yes/no.
760
564
    
761
565
	if [ -f ${OCF_RESKEY_state} ]; then
762
566
	    return $OCF_SUCCESS
763
567
	fi
764
568
	if false ; then
765
569
		return $OCF_ERR_GENERIC
766
570
	fi
767
571
	return $OCF_NOT_RUNNING
768
572
}
769
573
770
574
mysql_monitor_validate() {
771
575
    
772
576
    # Is the state directory writable? 
773
577
    state_dir=`dirname "$OCF_RESKEY_state"`
774
578
    touch "$state_dir/$$"
775
579
    if [ $? != 0 ]; then
776
580
	return $OCF_ERR_ARGS
777
581
    fi
778
582
    rm "$state_dir/$$"
779
583
780
584
    return $OCF_SUCCESS
781
585
}
782
586
783
587
##########################################################################
784
588
# If DEBUG_LOG is set, make this resource agent easy to debug: set up the
785
589
# debug log and direct all output to it.  Otherwise, redirect to /dev/null.
786
590
# The log directory must be a directory owned by root, with permissions 0700,
787
591
# and the log must be writable and not a symlink.
788
592
##########################################################################
789
593
DEBUG_LOG="/tmp/mysql_monitor.ocf.ra.debug/log"
790
594
if [ "${DEBUG_LOG}" -a -w "${DEBUG_LOG}" -a ! -L "${DEBUG_LOG}" ]; then
791
595
    DEBUG_LOG_DIR="${DEBUG_LOG%/*}"
792
596
    if [ -d "${DEBUG_LOG_DIR}" ]; then
793
597
        exec 9>>"$DEBUG_LOG"
794
598
        exec 2>&9
795
599
        date >&9
796
600
        echo "$*" >&9
797
601
        env | grep OCF_ | sort >&9
798
602
        set -x
799
603
    else
800
604
        exec 9>/dev/null
801
605
    fi
802
606
fi
803
607
804
608
805
609
case $__OCF_ACTION in
806
610
meta-data)	meta_data
807
611
		exit $OCF_SUCCESS
808
612
		;;
809
613
start)		mysql_monitor_start;;
810
614
stop)		mysql_monitor_stop;;
811
615
monitor)	mysql_monitor
812
616
            mysql_monitor_monitor;;
813
617
migrate_to)	ocf_log info "Migrating ${OCF_RESOURCE_INSTANCE} to ${OCF_RESKEY_CRM_meta_migrate_target}."
814
618
	        mysql_monitor_stop
815
619
		;;
816
620
migrate_from)	ocf_log info "Migrating ${OCF_RESOURCE_INSTANCE} from ${OCF_RESKEY_CRM_meta_migrate_source}."
817
621
	        mysql_monitor_start
818
622
		;;
819
623
reload)		ocf_log info "Reloading ${OCF_RESOURCE_INSTANCE} ..."
820
624
		;;
821
625
validate-all)	mysql_monitor_validate;;
822
626
usage|help)	mysql_monitor_usage
823
627
		exit $OCF_SUCCESS
824
628
		;;
825
629
*)		mysql_monitor_usage
826
630
		exit $OCF_ERR_UNIMPLEMENTED
827
631
		;;
828
632
esac
829
633
rc=$?
830
634
ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
831
635
exit $rc
832
636
833
0
637
834
=== added file 'setup.cfg'
835
--- setup.cfg	1970-01-01 00:00:00 +0000
836
+++ setup.cfg	2015-04-17 10:12:07 +0000
837
@@ -0,0 +1,6 @@
838
1
[nosetests]
839
2
verbosity=2
840
3
with-coverage=1
841
4
cover-erase=1
842
5
cover-package=hooks
843
6
844
0
7
845
=== modified file 'templates/my.cnf'
846
--- templates/my.cnf	2015-03-04 15:30:55 +0000
847
+++ templates/my.cnf	2015-04-17 10:12:07 +0000
848
@@ -11,6 +11,7 @@
849
11
11
850
12
datadir=/var/lib/mysql
12
datadir=/var/lib/mysql
851
13
user=mysql
13
user=mysql
852
14
pid_file = /var/run/mysqld/mysqld.pid
853
14
15
854
15
# Path to Galera library
16
# Path to Galera library
855
16
wsrep_provider=/usr/lib/libgalera_smm.so
17
wsrep_provider=/usr/lib/libgalera_smm.so
856
17
18
857
=== added directory 'tests'
858
=== added file 'tests/00-setup.sh'
859
--- tests/00-setup.sh	1970-01-01 00:00:00 +0000
860
+++ tests/00-setup.sh	2015-04-17 10:12:07 +0000
861
@@ -0,0 +1,29 @@
862
1
#!/bin/bash -x
863
2
# The script installs amulet and other tools needed for the amulet tests.
864
3
865
4
# Get the status of the amulet package, this returns 0 of package is installed.
866
5
dpkg -s amulet
867
6
if [ $? -ne 0 ]; then
868
7
  # Install the Amulet testing harness.
869
8
  sudo add-apt-repository -y ppa:juju/stable
870
9
  sudo apt-get update 
871
10
  sudo apt-get install -y -q amulet juju-core charm-tools
872
11
fi
873
12
874
13
875
14
PACKAGES="python3 python3-yaml"
876
15
for pkg in $PACKAGES; do
877
16
  dpkg -s python3
878
17
  if [ $? -ne 0 ]; then
879
18
    sudo apt-get install -y -q $pkg
880
19
  fi
881
20
done
882
21
883
22
884
23
#if [ ! -f "$(dirname $0)/../local.yaml" ]; then
885
24
#  echo "To run these amulet tests a vip is needed, create a file called \
886
25
#local.yaml in the charm dir, this file must contain a 'vip', if you're \
887
26
#using the local provider with lxc you could use a free IP from the range \
888
27
#10.0.3.0/24"
889
28
#  exit 1
890
29
#fi
891
0
30
892
=== added file 'tests/10-deploy_test.py'
893
--- tests/10-deploy_test.py	1970-01-01 00:00:00 +0000
894
+++ tests/10-deploy_test.py	2015-04-17 10:12:07 +0000
895
@@ -0,0 +1,29 @@
896
1
#!/usr/bin/python3
897
2
# test percona-cluster (3 nodes)
898
3
899
4
import basic_deployment
900
5
import time
901
6
902
7
903
8
class ThreeNode(basic_deployment.BasicDeployment):
904
9
    def __init__(self):
905
10
        super(ThreeNode, self).__init__(units=3)
906
11
907
12
    def run(self):
908
13
        super(ThreeNode, self).run()
909
14
        # we are going to kill the master
910
15
        old_master = self.master_unit
911
16
        self.master_unit.run('sudo poweroff')
912
17
913
18
        time.sleep(10)  # give some time to pacemaker to react
914
19
        new_master = self.find_master()
915
20
        assert new_master is not None, "master unit not found"
916
21
        assert (new_master.info['public-address'] !=
917
22
                    old_master.info['public-address'])
918
23
919
24
        assert self.is_port_open(address=self.vip), 'cannot connect to vip'
920
25
921
26
922
27
if __name__ == "__main__":
923
28
    t = ThreeNode()
924
29
    t.run()
925
0
30
926
=== added file 'tests/20-broken-mysqld.py'
927
--- tests/20-broken-mysqld.py	1970-01-01 00:00:00 +0000
928
+++ tests/20-broken-mysqld.py	2015-04-17 10:12:07 +0000
929
@@ -0,0 +1,38 @@
930
1
#!/usr/bin/python3
931
2
# test percona-cluster (3 nodes)
932
3
933
4
import basic_deployment
934
5
import time
935
6
936
7
937
8
class ThreeNode(basic_deployment.BasicDeployment):
938
9
    def __init__(self):
939
10
        super(ThreeNode, self).__init__(units=3)
940
11
941
12
    def run(self):
942
13
        super(ThreeNode, self).run()
943
14
        # we are going to kill the master
944
15
        old_master = self.master_unit
945
16
        print('stopping mysql in %s' % str(self.master_unit.info))
946
17
        self.master_unit.run('sudo service mysql stop')
947
18
948
19
        print('looking for the new master')
949
20
        i = 0
950
21
        changed = False
951
22
        while i < 10 and not changed:
952
23
            i += 1
953
24
            time.sleep(5)  # give some time to pacemaker to react
954
25
            new_master = self.find_master()
955
26
956
27
            if (new_master and new_master.info['unit_name'] !=
957
28
                    old_master.info['unit_name']):
958
29
                changed = True
959
30
960
31
        assert changed, "The master didn't change"
961
32
962
33
        assert self.is_port_open(address=self.vip), 'cannot connect to vip'
963
34
964
35
965
36
if __name__ == "__main__":
966
37
    t = ThreeNode()
967
38
    t.run()
968
0
39
969
=== added file 'tests/30-kill-9-mysqld.py'
970
--- tests/30-kill-9-mysqld.py	1970-01-01 00:00:00 +0000
971
+++ tests/30-kill-9-mysqld.py	2015-04-17 10:12:07 +0000
972
@@ -0,0 +1,38 @@
973
1
#!/usr/bin/python3
974
2
# test percona-cluster (3 nodes)
975
3
976
4
import basic_deployment
977
5
import time
978
6
979
7
980
8
class ThreeNode(basic_deployment.BasicDeployment):
981
9
    def __init__(self):
982
10
        super(ThreeNode, self).__init__(units=3)
983
11
984
12
    def run(self):
985
13
        super(ThreeNode, self).run()
986
14
        # we are going to kill the master
987
15
        old_master = self.master_unit
988
16
        print('kill-9 mysqld in %s' % str(self.master_unit.info))
989
17
        self.master_unit.run('sudo killall -9 mysqld')
990
18
991
19
        print('looking for the new master')
992
20
        i = 0
993
21
        changed = False
994
22
        while i < 10 and not changed:
995
23
            i += 1
996
24
            time.sleep(5)  # give some time to pacemaker to react
997
25
            new_master = self.find_master()
998
26
999
27
            if (new_master and new_master.info['unit_name'] !=
1000
28
                    old_master.info['unit_name']):
1001
29
                changed = True
1002
30
1003
31
        assert changed, "The master didn't change"
1004
32
1005
33
        assert self.is_port_open(address=self.vip), 'cannot connect to vip'
1006
34
1007
35
1008
36
if __name__ == "__main__":
1009
37
    t = ThreeNode()
1010
38
    t.run()
1011
0
39
1012
=== added file 'tests/basic_deployment.py'
1013
--- tests/basic_deployment.py	1970-01-01 00:00:00 +0000
1014
+++ tests/basic_deployment.py	2015-04-17 10:12:07 +0000
1015
@@ -0,0 +1,151 @@
1016
1
import amulet
1017
2
import os
1018
3
import time
1019
4
import telnetlib
1020
5
import unittest
1021
6
import yaml
1022
7
from charmhelpers.contrib.openstack.amulet.deployment import (
1023
8
    OpenStackAmuletDeployment
1024
9
)
1025
10
1026
11
1027
12
class BasicDeployment(OpenStackAmuletDeployment):
1028
13
    def __init__(self, vip=None, units=1, series="trusty", openstack=None,
1029
14
                 source=None, stable=False):
1030
15
        super(BasicDeployment, self).__init__(series, openstack, source,
1031
16
                                              stable)
1032
17
        self.units = units
1033
18
        self.master_unit = None
1034
19
        self.vip = None
1035
20
        if vip:
1036
21
            self.vip = vip
1037
22
        elif 'AMULET_OS_VIP' in os.environ:
1038
23
            self.vip = os.environ.get('AMULET_OS_VIP')
1039
24
        elif os.path.isfile('local.yaml'):
1040
25
            with open('local.yaml', 'rb') as f:
1041
26
                self.cfg = yaml.safe_load(f.read())
1042
27
1043
28
            self.vip = self.cfg.get('vip')
1044
29
        else:
1045
30
            amulet.raise_status(amulet.SKIP,
1046
31
                                ("please set the vip in local.yaml or env var "
1047
32
                                 "AMULET_OS_VIP to run this test suite"))
1048
33
1049
34
    def _add_services(self):
1050
35
        """Add services
1051
36
1052
37
           Add the services that we're testing, where percona-cluster is local,
1053
38
           and the rest of the service are from lp branches that are
1054
39
           compatible with the local charm (e.g. stable or next).
1055
40
           """
1056
41
        this_service = {'name': 'percona-cluster',
1057
42
                        'units': self.units}
1058
43
        other_services = [{'name': 'hacluster'}]
1059
44
        super(BasicDeployment, self)._add_services(this_service,
1060
45
                                                   other_services)
1061
46
1062
47
    def _add_relations(self):
1063
48
        """Add all of the relations for the services."""
1064
49
        relations = {'percona-cluster:ha': 'hacluster:ha'}
1065
50
        super(BasicDeployment, self)._add_relations(relations)
1066
51
1067
52
    def _configure_services(self):
1068
53
        """Configure all of the services."""
1069
54
        cfg_percona = {'sst-password': 'ubuntu',
1070
55
                       'root-password': 't00r',
1071
56
                       'dataset-size': '512M',
1072
57
                       'vip': self.vip}
1073
58
1074
59
        cfg_ha = {'debug': True,
1075
60
                  'corosync_mcastaddr': '226.94.1.4',
1076
61
                  'corosync_key': ('xZP7GDWV0e8Qs0GxWThXirNNYlScgi3sRTdZk/IXKD'
1077
62
                                   'qkNFcwdCWfRQnqrHU/6mb6sz6OIoZzX2MtfMQIDcXu'
1078
63
                                   'PqQyvKuv7YbRyGHmQwAWDUA4ed759VWAO39kHkfWp9'
1079
64
                                   'y5RRk/wcHakTcWYMwm70upDGJEP00YT3xem3NQy27A'
1080
65
                                   'C1w=')}
1081
66
1082
67
        configs = {'percona-cluster': cfg_percona,
1083
68
                   'hacluster': cfg_ha}
1084
69
        super(BasicDeployment, self)._configure_services(configs)
1085
70
1086
71
    def run(self):
1087
72
        # The number of seconds to wait for the environment to setup.
1088
73
        seconds = 1200
1089
74
1090
75
        self._add_services()
1091
76
        self._add_relations()
1092
77
        self._configure_services()
1093
78
        self._deploy()
1094
79
1095
80
        i = 0
1096
81
        while i < 30 and not self.master_unit:
1097
82
            self.master_unit = self.find_master()
1098
83
            i += 1
1099
84
            time.sleep(10)
1100
85
1101
86
        assert self.master_unit is not None, 'percona-cluster vip not found'
1102
87
1103
88
        output, code = self.master_unit.run('sudo crm_verify --live-check')
1104
89
        assert code == 0, "'crm_verify --live-check' failed"
1105
90
1106
91
        resources = ['res_mysql_vip']
1107
92
        resources += ['res_mysql_monitor:%d' % i for i in range(self.units)]
1108
93
1109
94
        assert sorted(self.get_pcmkr_resources()) == sorted(resources)
1110
95
1111
96
        for i in range(self.units):
1112
97
            uid = 'percona-cluster/%d' % i
1113
98
            unit = self.d.sentry.unit[uid]
1114
99
            assert self.is_mysqld_running(unit), 'mysql not running: %s' % uid
1115
100
1116
101
    def find_master(self):
1117
102
        for unit_id, unit in self.d.sentry.unit.items():
1118
103
            if not unit_id.startswith('percona-cluster/'):
1119
104
                continue
1120
105
1121
106
            # is the vip running here?
1122
107
            output, code = unit.run('sudo ip a | grep "inet %s/"' % self.vip)
1123
108
            print('---')
1124
109
            print(unit_id)
1125
110
            print(output)
1126
111
            if code == 0:
1127
112
                print('vip(%s) running in %s' % (self.vip, unit_id))
1128
113
                return unit
1129
114
1130
115
    def get_pcmkr_resources(self, unit=None):
1131
116
        if unit:
1132
117
            u = unit
1133
118
        else:
1134
119
            u = self.master_unit
1135
120
1136
121
        output, code = u.run('sudo crm_resource -l')
1137
122
1138
123
        assert code == 0, 'could not get "crm resource list"'
1139
124
1140
125
        return output.split('\n')
1141
126
1142
127
    def is_mysqld_running(self, unit=None):
1143
128
        if unit:
1144
129
            u = unit
1145
130
        else:
1146
131
            u = self.master_unit
1147
132
1148
133
        output, code = u.run('pidof mysqld')
1149
134
1150
135
        if code != 0:
1151
136
            return False
1152
137
1153
138
        return self.is_port_open(u, '3306')
1154
139
1155
140
    def is_port_open(self, unit=None, port='3306', address=None):
1156
141
        if unit:
1157
142
            addr = unit.info['public-address']
1158
143
        elif address:
1159
144
            addr = address
1160
145
        else:
1161
146
            raise Exception('Please provide a unit or address')
1162
147
        try:
1163
148
            telnetlib.Telnet(addr, port)
1164
149
            return True
1165
150
        except TimeoutError:  # noqa this exception only available in py3
1166
151
            return False
1167
0
152
1168
=== added directory 'tests/charmhelpers'
1169
=== added file 'tests/charmhelpers/__init__.py'
1170
--- tests/charmhelpers/__init__.py	1970-01-01 00:00:00 +0000
1171
+++ tests/charmhelpers/__init__.py	2015-04-17 10:12:07 +0000
1172
@@ -0,0 +1,38 @@
1173
1
# Copyright 2014-2015 Canonical Limited.
1174
2
#
1175
3
# This file is part of charm-helpers.
1176
4
#
1177
5
# charm-helpers is free software: you can redistribute it and/or modify
1178
6
# it under the terms of the GNU Lesser General Public License version 3 as
1179
7
# published by the Free Software Foundation.
1180
8
#
1181
9
# charm-helpers is distributed in the hope that it will be useful,
1182
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1183
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1184
12
# GNU Lesser General Public License for more details.
1185
13
#
1186
14
# You should have received a copy of the GNU Lesser General Public License
1187
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1188
16
1189
17
# Bootstrap charm-helpers, installing its dependencies if necessary using
1190
18
# only standard libraries.
1191
19
import subprocess
1192
20
import sys
1193
21
1194
22
try:
1195
23
    import six  # flake8: noqa
1196
24
except ImportError:
1197
25
    if sys.version_info.major == 2:
1198
26
        subprocess.check_call(['apt-get', 'install', '-y', 'python-six'])
1199
27
    else:
1200
28
        subprocess.check_call(['apt-get', 'install', '-y', 'python3-six'])
1201
29
    import six  # flake8: noqa
1202
30
1203
31
try:
1204
32
    import yaml  # flake8: noqa
1205
33
except ImportError:
1206
34
    if sys.version_info.major == 2:
1207
35
        subprocess.check_call(['apt-get', 'install', '-y', 'python-yaml'])
1208
36
    else:
1209
37
        subprocess.check_call(['apt-get', 'install', '-y', 'python3-yaml'])
1210
38
    import yaml  # flake8: noqa
1211
0
39
1212
=== added directory 'tests/charmhelpers/contrib'
1213
=== added file 'tests/charmhelpers/contrib/__init__.py'
1214
--- tests/charmhelpers/contrib/__init__.py	1970-01-01 00:00:00 +0000
1215
+++ tests/charmhelpers/contrib/__init__.py	2015-04-17 10:12:07 +0000
1216
@@ -0,0 +1,15 @@
1217
1
# Copyright 2014-2015 Canonical Limited.
1218
2
#
1219
3
# This file is part of charm-helpers.
1220
4
#
1221
5
# charm-helpers is free software: you can redistribute it and/or modify
1222
6
# it under the terms of the GNU Lesser General Public License version 3 as
1223
7
# published by the Free Software Foundation.
1224
8
#
1225
9
# charm-helpers is distributed in the hope that it will be useful,
1226
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1227
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1228
12
# GNU Lesser General Public License for more details.
1229
13
#
1230
14
# You should have received a copy of the GNU Lesser General Public License
1231
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1232
0
16
1233
=== added directory 'tests/charmhelpers/contrib/amulet'
1234
=== added file 'tests/charmhelpers/contrib/amulet/__init__.py'
1235
--- tests/charmhelpers/contrib/amulet/__init__.py	1970-01-01 00:00:00 +0000
1236
+++ tests/charmhelpers/contrib/amulet/__init__.py	2015-04-17 10:12:07 +0000
1237
@@ -0,0 +1,15 @@
1238
1
# Copyright 2014-2015 Canonical Limited.
1239
2
#
1240
3
# This file is part of charm-helpers.
1241
4
#
1242
5
# charm-helpers is free software: you can redistribute it and/or modify
1243
6
# it under the terms of the GNU Lesser General Public License version 3 as
1244
7
# published by the Free Software Foundation.
1245
8
#
1246
9
# charm-helpers is distributed in the hope that it will be useful,
1247
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1248
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1249
12
# GNU Lesser General Public License for more details.
1250
13
#
1251
14
# You should have received a copy of the GNU Lesser General Public License
1252
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1253
0
16
1254
=== added file 'tests/charmhelpers/contrib/amulet/deployment.py'
1255
--- tests/charmhelpers/contrib/amulet/deployment.py	1970-01-01 00:00:00 +0000
1256
+++ tests/charmhelpers/contrib/amulet/deployment.py	2015-04-17 10:12:07 +0000
1257
@@ -0,0 +1,93 @@
1258
1
# Copyright 2014-2015 Canonical Limited.
1259
2
#
1260
3
# This file is part of charm-helpers.
1261
4
#
1262
5
# charm-helpers is free software: you can redistribute it and/or modify
1263
6
# it under the terms of the GNU Lesser General Public License version 3 as
1264
7
# published by the Free Software Foundation.
1265
8
#
1266
9
# charm-helpers is distributed in the hope that it will be useful,
1267
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1268
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1269
12
# GNU Lesser General Public License for more details.
1270
13
#
1271
14
# You should have received a copy of the GNU Lesser General Public License
1272
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1273
16
1274
17
import amulet
1275
18
import os
1276
19
import six
1277
20
1278
21
1279
22
class AmuletDeployment(object):
1280
23
    """Amulet deployment.
1281
24
1282
25
       This class provides generic Amulet deployment and test runner
1283
26
       methods.
1284
27
       """
1285
28
1286
29
    def __init__(self, series=None):
1287
30
        """Initialize the deployment environment."""
1288
31
        self.series = None
1289
32
1290
33
        if series:
1291
34
            self.series = series
1292
35
            self.d = amulet.Deployment(series=self.series)
1293
36
        else:
1294
37
            self.d = amulet.Deployment()
1295
38
1296
39
    def _add_services(self, this_service, other_services):
1297
40
        """Add services.
1298
41
1299
42
           Add services to the deployment where this_service is the local charm
1300
43
           that we're testing and other_services are the other services that
1301
44
           are being used in the local amulet tests.
1302
45
           """
1303
46
        if this_service['name'] != os.path.basename(os.getcwd()):
1304
47
            s = this_service['name']
1305
48
            msg = "The charm's root directory name needs to be {}".format(s)
1306
49
            amulet.raise_status(amulet.FAIL, msg=msg)
1307
50
1308
51
        if 'units' not in this_service:
1309
52
            this_service['units'] = 1
1310
53
1311
54
        self.d.add(this_service['name'], units=this_service['units'])
1312
55
1313
56
        for svc in other_services:
1314
57
            if 'location' in svc:
1315
58
                branch_location = svc['location']
1316
59
            elif self.series:
1317
60
                branch_location = 'cs:{}/{}'.format(self.series, svc['name']),
1318
61
            else:
1319
62
                branch_location = None
1320
63
1321
64
            if 'units' not in svc:
1322
65
                svc['units'] = 1
1323
66
1324
67
            self.d.add(svc['name'], charm=branch_location, units=svc['units'])
1325
68
1326
69
    def _add_relations(self, relations):
1327
70
        """Add all of the relations for the services."""
1328
71
        for k, v in six.iteritems(relations):
1329
72
            self.d.relate(k, v)
1330
73
1331
74
    def _configure_services(self, configs):
1332
75
        """Configure all of the services."""
1333
76
        for service, config in six.iteritems(configs):
1334
77
            self.d.configure(service, config)
1335
78
1336
79
    def _deploy(self):
1337
80
        """Deploy environment and wait for all hooks to finish executing."""
1338
81
        try:
1339
82
            self.d.setup(timeout=900)
1340
83
            self.d.sentry.wait(timeout=900)
1341
84
        except amulet.helpers.TimeoutError:
1342
85
            amulet.raise_status(amulet.FAIL, msg="Deployment timed out")
1343
86
        except Exception:
1344
87
            raise
1345
88
1346
89
    def run_tests(self):
1347
90
        """Run all of the methods that are prefixed with 'test_'."""
1348
91
        for test in dir(self):
1349
92
            if test.startswith('test_'):
1350
93
                getattr(self, test)()
1351
0
94
1352
=== added file 'tests/charmhelpers/contrib/amulet/utils.py'
1353
--- tests/charmhelpers/contrib/amulet/utils.py	1970-01-01 00:00:00 +0000
1354
+++ tests/charmhelpers/contrib/amulet/utils.py	2015-04-17 10:12:07 +0000
1355
@@ -0,0 +1,316 @@
1356
1
# Copyright 2014-2015 Canonical Limited.
1357
2
#
1358
3
# This file is part of charm-helpers.
1359
4
#
1360
5
# charm-helpers is free software: you can redistribute it and/or modify
1361
6
# it under the terms of the GNU Lesser General Public License version 3 as
1362
7
# published by the Free Software Foundation.
1363
8
#
1364
9
# charm-helpers is distributed in the hope that it will be useful,
1365
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1366
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1367
12
# GNU Lesser General Public License for more details.
1368
13
#
1369
14
# You should have received a copy of the GNU Lesser General Public License
1370
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1371
16
1372
17
import ConfigParser
1373
18
import io
1374
19
import logging
1375
20
import re
1376
21
import sys
1377
22
import time
1378
23
1379
24
import six
1380
25
1381
26
1382
27
class AmuletUtils(object):
1383
28
    """Amulet utilities.
1384
29
1385
30
       This class provides common utility functions that are used by Amulet
1386
31
       tests.
1387
32
       """
1388
33
1389
34
    def __init__(self, log_level=logging.ERROR):
1390
35
        self.log = self.get_logger(level=log_level)
1391
36
1392
37
    def get_logger(self, name="amulet-logger", level=logging.DEBUG):
1393
38
        """Get a logger object that will log to stdout."""
1394
39
        log = logging
1395
40
        logger = log.getLogger(name)
1396
41
        fmt = log.Formatter("%(asctime)s %(funcName)s "
1397
42
                            "%(levelname)s: %(message)s")
1398
43
1399
44
        handler = log.StreamHandler(stream=sys.stdout)
1400
45
        handler.setLevel(level)
1401
46
        handler.setFormatter(fmt)
1402
47
1403
48
        logger.addHandler(handler)
1404
49
        logger.setLevel(level)
1405
50
1406
51
        return logger
1407
52
1408
53
    def valid_ip(self, ip):
1409
54
        if re.match(r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$", ip):
1410
55
            return True
1411
56
        else:
1412
57
            return False
1413
58
1414
59
    def valid_url(self, url):
1415
60
        p = re.compile(
1416
61
            r'^(?:http|ftp)s?://'
1417
62
            r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|'  # noqa
1418
63
            r'localhost|'
1419
64
            r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'
1420
65
            r'(?::\d+)?'
1421
66
            r'(?:/?|[/?]\S+)$',
1422
67
            re.IGNORECASE)
1423
68
        if p.match(url):
1424
69
            return True
1425
70
        else:
1426
71
            return False
1427
72
1428
73
    def validate_services(self, commands):
1429
74
        """Validate services.
1430
75
1431
76
           Verify the specified services are running on the corresponding
1432
77
           service units.
1433
78
           """
1434
79
        for k, v in six.iteritems(commands):
1435
80
            for cmd in v:
1436
81
                output, code = k.run(cmd)
1437
82
                if code != 0:
1438
83
                    return "command `{}` returned {}".format(cmd, str(code))
1439
84
        return None
1440
85
1441
86
    def _get_config(self, unit, filename):
1442
87
        """Get a ConfigParser object for parsing a unit's config file."""
1443
88
        file_contents = unit.file_contents(filename)
1444
89
        config = ConfigParser.ConfigParser()
1445
90
        config.readfp(io.StringIO(file_contents))
1446
91
        return config
1447
92
1448
93
    def validate_config_data(self, sentry_unit, config_file, section,
1449
94
                             expected):
1450
95
        """Validate config file data.
1451
96
1452
97
           Verify that the specified section of the config file contains
1453
98
           the expected option key:value pairs.
1454
99
           """
1455
100
        config = self._get_config(sentry_unit, config_file)
1456
101
1457
102
        if section != 'DEFAULT' and not config.has_section(section):
1458
103
            return "section [{}] does not exist".format(section)
1459
104
1460
105
        for k in expected.keys():
1461
106
            if not config.has_option(section, k):
1462
107
                return "section [{}] is missing option {}".format(section, k)
1463
108
            if config.get(section, k) != expected[k]:
1464
109
                return "section [{}] {}:{} != expected {}:{}".format(
1465
110
                       section, k, config.get(section, k), k, expected[k])
1466
111
        return None
1467
112
1468
113
    def _validate_dict_data(self, expected, actual):
1469
114
        """Validate dictionary data.
1470
115
1471
116
           Compare expected dictionary data vs actual dictionary data.
1472
117
           The values in the 'expected' dictionary can be strings, bools, ints,
1473
118
           longs, or can be a function that evaluate a variable and returns a
1474
119
           bool.
1475
120
           """
1476
121
        self.log.debug('actual: {}'.format(repr(actual)))
1477
122
        self.log.debug('expected: {}'.format(repr(expected)))
1478
123
1479
124
        for k, v in six.iteritems(expected):
1480
125
            if k in actual:
1481
126
                if (isinstance(v, six.string_types) or
1482
127
                        isinstance(v, bool) or
1483
128
                        isinstance(v, six.integer_types)):
1484
129
                    if v != actual[k]:
1485
130
                        return "{}:{}".format(k, actual[k])
1486
131
                elif not v(actual[k]):
1487
132
                    return "{}:{}".format(k, actual[k])
1488
133
            else:
1489
134
                return "key '{}' does not exist".format(k)
1490
135
        return None
1491
136
1492
137
    def validate_relation_data(self, sentry_unit, relation, expected):
1493
138
        """Validate actual relation data based on expected relation data."""
1494
139
        actual = sentry_unit.relation(relation[0], relation[1])
1495
140
        return self._validate_dict_data(expected, actual)
1496
141
1497
142
    def _validate_list_data(self, expected, actual):
1498
143
        """Compare expected list vs actual list data."""
1499
144
        for e in expected:
1500
145
            if e not in actual:
1501
146
                return "expected item {} not found in actual list".format(e)
1502
147
        return None
1503
148
1504
149
    def not_null(self, string):
1505
150
        if string is not None:
1506
151
            return True
1507
152
        else:
1508
153
            return False
1509
154
1510
155
    def _get_file_mtime(self, sentry_unit, filename):
1511
156
        """Get last modification time of file."""
1512
157
        return sentry_unit.file_stat(filename)['mtime']
1513
158
1514
159
    def _get_dir_mtime(self, sentry_unit, directory):
1515
160
        """Get last modification time of directory."""
1516
161
        return sentry_unit.directory_stat(directory)['mtime']
1517
162
1518
163
    def _get_proc_start_time(self, sentry_unit, service, pgrep_full=False):
1519
164
        """Get process' start time.
1520
165
1521
166
           Determine start time of the process based on the last modification
1522
167
           time of the /proc/pid directory. If pgrep_full is True, the process
1523
168
           name is matched against the full command line.
1524
169
           """
1525
170
        if pgrep_full:
1526
171
            cmd = 'pgrep -o -f {}'.format(service)
1527
172
        else:
1528
173
            cmd = 'pgrep -o {}'.format(service)
1529
174
        cmd = cmd + '  | grep  -v pgrep || exit 0'
1530
175
        cmd_out = sentry_unit.run(cmd)
1531
176
        self.log.debug('CMDout: ' + str(cmd_out))
1532
177
        if cmd_out[0]:
1533
178
            self.log.debug('Pid for %s %s' % (service, str(cmd_out[0])))
1534
179
            proc_dir = '/proc/{}'.format(cmd_out[0].strip())
1535
180
            return self._get_dir_mtime(sentry_unit, proc_dir)
1536
181
1537
182
    def service_restarted(self, sentry_unit, service, filename,
1538
183
                          pgrep_full=False, sleep_time=20):
1539
184
        """Check if service was restarted.
1540
185
1541
186
           Compare a service's start time vs a file's last modification time
1542
187
           (such as a config file for that service) to determine if the service
1543
188
           has been restarted.
1544
189
           """
1545
190
        time.sleep(sleep_time)
1546
191
        if (self._get_proc_start_time(sentry_unit, service, pgrep_full) >=
1547
192
                self._get_file_mtime(sentry_unit, filename)):
1548
193
            return True
1549
194
        else:
1550
195
            return False
1551
196
1552
197
    def service_restarted_since(self, sentry_unit, mtime, service,
1553
198
                                pgrep_full=False, sleep_time=20,
1554
199
                                retry_count=2):
1555
200
        """Check if service was been started after a given time.
1556
201
1557
202
        Args:
1558
203
          sentry_unit (sentry): The sentry unit to check for the service on
1559
204
          mtime (float): The epoch time to check against
1560
205
          service (string): service name to look for in process table
1561
206
          pgrep_full (boolean): Use full command line search mode with pgrep
1562
207
          sleep_time (int): Seconds to sleep before looking for process
1563
208
          retry_count (int): If service is not found, how many times to retry
1564
209
1565
210
        Returns:
1566
211
          bool: True if service found and its start time it newer than mtime,
1567
212
                False if service is older than mtime or if service was
1568
213
                not found.
1569
214
        """
1570
215
        self.log.debug('Checking %s restarted since %s' % (service, mtime))
1571
216
        time.sleep(sleep_time)
1572
217
        proc_start_time = self._get_proc_start_time(sentry_unit, service,
1573
218
                                                    pgrep_full)
1574
219
        while retry_count > 0 and not proc_start_time:
1575
220
            self.log.debug('No pid file found for service %s, will retry %i '
1576
221
                           'more times' % (service, retry_count))
1577
222
            time.sleep(30)
1578
223
            proc_start_time = self._get_proc_start_time(sentry_unit, service,
1579
224
                                                        pgrep_full)
1580
225
            retry_count = retry_count - 1
1581
226
1582
227
        if not proc_start_time:
1583
228
            self.log.warn('No proc start time found, assuming service did '
1584
229
                          'not start')
1585
230
            return False
1586
231
        if proc_start_time >= mtime:
1587
232
            self.log.debug('proc start time is newer than provided mtime'
1588
233
                           '(%s >= %s)' % (proc_start_time, mtime))
1589
234
            return True
1590
235
        else:
1591
236
            self.log.warn('proc start time (%s) is older than provided mtime '
1592
237
                          '(%s), service did not restart' % (proc_start_time,
1593
238
                                                             mtime))
1594
239
            return False
1595
240
1596
241
    def config_updated_since(self, sentry_unit, filename, mtime,
1597
242
                             sleep_time=20):
1598
243
        """Check if file was modified after a given time.
1599
244
1600
245
        Args:
1601
246
          sentry_unit (sentry): The sentry unit to check the file mtime on
1602
247
          filename (string): The file to check mtime of
1603
248
          mtime (float): The epoch time to check against
1604
249
          sleep_time (int): Seconds to sleep before looking for process
1605
250
1606
251
        Returns:
1607
252
          bool: True if file was modified more recently than mtime, False if
1608
253
                file was modified before mtime,
1609
254
        """
1610
255
        self.log.debug('Checking %s updated since %s' % (filename, mtime))
1611
256
        time.sleep(sleep_time)
1612
257
        file_mtime = self._get_file_mtime(sentry_unit, filename)
1613
258
        if file_mtime >= mtime:
1614
259
            self.log.debug('File mtime is newer than provided mtime '
1615
260
                           '(%s >= %s)' % (file_mtime, mtime))
1616
261
            return True
1617
262
        else:
1618
263
            self.log.warn('File mtime %s is older than provided mtime %s'
1619
264
                          % (file_mtime, mtime))
1620
265
            return False
1621
266
1622
267
    def validate_service_config_changed(self, sentry_unit, mtime, service,
1623
268
                                        filename, pgrep_full=False,
1624
269
                                        sleep_time=20, retry_count=2):
1625
270
        """Check service and file were updated after mtime
1626
271
1627
272
        Args:
1628
273
          sentry_unit (sentry): The sentry unit to check for the service on
1629
274
          mtime (float): The epoch time to check against
1630
275
          service (string): service name to look for in process table
1631
276
          filename (string): The file to check mtime of
1632
277
          pgrep_full (boolean): Use full command line search mode with pgrep
1633
278
          sleep_time (int): Seconds to sleep before looking for process
1634
279
          retry_count (int): If service is not found, how many times to retry
1635
280
1636
281
        Typical Usage:
1637
282
            u = OpenStackAmuletUtils(ERROR)
1638
283
            ...
1639
284
            mtime = u.get_sentry_time(self.cinder_sentry)
1640
285
            self.d.configure('cinder', {'verbose': 'True', 'debug': 'True'})
1641
286
            if not u.validate_service_config_changed(self.cinder_sentry,
1642
287
                                                     mtime,
1643
288
                                                     'cinder-api',
1644
289
                                                     '/etc/cinder/cinder.conf')
1645
290
                amulet.raise_status(amulet.FAIL, msg='update failed')
1646
291
        Returns:
1647
292
          bool: True if both service and file where updated/restarted after
1648
293
                mtime, False if service is older than mtime or if service was
1649
294
                not found or if filename was modified before mtime.
1650
295
        """
1651
296
        self.log.debug('Checking %s restarted since %s' % (service, mtime))
1652
297
        time.sleep(sleep_time)
1653
298
        service_restart = self.service_restarted_since(sentry_unit, mtime,
1654
299
                                                       service,
1655
300
                                                       pgrep_full=pgrep_full,
1656
301
                                                       sleep_time=0,
1657
302
                                                       retry_count=retry_count)
1658
303
        config_update = self.config_updated_since(sentry_unit, filename, mtime,
1659
304
                                                  sleep_time=0)
1660
305
        return service_restart and config_update
1661
306
1662
307
    def get_sentry_time(self, sentry_unit):
1663
308
        """Return current epoch time on a sentry"""
1664
309
        cmd = "date +'%s'"
1665
310
        return float(sentry_unit.run(cmd)[0])
1666
311
1667
312
    def relation_error(self, name, data):
1668
313
        return 'unexpected relation data in {} - {}'.format(name, data)
1669
314
1670
315
    def endpoint_error(self, name, data):
1671
316
        return 'unexpected endpoint data in {} - {}'.format(name, data)
1672
0
317
1673
=== added directory 'tests/charmhelpers/contrib/openstack'
1674
=== added file 'tests/charmhelpers/contrib/openstack/__init__.py'
1675
--- tests/charmhelpers/contrib/openstack/__init__.py	1970-01-01 00:00:00 +0000
1676
+++ tests/charmhelpers/contrib/openstack/__init__.py	2015-04-17 10:12:07 +0000
1677
@@ -0,0 +1,15 @@
1678
1
# Copyright 2014-2015 Canonical Limited.
1679
2
#
1680
3
# This file is part of charm-helpers.
1681
4
#
1682
5
# charm-helpers is free software: you can redistribute it and/or modify
1683
6
# it under the terms of the GNU Lesser General Public License version 3 as
1684
7
# published by the Free Software Foundation.
1685
8
#
1686
9
# charm-helpers is distributed in the hope that it will be useful,
1687
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1688
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1689
12
# GNU Lesser General Public License for more details.
1690
13
#
1691
14
# You should have received a copy of the GNU Lesser General Public License
1692
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1693
0
16
1694
=== added directory 'tests/charmhelpers/contrib/openstack/amulet'
1695
=== added file 'tests/charmhelpers/contrib/openstack/amulet/__init__.py'
1696
--- tests/charmhelpers/contrib/openstack/amulet/__init__.py	1970-01-01 00:00:00 +0000
1697
+++ tests/charmhelpers/contrib/openstack/amulet/__init__.py	2015-04-17 10:12:07 +0000
1698
@@ -0,0 +1,15 @@
1699
1
# Copyright 2014-2015 Canonical Limited.
1700
2
#
1701
3
# This file is part of charm-helpers.
1702
4
#
1703
5
# charm-helpers is free software: you can redistribute it and/or modify
1704
6
# it under the terms of the GNU Lesser General Public License version 3 as
1705
7
# published by the Free Software Foundation.
1706
8
#
1707
9
# charm-helpers is distributed in the hope that it will be useful,
1708
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1709
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1710
12
# GNU Lesser General Public License for more details.
1711
13
#
1712
14
# You should have received a copy of the GNU Lesser General Public License
1713
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1714
0
16
1715
=== added file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
1716
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	1970-01-01 00:00:00 +0000
1717
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-04-17 10:12:07 +0000
1718
@@ -0,0 +1,137 @@
1719
1
# Copyright 2014-2015 Canonical Limited.
1720
2
#
1721
3
# This file is part of charm-helpers.
1722
4
#
1723
5
# charm-helpers is free software: you can redistribute it and/or modify
1724
6
# it under the terms of the GNU Lesser General Public License version 3 as
1725
7
# published by the Free Software Foundation.
1726
8
#
1727
9
# charm-helpers is distributed in the hope that it will be useful,
1728
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1729
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1730
12
# GNU Lesser General Public License for more details.
1731
13
#
1732
14
# You should have received a copy of the GNU Lesser General Public License
1733
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1734
16
1735
17
import six
1736
18
from collections import OrderedDict
1737
19
from charmhelpers.contrib.amulet.deployment import (
1738
20
    AmuletDeployment
1739
21
)
1740
22
1741
23
1742
24
class OpenStackAmuletDeployment(AmuletDeployment):
1743
25
    """OpenStack amulet deployment.
1744
26
1745
27
       This class inherits from AmuletDeployment and has additional support
1746
28
       that is specifically for use by OpenStack charms.
1747
29
       """
1748
30
1749
31
    def __init__(self, series=None, openstack=None, source=None, stable=True):
1750
32
        """Initialize the deployment environment."""
1751
33
        super(OpenStackAmuletDeployment, self).__init__(series)
1752
34
        self.openstack = openstack
1753
35
        self.source = source
1754
36
        self.stable = stable
1755
37
        # Note(coreycb): this needs to be changed when new next branches come
1756
38
        # out.
1757
39
        self.current_next = "trusty"
1758
40
1759
41
    def _determine_branch_locations(self, other_services):
1760
42
        """Determine the branch locations for the other services.
1761
43
1762
44
           Determine if the local branch being tested is derived from its
1763
45
           stable or next (dev) branch, and based on this, use the corresonding
1764
46
           stable or next branches for the other_services."""
1765
47
        base_charms = ['mysql', 'mongodb']
1766
48
1767
49
        if self.stable:
1768
50
            for svc in other_services:
1769
51
                temp = 'lp:charms/{}'
1770
52
                svc['location'] = temp.format(svc['name'])
1771
53
        else:
1772
54
            for svc in other_services:
1773
55
                if svc['name'] in base_charms:
1774
56
                    temp = 'lp:charms/{}'
1775
57
                    svc['location'] = temp.format(svc['name'])
1776
58
                else:
1777
59
                    temp = 'lp:~openstack-charmers/charms/{}/{}/next'
1778
60
                    svc['location'] = temp.format(self.current_next,
1779
61
                                                  svc['name'])
1780
62
        return other_services
1781
63
1782
64
    def _add_services(self, this_service, other_services):
1783
65
        """Add services to the deployment and set openstack-origin/source."""
1784
66
        other_services = self._determine_branch_locations(other_services)
1785
67
1786
68
        super(OpenStackAmuletDeployment, self)._add_services(this_service,
1787
69
                                                             other_services)
1788
70
1789
71
        services = other_services
1790
72
        services.append(this_service)
1791
73
        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
1792
74
                      'ceph-osd', 'ceph-radosgw']
1793
75
        # Openstack subordinate charms do not expose an origin option as that
1794
76
        # is controlled by the principle
1795
77
        ignore = ['neutron-openvswitch']
1796
78
1797
79
        if self.openstack:
1798
80
            for svc in services:
1799
81
                if svc['name'] not in use_source + ignore:
1800
82
                    config = {'openstack-origin': self.openstack}
1801
83
                    self.d.configure(svc['name'], config)
1802
84
1803
85
        if self.source:
1804
86
            for svc in services:
1805
87
                if svc['name'] in use_source and svc['name'] not in ignore:
1806
88
                    config = {'source': self.source}
1807
89
                    self.d.configure(svc['name'], config)
1808
90
1809
91
    def _configure_services(self, configs):
1810
92
        """Configure all of the services."""
1811
93
        for service, config in six.iteritems(configs):
1812
94
            self.d.configure(service, config)
1813
95
1814
96
    def _get_openstack_release(self):
1815
97
        """Get openstack release.
1816
98
1817
99
           Return an integer representing the enum value of the openstack
1818
100
           release.
1819
101
           """
1820
102
        (self.precise_essex, self.precise_folsom, self.precise_grizzly,
1821
103
         self.precise_havana, self.precise_icehouse,
1822
104
         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo,
1823
105
         self.utopic_juno, self.vivid_kilo) = range(10)
1824
106
        releases = {
1825
107
            ('precise', None): self.precise_essex,
1826
108
            ('precise', 'cloud:precise-folsom'): self.precise_folsom,
1827
109
            ('precise', 'cloud:precise-grizzly'): self.precise_grizzly,
1828
110
            ('precise', 'cloud:precise-havana'): self.precise_havana,
1829
111
            ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
1830
112
            ('trusty', None): self.trusty_icehouse,
1831
113
            ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
1832
114
            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
1833
115
            ('utopic', None): self.utopic_juno,
1834
116
            ('vivid', None): self.vivid_kilo}
1835
117
        return releases[(self.series, self.openstack)]
1836
118
1837
119
    def _get_openstack_release_string(self):
1838
120
        """Get openstack release string.
1839
121
1840
122
           Return a string representing the openstack release.
1841
123
           """
1842
124
        releases = OrderedDict([
1843
125
            ('precise', 'essex'),
1844
126
            ('quantal', 'folsom'),
1845
127
            ('raring', 'grizzly'),
1846
128
            ('saucy', 'havana'),
1847
129
            ('trusty', 'icehouse'),
1848
130
            ('utopic', 'juno'),
1849
131
            ('vivid', 'kilo'),
1850
132
        ])
1851
133
        if self.openstack:
1852
134
            os_origin = self.openstack.split(':')[1]
1853
135
            return os_origin.split('%s-' % self.series)[1].split('/')[0]
1854
136
        else:
1855
137
            return releases[self.series]
1856
0
138
1857
=== added file 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
1858
--- tests/charmhelpers/contrib/openstack/amulet/utils.py	1970-01-01 00:00:00 +0000
1859
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-04-17 10:12:07 +0000
1860
@@ -0,0 +1,294 @@
1861
1
# Copyright 2014-2015 Canonical Limited.
1862
2
#
1863
3
# This file is part of charm-helpers.
1864
4
#
1865
5
# charm-helpers is free software: you can redistribute it and/or modify
1866
6
# it under the terms of the GNU Lesser General Public License version 3 as
1867
7
# published by the Free Software Foundation.
1868
8
#
1869
9
# charm-helpers is distributed in the hope that it will be useful,
1870
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1871
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1872
12
# GNU Lesser General Public License for more details.
1873
13
#
1874
14
# You should have received a copy of the GNU Lesser General Public License
1875
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
1876
16
1877
17
import logging
1878
18
import os
1879
19
import time
1880
20
import urllib
1881
21
1882
22
import glanceclient.v1.client as glance_client
1883
23
import keystoneclient.v2_0 as keystone_client
1884
24
import novaclient.v1_1.client as nova_client
1885
25
1886
26
import six
1887
27
1888
28
from charmhelpers.contrib.amulet.utils import (
1889
29
    AmuletUtils
1890
30
)
1891
31
1892
32
DEBUG = logging.DEBUG
1893
33
ERROR = logging.ERROR
1894
34
1895
35
1896
36
class OpenStackAmuletUtils(AmuletUtils):
1897
37
    """OpenStack amulet utilities.
1898
38
1899
39
       This class inherits from AmuletUtils and has additional support
1900
40
       that is specifically for use by OpenStack charms.
1901
41
       """
1902
42
1903
43
    def __init__(self, log_level=ERROR):
1904
44
        """Initialize the deployment environment."""
1905
45
        super(OpenStackAmuletUtils, self).__init__(log_level)
1906
46
1907
47
    def validate_endpoint_data(self, endpoints, admin_port, internal_port,
1908
48
                               public_port, expected):
1909
49
        """Validate endpoint data.
1910
50
1911
51
           Validate actual endpoint data vs expected endpoint data. The ports
1912
52
           are used to find the matching endpoint.
1913
53
           """
1914
54
        found = False
1915
55
        for ep in endpoints:
1916
56
            self.log.debug('endpoint: {}'.format(repr(ep)))
1917
57
            if (admin_port in ep.adminurl and
1918
58
                    internal_port in ep.internalurl and
1919
59
                    public_port in ep.publicurl):
1920
60
                found = True
1921
61
                actual = {'id': ep.id,
1922
62
                          'region': ep.region,
1923
63
                          'adminurl': ep.adminurl,
1924
64
                          'internalurl': ep.internalurl,
1925
65
                          'publicurl': ep.publicurl,
1926
66
                          'service_id': ep.service_id}
1927
67
                ret = self._validate_dict_data(expected, actual)
1928
68
                if ret:
1929
69
                    return 'unexpected endpoint data - {}'.format(ret)
1930
70
1931
71
        if not found:
1932
72
            return 'endpoint not found'
1933
73
1934
74
    def validate_svc_catalog_endpoint_data(self, expected, actual):
1935
75
        """Validate service catalog endpoint data.
1936
76
1937
77
           Validate a list of actual service catalog endpoints vs a list of
1938
78
           expected service catalog endpoints.
1939
79
           """
1940
80
        self.log.debug('actual: {}'.format(repr(actual)))
1941
81
        for k, v in six.iteritems(expected):
1942
82
            if k in actual:
1943
83
                ret = self._validate_dict_data(expected[k][0], actual[k][0])
1944
84
                if ret:
1945
85
                    return self.endpoint_error(k, ret)
1946
86
            else:
1947
87
                return "endpoint {} does not exist".format(k)
1948
88
        return ret
1949
89
1950
90
    def validate_tenant_data(self, expected, actual):
1951
91
        """Validate tenant data.
1952
92
1953
93
           Validate a list of actual tenant data vs list of expected tenant
1954
94
           data.
1955
95
           """
1956
96
        self.log.debug('actual: {}'.format(repr(actual)))
1957
97
        for e in expected:
1958
98
            found = False
1959
99
            for act in actual:
1960
100
                a = {'enabled': act.enabled, 'description': act.description,
1961
101
                     'name': act.name, 'id': act.id}
1962
102
                if e['name'] == a['name']:
1963
103
                    found = True
1964
104
                    ret = self._validate_dict_data(e, a)
1965
105
                    if ret:
1966
106
                        return "unexpected tenant data - {}".format(ret)
1967
107
            if not found:
1968
108
                return "tenant {} does not exist".format(e['name'])
1969
109
        return ret
1970
110
1971
111
    def validate_role_data(self, expected, actual):
1972
112
        """Validate role data.
1973
113
1974
114
           Validate a list of actual role data vs a list of expected role
1975
115
           data.
1976
116
           """
1977
117
        self.log.debug('actual: {}'.format(repr(actual)))
1978
118
        for e in expected:
1979
119
            found = False
1980
120
            for act in actual:
1981
121
                a = {'name': act.name, 'id': act.id}
1982
122
                if e['name'] == a['name']:
1983
123
                    found = True
1984
124
                    ret = self._validate_dict_data(e, a)
1985
125
                    if ret:
1986
126
                        return "unexpected role data - {}".format(ret)
1987
127
            if not found:
1988
128
                return "role {} does not exist".format(e['name'])
1989
129
        return ret
1990
130
1991
131
    def validate_user_data(self, expected, actual):
1992
132
        """Validate user data.
1993
133
1994
134
           Validate a list of actual user data vs a list of expected user
1995
135
           data.
1996
136
           """
1997
137
        self.log.debug('actual: {}'.format(repr(actual)))
1998
138
        for e in expected:
1999
139
            found = False
2000
140
            for act in actual:
2001
141
                a = {'enabled': act.enabled, 'name': act.name,
2002
142
                     'email': act.email, 'tenantId': act.tenantId,
2003
143
                     'id': act.id}
2004
144
                if e['name'] == a['name']:
2005
145
                    found = True
2006
146
                    ret = self._validate_dict_data(e, a)
2007
147
                    if ret:
2008
148
                        return "unexpected user data - {}".format(ret)
2009
149
            if not found:
2010
150
                return "user {} does not exist".format(e['name'])
2011
151
        return ret
2012
152
2013
153
    def validate_flavor_data(self, expected, actual):
2014
154
        """Validate flavor data.
2015
155
2016
156
           Validate a list of actual flavors vs a list of expected flavors.
2017
157
           """
2018
158
        self.log.debug('actual: {}'.format(repr(actual)))
2019
159
        act = [a.name for a in actual]
2020
160
        return self._validate_list_data(expected, act)
2021
161
2022
162
    def tenant_exists(self, keystone, tenant):
2023
163
        """Return True if tenant exists."""
2024
164
        return tenant in [t.name for t in keystone.tenants.list()]
2025
165
2026
166
    def authenticate_keystone_admin(self, keystone_sentry, user, password,
2027
167
                                    tenant):
2028
168
        """Authenticates admin user with the keystone admin endpoint."""
2029
169
        unit = keystone_sentry
2030
170
        service_ip = unit.relation('shared-db',
2031
171
                                   'mysql:shared-db')['private-address']
2032
172
        ep = "http://{}:35357/v2.0".format(service_ip.strip().decode('utf-8'))
2033
173
        return keystone_client.Client(username=user, password=password,
2034
174
                                      tenant_name=tenant, auth_url=ep)
2035
175
2036
176
    def authenticate_keystone_user(self, keystone, user, password, tenant):
2037
177
        """Authenticates a regular user with the keystone public endpoint."""
2038
178
        ep = keystone.service_catalog.url_for(service_type='identity',
2039
179
                                              endpoint_type='publicURL')
2040
180
        return keystone_client.Client(username=user, password=password,
2041
181
                                      tenant_name=tenant, auth_url=ep)
2042
182
2043
183
    def authenticate_glance_admin(self, keystone):
2044
184
        """Authenticates admin user with glance."""
2045
185
        ep = keystone.service_catalog.url_for(service_type='image',
2046
186
                                              endpoint_type='adminURL')
2047
187
        return glance_client.Client(ep, token=keystone.auth_token)
2048
188
2049
189
    def authenticate_nova_user(self, keystone, user, password, tenant):
2050
190
        """Authenticates a regular user with nova-api."""
2051
191
        ep = keystone.service_catalog.url_for(service_type='identity',
2052
192
                                              endpoint_type='publicURL')
2053
193
        return nova_client.Client(username=user, api_key=password,
2054
194
                                  project_id=tenant, auth_url=ep)
2055
195
2056
196
    def create_cirros_image(self, glance, image_name):
2057
197
        """Download the latest cirros image and upload it to glance."""
2058
198
        http_proxy = os.getenv('AMULET_HTTP_PROXY')
2059
199
        self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
2060
200
        if http_proxy:
2061
201
            proxies = {'http': http_proxy}
2062
202
            opener = urllib.FancyURLopener(proxies)
2063
203
        else:
2064
204
            opener = urllib.FancyURLopener()
2065
205
2066
206
        f = opener.open("http://download.cirros-cloud.net/version/released")
2067
207
        version = f.read().strip()
2068
208
        cirros_img = "cirros-{}-x86_64-disk.img".format(version)
2069
209
        local_path = os.path.join('tests', cirros_img)
2070
210
2071
211
        if not os.path.exists(local_path):
2072
212
            cirros_url = "http://{}/{}/{}".format("download.cirros-cloud.net",
2073
213
                                                  version, cirros_img)
2074
214
            opener.retrieve(cirros_url, local_path)
2075
215
        f.close()
2076
216
2077
217
        with open(local_path) as f:
2078
218
            image = glance.images.create(name=image_name, is_public=True,
2079
219
                                         disk_format='qcow2',
2080
220
                                         container_format='bare', data=f)
2081
221
        count = 1
2082
222
        status = image.status
2083
223
        while status != 'active' and count < 10:
2084
224
            time.sleep(3)
2085
225
            image = glance.images.get(image.id)
2086
226
            status = image.status
2087
227
            self.log.debug('image status: {}'.format(status))
2088
228
            count += 1
2089
229
2090
230
        if status != 'active':
2091
231
            self.log.error('image creation timed out')
2092
232
            return None
2093
233
2094
234
        return image
2095
235
2096
236
    def delete_image(self, glance, image):
2097
237
        """Delete the specified image."""
2098
238
        num_before = len(list(glance.images.list()))
2099
239
        glance.images.delete(image)
2100
240
2101
241
        count = 1
2102
242
        num_after = len(list(glance.images.list()))
2103
243
        while num_after != (num_before - 1) and count < 10:
2104
244
            time.sleep(3)
2105
245
            num_after = len(list(glance.images.list()))
2106
246
            self.log.debug('number of images: {}'.format(num_after))
2107
247
            count += 1
2108
248
2109
249
        if num_after != (num_before - 1):
2110
250
            self.log.error('image deletion timed out')
2111
251
            return False
2112
252
2113
253
        return True
2114
254
2115
255
    def create_instance(self, nova, image_name, instance_name, flavor):
2116
256
        """Create the specified instance."""
2117
257
        image = nova.images.find(name=image_name)
2118
258
        flavor = nova.flavors.find(name=flavor)
2119
259
        instance = nova.servers.create(name=instance_name, image=image,
2120
260
                                       flavor=flavor)
2121
261
2122
262
        count = 1
2123
263
        status = instance.status
2124
264
        while status != 'ACTIVE' and count < 60:
2125
265
            time.sleep(3)
2126
266
            instance = nova.servers.get(instance.id)
2127
267
            status = instance.status
2128
268
            self.log.debug('instance status: {}'.format(status))
2129
269
            count += 1
2130
270
2131
271
        if status != 'ACTIVE':
2132
272
            self.log.error('instance creation timed out')
2133
273
            return None
2134
274
2135
275
        return instance
2136
276
2137
277
    def delete_instance(self, nova, instance):
2138
278
        """Delete the specified instance."""
2139
279
        num_before = len(list(nova.servers.list()))
2140
280
        nova.servers.delete(instance)
2141
281
2142
282
        count = 1
2143
283
        num_after = len(list(nova.servers.list()))
2144
284
        while num_after != (num_before - 1) and count < 10:
2145
285
            time.sleep(3)
2146
286
            num_after = len(list(nova.servers.list()))
2147
287
            self.log.debug('number of instances: {}'.format(num_after))
2148
288
            count += 1
2149
289
2150
290
        if num_after != (num_before - 1):
2151
291
            self.log.error('instance deletion timed out')
2152
292
            return False
2153
293
2154
294
        return True
2155
0
295
2156
=== added file 'unit_tests/test_percona_hooks.py'
2157
--- unit_tests/test_percona_hooks.py	1970-01-01 00:00:00 +0000
2158
+++ unit_tests/test_percona_hooks.py	2015-04-17 10:12:07 +0000
2159
@@ -0,0 +1,65 @@
2160
1
import mock
2161
2
import sys
2162
3
from test_utils import CharmTestCase
2163
4
2164
5
sys.modules['MySQLdb'] = mock.Mock()
2165
6
import percona_hooks as hooks
2166
7
2167
8
TO_PATCH = ['log', 'config',
2168
9
            'get_db_helper',
2169
10
            'relation_ids',
2170
11
            'relation_set']
2171
12
2172
13
2173
14
class TestHaRelation(CharmTestCase):
2174
15
    def setUp(self):
2175
16
        CharmTestCase.setUp(self, hooks, TO_PATCH)
2176
17
2177
18
    @mock.patch('sys.exit')
2178
19
    def test_relation_not_configured(self, exit_):
2179
20
        self.config.return_value = None
2180
21
2181
22
        class MyError(Exception):
2182
23
            pass
2183
24
2184
25
        def f(x):
2185
26
            raise MyError(x)
2186
27
        exit_.side_effect = f
2187
28
        self.assertRaises(MyError, hooks.ha_relation_joined)
2188
29
2189
30
    def test_resources(self):
2190
31
        self.relation_ids.return_value = ['ha:1']
2191
32
        password = 'ubuntu'
2192
33
        helper = mock.Mock()
2193
34
        attrs = {'get_mysql_password.return_value': password}
2194
35
        helper.configure_mock(**attrs)
2195
36
        self.get_db_helper.return_value = helper
2196
37
        self.test_config.set('vip', '10.0.3.3')
2197
38
        self.test_config.set('sst-password', password)
2198
39
        def f(k):
2199
40
            return self.test_config.get(k)
2200
41
2201
42
        self.config.side_effect = f
2202
43
        hooks.ha_relation_joined()
2203
44
2204
45
        resources = {'res_mysql_vip': 'ocf:heartbeat:IPaddr2',
2205
46
                     'res_mysql_monitor': 'ocf:percona:mysql_monitor'}
2206
47
        resource_params = {'res_mysql_vip': ('params ip="10.0.3.3" '
2207
48
                                             'cidr_netmask="24" '
2208
49
                                             'nic="eth0"'),
2209
50
                           'res_mysql_monitor':
2210
51
                               hooks.RES_MONITOR_PARAMS % {'sstpass': 'ubuntu'}}
2211
52
        groups = {'grp_percona_cluster': 'res_mysql_vip'}
2212
53
2213
54
        clones = {'cl_mysql_monitor': 'res_mysql_monitor meta interleave=true'}
2214
55
2215
56
        colocations = {'vip_mysqld': 'inf: grp_percona_cluster cl_mysql_monitor'}
2216
57
2217
58
        locations = {'loc_percona_cluster':
2218
59
                     'grp_percona_cluster rule inf: writable eq 1'}
2219
60
2220
61
        self.relation_set.assert_called_with(
2221
62
            relation_id='ha:1', corosync_bindiface=f('ha-bindiface'),
2222
63
            corosync_mcastport=f('ha-mcastport'), resources=resources,
2223
64
            resource_params=resource_params, groups=groups,
2224
65
            clones=clones, colocations=colocations, locations=locations)
2225
0
66
2226
=== added file 'unit_tests/test_utils.py'
2227
--- unit_tests/test_utils.py	1970-01-01 00:00:00 +0000
2228
+++ unit_tests/test_utils.py	2015-04-17 10:12:07 +0000
2229
@@ -0,0 +1,121 @@
2230
1
import logging
2231
2
import unittest
2232
3
import os
2233
4
import yaml
2234
5
2235
6
from contextlib import contextmanager
2236
7
from mock import patch, MagicMock
2237
8
2238
9
2239
10
def load_config():
2240
11
    '''
2241
12
    Walk backwords from __file__ looking for config.yaml, load and return the
2242
13
    'options' section'
2243
14
    '''
2244
15
    config = None
2245
16
    f = __file__
2246
17
    while config is None:
2247
18
        d = os.path.dirname(f)
2248
19
        if os.path.isfile(os.path.join(d, 'config.yaml')):
2249
20
            config = os.path.join(d, 'config.yaml')
2250
21
            break
2251
22
        f = d
2252
23
2253
24
    if not config:
2254
25
        logging.error('Could not find config.yaml in any parent directory '
2255
26
                      'of %s. ' % file)
2256
27
        raise Exception
2257
28
2258
29
    return yaml.safe_load(open(config).read())['options']
2259
30
2260
31
2261
32
def get_default_config():
2262
33
    '''
2263
34
    Load default charm config from config.yaml return as a dict.
2264
35
    If no default is set in config.yaml, its value is None.
2265
36
    '''
2266
37
    default_config = {}
2267
38
    config = load_config()
2268
39
    for k, v in config.iteritems():
2269
40
        if 'default' in v:
2270
41
            default_config[k] = v['default']
2271
42
        else:
2272
43
            default_config[k] = None
2273
44
    return default_config
2274
45
2275
46
2276
47
class CharmTestCase(unittest.TestCase):
2277
48
2278
49
    def setUp(self, obj, patches):
2279
50
        super(CharmTestCase, self).setUp()
2280
51
        self.patches = patches
2281
52
        self.obj = obj
2282
53
        self.test_config = TestConfig()
2283
54
        self.test_relation = TestRelation()
2284
55
        self.patch_all()
2285
56
2286
57
    def patch(self, method):
2287
58
        _m = patch.object(self.obj, method)
2288
59
        mock = _m.start()
2289
60
        self.addCleanup(_m.stop)
2290
61
        return mock
2291
62
2292
63
    def patch_all(self):
2293
64
        for method in self.patches:
2294
65
            setattr(self, method, self.patch(method))
2295
66
2296
67
2297
68
class TestConfig(object):
2298
69
2299
70
    def __init__(self):
2300
71
        self.config = get_default_config()
2301
72
2302
73
    def get(self, attr=None):
2303
74
        if not attr:
2304
75
            return self.get_all()
2305
76
        try:
2306
77
            return self.config[attr]
2307
78
        except KeyError:
2308
79
            return None
2309
80
2310
81
    def get_all(self):
2311
82
        return self.config
2312
83
2313
84
    def set(self, attr, value):
2314
85
        if attr not in self.config:
2315
86
            raise KeyError
2316
87
        self.config[attr] = value
2317
88
2318
89
2319
90
class TestRelation(object):
2320
91
2321
92
    def __init__(self, relation_data={}):
2322
93
        self.relation_data = relation_data
2323
94
2324
95
    def set(self, relation_data):
2325
96
        self.relation_data = relation_data
2326
97
2327
98
    def get(self, attr=None, unit=None, rid=None):
2328
99
        if attr is None:
2329
100
            return self.relation_data
2330
101
        elif attr in self.relation_data:
2331
102
            return self.relation_data[attr]
2332
103
        return None
2333
104
2334
105
2335
106
@contextmanager
2336
107
def patch_open():
2337
108
    '''Patch open() to allow mocking both open() itself and the file that is
2338
109
    yielded.
2339
110
2340
111
    Yields the mock for "open" and "file", respectively.'''
2341
112
    mock_open = MagicMock(spec=open)
2342
113
    mock_file = MagicMock(spec=file)
2343
114
2344
115
    @contextmanager
2345
116
    def stub_open(*args, **kwargs):
2346
117
        mock_open(*args, **kwargs)
2347
118
        yield mock_file
2348
119
2349
120
    with patch('__builtin__.open', stub_open):
2350
121
        yield mock_open, mock_file
Reviewer	Date Requested	Status
James Page	2015-04-17	Pending
Mario Splivalo	2015-04-17	Pending
OpenStack Charmers	2015-04-17	Pending
Review via email: mp+256640@code.launchpad.net