Merge lp:~gnuoy/charm-helpers/neutron-shuffle into lp:charm-helpers

[Liam Young]

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-03-18 11:50:24 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-03-24 14:04:19 +0000
@@ -47,6 +47,7 @@
 )
 
 from charmhelpers.core.sysctl import create as sysctl_create
+from charmhelpers.core.strutils import bool_from_string
 
 from charmhelpers.core.host import (
     list_nics,
@@ -67,6 +68,7 @@
 )
 from charmhelpers.contrib.openstack.neutron import (
     neutron_plugin_attribute,
+    parse_data_port_mappings,
 )
 from charmhelpers.contrib.openstack.ip import (
     resolve_address,
@@ -82,7 +84,6 @@
     is_bridge_member,
 )
 from charmhelpers.contrib.openstack.utils import get_host_ip
-
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
 ADDRESS_TYPES = ['admin', 'internal', 'public']
 
@@ -1162,3 +1163,145 @@
             sysctl_create(sysctl_dict,
                           '/etc/sysctl.d/50-{0}.conf'.format(charm_name()))
         return {'sysctl': sysctl_dict}
+
+
+class NeutronAPIContext(OSContextGenerator):
+    '''
+    Inspects current neutron-plugin-api relation for neutron settings. Return
+    defaults if it is not present.
+    '''
+    interfaces = ['neutron-plugin-api']
+
+    def __call__(self):
+        self.neutron_defaults = {
+            'l2_population': {
+                'rel_key': 'l2-population',
+                'default': False,
+            },
+            'overlay_network_type': {
+                'rel_key': 'overlay-network-type',
+                'default': 'gre',
+            },
+            'neutron_security_groups': {
+                'rel_key': 'neutron-security-groups',
+                'default': False,
+            },
+            'network_device_mtu': {
+                'rel_key': 'network-device-mtu',
+                'default': None,
+            },
+            'enable_dvr': {
+                'rel_key': 'enable-dvr',
+                'default': False,
+            },
+            'enable_l3ha': {
+                'rel_key': 'enable-l3ha',
+                'default': False,
+            },
+        }
+        ctxt = self.get_neutron_options({})
+        for rid in relation_ids('neutron-plugin-api'):
+            for unit in related_units(rid):
+                rdata = relation_get(rid=rid, unit=unit)
+                if 'l2-population' in rdata:
+                    ctxt.update(self.get_neutron_options(rdata))
+
+        return ctxt
+
+    def get_neutron_options(self, rdata):
+        settings = {}
+        for nkey in self.neutron_defaults.keys():
+            defv = self.neutron_defaults[nkey]['default']
+            rkey = self.neutron_defaults[nkey]['rel_key']
+            if rkey in rdata.keys():
+                if type(defv) is bool:
+                    settings[nkey] = bool_from_string(rdata[rkey])
+                else:
+                    settings[nkey] = rdata[rkey]
+            else:
+                settings[nkey] = defv
+        return settings
+
+
+class ExternalPortContext(NeutronPortContext):
+
+    def __call__(self):
+        ctxt = {}
+        ports = config('ext-port')
+        if ports:
+            ports = [p.strip() for p in ports.split()]
+            ports = self.resolve_ports(ports)
+            if ports:
+                ctxt = {"ext_port": ports[0]}
+                napi_settings = NeutronAPIContext()()
+                mtu = napi_settings.get('network_device_mtu')
+                if mtu:
+                    ctxt['ext_port_mtu'] = mtu
+
+        return ctxt
+
+
+class DataPortContext(NeutronPortContext):
+
+    def __call__(self):
+        ports = config('data-port')
+        if ports:
+            portmap = parse_data_port_mappings(ports)
+            ports = portmap.values()
+            resolved = self.resolve_ports(ports)
+            normalized = {get_nic_hwaddr(port): port for port in resolved
+                          if port not in ports}
+            normalized.update({port: port for port in resolved
+                               if port in ports})
+            if resolved:
+                return {bridge: normalized[port] for bridge, port in
+                        six.iteritems(portmap) if port in normalized.keys()}
+
+        return None
+
+
+class PhyNICMTUContext(DataPortContext):
+
+    def __call__(self):
+        ctxt = {}
+        mappings = super(PhyNICMTUContext, self).__call__()
+        if mappings and mappings.values():
+            ports = mappings.values()
+            napi_settings = NeutronAPIContext()()
+            mtu = napi_settings.get('network_device_mtu')
+            if mtu:
+                ctxt["devs"] = '\\n'.join(ports)
+                ctxt['mtu'] = mtu
+
+        return ctxt
+
+
+class NetworkServiceContext(OSContextGenerator):
+
+    def __init__(self, rel_name='quantum-network-service'):
+        self.rel_name = rel_name
+        self.interfaces = [rel_name]
+
+    def __call__(self):
+        for rid in relation_ids(self.rel_name):
+            for unit in related_units(rid):
+                rdata = relation_get(rid=rid, unit=unit)
+                ctxt = {
+                    'keystone_host': rdata.get('keystone_host'),
+                    'service_port': rdata.get('service_port'),
+                    'auth_port': rdata.get('auth_port'),
+                    'service_tenant': rdata.get('service_tenant'),
+                    'service_username': rdata.get('service_username'),
+                    'service_password': rdata.get('service_password'),
+                    'quantum_host': rdata.get('quantum_host'),
+                    'quantum_port': rdata.get('quantum_port'),
+                    'quantum_url': rdata.get('quantum_url'),
+                    'region': rdata.get('region'),
+                    'service_protocol':
+                    rdata.get('service_protocol') or 'http',
+                    'auth_protocol':
+                    rdata.get('auth_protocol') or 'http',
+                }
+                if context_complete(ctxt):
+                    return ctxt
+        return {}

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-03-18 11:50:24 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-03-24 14:04:19 +0000
@@ -274,6 +274,23 @@
     }
 }
 
+QUANTUM_NETWORK_SERVICE_RELATION = {
+    'quantum-network-service:0': {
+        'unit/0': {
+            'keystone_host': '10.5.0.1',
+            'service_port': '5000',
+            'auth_port': '20000',
+            'service_tenant': 'tenant',
+            'service_username': 'username',
+            'service_password': 'password',
+            'quantum_host': '10.5.0.2',
+            'quantum_port': '9696',
+            'quantum_url': 'http://10.5.0.2:9696/v2',
+            'region': 'aregion'
+        },
+    }
+}
+
 
 SUB_CONFIG = """
 nova:
@@ -355,6 +372,22 @@
     'os-public-network': "10.5.3.0/24"
 }
 
+MACHINE_MACS = {
+    'eth0': 'fe:c5:ce:8e:2b:00',
+    'eth1': 'fe:c5:ce:8e:2b:01',
+    'eth2': 'fe:c5:ce:8e:2b:02',
+    'eth3': 'fe:c5:ce:8e:2b:03',
+}
+
+MACHINE_NICS = {
+    'eth0': ['192.168.0.1'],
+    'eth1': ['192.168.0.2'],
+    'eth2': [],
+    'eth3': [],
+}
+
+ABSENT_MACS = "aa:a5:ae:ae:ab:a4 "
+
 # Imported in contexts.py and needs patching in setUp()
 TO_PATCH = [
     'b64decode',
@@ -2231,3 +2264,149 @@
         self.assertEqual(flags, {'user_tree_dn': ('ou=ABC General,'
                                                   'ou=User Accounts,'
                                                   'dc=example,dc=com')})
+
+    def _fake_get_hwaddr(self, arg):
+        return MACHINE_MACS[arg]
+
+    def _fake_get_ipv4(self, arg, fatal=False):
+        return MACHINE_NICS[arg]
+
+    @patch('charmhelpers.contrib.openstack.context.config')
+    def test_no_ext_port(self, mock_config):
+        self.config.side_effect = config = fake_config({})
+        mock_config.side_effect = config
+        self.assertEquals(context.ExternalPortContext()(), {})
+
+    @patch('charmhelpers.contrib.openstack.context.config')
+    def test_ext_port_eth(self, mock_config):
+        config = fake_config({'ext-port': 'eth1010'})
+        self.config.side_effect = config
+        mock_config.side_effect = config
+        self.assertEquals(context.ExternalPortContext()(),
+                          {'ext_port': 'eth1010'})
+
+    @patch('charmhelpers.contrib.openstack.context.get_nic_hwaddr')
+    @patch('charmhelpers.contrib.openstack.context.list_nics')
+    @patch('charmhelpers.contrib.openstack.context.get_ipv6_addr')
+    @patch('charmhelpers.contrib.openstack.context.get_ipv4_addr')
+    @patch('charmhelpers.contrib.openstack.context.config')
+    def test_ext_port_mac(self, mock_config, mock_get_ipv4_addr,
+                          mock_get_ipv6_addr, mock_list_nics,
+                          mock_get_nic_hwaddr):
+        config_macs = ABSENT_MACS + " " + MACHINE_MACS['eth2']
+        config = fake_config({'ext-port': config_macs})
+        self.config.side_effect = config
+        mock_config.side_effect = config
+
+        mock_get_ipv4_addr.side_effect = self._fake_get_ipv4
+        mock_get_ipv6_addr.return_value = []
+        mock_list_nics.return_value = MACHINE_MACS.keys()
+        mock_get_nic_hwaddr.side_effect = self._fake_get_hwaddr
+
+        self.assertEquals(context.ExternalPortContext()(),
+                          {'ext_port': 'eth2'})
+
+        config = fake_config({'ext-port': ABSENT_MACS})
+        self.config.side_effect = config
+        mock_config.side_effect = config
+
+        self.assertEquals(context.ExternalPortContext()(), {})
+
+    @patch('charmhelpers.contrib.openstack.context.get_nic_hwaddr')
+    @patch('charmhelpers.contrib.openstack.context.list_nics')
+    @patch('charmhelpers.contrib.openstack.context.get_ipv6_addr')
+    @patch('charmhelpers.contrib.openstack.context.get_ipv4_addr')
+    @patch('charmhelpers.contrib.openstack.context.config')
+    def test_ext_port_mac_one_used_nic(self, mock_config,
+                                       mock_get_ipv4_addr,
+                                       mock_get_ipv6_addr, mock_list_nics,
+                                       mock_get_nic_hwaddr):
+
+        self.relation_ids.return_value = ['neutron-plugin-api:1']
+        self.related_units.return_value = ['neutron-api/0']
+        self.relation_get.return_value = {'network-device-mtu': 1234,
+                                          'l2-population': 'False'}
+        config_macs = "%s %s" % (MACHINE_MACS['eth1'],
+                                 MACHINE_MACS['eth2'])
+
+        mock_get_ipv4_addr.side_effect = self._fake_get_ipv4
+        mock_get_ipv6_addr.return_value = []
+        mock_list_nics.return_value = MACHINE_MACS.keys()
+        mock_get_nic_hwaddr.side_effect = self._fake_get_hwaddr
+
+        config = fake_config({'ext-port': config_macs})
+        self.config.side_effect = config
+        mock_config.side_effect = config
+        self.assertEquals(context.ExternalPortContext()(),
+                          {'ext_port': 'eth2', 'ext_port_mtu': 1234})
+
+    @patch('charmhelpers.contrib.openstack.context.NeutronPortContext.'
+           'resolve_ports')
+    def test_data_port_eth(self, mock_resolve):
+        self.config.side_effect = fake_config({'data-port':
+                                               'phybr1:eth1010'})
+        mock_resolve.side_effect = lambda ports: ports
+        self.assertEquals(context.DataPortContext()(),
+                          {'phybr1': 'eth1010'})
+
+    def test_neutronapicontext_defaults(self):
+        self.relation_ids.return_value = []
+        expected_keys = [
+            'l2_population', 'enable_dvr', 'enable_l3ha',
+            'overlay_network_type', 'network_device_mtu'
+        ]
+        api_ctxt = context.NeutronAPIContext()()
+        for key in expected_keys:
+            self.assertTrue(key in api_ctxt)
+
+    def test_neutronapicontext_string_converted(self):
+        self.relation_ids.return_value = ['neutron-plugin-api:1']
+        self.related_units.return_value = ['neutron-api/0']
+        self.relation_get.return_value = {'l2-population': 'True'}
+        api_ctxt = context.NeutronAPIContext()()
+        self.assertEquals(api_ctxt['l2_population'], True)
+
+    def test_neutronapicontext_none(self):
+        self.relation_ids.return_value = ['neutron-plugin-api:1']
+        self.related_units.return_value = ['neutron-api/0']
+        self.relation_get.return_value = {'l2-population': 'True'}
+        api_ctxt = context.NeutronAPIContext()()
+        self.assertEquals(api_ctxt['network_device_mtu'], None)
+
+    def test_network_service_ctxt_no_units(self):
+        self.relation_ids.return_value = []
+        self.relation_ids.return_value = ['foo']
+        self.related_units.return_value = []
+        self.assertEquals(context.NetworkServiceContext()(), {})
+
+    @patch.object(context, 'context_complete')
+    def test_network_service_ctxt_no_data(self, mock_context_complete):
+        rel = FakeRelation(QUANTUM_NETWORK_SERVICE_RELATION)
+        self.relation_ids.side_effect = rel.relation_ids
+        self.related_units.side_effect = rel.relation_units
+        relation = FakeRelation(relation_data=QUANTUM_NETWORK_SERVICE_RELATION)
+        self.relation_get.side_effect = relation.get
+        mock_context_complete.return_value = False
+        self.assertEquals(context.NetworkServiceContext()(), {})
+
+    def test_network_service_ctxt_data(self):
+        data_result = {
+            'keystone_host': '10.5.0.1',
+            'service_port': '5000',
+            'auth_port': '20000',
+            'service_tenant': 'tenant',
+            'service_username': 'username',
+            'service_password': 'password',
+            'quantum_host': '10.5.0.2',
+            'quantum_port': '9696',
+            'quantum_url': 'http://10.5.0.2:9696/v2',
+            'region': 'aregion',
+            'service_protocol': 'http',
+            'auth_protocol': 'http',
+        }
+        rel = FakeRelation(QUANTUM_NETWORK_SERVICE_RELATION)
+        self.relation_ids.side_effect = rel.relation_ids
+        self.related_units.side_effect = rel.relation_units
+        relation = FakeRelation(relation_data=QUANTUM_NETWORK_SERVICE_RELATION)
+        self.relation_get.side_effect = relation.get
+        self.assertEquals(context.NetworkServiceContext()(), data_result)