Merge "Specify tenant_id when retrieving LBaaS/VPNaaS resource" into stable/havana

9 files changed, 123 insertions, 79 deletions

diff --git a/openstack_dashboard/dashboards/project/firewalls/tests.py b/openstack_dashboard/dashboards/project/firewalls/tests.py
index 700500772..ecc462974 100644
--- a/openstack_dashboard/dashboards/project/firewalls/tests.py
+++ b/openstack_dashboard/dashboards/project/firewalls/tests.py
@@ -54,8 +54,7 @@ class FirewallTests(test.TestCase):
 
     def set_up_expect(self):
         # retrieve rules
-        rule1 = self.fw_rules.first()
-        tenant_id = rule1.tenant_id
+        tenant_id = self.tenant.id
 
         api.fwaas.rules_list(
             IsA(http.HttpRequest),
@@ -72,8 +71,7 @@ class FirewallTests(test.TestCase):
             IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(firewalls)
 
     def set_up_expect_with_exception(self):
-        rule1 = self.fw_rules.first()
-        tenant_id = rule1.tenant_id
+        tenant_id = self.tenant.id
 
         api.fwaas.rules_list(
             IsA(http.HttpRequest),
@@ -93,8 +91,7 @@ class FirewallTests(test.TestCase):
 
         self.mox.ReplayAll()
 
-        firewall = self.firewalls.first()
-        tenant_id = firewall.tenant_id
+        tenant_id = self.tenant.id
 
         res = self.client.get(self.INDEX_URL, tenant_id=tenant_id)
 
@@ -112,8 +109,7 @@ class FirewallTests(test.TestCase):
 
         self.mox.ReplayAll()
 
-        policy = self.fw_policies.first()
-        tenant_id = policy.tenant_id
+        tenant_id = self.tenant.id
 
         res = self.client.get(self.INDEX_URL + '?tab=fwtabs__policies',
                               tenant_id=tenant_id)
@@ -132,8 +128,7 @@ class FirewallTests(test.TestCase):
 
         self.mox.ReplayAll()
 
-        rule = self.fw_rules.first()
-        tenant_id = rule.tenant_id
+        tenant_id = self.tenant.id
 
         res = self.client.get(self.INDEX_URL + '?tab=fwtabs__rules',
                               tenant_id=tenant_id)
@@ -152,8 +147,7 @@ class FirewallTests(test.TestCase):
 
         self.mox.ReplayAll()
 
-        firewall = self.firewalls.first()
-        tenant_id = firewall.tenant_id
+        tenant_id = self.tenant.id
 
         res = self.client.get(self.INDEX_URL, tenant_id=tenant_id)
 
@@ -172,8 +166,7 @@ class FirewallTests(test.TestCase):
 
         self.mox.ReplayAll()
 
-        policy = self.fw_policies.first()
-        tenant_id = policy.tenant_id
+        tenant_id = self.tenant.id
 
         res = self.client.get(self.INDEX_URL + '?tab=fwtabs__policies',
                               tenant_id=tenant_id)
@@ -193,8 +186,7 @@ class FirewallTests(test.TestCase):
 
         self.mox.ReplayAll()
 
-        rule = self.fw_rules.first()
-        tenant_id = rule.tenant_id
+        tenant_id = self.tenant.id
 
         res = self.client.get(self.INDEX_URL + '?tab=fwtabs__rules',
                               tenant_id=tenant_id)
@@ -257,7 +249,7 @@ class FirewallTests(test.TestCase):
     def test_add_policy_post(self):
         policy = self.fw_policies.first()
         rules = self.fw_rules.list()
-        tenant_id = policy.tenant_id
+        tenant_id = self.tenant.id
         form_data = {'name': policy.name,
                      'description': policy.description,
                      'firewall_rules': policy.firewall_rules,
@@ -295,7 +287,7 @@ class FirewallTests(test.TestCase):
     def test_add_policy_post_with_error(self):
         policy = self.fw_policies.first()
         rules = self.fw_rules.list()
-        tenant_id = policy.tenant_id
+        tenant_id = self.tenant.id
         form_data = {'description': policy.description,
                      'firewall_rules': None,
                      'shared': policy.shared,
@@ -314,7 +306,7 @@ class FirewallTests(test.TestCase):
     def test_add_firewall_post(self):
         firewall = self.firewalls.first()
         policies = self.fw_policies.list()
-        tenant_id = firewall.tenant_id
+        tenant_id = self.tenant.id
         form_data = {'name': firewall.name,
                      'description': firewall.description,
                      'firewall_policy_id': firewall.firewall_policy_id,
@@ -337,7 +329,7 @@ class FirewallTests(test.TestCase):
     def test_add_firewall_post_with_error(self):
         firewall = self.firewalls.first()
         policies = self.fw_policies.list()
-        tenant_id = firewall.tenant_id
+        tenant_id = self.tenant.id
         form_data = {'name': firewall.name,
                      'description': firewall.description,
                      'firewall_policy_id': None,
@@ -435,7 +427,7 @@ class FirewallTests(test.TestCase):
                                     'firewall_update')})
     def test_update_firewall_post(self):
         firewall = self.firewalls.first()
-        tenant_id = firewall.tenant_id
+        tenant_id = self.tenant.id
         api.fwaas.firewall_get(IsA(http.HttpRequest),
                                firewall.id).AndReturn(firewall)
 
@@ -468,7 +460,7 @@ class FirewallTests(test.TestCase):
                                     'rules_list', 'rule_get')})
     def test_policy_insert_rule(self):
         policy = self.fw_policies.first()
-        tenant_id = policy.tenant_id
+        tenant_id = self.tenant.id
         rules = self.fw_rules.list()
 
         new_rule_id = rules[2].id
@@ -503,7 +495,7 @@ class FirewallTests(test.TestCase):
                                     'rules_list', 'rule_get')})
     def test_policy_remove_rule(self):
         policy = self.fw_policies.first()
-        tenant_id = policy.tenant_id
+        tenant_id = self.tenant.id
         rules = self.fw_rules.list()
 
         remove_rule_id = policy.firewall_rules[0]
diff --git a/openstack_dashboard/dashboards/project/loadbalancers/forms.py b/openstack_dashboard/dashboards/project/loadbalancers/forms.py
index 4ee7801bd..f3e517fa1 100644
--- a/openstack_dashboard/dashboards/project/loadbalancers/forms.py
+++ b/openstack_dashboard/dashboards/project/loadbalancers/forms.py
@@ -100,7 +100,8 @@ class UpdateVip(forms.SelfHandlingForm):
 
         pool_id_choices = []
         try:
-            pools = api.lbaas.pools_get(request)
+            tenant_id = request.user.tenant_id
+            pools = api.lbaas.pools_get(request, tenant_id=tenant_id)
         except Exception:
             pools = []
             exceptions.handle(request,
@@ -179,7 +180,8 @@ class UpdateMember(forms.SelfHandlingForm):
 
         pool_id_choices = []
         try:
-            pools = api.lbaas.pools_get(request)
+            tenant_id = request.user.tenant_id
+            pools = api.lbaas.pools_get(request, tenant_id=tenant_id)
         except Exception:
             pools = []
             exceptions.handle(request,
diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tables.py b/openstack_dashboard/dashboards/project/loadbalancers/tables.py
index e08438546..734498d97 100644
--- a/openstack_dashboard/dashboards/project/loadbalancers/tables.py
+++ b/openstack_dashboard/dashboards/project/loadbalancers/tables.py
@@ -162,7 +162,9 @@ class AddPMAssociationLink(tables.LinkAction):
 
     def allowed(self, request, datum=None):
         try:
-            monitors = api.lbaas.pool_health_monitors_get(request)
+            tenant_id = request.user.tenant_id
+            monitors = api.lbaas.pool_health_monitors_get(request,
+                                                          tenant_id=tenant_id)
             for m in monitors:
                 if m.id not in datum['health_monitors']:
                     return True
diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tabs.py b/openstack_dashboard/dashboards/project/loadbalancers/tabs.py
index 200cd141c..ca610dc2b 100644
--- a/openstack_dashboard/dashboards/project/loadbalancers/tabs.py
+++ b/openstack_dashboard/dashboards/project/loadbalancers/tabs.py
@@ -33,7 +33,9 @@ class PoolsTab(tabs.TableTab):
 
     def get_poolstable_data(self):
         try:
-            pools = api.lbaas.pools_get(self.tab_group.request)
+            tenant_id = self.request.user.tenant_id
+            pools = api.lbaas.pools_get(self.tab_group.request,
+                                        tenant_id=tenant_id)
             poolsFormatted = [p.readable(self.tab_group.request) for
                               p in pools]
         except Exception:
@@ -51,7 +53,9 @@ class MembersTab(tabs.TableTab):
 
     def get_memberstable_data(self):
         try:
-            members = api.lbaas.members_get(self.tab_group.request)
+            tenant_id = self.request.user.tenant_id
+            members = api.lbaas.members_get(self.tab_group.request,
+                                            tenant_id=tenant_id)
             membersFormatted = [m.readable(self.tab_group.request) for
                                 m in members]
         except Exception:
@@ -69,8 +73,9 @@ class MonitorsTab(tabs.TableTab):
 
     def get_monitorstable_data(self):
         try:
+            tenant_id = self.request.user.tenant_id
             monitors = api.lbaas.pool_health_monitors_get(
-                self.tab_group.request)
+                self.tab_group.request, tenant_id=tenant_id)
         except Exception:
             monitors = []
             exceptions.handle(self.tab_group.request,
diff --git a/openstack_dashboard/dashboards/project/loadbalancers/tests.py b/openstack_dashboard/dashboards/project/loadbalancers/tests.py
index 810a72a3c..6167daee7 100644
--- a/openstack_dashboard/dashboards/project/loadbalancers/tests.py
+++ b/openstack_dashboard/dashboards/project/loadbalancers/tests.py
@@ -51,14 +51,16 @@ class LoadBalancerTests(test.TestCase):
         vip2 = self.vips.list()[1]
 
         api.lbaas.pools_get(
-            IsA(http.HttpRequest)).AndReturn(self.pools.list())
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
 
         api.lbaas.vip_get(IsA(http.HttpRequest), vip1.id).AndReturn(vip1)
         api.lbaas.vip_get(IsA(http.HttpRequest), vip2.id).AndReturn(vip2)
 
         # retrieves members
         api.lbaas.members_get(
-            IsA(http.HttpRequest)).AndReturn(self.members.list())
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.members.list())
 
         pool1 = self.pools.first()
         pool2 = self.pools.list()[1]
@@ -70,16 +72,19 @@ class LoadBalancerTests(test.TestCase):
 
         # retrieves monitors
         api.lbaas.pool_health_monitors_get(
-            IsA(http.HttpRequest)).MultipleTimes() \
+            IsA(http.HttpRequest), tenant_id=self.tenant.id).MultipleTimes() \
                 .AndReturn(self.monitors.list())
 
     def set_up_expect_with_exception(self):
         api.lbaas.pools_get(
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.neutron)
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndRaise(self.exceptions.neutron)
         api.lbaas.members_get(
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.neutron)
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndRaise(self.exceptions.neutron)
         api.lbaas.pool_health_monitors_get(
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.neutron)
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndRaise(self.exceptions.neutron)
 
     @test.create_stubs({api.lbaas: ('pools_get', 'vip_get',
                                     'members_get', 'pool_get',
@@ -193,7 +198,7 @@ class LoadBalancerTests(test.TestCase):
         api.neutron.is_extension_supported(
             IsA(http.HttpRequest), 'service-type').AndReturn(True)
         api.neutron.network_list_for_tenant(
-            IsA(http.HttpRequest), subnet.tenant_id).AndReturn(networks)
+            IsA(http.HttpRequest), self.tenant.id).AndReturn(networks)
         api.neutron.provider_list(IsA(http.HttpRequest)) \
             .AndReturn(self.providers.list())
 
@@ -248,7 +253,7 @@ class LoadBalancerTests(test.TestCase):
         api.neutron.is_extension_supported(
             IsA(http.HttpRequest), 'service-type').AndReturn(with_service_type)
         api.neutron.network_list_for_tenant(
-            IsA(http.HttpRequest), subnet.tenant_id).AndReturn(networks)
+            IsA(http.HttpRequest), self.tenant.id).AndReturn(networks)
         if with_service_type:
             prov_list = api.neutron.provider_list(IsA(http.HttpRequest))
             if with_provider_exception:
@@ -488,7 +493,8 @@ class LoadBalancerTests(test.TestCase):
         port1 = self.AttributeDict(
             {'fixed_ips': [{'ip_address': member.address}]})
 
-        api.lbaas.pools_get(IsA(http.HttpRequest)).AndReturn(self.pools.list())
+        api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
 
         api.nova.server_list(IsA(http.HttpRequest)).AndReturn(
             [[server1, server2], False])
@@ -534,7 +540,8 @@ class LoadBalancerTests(test.TestCase):
                                       '12381d38-c3eb-4fee-9763-12de3338043e',
                                       'name': 'vm2'})
 
-        api.lbaas.pools_get(IsA(http.HttpRequest)).AndReturn(self.pools.list())
+        api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
 
         api.nova.server_list(IsA(http.HttpRequest)).AndReturn([[server1,
                                                                 server2],
@@ -564,7 +571,8 @@ class LoadBalancerTests(test.TestCase):
                                       '12381d38-c3eb-4fee-9763-12de3338043e',
                                       'name': 'vm2'})
 
-        api.lbaas.pools_get(IsA(http.HttpRequest)).AndReturn(self.pools.list())
+        api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
         api.nova.server_list(
             IsA(http.HttpRequest)).AndReturn([[server1, server2], False])
 
@@ -621,7 +629,8 @@ class LoadBalancerTests(test.TestCase):
     def test_update_vip_post(self):
         vip = self.vips.first()
 
-        api.lbaas.pools_get(IsA(http.HttpRequest)).AndReturn(self.pools.list())
+        api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
         api.lbaas.vip_get(IsA(http.HttpRequest), vip.id).AndReturn(vip)
 
         data = {'name': vip.name,
@@ -649,7 +658,8 @@ class LoadBalancerTests(test.TestCase):
     def test_update_vip_get(self):
         vip = self.vips.first()
 
-        api.lbaas.pools_get(IsA(http.HttpRequest)).AndReturn(self.pools.list())
+        api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
         api.lbaas.vip_get(IsA(http.HttpRequest), vip.id).AndReturn(vip)
 
         self.mox.ReplayAll()
@@ -663,7 +673,8 @@ class LoadBalancerTests(test.TestCase):
     def test_update_member_post(self):
         member = self.members.first()
 
-        api.lbaas.pools_get(IsA(http.HttpRequest)).AndReturn(self.pools.list())
+        api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
         api.lbaas.member_get(IsA(http.HttpRequest), member.id)\
             .AndReturn(member)
 
@@ -689,7 +700,8 @@ class LoadBalancerTests(test.TestCase):
     def test_update_member_get(self):
         member = self.members.first()
 
-        api.lbaas.pools_get(IsA(http.HttpRequest)).AndReturn(self.pools.list())
+        api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.pools.list())
         api.lbaas.member_get(IsA(http.HttpRequest), member.id)\
             .AndReturn(member)
 
@@ -751,7 +763,8 @@ class LoadBalancerTests(test.TestCase):
 
         api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool)
         api.lbaas.pool_health_monitors_get(
-            IsA(http.HttpRequest)).AndReturn(monitors)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(monitors)
 
         api.lbaas.pool_monitor_association_create(
             IsA(http.HttpRequest),
@@ -780,7 +793,8 @@ class LoadBalancerTests(test.TestCase):
 
         api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool)
         api.lbaas.pool_health_monitors_get(
-            IsA(http.HttpRequest)).AndReturn(monitors)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(monitors)
 
         self.mox.ReplayAll()
 
diff --git a/openstack_dashboard/dashboards/project/loadbalancers/workflows.py b/openstack_dashboard/dashboards/project/loadbalancers/workflows.py
index f1012d082..b5d26d076 100644
--- a/openstack_dashboard/dashboards/project/loadbalancers/workflows.py
+++ b/openstack_dashboard/dashboards/project/loadbalancers/workflows.py
@@ -307,7 +307,8 @@ class AddMemberAction(workflows.Action):
 
         pool_id_choices = [('', _("Select a Pool"))]
         try:
-            pools = api.lbaas.pools_get(request)
+            tenant_id = self.request.user.tenant_id
+            pools = api.lbaas.pools_get(request, tenant_id=tenant_id)
         except Exception:
             pools = []
             exceptions.handle(request,
@@ -553,7 +554,9 @@ class AddPMAssociationAction(workflows.Action, MonitorMixin):
 
         monitor_id_choices = [('', _("Select a Monitor"))]
         try:
-            monitors = api.lbaas.pool_health_monitors_get(request)
+            tenant_id = self.request.user.tenant_id
+            monitors = api.lbaas.pool_health_monitors_get(request,
+                                                          tenant_id=tenant_id)
             for m in monitors:
                 if m.id not in context['pool_monitors']:
                     display_name = self._get_monitor_display_name(m)
diff --git a/openstack_dashboard/dashboards/project/vpn/tabs.py b/openstack_dashboard/dashboards/project/vpn/tabs.py
index 66e278adc..ea8784a62 100644
--- a/openstack_dashboard/dashboards/project/vpn/tabs.py
+++ b/openstack_dashboard/dashboards/project/vpn/tabs.py
@@ -57,8 +57,9 @@ class IPSecSiteConnectionsTab(tabs.TableTab):
 
     def get_ipsecsiteconnectionstable_data(self):
         try:
+            tenant_id = self.request.user.tenant_id
             ipsecsiteconnections = api.vpn.ipsecsiteconnections_get(
-                self.tab_group.request)
+                self.tab_group.request, tenant_id=tenant_id)
             ipsecsiteconnectionsFormatted = [s.readable(self.tab_group.request)
                 for s in ipsecsiteconnections]
         except Exception:
@@ -76,8 +77,9 @@ class VPNServicesTab(tabs.TableTab):
 
     def get_vpnservicestable_data(self):
         try:
+            tenant_id = self.request.user.tenant_id
             vpnservices = api.vpn.vpnservices_get(
-                self.tab_group.request)
+                self.tab_group.request, tenant_id=tenant_id)
             vpnservicesFormatted = [s.readable(self.tab_group.request) for
                               s in vpnservices]
         except Exception:
@@ -95,8 +97,9 @@ class IKEPoliciesTab(tabs.TableTab):
 
     def get_ikepoliciestable_data(self):
         try:
+            tenant_id = self.request.user.tenant_id
             ikepolicies = api.vpn.ikepolicies_get(
-                self.tab_group.request)
+                self.tab_group.request, tenant_id=tenant_id)
         except Exception:
             ikepolicies = []
             exceptions.handle(self.tab_group.request,
@@ -112,8 +115,9 @@ class IPSecPoliciesTab(tabs.TableTab):
 
     def get_ipsecpoliciestable_data(self):
         try:
+            tenant_id = self.request.user.tenant_id
             ipsecpolicies = api.vpn.ipsecpolicies_get(
-                self.tab_group.request)
+                self.tab_group.request, tenant_id=tenant_id)
         except Exception:
             ipsecpolicies = []
             exceptions.handle(self.tab_group.request,
diff --git a/openstack_dashboard/dashboards/project/vpn/tests.py b/openstack_dashboard/dashboards/project/vpn/tests.py
index 0e5a3ed89..348d19bd2 100644
--- a/openstack_dashboard/dashboards/project/vpn/tests.py
+++ b/openstack_dashboard/dashboards/project/vpn/tests.py
@@ -57,7 +57,8 @@ class VPNTests(test.TestCase):
         vpnservice1, vpnservice2 = self.vpnservices.list()[:2]
 
         api.vpn.vpnservices_get(
-            IsA(http.HttpRequest)).AndReturn(self.vpnservices.list())
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.vpnservices.list())
 
         api.vpn.vpnservice_get(
             IsA(http.HttpRequest), vpnservice1.id).AndReturn(vpnservice1)
@@ -66,7 +67,8 @@ class VPNTests(test.TestCase):
 
         # retrieves ikepolicies
         api.vpn.ikepolicies_get(
-            IsA(http.HttpRequest)).AndReturn(self.ikepolicies.list())
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.ikepolicies.list())
 
         ikepolicy1, ikepolicy2 = self.ikepolicies.list()[:2]
 
@@ -77,7 +79,8 @@ class VPNTests(test.TestCase):
 
         # retrieves ipsecpolicies
         api.vpn.ipsecpolicies_get(
-            IsA(http.HttpRequest)).AndReturn(self.ipsecpolicies.list())
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.ipsecpolicies.list())
 
         ipsecpolicy1, ipsecpolicy2 = self.ipsecpolicies.list()[:2]
 
@@ -88,17 +91,22 @@ class VPNTests(test.TestCase):
 
         # retrieves ipsecsiteconnections
         api.vpn.ipsecsiteconnections_get(
-            IsA(http.HttpRequest)).AndReturn(self.ipsecsiteconnections.list())
+            IsA(http.HttpRequest), tenant_id=self.tenant.id) \
+            .AndReturn(self.ipsecsiteconnections.list())
 
     def set_up_expect_with_exception(self):
         api.vpn.vpnservices_get(
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.neutron)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
         api.vpn.ikepolicies_get(
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.neutron)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
         api.vpn.ipsecpolicies_get(
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.neutron)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
         api.vpn.ipsecsiteconnections_get(
-            IsA(http.HttpRequest)).AndRaise(self.exceptions.neutron)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
 
     @test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get',
                                   'vpnservices_get',
@@ -247,12 +255,12 @@ class VPNTests(test.TestCase):
         networks = [{'subnets': [subnet, ]}, ]
 
         api.neutron.network_list_for_tenant(
-            IsA(http.HttpRequest), subnet.tenant_id).AndReturn(networks)
+            IsA(http.HttpRequest), self.tenant.id).AndReturn(networks)
 
         routers = self.routers.list()
 
         api.neutron.router_list(
-            IsA(http.HttpRequest)).AndReturn(routers)
+            IsA(http.HttpRequest), tenant_id=self.tenant.id).AndReturn(routers)
 
         self.mox.ReplayAll()
 
@@ -274,13 +282,13 @@ class VPNTests(test.TestCase):
         routers = self.routers.list()
 
         api.neutron.router_list(
-            IsA(http.HttpRequest)).AndReturn(routers)
+            IsA(http.HttpRequest), tenant_id=self.tenant.id).AndReturn(routers)
 
         subnet = self.subnets.first()
         networks = [{'subnets': [subnet, ]}, ]
 
         api.neutron.network_list_for_tenant(
-            IsA(http.HttpRequest), subnet.tenant_id).AndReturn(networks)
+            IsA(http.HttpRequest), self.tenant.id).AndReturn(networks)
 
         api.vpn.vpnservice_create(
             IsA(http.HttpRequest),
@@ -312,13 +320,13 @@ class VPNTests(test.TestCase):
         routers = self.routers.list()
 
         api.neutron.router_list(
-            IsA(http.HttpRequest)).AndReturn(routers)
+            IsA(http.HttpRequest), tenant_id=self.tenant.id).AndReturn(routers)
 
         subnet = self.subnets.first()
         networks = [{'subnets': [subnet, ]}, ]
 
         api.neutron.network_list_for_tenant(
-            IsA(http.HttpRequest), subnet.tenant_id).AndReturn(networks)
+            IsA(http.HttpRequest), self.tenant.id).AndReturn(networks)
 
         self.mox.ReplayAll()
 
@@ -468,17 +476,20 @@ class VPNTests(test.TestCase):
         ikepolicies = self.ikepolicies.list()
 
         api.vpn.ikepolicies_get(
-            IsA(http.HttpRequest)).AndReturn(ikepolicies)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(ikepolicies)
 
         ipsecpolicies = self.ipsecpolicies.list()
 
         api.vpn.ipsecpolicies_get(
-            IsA(http.HttpRequest)).AndReturn(ipsecpolicies)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(ipsecpolicies)
 
         vpnservices = self.vpnservices.list()
 
         api.vpn.vpnservices_get(
-            IsA(http.HttpRequest)).AndReturn(vpnservices)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(vpnservices)
 
         self.mox.ReplayAll()
 
@@ -503,17 +514,20 @@ class VPNTests(test.TestCase):
         ikepolicies = self.ikepolicies.list()
 
         api.vpn.ikepolicies_get(
-            IsA(http.HttpRequest)).AndReturn(ikepolicies)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(ikepolicies)
 
         ipsecpolicies = self.ipsecpolicies.list()
 
         api.vpn.ipsecpolicies_get(
-            IsA(http.HttpRequest)).AndReturn(ipsecpolicies)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(ipsecpolicies)
 
         vpnservices = self.vpnservices.list()
 
         api.vpn.vpnservices_get(
-            IsA(http.HttpRequest)).AndReturn(vpnservices)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(vpnservices)
 
         api.vpn.ipsecsiteconnection_create(
             IsA(http.HttpRequest),
@@ -566,17 +580,20 @@ class VPNTests(test.TestCase):
         ikepolicies = self.ikepolicies.list()
 
         api.vpn.ikepolicies_get(
-            IsA(http.HttpRequest)).AndReturn(ikepolicies)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(ikepolicies)
 
         ipsecpolicies = self.ipsecpolicies.list()
 
         api.vpn.ipsecpolicies_get(
-            IsA(http.HttpRequest)).AndReturn(ipsecpolicies)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(ipsecpolicies)
 
         vpnservices = self.vpnservices.list()
 
         api.vpn.vpnservices_get(
-            IsA(http.HttpRequest)).AndReturn(vpnservices)
+            IsA(http.HttpRequest),
+            tenant_id=self.tenant.id).AndReturn(vpnservices)
 
         self.mox.ReplayAll()
 
diff --git a/openstack_dashboard/dashboards/project/vpn/workflows.py b/openstack_dashboard/dashboards/project/vpn/workflows.py
index f0541a422..25550b319 100644
--- a/openstack_dashboard/dashboards/project/vpn/workflows.py
+++ b/openstack_dashboard/dashboards/project/vpn/workflows.py
@@ -57,7 +57,8 @@ class AddVPNServiceAction(workflows.Action):
     def populate_router_id_choices(self, request, context):
         router_id_choices = [('', _("Select a Router"))]
         try:
-            routers = api.neutron.router_list(request)
+            tenant_id = request.user.tenant_id
+            routers = api.neutron.router_list(request, tenant_id=tenant_id)
         except Exception:
             exceptions.handle(request,
                               _('Unable to retrieve routers list.'))
@@ -339,7 +340,8 @@ class AddIPSecSiteConnectionAction(workflows.Action):
     def populate_ikepolicy_id_choices(self, request, context):
         ikepolicy_id_choices = [('', _("Select IKE Policy"))]
         try:
-            ikepolicies = api.vpn.ikepolicies_get(request)
+            tenant_id = self.request.user.tenant_id
+            ikepolicies = api.vpn.ikepolicies_get(request, tenant_id=tenant_id)
         except Exception:
             exceptions.handle(request,
                               _('Unable to retrieve IKE Policies list.'))
@@ -352,7 +354,9 @@ class AddIPSecSiteConnectionAction(workflows.Action):
     def populate_ipsecpolicy_id_choices(self, request, context):
         ipsecpolicy_id_choices = [('', _("Select IPSec Policy"))]
         try:
-            ipsecpolicies = api.vpn.ipsecpolicies_get(request)
+            tenant_id = self.request.user.tenant_id
+            ipsecpolicies = api.vpn.ipsecpolicies_get(request,
+                                                      tenant_id=tenant_id)
         except Exception:
             exceptions.handle(request,
                               _('Unable to retrieve IPSec Policies list.'))
@@ -365,7 +369,8 @@ class AddIPSecSiteConnectionAction(workflows.Action):
     def populate_vpnservice_id_choices(self, request, context):
         vpnservice_id_choices = [('', _("Select VPN Service"))]
         try:
-            vpnservices = api.vpn.vpnservices_get(request)
+            tenant_id = self.request.user.tenant_id
+            vpnservices = api.vpn.vpnservices_get(request, tenant_id=tenant_id)
         except Exception:
             exceptions.handle(request,
                               _('Unable to retrieve VPN Services list.'))