diff --git a/gosnappi/bgp_attributes_community.go b/gosnappi/bgp_attributes_community.go
index 9563f25e..35b07fa0 100644
--- a/gosnappi/bgp_attributes_community.go
+++ b/gosnappi/bgp_attributes_community.go
@@ -278,14 +278,14 @@ type BgpAttributesCommunity interface {
 	Choice() BgpAttributesCommunityChoiceEnum
 	// setChoice assigns BgpAttributesCommunityChoiceEnum provided by user to BgpAttributesCommunity
 	setChoice(value BgpAttributesCommunityChoiceEnum) BgpAttributesCommunity
-	// getter for LlgrStale to set choice.
-	LlgrStale()
 	// getter for NoExportSubconfed to set choice.
 	NoExportSubconfed()
-	// getter for NoExport to set choice.
-	NoExport()
 	// getter for NoLlgr to set choice.
 	NoLlgr()
+	// getter for LlgrStale to set choice.
+	LlgrStale()
+	// getter for NoExport to set choice.
+	NoExport()
 	// getter for NoAdvertised to set choice.
 	NoAdvertised()
 	// CustomCommunity returns BgpAttributesCustomCommunity, set in BgpAttributesCommunity.
@@ -322,26 +322,26 @@ func (obj *bgpAttributesCommunity) Choice() BgpAttributesCommunityChoiceEnum {
 	return BgpAttributesCommunityChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for LlgrStale to set choice
-func (obj *bgpAttributesCommunity) LlgrStale() {
-	obj.setChoice(BgpAttributesCommunityChoice.LLGR_STALE)
-}
-
 // getter for NoExportSubconfed to set choice
 func (obj *bgpAttributesCommunity) NoExportSubconfed() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT_SUBCONFED)
 }
 
-// getter for NoExport to set choice
-func (obj *bgpAttributesCommunity) NoExport() {
-	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT)
-}
-
 // getter for NoLlgr to set choice
 func (obj *bgpAttributesCommunity) NoLlgr() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_LLGR)
 }
 
+// getter for LlgrStale to set choice
+func (obj *bgpAttributesCommunity) LlgrStale() {
+	obj.setChoice(BgpAttributesCommunityChoice.LLGR_STALE)
+}
+
+// getter for NoExport to set choice
+func (obj *bgpAttributesCommunity) NoExport() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT)
+}
+
 // getter for NoAdvertised to set choice
 func (obj *bgpAttributesCommunity) NoAdvertised() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_ADVERTISED)
diff --git a/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go b/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go
index a75d770b..7db09d0b 100644
--- a/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go
+++ b/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go
@@ -272,16 +272,16 @@ type BgpAttributesSrPolicyExplicitNullPolicy interface {
 	setChoice(value BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum) BgpAttributesSrPolicyExplicitNullPolicy
 	// HasChoice checks if Choice has been set in BgpAttributesSrPolicyExplicitNullPolicy
 	HasChoice() bool
-	// getter for DonotPush to set choice.
-	DonotPush()
-	// getter for PushIpv6 to set choice.
-	PushIpv6()
 	// getter for Unknown to set choice.
 	Unknown()
-	// getter for PushIpv4 to set choice.
-	PushIpv4()
+	// getter for DonotPush to set choice.
+	DonotPush()
 	// getter for PushIpv4AndIpv6 to set choice.
 	PushIpv4AndIpv6()
+	// getter for PushIpv4 to set choice.
+	PushIpv4()
+	// getter for PushIpv6 to set choice.
+	PushIpv6()
 }
 
 type BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum string
@@ -305,19 +305,19 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Choice() BgpAttributesSrPoli
 	return BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for Unknown to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Unknown() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.UNKNOWN)
+}
+
 // getter for DonotPush to set choice
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
 }
 
-// getter for PushIpv6 to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV6)
-}
-
-// getter for Unknown to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Unknown() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.UNKNOWN)
+// getter for PushIpv4AndIpv6 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4AndIpv6() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4_AND_IPV6)
 }
 
 // getter for PushIpv4 to set choice
@@ -325,9 +325,9 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4)
 }
 
-// getter for PushIpv4AndIpv6 to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4AndIpv6() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4_AND_IPV6)
+// getter for PushIpv6 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV6)
 }
 
 // The Explicit NULL Label policy.
diff --git a/gosnappi/dhcpv6_client_options_duid_uuid_variant.go b/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
index de71eabb..9f0085ec 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
@@ -272,12 +272,12 @@ type Dhcpv6ClientOptionsDuidUuidVariant interface {
 	HasChoice() bool
 	// getter for Guid to set choice.
 	Guid()
-	// getter for Dce to set choice.
-	Dce()
 	// getter for Ncs to set choice.
 	Ncs()
 	// getter for VarReserved to set choice.
 	VarReserved()
+	// getter for Dce to set choice.
+	Dce()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum string
@@ -304,11 +304,6 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) Guid() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.GUID)
 }
 
-// getter for Dce to set choice
-func (obj *dhcpv6ClientOptionsDuidUuidVariant) Dce() {
-	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.DCE)
-}
-
 // getter for Ncs to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVariant) Ncs() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.NCS)
@@ -319,6 +314,11 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) VarReserved() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.VAR_RESERVED)
 }
 
+// getter for Dce to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVariant) Dce() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.DCE)
+}
+
 // The current variants are ncs, dce,microsoft guid and reserved.
 // Choice returns a string
 func (obj *dhcpv6ClientOptionsDuidUuidVariant) HasChoice() bool {
diff --git a/gosnappi/dhcpv6_client_options_duid_uuid_version.go b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
index 910c4dd0..13a5ee8b 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_version.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
@@ -274,12 +274,12 @@ type Dhcpv6ClientOptionsDuidUuidVersion interface {
 	V_4()
 	// getter for V_5 to set choice.
 	V_5()
-	// getter for V_1 to set choice.
-	V_1()
 	// getter for V_3 to set choice.
 	V_3()
 	// getter for V_2 to set choice.
 	V_2()
+	// getter for V_1 to set choice.
+	V_1()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum string
@@ -313,11 +313,6 @@ func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_5() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_5)
 }
 
-// getter for V_1 to set choice
-func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_1() {
-	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_1)
-}
-
 // getter for V_3 to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_3() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_3)
@@ -328,6 +323,11 @@ func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_2() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_2)
 }
 
+// getter for V_1 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_1() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_1)
+}
+
 // The version values are from 1 to 5 in the most significant 4 bits of the timestamp (bits 4 through 7 of the  time_hi_and_version field).
 // Choice returns a string
 func (obj *dhcpv6ClientOptionsDuidUuidVersion) HasChoice() bool {
diff --git a/gosnappi/dhcpv6_client_options_message_type.go b/gosnappi/dhcpv6_client_options_message_type.go
index 6083a8e7..505ca5c1 100644
--- a/gosnappi/dhcpv6_client_options_message_type.go
+++ b/gosnappi/dhcpv6_client_options_message_type.go
@@ -270,18 +270,18 @@ type Dhcpv6ClientOptionsMessageType interface {
 	setChoice(value Dhcpv6ClientOptionsMessageTypeChoiceEnum) Dhcpv6ClientOptionsMessageType
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsMessageType
 	HasChoice() bool
-	// getter for Release to set choice.
-	Release()
-	// getter for Solicit to set choice.
-	Solicit()
-	// getter for Renew to set choice.
-	Renew()
-	// getter for Rebind to set choice.
-	Rebind()
 	// getter for InformRequest to set choice.
 	InformRequest()
 	// getter for Request to set choice.
 	Request()
+	// getter for Renew to set choice.
+	Renew()
+	// getter for Rebind to set choice.
+	Rebind()
+	// getter for Release to set choice.
+	Release()
+	// getter for Solicit to set choice.
+	Solicit()
 }
 
 type Dhcpv6ClientOptionsMessageTypeChoiceEnum string
@@ -307,14 +307,14 @@ func (obj *dhcpv6ClientOptionsMessageType) Choice() Dhcpv6ClientOptionsMessageTy
 	return Dhcpv6ClientOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Release to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Release() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RELEASE)
+// getter for InformRequest to set choice
+func (obj *dhcpv6ClientOptionsMessageType) InformRequest() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.INFORM_REQUEST)
 }
 
-// getter for Solicit to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Solicit() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.SOLICIT)
+// getter for Request to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Request() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REQUEST)
 }
 
 // getter for Renew to set choice
@@ -327,14 +327,14 @@ func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
 }
 
-// getter for InformRequest to set choice
-func (obj *dhcpv6ClientOptionsMessageType) InformRequest() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.INFORM_REQUEST)
+// getter for Release to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Release() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RELEASE)
 }
 
-// getter for Request to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Request() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REQUEST)
+// getter for Solicit to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Solicit() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.SOLICIT)
 }
 
 // The client message name where the option is included, by default it is all.
diff --git a/gosnappi/dhcpv6_client_options_options_request.go b/gosnappi/dhcpv6_client_options_options_request.go
index 69514b3c..b5815027 100644
--- a/gosnappi/dhcpv6_client_options_options_request.go
+++ b/gosnappi/dhcpv6_client_options_options_request.go
@@ -278,16 +278,16 @@ type Dhcpv6ClientOptionsOptionsRequest interface {
 	setChoice(value Dhcpv6ClientOptionsOptionsRequestChoiceEnum) Dhcpv6ClientOptionsOptionsRequest
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsOptionsRequest
 	HasChoice() bool
-	// getter for Fqdn to set choice.
-	Fqdn()
-	// getter for VendorInformation to set choice.
-	VendorInformation()
 	// getter for NameServers to set choice.
 	NameServers()
-	// getter for Sztp to set choice.
-	Sztp()
 	// getter for BootfileUrl to set choice.
 	BootfileUrl()
+	// getter for Fqdn to set choice.
+	Fqdn()
+	// getter for Sztp to set choice.
+	Sztp()
+	// getter for VendorInformation to set choice.
+	VendorInformation()
 	// Custom returns Dhcpv6ClientOptionsCustom, set in Dhcpv6ClientOptionsOptionsRequest.
 	// Dhcpv6ClientOptionsCustom is the Custom option is used to provide a not so well known option in the message between a client and a server.
 	Custom() Dhcpv6ClientOptionsCustom
@@ -322,19 +322,19 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Choice() Dhcpv6ClientOptionsOption
 	return Dhcpv6ClientOptionsOptionsRequestChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Fqdn to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) Fqdn() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.FQDN)
+// getter for NameServers to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
 }
 
-// getter for VendorInformation to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) VendorInformation() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.VENDOR_INFORMATION)
+// getter for BootfileUrl to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) BootfileUrl() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.BOOTFILE_URL)
 }
 
-// getter for NameServers to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
+// getter for Fqdn to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) Fqdn() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.FQDN)
 }
 
 // getter for Sztp to set choice
@@ -342,9 +342,9 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Sztp() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.SZTP)
 }
 
-// getter for BootfileUrl to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) BootfileUrl() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.BOOTFILE_URL)
+// getter for VendorInformation to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) VendorInformation() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.VENDOR_INFORMATION)
 }
 
 // The Option Request option is used to identify a list of options in a message between a client and a server. The  option code is 6. - Vendor_specific information option, requested by clients for vendor-specific informations from servers. - DNS Recursive Name Server Option, requested by clients to get the list ofIPv6 addresses of DNS recursive name
diff --git a/gosnappi/dhcpv6_server_options_message_type.go b/gosnappi/dhcpv6_server_options_message_type.go
index 404e5df0..fb9162ea 100644
--- a/gosnappi/dhcpv6_server_options_message_type.go
+++ b/gosnappi/dhcpv6_server_options_message_type.go
@@ -272,10 +272,10 @@ type Dhcpv6ServerOptionsMessageType interface {
 	HasChoice() bool
 	// getter for Reply to set choice.
 	Reply()
-	// getter for ReConfigure to set choice.
-	ReConfigure()
 	// getter for Advertise to set choice.
 	Advertise()
+	// getter for ReConfigure to set choice.
+	ReConfigure()
 }
 
 type Dhcpv6ServerOptionsMessageTypeChoiceEnum string
@@ -300,16 +300,16 @@ func (obj *dhcpv6ServerOptionsMessageType) Reply() {
 	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.REPLY)
 }
 
-// getter for ReConfigure to set choice
-func (obj *dhcpv6ServerOptionsMessageType) ReConfigure() {
-	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.RE_CONFIGURE)
-}
-
 // getter for Advertise to set choice
 func (obj *dhcpv6ServerOptionsMessageType) Advertise() {
 	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.ADVERTISE)
 }
 
+// getter for ReConfigure to set choice
+func (obj *dhcpv6ServerOptionsMessageType) ReConfigure() {
+	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.RE_CONFIGURE)
+}
+
 // The server message name where the option is included, by default it is all.
 // Choice returns a string
 func (obj *dhcpv6ServerOptionsMessageType) HasChoice() bool {
diff --git a/gosnappi/flow_rsvp_lsp_tunnel_flag.go b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
index 98f008f7..5047737d 100644
--- a/gosnappi/flow_rsvp_lsp_tunnel_flag.go
+++ b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
@@ -270,12 +270,12 @@ type FlowRSVPLspTunnelFlag interface {
 	setChoice(value FlowRSVPLspTunnelFlagChoiceEnum) FlowRSVPLspTunnelFlag
 	// HasChoice checks if Choice has been set in FlowRSVPLspTunnelFlag
 	HasChoice() bool
+	// getter for SeStyleDesired to set choice.
+	SeStyleDesired()
 	// getter for LocalProtectionDesired to set choice.
 	LocalProtectionDesired()
 	// getter for LabelRecordingDesired to set choice.
 	LabelRecordingDesired()
-	// getter for SeStyleDesired to set choice.
-	SeStyleDesired()
 }
 
 type FlowRSVPLspTunnelFlagChoiceEnum string
@@ -295,6 +295,11 @@ func (obj *flowRSVPLspTunnelFlag) Choice() FlowRSVPLspTunnelFlagChoiceEnum {
 	return FlowRSVPLspTunnelFlagChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for SeStyleDesired to set choice
+func (obj *flowRSVPLspTunnelFlag) SeStyleDesired() {
+	obj.setChoice(FlowRSVPLspTunnelFlagChoice.SE_STYLE_DESIRED)
+}
+
 // getter for LocalProtectionDesired to set choice
 func (obj *flowRSVPLspTunnelFlag) LocalProtectionDesired() {
 	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LOCAL_PROTECTION_DESIRED)
@@ -305,11 +310,6 @@ func (obj *flowRSVPLspTunnelFlag) LabelRecordingDesired() {
 	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LABEL_RECORDING_DESIRED)
 }
 
-// getter for SeStyleDesired to set choice
-func (obj *flowRSVPLspTunnelFlag) SeStyleDesired() {
-	obj.setChoice(FlowRSVPLspTunnelFlagChoice.SE_STYLE_DESIRED)
-}
-
 // description is TBD
 // Choice returns a string
 func (obj *flowRSVPLspTunnelFlag) HasChoice() bool {
diff --git a/gosnappi/flow_rsvp_record_route_i_pv4_flag.go b/gosnappi/flow_rsvp_record_route_i_pv4_flag.go
index 8ec9fad0..ae4873ee 100644
--- a/gosnappi/flow_rsvp_record_route_i_pv4_flag.go
+++ b/gosnappi/flow_rsvp_record_route_i_pv4_flag.go
@@ -270,10 +270,10 @@ type FlowRSVPRecordRouteIPv4Flag interface {
 	setChoice(value FlowRSVPRecordRouteIPv4FlagChoiceEnum) FlowRSVPRecordRouteIPv4Flag
 	// HasChoice checks if Choice has been set in FlowRSVPRecordRouteIPv4Flag
 	HasChoice() bool
-	// getter for LocalProtectionAvailable to set choice.
-	LocalProtectionAvailable()
 	// getter for LocalProtectionInUse to set choice.
 	LocalProtectionInUse()
+	// getter for LocalProtectionAvailable to set choice.
+	LocalProtectionAvailable()
 }
 
 type FlowRSVPRecordRouteIPv4FlagChoiceEnum string
@@ -291,16 +291,16 @@ func (obj *flowRSVPRecordRouteIPv4Flag) Choice() FlowRSVPRecordRouteIPv4FlagChoi
 	return FlowRSVPRecordRouteIPv4FlagChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for LocalProtectionAvailable to set choice
-func (obj *flowRSVPRecordRouteIPv4Flag) LocalProtectionAvailable() {
-	obj.setChoice(FlowRSVPRecordRouteIPv4FlagChoice.LOCAL_PROTECTION_AVAILABLE)
-}
-
 // getter for LocalProtectionInUse to set choice
 func (obj *flowRSVPRecordRouteIPv4Flag) LocalProtectionInUse() {
 	obj.setChoice(FlowRSVPRecordRouteIPv4FlagChoice.LOCAL_PROTECTION_IN_USE)
 }
 
+// getter for LocalProtectionAvailable to set choice
+func (obj *flowRSVPRecordRouteIPv4Flag) LocalProtectionAvailable() {
+	obj.setChoice(FlowRSVPRecordRouteIPv4FlagChoice.LOCAL_PROTECTION_AVAILABLE)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *flowRSVPRecordRouteIPv4Flag) HasChoice() bool {
diff --git a/gosnappi/go.mod b/gosnappi/go.mod
index 4613e459..bcbc077d 100644
--- a/gosnappi/go.mod
+++ b/gosnappi/go.mod
@@ -1,26 +1,26 @@
 module github.com/open-traffic-generator/snappi/gosnappi
 
-go 1.21
+go 1.22.7
 
-toolchain go1.21.13
+toolchain go1.23.3
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/mux v1.8.1
 	github.com/stretchr/testify v1.9.0
-	google.golang.org/grpc v1.67.1
-	google.golang.org/protobuf v1.35.1
+	google.golang.org/grpc v1.68.0
+	google.golang.org/protobuf v1.35.2
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v2 v2.2.3 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/gosnappi/go.sum b/gosnappi/go.sum
index 0f2a557e..55246846 100644
--- a/gosnappi/go.sum
+++ b/gosnappi/go.sum
@@ -5,6 +5,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
@@ -23,18 +25,18 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
+google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/gosnappi/metrics_response.go b/gosnappi/metrics_response.go
index 259ec5b8..511a7b4d 100644
--- a/gosnappi/metrics_response.go
+++ b/gosnappi/metrics_response.go
@@ -304,14 +304,14 @@ type MetricsResponse interface {
 	setChoice(value MetricsResponseChoiceEnum) MetricsResponse
 	// HasChoice checks if Choice has been set in MetricsResponse
 	HasChoice() bool
-	// getter for Dhcpv6Client to set choice.
-	Dhcpv6Client()
 	// getter for Dhcpv4Client to set choice.
 	Dhcpv4Client()
 	// getter for Dhcpv6Server to set choice.
 	Dhcpv6Server()
 	// getter for Dhcpv4Server to set choice.
 	Dhcpv4Server()
+	// getter for Dhcpv6Client to set choice.
+	Dhcpv6Client()
 	// PortMetrics returns MetricsResponsePortMetricIterIter, set in MetricsResponse
 	PortMetrics() MetricsResponsePortMetricIter
 	// FlowMetrics returns MetricsResponseFlowMetricIterIter, set in MetricsResponse
@@ -382,11 +382,6 @@ func (obj *metricsResponse) Choice() MetricsResponseChoiceEnum {
 	return MetricsResponseChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Dhcpv6Client to set choice
-func (obj *metricsResponse) Dhcpv6Client() {
-	obj.setChoice(MetricsResponseChoice.DHCPV6_CLIENT)
-}
-
 // getter for Dhcpv4Client to set choice
 func (obj *metricsResponse) Dhcpv4Client() {
 	obj.setChoice(MetricsResponseChoice.DHCPV4_CLIENT)
@@ -402,6 +397,11 @@ func (obj *metricsResponse) Dhcpv4Server() {
 	obj.setChoice(MetricsResponseChoice.DHCPV4_SERVER)
 }
 
+// getter for Dhcpv6Client to set choice
+func (obj *metricsResponse) Dhcpv6Client() {
+	obj.setChoice(MetricsResponseChoice.DHCPV6_CLIENT)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *metricsResponse) HasChoice() bool {
diff --git a/gosnappi/ospfv2_interface_network_type.go b/gosnappi/ospfv2_interface_network_type.go
index 3ec53c4b..7de2eb9f 100644
--- a/gosnappi/ospfv2_interface_network_type.go
+++ b/gosnappi/ospfv2_interface_network_type.go
@@ -281,10 +281,10 @@ type Ospfv2InterfaceNetworkType interface {
 	setChoice(value Ospfv2InterfaceNetworkTypeChoiceEnum) Ospfv2InterfaceNetworkType
 	// HasChoice checks if Choice has been set in Ospfv2InterfaceNetworkType
 	HasChoice() bool
-	// getter for Broadcast to set choice.
-	Broadcast()
 	// getter for PointToPoint to set choice.
 	PointToPoint()
+	// getter for Broadcast to set choice.
+	Broadcast()
 	// PointToMultipoint returns Ospfv2InterfaceNetworkTypeOspfv2InterfaceNeighborIterIter, set in Ospfv2InterfaceNetworkType
 	PointToMultipoint() Ospfv2InterfaceNetworkTypeOspfv2InterfaceNeighborIter
 	setNil()
@@ -307,16 +307,16 @@ func (obj *ospfv2InterfaceNetworkType) Choice() Ospfv2InterfaceNetworkTypeChoice
 	return Ospfv2InterfaceNetworkTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Broadcast to set choice
-func (obj *ospfv2InterfaceNetworkType) Broadcast() {
-	obj.setChoice(Ospfv2InterfaceNetworkTypeChoice.BROADCAST)
-}
-
 // getter for PointToPoint to set choice
 func (obj *ospfv2InterfaceNetworkType) PointToPoint() {
 	obj.setChoice(Ospfv2InterfaceNetworkTypeChoice.POINT_TO_POINT)
 }
 
+// getter for Broadcast to set choice
+func (obj *ospfv2InterfaceNetworkType) Broadcast() {
+	obj.setChoice(Ospfv2InterfaceNetworkTypeChoice.BROADCAST)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *ospfv2InterfaceNetworkType) HasChoice() bool {
diff --git a/requirements.txt b/requirements.txt
index e43b76db..64ccfe7b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 --prefer-binary
-PyYAML
 grpcio~=1.44.0 ; python_version <= '3.6'
-grpcio~=1.59.0 ; python_version > '3.6'
-grpcio-tools~=1.44.0 ; python_version <= '3.6'
 grpcio-tools~=1.59.0 ; python_version > '3.6'
-protobuf~=3.15.0 ;  python_version <= '3.6'
-protobuf~=4.24.4 ;  python_version > '3.6'
+grpcio-tools~=1.44.0 ; python_version <= '3.6'
+grpcio~=1.59.0 ; python_version > '3.6'
+PyYAML
 requests
+protobuf~=4.24.4 ;  python_version > '3.6'
+protobuf~=3.15.0 ;  python_version <= '3.6'
 urllib3
 semantic_version