Switch to using charms.openstack memcache adapter
Minor refactor to drop use of local Memcache relation adapter now that its been incorporated into charms.openstack. Change-Id: I2b5d8ed26513574b34c1cdfd8edbe53bb1498343
This commit is contained in:
parent
dba0b04e86
commit
76cd529b9a
@ -96,23 +96,6 @@ class StorageCephRelationAdapter(adapters.OpenStackRelationAdapter):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
# TODO(jamespage): charms.openstack
|
|
||||||
class MemcacheRelationAdapter(adapters.OpenStackRelationAdapter):
|
|
||||||
|
|
||||||
"""
|
|
||||||
Adapter for the MemcacheRequires relation interface.
|
|
||||||
"""
|
|
||||||
|
|
||||||
interface_type = 'memcache'
|
|
||||||
|
|
||||||
@property
|
|
||||||
def url(self):
|
|
||||||
hosts = sorted(self.relation.memcache_hosts())
|
|
||||||
if hosts:
|
|
||||||
return "memcached://{}:11211?timeout=5".format(hosts[0])
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
class GnocchiCharmRelationAdapaters(adapters.OpenStackAPIRelationAdapters):
|
class GnocchiCharmRelationAdapaters(adapters.OpenStackAPIRelationAdapters):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
@ -123,7 +106,7 @@ class GnocchiCharmRelationAdapaters(adapters.OpenStackAPIRelationAdapters):
|
|||||||
'storage_ceph': StorageCephRelationAdapter,
|
'storage_ceph': StorageCephRelationAdapter,
|
||||||
'shared_db': adapters.DatabaseRelationAdapter,
|
'shared_db': adapters.DatabaseRelationAdapter,
|
||||||
'cluster': adapters.PeerHARelationAdapter,
|
'cluster': adapters.PeerHARelationAdapter,
|
||||||
'coordinator_memcached': MemcacheRelationAdapter,
|
'coordinator_memcached': adapters.MemcacheRelationAdapter,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,8 +30,6 @@ class TestAdapters(test_utils.PatchHelper):
|
|||||||
'1.2.3.6:123',
|
'1.2.3.6:123',
|
||||||
]
|
]
|
||||||
|
|
||||||
_memcache = ['1.2.3.4', '1.2.3.5']
|
|
||||||
|
|
||||||
def test_storage_ceph(self):
|
def test_storage_ceph(self):
|
||||||
adapter = gnocchi.StorageCephRelationAdapter()
|
adapter = gnocchi.StorageCephRelationAdapter()
|
||||||
adapter.relation = mock.MagicMock()
|
adapter.relation = mock.MagicMock()
|
||||||
@ -40,12 +38,3 @@ class TestAdapters(test_utils.PatchHelper):
|
|||||||
','.join(self._mons))
|
','.join(self._mons))
|
||||||
adapter.relation.mon_hosts.return_value = []
|
adapter.relation.mon_hosts.return_value = []
|
||||||
self.assertEqual(adapter.monitors, None)
|
self.assertEqual(adapter.monitors, None)
|
||||||
|
|
||||||
def test_memcache(self):
|
|
||||||
adapter = gnocchi.MemcacheRelationAdapter()
|
|
||||||
adapter.relation = mock.MagicMock()
|
|
||||||
adapter.relation.memcache_hosts.return_value = self._memcache
|
|
||||||
self.assertEqual(adapter.url,
|
|
||||||
"memcached://1.2.3.4:11211?timeout=5")
|
|
||||||
adapter.relation.memcache_hosts.return_value = []
|
|
||||||
self.assertEqual(adapter.url, None)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user