Skip to content

Commit

Permalink
CASMCMS-9161: Changed BootSetStatus from Enum to IntEnum; restored in…
Browse files Browse the repository at this point in the history
…equality comparison of same in sessions controller
  • Loading branch information
mharding-hpe committed Oct 10, 2024
1 parent 8bd7e14 commit 60fc17b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [2.30.3] - 2024-10-10
### Changed
- Changed `BootSetStatus` type from Enum to IntEnum, to allow inequality comparisons
- Reverted change in `2.30.1` now that inequalities work as expected

### Fixed
- Fixed type hint for `validate_boot_sets` function

Expand Down
5 changes: 3 additions & 2 deletions src/bos/server/controllers/v2/boot_set/defs.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
# OTHER DEALINGS IN THE SOFTWARE.
#

from enum import Enum
from enum import IntEnum
import logging

LOGGER = logging.getLogger('bos.server.controllers.v2.boot_set')

class BootSetStatus(Enum):
# Use IntEnum to allow for inequalities
class BootSetStatus(IntEnum):
"""
In ascending order of error severity
"""
Expand Down
2 changes: 1 addition & 1 deletion src/bos/server/controllers/v2/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def post_v2_session(): # noqa: E501
# Validate health/validity of the sessiontemplate before creating a session
error_code, msg = validate_boot_sets(session_template, session_create.operation, template_name,
options_data=options_data)
if error_code == BootSetStatus.ERROR:
if error_code >= BootSetStatus.ERROR:
LOGGER.error("Session template fails check: %s", msg)
return msg, 400

Expand Down

0 comments on commit 60fc17b

Please sign in to comment.