Skip to content

Bug 1996155: UPSTREAM: 964: getOrCreatePort: add support to configure port Profile #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 20, 2021
Merged

Bug 1996155: UPSTREAM: 964: getOrCreatePort: add support to configure port Profile #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkg/apis/openstackproviderconfig/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@ type NetworkParam struct {
// NoAllowedAddressPairs disables creation of allowed address pairs for the network ports
NoAllowedAddressPairs bool `json:"noAllowedAddressPairs,omitempty"`
// PortTags allows users to specify a list of tags to add to ports created in a given network
PortTags []string `json:"portTags,omitempty"`
VNICType string `json:"vnicType,omitempty"`
PortTags []string `json:"portTags,omitempty"`
VNICType string `json:"vnicType,omitempty"`
Profile map[string]string `json:"profile,omitempty"`
// PortSecurity optionally enables or disables security on ports managed by OpenStack
PortSecurity *bool `json:"portSecurity,omitempty"`
}
Expand Down Expand Up @@ -218,6 +219,11 @@ type PortOpts struct {
// neutron port.
VNICType string `json:"vnicType,omitempty"`

// A dictionary that enables the application running on the specified
// host to pass and receive virtual network interface (VIF) port-specific
// information to the plug-in.
Profile map[string]string `json:"profile,omitempty"`

// enable or disable security on a given port
// incompatible with securityGroups and allowedAddressPairs
PortSecurity *bool `json:"portSecurity,omitempty"`
Expand Down
19 changes: 18 additions & 1 deletion pkg/cloud/openstack/clients/machineservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func getOrCreatePort(is *InstanceService, name string, portOpts openstackconfigv
CreateOptsBuilder: createOpts,
HostID: portOpts.HostID,
VNICType: portOpts.VNICType,
Profile: nil,
Profile: getPortProfile(portOpts.Profile),
}).Extract()
if err != nil {
return nil, err
Expand Down Expand Up @@ -405,6 +405,21 @@ func getOrCreatePort(is *InstanceService, name string, portOpts openstackconfigv
return nil, fmt.Errorf("multiple ports found with name \"%s\"", portName)
}

func getPortProfile(p map[string]string) map[string]interface{} {
portProfile := make(map[string]interface{})
for k, v := range p {
portProfile[k] = v
}
// We need return nil if there is no profiles
// to have backward compatible defaults.
// To set profiles, your tenant needs this permission:
// rule:create_port and rule:create_port:binding:profile
if len(portProfile) == 0 {
return nil
}
return portProfile
}

func listPorts(is *InstanceService, opts ports.ListOpts) ([]ports.Port, error) {
allPages, err := ports.List(is.networkClient, opts).AllPages()
if err != nil {
Expand Down Expand Up @@ -572,6 +587,7 @@ func (is *InstanceService) InstanceCreate(clusterName string, name string, clust
NameSuffix: net.UUID,
Tags: net.PortTags,
VNICType: net.VNICType,
Profile: net.Profile,
PortSecurity: net.PortSecurity,
})
}
Expand All @@ -598,6 +614,7 @@ func (is *InstanceService) InstanceCreate(clusterName string, name string, clust
FixedIPs: []openstackconfigv1.FixedIPs{{SubnetID: snet.ID}},
Tags: append(net.PortTags, snetParam.PortTags...),
VNICType: net.VNICType,
Profile: net.Profile,
PortSecurity: portSecurity,
})
}
Expand Down