starlingx
/
nfv
Code Issues Proposed changes

Merge "sw-deploy strategy for reboot-required patch-release(AIO-SX)"

This commit is contained in:
Zuul 2024-05-22 17:31:11 +00:00 committed by Gerrit Code Review
parent 053327fe8f 117e2faaa9
commit 57b6635fcc
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nfv/nfv-tests/nfv_unit_tests/tests/test_sw_deploy_strategy.py
View File

@ -231,7 +231,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -277,7 +277,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -324,7 +324,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -376,7 +376,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -424,7 +424,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -473,7 +473,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -1011,7 +1011,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -1076,7 +1076,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'Y',
'reboot_required': True,
},
None,
)
@ -1145,7 +1145,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -1219,7 +1219,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'Y',
'reboot_required': True,
},
None,
)
@ -1305,7 +1305,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'N',
'reboot_required': False,
},
None,
)
@ -1401,7 +1401,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'Y',
'reboot_required': True,
},
None,
)

2
nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py
View File

@ -80,7 +80,7 @@ class TestSwUpgradeStrategy(sw_update_testcase.SwUpdateStrategyTestCase):
release,
{
'state': 'available',
'reboot_required': 'Y',
'reboot_required': True,
},
None,
)

3
nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_upgrade.py
View File

@ -18,7 +18,6 @@ USM_DEPLOYING_START = 'deploying-start'
USM_REMOVING = 'removing'
USM_UNAVAILABLE = 'unavailable'
USM_UNKNOWN = 'n/a'
USM_REBOOT_REQUIRED = "Y"
class Upgrade(ObjectData):
@ -43,7 +42,7 @@ class Upgrade(ObjectData):
if not self.release_info:
return None
return self.release_info["reboot_required"] == USM_REBOOT_REQUIRED
return self.release_info["reboot_required"]
@property
def is_available(self):