← Back to branch summary

~hopem/charms/trusty/keystone/lp1476325

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/amulet/utils.py

  • Committer: Liam Young
  • Date: 2015-01-09 15:54:17 UTC
  • mfrom: (99 keystone-242900)
  • mto: This revision was merged to the branch mainline in revision 100.
  • Revision ID: liam.young@canonical.com-20150109155417-ev9c5l3hcx7lo4ec
Merged next in and resolved conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/amulet/utils.py
7
7
import keystoneclient.v2_0 as keystone_client
8
8
import novaclient.v1_1.client as nova_client
9
9
 
 
10
import six
 
11
 
10
12
from charmhelpers.contrib.amulet.utils import (
11
13
    AmuletUtils
12
14
)
60
62
           expected service catalog endpoints.
61
63
           """
62
64
        self.log.debug('actual: {}'.format(repr(actual)))
63
 
        for k, v in expected.iteritems():
 
65
        for k, v in six.iteritems(expected):
64
66
            if k in actual:
65
67
                ret = self._validate_dict_data(expected[k][0], actual[k][0])
66
68
                if ret: