From 75e4b0c27c948e176eb4f3dd4ef95d681011ee96 Mon Sep 17 00:00:00 2001 From: QingFeng Hao Date: Wed, 3 Jan 2024 10:13:54 +0800 Subject: [PATCH] Fix UT errors Signed-off-by: QingFeng Hao --- .../unit/sdkclientcases/test_restclient.py | 5 ++- .../tests/unit/sdkwsgi/handlers/test_guest.py | 37 ++++++++++++------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/zvmsdk/tests/unit/sdkclientcases/test_restclient.py b/zvmsdk/tests/unit/sdkclientcases/test_restclient.py index 1ed2f6baf..8c1a06dc5 100644 --- a/zvmsdk/tests/unit/sdkclientcases/test_restclient.py +++ b/zvmsdk/tests/unit/sdkclientcases/test_restclient.py @@ -1,7 +1,7 @@ # Copyright Contributors to the Feilong Project. # SPDX-License-Identifier: Apache-2.0 -# Copyright 2017, 2022 IBM Corp. +# Copyright 2017, 2024 IBM Corp. # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain @@ -652,8 +652,9 @@ def test_guest_create_network_interface(self, get_token, request): request.return_value = self.response get_token.return_value = self._tmp_token() + # **kwargs accepts the key=val arguments self.client.call("guest_create_network_interface", self.fake_userid, - 'rhel7.2', networks, active=False) + 'rhel7.2', networks, False) request.assert_called_with(method, full_uri, data=body, headers=header, verify=False) diff --git a/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py b/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py index 020105ce1..b7110008e 100644 --- a/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py +++ b/zvmsdk/tests/unit/sdkwsgi/handlers/test_guest.py @@ -799,7 +799,8 @@ def test_guest_create_network_interface(self, mock_interface, mock_userid): "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -832,7 +833,8 @@ def test_guest_create_network_interface_OSA(self, mock_interface, "cidr": "192.168.95.0/24", "nic_vdev": "1000", "mac_addr": "02:00:00:12:34:56", - "osa_device": "AABB"}]}}""" + "osa_device": "AABB"}], + "active": "True"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -843,7 +845,7 @@ def test_guest_create_network_interface_OSA(self, mock_interface, FAKE_USERID, os_version=os_version, guest_networks=guest_networks, - active=False) + active=True) @mock.patch.object(util, 'wsgi_path_item') @mock.patch('zvmconnector.connector.ZVMConnector.send_request') @@ -883,7 +885,8 @@ def test_guest_create_network_interface_with_correct_rhcos_version(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -915,7 +918,8 @@ def test_guest_create_network_interface_with_correct_rhcos_version_1(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -947,7 +951,8 @@ def test_guest_create_network_interface_with_correct_rhcos_version_2(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "True"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -958,7 +963,7 @@ def test_guest_create_network_interface_with_correct_rhcos_version_2(self, FAKE_USERID, os_version=os_version, guest_networks=guest_networks, - active=False) + active=True) @mock.patch.object(util, 'wsgi_path_item') @mock.patch('zvmconnector.connector.ZVMConnector.send_request') @@ -979,7 +984,8 @@ def test_guest_create_network_interface_with_correct_rhcos_version_3(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -1011,7 +1017,8 @@ def test_guest_create_network_interface_with_correct_rhcos_version_4(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -1036,7 +1043,8 @@ def test_guest_create_network_interface_with_wrong_rhcos_version(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -1057,7 +1065,8 @@ def test_guest_create_network_interface_with_wrong_rhcos_version_1(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -1078,7 +1087,8 @@ def test_guest_create_network_interface_with_wrong_rhcos_version_2(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = '' @@ -1099,7 +1109,8 @@ def test_guest_create_network_interface_with_wrong_rhcos_version_3(self, "gateway_addr": "192.168.95.1", "cidr": "192.168.95.0/24", "nic_vdev": "1000", - "mac_addr": "02:00:00:12:34:56"}]}}""" + "mac_addr": "02:00:00:12:34:56"}], + "active": "False"}}""" self.req.body = bstr mock_userid.return_value = FAKE_USERID mock_interface.return_value = ''