Skip to content

Commit

Permalink
Merge pull request #6210 from pcbailey/fix-nad-vlan-id-type
Browse files Browse the repository at this point in the history
Bug 1858317: Change type of VLAN attribute for CNV bridge in NADs
  • Loading branch information
openshift-merge-robot committed Aug 6, 2020
2 parents 13ce5c9 + 3de17d4 commit 1217700
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@ const buildConfig = (name, networkType, typeParamsData): NetworkAttachmentDefini
// cnv-bridge should not define type on root
delete config.type;

const vlan = _.get(typeParamsData, 'vlanTagNum.value', '');
config.plugins = [
{
type: 'cnv-bridge',
bridge: _.get(typeParamsData, 'bridge.value', ''),
vlan: _.isEmpty(vlan) ? undefined : vlan,
vlan: parseInt(typeParamsData?.vlanTagNum?.value, 10) || undefined,
ipam,
},
{ type: 'cnv-tuning' },
Expand Down

0 comments on commit 1217700

Please sign in to comment.