From ee2c2b610b7b62c7a5e3b4aae6bac7ede005ead1 Mon Sep 17 00:00:00 2001 From: Austin Cormier Date: Mon, 23 May 2016 20:53:00 -0400 Subject: [PATCH] Pull IMS charm from github during build process to workaround license issue. --- Makefile | 12 +- .../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 - 17 files changed, 10 insertions(+), 709 deletions(-) delete mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/README.md delete mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions.yaml delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-update-user delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-user delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/delete-user delete mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/config.yaml delete mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/copyright delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/config-changed delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/install delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/start delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/stop delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/upgrade-charm delete mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/icon.svg delete mode 100755 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/lib/reconfigure-aio delete mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/metadata.yaml delete mode 100644 src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/revision diff --git a/Makefile b/Makefile index 0a01862a..c4179eaf 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,8 @@ VNFD_BUILD_DIRS := $(addprefix $(VNFD_BUILD_DIR)/, $(VNFDS)) VNFD_PKGS := $(addsuffix .tar.gz, $(VNFDS)) VNFD_BUILD_PKGS := $(addprefix $(VNFD_BUILD_DIR)_pkgs/, $(VNFD_PKGS)) +IMS_GITHUB="https://github.com/Metaswitch/clearwater-juju.git" + all: $(VNFD_BUILD_PKGS) ${NSD_BUILD_PKGS} echo $@ @@ -29,7 +31,9 @@ $(VNFD_BUILD_DIR)/%: $(VNFD_SRC_DIR)/% cp -rf $< $(VNFD_BUILD_DIR) src/gen_vnfd_pkg.sh $< $@ - src/generate_descriptor_pkg.sh $(BUILD_DIR)/vnfd_pkgs $@ + +$(BUILD_DIR)/clearwater-juju: $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf + -cd $(BUILD_DIR) && (test -e clearwater-juju || git clone $(IMS_GITHUB)) $(NSD_BUILD_DIR)/%: $(NSD_SRC_DIR)/% mkdir -p $(NSD_BUILD_DIR) @@ -40,5 +44,9 @@ $(NSD_BUILD_DIR)/%: $(NSD_SRC_DIR)/% $(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)/% +$(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy: $(BUILD_DIR)/clearwater-juju + # Copy the IMS Charm into the IMS vnf package directory before + cp -rf $(BUILD_DIR)/clearwater-juju/charms/trusty/clearwater-aio-proxy $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms + +$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy src/generate_descriptor_pkg.sh $(BUILD_DIR)/vnfd_pkgs $< 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 deleted file mode 100644 index c67a763b..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# 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 deleted file mode 100644 index 424ae896..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions.yaml +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100755 index 1f388fe2..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-update-user +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 deleted file mode 100755 index feeb6466..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/create-user +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 deleted file mode 100755 index 7ecf5198..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/actions/delete-user +++ /dev/null @@ -1,16 +0,0 @@ -#!/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 deleted file mode 100644 index 3be783fc..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/config.yaml +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 39f1ec8f..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/copyright +++ /dev/null @@ -1,31 +0,0 @@ -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 -. - -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 deleted file mode 100755 index 4382edd6..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/config-changed +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 deleted file mode 100755 index 4378d034..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/install +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 deleted file mode 100755 index 8824f74a..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/start +++ /dev/null @@ -1,7 +0,0 @@ -#!/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 deleted file mode 100755 index f6ecbe3a..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/stop +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 deleted file mode 100755 index fdb1f864..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/hooks/upgrade-charm +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100644 index f9ac92c4..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/icon.svg +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - 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 deleted file mode 100755 index a7cad909..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/lib/reconfigure-aio +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -# Reconfigures an all-in-one image to use a new home domain and number range. -# Usage: reconfigure-aio [ ] - -# Get command-line arguments. -home_domain=$1 -base_number=$2 -number_count=$3 - -if [ -z "$home_domain" ] ; then - echo "Usage: reconfigure-aio [ ]" -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' \ - /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 deleted file mode 100644 index 4f1ad130..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/metadata.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: clearwater-aio-proxy -summary: All-in-One proxy charm for Project Clearwater -maintainer: Project Clearwater Maintainers -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 deleted file mode 100644 index d00491fd..00000000 --- a/src/vnfd/ims_allin1_2p_vnf/charms/clearwater-aio-proxy/revision +++ /dev/null @@ -1 +0,0 @@ -1 -- 2.25.1