x
/
charm-plumgrid-gateway
Code Issues Proposed changes

Merge: Adding fabric/data network support

This commit is contained in:
Bilal Baqar 2015-12-01 11:23:10 -08:00
parent 1891de34ce 242549117f
commit 4edf5861f4
7 changed files with 119 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config.yaml
View File

@ -13,10 +13,28 @@ options:
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 gateway 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'
description: The MTU size for interfaces managed by director.
description: The MTU size for interfaces managed by gateway.
install_sources:
default: 'ppa:plumgrid-team/stable'
type: string

7
hooks/pg_gw_context.py
View File

@ -71,8 +71,13 @@ class PGGwContext(context.NeutronContext):
pg_ctxt['local_ip'] = pg_dir_ips
unit_hostname = get_unit_hostname()
pg_ctxt['pg_hostname'] = unit_hostname
from pg_gw_utils import get_mgmt_interface, get_gw_interfaces
from pg_gw_utils import (
get_mgmt_interface,
get_gw_interfaces,
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'
pg_ctxt['ext_interfaces'] = get_gw_interfaces()

11
hooks/pg_gw_hooks.py
View File

@ -11,6 +11,7 @@ from charmhelpers.core.hookenv import (
Hooks,
UnregisteredHookError,
log,
config,
)
from charmhelpers.fetch import (
@ -29,6 +30,7 @@ from pg_gw_utils import (
remove_iovisor,
ensure_mtu,
add_lcm_key,
fabric_interface_changed
)
hooks = Hooks()
@ -73,6 +75,15 @@ def config_changed():
if add_lcm_key():
log("PLUMgrid LCM Key added")
return 1
charm_config = config()
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()

95
hooks/pg_gw_utils.py
View File

@ -13,6 +13,8 @@ from charmhelpers.contrib.network.ip import (
get_iface_from_addr,
get_bridges,
get_bridge_nics,
is_address_in_network,
get_iface_addr
)
from charmhelpers.core.host import (
write_file,
@ -170,22 +172,23 @@ def remove_iovisor():
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.
'''
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
mgmt_interface = config('mgmt-interface')
if interface_exists(mgmt_interface):
return mgmt_interface
@ -195,20 +198,74 @@ def get_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 get_gw_interfaces():
'''
Gateway node can have multiple interfaces. This function parses json
provided in config to get all gateway interfaces for this node.
'''
node_interfaces = ['eth1']
node_interfaces = []
try:
all_interfaces = json.loads(config('external-interfaces'))
except ValueError:
log("Invalid JSON")
return node_interfaces
raise ValueError("Invalid json provided for gateway interfaces")
hostname = get_unit_hostname()
if hostname in all_interfaces:
node_interfaces = all_interfaces[hostname].split(',')
elif 'DEFAULT' in all_interfaces:
node_interfaces = all_interfaces['DEFAULT'].split(',')
for interface in node_interfaces:
if not interface_exists(interface):
log('Provided gateway interface %s does not exist'
% interface)
raise ValueError('Provided gateway interface does not exist')
return node_interfaces
@ -217,12 +274,12 @@ def ensure_mtu():
Ensures required MTU of the underlying networking of the node.
'''
interface_mtu = config('network-device-mtu')
mgmt_interface = get_mgmt_interface()
if mgmt_interface in get_bridges():
attached_interfaces = get_bridge_nics(mgmt_interface)
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(mgmt_interface, interface_mtu)
set_nic_mtu(fabric_interface, interface_mtu)
def _exec_cmd(cmd=None, error_msg='Command exited with ERRORs', fatal=False):

2
templates/kilo/ifcs.conf
View File

@ -1,4 +1,4 @@
{{ interface }} = fabric_core host
{{ fabric_interface }} = fabric_core host
{% if ext_interfaces -%}
{% for ip in ext_interfaces -%}
{{ ip }} = access_phys

7
unit_tests/test_pg_gw_context.py
View File

@ -38,9 +38,10 @@ class PGGwContextTest(CharmTestCase):
@patch.object(charmhelpers.contrib.openstack.context,
'neutron_plugin_attribute')
@patch.object(utils, 'get_mgmt_interface')
@patch.object(utils, 'get_fabric_interface')
@patch.object(utils, 'get_gw_interfaces')
def test_neutroncc_context_api_rel(self, _gw_int, _mgmt_int,
_npa, _pg_dir_settings,
def test_neutroncc_context_api_rel(self, _gw_int, _fabric_int,
_mgmt_int, _npa, _pg_dir_settings,
_save_flag_file, _config_flag,
_unit_get, _unit_priv_ip, _config,
_is_clus, _https, _ens_pkgs):
@ -59,6 +60,7 @@ class PGGwContextTest(CharmTestCase):
_config_flag.return_value = False
_pg_dir_settings.return_value = {'pg_dir_ip': '192.168.100.201'}
_mgmt_int.return_value = 'juju-br0'
_fabric_int.return_value = 'juju-br0'
_gw_int.return_value = ['eth1']
napi_ctxt = context.PGGwContext()
expect = {
@ -72,6 +74,7 @@ class PGGwContextTest(CharmTestCase):
'neutron_url': 'https://192.168.100.201:9696',
'pg_hostname': 'node0',
'interface': 'juju-br0',
'fabric_interface': 'juju-br0',
'label': 'node0',
'fabric_mode': 'host',
'neutron_alchemy_flags': False,

15
unit_tests/test_pg_gw_hooks.py
View File

@ -69,21 +69,8 @@ class PGGwHooksTests(CharmTestCase):
self.restart_pg.assert_called_with()
def test_config_changed_hook(self):
_pkgs = ['plumgrid-lxc', 'iovisor-dkms']
self.add_lcm_key.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.ensure_files.assert_called_with()
self.CONFIGS.write_all.assert_called_with()
self.restart_pg.assert_called_with()
def test_stop(self):
_pkgs = ['plumgrid-lxc', 'iovisor-dkms']