Merge lp:~mew/juju-deployer/uncomplicate-relations into lp:~gandelman-a/juju-deployer/trunk

[Matthew Wedgwood]

This change removes the complicated interface-guessing logic from deployer.py. Relation names are now passed directly to juju add-relation.

[James Page (james-page)]

I've not tested this (but I know adam has) but I'm completely a +1 on this.

It will start to flush out where charms have bad interface typing as well which is good.

review: Approve

=== modified file 'deployer.py'
--- deployer.py	2013-02-21 02:05:38 +0000
+++ deployer.py	2013-02-28 00:25:27 +0000
@@ -286,34 +286,8 @@
     print "- Adding relations:"
     for w in sorted(RELATIONS, reverse=True):
         for r in RELATIONS[w]:
-            interface = False
-            if len(r[1].split(':')) == 1:
-                # no interface specified in config, auto-resolve it based on
-                # metadata
-                services = [r[0], r[1]]
-                result = determine_interface(CHARMS, r)
-                if result is not None and len(result) == 2:
-                    ci, pi = result
-                else:
-                    log.error("WARN: No relation found? %s <=> %s -- Skip" % (
-                        r[0]["name"], r[1]["name"]))
-                    continue
-            elif len(r[1].split(':')) == 2:
-                # the provider has an interface specified
-                services = [r[0], r[1].split(':')[0]]
-                ci = pi = r[1].split(':')[1]
-            else:
-                log.error("Cannot parse interface from provider %s", r[1])
-                exit(1)
-
-            # If an interface was provided above, specify it to juju
-            if ci:
-                services[0] += ":%s" % ci
-            if pi:
-                services[1] += ":%s" % pi
-
-            print "  -> Relation: %s <-> %s" % (services[0], services[1])
-            cmd = "add-relation %s %s" % (services[0], services[1])
+            print "  -> Relation: %s <-> %s" % (r[0], r[1])
+            cmd = "add-relation %s %s" % (r[0], r[1])
             if opts.juju_env:
                 cmd += " -e %s" % opts.juju_env
             juju_call(cmd, ignore_failure=True)