starlingx
/
config
Code Issues Proposed changes

sysinv pnet support without neutron extension 

This commit adds support for configuring providernets in sysinv,
without communicating with neutron, in the case that the neutron
providernet extension is not supported.
This commit also adds a check in sysinv for if it is a containerized
setup, and if so, then _neutron_providernet_extension_supported
returns False.

Story: 2003909
Task: 27082
Change-Id: Id856c75b630335f5330306d165fa5205b05ce9b2
Signed-off-by: Joseph Richard <joseph.richard@windriver.com>
This commit is contained in:
Joseph Richard 2018-10-18 09:49:44 -04:00
parent 8a1afec67c
commit 5ec51b3dbb
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/interface.py
View File

@ -1526,11 +1526,6 @@ def _check_interface_data(op, interface, ihost, existing_interface):
msg = _("At least one provider network must be selected.")
raise wsme.exc.ClientSideError(msg)
elif any(nt in NEUTRON_NETWORK_TYPES for nt in networktypelist):
msg = (_("Unexpected interface network type list {}").
format(', '.join(networktypelist)))
raise wsme.exc.ClientSideError(msg)
elif (interface['ifclass'] and
interface['ifclass'] not in NEUTRON_INTERFACE_CLASS and
not existing_interface):
@ -1538,7 +1533,8 @@ def _check_interface_data(op, interface, ihost, existing_interface):
msg = _("Provider network(s) not supported "
"for non-data interfaces. (%s) (%s)" % (interface['ifclass'], str(existing_interface)))
raise wsme.exc.ClientSideError(msg)
else:
elif (_neutron_providernet_extension_supported() or
interface['ifclass'] not in NEUTRON_INTERFACE_CLASS):
interface['providernetworks'] = None
# check MTU
@ -1999,6 +1995,11 @@ def _neutron_providernet_extension_supported():
necessary or not. If it is not supported then this is an indication that
we are running against a vanilla openstack installation.
"""
# In the case of a kubernetes config, neutron may not be running, and
# sysinv should not rely on talking to containerized neutron.
if utils.is_kubernetes_config():
return False
return True
# TODO: This should be looking at the neutron extension list, but because
# our config file is not setup properly to have a different region on a per
@ -2040,6 +2041,9 @@ def _neutron_bind_interface(ihost, interface, test=False):
if recordtype in ['profile']:
# No action required if we are operating on a profile record
return
if not _neutron_providernet_extension_supported():
# No action required if neutron does not support the pnet extension
return
if not _neutron_host_extension_supported():
# No action required if neutron does not support the host extension
return
@ -2077,6 +2081,9 @@ def _neutron_unbind_interface(ihost, interface):
if recordtype in ['profile']:
# No action required if we are operating on a profile record
return
if not _neutron_providernet_extension_supported():
# No action required if neutron does not support the pnet extension
return
if not _neutron_host_extension_supported():
# No action required if neutron does not support the host extension
return

11
sysinv/sysinv/sysinv/sysinv/tests/api/test_interface.py
View File

@ -1786,17 +1786,6 @@ class TestCpePost(InterfaceTestCase):
providernetworks='group0-data1,group0-data1',
expect_errors=True)
# Expected error: Unexpected interface network type list data
@mock.patch.object(api_if_v1, '_neutron_providernet_extension_supported')
def test_create_invalid_non_vswitch(self,
mock_providernet_extension_supported):
mock_providernet_extension_supported.return_value = False
self._create_ethernet('data0',
networktype=constants.NETWORK_TYPE_DATA,
ifclass=constants.INTERFACE_CLASS_DATA,
providernetworks='group0-data1',
expect_errors=True)
class TestCpePatch(InterfaceTestCase):
def setUp(self):