Merge lp:~bbaqar/charms/trusty/plumgrid-director/conflicts into lp:charms/trusty/plumgrid-director

[Bilal Baqar]

Will merge in lp:~plumgrid-team/charms/trusty/plumgrid-director/trunk first

=== modified file 'Makefile'
--- Makefile	2015-08-24 16:18:48 +0000
+++ Makefile	2016-03-03 21:07:28 +0000
@@ -7,7 +7,7 @@
         netaddr jinja2
 
 lint: virtualenv
-	.venv/bin/flake8 --exclude hooks/charmhelpers hooks unit_tests tests
+	.venv/bin/flake8 --exclude hooks/charmhelpers hooks unit_tests tests --ignore E402
 	@charm proof
 
 unit_test: virtualenv

=== modified file 'config.yaml'
--- config.yaml	2015-08-16 19:04:53 +0000
+++ config.yaml	2016-03-03 21:07:28 +0000
@@ -7,6 +7,28 @@
     default: 'null'
     type: string
     description: Public SSH key of PLUMgrid LCM which is running PG-Tools.
+  mgmt-interface:
+    type: string
+    default: 'juju-br0'
+    description: The interface connected to PLUMgrid Managment network.
+  os-data-network:
+    type: string
+    default:
+    description: |
+      The IP address and netmask of the OpenStack Data network (e.g.,
+      192.168.0.0/24)
+      .
+      This network will be used for tenant network traffic in overlay
+      networks.
+  fabric-interfaces:
+    default: 'MANAGEMENT'
+    type: string
+    description: |
+       Interfaces that will provide fabric connectivity on the director nodes.
+       Provided in form of json in a string. These interfaces have to be connected 
+       to the os-data-network specified in the config. Default value is MANAGEMENT which
+       will configure the management interface as the fabric interface on each
+       director.
   network-device-mtu:
     type: string
     default: '1580'
@@ -19,6 +41,16 @@
     default: null
     type: string
     description: Provide the respective keys of the install sources.
+  plumgrid-build:
+    default: 'latest'
+    type: string
+    description: |
+       Provide the build version of PLUMgrid packages that needs to be installed
+  iovisor-build:
+    default: 'latest'
+    type: string
+    description: |
+       Provide the build version of iovisor package that needs to be installed
   plumgrid-license-key:
     default: null
     type: string

=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2015-07-29 18:07:31 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2016-03-03 21:07:28 +0000
@@ -204,8 +204,8 @@
                                         database=config('database'),
                                         ssl_dir=NEUTRON_CONF_DIR)],
             'services': [],
-            'packages': [['plumgrid-lxc'],
-                         ['iovisor-dkms']],
+            'packages': ['plumgrid-lxc',
+                         'iovisor-dkms'],
             'server_packages': ['neutron-server',
                                 'neutron-plugin-plumgrid'],
             'server_services': ['neutron-server']

=== modified file 'hooks/pg_dir_context.py'
--- hooks/pg_dir_context.py	2015-08-24 16:18:48 +0000
+++ hooks/pg_dir_context.py	2016-03-03 21:07:28 +0000
@@ -29,7 +29,7 @@
     for rid in relation_ids('director'):
         for unit in related_units(rid):
             rdata = relation_get(rid=rid, unit=unit)
-            pg_dir_ips.append(rdata['private-address'])
+            pg_dir_ips.append(get_host_ip(rdata['private-address']))
     return pg_dir_ips
 
 
@@ -82,11 +82,12 @@
                 pg_dir_ips_string = pg_dir_ips_string + ',' + str(ip)
         pg_ctxt['director_ips_string'] = pg_dir_ips_string
         pg_ctxt['virtual_ip'] = conf['plumgrid-virtual-ip']
-        pg_ctxt['pg_hostname'] = "pg-director"
-        from pg_dir_utils import check_interface_type
-        interface_type = check_interface_type()
-        pg_ctxt['interface'] = interface_type
-        pg_ctxt['label'] = get_unit_hostname()
+        unit_hostname = get_unit_hostname()
+        pg_ctxt['pg_hostname'] = unit_hostname
+        from pg_dir_utils import get_mgmt_interface, get_fabric_interface
+        pg_ctxt['interface'] = get_mgmt_interface()
+        pg_ctxt['fabric_interface'] = get_fabric_interface()
+        pg_ctxt['label'] = unit_hostname
         pg_ctxt['fabric_mode'] = 'host'
         virtual_ip_array = re.split('\.', conf['plumgrid-virtual-ip'])
         pg_ctxt['virtual_router_id'] = virtual_ip_array[3]

=== modified file 'hooks/pg_dir_hooks.py'
--- hooks/pg_dir_hooks.py	2015-08-24 16:18:48 +0000
+++ hooks/pg_dir_hooks.py	2016-03-03 21:07:28 +0000
@@ -30,6 +30,7 @@
     ensure_mtu,
     add_lcm_key,
     post_pg_license,
+    fabric_interface_changed
 )
 
 hooks = Hooks()
@@ -47,7 +48,7 @@
         apt_install(pkg, options=['--force-yes'], fatal=True)
     load_iovisor()
     ensure_mtu()
-    add_lcm_key()
+    CONFIGS.write_all()
 
 
 @hooks.hook('director-relation-joined')
@@ -65,17 +66,28 @@
     This hook is run when a config parameter is changed.
     It also runs on node reboot.
     '''
-    if post_pg_license():
-        log("PLUMgrid License Posted")
-        return 1
     if add_lcm_key():
         log("PLUMgrid LCM Key added")
         return 1
+    charm_config = config()
+    if charm_config.changed('plumgrid-license-key'):
+        if post_pg_license():
+            log("PLUMgrid License Posted")
+        return 1
+    if charm_config.changed('fabric-interfaces'):
+        if not fabric_interface_changed():
+            log("Fabric interface already set")
+            return 1
+    if charm_config.changed('os-data-network'):
+        if charm_config['fabric-interfaces'] == 'MANAGEMENT':
+            log('Fabric running on managment network')
+            return 1
     stop_pg()
     configure_sources(update=True)
     pkgs = determine_packages()
     for pkg in pkgs:
         apt_install(pkg, options=['--force-yes'], fatal=True)
+    remove_iovisor()
     load_iovisor()
     ensure_mtu()
     add_lcm_key()

=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2015-08-24 16:18:48 +0000
+++ hooks/pg_dir_utils.py	2016-03-03 21:07:28 +0000
@@ -7,6 +7,18 @@
 from charmhelpers.core.hookenv import (
     log,
     config,
+    unit_get,
+)
+from charmhelpers.contrib.network.ip import (
+    get_iface_from_addr,
+    get_bridges,
+    get_bridge_nics,
+    is_ip,
+    is_address_in_network,
+    get_iface_addr
+)
+from charmhelpers.fetch import (
+    apt_cache
 )
 from charmhelpers.contrib.openstack import templating
 from charmhelpers.core.host import set_nic_mtu
@@ -19,11 +31,11 @@
     service_start,
     service_stop,
 )
+from socket import gethostname as get_unit_hostname
 import pg_dir_context
 import subprocess
 import time
 import os
-import re
 import json
 
 LXC_CONF = '/etc/libvirt/lxc.conf'
@@ -74,7 +86,25 @@
     Returns list of packages required by PLUMgrid director as specified
     in the neutron_plugins dictionary in charmhelpers.
     '''
-    return neutron_plugin_attribute('plumgrid', 'packages', 'neutron')
+    pkgs = []
+    tag = 'latest'
+    for pkg in neutron_plugin_attribute('plumgrid', 'packages', 'neutron'):
+        if 'plumgrid' in pkg:
+            tag = config('plumgrid-build')
+        elif pkg == 'iovisor-dkms':
+            tag = config('iovisor-build')
+
+        if tag == 'latest':
+            pkgs.append(pkg)
+        else:
+            if tag in [i.ver_str for i in apt_cache()[pkg].version_list]:
+                pkgs.append('%s=%s' % (pkg, tag))
+            else:
+                error_msg = \
+                    "Build version '%s' for package '%s' not available" \
+                    % (tag, pkg)
+                raise ValueError(error_msg)
+    return pkgs
 
 
 def register_configs(release=None):
@@ -139,38 +169,94 @@
     '''
     _exec_cmd(cmd=['rmmod', 'iovisor'],
               error_msg='Error Loading IOVisor Kernel Module')
-
-
-def check_interface_type():
-    '''
-    Checks the interface. Support added for AWS deployments. There are 2
-    possible interfaces "juju-br0" and "eth0". The default being juju-br0
-    '''
-    log("Checking Interface Type")
-    default_interface = "juju-br0"
-    AWS_interface = "eth0"
-    shell_output = subprocess.check_output(['brctl', 'show', 'juju-br0'])
-    output = re.split(' |\n|\t', shell_output)
-    if output[10] == '':
-        return AWS_interface
-    else:
-        return default_interface
+    time.sleep(1)
+
+
+def interface_exists(interface):
+    '''
+    Checks if interface exists on node.
+    '''
+    try:
+        subprocess.check_call(['ip', 'link', 'show', interface],
+                              stdout=open(os.devnull, 'w'),
+                              stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError:
+        return False
+    return True
+
+
+def get_mgmt_interface():
+    '''
+    Returns the managment interface.
+    '''
+    mgmt_interface = config('mgmt-interface')
+    if interface_exists(mgmt_interface):
+        return mgmt_interface
+    else:
+        log('Provided managment interface %s does not exist'
+            % mgmt_interface)
+        return get_iface_from_addr(unit_get('private-address'))
+
+
+def fabric_interface_changed():
+    '''
+    Returns true if interface for node changed.
+    '''
+    fabric_interface = get_fabric_interface()
+    try:
+        with open(PG_IFCS_CONF, 'r') as ifcs:
+            for line in ifcs:
+                if 'fabric_core' in line:
+                    if line.split()[0] == fabric_interface:
+                        return False
+    except IOError:
+        return True
+    return True
+
+
+def get_fabric_interface():
+    '''
+    Returns the fabric interface.
+    '''
+    fabric_interfaces = config('fabric-interfaces')
+    if fabric_interfaces == 'MANAGEMENT':
+        return get_mgmt_interface()
+    else:
+        try:
+            all_fabric_interfaces = json.loads(fabric_interfaces)
+        except ValueError:
+            raise ValueError('Invalid json provided for fabric interfaces')
+        hostname = get_unit_hostname()
+        if hostname in all_fabric_interfaces:
+            node_fabric_interface = all_fabric_interfaces[hostname]
+        elif 'DEFAULT' in all_fabric_interfaces:
+            node_fabric_interface = all_fabric_interfaces['DEFAULT']
+        else:
+            raise ValueError('No fabric interface provided for node')
+        if interface_exists(node_fabric_interface):
+            if is_address_in_network(config('os-data-network'),
+                                     get_iface_addr(node_fabric_interface)[0]):
+                return node_fabric_interface
+            else:
+                raise ValueError('Fabric interface not in fabric network')
+        else:
+            log('Provided fabric interface %s does not exist'
+                % node_fabric_interface)
+            raise ValueError('Provided fabric interface does not exist')
+        return node_fabric_interface
 
 
 def ensure_mtu():
     '''
     Ensures required MTU of the underlying networking of the node.
     '''
-    log("Changing MTU of juju-br0 and all attached interfaces")
     interface_mtu = config('network-device-mtu')
-    interface_type = check_interface_type()
-    if interface_type == "juju-br0":
-        cmd = subprocess.check_output(["brctl", "show", interface_type])
-        words = cmd.split()
-        for word in words:
-            if 'eth' in word:
-                set_nic_mtu(word, interface_mtu)
-    set_nic_mtu(interface_type, interface_mtu)
+    fabric_interface = get_fabric_interface()
+    if fabric_interface in get_bridges():
+        attached_interfaces = get_bridge_nics(fabric_interface)
+        for interface in attached_interfaces:
+            set_nic_mtu(interface, interface_mtu)
+    set_nic_mtu(fabric_interface, interface_mtu)
 
 
 def _exec_cmd(cmd=None, error_msg='Command exited with ERRORs', fatal=False):
@@ -229,6 +315,8 @@
         log('PLUMgrid License Key not specified')
         return 0
     PG_VIP = config('plumgrid-virtual-ip')
+    if not is_ip(PG_VIP):
+        raise ValueError('Invalid IP Provided')
     LICENSE_POST_PATH = 'https://%s/0/tenant_manager/license_key' % PG_VIP
     LICENSE_GET_PATH = 'https://%s/0/tenant_manager/licenses' % PG_VIP
     PG_CURL = '%s/opt/pg/scripts/pg_curl.sh' % PG_LXC_PATH
@@ -239,8 +327,7 @@
         'plumgrid:plumgrid',
         LICENSE_POST_PATH,
         '-d',
-        json.dumps(license)
-        ]
+        json.dumps(license)]
     licence_get_cmd = [PG_CURL, '-u', 'plumgrid:plumgrid', LICENSE_GET_PATH]
     try:
         old_license = subprocess.check_output(licence_get_cmd)

=== modified file 'templates/kilo/ifcs.conf'
--- templates/kilo/ifcs.conf	2015-07-29 18:11:14 +0000
+++ templates/kilo/ifcs.conf	2016-03-03 21:07:28 +0000
@@ -1,2 +1,2 @@
-{{ interface }} = fabric_core host
+{{ fabric_interface }} = fabric_core host
 

=== modified file 'templates/kilo/nginx.conf'
--- templates/kilo/nginx.conf	2015-08-10 10:06:33 +0000
+++ templates/kilo/nginx.conf	2016-03-03 21:07:28 +0000
@@ -12,6 +12,10 @@
   server {{ virtual_ip }}:3000;
 }
 
+upstream pgMW {
+  server 127.0.0.1:4000;
+}
+
 map $http_upgrade $connection_upgrade {
   default upgrade;
   '' close;
@@ -58,6 +62,19 @@
     proxy_set_header Host $host;
   }
 
+  location /mwv0 {
+    proxy_pass http://pgMW;
+    proxy_redirect off;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+  }
+
+  location /cloudApex/ {
+    index index.html;
+  }
+
   location /vtap/ {
     alias /opt/pg/vtap;
   }

=== added file 'tests/files/plumgrid-director-dense.yaml'
--- tests/files/plumgrid-director-dense.yaml	1970-01-01 00:00:00 +0000
+++ tests/files/plumgrid-director-dense.yaml	2016-03-03 21:07:28 +0000
@@ -0,0 +1,133 @@
+test:
+  series: 'trusty'
+  relations:
+  - - mysql
+    - keystone
+  - - nova-cloud-controller
+    - mysql
+  - - nova-cloud-controller
+    - rabbitmq-server
+  - - nova-cloud-controller
+    - glance
+  - - nova-cloud-controller
+    - keystone
+  - - nova-compute
+    - nova-cloud-controller
+  - - nova-compute
+    - mysql
+  - - nova-compute
+    - rabbitmq-server
+  - - nova-compute
+    - glance
+  - - glance
+    - mysql
+  - - glance
+    - keystone
+  - - glance
+    - cinder
+  - - mysql
+    - cinder
+  - - cinder
+    - rabbitmq-server
+  - - cinder
+    - nova-cloud-controller
+  - - cinder
+    - keystone
+  - - openstack-dashboard
+    - keystone
+  - - neutron-api
+    - mysql
+  - - neutron-api
+    - keystone
+  - - neutron-api
+    - rabbitmq-server
+  - - neutron-api
+    - nova-cloud-controller
+  - - neutron-api
+    - neutron-api-plumgrid
+  - - neutron-api-plumgrid
+    - plumgrid-edge
+  - - plumgrid-director
+    - plumgrid-edge
+  - - nova-compute
+    - plumgrid-edge
+  - - plumgrid-director
+    - plumgrid-gateway
+  services:
+    mysql:
+      charm: cs:trusty/mysql
+      num_units: 1
+      to: 'lxc:plumgrid-director=0'
+    rabbitmq-server:
+      charm: cs:trusty/rabbitmq-server
+      num_units: 1
+      to: 'lxc:plumgrid-director=0'
+    keystone:
+      charm: cs:trusty/keystone
+      num_units: 1
+      options:
+        admin-password: plumgrid
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    nova-cloud-controller:
+      charm: cs:trusty/nova-cloud-controller
+      num_units: 1
+      options:
+        console-access-protocol: novnc
+        network-manager: Neutron
+        openstack-origin: cloud:trusty-kilo
+        quantum-security-groups: 'yes'
+      to: 'lxc:plumgrid-director=0'
+    glance:
+      charm: cs:trusty/glance
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    openstack-dashboard:
+      charm: cs:trusty/openstack-dashboard
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    cinder:
+      charm: cs:trusty/cinder
+      num_units: 1
+      options:
+        openstack-origin: cloud:trusty-kilo
+      to: 'lxc:plumgrid-director=0'
+    neutron-api:
+      charm: cs:~plumgrid-team/trusty/neutron-api
+      num_units: 1
+      options:
+        neutron-plugin: plumgrid
+        neutron-security-groups: false
+        openstack-origin: cloud:trusty-kilo
+        plumgrid-password: plumgrid
+        plumgrid-username: plumgrid
+        plumgrid-virtual-ip: 192.168.100.250
+      to: 'lxc:plumgrid-director=0'
+    neutron-api-plumgrid:
+      charm: cs:~plumgrid-team/trusty/neutron-api-plumgrid
+      options:
+        enable-metadata: True
+    plumgrid-director:
+      charm: cs:~plumgrid-team/trusty/plumgrid-director
+      num_units: 1
+      constraints: "root-disk=30G mem=8G cpu-cores=8"
+      options:
+        plumgrid-virtual-ip: 192.168.100.250
+    nova-compute:
+      charm: cs:~plumgrid-team/trusty/nova-compute
+      num_units: 1
+      options:
+        enable-live-migration: true
+        enable-resize: true
+        migration-auth-type: ssh
+        openstack-origin: cloud:trusty-kilo
+      to: '0'
+    plumgrid-edge:
+      charm: cs:~plumgrid-team/trusty/plumgrid-edge
+    plumgrid-gateway:
+      charm: cs:~plumgrid-team/trusty/plumgrid-gateway
+      num_units: 1

=== removed file 'tests/files/plumgrid-director-dense.yaml'
--- tests/files/plumgrid-director-dense.yaml	2015-09-01 17:31:26 +0000
+++ tests/files/plumgrid-director-dense.yaml	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-test:
-  series: 'trusty'
-  relations:
-  - - mysql
-    - keystone
-  - - nova-cloud-controller
-    - mysql
-  - - nova-cloud-controller
-    - rabbitmq-server
-  - - nova-cloud-controller
-    - glance
-  - - nova-cloud-controller
-    - keystone
-  - - nova-compute
-    - nova-cloud-controller
-  - - nova-compute
-    - mysql
-  - - nova-compute
-    - rabbitmq-server
-  - - nova-compute
-    - glance
-  - - glance
-    - mysql
-  - - glance
-    - keystone
-  - - glance
-    - cinder
-  - - mysql
-    - cinder
-  - - cinder
-    - rabbitmq-server
-  - - cinder
-    - nova-cloud-controller
-  - - cinder
-    - keystone
-  - - openstack-dashboard
-    - keystone
-  - - neutron-api
-    - mysql
-  - - neutron-api
-    - keystone
-  - - neutron-api
-    - rabbitmq-server
-  - - neutron-api
-    - nova-cloud-controller
-  - - neutron-api
-    - neutron-api-plumgrid
-  - - neutron-api-plumgrid
-    - plumgrid-edge
-  - - plumgrid-director
-    - plumgrid-edge
-  - - nova-compute
-    - plumgrid-edge
-  - - plumgrid-director
-    - plumgrid-gateway
-  services:
-    mysql:
-      charm: cs:trusty/mysql
-      num_units: 1
-      to: 'lxc:plumgrid-director=0'
-    rabbitmq-server:
-      charm: cs:trusty/rabbitmq-server
-      num_units: 1
-      to: 'lxc:plumgrid-director=0'
-    keystone:
-      charm: cs:trusty/keystone
-      num_units: 1
-      options:
-        admin-password: plumgrid
-        openstack-origin: cloud:trusty-kilo
-      to: 'lxc:plumgrid-director=0'
-    nova-cloud-controller:
-      charm: cs:trusty/nova-cloud-controller
-      num_units: 1
-      options:
-        console-access-protocol: novnc
-        network-manager: Neutron
-        openstack-origin: cloud:trusty-kilo
-        quantum-security-groups: 'yes'
-      to: 'lxc:plumgrid-director=0'
-    glance:
-      charm: cs:trusty/glance
-      num_units: 1
-      options:
-        openstack-origin: cloud:trusty-kilo
-      to: 'lxc:plumgrid-director=0'
-    openstack-dashboard:
-      charm: cs:trusty/openstack-dashboard
-      num_units: 1
-      options:
-        openstack-origin: cloud:trusty-kilo
-      to: 'lxc:plumgrid-director=0'
-    cinder:
-      charm: cs:trusty/cinder
-      num_units: 1
-      options:
-        openstack-origin: cloud:trusty-kilo
-      to: 'lxc:plumgrid-director=0'
-    neutron-api:
-      charm: cs:~plumgrid-team/trusty/neutron-api
-      num_units: 1
-      options:
-        neutron-plugin: plumgrid
-        neutron-security-groups: false
-        openstack-origin: cloud:trusty-kilo
-        plumgrid-password: plumgrid
-        plumgrid-username: plumgrid
-        plumgrid-virtual-ip: 192.168.100.250
-      to: 'lxc:plumgrid-director=0'
-    neutron-api-plumgrid:
-      charm: cs:~plumgrid-team/trusty/neutron-api-plumgrid
-      options:
-        enable-metadata: True
-    plumgrid-director:
-      charm: cs:~plumgrid-team/trusty/plumgrid-director
-      num_units: 1
-      constraints: "root-disk=30G mem=8G cpu-cores=8"
-      options:
-        plumgrid-virtual-ip: 192.168.100.250
-    nova-compute:
-      charm: cs:~plumgrid-team/trusty/nova-compute
-      num_units: 1
-      options:
-        enable-live-migration: true
-        enable-resize: true
-        migration-auth-type: ssh
-        openstack-origin: cloud:trusty-kilo
-      to: '0'
-    plumgrid-edge:
-      charm: cs:~plumgrid-team/trusty/plumgrid-edge
-    plumgrid-gateway:
-      charm: cs:~plumgrid-team/trusty/plumgrid-gateway
-      num_units: 1

=== added file 'tests/test.yaml'
--- tests/test.yaml	1970-01-01 00:00:00 +0000
+++ tests/test.yaml	2016-03-03 21:07:28 +0000
@@ -0,0 +1,2 @@
+makefile:
+  - lint

=== removed file 'tests/test.yaml'
--- tests/test.yaml	2015-09-01 17:31:26 +0000
+++ tests/test.yaml	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-makefile:
-  - lint

=== modified file 'unit_tests/test_pg_dir_context.py'
--- unit_tests/test_pg_dir_context.py	2015-08-24 16:18:48 +0000
+++ unit_tests/test_pg_dir_context.py	2016-03-03 21:07:28 +0000
@@ -45,12 +45,13 @@
                   'neutron_plugin_attribute')
     @patch.object(charmhelpers.contrib.openstack.context, 'unit_private_ip')
     @patch.object(context, '_pg_dir_ips')
-    @patch.object(utils, 'check_interface_type')
-    def test_neutroncc_context_api_rel(self, _int_type, _pg_dir_ips,
-                                       _unit_priv_ip, _npa, _ens_pkgs,
-                                       _save_ff, _https, _is_clus,
-                                       _unit_get, _config, _runits, _rids,
-                                       _rget):
+    @patch.object(utils, 'get_mgmt_interface')
+    @patch.object(utils, 'get_fabric_interface')
+    def test_neutroncc_context_api_rel(self, _fabric_int, _mgmt_int,
+                                       _pg_dir_ips, _unit_priv_ip, _npa,
+                                       _ens_pkgs, _save_ff, _https,
+                                       _is_clus, _unit_get, _config,
+                                       _runits, _rids, _rget):
         def mock_npa(plugin, section, manager):
             if section == "driver":
                 return "neutron.randomdriver"
@@ -73,7 +74,8 @@
         self.get_unit_hostname.return_value = 'node0'
         self.get_host_ip.return_value = '192.168.100.201'
         _pg_dir_ips.return_value = ['192.168.100.202', '192.168.100.203']
-        _int_type.return_value = 'juju-br0'
+        _mgmt_int.return_value = 'juju-br0'
+        _fabric_int.return_value = 'juju-br0'
         napi_ctxt = context.PGDirContext()
         expect = {
             'config': 'neutron.randomconfig',
@@ -84,8 +86,9 @@
             'neutron_security_groups': None,
             'neutron_url': 'https://None:9696',
             'virtual_ip': '192.168.100.250',
-            'pg_hostname': 'pg-director',
+            'pg_hostname': 'node0',
             'interface': 'juju-br0',
+            'fabric_interface': 'juju-br0',
             'label': 'node0',
             'fabric_mode': 'host',
             'virtual_router_id': '250',

=== modified file 'unit_tests/test_pg_dir_hooks.py'
--- unit_tests/test_pg_dir_hooks.py	2015-08-24 16:18:48 +0000
+++ unit_tests/test_pg_dir_hooks.py	2016-03-03 21:07:28 +0000
@@ -1,5 +1,7 @@
 from mock import MagicMock, patch, call
+
 from test_utils import CharmTestCase
+
 with patch('charmhelpers.core.hookenv.config') as config:
     config.return_value = 'neutron'
     import pg_dir_utils as utils
@@ -58,25 +60,10 @@
         ])
         self.load_iovisor.assert_called_with()
         self.ensure_mtu.assert_called_with()
-        self.add_lcm_key.assert_called_with()
 
     def test_config_changed_hook(self):
-        _pkgs = ['plumgrid-lxc', 'iovisor-dkms']
-        self.add_lcm_key.return_value = 0
-        self.post_pg_license.return_value = 0
-        self.determine_packages.return_value = [_pkgs]
+        self.add_lcm_key.return_value = 1
         self._call_hook('config-changed')
-        self.stop_pg.assert_called_with()
-        self.configure_sources.assert_called_with(update=True)
-        self.apt_install.assert_has_calls([
-            call(_pkgs, fatal=True,
-                 options=['--force-yes']),
-        ])
-        self.load_iovisor.assert_called_with()
-        self.ensure_mtu.assert_called_with()
-
-        self.CONFIGS.write_all.assert_called_with()
-        self.restart_pg.assert_called_with()
 
     def test_start(self):
         self._call_hook('start')