Merge lp:~junaidali/charms/trusty/plumgrid-director/oil-sapi-changes into lp:charms/trusty/plumgrid-director

[Junaid Ali]

Added charm series in metadata.yaml file
Updated README file
Added Solutions API support for PG-ONS 6.X.X
Added actions
Wrapper to deal with Ubuntu versions don't have py2 installed
Edge and gateway relations will also be used to get node's IPs
Catalyst OPSVM changes

Unmerged revisions

22. By Junaid Ali on 2016-10-15

Changes:
  Added charm series in metadata.yaml file
  Updated README file
  Added Solutions API support for PG-ONS 6.X.X
  Added actions
  Wrapper to deal with Ubuntu versions don't have py2 installed
  Edge and gateway relations will also be used to get node's IPs
  Catalyst OPSVM changes

21. By Junaid Ali on 2016-10-15

Changes:
  Added charm series in metadata.yaml file
  Updated README file
  Added Solutions API support for PG-ONS 6.X.X
  Added actions
  Wrapper to deal with Ubuntu versions don't have py2 installed
  Edge and gateway relations will also be used to get node's IPs
  Catalyst OPSVM changes

=== modified file 'Makefile'
--- Makefile	2016-05-25 16:30:35 +0000
+++ Makefile	2016-10-17 17:28:49 +0000
@@ -4,12 +4,11 @@
 virtualenv:
 	virtualenv .venv
 	.venv/bin/pip install flake8 nose coverage mock pyyaml netifaces \
-        netaddr jinja2 pyflakes pep8 six pbr funcsigs psutil charm-tools \
-        simplejson
+        netaddr jinja2 pyflakes pep8 six pbr funcsigs psutil
 
 lint: virtualenv
 	.venv/bin/flake8 --exclude hooks/charmhelpers hooks unit_tests tests --ignore E402
-	@.venv/bin/charm-proof
+	@charm proof
 
 unit_test: virtualenv
 	@echo Starting tests...

=== modified file 'README.md'
--- README.md	2016-03-03 20:56:40 +0000
+++ README.md	2016-10-17 17:28:49 +0000
@@ -26,7 +26,7 @@
 
 # Known Limitations and Issues
 
-This is an early access version of the PLUMgrid Director charm and it is not meant for production deployments. The charm only supports Kilo Openstack Release.
+This charm currently is in an initial phase in supporting Ubuntu 16.04.
 
 # Configuration
 
@@ -58,4 +58,5 @@
 # Contact Information
 
 Bilal Baqar <[e-mail]>
-Bilal Ahmad <[e-mail]>
+Javeria Khan <[e-mail]>
+Junaid Ali <[e-mail]>

=== modified file 'actions.yaml'
--- actions.yaml	2016-07-27 09:39:41 +0000
+++ actions.yaml	2016-10-17 17:28:49 +0000
@@ -1,2 +1,8 @@
-restart:
-  description: Restart the plumgrid-director unit.  This action will restart related services.
+restart-pg-service:
+  description: Restart the plumgrid-director unit's service.
+sapi-post-ips:
+  description: Post PLUMgrid nodes IPs to Solutions API server.
+sapi-post-zone-info:
+  description: Post PLUMgrid Zone info to Solutions API server.
+sapi-post-license:
+  description: Post PLUMgrid License to Solutions API server.

=== modified file 'actions/actions.py'
--- actions/actions.py	2016-07-27 09:39:41 +0000
+++ actions/actions.py	2016-10-17 17:28:49 +0000
@@ -7,20 +7,49 @@
 
 from charmhelpers.core.hookenv import action_fail
 from pg_dir_utils import (
-    restart_pg
+    restart_pg,
+    sapi_post_zone_info,
+    sapi_post_license,
+    sapi_post_ips
 )
 
 
-def restart(args):
-    """Pause the Ceilometer services.
-    @raises Exception should the service fail to stop.
-    """
-    restart_pg('lxc')
+def restart_pg_service(args):
+    """
+    Restart PLUMgrid services.
+    """
+    restart_pg()
+
+
+def post_ips(args):
+    """
+    POST PLUMgrid nodes IPs to solutions api server.
+    """
+    sapi_post_ips()
+
+
+def post_zone_info(args):
+    """
+    POST PLUMgrid zone information to solutions api server
+    """
+    sapi_post_zone_info()
+
+
+def post_license(args):
+    """
+    POST PLUMgrid License key to solutions api server
+    """
+    sapi_post_license()
 
 
 # A dictionary of all the defined actions to callables (which take
 # parsed arguments).
-ACTIONS = {"restart": restart}
+ACTIONS = {
+    "restart-pg-service": restart_pg_service,
+    "sapi-post-ips": post_ips,
+    "sapi-post-zone-info": post_zone_info,
+    "sapi-post-license": post_license
+}
 
 
 def main(args):

=== removed symlink 'actions/restart'
=== target was u'actions.py'
=== added symlink 'actions/restart-pg-service'
=== target is u'actions.py'
=== added symlink 'actions/sapi-post-ips'
=== target is u'actions.py'
=== added symlink 'actions/sapi-post-license'
=== target is u'actions.py'
=== added symlink 'actions/sapi-post-zone-info'
=== target is u'actions.py'
=== added directory 'bin'
=== added file 'bin/charm_helpers_sync.py'
--- bin/charm_helpers_sync.py	1970-01-01 00:00:00 +0000
+++ bin/charm_helpers_sync.py	2016-10-17 17:28:49 +0000
@@ -0,0 +1,253 @@
+#!/usr/bin/python
+
+# Copyright 2014-2015 Canonical Limited.
+#
+# This file is part of charm-helpers.
+#
+# charm-helpers is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# charm-helpers 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+
+# Authors:
+#   Adam Gandelman <[e-mail]>
+
+import logging
+import optparse
+import os
+import subprocess
+import shutil
+import sys
+import tempfile
+import yaml
+from fnmatch import fnmatch
+
+import six
+
+CHARM_HELPERS_BRANCH = 'lp:charm-helpers'
+
+
+def parse_config(conf_file):
+    if not os.path.isfile(conf_file):
+        logging.error('Invalid config file: %s.' % conf_file)
+        return False
+    return yaml.load(open(conf_file).read())
+
+
+def clone_helpers(work_dir, branch):
+    dest = os.path.join(work_dir, 'charm-helpers')
+    logging.info('Checking out %s to %s.' % (branch, dest))
+    cmd = ['bzr', 'checkout', '--lightweight', branch, dest]
+    subprocess.check_call(cmd)
+    return dest
+
+
+def _module_path(module):
+    return os.path.join(*module.split('.'))
+
+
+def _src_path(src, module):
+    return os.path.join(src, 'charmhelpers', _module_path(module))
+
+
+def _dest_path(dest, module):
+    return os.path.join(dest, _module_path(module))
+
+
+def _is_pyfile(path):
+    return os.path.isfile(path + '.py')
+
+
+def ensure_init(path):
+    '''
+    ensure directories leading up to path are importable, omitting
+    parent directory, eg path='/hooks/helpers/foo'/:
+        hooks/
+        hooks/helpers/__init__.py
+        hooks/helpers/foo/__init__.py
+    '''
+    for d, dirs, files in os.walk(os.path.join(*path.split('/')[:2])):
+        _i = os.path.join(d, '__init__.py')
+        if not os.path.exists(_i):
+            logging.info('Adding missing __init__.py: %s' % _i)
+            open(_i, 'wb').close()
+
+
+def sync_pyfile(src, dest):
+    src = src + '.py'
+    src_dir = os.path.dirname(src)
+    logging.info('Syncing pyfile: %s -> %s.' % (src, dest))
+    if not os.path.exists(dest):
+        os.makedirs(dest)
+    shutil.copy(src, dest)
+    if os.path.isfile(os.path.join(src_dir, '__init__.py')):
+        shutil.copy(os.path.join(src_dir, '__init__.py'),
+                    dest)
+    ensure_init(dest)
+
+
+def get_filter(opts=None):
+    opts = opts or []
+    if 'inc=*' in opts:
+        # do not filter any files, include everything
+        return None
+
+    def _filter(dir, ls):
+        incs = [opt.split('=').pop() for opt in opts if 'inc=' in opt]
+        _filter = []
+        for f in ls:
+            _f = os.path.join(dir, f)
+
+            if not os.path.isdir(_f) and not _f.endswith('.py') and incs:
+                if True not in [fnmatch(_f, inc) for inc in incs]:
+                    logging.debug('Not syncing %s, does not match include '
+                                  'filters (%s)' % (_f, incs))
+                    _filter.append(f)
+                else:
+                    logging.debug('Including file, which matches include '
+                                  'filters (%s): %s' % (incs, _f))
+            elif (os.path.isfile(_f) and not _f.endswith('.py')):
+                logging.debug('Not syncing file: %s' % f)
+                _filter.append(f)
+            elif (os.path.isdir(_f) and not
+                  os.path.isfile(os.path.join(_f, '__init__.py'))):
+                logging.debug('Not syncing directory: %s' % f)
+                _filter.append(f)
+        return _filter
+    return _filter
+
+
+def sync_directory(src, dest, opts=None):
+    if os.path.exists(dest):
+        logging.debug('Removing existing directory: %s' % dest)
+        shutil.rmtree(dest)
+    logging.info('Syncing directory: %s -> %s.' % (src, dest))
+
+    shutil.copytree(src, dest, ignore=get_filter(opts))
+    ensure_init(dest)
+
+
+def sync(src, dest, module, opts=None):
+
+    # Sync charmhelpers/__init__.py for bootstrap code.
+    sync_pyfile(_src_path(src, '__init__'), dest)
+
+    # Sync other __init__.py files in the path leading to module.
+    m = []
+    steps = module.split('.')[:-1]
+    while steps:
+        m.append(steps.pop(0))
+        init = '.'.join(m + ['__init__'])
+        sync_pyfile(_src_path(src, init),
+                    os.path.dirname(_dest_path(dest, init)))
+
+    # Sync the module, or maybe a .py file.
+    if os.path.isdir(_src_path(src, module)):
+        sync_directory(_src_path(src, module), _dest_path(dest, module), opts)
+    elif _is_pyfile(_src_path(src, module)):
+        sync_pyfile(_src_path(src, module),
+                    os.path.dirname(_dest_path(dest, module)))
+    else:
+        logging.warn('Could not sync: %s. Neither a pyfile or directory, '
+                     'does it even exist?' % module)
+
+
+def parse_sync_options(options):
+    if not options:
+        return []
+    return options.split(',')
+
+
+def extract_options(inc, global_options=None):
+    global_options = global_options or []
+    if global_options and isinstance(global_options, six.string_types):
+        global_options = [global_options]
+    if '|' not in inc:
+        return (inc, global_options)
+    inc, opts = inc.split('|')
+    return (inc, parse_sync_options(opts) + global_options)
+
+
+def sync_helpers(include, src, dest, options=None):
+    if not os.path.isdir(dest):
+        os.makedirs(dest)
+
+    global_options = parse_sync_options(options)
+
+    for inc in include:
+        if isinstance(inc, str):
+            inc, opts = extract_options(inc, global_options)
+            sync(src, dest, inc, opts)
+        elif isinstance(inc, dict):
+            # could also do nested dicts here.
+            for k, v in six.iteritems(inc):
+                if isinstance(v, list):
+                    for m in v:
+                        inc, opts = extract_options(m, global_options)
+                        sync(src, dest, '%s.%s' % (k, inc), opts)
+
+if __name__ == '__main__':
+    parser = optparse.OptionParser()
+    parser.add_option('-c', '--config', action='store', dest='config',
+                      default=None, help='helper config file')
+    parser.add_option('-D', '--debug', action='store_true', dest='debug',
+                      default=False, help='debug')
+    parser.add_option('-b', '--branch', action='store', dest='branch',
+                      help='charm-helpers bzr branch (overrides config)')
+    parser.add_option('-d', '--destination', action='store', dest='dest_dir',
+                      help='sync destination dir (overrides config)')
+    (opts, args) = parser.parse_args()
+
+    if opts.debug:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+    if opts.config:
+        logging.info('Loading charm helper config from %s.' % opts.config)
+        config = parse_config(opts.config)
+        if not config:
+            logging.error('Could not parse config from %s.' % opts.config)
+            sys.exit(1)
+    else:
+        config = {}
+
+    if 'branch' not in config:
+        config['branch'] = CHARM_HELPERS_BRANCH
+    if opts.branch:
+        config['branch'] = opts.branch
+    if opts.dest_dir:
+        config['destination'] = opts.dest_dir
+
+    if 'destination' not in config:
+        logging.error('No destination dir. specified as option or config.')
+        sys.exit(1)
+
+    if 'include' not in config:
+        if not args:
+            logging.error('No modules to sync specified as option or config.')
+            sys.exit(1)
+        config['include'] = []
+        [config['include'].append(a) for a in args]
+
+    sync_options = None
+    if 'options' in config:
+        sync_options = config['options']
+    tmpd = tempfile.mkdtemp()
+    try:
+        checkout = clone_helpers(tmpd, config['branch'])
+        sync_helpers(config['include'], checkout, config['destination'],
+                     options=sync_options)
+    except Exception as e:
+        logging.error("Could not sync: %s" % e)
+        raise e
+    finally:
+        logging.debug('Cleaning up %s' % tmpd)
+        shutil.rmtree(tmpd)

=== modified file 'config.yaml'
--- config.yaml	2016-07-23 14:21:58 +0000
+++ config.yaml	2016-10-17 17:28:49 +0000
@@ -17,6 +17,7 @@
     description: Public SSH key of PLUMgrid LCM which is running PG-Tools.
   mgmt-interface:
     type: string
+    default:
     description: The interface connected to PLUMgrid Managment network.
   fabric-interfaces:
     default: 'MANAGEMENT'
@@ -56,3 +57,26 @@
     default: 127.0.0.1
     type: string
     description: IP address of the PLUMgrid Operations VM Management interface.
+  lcm-ip:
+    type: string
+    default: 127.0.0.1
+    description: IP used by Solutions API to get/post cloud information.
+  sapi-port:
+    default: 8099
+    type: int
+    description: Port used by Solutions API to get/post cloud information.
+  sapi-zone:
+    default: pgzone
+    type: string
+    description: Zone name used by Solutions API to get/post cloud information.
+  openstack-release:
+    default: kilo
+    type: string
+    description: |
+        OpenStack release to determine solution version that will be posted to
+        Solutions API server.
+  enable-sapi:
+    default: false
+    type: boolean
+    description: |
+        Enable or disable Solutions API support.

=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'pg_dir_hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2016-10-17 17:28:49 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real

=== added symlink 'hooks/install.real'
=== target is u'pg_dir_hooks.py'
=== modified file 'hooks/pg_dir_context.py'
--- hooks/pg_dir_context.py	2016-03-26 22:04:58 +0000
+++ hooks/pg_dir_context.py	2016-10-17 17:28:49 +0000
@@ -26,6 +26,30 @@
 )
 
 
+def _pg_edge_ips():
+    '''
+    Inspects edge-peer relation and returns the
+    ips of the edge nodes
+    '''
+    return [get_host_ip(rdata['private-address'])
+            for rid in relation_ids("plumgrid")
+            for rdata in
+            (relation_get(rid=rid, unit=unit) for unit in related_units(rid))
+            if 'edge-peer' in rdata]
+
+
+def _pg_gateway_ips():
+    '''
+    Inspects gateway-peer relation and returns the
+    ips of the gateway nodes
+    '''
+    return [get_host_ip(rdata['private-address'])
+            for rid in relation_ids("plumgrid")
+            for rdata in
+            (relation_get(rid=rid, unit=unit) for unit in related_units(rid))
+            if 'gateway-peer' in rdata]
+
+
 def _pg_dir_ips():
     '''
     Inspects plumgrid-director peer relation and returns the

=== modified file 'hooks/pg_dir_hooks.py'
--- hooks/pg_dir_hooks.py	2016-07-28 19:27:47 +0000
+++ hooks/pg_dir_hooks.py	2016-10-17 17:28:49 +0000
@@ -9,7 +9,6 @@
 import time
 from charmhelpers.core.host import service_running
 from charmhelpers.contrib.network.ip import is_ip
-
 from charmhelpers.core.hookenv import (
     Hooks,
     UnregisteredHookError,
@@ -41,15 +40,19 @@
     load_iptables,
     restart_on_change,
     director_cluster_ready,
-    disable_apparmor_libvirt,
-    configure_pg_sources
+    configure_pg_sources,
+    configure_analyst_opsvm,
+    sapi_post_ips,
+    sapi_post_license,
+    sapi_post_zone_info,
+    disable_apparmor_libvirt
 )
 
 hooks = Hooks()
 CONFIGS = register_configs()
 
 
[e-mail]()
[e-mail]('install.real')
 def install():
     '''
     Install hook is run when the charm is first deployed on a node.
@@ -62,12 +65,13 @@
     for pkg in pkgs:
         apt_install(pkg, options=['--force-yes'], fatal=True)
     load_iovisor()
-    ensure_mtu()
     disable_apparmor_libvirt()
+    ensure_mtu()
     CONFIGS.write_all()
 
 
 @hooks.hook('director-relation-joined')
[e-mail]('director-relation-changed')
 @restart_on_change(restart_map())
 def dir_joined():
     '''
@@ -76,19 +80,22 @@
     if director_cluster_ready():
         ensure_mtu()
         CONFIGS.write_all()
-    restart_pg('lxc')
-
-
[e-mail]('plumgrid-relation-joined')
+
+
[e-mail]('plumgrid-relation-joined',
+            'plumgrid-relation-changed',
+            'plumgrid-relation-departed')
 def plumgrid_joined(relation_id=None):
     '''
     This hook is run when relation with edge or gateway is created.
     '''
     opsvm_ip = config('opsvm-ip')
     if not is_ip(opsvm_ip):
-        raise ValueError('Incorrect OPSVM IP specified')
+        raise ValueError('Invalid OPSVM IP specified!')
     else:
         relation_set(relation_id=relation_id, opsvm_ip=opsvm_ip)
+    if is_leader():
+        sapi_post_ips()
 
 
 @hooks.hook('plumgrid-configs-relation-joined')
@@ -119,6 +126,8 @@
     if charm_config.changed('plumgrid-license-key'):
         if is_leader() and post_pg_license():
             log("PLUMgrid License Posted")
+        # Post PG license to Sol-API
+        sapi_post_license()
     if charm_config.changed('fabric-interfaces'):
         if not fabric_interface_changed():
             log("Fabric interface already set")
@@ -126,6 +135,8 @@
             stop_pg()
     if charm_config.changed('plumgrid-virtual-ip'):
         CONFIGS.write_all()
+        for rid in relation_ids('plumgrid'):
+            plumgrid_joined(rid)
         stop_pg()
         for rid in relation_ids('plumgrid-configs'):
             plumgrid_configs_joined(rid)
@@ -151,10 +162,21 @@
         for rid in relation_ids('plumgrid'):
             plumgrid_joined(rid)
         stop_pg()
+    if (charm_config.changed('sapi-port') or
+        charm_config.changed('lcm-ip') or
+        charm_config.changed('sapi-zone') or
+            charm_config.changed('enable-sapi')):
+        if is_leader():
+            if is_ip(config('lcm-ip')):
+                sapi_post_zone_info()
+            else:
+                raise ValueError('Invalid LCM IP specified!')
+            for rid in relation_ids('plumgrid'):
+                plumgrid_joined(rid)
     ensure_mtu()
     CONFIGS.write_all()
     if not service_running('plumgrid'):
-        restart_pg('lxc')
+        restart_pg()
 
 
 @hooks.hook('start')
@@ -162,16 +184,15 @@
     '''
     This hook is run when the charm is started.
     '''
-    restart_pg('lxc')
-    time.sleep(15)
+    configure_analyst_opsvm()
     if config('plumgrid-license-key') is not None:
         count = 0
-        while (count < 15):
+        while (count < 10):
+            time.sleep(15)
             if post_pg_license():
                 break
             count += 1
-            time.sleep(15)
-        if count == 15:
+        if count == 10:
             raise ValueError("Error occurred while posting plumgrid license"
                              "key. Please check plumgrid services.")
 
@@ -184,7 +205,6 @@
     '''
     ensure_mtu()
     CONFIGS.write_all()
-    restart_pg('lxc')
 
 
 @hooks.hook('stop')

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2016-08-29 10:03:28 +0000
+++ hooks/pg_dir_utils.py	2016-10-17 17:28:49 +0000
@@ -7,7 +7,6 @@
 import time
 import os
 import json
-import shlex
 from collections import OrderedDict
 from socket import gethostname as get_unit_hostname
 from copy import deepcopy
@@ -25,14 +24,16 @@
     get_bridges,
     get_bridge_nics,
     is_ip,
+    get_iface_addr,
+    get_host_ip
 )
 from charmhelpers.core.host import (
     service_start,
-    service_restart,
     service_stop,
     service_running,
     path_hash,
-    set_nic_mtu
+    set_nic_mtu,
+    service_restart
 )
 from charmhelpers.fetch import (
     apt_cache,
@@ -41,6 +42,11 @@
 from charmhelpers.contrib.openstack.utils import (
     os_release,
 )
+from pg_dir_context import (
+    _pg_dir_ips,
+    _pg_edge_ips,
+    _pg_gateway_ips
+)
 
 SOURCES_LIST = '/etc/apt/sources.list'
 LXC_CONF = '/etc/libvirt/lxc.conf'
@@ -57,6 +63,14 @@
 AUTH_KEY_PATH = '%s/root/.ssh/authorized_keys' % PG_LXC_DATA_PATH
 TEMP_LICENSE_FILE = '/tmp/license'
 
+# Constant values for OpenStack releases as Canonical-Ubuntu
+# doesn't have any specific solution version associated
+OPENSTACK_RELEASE_VERS = {
+    'kilo': '10',
+    'liberty': '11',
+    'mitaka': '12'
+}
+
 BASE_RESOURCE_MAP = OrderedDict([
     (PG_KA_CONF, {
         'services': ['plumgrid'],
@@ -105,6 +119,31 @@
         log('Unable to update /etc/apt/sources.list')
 
 
+def configure_analyst_opsvm():
+    '''
+    Configures Anaylyst for OPSVM
+    '''
+    if not service_running('plumgrid'):
+        restart_pg()
+    NS_ENTER = ('/opt/local/bin/nsenter -t $(ps ho pid --ppid $(cat '
+                '/var/run/libvirt/lxc/plumgrid.pid)) -m -n -u -i -p ')
+    sigmund_stop = NS_ENTER + '/usr/bin/service plumgrid-sigmund stop'
+    sigmund_status = NS_ENTER \
+        + '/usr/bin/service plumgrid-sigmund status'
+    sigmund_autoboot = NS_ENTER \
+        + '/usr/bin/sigmund-configure --ip {0} --start --autoboot' \
+        .format(config('opsvm-ip'))
+    try:
+        status = subprocess.check_output(sigmund_status, shell=True)
+        if 'start/running' in status:
+            if subprocess.call(sigmund_stop, shell=True):
+                log('plumgrid-sigmund couldn\'t be stopped!')
+                return
+        subprocess.check_call(sigmund_autoboot, shell=True)
+    except:
+        log('plumgrid-sigmund couldn\'t be started!')
+
+
 def determine_packages():
     '''
     Returns list of packages required by PLUMgrid director as specified
@@ -131,6 +170,36 @@
     return pkgs
 
 
+def disable_apparmor_libvirt():
+    '''
+    Disables Apparmor profile of libvirtd.
+    '''
+    apt_install('apparmor-utils')
+    apt_install('cgroup-bin')
+    _exec_cmd(['sudo', 'aa-disable', '/usr/sbin/libvirtd'],
+              error_msg='Error disabling AppArmor profile of libvirtd')
+    disable_apparmor()
+    service_restart('libvirt-bin')
+
+
+def disable_apparmor():
+    '''
+    Disables Apparmor security for lxc.
+    '''
+    try:
+        f = open(LXC_CONF, 'r')
+    except IOError:
+        log('Libvirt not installed yet')
+        return 0
+    filedata = f.read()
+    f.close()
+    newdata = filedata.replace("security_driver = \"apparmor\"",
+                               "#security_driver = \"apparmor\"")
+    f = open(LXC_CONF, 'w')
+    f.write(newdata)
+    f.close()
+
+
 def register_configs(release=None):
     '''
     Returns an object of the Openstack Tempating Class which contains the
@@ -161,31 +230,7 @@
     return {cfg: rscs['services'] for cfg, rscs in resource_map().iteritems()}
 
 
-def start_gateway():
-    '''
-    Brings up PE-gateway interface. Initial hack but will be solved when docker
-    plumgrid-director package will be used. 
-    '''
-    count = 0
-    while (count < 7):
-        cmd = 'ps aux | grep launch_metadata_helper'
-        output = subprocess.check_output([cmd], shell=True)
-        roots = 0
-        v = shlex.split(output)
-        for i in v:
-            if i == 'root':
-                roots += 1
-        if roots < 3:
-            stop_pg()
-            time.sleep(3)
-            service_start('plumgrid')
-        else:
-            break
-        count += 1
-        time.sleep(20)
-
-
-def restart_pg(gateway=None):
+def restart_pg():
     '''
     Stops and Starts PLUMgrid service after flushing iptables.
     '''
@@ -203,8 +248,6 @@
                     raise ValueError("plumgrid service couldn't be started")
             else:
                 raise ValueError("libvirt-bin service couldn't be started")
-    if gateway:
-        start_gateway()
     status_set('active', 'Unit is ready')
 
 
@@ -251,8 +294,14 @@
     '''
     mgmt_interface = config('mgmt-interface')
     if not mgmt_interface:
-        return get_iface_from_addr(unit_get('private-address'))
-    elif mgmt_interface and interface_exists(mgmt_interface):
+        try:
+            return get_iface_from_addr(unit_get('private-address'))
+        except:
+            for bridge_interface in get_bridges():
+                if (get_host_ip(unit_get('private-address'))
+                        in get_iface_addr(bridge_interface)):
+                    return bridge_interface
+    elif interface_exists(mgmt_interface):
         return mgmt_interface
     else:
         log('Provided managment interface %s does not exist'
@@ -317,36 +366,6 @@
     set_nic_mtu(fabric_interface, interface_mtu)
 
 
-def disable_apparmor_libvirt():
-    '''
-    Disables Apparmor profile of libvirtd.
-    '''
-    apt_install('apparmor-utils')
-    apt_install('cgroup-bin')
-    _exec_cmd(['sudo', 'aa-disable', '/usr/sbin/libvirtd'],
-              error_msg='Error disabling AppArmor profile of libvirtd')
-    disable_apparmor()
-    service_restart('libvirt-bin')
-
-
-def disable_apparmor():
-    '''
-    Disables Apparmor security for lxc.
-    '''
-    try:
-        f = open(LXC_CONF, 'r')
-    except IOError:
-        log('Libvirt not installed yet')
-        return 0
-    filedata = f.read()
-    f.close()
-    newdata = filedata.replace("security_driver = \"apparmor\"",
-                               "#security_driver = \"apparmor\"")
-    f = open(LXC_CONF, 'w')
-    f.write(newdata)
-    f.close()
-
-
 def _exec_cmd(cmd=None, error_msg='Command exited with ERRORs', fatal=False):
     '''
     Function to execute any bash command on the node.
@@ -431,6 +450,160 @@
     return 1
 
 
+def sapi_post_ips():
+    """
+    Posts PLUMgrid nodes IPs to solutions api server.
+    """
+    if not config('enable-sapi'):
+        log('Solutions API support is disabled!')
+        return 1
+    pg_edge_ips = _pg_edge_ips()
+    pg_dir_ips = _pg_dir_ips()
+    pg_gateway_ips = _pg_gateway_ips()
+    pg_dir_ips.append(get_host_ip(unit_get('private-address')))
+    pg_edge_ips = '"edge_ips"' + ':' \
+        + '"{}"'.format(','.join(str(i) for i in pg_edge_ips))
+    pg_dir_ips = '"director_ips"' + ':' \
+        + '"{}"'.format(','.join(str(i) for i in pg_dir_ips))
+    pg_gateway_ips = '"gateway_ips"' + ':' \
+        + '"{}"'.format(','.join(str(i) for i in pg_gateway_ips))
+    opsvm_ip = '"opsvm_ip"' + ':' + '"{}"'.format(config('opsvm-ip'))
+    virtual_ip = '"virtual_ip"' + ':' \
+        + '"{}"'.format(config('plumgrid-virtual-ip'))
+    JSON_IPS = ','.join([pg_dir_ips, pg_edge_ips, pg_gateway_ips,
+                        opsvm_ip, virtual_ip])
+    status = (
+        'curl -H \'Content-Type: application/json\' -X '
+        'PUT -d \'{{{0}}}\' http://{1}' + ':' + '{2}/v1/zones/{3}/allIps'
+    ).format(JSON_IPS, config('lcm-ip'), config('sapi-port'),
+             config('sapi-zone'))
+    POST_ZONE_IPs = _exec_cmd_output(
+        status,
+        'Posting Zone IPs to Solutions API server failed!')
+    if POST_ZONE_IPs:
+        if 'success' in POST_ZONE_IPs:
+            log('Successfully posted Zone IPs to Solutions API server!')
+        log(POST_ZONE_IPs)
+
+
+def _exec_cmd_output(cmd=None, error_msg='Command exited with ERRORs',
+                     fatal=False):
+    '''
+    Function to get output from bash command executed on the node.
+    '''
+    if cmd is None:
+        log("No command specified")
+    else:
+        if fatal:
+            return subprocess.check_output(cmd, shell=True)
+        else:
+            try:
+                return subprocess.check_output(cmd, shell=True)
+            except subprocess.CalledProcessError:
+                log(error_msg)
+                return None
+
+
+def sapi_post_license():
+    '''
+    Posts PLUMgrid License to solutions api server
+    '''
+    if not config('enable-sapi'):
+        log('Solutions API support is disabled!')
+        return 1
+    username = '"user_name":' + '"{}"'.format(config('plumgrid-username'))
+    password = '"password":' + '"{}"'.format(config('plumgrid-password'))
+    license = '"license":' + '"{}"'.format(config('plumgrid-license-key'))
+    JSON_LICENSE = ','.join([username, password, license])
+    status = (
+        'curl -H \'Content-Type: application/json\' -X '
+        'PUT -d \'{{{0}}}\' http://{1}' + ':' + '{2}/v1/zones/{3}/pgLicense'
+    ).format(JSON_LICENSE, config('lcm-ip'), config('sapi-port'),
+             config('sapi-zone'))
+    POST_LICENSE = _exec_cmd_output(
+        status,
+        'Posting PLUMgrid License to Solutions API server failed!')
+    if POST_LICENSE:
+        if 'success' in POST_LICENSE:
+            log('Successfully posted license file for zone "{}"!'
+                .format(config('sapi-zone')))
+        log(POST_LICENSE)
+
+
+def sapi_post_zone_info():
+    '''
+    Posts zone information to solutions api server
+    '''
+    if not config('enable-sapi'):
+        log('Solutions API support is disabled!')
+        return 1
+    sol_name = '"solution_name":"Ubuntu OpenStack"'
+    release = config('openstack-release')
+    for key, value in OPENSTACK_RELEASE_VERS.iteritems():
+        if release == value:
+            sol_version = value
+        else:
+            sol_version = 10
+    sol_version = '"solution_version":"{}"'.format(sol_version)
+    pg_ons_version = _exec_cmd_output(
+        'dpkg -l | grep plumgrid | awk \'{print $3}\' | '
+        'sed \'s/-/./\' | cut -f1 -d"-"',
+        'Unable to obtain PG ONS version'
+    ).replace('\n', '')
+    pg_ons_version = \
+        '"pg_ons_version":"{}"'.format(pg_ons_version)
+    hypervisor = '"hypervisor":"Ubuntu"'
+    hypervisor_version = \
+        _exec_cmd_output('lsb_release -r | awk \'{print $2}\'',
+                         'Unable to obtain solution version'
+                         ).replace('\n', '')
+    hypervisor_version = '"hypervisor_version":"{}"' \
+                         .format(hypervisor_version)
+    kernel_version = _exec_cmd_output(
+        'uname -r',
+        'Unable to obtain kernal version').replace('\n', '')
+    kernel_version = \
+        '"kernel_version":"{}"'.format(kernel_version)
+    cloudapex_path = '/var/lib/libvirt/filesystems/plumgrid/' \
+                     'opt/pg/web/cloudApex/modules/appCloudApex' \
+                     '/appCloudApex.js'
+    if os.path.isfile(cloudapex_path):
+        pg_cloudapex_version = 'cat ' \
+            + '{}'.format(cloudapex_path) \
+            + ' | grep -i appversion | awk \'{print $2}\''
+        pg_cloudapex_version = \
+            _exec_cmd_output(pg_cloudapex_version,
+                             'Unable to retrieve CloudApex version'
+                             ).replace('\n', '')
+    else:
+        log('CloudApex not installed!')
+        pg_cloudapex_version = ''
+    pg_cloudapex_version = \
+        '"pg_cloudapex_version":"{}"'.format(pg_cloudapex_version)
+    JSON_ZONE_INFO = ','.join([
+        sol_name,
+        sol_version,
+        pg_ons_version,
+        hypervisor,
+        hypervisor_version,
+        kernel_version,
+        pg_cloudapex_version,
+    ])
+    status = (
+        'curl -H \'Content-Type: application/json\' -X '
+        'PUT -d \'{{{0}}}\' http://{1}:{2}/v1/zones/{3}/zoneinfo'
+    ).format(JSON_ZONE_INFO, config('lcm-ip'), config('sapi-port'),
+             config('sapi-zone'))
+    POST_ZONE_INFO = _exec_cmd_output(
+        status,
+        'Posting Zone Information to Solutions API server failed!')
+    if POST_ZONE_INFO:
+        if 'success' in POST_ZONE_INFO:
+            log('Successfully posted Zone information to Solutions API'
+                ' server!')
+        log(POST_ZONE_INFO)
+
+
 def load_iptables():
     '''
     Loads iptables rules to allow all PLUMgrid communication.

=== added symlink 'hooks/plumgrid-relation-changed'
=== target is u'pg_dir_hooks.py'
=== added symlink 'hooks/plumgrid-relation-departed'
=== target is u'pg_dir_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2016-05-04 06:47:43 +0000
+++ metadata.yaml	2016-10-17 17:28:49 +0000
@@ -7,6 +7,9 @@
   The configuration of the virtual network infrastructure for tenants is
   done through the PLUMgrid Director. The PLUMgrid Director is typically
   co-located on the OpenStack controller nodes.
+series:
+  - xenial
+  - trusty
 tags:
   - openstack
 requires:

=== modified file 'unit_tests/test_pg_dir_hooks.py'
--- unit_tests/test_pg_dir_hooks.py	2016-05-01 02:16:59 +0000
+++ unit_tests/test_pg_dir_hooks.py	2016-10-17 17:28:49 +0000
@@ -32,7 +32,10 @@
     'post_pg_license',
     'config',
     'load_iptables',
-    'status_set'
+    'status_set',
+    'configure_analyst_opsvm',
+    'sapi_post_zone_info',
+    'disable_apparmor_libvirt'
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"