Change module reference charmers.openstack -> charms_openstack
This is due to a change in the referenced module's namespace.
This commit is contained in:
parent
ba30ae763f
commit
e29db2af63
|
@ -8,9 +8,9 @@ import charmhelpers.fetch
|
|||
import charmhelpers.core.hookenv as hookenv
|
||||
import charmhelpers.contrib.openstack.utils as ch_utils
|
||||
|
||||
import charmers.openstack.charm
|
||||
import charmers.openstack.adapters
|
||||
import charmers.openstack.ip as os_ip
|
||||
import charms_openstack.charm
|
||||
import charms_openstack.adapters
|
||||
import charms_openstack.ip as os_ip
|
||||
|
||||
PACKAGES = ['barbican-common', 'barbican-api', 'barbican-worker',
|
||||
'python-mysqldb']
|
||||
|
@ -70,7 +70,7 @@ def render_configs(interfaces_list):
|
|||
# Implementation of the Barbican Charm classes
|
||||
|
||||
class BarbicanConfigurationAdapter(
|
||||
charmers.openstack.adapters.ConfigurationAdapter):
|
||||
charms_openstack.adapters.ConfigurationAdapter):
|
||||
|
||||
def __init__(self):
|
||||
super(BarbicanConfigurationAdapter, self).__init__()
|
||||
|
@ -95,7 +95,7 @@ class BarbicanConfigurationAdapter(
|
|||
}[self.keystone_api_version]
|
||||
|
||||
|
||||
class BarbicanAdapters(charmers.openstack.adapters.OpenStackRelationAdapters):
|
||||
class BarbicanAdapters(charms_openstack.adapters.OpenStackRelationAdapters):
|
||||
"""
|
||||
Adapters class for the Barbican charm.
|
||||
|
||||
|
@ -107,7 +107,7 @@ class BarbicanAdapters(charmers.openstack.adapters.OpenStackRelationAdapters):
|
|||
relations, options=BarbicanConfigurationAdapter)
|
||||
|
||||
|
||||
class BarbicanCharm(charmers.openstack.charm.OpenStackCharm):
|
||||
class BarbicanCharm(charms_openstack.charm.OpenStackCharm):
|
||||
"""BarbicanCharm provides the specialisation of the OpenStackCharm
|
||||
functionality to manage a barbican unit.
|
||||
"""
|
||||
|
|
|
@ -138,7 +138,7 @@ class TestBarbicanAdapters(Helper):
|
|||
self.assertTrue(
|
||||
isinstance(
|
||||
b.other,
|
||||
barbican.charmers.openstack.adapters.OpenStackRelationAdapter))
|
||||
barbican.charms_openstack.adapters.OpenStackRelationAdapter))
|
||||
self.assertTrue(isinstance(b.options,
|
||||
barbican.BarbicanConfigurationAdapter))
|
||||
|
||||
|
@ -153,9 +153,9 @@ class TestBarbicanCharm(Helper):
|
|||
def test_install(self):
|
||||
self.patch(barbican.charmhelpers.fetch, 'add_source')
|
||||
b = barbican.BarbicanCharm()
|
||||
self.patch(barbican.charmers.openstack.charm.OpenStackCharm,
|
||||
self.patch(barbican.charms_openstack.charm.OpenStackCharm,
|
||||
'configure_source')
|
||||
self.patch(barbican.charmers.openstack.charm.OpenStackCharm,
|
||||
self.patch(barbican.charms_openstack.charm.OpenStackCharm,
|
||||
'install')
|
||||
b.install()
|
||||
self.add_source.assert_called_once_with('ppa:gnuoy/barbican-alt')
|
||||
|
|
Loading…
Reference in New Issue