Merge ~vultaire/charm-grafana:master into ~prometheus-charmers/charm-grafana:master

[Paul Goins]

Migrate to using template from charm-create and add initial unit tests

With this, "make unittest" will work from within the src directory.

The topmost Makefile (generated via charm-create) does not seem to work
at present; I haven't looked into why. "cd" into "src" first.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Alvaro Uria (aluria)]

Changes here have been merged into a bigger MP. See https://code.launchpad.net/~aluria/grafana-charm/+git/grafana-charm-1/+merge/364044

Changes here look good to be, but rejecting the MP due to the above.

Unmerged commits

0332bff... by Paul Goins on 2019-01-24

Added tests for the data_path() helper method

The data_path() method was refactored out into the lib_grafana module,
along with required constants. This removed dependencies on modules
provided by "charm build" and allows for doing a "make unittest" within
the src directory and having it "just work".

A few other small tweaks were added:

* I tweaked the tox.ini for unit testing so that it will ignore files
  in the builds directory, in case "charm build" is run.

* I disabled a test in the test_actions.py module as we haven't
  implemented any real tests there yet.

92fca06... by Paul Goins on 2019-01-23

Adding new files from charm-create template; ignoring files which already exist

7cf91c4... by Paul Goins on 2019-01-23

Moving files to match new charm template structure

e20740c... by Jason Hobbs on 2019-01-08

Update packagecloud repository key.

Reviewed-on: https://code.launchpad.net/~jason-hobbs/grafana-charm/+git/grafana-charm/+merge/361519
Reviewed-by: Xav Paice <email address hidden>

b15be8f... by Jason Hobbs on 2019-01-08

Update packagecloud repository key.

On January 7th, 2019, packagecloud changed to a new repository
signing key for the grafana stable repository. This change
updates this charm to use that key rather than the old one.

LP: #1810969

diff --git a/Makefile b/Makefile
 new file mode 100644
index 0000000..5bef873
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,50 @@
+ifndef JUJU_REPOSITORY
+	JUJU_REPOSITORY := $(shell pwd)
+	$(warning Warning JUJU_REPOSITORY was not set, defaulting to $(JUJU_REPOSITORY))
+endif
+
+help:
+	@echo "This project supports the following targets"
+	@echo ""
+	@echo " make help - show this text"
+	@echo " make submodules - make sure that the submodules are up-to-date"
+	@echo " make lint - run flake8"
+	@echo " make test - run the unittests and lint"
+	@echo " make unittest - run the tests defined in the unittest subdirectory"
+	@echo " make functional - run the tests defined in the functional subdirectory"
+	@echo " make release - build the charm"
+	@echo " make clean - remove unneeded files"
+	@echo ""
+
+submodules:
+	@echo "Cloning submodules"
+	@git submodule update --init --recursive
+
+lint:
+	@echo "Running flake8"
+	@cd src && tox -e lint
+
+test: unittest functional lint
+
+unittest:
+	@cd src && tox -e unit
+
+functional: build
+	@cd src && tox -e functional
+
+build:
+	@echo "Building charm to base directory $(JUJU_REPOSITORY)"
+	@-git describe --tags > ./src/repo-info
+	@LAYER_PATH=./layers INTERFACE_PATH=./interfaces\
+		JUJU_REPOSITORY=$(JUJU_REPOSITORY) charm build ./src --force
+
+release: clean build
+	@echo "Charm is built at $(JUJU_REPOSITORY)/builds"
+
+clean:
+	@echo "Cleaning files"
+	@if [ -d src/.tox ] ; then rm -r src/.tox ; fi
+	@if [ -d src/.pytest_cache ] ; then rm -r src/.pytest_cache ; fi
+
+# The targets below don't depend on a file
+.PHONY: lint test unittest functional build release clean help submodules
diff --git a/interfaces/.empty b/interfaces/.empty
 new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/interfaces/.empty
@@ -0,0 +1 @@
+#
diff --git a/layers/.empty b/layers/.empty
 new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/layers/.empty
@@ -0,0 +1 @@
+#
diff --git a/src/Makefile b/src/Makefile
 new file mode 100644
index 0000000..e1e1a8b
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,25 @@
+help:
+	@echo "This project supports the following targets"
+	@echo ""
+	@echo " make help - show this text"
+	@echo " make test - run the functional test and unittests"
+	@echo " make unittest - run the the unittest"
+	@echo " make functionaltest - run the functional tests"
+	@echo " make clean - remove unneeded files"
+	@echo ""
+
+test: unittest functionaltest lint
+
+unittest:
+	@tox -e unit
+
+functionaltest:
+	@tox -e functional
+
+clean:
+	@echo "Cleaning files"
+	@if [ -d ./.tox ] ; then rm -r ./.tox ; fi
+	@if [ -d ./.pytest_cache ] ; then rm -r ./.pytest_cache ; fi
+
+# The targets below don't depend on a file
+.PHONY: lint test unittest functionaltest clean help
diff --git a/README.md b/src/README.md
 similarity index 100%
 rename from README.md
 rename to src/README.md
diff --git a/actions.yaml b/src/actions.yaml
 similarity index 100%
 rename from actions.yaml
 rename to src/actions.yaml
diff --git a/actions/change-user-role b/src/actions/change-user-role
 similarity index 100%
 rename from actions/change-user-role
 rename to src/actions/change-user-role
diff --git a/actions/create-api-key b/src/actions/create-api-key
 similarity index 100%
 rename from actions/create-api-key
 rename to src/actions/create-api-key
diff --git a/actions/create-user b/src/actions/create-user
 similarity index 100%
 rename from actions/create-user
 rename to src/actions/create-user
diff --git a/actions/delete-user b/src/actions/delete-user
 similarity index 100%
 rename from actions/delete-user
 rename to src/actions/delete-user
diff --git a/actions/get-admin-password b/src/actions/get-admin-password
 similarity index 100%
 rename from actions/get-admin-password
 rename to src/actions/get-admin-password
diff --git a/actions/grafana_utils.py b/src/actions/grafana_utils.py
 similarity index 100%
 rename from actions/grafana_utils.py
 rename to src/actions/grafana_utils.py
diff --git a/actions/import-dashboard b/src/actions/import-dashboard
 similarity index 100%
 rename from actions/import-dashboard
 rename to src/actions/import-dashboard
diff --git a/actions/set-user-password b/src/actions/set-user-password
 similarity index 100%
 rename from actions/set-user-password
 rename to src/actions/set-user-password
diff --git a/config.yaml b/src/config.yaml
 similarity index 64%
 rename from config.yaml
 rename to src/config.yaml
index 3d58088..ee5cf85 100644
--- a/config.yaml
+++ b/src/config.yaml
@@ -13,68 +13,68 @@ options:
     default: |
       - |
           -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: GnuPG v1
+          Version: GnuPG v1.4.11 (GNU/Linux)
 
-          mQINBFLUbogBEADceEoxBDoE6QM5xV/13qiELbFIkQgy/eEi3UesXmJblFdU7wcD
-          LOW3NuOIx/dgbZljeMEerj6N1cR7r7X5sVoFVEZiK4RLkC3Cpdns0d90ud2f3VyK
-          K7PXRBstdLm3JlW9OWZoe4VSADSMGWm1mIhT601qLKKAuWJoBIhnKY/RhA/RBXt7
-          z22g4ta9bT67PlliTo1a8y6DhUA7gd+5TsVHaxDRrzc3mKObdyS5LOT/gf8Ti2tY
-          BY5MBbQ8NUGExls4dXKlieePhKutFbde7sq3n5sdp1Ndoran1u0LsWnaSDx11R3x
-          iYfXJ6xGukAc6pYlUD1yYjU4oRGhD2fPyuewqhHNUVwqupTBQtEGULrtdwK04kgI
-          H93ssGRsLqUKe88uZeeBczVuupv8ZLd1YcQ29AfJHe6nsevsgjF+eajYlzsvC8BN
-          q3nOvvedcuI6BW4WWFjraH06GNTyMAZi0HibTg65guZXpLcpPW9hTzXMoUrZz8Mv
-          J9yUBcFPKuFOLDpRP6uaIbxJsYqiituoltl0vgS/vJcpIVVRwSaqPHa6S63dmKm2
-          6gq18v4l05mVcInPn+ciHtcSlZgQkCsRTSvfUrK+7nzyWtNQMGKstAZ7AHCoA8Pb
-          c3i7wyOtnTgfPFHVpHg3JHsPXKk9/71YogtoNFoETMFeKL1K+O+GMQddYQARAQAB
-          tDdwYWNrYWdlY2xvdWQgb3BzIChwcm9kdWN0aW9uIGtleSkgPG9wc0BwYWNrYWdl
-          Y2xvdWQuaW8+iQI+BBMBAgAoBQJS1G6IAhsvBQkJZgGABgsJCAcDAgYVCAIJCgsE
-          FgIDAQIeAQIXgAAKCRDC5zQk1ZCXq13KD/wNzAi6rEzRyx6NH61Hc19s2QAgcU1p
-          1mX1Tw0fU7CThx1nr8JrG63465c9dzUpVzNTYvMsUSBJwbb1phahCMNGbJpZRQ5b
-          vW/i3azmk/EHKL7wgMV8wu1atu6crrxGoDEfWUa4aIwbxZGkoxDZKZeKaLxz2ZCh
-          uKzjvkGUk4PUoOxxPn9XeFmJQ68ys4Z0CgIGfx2i64apqfsjVEdWEEBLoxHFIPy7
-          FgFafRL0bgsquwPkb5q/dihIzJEZ2EMOGwXuUaKI/UAhgRIUGizuW7ECEjX4FG92
-          8RsizHBjYL5Gl7DMt1KcPFe/YU/AdWEirs9pLQUr9eyGZN7HYJ03Aiy8R5aMBoeY
-          sfxjifkbWCpbN+SEATaB8YY6Zy2LK/5TiUYNUYb/VHP//ZEv0+uPgkoro6gWVkvG
-          DdXqH2d9svwfrQKfGSEQYXlLytZKvQSDLAqclSANs/y5HDjUxgtWKdsL3xNPCmff
-          jpyiqS4pvoTiUwS4FwBsIR2sBDToIEHDvTNk1imeSmxCUgDxFzWkmB70FBmwz7zs
-          9FzuoegrAxXonVit0+f3CxquN7tS0mHaWrZfhHxEIt65edkIz1wETOch3LIg6RaF
-          wsXgrZCNTB/zjKGAFEzxOSBkjhyJCY2g74QNObKgTSeGNFqG0ZBHe2/JQ33UxrDt
-          peKvCYTbjuWlyrkCDQRS1G6IARAArtNBXq+CNU9DR2YCi759fLR9F62Ec/QLWY3c
-          /D26OqjTgjxAzGKbu1aLzphP8tq1GDCbWQ2BMMZI+L0Ed502u6kC0fzvbppRRXrV
-          axBrwxY9XhnzvkXXzwNwnBalkrJ5Yk0lN8ocwCuUJohms7V14nEDyHgAB8yqCEWz
-          Qm/SIZw35N/insTXshcdiUGeyufo85SFhCUqZ1x1TkSC/FyDG+BCwArfj8Qwdab3
-          UlUEkF6czTjwWIO+5vYuR8bsCGYKCSrGRh5nxw0tuGXWXWFlBMSZP6mFcCDRQDGc
-          KOuGTjiWzLJcgsEcBoIX4WpHJYgl6ovex7HkfQsWPYL5V1FIHMlw34ALx4aQDH0d
-          PJpC+FxynrfTfsIzPnmm2huXPGGYul/TmOp00CsJEcKOjqcrYOgraYkCGVXbd4ri
-          6Pf7wJNiJ8V1iKTzQIrNpqGDk306Fww1VsYBLOnrSxNPYOOu1s8c8c9N5qbEbOCt
-          QdFf5pfuqsr5nJ0G4mhjQ/eLtDA4E7GPrdtUoceOkYKcQFt/yqnL1Sj9Ojeht3EN
-          PyVSgE8NiWxNIEM0YxPyJEPQawejT66JUnTjzLfGaDUxHfseRcyMMTbTrZ0fLJSR
-          aIH1AubPxhiYy+IcWOVMyLiUwjBBpKMStej2XILEpIJXP6Pn96KjMcB1grd0J2vM
-          w2Kg3E8AEQEAAYkERAQYAQIADwUCUtRuiAIbLgUJCWYBgAIpCRDC5zQk1ZCXq8Fd
-          IAQZAQIABgUCUtRuiAAKCRA3u+4/etlbPwI5D/4idr7VHQpou6c/YLnK1lmz3hEi
-          kdxUxjC4ymOyeODsGRlaxXfjvjOCdocMzuCY3C+ZfNFKOTtVY4fV5Pd82MuY1H8l
-          nuzqLxT6UwpIwo+yEv6xSK0mqm2FhT0JSQ7E7MnoHqsU0aikHegyEucGIFzew6BJ
-          UD2xBu/qmVP/YEPUzhW4g8uD+oRMxdAHXqvtThvFySY/rakLQRMRVwYdTFHrvu3z
-          HP+6hpZt25llJb3DiO+dTsv+ptLmlUr5JXLSSw2DfLxQa0kD5PGWpFPVJcxraS2p
-          NDK9KTi2nr1ZqDxeKjDBT6zZOs9+4JQ9fepn1S26AmHWHhyzvpjKxVm4sOilKysi
-          84CYluNrlEnidNf9wQa3NlLmtvxXQfm1py5tlwL5rE+ek1fwleaKXRcNNmm+T+vD
-          dIw+JcHy8a53nK1JEfBqEuY6IqEPKDke0wDIsDLSwI1OgtQoe7Cm1PBujfJu4rYQ
-          E+wwgWILTAgIy8WZXAloTcwVMtgfSsgHia++LqKfLDZ3JuwpaUAHAtguPy0QddvF
-          I4R7eFDVwHT0sS3AsG0HAOCY/1FRe8cAw/+9Vp0oDtOvBWAXycnCbdQeHvwh2+Uj
-          2u2f7K3CDMoevcBl4L5fkFkYTkmixCDy5nst1VM5nINueUIkUAJJbOGpd6yFdif7
-          mQR0JWcPLudb+fwusJ4UEACYWhPa8Gxa7eYopRsydlcdEzwpmo6E+V8GIdLFRFFp
-          KHQEzbSW5coxzU6oOiPbTurCZorIMHTA9cpAZoMUGKaSt19UKIMvSqtcDayhgf4c
-          Z2ay1z0fdJ2PuLeNnWeiGyfq78q6wqSaJq/h6JdAiwXplFd3gqJZTrFZz7A6Q6Pd
-          7B+9PZ/DUdEO3JeZlHJDfRmfU2XPoyPUoq79+whP5Tl3WwHUv7Fg357kRSdzKv9D
-          bgmhqRHlgVeKn9pwN4cpVBN+idzwPefQksSKH4lBDvVr/9j+V9mmrOx7QmQ5LCc/
-          1on+L0dqo6suoajADhKy+lDQbzs2mVb4CLpPKncDup/9iJbjiR17DDFMwgyCoy5O
-          HJICQ5lckNNgkHTS6Xiogkt28YfK4P3S0GaZgIrhKQ7AmO3O+hB12Zr+olpeyhGB
-          OpBD80URntdEcenvfnXBY/BsuAVbTGXiBzrlBEyQxg656jUeqAdXg+nzCvP0yJlB
-          UOjEcwyhK/U2nw9nGyaR3u0a9r24LgijGpdGabIeJm6O9vuuqFHHGI72pWUEs355
-          lt8q1pAoJUv8NehQmlaR0h5wcwhEtwM6fiSIUTnuJnyHT053GjsUD7ef5fY1KEFm
-          aZeW04kRtFDOPinz0faE8hvsxzsVgkKye1c2vkXKdOXvA3x+pZzlTHtcgMOhjKQA
-          sA==
-          =H60S
+          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
+          =ewdt
           -----END PGP PUBLIC KEY BLOCK-----
     type: string
     description: |
diff --git a/copyright b/src/copyright
 similarity index 100%
 rename from copyright
 rename to src/copyright
diff --git a/files/dashboards_backup b/src/files/dashboards_backup
 similarity index 100%
 rename from files/dashboards_backup
 rename to src/files/dashboards_backup
diff --git a/getstarted.md b/src/getstarted.md
 similarity index 100%
 rename from getstarted.md
 rename to src/getstarted.md
diff --git a/icon.svg b/src/icon.svg
 similarity index 100%
 rename from icon.svg
 rename to src/icon.svg
diff --git a/layer.yaml b/src/layer.yaml
 similarity index 100%
 rename from layer.yaml
 rename to src/layer.yaml
diff --git a/src/lib/lib_grafana.py b/src/lib/lib_grafana.py
 new file mode 100644
index 0000000..b074e53
--- /dev/null
+++ b/src/lib/lib_grafana.py
@@ -0,0 +1,28 @@
+from charmhelpers.core import hookenv, unitdata
+from charms.reactive import remove_state
+
+
+APT_COMMON = '/var/lib/grafana'
+SNAP_NAME = 'grafana'
+SNAP_COMMON = '/var/snap/{}/common/data'.format(SNAP_NAME)
+
+
+class GrafanaHelper():
+    def __init__(self):
+        self.charm_config = hookenv.config()
+
+    def action_function(self):
+        ''' An example function for calling from an action '''
+        return
+
+
+def data_path():
+    data_dir = {'snap': SNAP_COMMON,
+                'apt': APT_COMMON}
+    kv = unitdata.kv()
+    source = kv.get('install_method')
+    if source in ('snap', 'apt'):
+        return data_dir[source]
+    else:
+        hookenv.status_set('blocked', 'Unsupported install_method')
+        remove_state('grafana.installed')
diff --git a/metadata.yaml b/src/metadata.yaml
 similarity index 100%
 rename from metadata.yaml
 rename to src/metadata.yaml
diff --git a/reactive/grafana.py b/src/reactive/grafana.py
 similarity index 90%
 rename from reactive/grafana.py
 rename to src/reactive/grafana.py
index f98e11c..54f80c6 100644
--- a/reactive/grafana.py
+++ b/src/reactive/grafana.py
@@ -31,12 +31,11 @@ from charms.reactive import (
 )
 
 from charms.layer import snap
+from lib_grafana import data_path, SNAP_NAME
 
 SVCNAME = {'snap': 'snap.grafana.grafana',
            'apt': 'grafana-server'}
-SNAP_NAME = 'grafana'
 SNAP_DATA = '/var/snap/{}/current'.format(SNAP_NAME)
-SNAP_COMMON = '/var/snap/{}/common/data'.format(SNAP_NAME)
 
 GRAFANA_INI = {'snap': '{}/conf/grafana.ini'.format(SNAP_DATA),
                'apt': '/etc/grafana/grafana.ini'}
@@ -126,18 +125,6 @@ def install_packages():
         hookenv.status_set('blocked', 'Unsupported install_method')
 
 
-def data_path():
-    data_dir = {'snap': SNAP_COMMON,
-                'apt': '/var/lib/grafana'}
-    kv = unitdata.kv()
-    source = kv.get('install_method')
-    if source in ('snap', 'apt'):
-        return data_dir[source]
-    else:
-        hookenv.status_set('blocked', 'Unsupported install_method')
-        remove_state('grafana.installed')
-
-
 @when('grafana.installed')
 @when('config.changed.install_plugins')
 def install_plugins():
diff --git a/src/requirements.txt b/src/requirements.txt
 new file mode 100644
index 0000000..8462291
--- /dev/null
+++ b/src/requirements.txt
@@ -0,0 +1 @@
+# Include python requirements here
diff --git a/scripts/get_admin_password b/src/scripts/get_admin_password
 similarity index 100%
 rename from scripts/get_admin_password
 rename to src/scripts/get_admin_password
diff --git a/templates/dashboards/prometheus/CephCluster.json.j2 b/src/templates/dashboards/prometheus/CephCluster.json.j2
 similarity index 100%
 rename from templates/dashboards/prometheus/CephCluster.json.j2
 rename to src/templates/dashboards/prometheus/CephCluster.json.j2
diff --git a/templates/dashboards/prometheus/CephOSD.json.j2 b/src/templates/dashboards/prometheus/CephOSD.json.j2
 similarity index 100%
 rename from templates/dashboards/prometheus/CephOSD.json.j2
 rename to src/templates/dashboards/prometheus/CephOSD.json.j2
diff --git a/templates/dashboards/prometheus/CephPools.json.j2 b/src/templates/dashboards/prometheus/CephPools.json.j2
 similarity index 100%
 rename from templates/dashboards/prometheus/CephPools.json.j2
 rename to src/templates/dashboards/prometheus/CephPools.json.j2
diff --git a/templates/dashboards/prometheus/OpenStackCloud.json.j2 b/src/templates/dashboards/prometheus/OpenStackCloud.json.j2
 similarity index 100%
 rename from templates/dashboards/prometheus/OpenStackCloud.json.j2
 rename to src/templates/dashboards/prometheus/OpenStackCloud.json.j2
diff --git a/templates/dashboards/prometheus/RabbitMQ.json.j2 b/src/templates/dashboards/prometheus/RabbitMQ.json.j2
 similarity index 100%
 rename from templates/dashboards/prometheus/RabbitMQ.json.j2
 rename to src/templates/dashboards/prometheus/RabbitMQ.json.j2
diff --git a/templates/dashboards/prometheus/Swift.json.j2 b/src/templates/dashboards/prometheus/Swift.json.j2
 similarity index 100%
 rename from templates/dashboards/prometheus/Swift.json.j2
 rename to src/templates/dashboards/prometheus/Swift.json.j2
diff --git a/templates/dashboards/prometheus/Telegraf.json.j2 b/src/templates/dashboards/prometheus/Telegraf.json.j2
 similarity index 100%
 rename from templates/dashboards/prometheus/Telegraf.json.j2
 rename to src/templates/dashboards/prometheus/Telegraf.json.j2
diff --git a/templates/grafana.ini.j2 b/src/templates/grafana.ini.j2
 similarity index 100%
 rename from templates/grafana.ini.j2
 rename to src/templates/grafana.ini.j2
diff --git a/templates/juju-dashboards-backup.j2 b/src/templates/juju-dashboards-backup.j2
 similarity index 100%
 rename from templates/juju-dashboards-backup.j2
 rename to src/templates/juju-dashboards-backup.j2
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
 new file mode 100644
index 0000000..f76bfbb
--- /dev/null
+++ b/src/tests/functional/requirements.txt
@@ -0,0 +1,6 @@
+flake8
+juju
+mock
+pytest
+pytest-asyncio
+requests
diff --git a/src/tests/functional/test_deploy.py b/src/tests/functional/test_deploy.py
 new file mode 100644
index 0000000..c41422d
--- /dev/null
+++ b/src/tests/functional/test_deploy.py
@@ -0,0 +1,29 @@
+import pytest
+from juju.model import Model
+
+# Treat tests as coroutines
+pytestmark = pytest.mark.asyncio
+
+series = ['bionic']
+
+
[e-mail]
+async def model():
+    model = Model()
+    await model.connect_current()
+    yield model
+    await model.disconnect()
+
+
[e-mail]('series', series)
+async def test_grafana_deploy(model, series):
+    app = await model.deploy('.', series=series)
+    await model.block_until(lambda: app.status == 'active')
+    assert True
+
+
+# def test_example_action(self, deploy, unit):
+#     uuid = unit.run_action('example-action')
+#     action_output = deploy.get_action_output(uuid, full_output=True)
+#     print(action_output)
+#     assert action_output['status'] == 'completed'
diff --git a/src/tests/unit/conftest.py b/src/tests/unit/conftest.py
 new file mode 100644
index 0000000..aca2a0f
--- /dev/null
+++ b/src/tests/unit/conftest.py
@@ -0,0 +1,69 @@
+#!/usr/bin/python3
+import mock
+import pytest
+
+
+# If layer options are used, add this to grafana
+# and import layer in lib_grafana
[e-mail]
+def mock_layers(monkeypatch):
+    import sys
+    sys.modules['charms.layer'] = mock.Mock()
+    sys.modules['reactive'] = mock.Mock()
+    # Mock any functions in layers that need to be mocked here
+
+    def options(layer):
+        # mock options for layers here
+        if layer == 'example-layer':
+            options = {'port': 9999}
+            return options
+        else:
+            return None
+
+    monkeypatch.setattr('lib_grafana.layer.options', options)
+
+
[e-mail]
+def mock_hookenv_config(monkeypatch):
+    import yaml
+
+    def mock_config():
+        cfg = {}
+        yml = yaml.load(open('./config.yaml'))
+
+        # Load all defaults
+        for key, value in yml['options'].items():
+            cfg[key] = value['default']
+
+        # Manually add cfg from other layers
+        # cfg['my-other-layer'] = 'mock'
+        return cfg
+
+    monkeypatch.setattr('lib_grafana.hookenv.config', mock_config)
+
+
[e-mail]
+def mock_remote_unit(monkeypatch):
+    monkeypatch.setattr('lib_grafana.hookenv.remote_unit', lambda: 'unit-mock/0')
+
+
[e-mail]
+def mock_charm_dir(monkeypatch):
+    monkeypatch.setattr('lib_grafana.hookenv.charm_dir', lambda: '/mock/charm/dir')
+
+
[e-mail]
+def grafana(tmpdir, mock_hookenv_config, mock_charm_dir, monkeypatch):
+    from lib_grafana import GrafanaHelper
+    helper = GrafanaHelper()
+
+    # Example config file patching
+    cfg_file = tmpdir.join('example.cfg')
+    with open('./tests/unit/example.cfg', 'r') as src_file:
+        cfg_file.write(src_file.read())
+    helper.example_config_file = cfg_file.strpath
+
+    # Any other functions that load helper will get this version
+    monkeypatch.setattr('lib_grafana.GrafanaHelper', lambda: helper)
+
+    return helper
diff --git a/src/tests/unit/example.cfg b/src/tests/unit/example.cfg
 new file mode 100644
index 0000000..81b1e94
--- /dev/null
+++ b/src/tests/unit/example.cfg
@@ -0,0 +1 @@
+This is an example config file included with the unit tests
diff --git a/src/tests/unit/requirements.txt b/src/tests/unit/requirements.txt
 new file mode 100644
index 0000000..9c685e5
--- /dev/null
+++ b/src/tests/unit/requirements.txt
@@ -0,0 +1,5 @@
+charmhelpers
+charms.reactive
+mock
+pytest
+pytest-cov
diff --git a/src/tests/unit/test_actions.py b/src/tests/unit/test_actions.py
 new file mode 100644
index 0000000..731147e
--- /dev/null
+++ b/src/tests/unit/test_actions.py
@@ -0,0 +1,14 @@
+import imp
+
+import mock
+
+from pytest import mark
+
+class TestActions():
+    @mark.skip()
+    def test_example_action(self, grafana, monkeypatch):
+        mock_function = mock.Mock()
+        monkeypatch.setattr(grafana, 'action_function', mock_function)
+        assert mock_function.call_count == 0
+        imp.load_source('action_function', './actions/example-action')
+        assert mock_function.call_count == 1
diff --git a/src/tests/unit/test_lib.py b/src/tests/unit/test_lib.py
 new file mode 100644
index 0000000..733a33c
--- /dev/null
+++ b/src/tests/unit/test_lib.py
@@ -0,0 +1,37 @@
+#!/usr/bin/python3
+
+from pytest import mark
+import mock
+import lib_grafana
+
+
+class TestLib():
+    def test_grafana(self, grafana):
+        ''' See if the helper fixture works to load charm configs '''
+        # NOTE: This was added per the charm-create template; leaving it in in case it is useful.
+        assert isinstance(grafana.charm_config, dict)
+
+    @mark.parametrize(
+        'install_method,result',
+        [
+            ('snap', lib_grafana.SNAP_COMMON),
+            ('apt', lib_grafana.APT_COMMON),
+        ]
+    )
+    @mock.patch('lib_grafana.unitdata.kv')
+    def test_data_path_valid_method_returns_dir(self, unitdata_kv_mock, install_method, result):
+        unitdata_kv_mock.return_value = {
+            'install_method': install_method,
+        }
+        assert lib_grafana.data_path() == result
+
+    @mock.patch('lib_grafana.remove_state')
+    @mock.patch('lib_grafana.hookenv.status_set')
+    @mock.patch('lib_grafana.unitdata.kv')
+    def test_data_path_invalid_method_sets_blocked_status(self, unitdata_kv_mock, status_set_mock, remove_state_mock):
+        unitdata_kv_mock.return_value = {
+            'install_method': 'bad_method',
+        }
+        assert lib_grafana.data_path() is None
+        assert status_set_mock.mock_calls[-1] == mock.call('blocked', 'Unsupported install_method')
+        assert remove_state_mock.mock_calls[-1] == mock.call('grafana.installed')
diff --git a/src/tox.ini b/src/tox.ini
 new file mode 100644
index 0000000..bd49daf
--- /dev/null
+++ b/src/tox.ini
@@ -0,0 +1,35 @@
+[tox]
+skipsdist=True
+envlist = unit, functional
+skip_missing_interpreters = True
+
+[testenv]
+basepython = python3
+setenv =
+  PYTHONPATH = .
+
+[testenv:unit]
+commands = pytest -v --ignore {toxinidir}/tests/functional --ignore {toxinidir}/builds --cov=lib --cov=reactice --cov=actions --cov-report=term
+deps = -r{toxinidir}/tests/unit/requirements.txt
+       -r{toxinidir}/requirements.txt
+setenv = PYTHONPATH={toxinidir}/lib
+
+[testenv:functional]
+passenv =
+  HOME
+  JUJU_REPOSITORY
+  PATH
+commands = pytest -v --ignore {toxinidir}/tests/unit
+deps = -r{toxinidir}/tests/functional/requirements.txt
+       -r{toxinidir}/requirements.txt
+
+[testenv:lint]
+commands = flake8
+deps = flake8
+
+[flake8]
+exclude = 
+    .git,
+    __pycache__,
+    .tox,
+
diff --git a/wheelhouse.txt b/src/wheelhouse.txt
 similarity index 100%
 rename from wheelhouse.txt
 rename to src/wheelhouse.txt