starlingx/nfv
Code Issues Proposed changes

Remove kubernetes checks, wrs-headers from Rest API calls, and dead code.

Browse Source 
Story: 2002843
Task: 30434
Change-Id: Ia12bc3a302a45f7b12fd2d907e961c70d5713431
Signed-off-by: Kevin Smith <kevin.smith@windriver.com>
This commit is contained in:
Kevin Smith
2019-04-09 10:03:43 -04:00
parent c38bfbb4ab
commit ce40694481
17 changed files with 66 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py
View File

@@ -143,10 +143,15 @@ def fake_event_issue(a, b, c, d):
return None
def fake_nfvi_compute_plugin_disabled():
return False
@mock.patch('nfv_vim.objects._sw_update.SwUpdate.save', fake_save)
@mock.patch('nfv_vim.objects._sw_update.timers.timers_create_timer', fake_timer)
@mock.patch('nfv_vim.strategy._strategy.get_local_host_name', fake_host_name)
@mock.patch('nfv_vim.event_log._instance._event_issue', fake_event_issue)
@mock.patch('nfv_vim.nfvi.nfvi_compute_plugin_disabled', fake_nfvi_compute_plugin_disabled)
class TestSwPatchStrategy(testcase.NFVTestCase):
def setUp(self):
@@ -273,12 +278,15 @@ class TestSwPatchStrategy(testcase.NFVTestCase):
"""
personality = ''
openstack_compute = False
if host_name.startswith('controller'):
personality = HOST_PERSONALITY.CONTROLLER
if cpe:
personality = personality + ',' + HOST_PERSONALITY.WORKER
elif host_name.startswith('compute'):
personality = HOST_PERSONALITY.WORKER
openstack_compute = True
elif host_name.startswith('storage'):
personality = HOST_PERSONALITY.STORAGE
else:
@@ -294,7 +302,7 @@ class TestSwPatchStrategy(testcase.NFVTestCase):
action=nfvi.objects.v1.HOST_ACTION.NONE,
software_load='12.01',
target_load='12.01',
openstack_compute=False,
openstack_compute=openstack_compute,
openstack_control=False,
remote_storage=False,
uptime='1000'

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

@@ -124,9 +124,14 @@ def fake_event_issue(a, b, c, d):
return None
def fake_nfvi_compute_plugin_disabled():
return False
@mock.patch('nfv_vim.event_log._instance._event_issue', fake_event_issue)
@mock.patch('nfv_vim.objects._sw_update.SwUpdate.save', fake_save)
@mock.patch('nfv_vim.objects._sw_update.timers.timers_create_timer', fake_timer)
@mock.patch('nfv_vim.nfvi.nfvi_compute_plugin_disabled', fake_nfvi_compute_plugin_disabled)
class TestSwUpgradeStrategy(testcase.NFVTestCase):
def setUp(self):
@@ -250,6 +255,7 @@ class TestSwUpgradeStrategy(testcase.NFVTestCase):
"""
Create a host
"""
openstack_compute = False
personality = ''
if host_name.startswith('controller'):
personality = HOST_PERSONALITY.CONTROLLER
@@ -257,6 +263,7 @@ class TestSwUpgradeStrategy(testcase.NFVTestCase):
personality = personality + ',' + HOST_PERSONALITY.WORKER
elif host_name.startswith('compute'):
personality = HOST_PERSONALITY.WORKER
openstack_compute = True
elif host_name.startswith('storage'):
personality = HOST_PERSONALITY.STORAGE
else:
@@ -272,7 +279,7 @@ class TestSwUpgradeStrategy(testcase.NFVTestCase):
action=nfvi.objects.v1.HOST_ACTION.NONE,
software_load=software_load,
target_load=target_load,
openstack_compute=False,
openstack_compute=openstack_compute,
openstack_control=False,
remote_storage=False,
uptime='1000'