Merge lp:~veebers/juju-ci-tools/add-dumm-storage-charm into lp:juju-ci-tools/repository

[Curtis Hovey]

Dummy charm that allows storing a token value to storage.

Dummy charm that allows storing a token value to storage.

This is an attempt at making a charm that we can use to test persistent storage.
It will be used to make sure that data persists when detached (either directly or through application removal) and re-attached to an application.

e.g.
  - deploy and set token for the single filesystem.
  - check token value in the file stored on disk
  - remove application
  - deploy again, this time using the existing storage unit
  - check token values etc.

[Curtis Hovey (sinzui)]

I have a question in line and a few suggestions

review: Needs Information (code)

[lp:~veebers/juju-ci-tools/add-dumm-storage-charm]

78. By Christopher Lee on 2017-03-16

Remove missleading 'blocked' term from status.

79. By Christopher Lee on 2017-03-16

Remove and shuffle series.

80. By Christopher Lee on 2017-03-16

Remove revision file.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== added directory 'charms/dummy-storage'
=== added file 'charms/dummy-storage/config.yaml'
--- charms/dummy-storage/config.yaml	1970-01-01 00:00:00 +0000
+++ charms/dummy-storage/config.yaml	2017-03-16 02:26:57 +0000
@@ -0,0 +1,10 @@
+options:
+  # Will be tokens for each storage type.
+  single-fs-token:
+    type: string
+    default: ''
+    description: Token used to prove data stored is persistent
+  multi-fs-token:
+    type: string
+    default: ''
+    description: Token used to prove data stored is persistent
 
=== added directory 'charms/dummy-storage/hooks'
=== added file 'charms/dummy-storage/hooks/config-changed'
--- charms/dummy-storage/hooks/config-changed	1970-01-01 00:00:00 +0000
+++ charms/dummy-storage/hooks/config-changed	2017-03-16 02:26:57 +0000
@@ -0,0 +1,59 @@
+#!/bin/bash
+set -x
+
+juju-log -l INFO "Getting file fs token details."
+status-set maintenance "Getting file fs token details." || true
+
+function set_token() {
+    token_name=$1           # i.e. single-fs-token
+    fs_path=$2              # i.e. /srv/single-fs/ or /srv/multi-fs/multi-fs/13
+
+    token="$(config-get $token_name)"
+    token_file="$fs_path/token"
+
+    juju-log -l INFO "Token file: $token_file"
+
+    if [ -f $token_file ]; then
+        juju-log -l INFO "Using stored token details."
+
+        # If we have a token and we have a token file, check the contents if the differ update it otherwise use it.
+        current_file_token=$(cat $token_file | grep "$token_name" | head -1 | cut -d":" -f2)
+        if [ "$current_file_token" != "$token" ]; then
+            token=$token
+        else
+            token=$(cat $token_file)
+        fi
+    fi
+
+    if [[ -z $token ]]; then
+        fs_token="not set"
+        juju-log -l WARNING "$fs_token"
+    else
+        fs_token="$token"
+        echo "$token" > $token_file
+        juju-log -l INFO "$fs_token"
+    fi
+
+    # Return the token value.
+    echo "$fs_token"
+}
+
+# Clear any previous tokens or state.
+echo > /tmp/status
+
+# First the single token
+single_fs_token=$(set_token "single-fs-token" "/srv/single-fs")
+
+juju-log -l INFO "Setting single token details."
+echo "single-fs-token:$single_fs_token" >> /tmp/status
+
+# Then the multi-fs token
+for unit in $(storage-list multi-fs); do
+    fs_path=$(storage-get -s $unit | grep "^location:\ " | cut -d: -f2 | tr -d ' ')
+    multi_fs_token=$(set_token "multi-fs-token" "$fs_path")
+    juju-log -l INFO "Setting multi token details."
+    unit_token_number=$(echo $unit | cut -f2 -d"/")
+    echo "multi-fs-token/$unit_token_number:$multi_fs_token" >> /tmp/status
+done
+
+status-set active "Stored token: /tmp/status" || true
 
=== added file 'charms/dummy-storage/hooks/hooks'
=== added file 'charms/dummy-storage/hooks/install'
--- charms/dummy-storage/hooks/install	1970-01-01 00:00:00 +0000
+++ charms/dummy-storage/hooks/install	2017-03-16 02:26:57 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -x
+
+juju-log -l INFO "Install"
+juju-log -l INFO "Data on drive: $(cat /srv/single-fs/test.txt)"
+
+for unit in $(storage-list); do
+    juju-log -l INFO "Storage details for ${unit}: $(storage-get -s $unit)"
+done
+
+# The storage-attached hook has fired so we can write some data there now.
+status-set maintenance "Installed" || true
 
=== added file 'charms/dummy-storage/hooks/multi-fs-storage-attached'
--- charms/dummy-storage/hooks/multi-fs-storage-attached	1970-01-01 00:00:00 +0000
+++ charms/dummy-storage/hooks/multi-fs-storage-attached	2017-03-16 02:26:57 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -x
+
+juju-log -l INFO "Storage is attached."
+juju-log -l INFO "Storage details: $(storage-list)"
+
+status-set active "Started" || true
 
=== added file 'charms/dummy-storage/hooks/single-fs-storage-attached'
--- charms/dummy-storage/hooks/single-fs-storage-attached	1970-01-01 00:00:00 +0000
+++ charms/dummy-storage/hooks/single-fs-storage-attached	2017-03-16 02:26:57 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -x
+
+juju-log -l INFO "Storage is attached."
+juju-log -l INFO "Hook details: $(storage-list)"
 \ No newline at end of file
 
=== added file 'charms/dummy-storage/hooks/start'
--- charms/dummy-storage/hooks/start	1970-01-01 00:00:00 +0000
+++ charms/dummy-storage/hooks/start	2017-03-16 02:26:57 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -x
+
+juju-log -l INFO "Starting, checking what storage we have."
+juju-log -l INFO "Storage details: $(storage-list)"
 
=== added file 'charms/dummy-storage/metadata.yaml'
--- charms/dummy-storage/metadata.yaml	1970-01-01 00:00:00 +0000
+++ charms/dummy-storage/metadata.yaml	2017-03-16 02:26:57 +0000
@@ -0,0 +1,23 @@
+name: dummy-storage
+maintainer: Christopher Lee <[e-mail]>
+summary: Dummy charm that utilises storage.
+description: This dummy charm is used for testing persistent storage.
+categories:
+  - misc
+series:
+  - xenial
+  - trusty
+  - precise
+storage:
+  single-fs:
+    type: filesystem
+    description: Single instance storage of filesystem type.
+    minimum-size: 10M
+    location: /srv/single-fs
+  multi-fs:
+    type: filesystem
+    description: Multiple storage instances of filesystem type.
+    minimum-size: 10M
+    location: /srv/multi-fs
+    multiple:
+      range: 0-2