Merge lp:~thomir-deactivatedaccount/juju-viz/fix-box-drawing-for-services into lp:juju-viz

[Thomi Richards]

juju-viz currently checks to see if the service name contains 'db' or the charm name contains 'sql', and if so, renders that service in a box. This is intended to draw database services differently.

However, this fails when services happen to contain 'db' in their name. For example, we deploy services that contain a git commit hash in the service name, which causes juju viz to display some of our services as box when they shouldn't.

This branch changes that logic so the charm name is searched for both the 'db' and 'sql' strings instead.

[Haw Loeung (hloeung)]

LGTM. Searching https://jujucharms.com/q/db, this will also catch influxdb should we ever use that :)

review: Approve

[JuanJo Ciarlante (jjo)]

review: Approve (lgtm)

[JuanJo Ciarlante (jjo)]

FYI code comes from http://github.com/jjo/juju-viz, just pushed
this change there, and triggered LP import.

=== modified file 'bin/juju-dotty.py'
--- bin/juju-dotty.py	2015-10-19 15:49:41 +0000
+++ bin/juju-dotty.py	2016-03-30 03:35:44 +0000
@@ -244,7 +244,7 @@
         if service_dict.get('exposed'):
             extras.append("shape=house")
         # hack: if a DB~ish service, use a box
-        if service.find("db") >= 0 or charmname.find("sql") >= 0:
+        if "sql" in charmname or "db" in charmname:
             extras.append("shape=box")
         for unit in units:
             machine = units[unit]['machine']