Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 21 additions & 14 deletions cmd/workflow/enroll_netdev.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ const (
enrollFWWorkflowTemplate = "wftmpl/enroll-fw"
)

// netdevOptions holds the flags shared by enroll-netdev and enroll-fw, since
// enroll-fw reuses the enroll-netdev node/port lifecycle.
// netdevOptions holds values shared by enroll-netdev and enroll-fw.
type netdevOptions struct {
Name string
PhysicalNet string
Expand All @@ -34,17 +33,22 @@ type fwOptions struct {
ManagementSwitch string
ManagementSwitchPort string
MateSerial string
HARole string
Serial string
Vendor string
Model string
Driver string
}

func addNetdevFlags(cmd *cobra.Command, opts *netdevOptions) {
cmd.Flags().StringVar(&opts.Name, "name", "", "Node name (required)")
cmd.Flags().StringVar(&opts.PhysicalNet, "physical-network", "", "Physical network (required)")
addNetdevCommonFlags(cmd, opts)
cmd.Flags().StringVar(&opts.Ports, "ports", "", "Ports as a JSON array")
cmd.Flags().StringVar(&opts.PortsFile, "ports-file", "", "File (YAML or JSON) containing the ports array")
}

func addNetdevCommonFlags(cmd *cobra.Command, opts *netdevOptions) {
cmd.Flags().StringVar(&opts.Name, "name", "", "Node name (required)")
cmd.Flags().StringVar(&opts.PhysicalNet, "physical-network", "", "Physical network (required)")
cmd.Flags().StringVar(&opts.ExternalCMDBID, "external-cmdb-id", "", "External CMDB identifier")
cmd.Flags().StringVar(&opts.ResourceClass, "resource-class", "", "Ironic resource class")
cmd.Flags().StringVar(&opts.Rack, "rack", "", "Rack where the node lives")
Expand Down Expand Up @@ -95,11 +99,12 @@ func newCmdEnrollFW() *cobra.Command {
},
}

addNetdevFlags(cmd, &opts.netdevOptions)
addNetdevCommonFlags(cmd, &opts.netdevOptions)
cmd.Flags().StringVar(&opts.ManagementIP, "management-ip", "", "Firewall management IP address")
cmd.Flags().StringVar(&opts.ManagementSwitch, "management-switch", "", "Switch FQDN the management port is on (required)")
cmd.Flags().StringVar(&opts.ManagementSwitchPort, "management-switch-port", "", "Switch port the management interface is on (required)")
cmd.Flags().StringVar(&opts.MateSerial, "mate-serial", "", "Serial number of the HA mate")
cmd.Flags().StringVar(&opts.HARole, "ha-role", "", "HA role (primary or secondary; requires --mate-serial)")
cmd.Flags().StringVar(&opts.Serial, "serial", "", "Device serial number")
cmd.Flags().StringVar(&opts.Vendor, "vendor", "", "Device vendor")
cmd.Flags().StringVar(&opts.Model, "model", "", "Device model")
Expand Down Expand Up @@ -169,6 +174,10 @@ func netdevParams(cmd *cobra.Command, opts *netdevOptions) ([]string, error) {
fmt.Sprintf("ports=%s", ports),
}

return appendNetdevOptionalParams(cmd, opts, params), nil
}

func appendNetdevOptionalParams(cmd *cobra.Command, opts *netdevOptions, params []string) []string {
if cmd.Flags().Changed("external-cmdb-id") {
params = append(params, fmt.Sprintf("external_cmdb_id=%s", opts.ExternalCMDBID))
}
Expand All @@ -181,8 +190,7 @@ func netdevParams(cmd *cobra.Command, opts *netdevOptions) ([]string, error) {
if cmd.Flags().Changed("position") {
params = append(params, fmt.Sprintf("position=%s", opts.Position))
}

return params, nil
return params
}

func buildEnrollNetdevArgoArgs(cmd *cobra.Command, opts *netdevOptions) ([]string, error) {
Expand All @@ -195,19 +203,18 @@ func buildEnrollNetdevArgoArgs(cmd *cobra.Command, opts *netdevOptions) ([]strin
}

func buildEnrollFWArgoArgs(cmd *cobra.Command, opts *fwOptions) ([]string, error) {
params, err := netdevParams(cmd, &opts.netdevOptions)
if err != nil {
return nil, err
}

params = append(params,
params := []string{
fmt.Sprintf("name=%s", opts.Name),
fmt.Sprintf("physical_network=%s", opts.PhysicalNet),
fmt.Sprintf("management_switch=%s", opts.ManagementSwitch),
fmt.Sprintf("management_switch_port=%s", opts.ManagementSwitchPort),
)
}
params = appendNetdevOptionalParams(cmd, &opts.netdevOptions, params)

optional := []struct{ flag, param, value string }{
{"management-ip", "management_ip", opts.ManagementIP},
{"mate-serial", "mate_serial", opts.MateSerial},
{"ha-role", "ha_role", opts.HARole},
{"serial", "serial", opts.Serial},
{"vendor", "vendor", opts.Vendor},
{"model", "model", opts.Model},
Expand Down
10 changes: 7 additions & 3 deletions cmd/workflow/enroll_netdev_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,22 @@ func TestBuildEnrollFWArgoArgs(t *testing.T) {
for k, v := range map[string]string{
"name": "fw-a",
"physical-network": "physnet1",
"ports": testPortsJSON,
"management-switch": "sw1.example.com",
"management-switch-port": "Ethernet48",
"mate-serial": "SN2",
"ha-role": "primary",
} {
if err := cmd.Flags().Set(k, v); err != nil {
t.Fatalf("set %s: %v", k, err)
}
}

opts := &fwOptions{
netdevOptions: netdevOptions{Name: "fw-a", PhysicalNet: "physnet1", Ports: testPortsJSON},
netdevOptions: netdevOptions{Name: "fw-a", PhysicalNet: "physnet1"},
ManagementSwitch: "sw1.example.com",
ManagementSwitchPort: "Ethernet48",
MateSerial: "SN2",
HARole: "primary",
}
args, err := buildEnrollFWArgoArgs(cmd, opts)
if err != nil {
Expand All @@ -81,14 +82,17 @@ func TestBuildEnrollFWArgoArgs(t *testing.T) {
"-o", "name",
"-p", "name=fw-a",
"-p", "physical_network=physnet1",
"-p", "ports=" + testPortsJSON,
"-p", "management_switch=sw1.example.com",
"-p", "management_switch_port=Ethernet48",
"-p", "mate_serial=SN2",
"-p", "ha_role=primary",
}
if !reflect.DeepEqual(args, expected) {
t.Fatalf("unexpected args: got %#v want %#v", args, expected)
}
if cmd.Flags().Lookup("ports") != nil || cmd.Flags().Lookup("ports-file") != nil {
t.Fatal("firewall enrollment must discover ports through inspection")
}
}

func TestResolvePortsFromYAMLFile(t *testing.T) {
Expand Down
Loading