diff --git a/gosnappi/bgp_attributes_community.go b/gosnappi/bgp_attributes_community.go
index d256e9f8..eaef2eaa 100644
--- a/gosnappi/bgp_attributes_community.go
+++ b/gosnappi/bgp_attributes_community.go
@@ -278,16 +278,16 @@ type BgpAttributesCommunity interface {
 	Choice() BgpAttributesCommunityChoiceEnum
 	// setChoice assigns BgpAttributesCommunityChoiceEnum provided by user to BgpAttributesCommunity
 	setChoice(value BgpAttributesCommunityChoiceEnum) BgpAttributesCommunity
-	// getter for NoAdvertised to set choice.
-	NoAdvertised()
-	// getter for NoExport to set choice.
-	NoExport()
-	// getter for LlgrStale to set choice.
-	LlgrStale()
 	// getter for NoExportSubconfed to set choice.
 	NoExportSubconfed()
+	// getter for NoAdvertised to set choice.
+	NoAdvertised()
 	// getter for NoLlgr to set choice.
 	NoLlgr()
+	// getter for LlgrStale to set choice.
+	LlgrStale()
+	// getter for NoExport to set choice.
+	NoExport()
 	// CustomCommunity returns BgpAttributesCustomCommunity, set in BgpAttributesCommunity.
 	// BgpAttributesCustomCommunity is user defined COMMUNITY attribute containing 2 byte AS and custom 2 byte value defined by the administrator of the domain.
 	CustomCommunity() BgpAttributesCustomCommunity
@@ -322,14 +322,19 @@ func (obj *bgpAttributesCommunity) Choice() BgpAttributesCommunityChoiceEnum {
 	return BgpAttributesCommunityChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for NoExportSubconfed to set choice
+func (obj *bgpAttributesCommunity) NoExportSubconfed() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT_SUBCONFED)
+}
+
 // getter for NoAdvertised to set choice
 func (obj *bgpAttributesCommunity) NoAdvertised() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_ADVERTISED)
 }
 
-// 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
@@ -337,14 +342,9 @@ 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 NoLlgr to set choice
-func (obj *bgpAttributesCommunity) NoLlgr() {
-	obj.setChoice(BgpAttributesCommunityChoice.NO_LLGR)
+// getter for NoExport to set choice
+func (obj *bgpAttributesCommunity) NoExport() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT)
 }
 
 func (obj *bgpAttributesCommunity) setChoice(value BgpAttributesCommunityChoiceEnum) BgpAttributesCommunity {
diff --git a/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go b/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go
index dfa5a518..94e65321 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 Unknown to set choice.
-	Unknown()
-	// getter for DonotPush to set choice.
-	DonotPush()
-	// getter for PushIpv6 to set choice.
-	PushIpv6()
 	// getter for PushIpv4AndIpv6 to set choice.
 	PushIpv4AndIpv6()
 	// getter for PushIpv4 to set choice.
 	PushIpv4()
+	// getter for DonotPush to set choice.
+	DonotPush()
+	// getter for Unknown to set choice.
+	Unknown()
+	// getter for PushIpv6 to set choice.
+	PushIpv6()
 }
 
 type BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum string
@@ -305,9 +305,14 @@ 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 PushIpv4AndIpv6 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4AndIpv6() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4_AND_IPV6)
+}
+
+// getter for PushIpv4 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4)
 }
 
 // getter for DonotPush to set choice
@@ -315,21 +320,16 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
 }
 
+// getter for Unknown to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Unknown() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.UNKNOWN)
+}
+
 // getter for PushIpv6 to set choice
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV6)
 }
 
-// getter for PushIpv4AndIpv6 to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4AndIpv6() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4_AND_IPV6)
-}
-
-// getter for PushIpv4 to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4)
-}
-
 // The Explicit NULL Label policy.
 // Choice returns a string
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) HasChoice() bool {
diff --git a/gosnappi/dhcpv6_client_options_duid_uuid_variant.go b/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
index 814d9ff4..1e6192c8 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
@@ -270,12 +270,12 @@ type Dhcpv6ClientOptionsDuidUuidVariant interface {
 	setChoice(value Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum) Dhcpv6ClientOptionsDuidUuidVariant
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsDuidUuidVariant
 	HasChoice() bool
+	// getter for Dce to set choice.
+	Dce()
 	// getter for VarReserved to set choice.
 	VarReserved()
 	// getter for Ncs to set choice.
 	Ncs()
-	// getter for Dce to set choice.
-	Dce()
 	// getter for Guid to set choice.
 	Guid()
 }
@@ -299,6 +299,11 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) Choice() Dhcpv6ClientOptionsDuidU
 	return Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for Dce to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVariant) Dce() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.DCE)
+}
+
 // getter for VarReserved to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVariant) VarReserved() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.VAR_RESERVED)
@@ -309,11 +314,6 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) Ncs() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.NCS)
 }
 
-// getter for Dce to set choice
-func (obj *dhcpv6ClientOptionsDuidUuidVariant) Dce() {
-	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.DCE)
-}
-
 // getter for Guid to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVariant) Guid() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.GUID)
diff --git a/gosnappi/dhcpv6_client_options_duid_uuid_version.go b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
index 7411dd98..e714fa92 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_version.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
@@ -270,16 +270,16 @@ type Dhcpv6ClientOptionsDuidUuidVersion interface {
 	setChoice(value Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum) Dhcpv6ClientOptionsDuidUuidVersion
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsDuidUuidVersion
 	HasChoice() bool
-	// getter for V_4 to set choice.
-	V_4()
-	// 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_5 to set choice.
 	V_5()
+	// getter for V_1 to set choice.
+	V_1()
+	// getter for V_4 to set choice.
+	V_4()
+	// getter for V_3 to set choice.
+	V_3()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum string
@@ -303,9 +303,14 @@ func (obj *dhcpv6ClientOptionsDuidUuidVersion) Choice() Dhcpv6ClientOptionsDuidU
 	return Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for V_4 to set choice
-func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_4() {
-	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_4)
+// getter for V_2 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_2() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_2)
+}
+
+// getter for V_5 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_5() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_5)
 }
 
 // getter for V_1 to set choice
@@ -313,21 +318,16 @@ func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_1() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_1)
 }
 
+// getter for V_4 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_4() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_4)
+}
+
 // getter for V_3 to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_3() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_3)
 }
 
-// getter for V_2 to set choice
-func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_2() {
-	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_2)
-}
-
-// getter for V_5 to set choice
-func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_5() {
-	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_5)
-}
-
 // 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 5a0da2df..1ecd447d 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 Rebind to set choice.
-	Rebind()
 	// getter for Renew to set choice.
 	Renew()
-	// getter for InformRequest to set choice.
-	InformRequest()
+	// getter for Release to set choice.
+	Release()
 	// getter for Request to set choice.
 	Request()
+	// getter for Rebind to set choice.
+	Rebind()
 	// getter for Solicit to set choice.
 	Solicit()
-	// getter for Release to set choice.
-	Release()
+	// getter for InformRequest to set choice.
+	InformRequest()
 }
 
 type Dhcpv6ClientOptionsMessageTypeChoiceEnum string
@@ -307,19 +307,14 @@ func (obj *dhcpv6ClientOptionsMessageType) Choice() Dhcpv6ClientOptionsMessageTy
 	return Dhcpv6ClientOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Rebind to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
-}
-
 // getter for Renew to set choice
 func (obj *dhcpv6ClientOptionsMessageType) Renew() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RENEW)
 }
 
-// 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
@@ -327,14 +322,19 @@ func (obj *dhcpv6ClientOptionsMessageType) Request() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REQUEST)
 }
 
+// getter for Rebind to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
+}
+
 // getter for Solicit to set choice
 func (obj *dhcpv6ClientOptionsMessageType) Solicit() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.SOLICIT)
 }
 
-// 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)
 }
 
 // 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 9d129f79..631a9691 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 NameServers to set choice.
-	NameServers()
-	// getter for Fqdn to set choice.
-	Fqdn()
 	// getter for Sztp to set choice.
 	Sztp()
-	// getter for BootfileUrl to set choice.
-	BootfileUrl()
+	// getter for Fqdn to set choice.
+	Fqdn()
+	// getter for NameServers to set choice.
+	NameServers()
 	// getter for VendorInformation to set choice.
 	VendorInformation()
+	// getter for BootfileUrl to set choice.
+	BootfileUrl()
 	// 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,9 +322,9 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Choice() Dhcpv6ClientOptionsOption
 	return Dhcpv6ClientOptionsOptionsRequestChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for NameServers to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
+// getter for Sztp to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) Sztp() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.SZTP)
 }
 
 // getter for Fqdn to set choice
@@ -332,14 +332,9 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Fqdn() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.FQDN)
 }
 
-// getter for Sztp to set choice
-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 NameServers to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
 }
 
 // getter for VendorInformation to set choice
@@ -347,6 +342,11 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) VendorInformation() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.VENDOR_INFORMATION)
 }
 
+// getter for BootfileUrl to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) BootfileUrl() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.BOOTFILE_URL)
+}
+
 // 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
 // servers to which DNS queries may be sent by the client resolver in order of preference.
 // - Client FQDN option - indicates whether the client or the DHCP server should update DNS with the AAAA record
diff --git a/gosnappi/dhcpv6_server_options_message_type.go b/gosnappi/dhcpv6_server_options_message_type.go
index fb9162ea..1eb23b3a 100644
--- a/gosnappi/dhcpv6_server_options_message_type.go
+++ b/gosnappi/dhcpv6_server_options_message_type.go
@@ -270,12 +270,12 @@ type Dhcpv6ServerOptionsMessageType interface {
 	setChoice(value Dhcpv6ServerOptionsMessageTypeChoiceEnum) Dhcpv6ServerOptionsMessageType
 	// HasChoice checks if Choice has been set in Dhcpv6ServerOptionsMessageType
 	HasChoice() bool
-	// getter for Reply to set choice.
-	Reply()
-	// getter for Advertise to set choice.
-	Advertise()
 	// getter for ReConfigure to set choice.
 	ReConfigure()
+	// getter for Advertise to set choice.
+	Advertise()
+	// getter for Reply to set choice.
+	Reply()
 }
 
 type Dhcpv6ServerOptionsMessageTypeChoiceEnum string
@@ -295,9 +295,9 @@ func (obj *dhcpv6ServerOptionsMessageType) Choice() Dhcpv6ServerOptionsMessageTy
 	return Dhcpv6ServerOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Reply to set choice
-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
@@ -305,9 +305,9 @@ func (obj *dhcpv6ServerOptionsMessageType) Advertise() {
 	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.ADVERTISE)
 }
 
-// getter for ReConfigure to set choice
-func (obj *dhcpv6ServerOptionsMessageType) ReConfigure() {
-	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.RE_CONFIGURE)
+// getter for Reply to set choice
+func (obj *dhcpv6ServerOptionsMessageType) Reply() {
+	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.REPLY)
 }
 
 // The server message name where the option is included, by default it is all.
diff --git a/gosnappi/flow_rsvp_lsp_tunnel_flag.go b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
index 724bbb14..5047737d 100644
--- a/gosnappi/flow_rsvp_lsp_tunnel_flag.go
+++ b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
@@ -270,10 +270,10 @@ type FlowRSVPLspTunnelFlag interface {
 	setChoice(value FlowRSVPLspTunnelFlagChoiceEnum) FlowRSVPLspTunnelFlag
 	// HasChoice checks if Choice has been set in FlowRSVPLspTunnelFlag
 	HasChoice() bool
-	// getter for LocalProtectionDesired to set choice.
-	LocalProtectionDesired()
 	// getter for SeStyleDesired to set choice.
 	SeStyleDesired()
+	// getter for LocalProtectionDesired to set choice.
+	LocalProtectionDesired()
 	// getter for LabelRecordingDesired to set choice.
 	LabelRecordingDesired()
 }
@@ -295,16 +295,16 @@ func (obj *flowRSVPLspTunnelFlag) Choice() FlowRSVPLspTunnelFlagChoiceEnum {
 	return FlowRSVPLspTunnelFlagChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for LocalProtectionDesired to set choice
-func (obj *flowRSVPLspTunnelFlag) LocalProtectionDesired() {
-	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LOCAL_PROTECTION_DESIRED)
-}
-
 // 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)
+}
+
 // getter for LabelRecordingDesired to set choice
 func (obj *flowRSVPLspTunnelFlag) LabelRecordingDesired() {
 	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LABEL_RECORDING_DESIRED)
diff --git a/gosnappi/go.mod b/gosnappi/go.mod
index 8c20411c..4346afbb 100644
--- a/gosnappi/go.mod
+++ b/gosnappi/go.mod
@@ -9,7 +9,7 @@ require (
 	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.66.2
+	google.golang.org/grpc v1.67.0
 	google.golang.org/protobuf v1.34.2
 )
 
@@ -17,10 +17,10 @@ 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.26.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // 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
 	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 89e4da0e..3c279b8f 100644
--- a/gosnappi/go.sum
+++ b/gosnappi/go.sum
@@ -23,16 +23,16 @@ 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.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
-google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
-google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
+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.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
+google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/gosnappi/metrics_response.go b/gosnappi/metrics_response.go
index bdd6f2b7..18ff43e5 100644
--- a/gosnappi/metrics_response.go
+++ b/gosnappi/metrics_response.go
@@ -302,14 +302,14 @@ type MetricsResponse interface {
 	setChoice(value MetricsResponseChoiceEnum) MetricsResponse
 	// HasChoice checks if Choice has been set in MetricsResponse
 	HasChoice() bool
-	// getter for Dhcpv4Server to set choice.
-	Dhcpv4Server()
-	// getter for Dhcpv4Client to set choice.
-	Dhcpv4Client()
 	// getter for Dhcpv6Client to set choice.
 	Dhcpv6Client()
+	// getter for Dhcpv4Server to set choice.
+	Dhcpv4Server()
 	// getter for Dhcpv6Server to set choice.
 	Dhcpv6Server()
+	// getter for Dhcpv4Client to set choice.
+	Dhcpv4Client()
 	// PortMetrics returns MetricsResponsePortMetricIterIter, set in MetricsResponse
 	PortMetrics() MetricsResponsePortMetricIter
 	// FlowMetrics returns MetricsResponseFlowMetricIterIter, set in MetricsResponse
@@ -376,26 +376,26 @@ func (obj *metricsResponse) Choice() MetricsResponseChoiceEnum {
 	return MetricsResponseChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Dhcpv4Server to set choice
-func (obj *metricsResponse) Dhcpv4Server() {
-	obj.setChoice(MetricsResponseChoice.DHCPV4_SERVER)
-}
-
-// getter for Dhcpv4Client to set choice
-func (obj *metricsResponse) Dhcpv4Client() {
-	obj.setChoice(MetricsResponseChoice.DHCPV4_CLIENT)
-}
-
 // getter for Dhcpv6Client to set choice
 func (obj *metricsResponse) Dhcpv6Client() {
 	obj.setChoice(MetricsResponseChoice.DHCPV6_CLIENT)
 }
 
+// getter for Dhcpv4Server to set choice
+func (obj *metricsResponse) Dhcpv4Server() {
+	obj.setChoice(MetricsResponseChoice.DHCPV4_SERVER)
+}
+
 // getter for Dhcpv6Server to set choice
 func (obj *metricsResponse) Dhcpv6Server() {
 	obj.setChoice(MetricsResponseChoice.DHCPV6_SERVER)
 }
 
+// getter for Dhcpv4Client to set choice
+func (obj *metricsResponse) Dhcpv4Client() {
+	obj.setChoice(MetricsResponseChoice.DHCPV4_CLIENT)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *metricsResponse) HasChoice() bool {
diff --git a/requirements.txt b/requirements.txt
index d34ff02d..ed9d0cd3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 --prefer-binary
-grpcio~=1.44.0 ; python_version <= '3.6'
-grpcio~=1.59.0 ; python_version > '3.6'
+requests
+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-tools~=1.59.0 ; python_version > '3.6'
-requests
+grpcio~=1.59.0 ; python_version > '3.6'
+grpcio~=1.44.0 ; python_version <= '3.6'
 PyYAML
-protobuf~=4.24.4 ;  python_version > '3.6'
-protobuf~=3.15.0 ;  python_version <= '3.6'
 semantic_version
 urllib3