summaryrefslogtreecommitdiff
path: root/ironic/tests/unit/api/controllers/v1/test_portgroup.py
diff options
context:
space:
mode:
Diffstat (limited to 'ironic/tests/unit/api/controllers/v1/test_portgroup.py')
-rw-r--r--ironic/tests/unit/api/controllers/v1/test_portgroup.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/ironic/tests/unit/api/controllers/v1/test_portgroup.py b/ironic/tests/unit/api/controllers/v1/test_portgroup.py
index 8d66c414d..1f18564a0 100644
--- a/ironic/tests/unit/api/controllers/v1/test_portgroup.py
+++ b/ironic/tests/unit/api/controllers/v1/test_portgroup.py
@@ -26,16 +26,13 @@ from testtools.matchers import HasLength
from ironic.api.controllers import base as api_base
from ironic.api.controllers import v1 as api_v1
from ironic.api.controllers.v1 import notification_utils
-from ironic.api.controllers.v1 import portgroup as api_portgroup
from ironic.api.controllers.v1 import utils as api_utils
-from ironic.api import types as atypes
from ironic.common import exception
from ironic.common import states
from ironic.common import utils as common_utils
from ironic.conductor import rpcapi
from ironic import objects
from ironic.objects import fields as obj_fields
-from ironic.tests import base
from ironic.tests.unit.api import base as test_api_base
from ironic.tests.unit.api import utils as apiutils
from ironic.tests.unit.objects import utils as obj_utils
@@ -51,15 +48,6 @@ def _rpcapi_update_portgroup(self, context, portgroup, topic):
return portgroup
-class TestPortgroupObject(base.TestCase):
-
- def test_portgroup_init(self):
- portgroup_dict = apiutils.portgroup_post_data(node_id=None)
- del portgroup_dict['extra']
- portgroup = api_portgroup.Portgroup(**portgroup_dict)
- self.assertEqual(atypes.Unset, portgroup.extra)
-
-
class TestListPortgroups(test_api_base.BaseApiTest):
headers = {api_base.Version.string: str(api_v1.max_version())}
@@ -1007,6 +995,7 @@ class TestPatch(test_api_base.BaseApiTest):
self.assertFalse(mock_upd.called)
def test_update_portgroup_internal_info_not_allowed(self, mock_upd):
+ mock_upd.return_value = self.portgroup
response = self.patch_json('/portgroups/%s' % self.portgroup.uuid,
[{'path': '/internal_info',
'value': False,
@@ -1052,6 +1041,7 @@ class TestPatch(test_api_base.BaseApiTest):
[{'path': '/properties/abc', 'op': 'add', 'value': 123}], mock_upd)
def test_remove_mode_not_allowed(self, mock_upd):
+ mock_upd.return_value = self.portgroup
response = self.patch_json('/portgroups/%s' % self.portgroup.uuid,
[{'path': '/mode',
'op': 'remove'}],