From 3aeed1205fbfdfa490cd9cb6108ef9d8b534c7ca Mon Sep 17 00:00:00 2001
From: Austin Cormier <Austin.Cormier@riftio.com>
Date: Mon, 23 May 2016 19:12:00 -0400
Subject: [PATCH] Initial Makefile for descriptor packages

---
 .gitignore                                    |   1 +
 Makefile                                      |  44 ++
 src/gen_nsd_pkg.sh                            |  47 ++
 src/gen_vnfd_pkg.sh                           |  47 ++
 src/generate_descriptor_pkg.sh                |  27 ++
 src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml  |  57 +++
 src/nsd/ims_allin1_corpa/icons/osm_2x.png     | Bin 0 -> 55888 bytes
 .../vnf_config/IMS-ALLIN1_2p__1.yaml          |   4 +
 .../ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml   |  85 ++++
 .../charms/clearwater-aio-proxy/README.md     |  53 +++
 .../charms/clearwater-aio-proxy/actions.yaml  |  19 +
 .../actions/create-update-user                |  23 +
 .../clearwater-aio-proxy/actions/create-user  |  17 +
 .../clearwater-aio-proxy/actions/delete-user  |  16 +
 .../charms/clearwater-aio-proxy/config.yaml   |  20 +
 .../charms/clearwater-aio-proxy/copyright     |  31 ++
 .../clearwater-aio-proxy/hooks/config-changed |  20 +
 .../charms/clearwater-aio-proxy/hooks/install |  10 +
 .../charms/clearwater-aio-proxy/hooks/start   |   7 +
 .../charms/clearwater-aio-proxy/hooks/stop    |  10 +
 .../clearwater-aio-proxy/hooks/upgrade-charm  |   8 +
 .../charms/clearwater-aio-proxy/icon.svg      | 407 ++++++++++++++++++
 .../clearwater-aio-proxy/lib/reconfigure-aio  |  55 +++
 .../charms/clearwater-aio-proxy/metadata.yaml |  10 +
 .../charms/clearwater-aio-proxy/revision      |   1 +
 .../ims_allin1_2p_vnf/icons/metaswitch_2x.png | Bin 0 -> 2799 bytes
 26 files changed, 1019 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Makefile
 create mode 100755 src/gen_nsd_pkg.sh
 create mode 100755 src/gen_vnfd_pkg.sh
 create mode 100755 src/generate_descriptor_pkg.sh
 create mode 100644 src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
 create mode 100644 src/nsd/ims_allin1_corpa/icons/osm_2x.png
 create mode 100644 src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/README.md
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions.yaml
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-update-user
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-user
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/delete-user
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/config.yaml
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/copyright
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/config-changed
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/install
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/start
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/stop
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/upgrade-charm
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/icon.svg
 create mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/lib/reconfigure-aio
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/metadata.yaml
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/revision
 create mode 100644 src/vnfd/ims_allin1_2p_vnf/icons/metaswitch_2x.png

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..1b2211df
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build*
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..0a01862a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,44 @@
+BUILD_DIR = build
+
+NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns
+NSD_SRC_DIR := src/nsd
+NSD_BUILD_DIR := $(BUILD_DIR)/nsd
+
+NSD_SRC_DIRS := $(addprefix $(NSD_SRC_DIR)/, $(NSDS))
+NSD_BUILD_DIRS := $(addprefix $(NSD_BUILD_DIR)/, $(NSDS))
+NSD_PKGS := $(addsuffix .tar.gz, $(NSDS))
+NSD_BUILD_PKGS := $(addprefix $(NSD_BUILD_DIR)_pkgs/, $(NSD_PKGS))
+
+VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf
+VNFD_SRC_DIR := src/vnfd
+VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd
+
+VNFD_SRC_DIRS := $(addprefix $(VNFD_SRC_DIR)/, $(VNFDS))
+VNFD_BUILD_DIRS := $(addprefix $(VNFD_BUILD_DIR)/, $(VNFDS))
+VNFD_PKGS := $(addsuffix .tar.gz, $(VNFDS))
+VNFD_BUILD_PKGS := $(addprefix $(VNFD_BUILD_DIR)_pkgs/, $(VNFD_PKGS))
+
+all: $(VNFD_BUILD_PKGS) ${NSD_BUILD_PKGS}
+	echo $@
+
+clean:
+	-@ $(RM) -rf $(BUILD_DIR)
+
+$(VNFD_BUILD_DIR)/%: $(VNFD_SRC_DIR)/%
+	mkdir -p $(VNFD_BUILD_DIR)
+	cp -rf $< $(VNFD_BUILD_DIR)
+
+	src/gen_vnfd_pkg.sh $< $@
+	src/generate_descriptor_pkg.sh $(BUILD_DIR)/vnfd_pkgs $@
+
+$(NSD_BUILD_DIR)/%: $(NSD_SRC_DIR)/%
+	mkdir -p $(NSD_BUILD_DIR)
+	cp -rf $< $(NSD_BUILD_DIR)
+
+	src/gen_nsd_pkg.sh $< $@
+
+$(BUILD_DIR)/nsd_pkgs/%.tar.gz: $(NSD_BUILD_DIR)/%
+	src/generate_descriptor_pkg.sh $(BUILD_DIR)/nsd_pkgs $<
+
+$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/%
+	src/generate_descriptor_pkg.sh $(BUILD_DIR)/vnfd_pkgs $<
diff --git a/src/gen_nsd_pkg.sh b/src/gen_nsd_pkg.sh
new file mode 100755
index 00000000..ea5e6a71
--- /dev/null
+++ b/src/gen_nsd_pkg.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Generates a NSD descriptor package from a source directory
+# Usage:
+# gen_nsd_pkg.sh <pkg_src_dir> <pkg_dest_dir>
+
+set -o nounset
+
+if [ $# -ne 2 ]; then
+	echo "Error: Must provide 2 parameters" >@2
+	exit 1
+fi
+
+pkg_src_dir="$1"
+pkg_dest_dir="$2"
+
+if [ ! -e ${pkg_src_dir} ]; then
+    echo "Error: ${pkg_src_dir} does not exist"
+    exit 1
+fi
+
+if [ ! -e ${pkg_dest_dir} ]; then
+    echo "Error: ${pkg_src_dir} does not exist"
+    exit 1
+fi
+
+echo "Generating package in directory: ${pkg_dest_dir}"
+
+# Create any missing directories/files so each package has
+# a complete hierachy
+nsd_dirs=( ns_config vnf_config icons scripts )
+nsd_files=( README )
+
+nsd_dir="${pkg_src_dir}"
+echo $(pwd)
+
+mkdir -p "${pkg_dest_dir}"
+cp -rf ${nsd_dir}/* "${pkg_dest_dir}"
+for sub_dir in ${nsd_dirs[@]}; do
+    dir_path=${pkg_dest_dir}/${sub_dir}
+    mkdir -p ${dir_path}
+done
+
+for file in ${nsd_files[@]}; do
+    file_path=${pkg_dest_dir}/${file}
+    touch ${file_path}
+done
diff --git a/src/gen_vnfd_pkg.sh b/src/gen_vnfd_pkg.sh
new file mode 100755
index 00000000..478d5c54
--- /dev/null
+++ b/src/gen_vnfd_pkg.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Generates a NSD descriptor package from a source directory
+# Usage:
+# gen_vnfd_pkg.sh <pkg_src_dir> <pkg_dest_dir>
+
+set -o nounset
+
+if [ $# -ne 2 ]; then
+	echo "Error: Must provide 2 parameters" >@2
+	exit 1
+fi
+
+pkg_src_dir="$1"
+pkg_dest_dir="$2"
+
+if [ ! -e ${pkg_src_dir} ]; then
+    echo "Error: ${pkg_src_dir} does not exist"
+    exit 1
+fi
+
+if [ ! -e ${pkg_dest_dir} ]; then
+    echo "Error: ${pkg_src_dir} does not exist"
+    exit 1
+fi
+
+echo "Generating package in directory: ${pkg_dest_dir}"
+
+# Create any missing directories/files so each package has
+# a complete hierachy
+vnfd_dirs=( charms icons scripts images )
+vnfd_files=( README )
+
+vnfd_dir="${pkg_src_dir}"
+echo $(pwd)
+
+mkdir -p "${pkg_dest_dir}"
+cp -rf ${vnfd_dir}/* "${pkg_dest_dir}"
+for sub_dir in ${vnfd_dirs[@]}; do
+    dir_path=${pkg_dest_dir}/${sub_dir}
+    mkdir -p ${dir_path}
+done
+
+for file in ${vnfd_files[@]}; do
+    file_path=${pkg_dest_dir}/${file}
+    touch ${file_path}
+done
diff --git a/src/generate_descriptor_pkg.sh b/src/generate_descriptor_pkg.sh
new file mode 100755
index 00000000..82ecda13
--- /dev/null
+++ b/src/generate_descriptor_pkg.sh
@@ -0,0 +1,27 @@
+#! /usr/bin/bash
+# STANDARD_RIFT_IO_COPYRIGHT
+# Author(s): Anil Gunturu
+# Creation Date: 2015/10/09
+#
+# This shell script is used to create a descriptor package
+# The main functions of this script include:
+# - Generate checksums.txt file
+# - Generate a tar.gz file
+
+# Usage: generate_descriptor_pkg.sh <package-directory> <dest_package_dir>
+
+mkdir -p $1
+mkdir -p $2
+
+dest_dir=$(cd $1 && pwd)
+pkg_dir=$(cd $2 && pwd)
+
+echo $(pwd)
+cd ${pkg_dir}
+rm -rf checksums.txt
+find * -type f |
+    while read file; do
+        md5sum $file >> checksums.txt
+    done
+cd ..
+tar -zcvf ${dest_dir}/$(basename $pkg_dir).tar.gz $(basename $pkg_dir)
diff --git a/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
new file mode 100644
index 00000000..27a1197f
--- /dev/null
+++ b/src/nsd/ims_allin1_corpa/IMS-corpA__nsd.yaml
@@ -0,0 +1,57 @@
+nsd:nsd-catalog:
+    nsd:
+    -   id: IMS-corpA
+        name: IMS-corpA
+        short-name: IMS-corpA
+        description: All in one Clearwater IMS for corporation A in MWC16
+        logo: osm_2x.png
+        constituent-vnfd:
+        -   member-vnf-index: '1'
+            vnfd-id-ref: IMS-ALLIN1_2p
+        vld:
+        -   id: data
+            name: data
+            type: ELAN
+            provider-network:
+                overlay-type: VLAN
+                physical-network: net-corp
+                segmentation_id: '108'
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: eth0
+                vnfd-id-ref: IMS-ALLIN1_2p
+        -   id: management
+            name: management
+            type: ELAN
+            provider-network:
+                overlay-type: VLAN
+                physical-network: net-mgmtOS
+            vnfd-connection-point-ref:
+            -   member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: eth1
+                vnfd-id-ref: IMS-ALLIN1_2p
+        config-primitive:
+        -   name: Update Domain
+            vnf-primitive-group:
+            -   member-vnf-index-ref: '1'
+                vnfd-id-ref: IMS-ALLIN1_2p
+                vnfd-name: cwims_vnfd
+                primitive:
+                -   index: '1'
+                    name: config
+        -   name: Add User
+            vnf-primitive-group:
+            -   member-vnf-index-ref: '1'
+                vnfd-id-ref: IMS-ALLIN1_2p
+                vnfd-name: cwims_vnfd
+                primitive:
+                -   index: '1'
+                    name: create-update-user
+        -   name: Delete User
+            vnf-primitive-group:
+            -   member-vnf-index-ref: '1'
+                vnfd-id-ref: IMS-ALLIN1_2p
+                vnfd-name: cwims_vnfd
+                primitive:
+                -   index: '1'
+                    name: delete-user
diff --git a/src/nsd/ims_allin1_corpa/icons/osm_2x.png b/src/nsd/ims_allin1_corpa/icons/osm_2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..62012d2a2b491bdcd536d62c3c3c863c0d8c1b33
GIT binary patch
literal 55888
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
QVa%F-+q93SJpA+j4_IIKX8-^I

literal 0
HcmV?d00001

diff --git a/src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml b/src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml
new file mode 100644
index 00000000..33c5ef96
--- /dev/null
+++ b/src/nsd/ims_allin1_corpa/vnf_config/IMS-ALLIN1_2p__1.yaml
@@ -0,0 +1,4 @@
+initial_config_primitive:
+- name: config
+  parameter:
+    proxied_ip: <rw_mgmt_ip>
diff --git a/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
new file mode 100644
index 00000000..b36941a9
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/IMS-ALLIN1__vnfd.yaml
@@ -0,0 +1,85 @@
+vnfd:vnfd-catalog:
+    vnfd:
+    -   id: IMS-ALLIN1_2p
+        name: IMS-ALLIN1_2p
+        short-name: IMS-ALLIN1_2p
+        description: IMS-ALLIN1_2p
+        logo: metaswitch_2x.png
+        mgmt-interface:
+            vdu-id: IMS-ALLIN1_2p-VM
+            vnf-configuration:
+                config-attributes:
+                    config-delay: '0'
+                    config-priority: '1'
+                config-primitive:
+                -   name: config
+                    parameter:
+                    -   name: home_domain
+                        data-type: STRING
+                        mandatory: 'true'
+                        default-value: ims.com
+                    -   name: password
+                        data-type: string
+                        mandatory: 'true'
+                        name: password
+                        default-value: cw-aio
+                -   name: create-update-user
+                    parameter:
+                    -   name: number
+                        data-type: STRING
+                        mandatory: 'true'
+                    -   name: password
+                        data-type: STRING
+                        mandatory: 'true'
+                -   name: delete-user
+                    parameter:
+                    -   name: number
+                        data-type: STRING
+                        mandatory: 'true'
+                initial-config-primitive:
+                -   name: config
+                    parameter:
+                    -   name: proxied_ip
+                        value: <rw_mgmt_ip>
+                    seq: '1'
+                juju:
+                    charm: clearwater-aio-proxy
+        connection-point:
+        -   name: eth0
+            type: VPORT
+        -   name: eth1
+            type: VPORT
+        vdu:
+        -   id: IMS-ALLIN1_2p-VM
+            name: IMS-ALLIN1_2p-VM
+            description: IMS-ALLIN1_2p-VM
+            image: /mnt/powervault/virtualization/vnfs/demos/mwc2016/allin1.qcow2
+            vm-flavor:
+                memory-mb: '4096'
+                storage-gb: '10'
+                vcpu-count: '2'
+            mgmt-vpci: 0000:00:0a.0
+            external-interface:
+            -   name: eth0
+                virtual-interface:
+                    bandwidth: '0'
+                    type: VIRTIO
+                    vpci: 0000:00:0a.0
+                vnfd-connection-point-ref: eth0
+            -   name: eth1
+                virtual-interface:
+                    bandwidth: '0'
+                    type: OM-MGMT
+                    vpci: 0000:00:0b.0
+                vnfd-connection-point-ref: eth1
+            guest-epa:
+                cpu-pinning-policy: DEDICATED
+                cpu-thread-pinning-policy: PREFER
+                mempage-size: LARGE
+                numa-node-policy:
+                    mem-policy: STRICT
+                    node:
+                    -   id: '0'
+                        paired-threads:
+                            num-paired-threads: '1'
+                    node-cnt: '1'
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/README.md b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/README.md
new file mode 100644
index 00000000..c67a763b
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/README.md
@@ -0,0 +1,53 @@
+# Overview
+
+This is a [Juju charm](https://jujucharms.com/about), which allows configuration of the [Project Clearwater](http://projectclearwater.org) IMS core's [all-in-one](http://clearwater.readthedocs.org/en/stable/All_in_one_Images/index.html) node.
+
+This is a proxy charm, meaning that you must spin up the all-in-one VM first, and then point this charm at it to manage it.
+
+Since the all-in-one node does not support scaling up, neither does this charm.
+
+# Deployment
+
+## Initial deployment
+
+The all-in-one VM image should be downloaded from [http://repo.cw-ngv.com/juju-clearwater-2/cw-aio.ova](http://repo.cw-ngv.com/juju-clearwater-2/cw-aio.ova) and deployed onto your virtualization platform.  (You could alternatively try the latest all-in-one VM image from [http://vm-images.cw-ngv.com/](http://vm-images.cw-ngv.com/), but this may not have been tested with this charm - the juju-clearwater-2 version above is known to work.)
+
+The proxy charm should then be deployed, pointing at the all-in-one VM.
+
+# Using the All-in-One Node
+
+Once installed, the all-in-one node will listen for SIP traffic on port 5060 (both TCP and UDP).  You can use a standard SIP client (e.g. Blink, Boghe or X-Lite) to register against the all-in-one VM's public IP and make calls.
+
+Our ["Making your first call" documentation](http://clearwater.readthedocs.org/en/latest/Making_your_first_call/index.html) has more information on this process.
+
+# Configuration
+
+-  `proxied_ip`: The IP address of the All-in-One node to manage
+-  `password`: The login password of the All-in-One node to manage (default is
+ very likely correct)
+-  `home_domain`: The home domain for this service
+-  `base_number`: The first number to be allocated in the number range
+-  `number_count`: The count of numbers to allocate
+
+# Actions
+
+This proxy charm exposes two actions.
+
+-  `create-update-user`: Creates a user, or updates if they already exist
+    -  `number`: The number to provision
+    -  `password`: The number's password
+
+-  `delete-user`: Deletes a user
+    -  `number`: The number to delete
+
+For example, `juju action do clearwater-aio-proxy/0 create-update-user number=\"1234567890\" password=secret` creates a user.  (Note that the escaped double-quotes are required to avoid juju parsing the number as an integer rather than a string.)
+
+Note that the numbers specified in `create-update-user` and `delete-user` actions need not be in the number range specified in the configuration above.
+
+# Contact and Upstream Project Information
+
+Project Clearwater is an open-source IMS core, developed by [Metaswitch Networks](http://www.metaswitch.com) and released under the [GNU GPLv3](http://www.projectclearwater.org/download/license/). You can find more information about it on [our website](http://www.projectclearwater.org/) or [our documentation site](https://clearwater.readthedocs.org).
+
+Clearwater source code and issue list can be found at https://github.com/Metaswitch/.
+
+If you have problems when using Project Clearwater, read [our troubleshooting documentation](http://clearwater.readthedocs.org/en/latest/Troubleshooting_and_Recovery/index.html) for help, or see [our support page](http://clearwater.readthedocs.org/en/latest/Support/index.html) to find out how to ask mailing list questions or raise issues.
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions.yaml b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions.yaml
new file mode 100644
index 00000000..424ae896
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions.yaml
@@ -0,0 +1,19 @@
+create-update-user:
+  description: Create a user, or update a user if they already exist.
+  params:
+    number:
+      description: The number to provision
+      type: string
+    password:
+      description: The number's password
+      type: string
+  required: [number, password]
+  additionalProperties: false
+delete-user:
+  description: Delete a user.  If the user does not exist, this is still considered success.
+  params:
+    number:
+      description: The number to provision
+      type: string
+  required: [number]
+  additionalProperties: false
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-update-user b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-update-user
new file mode 100755
index 00000000..1f388fe2
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-update-user
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+# Get the configuration and action parameters.
+proxied_ip=$(config-get proxied_ip)
+login_password=$(config-get password)
+home_domain=$(config-get home_domain)
+number=$(action-get number)
+password=$(action-get password)
+
+if [ -z "$proxied_ip" ] || [ -z "$login_password" ] || [ -z "$home_domain" ] ; then
+  echo Proxy not yet configured!
+  exit 1
+fi
+
+# If the user doesn't exist, try to create them.  Otherwise, try to update them.
+if ! sshpass -p$login_password ssh -o StrictHostKeyChecking=no ubuntu@$proxied_ip "echo $login_password | sudo -S /usr/share/clearwater/bin/display_user $number $home_domain" ; then
+  echo "Subscriber doesn't exist - creating"
+  sshpass -p$login_password ssh -o StrictHostKeyChecking=no ubuntu@$proxied_ip "echo $login_password | sudo -S /usr/share/clearwater/bin/create_user $number $home_domain $password"
+else
+  echo "Subscriber exists - updating"
+  sshpass -p$login_password ssh -o StrictHostKeyChecking=no ubuntu@$proxied_ip "echo $login_password | sudo -S /usr/share/clearwater/bin/update_user $number $home_domain --password $password"
+fi
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-user b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-user
new file mode 100755
index 00000000..feeb6466
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-user
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+# Get the configuration and action parameters.
+proxied_ip=$(config-get proxied_ip)
+login_password=$(config-get password)
+home_domain=$(config-get home_domain)
+number=$(action-get number)
+password=$(action-get password)
+
+if [ -z "$proxied_ip" ] || [ -z "$login_password" ] || [ -z "$home_domain" ] ; then
+  echo Proxy not yet configured!
+  exit 1
+fi
+
+# Create the user.
+sshpass -p$login_password ssh -o StrictHostKeyChecking=no ubuntu@$proxied_ip "echo $login_password | sudo -S /usr/share/clearwater/bin/create_user $number $home_domain $password"
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/delete-user b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/delete-user
new file mode 100755
index 00000000..7ecf5198
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/delete-user
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+# Get the configuration and action parameters.
+proxied_ip=$(config-get proxied_ip)
+login_password=$(config-get password)
+home_domain=$(config-get home_domain)
+number=$(action-get number)
+
+if [ -z "$proxied_ip" ] || [ -z "$login_password" ] || [ -z "$home_domain" ] ; then
+  echo Proxy not yet configured!
+  exit 1
+fi
+
+# Delete the user.
+sshpass -p$login_password ssh -o StrictHostKeyChecking=no ubuntu@$proxied_ip "echo $login_password | sudo -S /usr/share/clearwater/bin/delete_user -y $number $home_domain"
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/config.yaml b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/config.yaml
new file mode 100644
index 00000000..3be783fc
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/config.yaml
@@ -0,0 +1,20 @@
+options:
+  proxied_ip:
+    description: The IP address of the All-in-One node to manage
+    type: string
+  password:
+    default: cw-aio
+    description: The login password of the All-in-One node to manage (default is very likely correct)
+    type: string
+  home_domain:
+    default: example.com
+    description: The home domain for this service
+    type: string
+  base_number:
+    default: "1230000000"
+    description: The first number to be allocated in the number range
+    type: string
+  number_count:
+    default: 1000
+    description: The count of numbers to allocate
+    type: int
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/copyright b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/copyright
new file mode 100644
index 00000000..39f1ec8f
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/copyright
@@ -0,0 +1,31 @@
+Project Clearwater - IMS in the Cloud
+Copyright (C) 2016  Metaswitch Networks Ltd
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version, along with the "Special Exception" for use of
+the program along with SSL, set forth below. This program is distributed
+in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details. You should have received a copy of the GNU General Public
+License along with this program.  If not, see
+<http://www.gnu.org/licenses/>.
+
+The author can be reached by email at clearwater@metaswitch.com or by
+post at Metaswitch Networks Ltd, 100 Church St, Enfield EN2 6BQ, UK
+
+Special Exception
+Metaswitch Networks Ltd  grants you permission to copy, modify,
+propagate, and distribute a work formed by combining OpenSSL with The
+Software, or a work derivative of such a combination, even if such
+copying, modification, propagation, or distribution would otherwise
+violate the terms of the GPL. You must comply with the GPL in all
+respects for all of the code used other than OpenSSL.
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/config-changed b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/config-changed
new file mode 100755
index 00000000..4382edd6
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/config-changed
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+# Get the configuration.
+proxied_ip=$(config-get proxied_ip)
+login_password=$(config-get password)
+home_domain=$(config-get home_domain)
+base_number=$(config-get base_number)
+number_count=$(config-get number_count)
+
+# If the node is configured, provision it and its numbers.
+if [ -n "$proxied_ip" ] && [ -n "$home_domain" ]  && [ -n "$login_password" ] ; then
+  # Copy the reconfigure-aio script on, and run it.
+  status-set maintenance "configuring"
+  sshpass -p$login_password scp -o StrictHostKeyChecking=no $CHARM_DIR/lib/reconfigure-aio ubuntu@$proxied_ip:/tmp/reconfigure-aio.$$
+  sshpass -p$login_password ssh -o StrictHostKeyChecking=no ubuntu@$proxied_ip "echo $login_password | sudo -S bash -c 'bash /tmp/reconfigure-aio.$$ $home_domain $base_number $number_count ; rm -f /tmp/reconfigure-aio.$$'"
+  status-set active "configured"
+else
+  status-set blocked "waiting for configuration"
+fi
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/install b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/install
new file mode 100755
index 00000000..4378d034
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/install
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+status-set maintenance "installing"
+
+# Install sshpass as we'll need it shortly
+apt-get update
+apt-get -q -y --force-yes install sshpass
+
+status-set maintenance "installed"
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/start b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/start
new file mode 100755
index 00000000..8824f74a
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/start
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Here put anything that is needed to start the service.
+# Note that currently this is run directly after install
+# i.e. 'service apache2 start'
+set -e
+
+# Nothing to do
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/stop b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/stop
new file mode 100755
index 00000000..f6ecbe3a
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/stop
@@ -0,0 +1,10 @@
+#!/bin/bash
+# This will be run when the service is being torn down, allowing you to disable
+# it in various ways..
+# For example, if your web app uses a text file to signal to the load balancer
+# that it is live... you could remove it and sleep for a bit to allow the load
+# balancer to stop sending traffic.
+# rm /srv/webroot/server-live.txt && sleep 30
+set -e
+
+# Nothing to do
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/upgrade-charm b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/upgrade-charm
new file mode 100755
index 00000000..fdb1f864
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/upgrade-charm
@@ -0,0 +1,8 @@
+#!/bin/bash
+# This hook is executed each time a charm is upgraded after the new charm
+# contents have been unpacked
+# Best practice suggests you execute the hooks/install to ensure all updates are processed -
+# hooks/config_change is triggered automatically
+set -e
+
+$CHARM_DIR/hooks/install
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/icon.svg b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/icon.svg
new file mode 100644
index 00000000..f9ac92c4
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/icon.svg
@@ -0,0 +1,407 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.3995495"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1331"
+     inkscape:window-height="674"
+     inkscape:window-x="19"
+     inkscape:window-y="1"
+     inkscape:window-maximized="0"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <image
+       y="633.29077"
+       x="-270"
+       id="image3169"
+       xlink:href="data:image/png;base64,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
+AABJRU5ErkJggg==
+"
+       height="96"
+       width="96"
+       style="stroke:#000000;stroke-opacity:0.18666669" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/lib/reconfigure-aio b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/lib/reconfigure-aio
new file mode 100755
index 00000000..a7cad909
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/lib/reconfigure-aio
@@ -0,0 +1,55 @@
+#!/bin/bash
+# Reconfigures an all-in-one image to use a new home domain and number range.
+# Usage: reconfigure-aio <home-domain> [<base-number> <number-count>]
+
+# Get command-line arguments.
+home_domain=$1
+base_number=$2
+number_count=$3
+
+if [ -z "$home_domain" ] ; then
+  echo "Usage: reconfigure-aio <home-domain> [<base-number> <number-count>]"
+fi
+
+# Remove all old numbers from the database, unless they're currently assigned.
+# We do this even if the home domain hasn't changed, because the number range might have done (and
+# it's hard to tell if that's happened, and cheap/low-impact to just do the reprovisioning).
+old_home_domain=$(. /etc/clearwater/config ; echo $home_domain)
+echo "DELETE FROM ellis.numbers WHERE number LIKE '%@$old_home_domain' AND owner_id IS NULL ;" | mysql
+
+# Update /etc/clearwater/shared_config, if the home domain has changed.
+if [ "$home_domain" != "$old_home_domain" ] ; then
+  function escape { echo $1 | sed -e 's/\//\\\//g' ; }
+  sed -e 's/^home_domain=.*$/home_domain='$(escape $home_domain)'/g' \
+      </etc/clearwater/shared_config >/tmp/shared_config.$$
+  mv /tmp/shared_config.$$ /etc/clearwater/shared_config
+  
+  # Restart clearwater-infrastructure to propagate changes to other configuration files.
+  service clearwater-infrastructure restart
+fi
+
+# Create new numbers in the new domain, if we've been asked to.
+if [ -n "$base_number" ] && [ -n "$number_count" ] ; then
+  /usr/share/clearwater/ellis/env/bin/python /usr/share/clearwater/ellis/src/metaswitch/ellis/tools/create_numbers.py --start $base_number --count $number_count
+fi
+
+# Restart all the components, if the home domain has changed.
+if [ "$home_domain" != "$old_home_domain" ] ; then
+  # Work around https://github.com/Metaswitch/sprout/issues/1296.
+  service bono stop
+
+  # Restart all the processes.
+  for X in /usr/share/clearwater/infrastructure/scripts/restart/* ; do $X ; done
+
+  # Kick monit to wake up and sleep for 10 seconds to make sure it has an accurate view of the system.
+  monit
+  sleep 10
+
+  # Now wait until all the processes are back up and running (or at least "Uptime failed", which
+  # means the process is running, just hasn't been running for very long).
+  while monit summary | grep _process | egrep -v "(Running|Uptime failed)" ; do
+    echo Some processes still not running - waiting...
+    sleep 2
+  done
+  echo All processes running - configuration complete!
+fi
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/metadata.yaml b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/metadata.yaml
new file mode 100644
index 00000000..4f1ad130
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/metadata.yaml
@@ -0,0 +1,10 @@
+name: clearwater-aio-proxy
+summary: All-in-One proxy charm for Project Clearwater
+maintainer: Project Clearwater Maintainers <maintainers@projectclearwater.org>
+description: All-in-One proxy charm for Project Clearwater
+tags:
+  - misc
+subordinate: false
+provides:
+  ue:
+    interface: 3GPP-Gm
diff --git a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/revision b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/revision
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/revision
@@ -0,0 +1 @@
+1
diff --git a/src/vnfd/ims_allin1_2p_vnf/icons/metaswitch_2x.png b/src/vnfd/ims_allin1_2p_vnf/icons/metaswitch_2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a899bc8e3e45de8438181d86b9d9ae53b0e9f9dd
GIT binary patch
literal 2799
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
BR51Vm

literal 0
HcmV?d00001

-- 
2.25.1