1
=== modified file '.coveragerc'
2
--- .coveragerc	2015-08-11 08:09:29 +0000
3
+++ .coveragerc	2015-08-17 13:44:46 +0000
4
@@ -3,5 +3,6 @@
5
3
exclude_lines =
3
exclude_lines =
6
4
    if __name__ == .__main__.:
4
    if __name__ == .__main__.:
7
5
include=
5
include=
8
6
    actions/actions.py
9
6
    hooks/swift_storage_*
7
    hooks/swift_storage_*
10
7
    lib/swift_storage_*
8
    lib/swift_storage_*
11
8
9
12
=== modified file 'Makefile'
13
--- Makefile	2015-08-04 11:48:35 +0000
14
+++ Makefile	2015-08-17 13:44:46 +0000
15
@@ -30,3 +30,5 @@
16
30
publish: lint test
30
publish: lint test
17
31
	bzr push lp:charms/swift-storage
31
	bzr push lp:charms/swift-storage
18
32
	bzr push lp:charms/trusty/swift-storage
32
	bzr push lp:charms/trusty/swift-storage
19
33
20
34
.PHONY: lint unit_test test sync publish
21
33
35
22
=== added directory 'actions'
23
=== added file 'actions.yaml'
24
--- actions.yaml	1970-01-01 00:00:00 +0000
25
+++ actions.yaml	2015-08-17 13:44:46 +0000
26
@@ -0,0 +1,5 @@
27
1
pause:
28
2
  description: Pause the swift-storage unit. This action will stop Swift services.
29
3
resume:
30
4
  description: Resume the swift-storage unit. This action will start Swift services.
31
5
32
0
6
33
=== added file 'actions/__init__.py'
34
=== added file 'actions/actions.py'
35
--- actions/actions.py	1970-01-01 00:00:00 +0000
36
+++ actions/actions.py	2015-08-17 13:44:46 +0000
37
@@ -0,0 +1,93 @@
38
1
#!/usr/bin/python
39
2
40
3
import argparse
41
4
import os
42
5
import sys
43
6
import yaml
44
7
45
8
from charmhelpers.core.host import service_pause, service_resume
46
9
from charmhelpers.core.hookenv import action_fail, status_set
47
10
from charmhelpers.contrib.openstack.utils import get_os_codename_package
48
11
49
12
from lib.swift_storage_utils import SWIFT_SVCS
50
13
51
14
52
15
def _get_services():
53
16
    """Return a list of services that need to be (un)paused."""
54
17
    services = SWIFT_SVCS[:]
55
18
    # Before Icehouse there was no swift-container-sync
56
19
    if get_os_codename_package("swift-container") < "icehouse":
57
20
        services.remove("swift-container-sync")
58
21
    return services
59
22
60
23
61
24
def get_action_parser(actions_yaml_path, action_name,
62
25
                      get_services=_get_services):
63
26
    """Make an argparse.ArgumentParser seeded from actions.yaml definitions."""
64
27
    with open(actions_yaml_path) as fh:
65
28
        doc = yaml.load(fh)[action_name]["description"]
66
29
    parser = argparse.ArgumentParser(description=doc)
67
30
    parser.add_argument("--services", default=get_services())
68
31
    # TODO: Add arguments for params defined in the actions.yaml
69
32
    return parser
70
33
71
34
72
35
def pause(args):
73
36
    """Pause all the swift services.
74
37
75
38
    @raises Exception if any services fail to stop
76
39
    """
77
40
    for service in args.services:
78
41
        stopped = service_pause(service)
79
42
        if not stopped:
80
43
            raise Exception("{} didn't stop cleanly.".format(service))
81
44
    status_set(
82
45
        "maintenance", "Paused. Use 'resume' action to resume normal service.")
83
46
84
47
85
48
def resume(args):
86
49
    """Resume all the swift services.
87
50
88
51
    @raises Exception if any services fail to start
89
52
    """
90
53
    for service in args.services:
91
54
        started = service_resume(service)
92
55
        if not started:
93
56
            raise Exception("{} didn't start cleanly.".format(service))
94
57
    status_set("active", "")
95
58
96
59
97
60
# A dictionary of all the defined actions to callables (which take
98
61
# parsed arguments).
99
62
ACTIONS = {"pause": pause, "resume": resume}
100
63
101
64
102
65
def main(argv):
103
66
    action_name = _get_action_name()
104
67
    actions_yaml_path = _get_actions_yaml_path()
105
68
    parser = get_action_parser(actions_yaml_path, action_name)
106
69
    args = parser.parse_args(argv)
107
70
    try:
108
71
        action = ACTIONS[action_name]
109
72
    except KeyError:
110
73
        return "Action %s undefined" % action_name
111
74
    else:
112
75
        try:
113
76
            action(args)
114
77
        except Exception as e:
115
78
            action_fail(str(e))
116
79
117
80
118
81
def _get_action_name():
119
82
    """Return the name of the action."""
120
83
    return os.path.basename(__file__)
121
84
122
85
123
86
def _get_actions_yaml_path():
124
87
    """Return the path to actions.yaml"""
125
88
    cwd = os.path.dirname(__file__)
126
89
    return os.path.join(cwd, "..", "actions.yaml")
127
90
128
91
129
92
if __name__ == "__main__":
130
93
    sys.exit(main(sys.argv[1:]))
131
0
94
132
=== added symlink 'actions/charmhelpers'
133
=== target is u'../charmhelpers/'
134
=== added symlink 'actions/lib'
135
=== target is u'../lib'
136
=== added symlink 'actions/pause'
137
=== target is u'actions.py'
138
=== added symlink 'actions/resume'
139
=== target is u'actions.py'
140
=== modified file 'charmhelpers/cli/__init__.py'
141
--- charmhelpers/cli/__init__.py	2015-07-31 13:11:32 +0000
142
+++ charmhelpers/cli/__init__.py	2015-08-17 13:44:46 +0000
143
@@ -152,15 +152,11 @@
144
152
        arguments = self.argument_parser.parse_args()
152
        arguments = self.argument_parser.parse_args()
145
153
        argspec = inspect.getargspec(arguments.func)
153
        argspec = inspect.getargspec(arguments.func)
146
154
        vargs = []
154
        vargs = []
147
155
        kwargs = {}
148
156
        for arg in argspec.args:
155
        for arg in argspec.args:
149
157
            vargs.append(getattr(arguments, arg))
156
            vargs.append(getattr(arguments, arg))
150
158
        if argspec.varargs:
157
        if argspec.varargs:
151
159
            vargs.extend(getattr(arguments, argspec.varargs))
158
            vargs.extend(getattr(arguments, argspec.varargs))
156
160
        if argspec.keywords:
159
        output = arguments.func(*vargs)
153
161
            for kwarg in argspec.keywords.items():
154
162
                kwargs[kwarg] = getattr(arguments, kwarg)
155
163
        output = arguments.func(*vargs, **kwargs)
157
164
        if getattr(arguments.func, '_cli_test_command', False):
160
        if getattr(arguments.func, '_cli_test_command', False):
158
165
            self.exit_code = 0 if output else 1
161
            self.exit_code = 0 if output else 1
159
166
            output = ''
162
            output = ''
160
167
163
161
=== modified file 'charmhelpers/cli/commands.py'
162
--- charmhelpers/cli/commands.py	2015-07-31 13:11:32 +0000
163
+++ charmhelpers/cli/commands.py	2015-08-17 13:44:46 +0000
164
@@ -26,7 +26,7 @@
165
26
"""
26
"""
166
27
Import the sub-modules which have decorated subcommands to register with chlp.
27
Import the sub-modules which have decorated subcommands to register with chlp.
167
28
"""
28
"""
172
29
import host  # noqa
29
from . import host  # noqa
173
30
import benchmark  # noqa
30
from . import benchmark  # noqa
174
31
import unitdata  # noqa
31
from . import unitdata  # noqa
175
32
from charmhelpers.core import hookenv  # noqa
32
from . import hookenv  # noqa
176
33
33
177
=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
178
--- charmhelpers/contrib/openstack/amulet/deployment.py	2015-07-29 10:49:43 +0000
179
+++ charmhelpers/contrib/openstack/amulet/deployment.py	2015-08-17 13:44:46 +0000
180
@@ -44,7 +44,7 @@
181
44
           Determine if the local branch being tested is derived from its
44
           Determine if the local branch being tested is derived from its
182
45
           stable or next (dev) branch, and based on this, use the corresonding
45
           stable or next (dev) branch, and based on this, use the corresonding
183
46
           stable or next branches for the other_services."""
46
           stable or next branches for the other_services."""
185
47
        base_charms = ['mysql', 'mongodb']
47
        base_charms = ['mysql', 'mongodb', 'nrpe']
186
48
48
187
49
        if self.series in ['precise', 'trusty']:
49
        if self.series in ['precise', 'trusty']:
188
50
            base_series = self.series
50
            base_series = self.series
189
@@ -81,7 +81,7 @@
190
81
                      'ceph-osd', 'ceph-radosgw']
81
                      'ceph-osd', 'ceph-radosgw']
191
82
        # Most OpenStack subordinate charms do not expose an origin option
82
        # Most OpenStack subordinate charms do not expose an origin option
192
83
        # as that is controlled by the principle.
83
        # as that is controlled by the principle.
194
84
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch']
84
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe']
195
85
85
196
86
        if self.openstack:
86
        if self.openstack:
197
87
            for svc in services:
87
            for svc in services:
198
88
88
199
=== modified file 'charmhelpers/contrib/openstack/utils.py'
200
--- charmhelpers/contrib/openstack/utils.py	2015-07-29 10:49:43 +0000
201
+++ charmhelpers/contrib/openstack/utils.py	2015-08-17 13:44:46 +0000
202
@@ -24,6 +24,7 @@
203
24
import json
24
import json
204
25
import os
25
import os
205
26
import sys
26
import sys
206
27
import re
207
27
28
208
28
import six
29
import six
209
29
import yaml
30
import yaml
210
@@ -69,7 +70,6 @@
211
69
DISTRO_PROPOSED = ('deb http://archive.ubuntu.com/ubuntu/ %s-proposed '
70
DISTRO_PROPOSED = ('deb http://archive.ubuntu.com/ubuntu/ %s-proposed '
212
70
                   'restricted main multiverse universe')
71
                   'restricted main multiverse universe')
213
71
72
214
72
215
73
UBUNTU_OPENSTACK_RELEASE = OrderedDict([
73
UBUNTU_OPENSTACK_RELEASE = OrderedDict([
216
74
    ('oneiric', 'diablo'),
74
    ('oneiric', 'diablo'),
217
75
    ('precise', 'essex'),
75
    ('precise', 'essex'),
218
@@ -118,6 +118,34 @@
219
118
    ('2.3.0', 'liberty'),
118
    ('2.3.0', 'liberty'),
220
119
])
119
])
221
120
120
222
121
# >= Liberty version->codename mapping
223
122
PACKAGE_CODENAMES = {
224
123
    'nova-common': OrderedDict([
225
124
        ('12.0.0', 'liberty'),
226
125
    ]),
227
126
    'neutron-common': OrderedDict([
228
127
        ('7.0.0', 'liberty'),
229
128
    ]),
230
129
    'cinder-common': OrderedDict([
231
130
        ('7.0.0', 'liberty'),
232
131
    ]),
233
132
    'keystone': OrderedDict([
234
133
        ('8.0.0', 'liberty'),
235
134
    ]),
236
135
    'horizon-common': OrderedDict([
237
136
        ('8.0.0', 'liberty'),
238
137
    ]),
239
138
    'ceilometer-common': OrderedDict([
240
139
        ('5.0.0', 'liberty'),
241
140
    ]),
242
141
    'heat-common': OrderedDict([
243
142
        ('5.0.0', 'liberty'),
244
143
    ]),
245
144
    'glance-common': OrderedDict([
246
145
        ('11.0.0', 'liberty'),
247
146
    ]),
248
147
}
249
148
250
121
DEFAULT_LOOPBACK_SIZE = '5G'
149
DEFAULT_LOOPBACK_SIZE = '5G'
251
122
150
252
123
151
253
@@ -201,20 +229,29 @@
254
201
        error_out(e)
229
        error_out(e)
255
202
230
256
203
    vers = apt.upstream_version(pkg.current_ver.ver_str)
231
    vers = apt.upstream_version(pkg.current_ver.ver_str)
257
232
    match = re.match('^(\d)\.(\d)\.(\d)', vers)
258
233
    if match:
259
234
        vers = match.group(0)
260
204
235
274
205
    try:
236
    # >= Liberty independent project versions
275
206
        if 'swift' in pkg.name:
237
    if (package in PACKAGE_CODENAMES and
276
207
            swift_vers = vers[:5]
238
            vers in PACKAGE_CODENAMES[package]):
277
208
            if swift_vers not in SWIFT_CODENAMES:
239
        return PACKAGE_CODENAMES[package][vers]
278
209
                # Deal with 1.10.0 upward
240
    else:
279
210
                swift_vers = vers[:6]
241
        # < Liberty co-ordinated project versions
280
211
            return SWIFT_CODENAMES[swift_vers]
242
        try:
281
212
        else:
243
            if 'swift' in pkg.name:
282
213
            vers = vers[:6]
244
                swift_vers = vers[:5]
283
214
            return OPENSTACK_CODENAMES[vers]
245
                if swift_vers not in SWIFT_CODENAMES:
284
215
    except KeyError:
246
                    # Deal with 1.10.0 upward
285
216
        e = 'Could not determine OpenStack codename for version %s' % vers
247
                    swift_vers = vers[:6]
286
217
        error_out(e)
248
                return SWIFT_CODENAMES[swift_vers]
287
249
            else:
288
250
                vers = vers[:6]
289
251
                return OPENSTACK_CODENAMES[vers]
290
252
        except KeyError:
291
253
            e = 'Could not determine OpenStack codename for version %s' % vers
292
254
            error_out(e)
293
218
255
294
219
256
295
220
def get_os_version_package(pkg, fatal=True):
257
def get_os_version_package(pkg, fatal=True):
296
221
258
297
=== modified file 'charmhelpers/contrib/storage/linux/utils.py'
298
--- charmhelpers/contrib/storage/linux/utils.py	2015-07-29 10:49:43 +0000
299
+++ charmhelpers/contrib/storage/linux/utils.py	2015-08-17 13:44:46 +0000
300
@@ -43,9 +43,10 @@
301
43
43
302
44
    :param block_device: str: Full path of block device to clean.
44
    :param block_device: str: Full path of block device to clean.
303
45
    '''
45
    '''
304
46
    # https://github.com/ceph/ceph/commit/fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b
305
46
    # sometimes sgdisk exits non-zero; this is OK, dd will clean up
47
    # sometimes sgdisk exits non-zero; this is OK, dd will clean up
308
47
    call(['sgdisk', '--zap-all', '--mbrtogpt',
48
    call(['sgdisk', '--zap-all', '--', block_device])
309
48
          '--clear', block_device])
49
    call(['sgdisk', '--clear', '--mbrtogpt', '--', block_device])
310
49
    dev_end = check_output(['blockdev', '--getsz',
50
    dev_end = check_output(['blockdev', '--getsz',
311
50
                            block_device]).decode('UTF-8')
51
                            block_device]).decode('UTF-8')
312
51
    gpt_end = int(dev_end.split()[0]) - 100
52
    gpt_end = int(dev_end.split()[0]) - 100
313
52
53
314
=== modified file 'charmhelpers/core/hookenv.py'
315
--- charmhelpers/core/hookenv.py	2015-08-03 14:00:44 +0000
316
+++ charmhelpers/core/hookenv.py	2015-08-17 13:44:46 +0000
317
@@ -34,23 +34,6 @@
318
34
import tempfile
34
import tempfile
319
35
from subprocess import CalledProcessError
35
from subprocess import CalledProcessError
320
36
36
321
37
try:
322
38
    from charmhelpers.cli import cmdline
323
39
except ImportError as e:
324
40
    # due to the anti-pattern of partially synching charmhelpers directly
325
41
    # into charms, it's possible that charmhelpers.cli is not available;
326
42
    # if that's the case, they don't really care about using the cli anyway,
327
43
    # so mock it out
328
44
    if str(e) == 'No module named cli':
329
45
        class cmdline(object):
330
46
            @classmethod
331
47
            def subcommand(cls, *args, **kwargs):
332
48
                def _wrap(func):
333
49
                    return func
334
50
                return _wrap
335
51
    else:
336
52
        raise
337
53
338
54
import six
37
import six
339
55
if not six.PY3:
38
if not six.PY3:
340
56
    from UserDict import UserDict
39
    from UserDict import UserDict
341
@@ -91,6 +74,7 @@
342
91
        res = func(*args, **kwargs)
74
        res = func(*args, **kwargs)
343
92
        cache[key] = res
75
        cache[key] = res
344
93
        return res
76
        return res
345
77
    wrapper._wrapped = func
346
94
    return wrapper
78
    return wrapper
347
95
79
348
96
80
349
@@ -190,7 +174,6 @@
350
190
    return os.environ.get('JUJU_RELATION', None)
174
    return os.environ.get('JUJU_RELATION', None)
351
191
175
352
192
176
353
193
@cmdline.subcommand()
354
194
@cached
177
@cached
355
195
def relation_id(relation_name=None, service_or_unit=None):
178
def relation_id(relation_name=None, service_or_unit=None):
356
196
    """The relation ID for the current or a specified relation"""
179
    """The relation ID for the current or a specified relation"""
357
@@ -216,13 +199,11 @@
358
216
    return os.environ.get('JUJU_REMOTE_UNIT', None)
199
    return os.environ.get('JUJU_REMOTE_UNIT', None)
359
217
200
360
218
201
361
219
@cmdline.subcommand()
362
220
def service_name():
202
def service_name():
363
221
    """The name service group this unit belongs to"""
203
    """The name service group this unit belongs to"""
364
222
    return local_unit().split('/')[0]
204
    return local_unit().split('/')[0]
365
223
205
366
224
206
367
225
@cmdline.subcommand()
368
226
@cached
207
@cached
369
227
def remote_service_name(relid=None):
208
def remote_service_name(relid=None):
370
228
    """The remote service name for a given relation-id (or the current relation)"""
209
    """The remote service name for a given relation-id (or the current relation)"""
371
229
210
372
=== modified file 'charmhelpers/core/host.py'
373
--- charmhelpers/core/host.py	2015-07-29 10:49:43 +0000
374
+++ charmhelpers/core/host.py	2015-08-17 13:44:46 +0000
375
@@ -72,7 +72,7 @@
376
72
    stopped = service_stop(service_name)
72
    stopped = service_stop(service_name)
377
73
    # XXX: Support systemd too
73
    # XXX: Support systemd too
378
74
    override_path = os.path.join(
74
    override_path = os.path.join(
380
75
        init_dir, '{}.conf.override'.format(service_name))
75
        init_dir, '{}.override'.format(service_name))
381
76
    with open(override_path, 'w') as fh:
76
    with open(override_path, 'w') as fh:
382
77
        fh.write("manual\n")
77
        fh.write("manual\n")
383
78
    return stopped
78
    return stopped
384
@@ -86,7 +86,7 @@
385
86
    if init_dir is None:
86
    if init_dir is None:
386
87
        init_dir = "/etc/init"
87
        init_dir = "/etc/init"
387
88
    override_path = os.path.join(
88
    override_path = os.path.join(
389
89
        init_dir, '{}.conf.override'.format(service_name))
89
        init_dir, '{}.override'.format(service_name))
390
90
    if os.path.exists(override_path):
90
    if os.path.exists(override_path):
391
91
        os.unlink(override_path)
91
        os.unlink(override_path)
392
92
    started = service_start(service_name)
92
    started = service_start(service_name)
393
93
93
394
=== modified file 'charmhelpers/fetch/__init__.py'
395
--- charmhelpers/fetch/__init__.py	2015-07-29 10:49:43 +0000
396
+++ charmhelpers/fetch/__init__.py	2015-08-17 13:44:46 +0000
397
@@ -90,6 +90,14 @@
398
90
    'kilo/proposed': 'trusty-proposed/kilo',
90
    'kilo/proposed': 'trusty-proposed/kilo',
399
91
    'trusty-kilo/proposed': 'trusty-proposed/kilo',
91
    'trusty-kilo/proposed': 'trusty-proposed/kilo',
400
92
    'trusty-proposed/kilo': 'trusty-proposed/kilo',
92
    'trusty-proposed/kilo': 'trusty-proposed/kilo',
401
93
    # Liberty
402
94
    'liberty': 'trusty-updates/liberty',
403
95
    'trusty-liberty': 'trusty-updates/liberty',
404
96
    'trusty-liberty/updates': 'trusty-updates/liberty',
405
97
    'trusty-updates/liberty': 'trusty-updates/liberty',
406
98
    'liberty/proposed': 'trusty-proposed/liberty',
407
99
    'trusty-liberty/proposed': 'trusty-proposed/liberty',
408
100
    'trusty-proposed/liberty': 'trusty-proposed/liberty',
409
93
}
101
}
410
94
102
411
95
# The order of this list is very important. Handlers should be listed in from
103
# The order of this list is very important. Handlers should be listed in from
412
96
104
413
=== modified file 'lib/swift_storage_utils.py'
414
--- lib/swift_storage_utils.py	2015-07-17 09:57:19 +0000
415
+++ lib/swift_storage_utils.py	2015-08-17 13:44:46 +0000
416
@@ -83,21 +83,7 @@
417
83
    'swift-object-updater', 'swift-object-replicator'
83
    'swift-object-updater', 'swift-object-replicator'
418
84
]
84
]
419
85
85
435
86
SWIFT_SVCS = [
86
SWIFT_SVCS = ACCOUNT_SVCS + CONTAINER_SVCS + OBJECT_SVCS
421
87
    'swift-account-auditor',
422
88
    'swift-account-reaper',
423
89
    'swift-account-replicator',
424
90
    'swift-account-server',
425
91
    'swift-container-auditor',
426
92
    'swift-container-replicator',
427
93
    'swift-container-server',
428
94
    'swift-container-sync',
429
95
    'swift-container-updater',
430
96
    'swift-object-auditor',
431
97
    'swift-object-replicator',
432
98
    'swift-object-server',
433
99
    'swift-object-updater',
434
100
    ]
436
101
87
437
102
RESTART_MAP = {
88
RESTART_MAP = {
438
103
    '/etc/rsync-juju.d/050-swift-storage.conf': ['rsync'],
89
    '/etc/rsync-juju.d/050-swift-storage.conf': ['rsync'],
439
104
90
440
=== modified file 'setup.cfg'
441
--- setup.cfg	2015-08-11 08:09:29 +0000
442
+++ setup.cfg	2015-08-17 13:44:46 +0000
443
@@ -2,5 +2,5 @@
444
2
verbosity=2
2
verbosity=2
445
3
with-coverage=1
3
with-coverage=1
446
4
cover-erase=1
4
cover-erase=1
448
5
cover-package=lib,hooks.swift_storage_hooks
5
cover-package=actions.actions,lib,hooks.swift_storage_hooks
449
6
6
450
7
7
451
=== modified file 'tests/00-setup'
452
--- tests/00-setup	2014-09-29 21:14:05 +0000
453
+++ tests/00-setup	2015-08-17 13:44:46 +0000
454
@@ -7,5 +7,6 @@
455
7
sudo apt-get install --yes python-amulet \
7
sudo apt-get install --yes python-amulet \
456
8
                           python-swiftclient \
8
                           python-swiftclient \
457
9
                           python-glanceclient \
9
                           python-glanceclient \
458
10
                           python-heatclient \
459
10
                           python-keystoneclient \
11
                           python-keystoneclient \
460
11
                           python-novaclient
12
                           python-novaclient
461
12
13
462
=== modified file 'tests/basic_deployment.py'
463
--- tests/basic_deployment.py	2015-04-16 21:31:35 +0000
464
+++ tests/basic_deployment.py	2015-08-17 13:44:46 +0000
465
@@ -1,5 +1,3 @@
466
1
#!/usr/bin/python
467
2
468
3
import amulet
1
import amulet
469
4
import swiftclient
2
import swiftclient
470
5
3
471
@@ -9,8 +7,7 @@
472
9
7
473
10
from charmhelpers.contrib.openstack.amulet.utils import (
8
from charmhelpers.contrib.openstack.amulet.utils import (
474
11
    OpenStackAmuletUtils,
9
    OpenStackAmuletUtils,
477
12
    DEBUG, # flake8: noqa
10
    DEBUG,
476
13
    ERROR
478
14
)
11
)
479
15
12
480
16
# Use DEBUG to turn on debug logging
13
# Use DEBUG to turn on debug logging
481
@@ -46,12 +43,12 @@
482
46
    def _add_relations(self):
43
    def _add_relations(self):
483
47
        """Add all of the relations for the services."""
44
        """Add all of the relations for the services."""
484
48
        relations = {
45
        relations = {
491
49
          'keystone:shared-db': 'mysql:shared-db',
46
            'keystone:shared-db': 'mysql:shared-db',
492
50
          'swift-proxy:identity-service': 'keystone:identity-service',
47
            'swift-proxy:identity-service': 'keystone:identity-service',
493
51
          'swift-storage:swift-storage': 'swift-proxy:swift-storage',
48
            'swift-storage:swift-storage': 'swift-proxy:swift-storage',
494
52
          'glance:identity-service': 'keystone:identity-service',
49
            'glance:identity-service': 'keystone:identity-service',
495
53
          'glance:shared-db': 'mysql:shared-db',
50
            'glance:shared-db': 'mysql:shared-db',
496
54
          'glance:object-store': 'swift-proxy:object-store'
51
            'glance:object-store': 'swift-proxy:object-store'
497
55
        }
52
        }
498
56
        super(SwiftStorageBasicDeployment, self)._add_relations(relations)
53
        super(SwiftStorageBasicDeployment, self)._add_relations(relations)
499
57
54
500
@@ -59,9 +56,11 @@
501
59
        """Configure all of the services."""
56
        """Configure all of the services."""
502
60
        keystone_config = {'admin-password': 'openstack',
57
        keystone_config = {'admin-password': 'openstack',
503
61
                           'admin-token': 'ubuntutesting'}
58
                           'admin-token': 'ubuntutesting'}
507
62
        swift_proxy_config = {'zone-assignment': 'manual',
59
        swift_proxy_config = {
508
63
                           'replicas': '1',
60
            'zone-assignment': 'manual',
509
64
                           'swift-hash': 'fdfef9d4-8b06-11e2-8ac0-531c923c8fae'}
61
            'replicas': '1',
510
62
            'swift-hash': 'fdfef9d4-8b06-11e2-8ac0-531c923c8fae'
511
63
        }
512
65
        swift_storage_config = {'zone': '1',
64
        swift_storage_config = {'zone': '1',
513
66
                                'block-device': 'vdb',
65
                                'block-device': 'vdb',
514
67
                                'overwrite': 'true'}
66
                                'overwrite': 'true'}
515
@@ -89,15 +88,16 @@
516
89
        self.glance = u.authenticate_glance_admin(self.keystone)
88
        self.glance = u.authenticate_glance_admin(self.keystone)
517
90
89
518
91
        # Authenticate swift user
90
        # Authenticate swift user
521
92
        keystone_relation = self.keystone_sentry.relation('identity-service',
91
        keystone_relation = self.keystone_sentry.relation(
522
93
                                                 'swift-proxy:identity-service')
92
            'identity-service', 'swift-proxy:identity-service')
523
94
        ep = self.keystone.service_catalog.url_for(service_type='identity',
93
        ep = self.keystone.service_catalog.url_for(service_type='identity',
524
95
                                                   endpoint_type='publicURL')
94
                                                   endpoint_type='publicURL')
530
96
        self.swift = swiftclient.Connection(authurl=ep,
95
        self.swift = swiftclient.Connection(
531
97
                                user=keystone_relation['service_username'],
96
            authurl=ep,
532
98
                                key=keystone_relation['service_password'],
97
            user=keystone_relation['service_username'],
533
99
                                tenant_name=keystone_relation['service_tenant'],
98
            key=keystone_relation['service_password'],
534
100
                                auth_version='2.0')
99
            tenant_name=keystone_relation['service_tenant'],
535
100
            auth_version='2.0')
536
101
101
537
102
        # Create a demo tenant/role/user
102
        # Create a demo tenant/role/user
538
103
        self.demo_tenant = 'demoTenant'
103
        self.demo_tenant = 'demoTenant'
539
@@ -122,29 +122,30 @@
540
122
    def test_services(self):
122
    def test_services(self):
541
123
        """Verify the expected services are running on the corresponding
123
        """Verify the expected services are running on the corresponding
542
124
           service units."""
124
           service units."""
555
125
        swift_storage_services = ['status swift-account',
125
        swift_storage_services = ['swift-account',
556
126
                                  'status swift-account-auditor',
126
                                  'swift-account-auditor',
557
127
                                  'status swift-account-reaper',
127
                                  'swift-account-reaper',
558
128
                                  'status swift-account-replicator',
128
                                  'swift-account-replicator',
559
129
                                  'status swift-container',
129
                                  'swift-container',
560
130
                                  'status swift-container-auditor',
130
                                  'swift-container-auditor',
561
131
                                  'status swift-container-replicator',
131
                                  'swift-container-replicator',
562
132
                                  'status swift-container-updater',
132
                                  'swift-container-updater',
563
133
                                  'status swift-object',
133
                                  'swift-object',
564
134
                                  'status swift-object-auditor',
134
                                  'swift-object-auditor',
565
135
                                  'status swift-object-replicator',
135
                                  'swift-object-replicator',
566
136
                                  'status swift-object-updater']
136
                                  'swift-object-updater']
567
137
        if self._get_openstack_release() >= self.precise_icehouse:
137
        if self._get_openstack_release() >= self.precise_icehouse:
574
138
            swift_storage_services.append('status swift-container-sync')
138
            swift_storage_services.append('swift-container-sync')
575
139
        commands = {
139
        service_names = {
576
140
            self.mysql_sentry: ['status mysql'],
140
            self.mysql_sentry: ['mysql'],
577
141
            self.keystone_sentry: ['status keystone'],
141
            self.keystone_sentry: ['keystone'],
578
142
            self.glance_sentry: ['status glance-registry', 'status glance-api'],
142
            self.glance_sentry: [
579
143
            self.swift_proxy_sentry: ['status swift-proxy'],
143
                'glance-registry', 'glance-api'],
580
144
            self.swift_proxy_sentry: ['swift-proxy'],
581
144
            self.swift_storage_sentry: swift_storage_services
145
            self.swift_storage_sentry: swift_storage_services
582
145
        }
146
        }
583
146
147
585
147
        ret = u.validate_services(commands)
148
        ret = u.validate_services_by_name(service_names)
586
148
        if ret:
149
        if ret:
587
149
            amulet.raise_status(amulet.FAIL, msg=ret)
150
            amulet.raise_status(amulet.FAIL, msg=ret)
588
150
151
589
@@ -303,8 +304,8 @@
590
303
           file."""
304
           file."""
591
304
        unit = self.swift_storage_sentry
305
        unit = self.swift_storage_sentry
592
305
        conf = '/etc/swift/swift.conf'
306
        conf = '/etc/swift/swift.conf'
595
306
        swift_proxy_relation = self.swift_proxy_sentry.relation('swift-storage',
307
        swift_proxy_relation = self.swift_proxy_sentry.relation(
596
307
                                                  'swift-storage:swift-storage')
308
            'swift-storage', 'swift-storage:swift-storage')
597
308
        expected = {
309
        expected = {
598
309
            'swift_hash_path_suffix': swift_proxy_relation['swift_hash']
310
            'swift_hash_path_suffix': swift_proxy_relation['swift_hash']
599
310
        }
311
        }
600
@@ -405,7 +406,8 @@
601
405
406
602
406
    def test_image_create(self):
407
    def test_image_create(self):
603
407
        """Create an instance in glance, which is backed by swift, and validate
408
        """Create an instance in glance, which is backed by swift, and validate
605
408
           that some of the metadata for the image match in glance and swift."""
409
           that some of the metadata for the image match in glance and swift.
606
410
        """
607
409
        # NOTE(coreycb): Skipping failing test on folsom until resolved. On
411
        # NOTE(coreycb): Skipping failing test on folsom until resolved. On
608
410
        #                folsom only, uploading an image to glance gets 400 Bad
412
        #                folsom only, uploading an image to glance gets 400 Bad
609
411
        #                Request - Error uploading image: (error): [Errno 111]
413
        #                Request - Error uploading image: (error): [Errno 111]
610
@@ -435,7 +437,8 @@
611
435
        # Validate that swift object's checksum/size match that from glance
437
        # Validate that swift object's checksum/size match that from glance
612
436
        headers, containers = self.swift.get_account()
438
        headers, containers = self.swift.get_account()
613
437
        if len(containers) != 1:
439
        if len(containers) != 1:
615
438
            msg = "Expected 1 swift container, found {}".format(len(containers))
440
            msg = "Expected 1 swift container, found {}".format(
616
441
                len(containers))
617
439
            amulet.raise_status(amulet.FAIL, msg=msg)
442
            amulet.raise_status(amulet.FAIL, msg=msg)
618
440
443
619
441
        container_name = containers[0].get('name')
444
        container_name = containers[0].get('name')
620
@@ -449,14 +452,66 @@
621
449
        swift_object_md5 = objects[0].get('hash')
452
        swift_object_md5 = objects[0].get('hash')
622
450
453
623
451
        if glance_image_size != swift_object_size:
454
        if glance_image_size != swift_object_size:
626
452
            msg = "Glance image size {} != swift object size {}".format( \
455
            msg = "Glance image size {} != swift object size {}".format(
627
453
                                           glance_image_size, swift_object_size)
456
                glance_image_size, swift_object_size)
628
454
            amulet.raise_status(amulet.FAIL, msg=msg)
457
            amulet.raise_status(amulet.FAIL, msg=msg)
629
455
458
630
456
        if glance_image_md5 != swift_object_md5:
459
        if glance_image_md5 != swift_object_md5:
633
457
            msg = "Glance image hash {} != swift object hash {}".format( \
460
            msg = "Glance image hash {} != swift object hash {}".format(
634
458
                                             glance_image_md5, swift_object_md5)
461
                glance_image_md5, swift_object_md5)
635
459
            amulet.raise_status(amulet.FAIL, msg=msg)
462
            amulet.raise_status(amulet.FAIL, msg=msg)
636
460
463
637
461
        # Cleanup
464
        # Cleanup
638
462
        u.delete_image(self.glance, image)
465
        u.delete_image(self.glance, image)
639
466
640
467
    def _assert_services(self, should_run):
641
468
        swift_storage_services = ['swift-account-auditor',
642
469
                                  'swift-account-reaper',
643
470
                                  'swift-account-replicator',
644
471
                                  'swift-account-server',
645
472
                                  'swift-container-auditor',
646
473
                                  'swift-container-replicator',
647
474
                                  'swift-container-server',
648
475
                                  'swift-container-sync',
649
476
                                  'swift-container-updater',
650
477
                                  'swift-object-auditor',
651
478
                                  'swift-object-replicator',
652
479
                                  'swift-object-server',
653
480
                                  'swift-object-updater']
654
481
        if self._get_openstack_release() < self.precise_icehouse:
655
482
            swift_storage_services.remove('swift-container-sync')
656
483
657
484
        u.get_unit_process_ids(
658
485
            {self.swift_storage_sentry: swift_storage_services},
659
486
            expect_success=should_run)
660
487
        # No point using validate_unit_process_ids, since we don't
661
488
        # care about how many PIDs, merely that they're running, so
662
489
        # would populate expected with either True or False. This
663
490
        # validation is already performed in get_process_id_list
664
491
665
492
    def _test_pause(self):
666
493
        u.log.info("Testing pause action")
667
494
        self._assert_services(should_run=True)
668
495
        pause_action_id = u.run_action(self.swift_storage_sentry, "pause")
669
496
        assert u.wait_on_action(pause_action_id), "Pause action failed."
670
497
671
498
        self._assert_services(should_run=False)
672
499
673
500
    def _test_resume(self):
674
501
        u.log.info("Testing resume action")
675
502
        # service is left paused by _test_pause
676
503
        self._assert_services(should_run=False)
677
504
        resume_action_id = u.run_action(self.swift_storage_sentry, "resume")
678
505
        assert u.wait_on_action(resume_action_id), "Resume action failed."
679
506
680
507
        self._assert_services(should_run=True)
681
508
682
509
    def test_z_actions(self):
683
510
        """Pause and then resume swift-storage.
684
511
685
512
           Note(sparkiegeek): The method name with the _z_ is a little odd
686
513
           but it forces the test to run last.  It just makes things
687
514
           easier because restarting services requires re-authorization.
688
515
        """
689
516
        self._test_pause()
690
517
        self._test_resume()
691
463
518
692
=== modified file 'tests/charmhelpers/contrib/amulet/utils.py'
693
--- tests/charmhelpers/contrib/amulet/utils.py	2015-07-29 10:49:43 +0000
694
+++ tests/charmhelpers/contrib/amulet/utils.py	2015-08-17 13:44:46 +0000
695
@@ -14,17 +14,23 @@
696
14
# You should have received a copy of the GNU Lesser General Public License
14
# You should have received a copy of the GNU Lesser General Public License
697
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
15
# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
698
16
16
699
17
import amulet
700
18
import ConfigParser
701
19
import distro_info
702
20
import io
17
import io
703
18
import json
704
21
import logging
19
import logging
705
22
import os
20
import os
706
23
import re
21
import re
708
24
import six
22
import subprocess
709
25
import sys
23
import sys
710
26
import time
24
import time
712
27
import urlparse
25
713
26
import amulet
714
27
import distro_info
715
28
import six
716
29
from six.moves import configparser
717
30
if six.PY3:
718
31
    from urllib import parse as urlparse
719
32
else:
720
33
    import urlparse
721
28
34
722
29
35
723
30
class AmuletUtils(object):
36
class AmuletUtils(object):
724
@@ -142,19 +148,23 @@
725
142
148
726
143
            for service_name in services_list:
149
            for service_name in services_list:
727
144
                if (self.ubuntu_releases.index(release) >= systemd_switch or
150
                if (self.ubuntu_releases.index(release) >= systemd_switch or
730
145
                        service_name == "rabbitmq-server"):
151
                        service_name in ['rabbitmq-server', 'apache2']):
731
146
                    # init is systemd
152
                    # init is systemd (or regular sysv)
732
147
                    cmd = 'sudo service {} status'.format(service_name)
153
                    cmd = 'sudo service {} status'.format(service_name)
733
154
                    output, code = sentry_unit.run(cmd)
734
155
                    service_running = code == 0
735
148
                elif self.ubuntu_releases.index(release) < systemd_switch:
156
                elif self.ubuntu_releases.index(release) < systemd_switch:
736
149
                    # init is upstart
157
                    # init is upstart
737
150
                    cmd = 'sudo status {}'.format(service_name)
158
                    cmd = 'sudo status {}'.format(service_name)
738
159
                    output, code = sentry_unit.run(cmd)
739
160
                    service_running = code == 0 and "start/running" in output
740
151
161
741
152
                output, code = sentry_unit.run(cmd)
742
153
                self.log.debug('{} `{}` returned '
162
                self.log.debug('{} `{}` returned '
743
154
                               '{}'.format(sentry_unit.info['unit_name'],
163
                               '{}'.format(sentry_unit.info['unit_name'],
744
155
                                           cmd, code))
164
                                           cmd, code))
747
156
                if code != 0:
165
                if not service_running:
748
157
                    return "command `{}` returned {}".format(cmd, str(code))
166
                    return u"command `{}` returned {} {}".format(
749
167
                        cmd, output, str(code))
750
158
        return None
168
        return None
751
159
169
752
160
    def _get_config(self, unit, filename):
170
    def _get_config(self, unit, filename):
753
@@ -164,7 +174,7 @@
754
164
        # NOTE(beisner):  by default, ConfigParser does not handle options
174
        # NOTE(beisner):  by default, ConfigParser does not handle options
755
165
        # with no value, such as the flags used in the mysql my.cnf file.
175
        # with no value, such as the flags used in the mysql my.cnf file.
756
166
        # https://bugs.python.org/issue7005
176
        # https://bugs.python.org/issue7005
758
167
        config = ConfigParser.ConfigParser(allow_no_value=True)
177
        config = configparser.ConfigParser(allow_no_value=True)
759
168
        config.readfp(io.StringIO(file_contents))
178
        config.readfp(io.StringIO(file_contents))
760
169
        return config
179
        return config
761
170
180
762
@@ -450,15 +460,20 @@
763
450
                                        cmd, code, output))
460
                                        cmd, code, output))
764
451
        return None
461
        return None
765
452
462
767
453
    def get_process_id_list(self, sentry_unit, process_name):
463
    def get_process_id_list(self, sentry_unit, process_name,
768
464
                            expect_success=True):
769
454
        """Get a list of process ID(s) from a single sentry juju unit
465
        """Get a list of process ID(s) from a single sentry juju unit
770
455
        for a single process name.
466
        for a single process name.
771
456
467
773
457
        :param sentry_unit: Pointer to amulet sentry instance (juju unit)
468
        :param sentry_unit: Amulet sentry instance (juju unit)
774
458
        :param process_name: Process name
469
        :param process_name: Process name
775
470
        :param expect_success: If False, expect the PID to be missing,
776
471
            raise if it is present.
777
459
        :returns: List of process IDs
472
        :returns: List of process IDs
778
460
        """
473
        """
780
461
        cmd = 'pidof {}'.format(process_name)
474
        cmd = 'pidof -x {}'.format(process_name)
781
475
        if not expect_success:
782
476
            cmd += " || exit 0 && exit 1"
783
462
        output, code = sentry_unit.run(cmd)
477
        output, code = sentry_unit.run(cmd)
784
463
        if code != 0:
478
        if code != 0:
785
464
            msg = ('{} `{}` returned {} '
479
            msg = ('{} `{}` returned {} '
786
@@ -467,14 +482,23 @@
787
467
            amulet.raise_status(amulet.FAIL, msg=msg)
482
            amulet.raise_status(amulet.FAIL, msg=msg)
788
468
        return str(output).split()
483
        return str(output).split()
789
469
484
791
470
    def get_unit_process_ids(self, unit_processes):
485
    def get_unit_process_ids(self, unit_processes, expect_success=True):
792
471
        """Construct a dict containing unit sentries, process names, and
486
        """Construct a dict containing unit sentries, process names, and
794
472
        process IDs."""
487
        process IDs.
795
488
796
489
        :param unit_processes: A dictionary of Amulet sentry instance
797
490
            to list of process names.
798
491
        :param expect_success: if False expect the processes to not be
799
492
            running, raise if they are.
800
493
        :returns: Dictionary of Amulet sentry instance to dictionary
801
494
            of process names to PIDs.
802
495
        """
803
473
        pid_dict = {}
496
        pid_dict = {}
805
474
        for sentry_unit, process_list in unit_processes.iteritems():
497
        for sentry_unit, process_list in six.iteritems(unit_processes):
806
475
            pid_dict[sentry_unit] = {}
498
            pid_dict[sentry_unit] = {}
807
476
            for process in process_list:
499
            for process in process_list:
809
477
                pids = self.get_process_id_list(sentry_unit, process)
500
                pids = self.get_process_id_list(
810
501
                    sentry_unit, process, expect_success=expect_success)
811
478
                pid_dict[sentry_unit].update({process: pids})
502
                pid_dict[sentry_unit].update({process: pids})
812
479
        return pid_dict
503
        return pid_dict
813
480
504
814
@@ -488,7 +512,7 @@
815
488
            return ('Unit count mismatch.  expected, actual: {}, '
512
            return ('Unit count mismatch.  expected, actual: {}, '
816
489
                    '{} '.format(len(expected), len(actual)))
513
                    '{} '.format(len(expected), len(actual)))
817
490
514
819
491
        for (e_sentry, e_proc_names) in expected.iteritems():
515
        for (e_sentry, e_proc_names) in six.iteritems(expected):
820
492
            e_sentry_name = e_sentry.info['unit_name']
516
            e_sentry_name = e_sentry.info['unit_name']
821
493
            if e_sentry in actual.keys():
517
            if e_sentry in actual.keys():
822
494
                a_proc_names = actual[e_sentry]
518
                a_proc_names = actual[e_sentry]
823
@@ -507,11 +531,23 @@
824
507
                            '{}'.format(e_proc_name, a_proc_name))
531
                            '{}'.format(e_proc_name, a_proc_name))
825
508
532
826
509
                a_pids_length = len(a_pids)
533
                a_pids_length = len(a_pids)
829
510
                if e_pids_length != a_pids_length:
534
                fail_msg = ('PID count mismatch. {} ({}) expected, actual: '
828
511
                    return ('PID count mismatch. {} ({}) expected, actual: '
830
512
                            '{}, {} ({})'.format(e_sentry_name, e_proc_name,
535
                            '{}, {} ({})'.format(e_sentry_name, e_proc_name,
831
513
                                                 e_pids_length, a_pids_length,
536
                                                 e_pids_length, a_pids_length,
832
514
                                                 a_pids))
537
                                                 a_pids))
833
538
834
539
                # If expected is not bool, ensure PID quantities match
835
540
                if not isinstance(e_pids_length, bool) and \
836
541
                        a_pids_length != e_pids_length:
837
542
                    return fail_msg
838
543
                # If expected is bool True, ensure 1 or more PIDs exist
839
544
                elif isinstance(e_pids_length, bool) and \
840
545
                        e_pids_length is True and a_pids_length < 1:
841
546
                    return fail_msg
842
547
                # If expected is bool False, ensure 0 PIDs exist
843
548
                elif isinstance(e_pids_length, bool) and \
844
549
                        e_pids_length is False and a_pids_length != 0:
845
550
                    return fail_msg
846
515
                else:
551
                else:
847
516
                    self.log.debug('PID check OK: {} {} {}: '
552
                    self.log.debug('PID check OK: {} {} {}: '
848
517
                                   '{}'.format(e_sentry_name, e_proc_name,
553
                                   '{}'.format(e_sentry_name, e_proc_name,
849
@@ -531,3 +567,30 @@
850
531
            return 'Dicts within list are not identical'
567
            return 'Dicts within list are not identical'
851
532
568
852
533
        return None
569
        return None
853
570
854
571
    def run_action(self, unit_sentry, action,
855
572
                   _check_output=subprocess.check_output):
856
573
        """Run the named action on a given unit sentry.
857
574
858
575
        _check_output parameter is used for dependency injection.
859
576
860
577
        @return action_id.
861
578
        """
862
579
        unit_id = unit_sentry.info["unit_name"]
863
580
        command = ["juju", "action", "do", "--format=json", unit_id, action]
864
581
        self.log.info("Running command: %s\n" % " ".join(command))
865
582
        output = _check_output(command, universal_newlines=True)
866
583
        data = json.loads(output)
867
584
        action_id = data[u'Action queued with id']
868
585
        return action_id
869
586
870
587
    def wait_on_action(self, action_id, _check_output=subprocess.check_output):
871
588
        """Wait for a given action, returning if it completed or not.
872
589
873
590
        _check_output parameter is used for dependency injection.
874
591
        """
875
592
        command = ["juju", "action", "fetch", "--format=json", "--wait=0",
876
593
                   action_id]
877
594
        output = _check_output(command, universal_newlines=True)
878
595
        data = json.loads(output)
879
596
        return data.get(u"status") == "completed"
880
534
597
881
=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
882
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-07-29 10:49:43 +0000
883
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-08-17 13:44:46 +0000
884
@@ -44,7 +44,7 @@
885
44
           Determine if the local branch being tested is derived from its
44
           Determine if the local branch being tested is derived from its
886
45
           stable or next (dev) branch, and based on this, use the corresonding
45
           stable or next (dev) branch, and based on this, use the corresonding
887
46
           stable or next branches for the other_services."""
46
           stable or next branches for the other_services."""
889
47
        base_charms = ['mysql', 'mongodb']
47
        base_charms = ['mysql', 'mongodb', 'nrpe']
890
48
48
891
49
        if self.series in ['precise', 'trusty']:
49
        if self.series in ['precise', 'trusty']:
892
50
            base_series = self.series
50
            base_series = self.series
893
@@ -81,7 +81,7 @@
894
81
                      'ceph-osd', 'ceph-radosgw']
81
                      'ceph-osd', 'ceph-radosgw']
895
82
        # Most OpenStack subordinate charms do not expose an origin option
82
        # Most OpenStack subordinate charms do not expose an origin option
896
83
        # as that is controlled by the principle.
83
        # as that is controlled by the principle.
898
84
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch']
84
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe']
899
85
85
900
86
        if self.openstack:
86
        if self.openstack:
901
87
            for svc in services:
87
            for svc in services:
902
88
88
903
=== added file 'unit_tests/test_actions.py'
904
--- unit_tests/test_actions.py	1970-01-01 00:00:00 +0000
905
+++ unit_tests/test_actions.py	2015-08-17 13:44:46 +0000
906
@@ -0,0 +1,239 @@
907
1
import argparse
908
2
import tempfile
909
3
import unittest
910
4
911
5
import mock
912
6
import yaml
913
7
914
8
from test_utils import CharmTestCase
915
9
916
10
import actions.actions
917
11
918
12
919
13
class PauseTestCase(CharmTestCase):
920
14
921
15
    def setUp(self):
922
16
        super(PauseTestCase, self).setUp(
923
17
            actions.actions, ["service_pause", "status_set"])
924
18
925
19
        class FakeArgs(object):
926
20
            services = ['swift-account',
927
21
                        'swift-account-auditor',
928
22
                        'swift-account-reaper',
929
23
                        'swift-account-replicator',
930
24
                        'swift-container',
931
25
                        'swift-container-auditor',
932
26
                        'swift-container-updater',
933
27
                        'swift-container-replicator',
934
28
                        'swift-container-sync',
935
29
                        'swift-object',
936
30
                        'swift-object-auditor',
937
31
                        'swift-object-updater',
938
32
                        'swift-object-replicator']
939
33
        self.args = FakeArgs()
940
34
941
35
    def test_pauses_services(self):
942
36
        """Pause action pauses all of the Swift services."""
943
37
        pause_calls = []
944
38
945
39
        def fake_service_pause(svc):
946
40
            pause_calls.append(svc)
947
41
            return True
948
42
949
43
        self.service_pause.side_effect = fake_service_pause
950
44
951
45
        actions.actions.pause(self.args)
952
46
        self.assertEqual(pause_calls, ['swift-account',
953
47
                                       'swift-account-auditor',
954
48
                                       'swift-account-reaper',
955
49
                                       'swift-account-replicator',
956
50
                                       'swift-container',
957
51
                                       'swift-container-auditor',
958
52
                                       'swift-container-updater',
959
53
                                       'swift-container-replicator',
960
54
                                       'swift-container-sync',
961
55
                                       'swift-object',
962
56
                                       'swift-object-auditor',
963
57
                                       'swift-object-updater',
964
58
                                       'swift-object-replicator'])
965
59
966
60
    def test_bails_out_early_on_error(self):
967
61
        """Pause action fails early if there are errors stopping a service."""
968
62
        pause_calls = []
969
63
970
64
        def maybe_kill(svc):
971
65
            if svc == "swift-container":
972
66
                return False
973
67
            else:
974
68
                pause_calls.append(svc)
975
69
                return True
976
70
977
71
        self.service_pause.side_effect = maybe_kill
978
72
        self.assertRaisesRegexp(
979
73
            Exception, "swift-container didn't stop cleanly.",
980
74
            actions.actions.pause, self.args)
981
75
        self.assertEqual(pause_calls, ['swift-account',
982
76
                                       'swift-account-auditor',
983
77
                                       'swift-account-reaper',
984
78
                                       'swift-account-replicator'])
985
79
986
80
    def test_status_mode(self):
987
81
        """Pause action sets the status to maintenance."""
988
82
        status_calls = []
989
83
        self.status_set.side_effect = lambda state, msg: status_calls.append(
990
84
            state)
991
85
992
86
        actions.actions.pause(self.args)
993
87
        self.assertEqual(status_calls, ["maintenance"])
994
88
995
89
    def test_status_message(self):
996
90
        """Pause action sets a status message reflecting that it's paused."""
997
91
        status_calls = []
998
92
        self.status_set.side_effect = lambda state, msg: status_calls.append(
999
93
            msg)
1000
94
1001
95
        actions.actions.pause(self.args)
1002
96
        self.assertEqual(
1003
97
            status_calls, ["Paused. "
1004
98
                           "Use 'resume' action to resume normal service."])
1005
99
1006
100
1007
101
class ResumeTestCase(CharmTestCase):
1008
102
1009
103
    def setUp(self):
1010
104
        super(ResumeTestCase, self).setUp(
1011
105
            actions.actions, ["service_resume", "status_set"])
1012
106
1013
107
        class FakeArgs(object):
1014
108
            services = ['swift-account',
1015
109
                        'swift-account-auditor',
1016
110
                        'swift-account-reaper',
1017
111
                        'swift-account-replicator',
1018
112
                        'swift-container',
1019
113
                        'swift-container-auditor',
1020
114
                        'swift-container-updater',
1021
115
                        'swift-container-replicator',
1022
116
                        'swift-container-sync',
1023
117
                        'swift-object',
1024
118
                        'swift-object-auditor',
1025
119
                        'swift-object-updater',
1026
120
                        'swift-object-replicator']
1027
121
        self.args = FakeArgs()
1028
122
1029
123
    def test_resumes_services(self):
1030
124
        """Resume action resumes all of the Swift services."""
1031
125
        resume_calls = []
1032
126
1033
127
        def fake_service_resume(svc):
1034
128
            resume_calls.append(svc)
1035
129
            return True
1036
130
1037
131
        self.service_resume.side_effect = fake_service_resume
1038
132
        actions.actions.resume(self.args)
1039
133
        self.assertEqual(resume_calls, ['swift-account',
1040
134
                                        'swift-account-auditor',
1041
135
                                        'swift-account-reaper',
1042
136
                                        'swift-account-replicator',
1043
137
                                        'swift-container',
1044
138
                                        'swift-container-auditor',
1045
139
                                        'swift-container-updater',
1046
140
                                        'swift-container-replicator',
1047
141
                                        'swift-container-sync',
1048
142
                                        'swift-object',
1049
143
                                        'swift-object-auditor',
1050
144
                                        'swift-object-updater',
1051
145
                                        'swift-object-replicator'])
1052
146
1053
147
    def test_bails_out_early_on_error(self):
1054
148
        """Resume action fails early if there are errors starting a service."""
1055
149
        resume_calls = []
1056
150
1057
151
        def maybe_kill(svc):
1058
152
            if svc == "swift-container":
1059
153
                return False
1060
154
            else:
1061
155
                resume_calls.append(svc)
1062
156
                return True
1063
157
1064
158
        self.service_resume.side_effect = maybe_kill
1065
159
        self.assertRaisesRegexp(
1066
160
            Exception, "swift-container didn't start cleanly.",
1067
161
            actions.actions.resume, self.args)
1068
162
        self.assertEqual(resume_calls, ['swift-account',
1069
163
                                        'swift-account-auditor',
1070
164
                                        'swift-account-reaper',
1071
165
                                        'swift-account-replicator'])
1072
166
1073
167
    def test_status_mode(self):
1074
168
        """Resume action sets the status to maintenance."""
1075
169
        status_calls = []
1076
170
        self.status_set.side_effect = lambda state, msg: status_calls.append(
1077
171
            state)
1078
172
1079
173
        actions.actions.resume(self.args)
1080
174
        self.assertEqual(status_calls, ["active"])
1081
175
1082
176
    def test_status_message(self):
1083
177
        """Resume action sets an empty status message."""
1084
178
        status_calls = []
1085
179
        self.status_set.side_effect = lambda state, msg: status_calls.append(
1086
180
            msg)
1087
181
1088
182
        actions.actions.resume(self.args)
1089
183
        self.assertEqual(status_calls, [""])
1090
184
1091
185
1092
186
class GetActionParserTestCase(unittest.TestCase):
1093
187
1094
188
    def test_definition_from_yaml(self):
1095
189
        """ArgumentParser is seeded from actions.yaml."""
1096
190
        actions_yaml = tempfile.NamedTemporaryFile(
1097
191
            prefix="GetActionParserTestCase", suffix="yaml")
1098
192
        actions_yaml.write(yaml.dump({"foo": {"description": "Foo is bar"}}))
1099
193
        actions_yaml.seek(0)
1100
194
        parser = actions.actions.get_action_parser(actions_yaml.name, "foo",
1101
195
                                                   get_services=lambda: [])
1102
196
        self.assertEqual(parser.description, 'Foo is bar')
1103
197
1104
198
1105
199
class MainTestCase(CharmTestCase):
1106
200
1107
201
    def setUp(self):
1108
202
        super(MainTestCase, self).setUp(
1109
203
            actions.actions, ["_get_action_name",
1110
204
                              "get_action_parser",
1111
205
                              "action_fail"])
1112
206
1113
207
    def test_invokes_pause(self):
1114
208
        dummy_calls = []
1115
209
1116
210
        def dummy_action(args):
1117
211
            dummy_calls.append(True)
1118
212
1119
213
        self._get_action_name.side_effect = lambda: "foo"
1120
214
        self.get_action_parser = lambda: argparse.ArgumentParser()
1121
215
        with mock.patch.dict(actions.actions.ACTIONS, {"foo": dummy_action}):
1122
216
            actions.actions.main([])
1123
217
        self.assertEqual(dummy_calls, [True])
1124
218
1125
219
    def test_unknown_action(self):
1126
220
        """Unknown actions aren't a traceback."""
1127
221
        self._get_action_name.side_effect = lambda: "foo"
1128
222
        self.get_action_parser = lambda: argparse.ArgumentParser()
1129
223
        exit_string = actions.actions.main([])
1130
224
        self.assertEqual("Action foo undefined", exit_string)
1131
225
1132
226
    def test_failing_action(self):
1133
227
        """Actions which traceback trigger action_fail() calls."""
1134
228
        dummy_calls = []
1135
229
1136
230
        self.action_fail.side_effect = dummy_calls.append
1137
231
        self._get_action_name.side_effect = lambda: "foo"
1138
232
1139
233
        def dummy_action(args):
1140
234
            raise ValueError("uh oh")
1141
235
1142
236
        self.get_action_parser = lambda: argparse.ArgumentParser()
1143
237
        with mock.patch.dict(actions.actions.ACTIONS, {"foo": dummy_action}):
1144
238
            actions.actions.main([])
1145
239
        self.assertEqual(dummy_calls, ["uh oh"])
Reviewer	Date Requested	Status
Landscape	2015-08-11	Pending
OpenStack Charmers	2015-08-11	Pending
Review via email: mp+267681@code.launchpad.net