diff --git a/gosnappi/bgp_attributes_community.go b/gosnappi/bgp_attributes_community.go
index edb3c713..b9c9469a 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 NoExport to set choice.
-	NoExport()
-	// 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 NoExportSubconfed to set choice.
+	NoExportSubconfed()
+	// getter for NoLlgr to set choice.
+	NoLlgr()
+	// 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,9 +322,14 @@ func (obj *bgpAttributesCommunity) Choice() BgpAttributesCommunityChoiceEnum {
 	return BgpAttributesCommunityChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// 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)
+}
+
+// getter for LlgrStale to set choice
+func (obj *bgpAttributesCommunity) LlgrStale() {
+	obj.setChoice(BgpAttributesCommunityChoice.LLGR_STALE)
 }
 
 // getter for NoExportSubconfed to set choice
@@ -332,19 +337,14 @@ 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 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)
 }
 
 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 35709455..3318f00e 100644
--- a/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go
+++ b/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go
@@ -272,8 +272,6 @@ type BgpAttributesSrPolicyExplicitNullPolicy interface {
 	setChoice(value BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum) BgpAttributesSrPolicyExplicitNullPolicy
 	// HasChoice checks if Choice has been set in BgpAttributesSrPolicyExplicitNullPolicy
 	HasChoice() bool
-	// getter for PushIpv4 to set choice.
-	PushIpv4()
 	// getter for PushIpv6 to set choice.
 	PushIpv6()
 	// getter for Unknown to set choice.
@@ -282,6 +280,8 @@ type BgpAttributesSrPolicyExplicitNullPolicy interface {
 	PushIpv4AndIpv6()
 	// getter for DonotPush to set choice.
 	DonotPush()
+	// getter for PushIpv4 to set choice.
+	PushIpv4()
 }
 
 type BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum string
@@ -305,11 +305,6 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Choice() BgpAttributesSrPoli
 	return BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for PushIpv4 to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4)
-}
-
 // getter for PushIpv6 to set choice
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV6)
@@ -330,6 +325,11 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
 }
 
+// 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 5e4ebb47..605e6f04 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
@@ -270,14 +270,14 @@ type Dhcpv6ClientOptionsDuidUuidVariant interface {
 	setChoice(value Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum) Dhcpv6ClientOptionsDuidUuidVariant
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsDuidUuidVariant
 	HasChoice() bool
-	// getter for Ncs to set choice.
-	Ncs()
 	// getter for Dce to set choice.
 	Dce()
-	// getter for Guid to set choice.
-	Guid()
+	// getter for Ncs to set choice.
+	Ncs()
 	// getter for VarReserved to set choice.
 	VarReserved()
+	// getter for Guid to set choice.
+	Guid()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum string
@@ -299,19 +299,14 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) Choice() Dhcpv6ClientOptionsDuidU
 	return Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Ncs to set choice
-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)
+// getter for Ncs to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVariant) Ncs() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.NCS)
 }
 
 // getter for VarReserved to set choice
@@ -319,6 +314,11 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) VarReserved() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.VAR_RESERVED)
 }
 
+// getter for Guid to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVariant) Guid() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.GUID)
+}
+
 // 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 449404dd..06c020ba 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_3 to set choice.
-	V_3()
-	// getter for V_4 to set choice.
-	V_4()
 	// getter for V_2 to set choice.
 	V_2()
-	// getter for V_5 to set choice.
-	V_5()
+	// getter for V_3 to set choice.
+	V_3()
 	// getter for V_1 to set choice.
 	V_1()
+	// getter for V_5 to set choice.
+	V_5()
+	// getter for V_4 to set choice.
+	V_4()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum string
@@ -303,19 +303,19 @@ func (obj *dhcpv6ClientOptionsDuidUuidVersion) Choice() Dhcpv6ClientOptionsDuidU
 	return Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for V_2 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_2() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_2)
+}
+
 // getter for V_3 to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_3() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_3)
 }
 
-// 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_1 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_1() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_1)
 }
 
 // getter for V_5 to set choice
@@ -323,9 +323,9 @@ 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_4 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_4() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_4)
 }
 
 // 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).
diff --git a/gosnappi/dhcpv6_client_options_message_type.go b/gosnappi/dhcpv6_client_options_message_type.go
index 90e32a09..255fdc09 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 Request to set choice.
-	Request()
 	// getter for Release to set choice.
 	Release()
-	// getter for InformRequest to set choice.
-	InformRequest()
 	// getter for Solicit to set choice.
 	Solicit()
-	// getter for Renew to set choice.
-	Renew()
+	// getter for InformRequest to set choice.
+	InformRequest()
 	// getter for Rebind to set choice.
 	Rebind()
+	// getter for Renew to set choice.
+	Renew()
+	// getter for Request to set choice.
+	Request()
 }
 
 type Dhcpv6ClientOptionsMessageTypeChoiceEnum string
@@ -307,24 +307,24 @@ func (obj *dhcpv6ClientOptionsMessageType) Choice() Dhcpv6ClientOptionsMessageTy
 	return Dhcpv6ClientOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Request to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Request() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REQUEST)
-}
-
 // getter for Release to set choice
 func (obj *dhcpv6ClientOptionsMessageType) Release() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RELEASE)
 }
 
+// getter for Solicit to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Solicit() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.SOLICIT)
+}
+
 // 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 Rebind to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
 }
 
 // getter for Renew to set choice
@@ -332,9 +332,9 @@ func (obj *dhcpv6ClientOptionsMessageType) Renew() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RENEW)
 }
 
-// getter for Rebind to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
+// getter for Request to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Request() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.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 e55fe369..28aa0cd7 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 Sztp to set choice.
-	Sztp()
-	// getter for NameServers to set choice.
-	NameServers()
-	// getter for Fqdn to set choice.
-	Fqdn()
 	// getter for BootfileUrl to set choice.
 	BootfileUrl()
+	// 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()
 	// 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,14 +322,9 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Choice() Dhcpv6ClientOptionsOption
 	return Dhcpv6ClientOptionsOptionsRequestChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Sztp to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) Sztp() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.SZTP)
-}
-
-// getter for NameServers to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
+// getter for BootfileUrl to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) BootfileUrl() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.BOOTFILE_URL)
 }
 
 // getter for Fqdn to set choice
@@ -337,16 +332,21 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Fqdn() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.FQDN)
 }
 
-// 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)
 }
 
+// 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)
+}
+
 // 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 404e5df0..fbc1b852 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 ReConfigure to set choice.
-	ReConfigure()
 	// getter for Advertise to set choice.
 	Advertise()
+	// getter for ReConfigure to set choice.
+	ReConfigure()
+	// 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 Advertise to set choice
+func (obj *dhcpv6ServerOptionsMessageType) Advertise() {
+	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.ADVERTISE)
 }
 
 // getter for ReConfigure to set choice
@@ -305,9 +305,9 @@ 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 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 5047737d..006d6812 100644
--- a/gosnappi/flow_rsvp_lsp_tunnel_flag.go
+++ b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
@@ -272,10 +272,10 @@ type FlowRSVPLspTunnelFlag interface {
 	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 LocalProtectionDesired to set choice.
+	LocalProtectionDesired()
 }
 
 type FlowRSVPLspTunnelFlagChoiceEnum string
@@ -300,16 +300,16 @@ 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)
 }
 
+// getter for LocalProtectionDesired to set choice
+func (obj *flowRSVPLspTunnelFlag) LocalProtectionDesired() {
+	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LOCAL_PROTECTION_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 acc8872f..72271564 100644
--- a/gosnappi/go.mod
+++ b/gosnappi/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/mux v1.8.1
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	google.golang.org/grpc v1.68.0
 	google.golang.org/protobuf v1.35.2
 )
diff --git a/gosnappi/go.sum b/gosnappi/go.sum
index fdc7c5d7..b23ccf9f 100644
--- a/gosnappi/go.sum
+++ b/gosnappi/go.sum
@@ -23,8 +23,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 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=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 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=
diff --git a/gosnappi/metrics_response.go b/gosnappi/metrics_response.go
index 121f735d..544ce6dc 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 Dhcpv4Client to set choice.
-	Dhcpv4Client()
-	// getter for Dhcpv4Server to set choice.
-	Dhcpv4Server()
 	// getter for Dhcpv6Server to set choice.
 	Dhcpv6Server()
 	// getter for Dhcpv6Client to set choice.
 	Dhcpv6Client()
+	// getter for Dhcpv4Client to set choice.
+	Dhcpv4Client()
+	// getter for Dhcpv4Server to set choice.
+	Dhcpv4Server()
 	// PortMetrics returns MetricsResponsePortMetricIterIter, set in MetricsResponse
 	PortMetrics() MetricsResponsePortMetricIter
 	// FlowMetrics returns MetricsResponseFlowMetricIterIter, set in MetricsResponse
@@ -382,16 +382,6 @@ func (obj *metricsResponse) Choice() MetricsResponseChoiceEnum {
 	return MetricsResponseChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Dhcpv4Client to set choice
-func (obj *metricsResponse) Dhcpv4Client() {
-	obj.setChoice(MetricsResponseChoice.DHCPV4_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)
@@ -402,6 +392,16 @@ func (obj *metricsResponse) Dhcpv6Client() {
 	obj.setChoice(MetricsResponseChoice.DHCPV6_CLIENT)
 }
 
+// getter for Dhcpv4Client to set choice
+func (obj *metricsResponse) Dhcpv4Client() {
+	obj.setChoice(MetricsResponseChoice.DHCPV4_CLIENT)
+}
+
+// getter for Dhcpv4Server to set choice
+func (obj *metricsResponse) Dhcpv4Server() {
+	obj.setChoice(MetricsResponseChoice.DHCPV4_SERVER)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *metricsResponse) HasChoice() bool {
diff --git a/requirements.txt b/requirements.txt
index 0e0059aa..86b7b623 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 --prefer-binary
-protobuf~=4.24.4 ;  python_version > '3.6'
-protobuf~=3.15.0 ;  python_version <= '3.6'
-grpcio-tools~=1.59.0 ; python_version > '3.6'
-grpcio~=1.44.0 ; python_version <= '3.6'
 grpcio-tools~=1.44.0 ; python_version <= '3.6'
+grpcio-tools~=1.59.0 ; python_version > '3.6'
 grpcio~=1.59.0 ; python_version > '3.6'
+grpcio~=1.44.0 ; python_version <= '3.6'
 PyYAML
+protobuf~=3.15.0 ;  python_version <= '3.6'
+protobuf~=4.24.4 ;  python_version > '3.6'
 requests
-urllib3
 semantic_version
+urllib3
diff --git a/setup.py b/setup.py
index 4f1a7369..c8432cd6 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
     python_requires=">=2.7, <4",
     install_requires=install_requires,
     extras_require={
-        "ixnetwork": ["snappi_ixnetwork==1.13.0"],
+        "ixnetwork": ["snappi_ixnetwork==1.17.0"],
         "trex": ["snappi_trex"],
         "testing": ["pytest", "flask"],
     },