diff --git a/neutron_vpnaas/services/vpn/service_drivers/base_ipsec.py b/neutron_vpnaas/services/vpn/service_drivers/base_ipsec.py index 90a40dbcf..6cb411658 100644 --- a/neutron_vpnaas/services/vpn/service_drivers/base_ipsec.py +++ b/neutron_vpnaas/services/vpn/service_drivers/base_ipsec.py @@ -169,6 +169,8 @@ class BaseIPsecVPNDriver(service_drivers.VpnDriver): also converting parameter name for vpn agent driver """ vpnservice_dict = dict(vpnservice) + # Populate tenant_id for RPC compat + vpnservice_dict['tenant_id'] = vpnservice_dict['project_id'] vpnservice_dict['ipsec_site_connections'] = [] if vpnservice.subnet: vpnservice_dict['subnet'] = dict(vpnservice.subnet) diff --git a/neutron_vpnaas/services/vpn/service_drivers/cisco_ipsec.py b/neutron_vpnaas/services/vpn/service_drivers/cisco_ipsec.py index 55dc62164..749029bc7 100644 --- a/neutron_vpnaas/services/vpn/service_drivers/cisco_ipsec.py +++ b/neutron_vpnaas/services/vpn/service_drivers/cisco_ipsec.py @@ -196,6 +196,8 @@ class CiscoCsrIPsecVPNDriver(base_ipsec.BaseIPsecVPNDriver): def make_vpnservice_dict(self, context, vpnservice, router_info): """Collect all service info, including Cisco info for IPSec conn.""" vpnservice_dict = dict(vpnservice) + # Populate tenant_id for RPC compat + vpnservice_dict['tenant_id'] = vpnservice_dict['project_id'] vpnservice_dict['ipsec_conns'] = [] vpnservice_dict['subnet'] = dict(vpnservice.subnet) vpnservice_dict['router_info'] = self._get_router_info(router_info) diff --git a/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py b/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py index 4473adf2f..7444b6243 100644 --- a/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py +++ b/neutron_vpnaas/tests/unit/services/vpn/service_drivers/test_ipsec.py @@ -166,7 +166,8 @@ class TestIPsecDriver(base.BaseTestCase): external_v4_ip=external_ip, external_v6_ip=None, subnet_id=subnet_id, - router_id='foo-router-id') + router_id='foo-router-id', + project_id='foo-project-id') if local_endpoints: fake_vpnservice.subnet = None else: @@ -207,6 +208,8 @@ class TestIPsecDriver(base.BaseTestCase): 'network_id': 'foo-net-id'}, 'subnet_id': 'foo-subnet-id', 'external_ip': external_ip, + 'project_id': 'foo-project-id', + 'tenant_id': 'foo-project-id', 'ipsec_site_connections': [ {'id': 'conn-id', 'peer_id': peer_id, @@ -246,6 +249,8 @@ class TestIPsecDriver(base.BaseTestCase): 'subnet': None, 'subnet_id': None, 'external_ip': external_ip, + 'project_id': 'foo-project-id', + 'tenant_id': 'foo-project-id', 'ipsec_site_connections': [ {'id': 'conn-id', 'peer_id': peer_id,