Merge "SDK Refactor: Prepare ip availability commands"

2 files changed, 10 insertions, 3 deletions

diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py
index c18511f7..97d07076 100644
--- a/openstackclient/tests/unit/network/v2/fakes.py
+++ b/openstackclient/tests/unit/network/v2/fakes.py
@@ -194,15 +194,18 @@ class FakeIPAvailability(object):
     """Fake one or more network ip availabilities."""
 
     @staticmethod
-    def create_one_ip_availability():
+    def create_one_ip_availability(attrs=None):
         """Create a fake list with ip availability stats of a network.
 
+        :param Dictionary attrs:
+            A dictionary with all attributes
         :return:
             A FakeResource object with network_name, network_id, etc.
         """
+        attrs = attrs or {}
 
         # Set default attributes.
-        network_ip_availability = {
+        network_ip_attrs = {
             'network_id': 'network-id-' + uuid.uuid4().hex,
             'network_name': 'network-name-' + uuid.uuid4().hex,
             'tenant_id': '',
@@ -210,10 +213,13 @@ class FakeIPAvailability(object):
             'total_ips': 254,
             'used_ips': 6,
         }
+        network_ip_attrs.update(attrs)
 
         network_ip_availability = fakes.FakeResource(
-            info=copy.deepcopy(network_ip_availability),
+            info=copy.deepcopy(network_ip_attrs),
             loaded=True)
+        network_ip_availability.project_id = network_ip_attrs['tenant_id']
+
         return network_ip_availability
 
     @staticmethod
diff --git a/openstackclient/tests/unit/network/v2/test_ip_availability.py b/openstackclient/tests/unit/network/v2/test_ip_availability.py
index c929ab82..4bdbddc4 100644
--- a/openstackclient/tests/unit/network/v2/test_ip_availability.py
+++ b/openstackclient/tests/unit/network/v2/test_ip_availability.py
@@ -107,6 +107,7 @@ class TestListIPAvailability(TestIPAvailability):
 
         columns, data = self.cmd.take_action(parsed_args)
         filters = {'tenant_id': self.project.id,
+                   'project_id': self.project.id,
                    'ip_version': 4}
 
         self.network.network_ip_availabilities.assert_called_once_with(