diff --git a/do.py b/do.py
index 954ea681..946f1145 100644
--- a/do.py
+++ b/do.py
@@ -35,9 +35,13 @@
 USE_OPENAPIART_DIR = None
 USE_MODELS_DIR = None
 
+
+
+
 # supported values - branch name or None
 USE_OPENAPIART_BRANCH = None
-USE_MODELS_BRANCH = None
+USE_MODELS_BRANCH = None 
+
 
 OPENAPIART_REPO = "https://github.com/open-traffic-generator/openapiart.git"
 MODELS_REPO = "https://github.com/open-traffic-generator/models.git"
diff --git a/gosnappi/bgp_attributes_community.go b/gosnappi/bgp_attributes_community.go
index 74353cc6..6e02ffd5 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 LlgrStale to set choice.
-	LlgrStale()
+	// getter for NoLlgr to set choice.
+	NoLlgr()
 	// getter for NoExport to set choice.
 	NoExport()
 	// getter for NoExportSubconfed to set choice.
 	NoExportSubconfed()
+	// getter for LlgrStale to set choice.
+	LlgrStale()
 	// getter for NoAdvertised to set choice.
 	NoAdvertised()
-	// getter for NoLlgr to set choice.
-	NoLlgr()
 	// 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,9 @@ 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 NoLlgr to set choice
+func (obj *bgpAttributesCommunity) NoLlgr() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_LLGR)
 }
 
 // getter for NoExport to set choice
@@ -337,16 +337,16 @@ func (obj *bgpAttributesCommunity) NoExportSubconfed() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT_SUBCONFED)
 }
 
+// getter for LlgrStale to set choice
+func (obj *bgpAttributesCommunity) LlgrStale() {
+	obj.setChoice(BgpAttributesCommunityChoice.LLGR_STALE)
+}
+
 // 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)
-}
-
 func (obj *bgpAttributesCommunity) setChoice(value BgpAttributesCommunityChoiceEnum) BgpAttributesCommunity {
 	intValue, ok := otg.BgpAttributesCommunity_Choice_Enum_value[string(value)]
 	if !ok {
diff --git a/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go b/gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go
index 0a5b0dd6..faf9238b 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 PushIpv6 to set choice.
 	PushIpv6()
-	// getter for PushIpv4AndIpv6 to set choice.
-	PushIpv4AndIpv6()
 	// getter for DonotPush to set choice.
 	DonotPush()
+	// getter for PushIpv4AndIpv6 to set choice.
+	PushIpv4AndIpv6()
 	// getter for PushIpv4 to set choice.
 	PushIpv4()
-	// getter for Unknown to set choice.
-	Unknown()
 }
 
 type BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum string
@@ -305,31 +305,31 @@ 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 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 DonotPush to set choice
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
 }
 
+// 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 Unknown to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Unknown() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.UNKNOWN)
-}
-
 // 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 fe2057b1..b6d10364 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 VarReserved to set choice.
 	VarReserved()
-	// getter for Dce to set choice.
-	Dce()
+	// getter for Ncs to set choice.
+	Ncs()
 	// getter for Guid to set choice.
 	Guid()
+	// getter for Dce to set choice.
+	Dce()
 }
 
 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 VarReserved to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVariant) VarReserved() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.VAR_RESERVED)
 }
 
-// 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)
 }
 
 // getter for Guid to set choice
@@ -319,6 +314,11 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) Guid() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.GUID)
 }
 
+// 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 9f3c24fc..9099fdc7 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_5 to set choice.
-	V_5()
-	// 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_1 to set choice.
 	V_1()
+	// getter for V_2 to set choice.
+	V_2()
+	// getter for V_3 to set choice.
+	V_3()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum string
@@ -303,19 +303,19 @@ 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_5 to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_5() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_5)
 }
 
-// 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_1 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_1() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_1)
 }
 
 // getter for V_2 to set choice
@@ -323,9 +323,9 @@ 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_3 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_3() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_3)
 }
 
 // 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 43c9de5d..08685fe6 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 Solicit to set choice.
-	Solicit()
-	// getter for Release to set choice.
-	Release()
 	// getter for Renew to set choice.
 	Renew()
+	// getter for Release to set choice.
+	Release()
+	// getter for Rebind to set choice.
+	Rebind()
+	// getter for Solicit to set choice.
+	Solicit()
 	// getter for Request to set choice.
 	Request()
 	// getter for InformRequest to set choice.
 	InformRequest()
-	// getter for Rebind to set choice.
-	Rebind()
 }
 
 type Dhcpv6ClientOptionsMessageTypeChoiceEnum string
@@ -307,9 +307,9 @@ func (obj *dhcpv6ClientOptionsMessageType) Choice() Dhcpv6ClientOptionsMessageTy
 	return Dhcpv6ClientOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Solicit to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Solicit() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.SOLICIT)
+// getter for Renew to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Renew() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RENEW)
 }
 
 // getter for Release to set choice
@@ -317,9 +317,14 @@ func (obj *dhcpv6ClientOptionsMessageType) Release() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RELEASE)
 }
 
-// getter for Renew to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Renew() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RENEW)
+// 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 Request to set choice
@@ -332,11 +337,6 @@ func (obj *dhcpv6ClientOptionsMessageType) InformRequest() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.INFORM_REQUEST)
 }
 
-// getter for Rebind to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
-}
-
 // The client message name where the option is included, by default it is all.
 // Choice returns a string
 func (obj *dhcpv6ClientOptionsMessageType) HasChoice() bool {
diff --git a/gosnappi/dhcpv6_client_options_options_request.go b/gosnappi/dhcpv6_client_options_options_request.go
index 5c4a990f..7224729b 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 BootfileUrl to set choice.
+	BootfileUrl()
 	// getter for VendorInformation to set choice.
 	VendorInformation()
 	// getter for Sztp to set choice.
 	Sztp()
 	// getter for Fqdn to set choice.
 	Fqdn()
-	// getter for BootfileUrl to set choice.
-	BootfileUrl()
-	// getter for NameServers to set choice.
-	NameServers()
 	// 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,6 +322,16 @@ 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 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)
@@ -337,16 +347,6 @@ 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 NameServers to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
-}
-
 // 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 fbc1b852..404e5df0 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 Advertise to set choice.
-	Advertise()
-	// getter for ReConfigure to set choice.
-	ReConfigure()
 	// getter for Reply to set choice.
 	Reply()
+	// getter for ReConfigure to set choice.
+	ReConfigure()
+	// getter for Advertise to set choice.
+	Advertise()
 }
 
 type Dhcpv6ServerOptionsMessageTypeChoiceEnum string
@@ -295,9 +295,9 @@ func (obj *dhcpv6ServerOptionsMessageType) Choice() Dhcpv6ServerOptionsMessageTy
 	return Dhcpv6ServerOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// 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)
 }
 
 // getter for ReConfigure to set choice
@@ -305,9 +305,9 @@ func (obj *dhcpv6ServerOptionsMessageType) ReConfigure() {
 	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.RE_CONFIGURE)
 }
 
-// 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)
 }
 
 // The server message name where the option is included, by default it is all.
diff --git a/gosnappi/egress_only_tracking_filter.go b/gosnappi/egress_only_tracking_filter.go
index 64f81948..f79b6b3d 100644
--- a/gosnappi/egress_only_tracking_filter.go
+++ b/gosnappi/egress_only_tracking_filter.go
@@ -270,10 +270,10 @@ type EgressOnlyTrackingFilter interface {
 	setChoice(value EgressOnlyTrackingFilterChoiceEnum) EgressOnlyTrackingFilter
 	// HasChoice checks if Choice has been set in EgressOnlyTrackingFilter
 	HasChoice() bool
-	// getter for None to set choice.
-	None()
 	// getter for AutoMacsec to set choice.
 	AutoMacsec()
+	// getter for None to set choice.
+	None()
 }
 
 type EgressOnlyTrackingFilterChoiceEnum string
@@ -291,16 +291,16 @@ func (obj *egressOnlyTrackingFilter) Choice() EgressOnlyTrackingFilterChoiceEnum
 	return EgressOnlyTrackingFilterChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for None to set choice
-func (obj *egressOnlyTrackingFilter) None() {
-	obj.setChoice(EgressOnlyTrackingFilterChoice.NONE)
-}
-
 // getter for AutoMacsec to set choice
 func (obj *egressOnlyTrackingFilter) AutoMacsec() {
 	obj.setChoice(EgressOnlyTrackingFilterChoice.AUTO_MACSEC)
 }
 
+// getter for None to set choice
+func (obj *egressOnlyTrackingFilter) None() {
+	obj.setChoice(EgressOnlyTrackingFilterChoice.NONE)
+}
+
 // If a packet does not match the filter it will not be considered for egress tracking. Currently two options are provided: none: All packets will be considered for egress only tracking. auto_macsec: This requires that MACsec enabled Ethernet interface should be configured on this port.  This filter will ensure that only packets with Ethernet Type set to MACsec (0x88E5) and  destined to traffic Rx device(s) will be considered for egress only tracking
 // Choice returns a string
 func (obj *egressOnlyTrackingFilter) HasChoice() bool {
diff --git a/gosnappi/flow_payload.go b/gosnappi/flow_payload.go
index dabc6ea2..566748c4 100644
--- a/gosnappi/flow_payload.go
+++ b/gosnappi/flow_payload.go
@@ -279,14 +279,14 @@ type FlowPayload interface {
 	setChoice(value FlowPayloadChoiceEnum) FlowPayload
 	// HasChoice checks if Choice has been set in FlowPayload
 	HasChoice() bool
+	// getter for IncrementWord to set choice.
+	IncrementWord()
 	// getter for DecrementWord to set choice.
 	DecrementWord()
 	// getter for IncrementByte to set choice.
 	IncrementByte()
 	// getter for DecrementByte to set choice.
 	DecrementByte()
-	// getter for IncrementWord to set choice.
-	IncrementWord()
 	// Fixed returns FlowPayloadFixed, set in FlowPayload.
 	// FlowPayloadFixed is payload with user defined pattern.
 	Fixed() FlowPayloadFixed
@@ -319,6 +319,11 @@ func (obj *flowPayload) Choice() FlowPayloadChoiceEnum {
 	return FlowPayloadChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for IncrementWord to set choice
+func (obj *flowPayload) IncrementWord() {
+	obj.setChoice(FlowPayloadChoice.INCREMENT_WORD)
+}
+
 // getter for DecrementWord to set choice
 func (obj *flowPayload) DecrementWord() {
 	obj.setChoice(FlowPayloadChoice.DECREMENT_WORD)
@@ -334,11 +339,6 @@ func (obj *flowPayload) DecrementByte() {
 	obj.setChoice(FlowPayloadChoice.DECREMENT_BYTE)
 }
 
-// getter for IncrementWord to set choice
-func (obj *flowPayload) IncrementWord() {
-	obj.setChoice(FlowPayloadChoice.INCREMENT_WORD)
-}
-
 // A choice used to determine the pattern of the bytes in the payload following the protocol headers.
 // Example of expected behaviour of each choice is as mentioned below,
 // - fixed: this would insert user defined pattern in the payload bytes.
diff --git a/gosnappi/flow_rsvp_lsp_tunnel_flag.go b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
index 724bbb14..d2ddef91 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 LabelRecordingDesired to set choice.
+	LabelRecordingDesired()
 	// getter for LocalProtectionDesired to set choice.
 	LocalProtectionDesired()
 	// getter for SeStyleDesired to set choice.
 	SeStyleDesired()
-	// getter for LabelRecordingDesired to set choice.
-	LabelRecordingDesired()
 }
 
 type FlowRSVPLspTunnelFlagChoiceEnum string
@@ -295,6 +295,11 @@ func (obj *flowRSVPLspTunnelFlag) Choice() FlowRSVPLspTunnelFlagChoiceEnum {
 	return FlowRSVPLspTunnelFlagChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// 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)
@@ -305,11 +310,6 @@ func (obj *flowRSVPLspTunnelFlag) SeStyleDesired() {
 	obj.setChoice(FlowRSVPLspTunnelFlagChoice.SE_STYLE_DESIRED)
 }
 
-// getter for LabelRecordingDesired to set choice
-func (obj *flowRSVPLspTunnelFlag) LabelRecordingDesired() {
-	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LABEL_RECORDING_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 ae4873ee..8ec9fad0 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 LocalProtectionInUse to set choice.
-	LocalProtectionInUse()
 	// getter for LocalProtectionAvailable to set choice.
 	LocalProtectionAvailable()
+	// getter for LocalProtectionInUse to set choice.
+	LocalProtectionInUse()
 }
 
 type FlowRSVPRecordRouteIPv4FlagChoiceEnum string
@@ -291,16 +291,16 @@ func (obj *flowRSVPRecordRouteIPv4Flag) Choice() FlowRSVPRecordRouteIPv4FlagChoi
 	return FlowRSVPRecordRouteIPv4FlagChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// 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)
 }
 
+// getter for LocalProtectionInUse to set choice
+func (obj *flowRSVPRecordRouteIPv4Flag) LocalProtectionInUse() {
+	obj.setChoice(FlowRSVPRecordRouteIPv4FlagChoice.LOCAL_PROTECTION_IN_USE)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *flowRSVPRecordRouteIPv4Flag) HasChoice() bool {
diff --git a/gosnappi/isis_router_capability.go b/gosnappi/isis_router_capability.go
index ab4c4991..8e6b2361 100644
--- a/gosnappi/isis_router_capability.go
+++ b/gosnappi/isis_router_capability.go
@@ -282,10 +282,10 @@ type IsisRouterCapability interface {
 	setChoice(value IsisRouterCapabilityChoiceEnum) IsisRouterCapability
 	// HasChoice checks if Choice has been set in IsisRouterCapability
 	HasChoice() bool
-	// getter for InterfaceIp to set choice.
-	InterfaceIp()
 	// getter for Ipv4TeRouterId to set choice.
 	Ipv4TeRouterId()
+	// getter for InterfaceIp to set choice.
+	InterfaceIp()
 	// CustomRouterCapId returns string, set in IsisRouterCapability.
 	CustomRouterCapId() string
 	// SetCustomRouterCapId assigns string provided by user to IsisRouterCapability
@@ -346,16 +346,16 @@ func (obj *isisRouterCapability) Choice() IsisRouterCapabilityChoiceEnum {
 	return IsisRouterCapabilityChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for InterfaceIp to set choice
-func (obj *isisRouterCapability) InterfaceIp() {
-	obj.setChoice(IsisRouterCapabilityChoice.INTERFACE_IP)
-}
-
 // getter for Ipv4TeRouterId to set choice
 func (obj *isisRouterCapability) Ipv4TeRouterId() {
 	obj.setChoice(IsisRouterCapabilityChoice.IPV4_TE_ROUTER_ID)
 }
 
+// getter for InterfaceIp to set choice
+func (obj *isisRouterCapability) InterfaceIp() {
+	obj.setChoice(IsisRouterCapabilityChoice.INTERFACE_IP)
+}
+
 // The Router Capability ID SHOULD be identical to the value advertised in the Traffic Engineering Router ID TLV [RFC5305].
 // If no Traffic Engineering Router ID is assigned, the Router ID SHOULD be identical to an IP Interface Address [RFC1195]
 // advertised by the originating IS.
diff --git a/gosnappi/metrics_response.go b/gosnappi/metrics_response.go
index b3e140b8..ac7a250f 100644
--- a/gosnappi/metrics_response.go
+++ b/gosnappi/metrics_response.go
@@ -322,14 +322,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 Dhcpv6Client to set choice.
+	Dhcpv6Client()
 	// 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()
 	// PortMetrics returns MetricsResponsePortMetricIterIter, set in MetricsResponse
 	PortMetrics() MetricsResponsePortMetricIter
 	// FlowMetrics returns MetricsResponseFlowMetricIterIter, set in MetricsResponse
@@ -436,6 +436,16 @@ 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 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)
@@ -446,16 +456,6 @@ func (obj *metricsResponse) Dhcpv6Server() {
 	obj.setChoice(MetricsResponseChoice.DHCPV6_SERVER)
 }
 
-// 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)
-}
-
 // description is TBD
 // Choice returns a string
 func (obj *metricsResponse) HasChoice() bool {
diff --git a/gosnappi/mka_basic_rekey_mode.go b/gosnappi/mka_basic_rekey_mode.go
index 73342a7e..9102f782 100644
--- a/gosnappi/mka_basic_rekey_mode.go
+++ b/gosnappi/mka_basic_rekey_mode.go
@@ -278,10 +278,10 @@ type MkaBasicRekeyMode interface {
 	setChoice(value MkaBasicRekeyModeChoiceEnum) MkaBasicRekeyMode
 	// HasChoice checks if Choice has been set in MkaBasicRekeyMode
 	HasChoice() bool
-	// getter for DontRekey to set choice.
-	DontRekey()
 	// getter for PnBased to set choice.
 	PnBased()
+	// getter for DontRekey to set choice.
+	DontRekey()
 	// TimerBased returns MkaBasicRekeyModeTimerBased, set in MkaBasicRekeyMode.
 	// MkaBasicRekeyModeTimerBased is timer based periodic rekey properties.
 	TimerBased() MkaBasicRekeyModeTimerBased
@@ -310,16 +310,16 @@ func (obj *mkaBasicRekeyMode) Choice() MkaBasicRekeyModeChoiceEnum {
 	return MkaBasicRekeyModeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for DontRekey to set choice
-func (obj *mkaBasicRekeyMode) DontRekey() {
-	obj.setChoice(MkaBasicRekeyModeChoice.DONT_REKEY)
-}
-
 // getter for PnBased to set choice
 func (obj *mkaBasicRekeyMode) PnBased() {
 	obj.setChoice(MkaBasicRekeyModeChoice.PN_BASED)
 }
 
+// getter for DontRekey to set choice
+func (obj *mkaBasicRekeyMode) DontRekey() {
+	obj.setChoice(MkaBasicRekeyModeChoice.DONT_REKEY)
+}
+
 // Mode choices.
 // Choice returns a string
 func (obj *mkaBasicRekeyMode) HasChoice() bool {
diff --git a/gosnappi/ospfv3_v6rr_route_origin.go b/gosnappi/ospfv3_v6rr_route_origin.go
index 16627389..0b2cc9c0 100644
--- a/gosnappi/ospfv3_v6rr_route_origin.go
+++ b/gosnappi/ospfv3_v6rr_route_origin.go
@@ -278,12 +278,12 @@ type Ospfv3V6RRRouteOrigin interface {
 	setChoice(value Ospfv3V6RRRouteOriginChoiceEnum) Ospfv3V6RRRouteOrigin
 	// HasChoice checks if Choice has been set in Ospfv3V6RRRouteOrigin
 	HasChoice() bool
+	// getter for ExternalType_1 to set choice.
+	ExternalType_1()
 	// getter for IntraArea to set choice.
 	IntraArea()
 	// getter for InterArea to set choice.
 	InterArea()
-	// getter for ExternalType_1 to set choice.
-	ExternalType_1()
 	// getter for ExternalType_2 to set choice.
 	ExternalType_2()
 	// NssaExternal returns Ospfv3V6RRNssaExternal, set in Ospfv3V6RRRouteOrigin.
@@ -318,6 +318,11 @@ func (obj *ospfv3V6RRRouteOrigin) Choice() Ospfv3V6RRRouteOriginChoiceEnum {
 	return Ospfv3V6RRRouteOriginChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for ExternalType_1 to set choice
+func (obj *ospfv3V6RRRouteOrigin) ExternalType_1() {
+	obj.setChoice(Ospfv3V6RRRouteOriginChoice.EXTERNAL_TYPE_1)
+}
+
 // getter for IntraArea to set choice
 func (obj *ospfv3V6RRRouteOrigin) IntraArea() {
 	obj.setChoice(Ospfv3V6RRRouteOriginChoice.INTRA_AREA)
@@ -328,11 +333,6 @@ func (obj *ospfv3V6RRRouteOrigin) InterArea() {
 	obj.setChoice(Ospfv3V6RRRouteOriginChoice.INTER_AREA)
 }
 
-// getter for ExternalType_1 to set choice
-func (obj *ospfv3V6RRRouteOrigin) ExternalType_1() {
-	obj.setChoice(Ospfv3V6RRRouteOriginChoice.EXTERNAL_TYPE_1)
-}
-
 // getter for ExternalType_2 to set choice
 func (obj *ospfv3V6RRRouteOrigin) ExternalType_2() {
 	obj.setChoice(Ospfv3V6RRRouteOriginChoice.EXTERNAL_TYPE_2)
diff --git a/gosnappi/rocev2_verb.go b/gosnappi/rocev2_verb.go
index 7efb0768..5b7e60eb 100644
--- a/gosnappi/rocev2_verb.go
+++ b/gosnappi/rocev2_verb.go
@@ -280,12 +280,12 @@ type Rocev2Verb interface {
 	setChoice(value Rocev2VerbChoiceEnum) Rocev2Verb
 	// HasChoice checks if Choice has been set in Rocev2Verb
 	HasChoice() bool
+	// getter for Send to set choice.
+	Send()
 	// getter for Read to set choice.
 	Read()
 	// getter for Write to set choice.
 	Write()
-	// getter for Send to set choice.
-	Send()
 	// WriteWithImmediate returns Rocev2ImmediateData, set in Rocev2Verb.
 	// Rocev2ImmediateData is four bytes of immediate Data for SEND/WRITE with immediate.
 	WriteWithImmediate() Rocev2ImmediateData
@@ -326,6 +326,11 @@ func (obj *rocev2Verb) Choice() Rocev2VerbChoiceEnum {
 	return Rocev2VerbChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for Send to set choice
+func (obj *rocev2Verb) Send() {
+	obj.setChoice(Rocev2VerbChoice.SEND)
+}
+
 // getter for Read to set choice
 func (obj *rocev2Verb) Read() {
 	obj.setChoice(Rocev2VerbChoice.READ)
@@ -336,11 +341,6 @@ func (obj *rocev2Verb) Write() {
 	obj.setChoice(Rocev2VerbChoice.WRITE)
 }
 
-// getter for Send to set choice
-func (obj *rocev2Verb) Send() {
-	obj.setChoice(Rocev2VerbChoice.SEND)
-}
-
 // description is TBD
 // Choice returns a string
 func (obj *rocev2Verb) HasChoice() bool {
diff --git a/gosnappi/secure_entity_static_key_rekey_mode.go b/gosnappi/secure_entity_static_key_rekey_mode.go
index d9d9aec2..165ca125 100644
--- a/gosnappi/secure_entity_static_key_rekey_mode.go
+++ b/gosnappi/secure_entity_static_key_rekey_mode.go
@@ -278,10 +278,10 @@ type SecureEntityStaticKeyRekeyMode interface {
 	setChoice(value SecureEntityStaticKeyRekeyModeChoiceEnum) SecureEntityStaticKeyRekeyMode
 	// HasChoice checks if Choice has been set in SecureEntityStaticKeyRekeyMode
 	HasChoice() bool
-	// getter for DontRekey to set choice.
-	DontRekey()
 	// getter for PnBased to set choice.
 	PnBased()
+	// getter for DontRekey to set choice.
+	DontRekey()
 	// TimerBased returns SecureEntityStaticKeyRekeyModeTimerBased, set in SecureEntityStaticKeyRekeyMode.
 	// SecureEntityStaticKeyRekeyModeTimerBased is timer based periodic rekey properties.
 	TimerBased() SecureEntityStaticKeyRekeyModeTimerBased
@@ -310,16 +310,16 @@ func (obj *secureEntityStaticKeyRekeyMode) Choice() SecureEntityStaticKeyRekeyMo
 	return SecureEntityStaticKeyRekeyModeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for DontRekey to set choice
-func (obj *secureEntityStaticKeyRekeyMode) DontRekey() {
-	obj.setChoice(SecureEntityStaticKeyRekeyModeChoice.DONT_REKEY)
-}
-
 // getter for PnBased to set choice
 func (obj *secureEntityStaticKeyRekeyMode) PnBased() {
 	obj.setChoice(SecureEntityStaticKeyRekeyModeChoice.PN_BASED)
 }
 
+// getter for DontRekey to set choice
+func (obj *secureEntityStaticKeyRekeyMode) DontRekey() {
+	obj.setChoice(SecureEntityStaticKeyRekeyModeChoice.DONT_REKEY)
+}
+
 // Rekey mode choices.
 // Choice returns a string
 func (obj *secureEntityStaticKeyRekeyMode) HasChoice() bool {
diff --git a/requirements.txt b/requirements.txt
index d96de737..7a528299 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
-PyYAML
-protobuf~=5.29.5
 requests
+protobuf~=5.29.5
+PyYAML
 grpcio-tools~=1.70.0
 grpcio~=1.70.0
-semantic_version
 urllib3
+semantic_version