diff --git a/gosnappi/bgp_attributes_community.go b/gosnappi/bgp_attributes_community.go
index 5b1d3578..3ec63566 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 NoExportSubconfed to set choice.
-	NoExportSubconfed()
-	// getter for NoAdvertised to set choice.
-	NoAdvertised()
-	// getter for NoExport to set choice.
-	NoExport()
 	// getter for LlgrStale to set choice.
 	LlgrStale()
 	// getter for NoLlgr to set choice.
 	NoLlgr()
+	// getter for NoExportSubconfed to set choice.
+	NoExportSubconfed()
+	// getter for NoExport to set choice.
+	NoExport()
+	// getter for NoAdvertised to set choice.
+	NoAdvertised()
 	// 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,29 +322,29 @@ 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 NoExportSubconfed to set choice
 func (obj *bgpAttributesCommunity) NoExportSubconfed() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT_SUBCONFED)
 }
 
-// getter for NoAdvertised to set choice
-func (obj *bgpAttributesCommunity) NoAdvertised() {
-	obj.setChoice(BgpAttributesCommunityChoice.NO_ADVERTISED)
-}
-
 // getter for NoExport to set choice
 func (obj *bgpAttributesCommunity) NoExport() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT)
 }
 
-// getter for 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 NoAdvertised to set choice
+func (obj *bgpAttributesCommunity) NoAdvertised() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_ADVERTISED)
 }
 
 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 60256161..339dffba 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 PushIpv6 to set choice.
 	PushIpv6()
 	// getter for PushIpv4 to set choice.
 	PushIpv4()
+	// getter for PushIpv4AndIpv6 to set choice.
+	PushIpv4AndIpv6()
 	// getter for DonotPush to set choice.
 	DonotPush()
+	// getter for Unknown to set choice.
+	Unknown()
 }
 
 type BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum string
@@ -305,16 +305,6 @@ 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 PushIpv6 to set choice
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV6)
@@ -325,11 +315,21 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4)
 }
 
+// getter for PushIpv4AndIpv6 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv4AndIpv6() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV4_AND_IPV6)
+}
+
 // getter for DonotPush to set choice
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
 }
 
+// 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 23c369d6..de71eabb 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_variant.go
@@ -270,12 +270,12 @@ type Dhcpv6ClientOptionsDuidUuidVariant interface {
 	setChoice(value Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum) Dhcpv6ClientOptionsDuidUuidVariant
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsDuidUuidVariant
 	HasChoice() bool
-	// getter for Ncs to set choice.
-	Ncs()
 	// getter for Guid to set choice.
 	Guid()
 	// getter for Dce to set choice.
 	Dce()
+	// getter for Ncs to set choice.
+	Ncs()
 	// getter for VarReserved to set choice.
 	VarReserved()
 }
@@ -299,11 +299,6 @@ 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 Guid to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVariant) Guid() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.GUID)
@@ -314,6 +309,11 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) Dce() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.DCE)
 }
 
+// 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)
diff --git a/gosnappi/dhcpv6_client_options_duid_uuid_version.go b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
index b78e04f7..3bc7437d 100644
--- a/gosnappi/dhcpv6_client_options_duid_uuid_version.go
+++ b/gosnappi/dhcpv6_client_options_duid_uuid_version.go
@@ -270,16 +270,16 @@ type Dhcpv6ClientOptionsDuidUuidVersion interface {
 	setChoice(value Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum) Dhcpv6ClientOptionsDuidUuidVersion
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsDuidUuidVersion
 	HasChoice() bool
+	// getter for V_4 to set choice.
+	V_4()
+	// getter for V_5 to set choice.
+	V_5()
 	// getter for V_2 to set choice.
 	V_2()
 	// getter for V_1 to set choice.
 	V_1()
 	// getter for V_3 to set choice.
 	V_3()
-	// getter for V_4 to set choice.
-	V_4()
-	// getter for V_5 to set choice.
-	V_5()
 }
 
 type Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum string
@@ -303,6 +303,16 @@ 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_2 to set choice
 func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_2() {
 	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_2)
@@ -318,16 +328,6 @@ 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_5 to set choice
-func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_5() {
-	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_5)
-}
-
 // The version values are from 1 to 5 in the most significant 4 bits of the timestamp (bits 4 through 7 of the  time_hi_and_version field).
 // Choice returns a string
 func (obj *dhcpv6ClientOptionsDuidUuidVersion) HasChoice() bool {
diff --git a/gosnappi/dhcpv6_client_options_message_type.go b/gosnappi/dhcpv6_client_options_message_type.go
index 5520c8e8..ddccd720 100644
--- a/gosnappi/dhcpv6_client_options_message_type.go
+++ b/gosnappi/dhcpv6_client_options_message_type.go
@@ -270,16 +270,16 @@ type Dhcpv6ClientOptionsMessageType interface {
 	setChoice(value Dhcpv6ClientOptionsMessageTypeChoiceEnum) Dhcpv6ClientOptionsMessageType
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsMessageType
 	HasChoice() bool
-	// getter for Rebind to set choice.
-	Rebind()
 	// getter for 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()
 	// getter for Renew to set choice.
 	Renew()
+	// getter for Solicit to set choice.
+	Solicit()
 	// getter for Request to set choice.
 	Request()
 }
@@ -307,31 +307,31 @@ func (obj *dhcpv6ClientOptionsMessageType) Choice() Dhcpv6ClientOptionsMessageTy
 	return Dhcpv6ClientOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Rebind to set choice
-func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
-	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
-}
-
 // getter for 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 Rebind to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
+}
+
 // getter for Renew to set choice
 func (obj *dhcpv6ClientOptionsMessageType) Renew() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RENEW)
 }
 
+// getter for 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)
diff --git a/gosnappi/dhcpv6_client_options_options_request.go b/gosnappi/dhcpv6_client_options_options_request.go
index 2c14102d..bb44628f 100644
--- a/gosnappi/dhcpv6_client_options_options_request.go
+++ b/gosnappi/dhcpv6_client_options_options_request.go
@@ -278,14 +278,14 @@ type Dhcpv6ClientOptionsOptionsRequest interface {
 	setChoice(value Dhcpv6ClientOptionsOptionsRequestChoiceEnum) Dhcpv6ClientOptionsOptionsRequest
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsOptionsRequest
 	HasChoice() bool
-	// getter for BootfileUrl to set choice.
-	BootfileUrl()
-	// getter for NameServers to set choice.
-	NameServers()
 	// 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.
@@ -322,16 +322,6 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Choice() Dhcpv6ClientOptionsOption
 	return Dhcpv6ClientOptionsOptionsRequestChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for BootfileUrl to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) BootfileUrl() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.BOOTFILE_URL)
-}
-
-// getter for NameServers to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
-}
-
 // getter for Sztp to set choice
 func (obj *dhcpv6ClientOptionsOptionsRequest) Sztp() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.SZTP)
@@ -342,6 +332,16 @@ 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 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)
diff --git a/gosnappi/dhcpv6_server_options_message_type.go b/gosnappi/dhcpv6_server_options_message_type.go
index fb9162ea..260f7bc6 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 ReConfigure to set choice.
+	ReConfigure()
 	// getter for Reply to set choice.
 	Reply()
 	// getter for Advertise to set choice.
 	Advertise()
-	// getter for ReConfigure to set choice.
-	ReConfigure()
 }
 
 type Dhcpv6ServerOptionsMessageTypeChoiceEnum string
@@ -295,6 +295,11 @@ func (obj *dhcpv6ServerOptionsMessageType) Choice() Dhcpv6ServerOptionsMessageTy
 	return Dhcpv6ServerOptionsMessageTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for ReConfigure to set choice
+func (obj *dhcpv6ServerOptionsMessageType) ReConfigure() {
+	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.RE_CONFIGURE)
+}
+
 // getter for Reply to set choice
 func (obj *dhcpv6ServerOptionsMessageType) Reply() {
 	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.REPLY)
@@ -305,11 +310,6 @@ func (obj *dhcpv6ServerOptionsMessageType) Advertise() {
 	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.ADVERTISE)
 }
 
-// getter for ReConfigure to set choice
-func (obj *dhcpv6ServerOptionsMessageType) ReConfigure() {
-	obj.setChoice(Dhcpv6ServerOptionsMessageTypeChoice.RE_CONFIGURE)
-}
-
 // The server message name where the option is included, by default it is all.
 // Choice returns a string
 func (obj *dhcpv6ServerOptionsMessageType) HasChoice() bool {
diff --git a/gosnappi/flow_rsvp_lsp_tunnel_flag.go b/gosnappi/flow_rsvp_lsp_tunnel_flag.go
index 724bbb14..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 LocalProtectionDesired to set choice.
-	LocalProtectionDesired()
-	// getter for SeStyleDesired to set choice.
-	SeStyleDesired()
 	// getter for LabelRecordingDesired to set choice.
 	LabelRecordingDesired()
+	// getter for SeStyleDesired to set choice.
+	SeStyleDesired()
+	// getter for LocalProtectionDesired to set choice.
+	LocalProtectionDesired()
 }
 
 type FlowRSVPLspTunnelFlagChoiceEnum string
@@ -295,9 +295,9 @@ func (obj *flowRSVPLspTunnelFlag) Choice() FlowRSVPLspTunnelFlagChoiceEnum {
 	return FlowRSVPLspTunnelFlagChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for LocalProtectionDesired to set choice
-func (obj *flowRSVPLspTunnelFlag) LocalProtectionDesired() {
-	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LOCAL_PROTECTION_DESIRED)
+// getter for LabelRecordingDesired to set choice
+func (obj *flowRSVPLspTunnelFlag) LabelRecordingDesired() {
+	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LABEL_RECORDING_DESIRED)
 }
 
 // getter for SeStyleDesired to set choice
@@ -305,9 +305,9 @@ 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)
+// getter for LocalProtectionDesired to set choice
+func (obj *flowRSVPLspTunnelFlag) LocalProtectionDesired() {
+	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LOCAL_PROTECTION_DESIRED)
 }
 
 // description is TBD
diff --git a/gosnappi/go.mod b/gosnappi/go.mod
index d4f14bf5..c3a9e5e6 100644
--- a/gosnappi/go.mod
+++ b/gosnappi/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/mux v1.8.1
 	github.com/stretchr/testify v1.10.0
-	google.golang.org/grpc v1.69.0
-	google.golang.org/protobuf v1.35.2
+	google.golang.org/grpc v1.69.2
+	google.golang.org/protobuf v1.36.0
 )
 
 require (
diff --git a/gosnappi/go.sum b/gosnappi/go.sum
index d3cfd65e..ee5fe872 100644
--- a/gosnappi/go.sum
+++ b/gosnappi/go.sum
@@ -50,10 +50,10 @@ golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
 golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
-google.golang.org/grpc v1.69.0 h1:quSiOM1GJPmPH5XtU+BCoVXcDVJJAzNcoyfC2cCjGkI=
-google.golang.org/grpc v1.69.0/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
+google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
+google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/gosnappi/metrics_response.go b/gosnappi/metrics_response.go
index 259ec5b8..23c8342d 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 Dhcpv4Server to set choice.
+	Dhcpv4Server()
 	// getter for Dhcpv6Client to set choice.
 	Dhcpv6Client()
 	// getter for Dhcpv4Client to set choice.
 	Dhcpv4Client()
 	// getter for Dhcpv6Server to set choice.
 	Dhcpv6Server()
-	// getter for Dhcpv4Server to set choice.
-	Dhcpv4Server()
 	// PortMetrics returns MetricsResponsePortMetricIterIter, set in MetricsResponse
 	PortMetrics() MetricsResponsePortMetricIter
 	// FlowMetrics returns MetricsResponseFlowMetricIterIter, set in MetricsResponse
@@ -382,6 +382,11 @@ func (obj *metricsResponse) Choice() MetricsResponseChoiceEnum {
 	return MetricsResponseChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+// getter for Dhcpv4Server to set choice
+func (obj *metricsResponse) Dhcpv4Server() {
+	obj.setChoice(MetricsResponseChoice.DHCPV4_SERVER)
+}
+
 // getter for Dhcpv6Client to set choice
 func (obj *metricsResponse) Dhcpv6Client() {
 	obj.setChoice(MetricsResponseChoice.DHCPV6_CLIENT)
@@ -397,11 +402,6 @@ func (obj *metricsResponse) Dhcpv6Server() {
 	obj.setChoice(MetricsResponseChoice.DHCPV6_SERVER)
 }
 
-// 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/gosnappi/ospfv2_interface_network_type.go b/gosnappi/ospfv2_interface_network_type.go
index 3ec53c4b..7de2eb9f 100644
--- a/gosnappi/ospfv2_interface_network_type.go
+++ b/gosnappi/ospfv2_interface_network_type.go
@@ -281,10 +281,10 @@ type Ospfv2InterfaceNetworkType interface {
 	setChoice(value Ospfv2InterfaceNetworkTypeChoiceEnum) Ospfv2InterfaceNetworkType
 	// HasChoice checks if Choice has been set in Ospfv2InterfaceNetworkType
 	HasChoice() bool
-	// getter for Broadcast to set choice.
-	Broadcast()
 	// getter for PointToPoint to set choice.
 	PointToPoint()
+	// getter for Broadcast to set choice.
+	Broadcast()
 	// PointToMultipoint returns Ospfv2InterfaceNetworkTypeOspfv2InterfaceNeighborIterIter, set in Ospfv2InterfaceNetworkType
 	PointToMultipoint() Ospfv2InterfaceNetworkTypeOspfv2InterfaceNeighborIter
 	setNil()
@@ -307,16 +307,16 @@ func (obj *ospfv2InterfaceNetworkType) Choice() Ospfv2InterfaceNetworkTypeChoice
 	return Ospfv2InterfaceNetworkTypeChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for Broadcast to set choice
-func (obj *ospfv2InterfaceNetworkType) Broadcast() {
-	obj.setChoice(Ospfv2InterfaceNetworkTypeChoice.BROADCAST)
-}
-
 // getter for PointToPoint to set choice
 func (obj *ospfv2InterfaceNetworkType) PointToPoint() {
 	obj.setChoice(Ospfv2InterfaceNetworkTypeChoice.POINT_TO_POINT)
 }
 
+// getter for Broadcast to set choice
+func (obj *ospfv2InterfaceNetworkType) Broadcast() {
+	obj.setChoice(Ospfv2InterfaceNetworkTypeChoice.BROADCAST)
+}
+
 // description is TBD
 // Choice returns a string
 func (obj *ospfv2InterfaceNetworkType) HasChoice() bool {
diff --git a/requirements.txt b/requirements.txt
index 33fdd0e3..884ddb61 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,11 @@
 --prefer-binary
-grpcio~=1.59.0 ; python_version > '3.6'
-grpcio~=1.44.0 ; python_version <= '3.6'
-grpcio-tools~=1.59.0 ; python_version > '3.6'
-grpcio-tools~=1.44.0 ; python_version <= '3.6'
-PyYAML
 protobuf~=4.24.4 ;  python_version > '3.6'
 protobuf~=3.15.0 ;  python_version <= '3.6'
 requests
-urllib3
+PyYAML
+grpcio-tools~=1.59.0 ; python_version > '3.6'
+grpcio~=1.59.0 ; python_version > '3.6'
+grpcio-tools~=1.44.0 ; python_version <= '3.6'
+grpcio~=1.44.0 ; python_version <= '3.6'
 semantic_version
+urllib3