PSS v2 (#181)

* add PSS v2 commands
ans-group · Jul 17, 2024 · 79634f8 · 79634f8
1 parent d1f5ca8
commit 79634f8
Show file tree

Hide file tree

Showing 67 changed files with 2,917 additions and 236 deletions.
diff --git a/cmd/ddosx/ddosx_domain.go b/cmd/ddosx/ddosx_domain.go
@@ -262,7 +262,7 @@ func DomainStatusWaitFunc(service ddosx.DDoSXService, domainName string, status
 			return false, fmt.Errorf("Failed to retrieve domain [%s]: %s", domainName, err)
 		}
 		if domain.Status == ddosx.DomainStatusFailed {
-			return false, fmt.Errorf("Domain [%s] in [%s] state", domainName, domain.Status.String())
+			return false, fmt.Errorf("Domain [%s] in [%s] state", domainName, domain.Status)
 		}
 		if domain.Status == status {
 			return true, nil

diff --git a/cmd/ddosx/ddosx_domain_acl_geoip_mode.go b/cmd/ddosx/ddosx_domain_acl_geoip_mode.go
@@ -95,7 +95,7 @@ func ddosxDomainACLGeoIPRulesModeUpdate(service ddosx.DDoSXService, cmd *cobra.C
 
 	if cmd.Flags().Changed("mode") {
 		mode, _ := cmd.Flags().GetString("mode")
-		parsedMode, err := ddosx.ParseACLGeoIPRulesMode(mode)
+		parsedMode, err := ddosx.ACLGeoIPRulesModeEnum.Parse(mode)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ddosx/ddosx_domain_acl_ip.go b/cmd/ddosx/ddosx_domain_acl_ip.go
@@ -148,7 +148,7 @@ func ddosxDomainACLIPRuleCreateCmd(f factory.ClientFactory) *cobra.Command {
 func ddosxDomainACLIPRuleCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
 	ip, _ := cmd.Flags().GetString("ip")
 	mode, _ := cmd.Flags().GetString("mode")
-	parsedMode, err := ddosx.ParseACLIPMode(mode)
+	parsedMode, err := ddosx.ACLIPModeEnum.Parse(mode)
 	if err != nil {
 		return clierrors.NewErrInvalidFlagValue("mode", mode, err)
 	}
@@ -219,7 +219,7 @@ func ddosxDomainACLIPRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Command,
 
 	if cmd.Flags().Changed("mode") {
 		mode, _ := cmd.Flags().GetString("mode")
-		parsedMode, err := ddosx.ParseACLIPMode(mode)
+		parsedMode, err := ddosx.ACLIPModeEnum.Parse(mode)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ddosx/ddosx_domain_cdn_rule.go b/cmd/ddosx/ddosx_domain_cdn_rule.go
@@ -146,13 +146,13 @@ func ddosxDomainCDNRuleCreateCmd(f factory.ClientFactory) *cobra.Command {
 
 func ddosxDomainCDNRuleCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
 	cacheControl, _ := cmd.Flags().GetString("cache-control")
-	parsedCacheControl, err := ddosx.ParseCDNRuleCacheControl(cacheControl)
+	parsedCacheControl, err := ddosx.CDNRuleCacheControlEnum.Parse(cacheControl)
 	if err != nil {
 		return clierrors.NewErrInvalidFlagValue("cache-control", cacheControl, err)
 	}
 
 	ruleType, _ := cmd.Flags().GetString("type")
-	parsedRuleType, err := ddosx.ParseCDNRuleType(ruleType)
+	parsedRuleType, err := ddosx.CDNRuleTypeEnum.Parse(ruleType)
 	if err != nil {
 		return clierrors.NewErrInvalidFlagValue("type", ruleType, err)
 	}
@@ -230,7 +230,7 @@ func ddosxDomainCDNRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Command, ar
 
 	if cmd.Flags().Changed("cache-control") {
 		cacheControl, _ := cmd.Flags().GetString("cache-control")
-		parsedCacheControl, err := ddosx.ParseCDNRuleCacheControl(cacheControl)
+		parsedCacheControl, err := ddosx.CDNRuleCacheControlEnum.Parse(cacheControl)
 		if err != nil {
 			return clierrors.NewErrInvalidFlagValue("cache-control", cacheControl, err)
 		}
@@ -254,7 +254,7 @@ func ddosxDomainCDNRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Command, ar
 
 	if cmd.Flags().Changed("type") {
 		ruleType, _ := cmd.Flags().GetString("type")
-		parsedRuleType, err := ddosx.ParseCDNRuleType(ruleType)
+		parsedRuleType, err := ddosx.CDNRuleTypeEnum.Parse(ruleType)
 		if err != nil {
 			return clierrors.NewErrInvalidFlagValue("type", ruleType, err)
 		}

diff --git a/cmd/ddosx/ddosx_domain_hsts_rule.go b/cmd/ddosx/ddosx_domain_hsts_rule.go
@@ -143,7 +143,7 @@ func ddosxDomainHSTSRuleCreateCmd(f factory.ClientFactory) *cobra.Command {
 
 func ddosxDomainHSTSRuleCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
 	ruleType, _ := cmd.Flags().GetString("type")
-	parsedRuleType, err := ddosx.ParseHSTSRuleType(ruleType)
+	parsedRuleType, err := ddosx.HSTSRuleTypeEnum.Parse(ruleType)
 	if err != nil {
 		return clierrors.NewErrInvalidFlagValue("type", ruleType, err)
 	}

diff --git a/cmd/ddosx/ddosx_domain_waf.go b/cmd/ddosx/ddosx_domain_waf.go
@@ -102,12 +102,12 @@ func ddosxDomainWAFCreateCmd(f factory.ClientFactory) *cobra.Command {
 
 func ddosxDomainWAFCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
 	mode, _ := cmd.Flags().GetString("mode")
-	parsedMode, err := ddosx.ParseWAFMode(mode)
+	parsedMode, err := ddosx.WAFModeEnum.Parse(mode)
 	if err != nil {
 		return err
 	}
 	paranoiaLevel, _ := cmd.Flags().GetString("paranoia-level")
-	parsedParanoiaLevel, err := ddosx.ParseWAFParanoiaLevel(paranoiaLevel)
+	parsedParanoiaLevel, err := ddosx.WAFParanoiaLevelEnum.Parse(paranoiaLevel)
 	if err != nil {
 		return err
 	}
@@ -164,7 +164,7 @@ func ddosxDomainWAFUpdate(service ddosx.DDoSXService, cmd *cobra.Command, args [
 
 	if cmd.Flags().Changed("mode") {
 		mode, _ := cmd.Flags().GetString("mode")
-		parsedMode, err := ddosx.ParseWAFMode(mode)
+		parsedMode, err := ddosx.WAFModeEnum.Parse(mode)
 		if err != nil {
 			return err
 		}
@@ -174,7 +174,7 @@ func ddosxDomainWAFUpdate(service ddosx.DDoSXService, cmd *cobra.Command, args [
 
 	if cmd.Flags().Changed("paranoia-level") {
 		paranoiaLevel, _ := cmd.Flags().GetString("paranoia-level")
-		parsedParanoiaLevel, err := ddosx.ParseWAFParanoiaLevel(paranoiaLevel)
+		parsedParanoiaLevel, err := ddosx.WAFParanoiaLevelEnum.Parse(paranoiaLevel)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ddosx/ddosx_domain_waf_advancedrule.go b/cmd/ddosx/ddosx_domain_waf_advancedrule.go
@@ -150,7 +150,7 @@ func ddosxDomainWAFAdvancedRuleCreate(service ddosx.DDoSXService, cmd *cobra.Com
 	createRequest := ddosx.CreateWAFAdvancedRuleRequest{}
 
 	modifier, _ := cmd.Flags().GetString("modifier")
-	parsedModifier, err := ddosx.ParseWAFAdvancedRuleModifier(modifier)
+	parsedModifier, err := ddosx.WAFAdvancedRuleModifierEnum.Parse(modifier)
 	if err != nil {
 		return err
 	}
@@ -213,7 +213,7 @@ func ddosxDomainWAFAdvancedRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Com
 
 	if cmd.Flags().Changed("modifier") {
 		modifier, _ := cmd.Flags().GetString("modifier")
-		parsedModifier, err := ddosx.ParseWAFAdvancedRuleModifier(modifier)
+		parsedModifier, err := ddosx.WAFAdvancedRuleModifierEnum.Parse(modifier)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ecloud/ecloud.go b/cmd/ecloud/ecloud.go
@@ -186,7 +186,7 @@ func TaskStatusWaitFunc(service ecloud.ECloudService, taskID string, expectedSta
 			return false, fmt.Errorf("Failed to retrieve task status: %s", err)
 		}
 		if task.Status == ecloud.TaskStatusFailed {
-			return false, fmt.Errorf("Task in [%s] state", ecloud.TaskStatusFailed.String())
+			return false, fmt.Errorf("Task in [%s] state", ecloud.TaskStatusFailed)
 		}
 		if task.Status == expectedStatus {
 			return true, nil

diff --git a/cmd/ecloud/ecloud_affinityrule.go b/cmd/ecloud/ecloud_affinityrule.go
@@ -118,9 +118,9 @@ func ecloudAffinityRuleCreate(service ecloud.ECloudService, cmd *cobra.Command,
 	createRequest := ecloud.CreateAffinityRuleRequest{}
 	createRequest.VPCID, _ = cmd.Flags().GetString("vpc")
 	createRequest.AvailabilityZoneID, _ = cmd.Flags().GetString("availability-zone")
-	
+
 	ruleType, _ := cmd.Flags().GetString("type")
-	parsedType, err := ecloud.ParseAffinityRuleType(ruleType)
+	parsedType, err := ecloud.AffinityRuleTypeEnum.Parse(ruleType)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/ecloud/ecloud_firewallrule.go b/cmd/ecloud/ecloud_firewallrule.go
@@ -130,14 +130,14 @@ func ecloudFirewallRuleCreate(service ecloud.ECloudService, cmd *cobra.Command,
 	createRequest.Enabled, _ = cmd.Flags().GetBool("enabled")
 
 	direction, _ := cmd.Flags().GetString("direction")
-	directionParsed, err := ecloud.ParseFirewallRuleDirection(direction)
+	directionParsed, err := ecloud.FirewallRuleDirectionEnum.Parse(direction)
 	if err != nil {
 		return err
 	}
 	createRequest.Direction = directionParsed
 
 	action, _ := cmd.Flags().GetString("action")
-	actionParsed, err := ecloud.ParseFirewallRuleAction(action)
+	actionParsed, err := ecloud.FirewallRuleActionEnum.Parse(action)
 	if err != nil {
 		return err
 	}
@@ -212,7 +212,7 @@ func ecloudFirewallRuleUpdate(service ecloud.ECloudService, cmd *cobra.Command,
 
 	if cmd.Flags().Changed("direction") {
 		direction, _ := cmd.Flags().GetString("direction")
-		directionParsed, err := ecloud.ParseFirewallRuleDirection(direction)
+		directionParsed, err := ecloud.FirewallRuleDirectionEnum.Parse(direction)
 		if err != nil {
 			return err
 		}
@@ -222,7 +222,7 @@ func ecloudFirewallRuleUpdate(service ecloud.ECloudService, cmd *cobra.Command,
 
 	if cmd.Flags().Changed("action") {
 		action, _ := cmd.Flags().GetString("action")
-		actionParsed, err := ecloud.ParseFirewallRuleAction(action)
+		actionParsed, err := ecloud.FirewallRuleActionEnum.Parse(action)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ecloud/ecloud_firewallruleport.go b/cmd/ecloud/ecloud_firewallruleport.go
@@ -119,7 +119,7 @@ func ecloudFirewallRulePortCreate(service ecloud.ECloudService, cmd *cobra.Comma
 	createRequest.Destination, _ = cmd.Flags().GetString("destination")
 
 	protocol, _ := cmd.Flags().GetString("protocol")
-	protocolParsed, err := ecloud.ParseFirewallRulePortProtocol(protocol)
+	protocolParsed, err := ecloud.FirewallRulePortProtocolEnum.Parse(protocol)
 	if err != nil {
 		return err
 	}
@@ -189,7 +189,7 @@ func ecloudFirewallRulePortUpdate(service ecloud.ECloudService, cmd *cobra.Comma
 	if cmd.Flags().Changed("protocol") {
 
 		protocol, _ := cmd.Flags().GetString("protocol")
-		protocolParsed, err := ecloud.ParseFirewallRulePortProtocol(protocol)
+		protocolParsed, err := ecloud.FirewallRulePortProtocolEnum.Parse(protocol)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ecloud/ecloud_natoverloadrule.go b/cmd/ecloud/ecloud_natoverloadrule.go
@@ -121,7 +121,7 @@ func ecloudNATOverloadRuleCreate(service ecloud.ECloudService, cmd *cobra.Comman
 	createRequest.Name, _ = cmd.Flags().GetString("name")
 
 	action, _ := cmd.Flags().GetString("action")
-	actionParsed, err := ecloud.ParseNATOverloadRuleAction(action)
+	actionParsed, err := ecloud.NATOverloadRuleActionEnum.Parse(action)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/ecloud/ecloud_networkpolicy.go b/cmd/ecloud/ecloud_networkpolicy.go
@@ -122,7 +122,7 @@ func ecloudNetworkPolicyCreate(service ecloud.ECloudService, cmd *cobra.Command,
 	}
 	if cmd.Flags().Changed("catchall-rule-action") {
 		catchallRuleAction, _ := cmd.Flags().GetString("catchall-rule-action")
-		catchallRuleActionParsed, err := ecloud.ParseNetworkPolicyCatchallRuleAction(catchallRuleAction)
+		catchallRuleActionParsed, err := ecloud.NetworkPolicyCatchallRuleActionEnum.Parse(catchallRuleAction)
 		if err != nil {
 			return err
 		}
@@ -181,7 +181,7 @@ func ecloudNetworkPolicyUpdate(service ecloud.ECloudService, cmd *cobra.Command,
 	}
 	if cmd.Flags().Changed("catchall-rule-action") {
 		catchallRuleAction, _ := cmd.Flags().GetString("catchall-rule-action")
-		catchallRuleActionParsed, err := ecloud.ParseNetworkPolicyCatchallRuleAction(catchallRuleAction)
+		catchallRuleActionParsed, err := ecloud.NetworkPolicyCatchallRuleActionEnum.Parse(catchallRuleAction)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ecloud/ecloud_networkrule.go b/cmd/ecloud/ecloud_networkrule.go
@@ -130,14 +130,14 @@ func ecloudNetworkRuleCreate(service ecloud.ECloudService, cmd *cobra.Command, a
 	createRequest.Enabled, _ = cmd.Flags().GetBool("enabled")
 
 	direction, _ := cmd.Flags().GetString("direction")
-	directionParsed, err := ecloud.ParseNetworkRuleDirection(direction)
+	directionParsed, err := ecloud.NetworkRuleDirectionEnum.Parse(direction)
 	if err != nil {
 		return err
 	}
 	createRequest.Direction = directionParsed
 
 	action, _ := cmd.Flags().GetString("action")
-	actionParsed, err := ecloud.ParseNetworkRuleAction(action)
+	actionParsed, err := ecloud.NetworkRuleActionEnum.Parse(action)
 	if err != nil {
 		return err
 	}
@@ -212,7 +212,7 @@ func ecloudNetworkRuleUpdate(service ecloud.ECloudService, cmd *cobra.Command, a
 
 	if cmd.Flags().Changed("direction") {
 		direction, _ := cmd.Flags().GetString("direction")
-		directionParsed, err := ecloud.ParseNetworkRuleDirection(direction)
+		directionParsed, err := ecloud.NetworkRuleDirectionEnum.Parse(direction)
 		if err != nil {
 			return err
 		}
@@ -222,7 +222,7 @@ func ecloudNetworkRuleUpdate(service ecloud.ECloudService, cmd *cobra.Command, a
 
 	if cmd.Flags().Changed("action") {
 		action, _ := cmd.Flags().GetString("action")
-		actionParsed, err := ecloud.ParseNetworkRuleAction(action)
+		actionParsed, err := ecloud.NetworkRuleActionEnum.Parse(action)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ecloud/ecloud_networkruleport.go b/cmd/ecloud/ecloud_networkruleport.go
@@ -119,7 +119,7 @@ func ecloudNetworkRulePortCreate(service ecloud.ECloudService, cmd *cobra.Comman
 	createRequest.Destination, _ = cmd.Flags().GetString("destination")
 
 	protocol, _ := cmd.Flags().GetString("protocol")
-	protocolParsed, err := ecloud.ParseNetworkRulePortProtocol(protocol)
+	protocolParsed, err := ecloud.NetworkRulePortProtocolEnum.Parse(protocol)
 	if err != nil {
 		return err
 	}
@@ -189,7 +189,7 @@ func ecloudNetworkRulePortUpdate(service ecloud.ECloudService, cmd *cobra.Comman
 	if cmd.Flags().Changed("protocol") {
 
 		protocol, _ := cmd.Flags().GetString("protocol")
-		protocolParsed, err := ecloud.ParseNetworkRulePortProtocol(protocol)
+		protocolParsed, err := ecloud.NetworkRulePortProtocolEnum.Parse(protocol)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/ecloud/ecloud_task.go b/cmd/ecloud/ecloud_task.go
@@ -112,7 +112,7 @@ func ecloudTaskWait(service ecloud.ECloudService, cmd *cobra.Command, args []str
 	var expectedStatus ecloud.TaskStatus = ecloud.TaskStatusComplete
 	if cmd.Flags().Changed("status") {
 		status, _ := cmd.Flags().GetString("status")
-		parsedStatus, err := ecloud.ParseTaskStatus(status)
+		parsedStatus, err := ecloud.TaskStatusEnum.Parse(status)
 		if err != nil {
 			return fmt.Errorf("Failed to parse status: %s", err)
 		}

diff --git a/cmd/ecloud/ecloud_v1_vm.go b/cmd/ecloud/ecloud_v1_vm.go
@@ -542,7 +542,7 @@ func VirtualMachineNotFoundWaitFunc(service ecloud.ECloudService, vmID int) help
 		}
 
 		if vm.Status == ecloud.VirtualMachineStatusFailed {
-			return false, fmt.Errorf("Virtual machine [%d] in [%s] state", vmID, ecloud.VirtualMachineStatusFailed.String())
+			return false, fmt.Errorf("Virtual machine [%d] in [%s] state", vmID, ecloud.VirtualMachineStatusFailed)
 		}
 
 		return false, nil
@@ -556,7 +556,7 @@ func VirtualMachineStatusWaitFunc(service ecloud.ECloudService, vmID int, status
 			return false, fmt.Errorf("Failed to retrieve virtual machine [%d]: %s", vmID, err)
 		}
 		if vm.Status == ecloud.VirtualMachineStatusFailed {
-			return false, fmt.Errorf("Virtual machine [%d] in [%s] state", vmID, ecloud.VirtualMachineStatusFailed.String())
+			return false, fmt.Errorf("Virtual machine [%d] in [%s] state", vmID, ecloud.VirtualMachineStatusFailed)
 		}
 		if vm.Status == status {
 			return true, nil

diff --git a/cmd/ecloud/ecloud_v1_vm_template.go b/cmd/ecloud/ecloud_v1_vm_template.go
@@ -64,7 +64,7 @@ func ecloudVirtualMachineTemplateCreate(service ecloud.ECloudService, cmd *cobra
 	}
 
 	templateType, _ := cmd.Flags().GetString("type")
-	parsedTemplateType, err := ecloud.ParseTemplateType(templateType)
+	parsedTemplateType, err := ecloud.TemplateTypeEnum.Parse(templateType)
 	if err != nil {
 		return clierrors.NewErrInvalidFlagValue("type", templateType, err)
 	}

diff --git a/cmd/ecloud/output.go b/cmd/ecloud/output.go
@@ -29,7 +29,7 @@ func OutputECloudVirtualMachinesProvider(vms []ecloud.VirtualMachine) output.Out
 				fields.Set("support", output.NewFieldValue(strconv.FormatBool(vm.Support), false))
 				fields.Set("environment", output.NewFieldValue(vm.Environment, false))
 				fields.Set("solution_id", output.NewFieldValue(strconv.Itoa(vm.SolutionID), false))
-				fields.Set("status", output.NewFieldValue(vm.Status.String(), true))
+				fields.Set("status", output.NewFieldValue(string(vm.Status), true))
 				fields.Set("power_status", output.NewFieldValue(vm.PowerStatus, true))
 				fields.Set("tools_status", output.NewFieldValue(vm.ToolsStatus, false))
 				fields.Set("encrypted", output.NewFieldValue(strconv.FormatBool(vm.Encrypted), false))
@@ -54,7 +54,7 @@ func OutputECloudVirtualMachineDisksProvider(disks []ecloud.VirtualMachineDisk)
 				fields.Set("name", output.NewFieldValue(disk.Name, true))
 				fields.Set("capacity", output.NewFieldValue(strconv.Itoa(disk.Capacity), true))
 				fields.Set("uuid", output.NewFieldValue(disk.UUID, true))
-				fields.Set("type", output.NewFieldValue(disk.Type.String(), true))
+				fields.Set("type", output.NewFieldValue(string(disk.Type), true))
 				fields.Set("key", output.NewFieldValue(strconv.Itoa(disk.Key), false))
 
 				data = append(data, fields)
@@ -93,7 +93,7 @@ func OutputECloudSolutionsProvider(solutions []ecloud.Solution) output.OutputHan
 				fields := output.NewOrderedFields()
 				fields.Set("id", output.NewFieldValue(strconv.Itoa(solution.ID), true))
 				fields.Set("name", output.NewFieldValue(solution.Name, true))
-				fields.Set("environment", output.NewFieldValue(solution.Environment.String(), true))
+				fields.Set("environment", output.NewFieldValue(string(solution.Environment), true))
 				fields.Set("pod_id", output.NewFieldValue(strconv.Itoa(solution.PodID), true))
 				fields.Set("encryption_enabled", output.NewFieldValue(strconv.FormatBool(solution.EncryptionEnabled), false))
 				fields.Set("encryption_default", output.NewFieldValue(strconv.FormatBool(solution.EncryptionDefault), false))
@@ -164,7 +164,7 @@ func OutputECloudDatastoresProvider(datastores []ecloud.Datastore) output.Output
 				fields.Set("solution_id", output.NewFieldValue(strconv.Itoa(datastore.SolutionID), true))
 				fields.Set("site_id", output.NewFieldValue(strconv.Itoa(datastore.SiteID), true))
 				fields.Set("name", output.NewFieldValue(datastore.Name, true))
-				fields.Set("status", output.NewFieldValue(datastore.Status.String(), true))
+				fields.Set("status", output.NewFieldValue(string(datastore.Status), true))
 				fields.Set("capacity", output.NewFieldValue(strconv.Itoa(datastore.Capacity), true))
 				fields.Set("allocated", output.NewFieldValue(strconv.Itoa(datastore.Allocated), false))
 				fields.Set("available", output.NewFieldValue(strconv.Itoa(datastore.Available), false))
@@ -229,7 +229,7 @@ func OutputECloudFirewallsProvider(firewalls []ecloud.Firewall) output.OutputHan
 				fields.Set("name", output.NewFieldValue(firewall.Name, true))
 				fields.Set("hostname", output.NewFieldValue(firewall.Hostname, true))
 				fields.Set("ip", output.NewFieldValue(firewall.IP.String(), true))
-				fields.Set("role", output.NewFieldValue(firewall.Role.String(), true))
+				fields.Set("role", output.NewFieldValue(string(firewall.Role), true))
 
 				data = append(data, fields)
 			}

diff --git a/cmd/loadbalancer/loadbalancer_listener.go b/cmd/loadbalancer/loadbalancer_listener.go
@@ -159,7 +159,7 @@ func loadbalancerListenerCreate(service loadbalancer.LoadBalancerService, cmd *c
 		geoipChanged = true
 
 		geoipRestrictionFlag, _ := cmd.Flags().GetString("geoip-restriction")
-		geoipRestriction, err := loadbalancer.ParseListenerGeoIPRestriction(geoipRestrictionFlag)
+		geoipRestriction, err := loadbalancer.ListenerGeoIPRestrictionEnum.Parse(geoipRestrictionFlag)
 		if err != nil {
 			return clierrors.NewErrInvalidFlagValue("geoip-restriction", geoipRestrictionFlag, err)
 		}
@@ -188,7 +188,7 @@ func loadbalancerListenerCreate(service loadbalancer.LoadBalancerService, cmd *c
 	}
 
 	mode, _ := cmd.Flags().GetString("mode")
-	parsedMode, err := loadbalancer.ParseMode(mode)
+	parsedMode, err := loadbalancer.ModeEnum.Parse(mode)
 	if err != nil {
 		return clierrors.NewErrInvalidFlagValue("mode", mode, err)
 	}
@@ -271,7 +271,7 @@ func loadbalancerListenerUpdate(service loadbalancer.LoadBalancerService, cmd *c
 		geoipChanged = true
 
 		geoipRestrictionFlag, _ := cmd.Flags().GetString("geoip-restriction")
-		geoipRestriction, err := loadbalancer.ParseListenerGeoIPRestriction(geoipRestrictionFlag)
+		geoipRestriction, err := loadbalancer.ListenerGeoIPRestrictionEnum.Parse(geoipRestrictionFlag)
 		if err != nil {
 			return clierrors.NewErrInvalidFlagValue("geoip-restriction", geoipRestrictionFlag, err)
 		}