diff --git a/do.py b/do.py
index e3fc272d..6cd282d8 100644
--- a/do.py
+++ b/do.py
@@ -33,6 +33,7 @@
 
 # supported values - local openapiart path or None
 USE_OPENAPIART_DIR = None
+#USE_MODELS_DIR = "C:\\Users\\waseebai\\Documents\\project\\GitHub\\models"
 USE_MODELS_DIR = None
 
 # supported values - branch name or None
diff --git a/gosnappi/bgp_attributes_community.go b/gosnappi/bgp_attributes_community.go
index 5b6fe4d2..96f72770 100644
--- a/gosnappi/bgp_attributes_community.go
+++ b/gosnappi/bgp_attributes_community.go
@@ -284,10 +284,10 @@ type BgpAttributesCommunity interface {
 	NoAdvertised()
 	// getter for NoExportSubconfed to set choice.
 	NoExportSubconfed()
-	// getter for NoLlgr to set choice.
-	NoLlgr()
 	// getter for NoExport to set choice.
 	NoExport()
+	// 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
@@ -337,16 +337,16 @@ 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)
 }
 
+// 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 7e32f1f6..512e2bf9 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 PushIpv4AndIpv6 to set choice.
 	PushIpv4AndIpv6()
-	// getter for DonotPush to set choice.
-	DonotPush()
-	// getter for PushIpv6 to set choice.
-	PushIpv6()
 	// getter for PushIpv4 to set choice.
 	PushIpv4()
+	// getter for PushIpv6 to set choice.
+	PushIpv6()
+	// getter for Unknown to set choice.
+	Unknown()
+	// getter for DonotPush to set choice.
+	DonotPush()
 }
 
 type BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum string
@@ -305,19 +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 DonotPush to set choice
-func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
-	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
+// getter for PushIpv4 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4)
 }
 
 // getter for PushIpv6 to set choice
@@ -325,9 +320,14 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_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)
+}
+
+// getter for DonotPush to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
 }
 
 // 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 5e4ebb47..23c369d6 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
@@ -272,10 +272,10 @@ type Dhcpv6ClientOptionsDuidUuidVariant interface {
 	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 Dce to set choice.
+	Dce()
 	// getter for VarReserved to set choice.
 	VarReserved()
 }
@@ -304,16 +304,16 @@ 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 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)
diff --git a/gosnappi/dhcpv6_client_options_duid_uuid_version.go b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
index 8ec29921..143f3a71 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_version.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
@@ -272,14 +272,14 @@ type Dhcpv6ClientOptionsDuidUuidVersion interface {
 	HasChoice() bool
 	// 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()
 	// getter for V_2 to set choice.
 	V_2()
+	// getter for V_4 to set choice.
+	V_4()
 	// getter for V_5 to set choice.
 	V_5()
-	// getter for V_3 to set choice.
-	V_3()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum string
@@ -308,9 +308,9 @@ 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
@@ -318,16 +318,16 @@ func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_2() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_2)
 }
 
+// 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)
-}
-
 // 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 d126933f..353200eb 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 Rebind to set choice.
+	Rebind()
+	// getter for Release to set choice.
+	Release()
 	// getter for Renew to set choice.
 	Renew()
 	// getter for Request to set choice.
 	Request()
-	// getter for Release to set choice.
-	Release()
-	// getter for Solicit to set choice.
-	Solicit()
 	// getter for InformRequest to set choice.
 	InformRequest()
-	// getter for Rebind to set choice.
-	Rebind()
 }
 
 type Dhcpv6ClientOptionsMessageTypeChoiceEnum string
@@ -307,14 +307,14 @@ func (obj *dhcpv6ClientOptionsMessageType) Choice() Dhcpv6ClientOptionsMessageTy
 	return Dhcpv6ClientOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Renew to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Renew() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RENEW)
+// 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 Rebind to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
 }
 
 // getter for Release to set choice
@@ -322,9 +322,14 @@ func (obj *dhcpv6ClientOptionsMessageType) Release() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RELEASE)
 }
 
-// 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 Request to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Request() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REQUEST)
 }
 
 // getter for InformRequest 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 bb44628f..99d76941 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 BootfileUrl to set choice.
+	BootfileUrl()
 	// getter for Sztp to set choice.
 	Sztp()
 	// getter for VendorInformation to set choice.
 	VendorInformation()
 	// getter for NameServers to set choice.
 	NameServers()
-	// getter for BootfileUrl to set choice.
-	BootfileUrl()
-	// getter for Fqdn to set choice.
-	Fqdn()
 	// 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 Fqdn to set choice
+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 Sztp to set choice
 func (obj *dhcpv6ClientOptionsOptionsRequest) Sztp() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.SZTP)
@@ -337,16 +347,6 @@ 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
-func (obj *dhcpv6ClientOptionsOptionsRequest) Fqdn() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.FQDN)
-}
-
 // 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..404e5df0 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 Advertise to set choice.
-	Advertise()
 	// getter for ReConfigure to set choice.
 	ReConfigure()
+	// getter for Advertise to set choice.
+	Advertise()
 }
 
 type Dhcpv6ServerOptionsMessageTypeChoiceEnum string
@@ -300,16 +300,16 @@ 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
 func (obj *dhcpv6ServerOptionsMessageType) ReConfigure() {
 	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.RE_CONFIGURE)
 }
 
+// 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.
 // Choice returns a string
 func (obj *dhcpv6ServerOptionsMessageType) HasChoice() bool {
diff --git a/gosnappi/egress_only_tracking_filter.go b/gosnappi/egress_only_tracking_filter.go
index f79b6b3d..64f81948 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 AutoMacsec to set choice.
-	AutoMacsec()
 	// getter for None to set choice.
 	None()
+	// getter for AutoMacsec to set choice.
+	AutoMacsec()
 }
 
 type EgressOnlyTrackingFilterChoiceEnum string
@@ -291,16 +291,16 @@ func (obj *egressOnlyTrackingFilter) Choice() EgressOnlyTrackingFilterChoiceEnum
 	return EgressOnlyTrackingFilterChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// 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)
 }
 
+// getter for AutoMacsec to set choice
+func (obj *egressOnlyTrackingFilter) AutoMacsec() {
+	obj.setChoice(EgressOnlyTrackingFilterChoice.AUTO_MACSEC)
+}
+
 // 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_rsvp_lsp_tunnel_flag.go b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
index 5047737d..6219236f 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 SeStyleDesired to set choice.
 	SeStyleDesired()
 	// getter for LocalProtectionDesired to set choice.
 	LocalProtectionDesired()
-	// 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 SeStyleDesired to set choice
 func (obj *flowRSVPLspTunnelFlag) SeStyleDesired() {
 	obj.setChoice(FlowRSVPLspTunnelFlagChoice.SE_STYLE_DESIRED)
@@ -305,11 +310,6 @@ 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)
-}
-
 // description is TBD
 // Choice returns a string
 func (obj *flowRSVPLspTunnelFlag) HasChoice() bool {
diff --git a/gosnappi/go.mod b/gosnappi/go.mod
index 0f4d75ae..ffe1c42f 100644
--- a/gosnappi/go.mod
+++ b/gosnappi/go.mod
@@ -2,43 +2,43 @@ module github.com/open-traffic-generator/snappi/gosnappi
 
 go 1.23.0
 
-toolchain go1.24.5
+toolchain go1.24.7
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/mux v1.8.1
-	github.com/stretchr/testify v1.10.0
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
-	go.opentelemetry.io/otel v1.37.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0
-	go.opentelemetry.io/otel/sdk v1.37.0
-	go.opentelemetry.io/otel/trace v1.37.0
-	google.golang.org/grpc v1.74.2
-	google.golang.org/protobuf v1.36.7
+	github.com/stretchr/testify v1.11.1
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
+	go.opentelemetry.io/otel v1.38.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0
+	go.opentelemetry.io/otel/sdk v1.38.0
+	go.opentelemetry.io/otel/trace v1.38.0
+	google.golang.org/grpc v1.75.1
+	google.golang.org/protobuf v1.36.9
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
 require (
-	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel/metric v1.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.7.1 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // 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 bb7e965f..959d746a 100644
--- a/gosnappi/go.sum
+++ b/gosnappi/go.sum
@@ -1,9 +1,9 @@
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
-github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
-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/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
+github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
@@ -21,58 +21,60 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 h1:rbRJ8BBoVMsQShESYZ0FkvcITu8X8QNwJogcLUmDNNw=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0/go.mod h1:ru6KHrNtNHxM4nD/vd6QrLVWgKhxPYgblq4VAtNawTQ=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
-go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
-go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 h1:EtFWSnwW9hGObjkIdmlnWSydO+Qs8OwzfzXLUPg4xOc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0/go.mod h1:QjUEoiGCPkvFZ/MjK6ZZfNOS6mfVEVKYE99dFhuN2LI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA=
-go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
-go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
-go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
-go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
-go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
-go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
-go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
-go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
-go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
+go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 h1:lwI4Dc5leUqENgGuQImwLo4WnuXFPetmPpkLi2IrX54=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 h1:aTL7F04bJHUlztTsNGJ2l+6he8c+y/b//eR0jjjemT4=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0/go.mod h1:kldtb7jDTeol0l3ewcmd8SDvx3EmIE7lyvqbasU3QC4=
+go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
+go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
+go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
+go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
+go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
+go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
+go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4=
+go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
-google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY=
-google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
-google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
-google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
-google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
+google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=
+google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
+google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
+google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
+google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
 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 9b3a8497..c5b797d2 100644
--- a/gosnappi/metrics_response.go
+++ b/gosnappi/metrics_response.go
@@ -320,14 +320,14 @@ type MetricsResponse interface {
 	setChoice(value MetricsResponseChoiceEnum) MetricsResponse
 	// HasChoice checks if Choice has been set in MetricsResponse
 	HasChoice() bool
-	// getter for Dhcpv6Server to set choice.
-	Dhcpv6Server()
 	// getter for Dhcpv4Server to set choice.
 	Dhcpv4Server()
-	// getter for Dhcpv4Client to set choice.
-	Dhcpv4Client()
 	// getter for Dhcpv6Client to set choice.
 	Dhcpv6Client()
+	// 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
@@ -430,26 +430,26 @@ func (obj *metricsResponse) Choice() MetricsResponseChoiceEnum {
 	return MetricsResponseChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Dhcpv6Server to set choice
-func (obj *metricsResponse) Dhcpv6Server() {
-	obj.setChoice(MetricsResponseChoice.DHCPV6_SERVER)
-}
-
 // 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 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/gosnappi/mka_basic_rekey_mode.go b/gosnappi/mka_basic_rekey_mode.go
index 9102f782..73342a7e 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 PnBased to set choice.
-	PnBased()
 	// getter for DontRekey to set choice.
 	DontRekey()
+	// getter for PnBased to set choice.
+	PnBased()
 	// 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 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)
 }
 
+// getter for PnBased to set choice
+func (obj *mkaBasicRekeyMode) PnBased() {
+	obj.setChoice(MkaBasicRekeyModeChoice.PN_BASED)
+}
+
 // Mode choices.
 // Choice returns a string
 func (obj *mkaBasicRekeyMode) HasChoice() bool {
diff --git a/gosnappi/ospfv2_interface_network_type.go b/gosnappi/ospfv2_interface_network_type.go
index 7de2eb9f..3ec53c4b 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 PointToPoint to set choice.
-	PointToPoint()
 	// getter for Broadcast to set choice.
 	Broadcast()
+	// getter for PointToPoint to set choice.
+	PointToPoint()
 	// 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 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)
 }
 
+// getter for PointToPoint to set choice
+func (obj *ospfv2InterfaceNetworkType) PointToPoint() {
+	obj.setChoice(Ospfv2InterfaceNetworkTypeChoice.POINT_TO_POINT)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *ospfv2InterfaceNetworkType) HasChoice() bool {
diff --git a/gosnappi/ospfv3_v6rr_route_origin.go b/gosnappi/ospfv3_v6rr_route_origin.go
index fe808f1d..96aa5d6d 100644
--- a/gosnappi/ospfv3_v6rr_route_origin.go
+++ b/gosnappi/ospfv3_v6rr_route_origin.go
@@ -280,12 +280,12 @@ type Ospfv3V6RRRouteOrigin interface {
 	HasChoice() bool
 	// getter for InterArea to set choice.
 	InterArea()
-	// getter for IntraArea to set choice.
-	IntraArea()
-	// getter for ExternalType_2 to set choice.
-	ExternalType_2()
 	// getter for ExternalType_1 to set choice.
 	ExternalType_1()
+	// getter for ExternalType_2 to set choice.
+	ExternalType_2()
+	// getter for IntraArea to set choice.
+	IntraArea()
 	// NssaExternal returns Ospfv3V6RRNssaExternal, set in Ospfv3V6RRRouteOrigin.
 	// Ospfv3V6RRNssaExternal is container for the forwarding address of NSSA External route origin configuration.
 	NssaExternal() Ospfv3V6RRNssaExternal
@@ -323,9 +323,9 @@ func (obj *ospfv3V6RRRouteOrigin) InterArea() {
 	obj.setChoice(Ospfv3V6RRRouteOriginChoice.INTER_AREA)
 }
 
-// getter for IntraArea to set choice
-func (obj *ospfv3V6RRRouteOrigin) IntraArea() {
-	obj.setChoice(Ospfv3V6RRRouteOriginChoice.INTRA_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
@@ -333,9 +333,9 @@ func (obj *ospfv3V6RRRouteOrigin) ExternalType_2() {
 	obj.setChoice(Ospfv3V6RRRouteOriginChoice.EXTERNAL_TYPE_2)
 }
 
-// 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)
 }
 
 // Supported types are: - intra_area: for Intra-Area. - inter_area: for Inter Area. - external_type_1: for Autonomous System (AS) External with internal AS metric. - external_type_2: for Autonomous System (AS) External with internal and external AS metric. - nssa_external: for type 7 Not-So-Stubby Area (NSSA) External.
diff --git a/gosnappi/rocev2_verb.go b/gosnappi/rocev2_verb.go
index 07c672af..7efb0768 100644
--- a/gosnappi/rocev2_verb.go
+++ b/gosnappi/rocev2_verb.go
@@ -280,10 +280,10 @@ type Rocev2Verb interface {
 	setChoice(value Rocev2VerbChoiceEnum) Rocev2Verb
 	// HasChoice checks if Choice has been set in Rocev2Verb
 	HasChoice() bool
-	// getter for Write to set choice.
-	Write()
 	// 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.
@@ -326,16 +326,16 @@ func (obj *rocev2Verb) Choice() Rocev2VerbChoiceEnum {
 	return Rocev2VerbChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Write to set choice
-func (obj *rocev2Verb) Write() {
-	obj.setChoice(Rocev2VerbChoice.WRITE)
-}
-
 // getter for Read to set choice
 func (obj *rocev2Verb) Read() {
 	obj.setChoice(Rocev2VerbChoice.READ)
 }
 
+// getter for Write to set choice
+func (obj *rocev2Verb) Write() {
+	obj.setChoice(Rocev2VerbChoice.WRITE)
+}
+
 // getter for Send to set choice
 func (obj *rocev2Verb) Send() {
 	obj.setChoice(Rocev2VerbChoice.SEND)
diff --git a/gosnappi/secure_entity_crypto_engine_encrypt_only_tx_sc_tx_pn.go b/gosnappi/secure_entity_crypto_engine_encrypt_only_tx_sc_tx_pn.go
index 54ab287f..a742cfca 100644
--- a/gosnappi/secure_entity_crypto_engine_encrypt_only_tx_sc_tx_pn.go
+++ b/gosnappi/secure_entity_crypto_engine_encrypt_only_tx_sc_tx_pn.go
@@ -280,10 +280,10 @@ type SecureEntityCryptoEngineEncryptOnlyTxScTxPn interface {
 	setChoice(value SecureEntityCryptoEngineEncryptOnlyTxScTxPnChoiceEnum) SecureEntityCryptoEngineEncryptOnlyTxScTxPn
 	// HasChoice checks if Choice has been set in SecureEntityCryptoEngineEncryptOnlyTxScTxPn
 	HasChoice() bool
-	// getter for FixedPn to set choice.
-	FixedPn()
 	// getter for IncrementingPn to set choice.
 	IncrementingPn()
+	// getter for FixedPn to set choice.
+	FixedPn()
 	// Fixed returns SecureEntityCryptoEngineEncryptOnlyFixedPn, set in SecureEntityCryptoEngineEncryptOnlyTxScTxPn.
 	// SecureEntityCryptoEngineEncryptOnlyFixedPn is fixed packet number(PN) configuration.
 	Fixed() SecureEntityCryptoEngineEncryptOnlyFixedPn
@@ -318,16 +318,16 @@ func (obj *secureEntityCryptoEngineEncryptOnlyTxScTxPn) Choice() SecureEntityCry
 	return SecureEntityCryptoEngineEncryptOnlyTxScTxPnChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for FixedPn to set choice
-func (obj *secureEntityCryptoEngineEncryptOnlyTxScTxPn) FixedPn() {
-	obj.setChoice(SecureEntityCryptoEngineEncryptOnlyTxScTxPnChoice.FIXED_PN)
-}
-
 // getter for IncrementingPn to set choice
 func (obj *secureEntityCryptoEngineEncryptOnlyTxScTxPn) IncrementingPn() {
 	obj.setChoice(SecureEntityCryptoEngineEncryptOnlyTxScTxPnChoice.INCREMENTING_PN)
 }
 
+// getter for FixedPn to set choice
+func (obj *secureEntityCryptoEngineEncryptOnlyTxScTxPn) FixedPn() {
+	obj.setChoice(SecureEntityCryptoEngineEncryptOnlyTxScTxPnChoice.FIXED_PN)
+}
+
 // Types of Tx packet number(PN) series. Supported choices: 1) fixed PN - MACsec packets will be sent out with the configured fixed PN or lower half of configured fixed XPN. 2) incrementing PN - MACsec packets will be sent out by single device with an incrementing PN or XPN.
 // Choice returns a string
 func (obj *secureEntityCryptoEngineEncryptOnlyTxScTxPn) HasChoice() bool {
diff --git a/gosnappi/secure_entity_static_key_rekey_mode.go b/gosnappi/secure_entity_static_key_rekey_mode.go
index 165ca125..d9d9aec2 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 PnBased to set choice.
-	PnBased()
 	// getter for DontRekey to set choice.
 	DontRekey()
+	// getter for PnBased to set choice.
+	PnBased()
 	// 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 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)
 }
 
+// getter for PnBased to set choice
+func (obj *secureEntityStaticKeyRekeyMode) PnBased() {
+	obj.setChoice(SecureEntityStaticKeyRekeyModeChoice.PN_BASED)
+}
+
 // Rekey mode choices.
 // Choice returns a string
 func (obj *secureEntityStaticKeyRekeyMode) HasChoice() bool {
diff --git a/requirements.txt b/requirements.txt
index 2f1ad2cc..ce6ff80b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 --prefer-binary
-protobuf~=3.15.0 ;  python_version <= '3.6'
-protobuf~=4.24.4 ;  python_version > '3.6'
 PyYAML
+protobuf~=4.24.4 ;  python_version > '3.6'
+protobuf~=3.15.0 ;  python_version <= '3.6'
 requests
+grpcio~=1.44.0 ; python_version <= '3.6'
 grpcio-tools~=1.44.0 ; python_version <= '3.6'
 grpcio~=1.59.5 ; python_version > '3.6'
-grpcio~=1.44.0 ; python_version <= '3.6'
 grpcio-tools~=1.59.5 ; python_version > '3.6'
 urllib3
 semantic_version