Merge ~james-page/openstack-charm-layer-dev:master into ~openstack-charmers-layers/openstack-charm-layer-dev:master

[James Page]

0cf698b... by James Page on 2015-12-04

Add localized layers support

Unmerged commits

0cf698b... by James Page on 2015-12-04

Add localized layers support

ffc2ca2... by James Page on 2015-12-04

An idea for interface adapters

diff --git a/.gitignore b/.gitignore
index cfac03f..bec5c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 build
 .tox
+interfaces
+layers
diff --git a/Makefile b/Makefile
index 8eab509..1bd85e5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,5 @@
 clean:
 	rm -Rf build
 
-generate:
+generate: clean
 	tox -e generate
diff --git a/charm/reactive/testcharm.py b/charm/reactive/testcharm.py
index ea6c0b6..240dcac 100644
--- a/charm/reactive/testcharm.py
+++ b/charm/reactive/testcharm.py
@@ -12,6 +12,130 @@ def setup_database(database):
     database.configure('mydatabase2', 'myusername2', host, prefix="second")
     #database.configure('mydatabase', 'myusername', host)
 
+class OpenStackRelationAdapter(object):
+    """
+    Base adapter class for all OpenStack related adapters.
+    """
+
+    interface_type = None
+    """
+    The generic type of the interface the adapter is wrapping.
+    """
+
+    def __init__(self, relation):
+        self.relation = relation
+        self._setup_properties()
+
+    @property
+    def relation_name(self):
+        """
+        Name of the relation this adapter is handling.
+        """
+        return self._relation.relation_name
+
+    def _setup_properties(self):
+        """
+        Setup property based accessors for an interfaces
+        auto accessors
+        """
+        for field in self.relation.auto_accessors:
+            meth_name = field.replace('-', '_')
+            # TODO: see if we can make this dynamic, rather
+            #       than making all calls on setup.
+            self.__dict__[meth_name] = getattr(self.relation,
+                                               meth_name)()
+
+
+class RabbitMQRelationAdapter(OpenStackRelationAdapter):
+    """
+    Adapter for the RabbitMQRequires relation interface.
+    """
+
+    interface_type = "messaging"
+
+    @property
+    def host(self):
+        """
+        Hostname that should be used to access RabbitMQ.
+        """
+        if self.vip:
+            return self.vip
+        else:
+            return self.private_address
+
+    @property
+    def hosts(self):
+        """
+        Comma separated list of hosts that should be used
+        to access RabbitMQ.
+        """
+        hosts = self.relation.rabbitmq_hosts()
+        if len(hosts) > 1:
+            return ','.join(hosts)
+        else:
+            return None
+
+    @property
+    def vhost(self):
+        return self.relation.vhost()
+
+    @property
+    def username(self):
+        return self.relation.username()
+
+
+class OpenStackInterfaceAdapters(object):
+    """
+    Base adapters class for OpenStack Charms, used to aggregate
+    the relations associated with a particular charm so that their
+    properties can be accessed using dot notation, e.g:
+
+        adapters.amqp.private_address
+    """
+
+    interface_adapters = {}
+    """
+    Dictionary mapping relation names to adapter classes, e.g:
+
+        interface_adapters = {
+            'amqp': RabbitMQRelationAdapter,
+        }
+
+    By default, interfaces will be wrapped in an OpenStackRelationAdapter.
+    """
+
+    def __init__(self, interfaces):
+        self._relations = []
+        for interface in interfaces:
+            relation_name = interface.relation_name
+            if relation_name in self.interface_adapters:
+                self.__dict__[relation_name] = (
+                    self.interface_adapters[relation_name](interface)
+                )
+            else:
+                self.__dict__[relation_name] = (
+                    OpenStackRelationAdapter(interface)
+                )
+            self._relations.append(relation_name)
+
+    def __iter__(self):
+        """
+        Iterate over the relations presented to the charm.
+        """
+        for relation in self._relations:
+            yield relation, self.__dict__[relation]
+
+
+class TestCharmAdapters(OpenStackInterfaceAdapters):
+    """
+    Adapters class for the TestCharm charm.
+    """
+
+    interface_adapters = {
+        'amqp': RabbitMQRelationAdapter,
+    }
+
+
 @when('database.available')
 def use_database(database):
     # base data provided by testcharm
@@ -44,36 +168,32 @@ def use_database_ssl(database):
     log("ssl_cert=%s" % database.ssl_cert())
     log("ssl_key=%s" % database.ssl_key())
 
+
 @when('amqp.connected')
 def setup_amqp_req(amqp):
     log("AMQP Connected")
     amqp.configure('bob', 'myvhost')
 
+
 @when('amqp.available')
-def conf_amqp_req(amqp):
+def conf_amqp_req(*args):
     log("AMQP Available")
-    log("hostname=%s" % amqp.hostname())
-    log("vhost=%s" % amqp.vhost())
-    log("username=%s" % amqp.username())
-    log("password=%s" % amqp.password())
-    ctxt = {
-        'amqp': amqp,
-    }
-    rabbits = amqp.rabbitmq_hosts()
-    if len(rabbits) > 1:
-        ctxt['rabbitmq_hosts'] = ','.join(rabbits)
-    elif len(rabbits) == 1:
-        ctxt['rabbitmq_host'] = rabbits[0]
+    adapters = TestCharmAdapters(args)
+    log("hostname=%s" % adapters.amqp.private_address)
+    log("vhost=%s" % adapters.amqp.vhost)
+    log("username=%s" % adapters.amqp.username)
+    log("password=%s" % adapters.amqp.password)
     render(source='rabbit.conf',
            target='/tmp/rabbit.conf',
-           context=ctxt
+           context=adapters
            )
 
 @when('amqp.available.ssl')
-def conf_amqp_ssl(amqp):
+def conf_amqp_ssl(*args):
     log("AMQP Available SSL")
-    log("ssl_port=%s" % amqp.ssl_port())
-    log("ssl_ca=%s" % amqp.ssl_ca())
+    adapters = TestCharmAdapters(args)
+    print(adapters.amqp.ssl_port)
+    print(adapters.amqp.ssl_ca)
 
 @when('database.connected')
 @when_not('database.available')
diff --git a/charm/templates/rabbit.conf b/charm/templates/rabbit.conf
index 269bea5..3ad2371 100644
--- a/charm/templates/rabbit.conf
+++ b/charm/templates/rabbit.conf
@@ -1,22 +1,22 @@
-{% if rabbitmq_host or rabbitmq_hosts -%}
+{% if amqp.host or amqp.hosts -%}
 [oslo_messaging_rabbit]
-rabbit_userid = {{ amqp.username() }}
-rabbit_virtual_host = {{ amqp.vhost() }}
-rabbit_password = {{ amqp.password() }}
-{% if rabbitmq_hosts -%}
-rabbit_hosts = {{ rabbitmq_hosts }}
-{% if amqp.ha_queues() -%}
+rabbit_userid = {{ amqp.username }}
+rabbit_virtual_host = {{ amqp.vhost }}
+rabbit_password = {{ amqp.password }}
+{% if amqp.hosts -%}
+rabbit_hosts = {{ amqp.hosts }}
+{% if amqp.ha_queues -%}
 rabbit_ha_queues = True
 rabbit_durable_queues = False
 {% endif -%}
 {% else -%}
-rabbit_host = {{ rabbitmq_host }}
+rabbit_host = {{ amqp.host }}
 {% endif -%}
-{% if amqp.ssl_data_complete() == True -%}
+{% if amqp.ssl_port -%}
 rabbit_use_ssl = True
-rabbit_port = {{ amqp.ssl_port() }}
-{% if amqp.ssl_ca() -%}
-kombu_ssl_ca_certs = {{ amqp.ssl_ca() }}
+rabbit_port = {{ amqp.ssl_port }}
+{% if amqp.ssl_ca -%}
+kombu_ssl_ca_certs = {{ amqp.ssl_ca }}
 {% endif -%}
 {% endif -%}
 {% endif -%}
diff --git a/tox.ini b/tox.ini
index 92c070a..8e8b8ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          TERM=linux
          INTERFACE_PATH={toxinidir}/interfaces
+         LAYER_PATH={toxinidir}/layers
          JUJU_REPOSITORY={toxinidir}/build
 passenv = http_proxy https_proxy
 install_command =