From 0e42ea3ae325cf5b168bb966e62cd6b8e9ee0159 Mon Sep 17 00:00:00 2001
From: Reedip <reedip.banerjee@nectechnologies.in>
Date: Tue, 21 Mar 2017 08:05:54 +0000
Subject: Structure FindFloatingIP() to work without ip_cache

Currently we have an ip_cache returned from _find_floating_ip() which
is generally ignored as it is not always required.

This patch removes the need of ip_cache in _find_floating_ip().

Co-Authored-By: Sindhu Devale<sindhu.devale@intel.com>

Change-Id: I8b92271185f82f275fa73adad03e9dad70be70e4
---
 .../tests/unit/network/v2/test_floating_ip.py          | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'openstackclient/tests/unit/network')

diff --git a/openstackclient/tests/unit/network/v2/test_floating_ip.py b/openstackclient/tests/unit/network/v2/test_floating_ip.py
index e395300d..0b3fd888 100644
--- a/openstackclient/tests/unit/network/v2/test_floating_ip.py
+++ b/openstackclient/tests/unit/network/v2/test_floating_ip.py
@@ -218,8 +218,8 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
     )
     def test_floating_ip_delete(self, find_floating_ip_mock):
         find_floating_ip_mock.side_effect = [
-            (self.floating_ips[0], []),
-            (self.floating_ips[1], []),
+            self.floating_ips[0],
+            self.floating_ips[1],
         ]
         arglist = [
             self.floating_ips[0].id,
@@ -233,7 +233,6 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
 
         find_floating_ip_mock.assert_called_once_with(
             mock.ANY,
-            [],
             self.floating_ips[0].id,
             ignore_missing=False,
         )
@@ -246,8 +245,8 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
     )
     def test_floating_ip_delete_multi(self, find_floating_ip_mock):
         find_floating_ip_mock.side_effect = [
-            (self.floating_ips[0], []),
-            (self.floating_ips[1], []),
+            self.floating_ips[0],
+            self.floating_ips[1],
         ]
         arglist = []
         verifylist = []
@@ -264,13 +263,11 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
         calls = [
             call(
                 mock.ANY,
-                [],
                 self.floating_ips[0].id,
                 ignore_missing=False,
             ),
             call(
                 mock.ANY,
-                [],
                 self.floating_ips[1].id,
                 ignore_missing=False,
             ),
@@ -289,7 +286,7 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
     )
     def test_floating_ip_delete_multi_exception(self, find_floating_ip_mock):
         find_floating_ip_mock.side_effect = [
-            (self.floating_ips[0], []),
+            self.floating_ips[0],
             exceptions.CommandError,
         ]
         arglist = [
@@ -310,13 +307,11 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
 
         find_floating_ip_mock.assert_any_call(
             mock.ANY,
-            [],
             self.floating_ips[0].id,
             ignore_missing=False,
         )
         find_floating_ip_mock.assert_any_call(
             mock.ANY,
-            [],
             'unexist_floating_ip',
             ignore_missing=False,
         )
@@ -584,7 +579,7 @@ class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
         "floating_ip._find_floating_ip"
     )
     def test_floating_ip_show(self, find_floating_ip_mock):
-        find_floating_ip_mock.return_value = (self.floating_ip, [])
+        find_floating_ip_mock.return_value = self.floating_ip
         arglist = [
             self.floating_ip.id,
         ]
@@ -597,7 +592,6 @@ class TestShowFloatingIPNetwork(TestFloatingIPNetwork):
 
         find_floating_ip_mock.assert_called_once_with(
             mock.ANY,
-            [],
             self.floating_ip.id,
             ignore_missing=False,
         )
-- 
cgit v1.2.1