Merge ~gnuoy/charms/+source/interface-rabbitmq:master into ~openstack-charmers-layers/charms/+source/interface-rabbitmq:master

[Liam Young]

[James Page (james-page)]

review: Needs Fixing

diff --git a/requires.py b/requires.py
index b118668..0a4a9d2 100644
--- a/requires.py
+++ b/requires.py
@@ -14,14 +14,15 @@
 from charms.reactive import RelationBase
 from charms.reactive import hook
 from charms.reactive import scopes
-
+from charmhelpers.core import hookenv
 
 class RabbitMQRequires(RelationBase):
     scope = scopes.GLOBAL
 
     # These remote data fields will be automatically mapped to accessors
     # with a basic documentation string provided.
-    auto_accessors = ['hostname', 'password']
+    auto_accessors = ['password', 'private-address', 'ssl_port',
+                      'ssl_ca', 'ha_queues', 'ha-vip-only', 'clustered', 'vip']
 
     def vhost(self):
         return self.get_local('vhost')
@@ -35,22 +36,23 @@ class RabbitMQRequires(RelationBase):
 
     @hook('{requires:rabbitmq}-relation-changed')
     def changed(self):
-        self.set_state('{relation_name}.connected')
-        if self.data_complete():
+        if self.base_data_complete():
             self.set_state('{relation_name}.available')
+            if self.ssl_data_complete():
+                self.set_state('{relation_name}.available.ssl')
 
     @hook('{requires:rabbitmq}-relation-{broken,departed}')
-    def departed_or_broken(self):
+    def departed(self):
         self.remove_state('{relation_name}.connected')
-        if not self.data_complete():
-            self.remove_state('{relation_name}.available')
+        self.remove_state('{relation_name}.available')
+        self.remove_state('{relation_name}.available.ssl')
 
-    def data_complete(self):
+    def base_data_complete(self):
         """
         Get the connection string, if available, or None.
         """
         data = {
-            'host': self.hostname(),
+            'hostname': self.private_address(),
             'vhost': self.vhost(),
             'username': self.username(),
             'password': self.password(),
@@ -59,11 +61,44 @@ class RabbitMQRequires(RelationBase):
             return True
         return False
 
+    def ssl_data_complete(self):
+        """
+        Get the connection string, if available, or None.
+        """
+        data = {
+            'ssl_port': self.ssl_port(),
+            'ssl_ca': self.ssl_ca(),
+        }
+        if all(data.values()):
+            return True
+        return False
+
+
     def configure(self, username, vhost):
+        """
+        Called by charm layer that uses this interface to configure rabbit.
+        """
         relation_info = {
             'username': username,
             'vhost': vhost,
         }
-        self.set_local('username', username)
-        self.set_local('vhost', vhost)
+        self.set_local(**relation_info)
         self.set_remote(**relation_info)
+
+
+    def get_remote_all(self, key, default=None):
+        '''Return a list of all values presented by remote units for key'''
+        values = []
+        for conversation in self.conversations():
+            for relation_id in conversation.relation_ids:
+                for unit in hookenv.related_units(relation_id):
+                    value = hookenv.relation_get(key,
+                                                 unit,
+                                                 relation_id) or default
+                    if value:
+                        values.append(value)
+        return list(set(values))
+
+
+    def rabbitmq_hosts(self):
+        return self.get_remote_all('private-address')