openstack/skyline-console
Code Issues Proposed changes

Merge "fix: Fix create ipv6 subnet with ipv6_address_mode"

Browse Source
This commit is contained in:
Zuul 2021-12-01 04:15:49 +00:00 committed by Gerrit Code Review
commit bfa613bd34
4 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/FormItem/index.jsx
View File

@ -156,6 +156,7 @@ export default class FormItem extends React.Component {
optionFilterProp = 'label',
checkOptions,
checkBoxInfo,
allowClear,
} = this.props;
return {
options,
@ -169,6 +170,7 @@ export default class FormItem extends React.Component {
optionFilterProp,
checkOptions,
checkBoxInfo,
allowClear,
};
}
default: {

38
src/pages/network/containers/Network/actions/CreateNetwork.jsx
View File

@ -400,6 +400,42 @@ export class CreateNetwork extends ModalAction {
required: true,
hidden: !create_subnet,
},
{
name: 'ipv6_ra_mode',
label: t('Router Advertisements Mode'),
type: 'select',
options: [
{
label: 'dhcpv6-stateful',
value: 'dhcpv6-stateful',
},
{
label: 'dhcpv6-stateless',
value: 'dhcpv6-stateless',
},
{
label: 'slaac',
value: 'slaac',
},
],
hidden: ip_version !== 'ipv6',
dependencies: ['ipv6_address_mode'],
allowClear: true,
validator: (rule, value) => {
const ipv6_address_mode =
(this.formRef.current &&
this.formRef.current.getFieldValue('ipv6_address_mode')) ||
undefined;
// https://docs.openstack.org/neutron/xena/admin/config-ipv6.html
if (!value && ipv6_address_mode) {
return Promise.resolve();
}
if (ipv6_address_mode && ipv6_address_mode !== value) {
return Promise.reject(new Error(t('Invalid combination')));
}
return Promise.resolve();
},
},
{
name: 'ipv6_address_mode',
label: t('IP Distribution Mode'),
@ -419,6 +455,8 @@ export class CreateNetwork extends ModalAction {
},
],
hidden: ip_version !== 'ipv6',
dependencies: ['ipv6_ra_mode'],
allowClear: true,
},
{
name: 'cidr',

37
src/pages/network/containers/Network/actions/CreateSubnet.jsx
View File

@ -177,6 +177,42 @@ export default class CreateSubnet extends ModalAction {
},
required: true,
},
{
name: 'ipv6_ra_mode',
label: t('Router Advertisements Mode'),
type: 'select',
options: [
{
label: 'dhcpv6-stateful',
value: 'dhcpv6-stateful',
},
{
label: 'dhcpv6-stateless',
value: 'dhcpv6-stateless',
},
{
label: 'slaac',
value: 'slaac',
},
],
hidden: ip_version !== 'ipv6',
dependencies: ['ipv6_address_mode'],
allowClear: true,
validator: (rule, value) => {
const ipv6_address_mode =
(this.formRef.current &&
this.formRef.current.getFieldValue('ipv6_address_mode')) ||
undefined;
// https://docs.openstack.org/neutron/xena/admin/config-ipv6.html
if (!value && ipv6_address_mode) {
return Promise.resolve();
}
if (ipv6_address_mode && ipv6_address_mode !== value) {
return Promise.reject(new Error(t('Invalid combination')));
}
return Promise.resolve();
},
},
{
name: 'ipv6_address_mode',
label: t('IP Distribution Mode'),
@ -196,6 +232,7 @@ export default class CreateSubnet extends ModalAction {
},
],
hidden: ip_version !== 'ipv6',
allowClear: true,
},
{
name: 'cidr',

6
src/stores/neutron/network.js
View File

@ -306,6 +306,8 @@ export class NetworkStore extends Base {
subnet_name,
enable_dhcp,
ip_version,
ipv6_address_mode,
ipv6_ra_mode,
gateway_ip,
cidr,
disable_gateway,
@ -323,6 +325,10 @@ export class NetworkStore extends Base {
gateway_ip: disable_gateway ? null : gateway_ip,
cidr,
};
if (data.ip_version === 6) {
data.ipv6_address_mode = ipv6_address_mode;
data.ipv6_ra_mode = ipv6_ra_mode;
}
return this.subnetClient.create({ subnet: data });
}
}