Merge "fix functional tests for network agents"

3 files changed, 3 insertions, 7 deletions

diff --git a/openstackclient/network/v2/network_agent.py b/openstackclient/network/v2/network_agent.py
index b3411166..7d36e5e9 100644
--- a/openstackclient/network/v2/network_agent.py
+++ b/openstackclient/network/v2/network_agent.py
@@ -168,7 +168,7 @@ class SetNetworkAgent(command.Command):
 
     def take_action(self, parsed_args):
         client = self.app.client_manager.network
-        obj = client.get_agent(parsed_args.network_agent, ignore_missing=False)
+        obj = client.get_agent(parsed_args.network_agent)
         attrs = {}
         if parsed_args.description is not None:
             attrs['description'] = str(parsed_args.description)
@@ -193,7 +193,7 @@ class ShowNetworkAgent(command.ShowOne):
 
     def take_action(self, parsed_args):
         client = self.app.client_manager.network
-        obj = client.get_agent(parsed_args.network_agent, ignore_missing=False)
+        obj = client.get_agent(parsed_args.network_agent)
         columns = tuple(sorted(list(obj.keys())))
         data = utils.get_item_properties(obj, columns, formatters=_formatters,)
         return columns, data
diff --git a/openstackclient/tests/functional/network/v2/test_network_agent.py b/openstackclient/tests/functional/network/v2/test_network_agent.py
index e99dcef6..dd6112e7 100644
--- a/openstackclient/tests/functional/network/v2/test_network_agent.py
+++ b/openstackclient/tests/functional/network/v2/test_network_agent.py
@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
-
 from openstackclient.tests.functional import base
 
 
@@ -28,13 +26,11 @@ class NetworkAgentTests(base.TestCase):
         # get the list of network agent IDs.
         cls.IDs = raw_output.split('\n')
 
-    @testtools.skip('broken SDK testing')
     def test_network_agent_show(self):
         opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('network agent show ' + self.IDs[0] + opts)
         self.assertEqual(self.IDs[0] + "\n", raw_output)
 
-    @testtools.skip('broken SDK testing')
     def test_network_agent_set(self):
         opts = self.get_opts(['admin_state_up'])
         self.openstack('network agent set --disable ' + self.IDs[0])
diff --git a/openstackclient/tests/unit/network/v2/test_network_agent.py b/openstackclient/tests/unit/network/v2/test_network_agent.py
index 9fd395b4..9964f14d 100644
--- a/openstackclient/tests/unit/network/v2/test_network_agent.py
+++ b/openstackclient/tests/unit/network/v2/test_network_agent.py
@@ -324,6 +324,6 @@ class TestShowNetworkAgent(TestNetworkAgent):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.get_agent.assert_called_once_with(
-            self._network_agent.id, ignore_missing=False)
+            self._network_agent.id)
         self.assertEqual(self.columns, columns)
         self.assertEqual(list(self.data), list(data))