From f609876f2d733fa3f1379ca383b6b5fb13a1dd99 Mon Sep 17 00:00:00 2001
From: Romain Acciari <romain.acciari@gmail.com>
Date: Sun, 11 Mar 2018 21:28:14 +0100
Subject: [PATCH] create_subnet: Add filter on tenant_id if specified

Change-Id: I073b53c6bb34fa904e9595169b135fde7c393d0e
Task: 12102
Story: 2001744
---
 shade/openstackcloud.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py
index 8af68f801..5d0eb7636 100644
--- a/shade/openstackcloud.py
+++ b/shade/openstackcloud.py
@@ -7828,7 +7828,12 @@ class OpenStackCloud(
         :raises: OpenStackCloudException on operation error.
         """
 
-        network = self.get_network(network_name_or_id)
+        if tenant_id is not None:
+            filters = {'tenant_id': tenant_id}
+        else:
+            filters = None
+
+        network = self.get_network(network_name_or_id, filters)
         if not network:
             raise OpenStackCloudException(
                 "Network %s not found." % network_name_or_id)