starlingx
/
config
Code Issues Proposed changes

Platform interface no longer requires networks 

This commit prevents the interface class from being set to None
once all the networks have been removed from the platform
interface. The interface class will remain to be platform
until changed.

Closes-Bug: 1793779
Depends-On: https://review.openstack.org/#/c/604396

Change-Id: I67063f4134f9a35b19e93193dd6ff651e676dfd6
Signed-off-by: Patrick Bonnell <patrick.bonnell@windriver.com>
This commit is contained in:
Patrick Bonnell 2018-09-21 11:46:56 -04:00
parent 0ce0f105cb
commit 534e8d9c7f
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,26 +774,35 @@ def _set_defaults(interface):
'vlan_id': None,
'sriov_numvfs': 0}
networktypelist = []
if interface['ifclass'] == constants.INTERFACE_CLASS_PLATFORM:
if interface['networks']:
for network_id in interface['networks']:
network = pecan.request.dbapi.network_get_by_id(network_id)
interface['networktype'] = network.type
break
networktypelist.append(network.type)
interface['networktype'] = ",".join(networktypelist)
elif interface['networktype']:
network = pecan.request.dbapi.network_get_by_type(
interface['networktype']
)
interface['networks'] = [str(network.id)]
networks = []
networktypelist = interface['networktype'].split(',')
for network_type in networktypelist:
if network_type in constants.PLATFORM_NETWORK_TYPES:
network = pecan.request.dbapi.network_get_by_type(
network_type
)
networks.append(str(network.id))
interface['networks'] = networks
networktype = interface['networktype']
family_defaults = [constants.NETWORK_TYPE_MGMT,
constants.NETWORK_TYPE_OAM,
constants.NETWORK_TYPE_INFRA]
if interface['ifclass'] == constants.INTERFACE_CLASS_DATA:
defaults['ipv4_mode'] = constants.IPV4_DISABLED
defaults['ipv6_mode'] = constants.IPV6_DISABLED
elif (networktype == constants.NETWORK_TYPE_MGMT or
networktype == constants.NETWORK_TYPE_OAM or
networktype == constants.NETWORK_TYPE_INFRA):
_set_address_family_defaults_by_pool(defaults, networktype)
else:
for network_type in networktypelist:
if network_type in family_defaults:
_set_address_family_defaults_by_pool(defaults,
network_type)
interface_merged = interface.copy()
for key in interface_merged:
@ -985,8 +994,8 @@ def _check_network_type_and_host_type(ihost, networktypelist):
def _check_network_type_and_interface_type(interface, networktypelist):
if interface['iftype'] == 'vlan':
if not networktypelist or constants.NETWORK_TYPE_NONE in networktypelist:
msg = _("VLAN interfaces cannot have a network type of '%s'." %
if constants.NETWORK_TYPE_NONE in networktypelist:
msg = _("VLAN interfaces cannot have an interface class of %s." %
constants.NETWORK_TYPE_NONE)
raise wsme.exc.ClientSideError(msg)

6
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/interface_network.py
View File

@ -301,10 +301,4 @@ class InterfaceNetworkController(rest.RestController):
@cutils.synchronized(LOCK_NAME)
@wsme_pecan.wsexpose(None, types.uuid, status_code=204)
def delete(self, interface_network_uuid):
interface_network = self._get_one(interface_network_uuid)
pecan.request.dbapi.interface_network_destroy(interface_network_uuid)
interface_networks = pecan.request.dbapi.interface_network_get_by_interface(
interface_network.interface_uuid)
if not interface_networks:
values = {'ifclass': None}
pecan.request.dbapi.iinterface_update(interface_network.interface_uuid, values)

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

@ -280,6 +280,10 @@ class InterfaceTestCase(base.FunctionalTest):
for network_type in networktypelist:
network = self.dbapi.network_get_by_type(network_type)
networks.append(str(network.id))
elif ifclass == constants.INTERFACE_CLASS_PLATFORM and \
any(network_type not in constants.PLATFORM_NETWORK_TYPES
for network_type in networktypelist):
ifclass = networktype
if not ifclass and networktype:
ifclass = networktype
port_id = len(self.profile['ports'])
@ -338,6 +342,10 @@ class InterfaceTestCase(base.FunctionalTest):
for network_type in networktypelist:
network = self.dbapi.network_get_by_type(network_type)
networks.append(str(network.id))
elif ifclass == constants.INTERFACE_CLASS_PLATFORM and \
any(network_type not in constants.PLATFORM_NETWORK_TYPES
for network_type in networktypelist):
ifclass = networktype
if not ifclass and networktype:
ifclass = networktype
interface = dbutils.post_get_test_interface(
@ -395,6 +403,10 @@ class InterfaceTestCase(base.FunctionalTest):
for network_type in networktypelist:
network = self.dbapi.network_get_by_type(network_type)
networks.append(str(network.id))
elif ifclass == constants.INTERFACE_CLASS_PLATFORM and \
any(network_type not in constants.PLATFORM_NETWORK_TYPES
for network_type in networktypelist):
ifclass = networktype
if not ifclass and networktype:
ifclass = networktype
interface = dbutils.post_get_test_interface(