Merge main into branch dev-convergence

gosnappi/bgp_attributes_community.go

@@ -278,6 +278,7 @@ type BgpAttributesCommunity interface {
 	Choice() BgpAttributesCommunityChoiceEnum
 	// setChoice assigns BgpAttributesCommunityChoiceEnum provided by user to BgpAttributesCommunity
 	setChoice(value BgpAttributesCommunityChoiceEnum) BgpAttributesCommunity
+<<<<<<< HEAD
 	// getter for NoExportSubconfed to set choice.
 	NoExportSubconfed()
 	// getter for NoExport to set choice.
@@ -288,6 +289,18 @@ type BgpAttributesCommunity interface {
 	NoAdvertised()
 	// getter for LlgrStale to set choice.
 	LlgrStale()
+=======
+	// getter for LlgrStale to set choice.
+	LlgrStale()
+	// getter for NoAdvertised to set choice.
+	NoAdvertised()
+	// getter for NoLlgr to set choice.
+	NoLlgr()
+	// getter for NoExport to set choice.
+	NoExport()
+	// getter for NoExportSubconfed to set choice.
+	NoExportSubconfed()
+>>>>>>> main
 	// 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,6 +335,7 @@ func (obj *bgpAttributesCommunity) Choice() BgpAttributesCommunityChoiceEnum {
 	return BgpAttributesCommunityChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+<<<<<<< HEAD
 // getter for NoExportSubconfed to set choice
 func (obj *bgpAttributesCommunity) NoExportSubconfed() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT_SUBCONFED)
@@ -330,16 +344,31 @@ func (obj *bgpAttributesCommunity) NoExportSubconfed() {
 // 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 NoAdvertised to set choice
+func (obj *bgpAttributesCommunity) NoAdvertised() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_ADVERTISED)
+>>>>>>> main
 }
 
 // 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)
+// getter for NoExport to set choice
+func (obj *bgpAttributesCommunity) NoExport() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT)
+}
+
+// getter for NoExportSubconfed to set choice
+func (obj *bgpAttributesCommunity) NoExportSubconfed() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT_SUBCONFED)
 }
 
 // getter for LlgrStale to set choice

gosnappi/bgp_attributes_sr_policy_explicit_null_policy.go

@@ -272,6 +272,7 @@ type BgpAttributesSrPolicyExplicitNullPolicy interface {
 	setChoice(value BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum) BgpAttributesSrPolicyExplicitNullPolicy
 	// HasChoice checks if Choice has been set in BgpAttributesSrPolicyExplicitNullPolicy
 	HasChoice() bool
+<<<<<<< HEAD
 	// getter for PushIpv4AndIpv6 to set choice.
 	PushIpv4AndIpv6()
 	// getter for PushIpv4 to set choice.
@@ -280,6 +281,16 @@ type BgpAttributesSrPolicyExplicitNullPolicy interface {
 	DonotPush()
 	// getter for Unknown to set choice.
 	Unknown()
+=======
+	// getter for PushIpv4 to set choice.
+	PushIpv4()
+	// getter for Unknown to set choice.
+	Unknown()
+	// getter for DonotPush to set choice.
+	DonotPush()
+	// getter for PushIpv4AndIpv6 to set choice.
+	PushIpv4AndIpv6()
+>>>>>>> main
 	// getter for PushIpv6 to set choice.
 	PushIpv6()
 }
@@ -305,16 +316,27 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Choice() BgpAttributesSrPoli
 	return BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+<<<<<<< HEAD
 // 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)
+>>>>>>> main
+}
+
+// getter for DonotPush to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
+}
+
 // getter for DonotPush to set choice
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) DonotPush() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.DONOT_PUSH)
@@ -330,6 +352,11 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
 	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV6)
 }
 
+// getter for PushIpv6 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_IPV6)
+}
+
 // The Explicit NULL Label policy.
 // Choice returns a string
 func (obj *bgpAttributesSrPolicyExplicitNullPolicy) HasChoice() bool {

gosnappi/dhcpv6_client_options_duid_uuid_variant.go

@@ -270,12 +270,20 @@ type Dhcpv6ClientOptionsDuidUuidVariant interface {
 	setChoice(value Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum) Dhcpv6ClientOptionsDuidUuidVariant
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsDuidUuidVariant
 	HasChoice() bool
+<<<<<<< HEAD
 	// getter for Ncs to set choice.
 	Ncs()
+=======
+>>>>>>> main
 	// getter for VarReserved to set choice.
 	VarReserved()
 	// getter for Guid to set choice.
 	Guid()
+<<<<<<< HEAD
+=======
+	// getter for Ncs to set choice.
+	Ncs()
+>>>>>>> main
 	// getter for Dce to set choice.
 	Dce()
 }
@@ -299,14 +307,27 @@ func (obj *dhcpv6ClientOptionsDuidUuidVariant) Choice() Dhcpv6ClientOptionsDuidU
 	return Dhcpv6ClientOptionsDuidUuidVariantChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+<<<<<<< HEAD
+=======
+// getter for VarReserved to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVariant) VarReserved() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.VAR_RESERVED)
+}
+
+// getter for Guid to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVariant) Guid() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVariantChoice.GUID)
+}
+
+>>>>>>> main
 // 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 Guid to set choice

gosnappi/dhcpv6_client_options_duid_uuid_version.go

@@ -270,14 +270,23 @@ type Dhcpv6ClientOptionsDuidUuidVersion interface {
 	setChoice(value Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum) Dhcpv6ClientOptionsDuidUuidVersion
 	// HasChoice checks if Choice has been set in Dhcpv6ClientOptionsDuidUuidVersion
 	HasChoice() bool
+<<<<<<< HEAD
 	// getter for V_5 to set choice.
 	V_5()
 	// getter for V_4 to set choice.
 	V_4()
 	// getter for V_1 to set choice.
 	V_1()
+=======
+>>>>>>> main
 	// getter for V_3 to set choice.
 	V_3()
+	// getter for V_1 to set choice.
+	V_1()
+	// getter for V_5 to set choice.
+	V_5()
+	// getter for V_4 to set choice.
+	V_4()
 	// getter for V_2 to set choice.
 	V_2()
 }
@@ -303,9 +312,15 @@ func (obj *dhcpv6ClientOptionsDuidUuidVersion) Choice() Dhcpv6ClientOptionsDuidU
 	return Dhcpv6ClientOptionsDuidUuidVersionChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
+<<<<<<< HEAD
 // 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)
+>>>>>>> main
 }
 
 // getter for V_4 to set choice
@@ -318,9 +333,14 @@ 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)
+// getter for V_5 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_5() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_5)
+}
+
+// getter for V_4 to set choice
+func (obj *dhcpv6ClientOptionsDuidUuidVersion) V_4() {
+	obj.setChoice(Dhcpv6ClientOptionsDuidUuidVersionChoice.V_4)
 }
 
 // getter for V_2 to set choice

gosnappi/dhcpv6_client_options_message_type.go

@@ -272,12 +272,21 @@ type Dhcpv6ClientOptionsMessageType interface {
 	HasChoice() bool
 	// getter for Rebind to set choice.
 	Rebind()
+<<<<<<< HEAD
 	// getter for Request to set choice.
 	Request()
 	// getter for Release to set choice.
 	Release()
 	// getter for Renew to set choice.
 	Renew()
+=======
+	// getter for Renew to set choice.
+	Renew()
+	// getter for Release to set choice.
+	Release()
+	// getter for Request to set choice.
+	Request()
+>>>>>>> main
 	// getter for InformRequest to set choice.
 	InformRequest()
 	// getter for Solicit to set choice.
@@ -312,6 +321,7 @@ func (obj *dhcpv6ClientOptionsMessageType) Rebind() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REBIND)
 }
 
+<<<<<<< HEAD
 // getter for Request to set choice
 func (obj *dhcpv6ClientOptionsMessageType) Request() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REQUEST)
@@ -322,11 +332,26 @@ func (obj *dhcpv6ClientOptionsMessageType) Release() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RELEASE)
 }
 
+=======
+>>>>>>> main
 // getter for Renew to set choice
 func (obj *dhcpv6ClientOptionsMessageType) Renew() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RENEW)
 }
 
+<<<<<<< HEAD
+=======
+// getter for Release to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Release() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.RELEASE)
+}
+
+// getter for Request to set choice
+func (obj *dhcpv6ClientOptionsMessageType) Request() {
+	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.REQUEST)
+}
+
+>>>>>>> main
 // getter for InformRequest to set choice
 func (obj *dhcpv6ClientOptionsMessageType) InformRequest() {
 	obj.setChoice(Dhcpv6ClientOptionsMessageTypeChoice.INFORM_REQUEST)

gosnappi/dhcpv6_client_options_options_request.go

@@ -280,14 +280,14 @@ type Dhcpv6ClientOptionsOptionsRequest interface {
 	HasChoice() bool
 	// getter for Fqdn to set choice.
 	Fqdn()
-	// getter for VendorInformation to set choice.
-	VendorInformation()
 	// getter for NameServers to set choice.
 	NameServers()
 	// getter for Sztp to set choice.
 	Sztp()
 	// getter for BootfileUrl to set choice.
 	BootfileUrl()
+	// getter for VendorInformation to set choice.
+	VendorInformation()
 	// 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
@@ -327,11 +327,6 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) Fqdn() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.FQDN)
 }
 
-// getter for VendorInformation to set choice
-func (obj *dhcpv6ClientOptionsOptionsRequest) VendorInformation() {
-	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.VENDOR_INFORMATION)
-}
-
 // getter for NameServers to set choice
 func (obj *dhcpv6ClientOptionsOptionsRequest) NameServers() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.NAME_SERVERS)
@@ -347,6 +342,11 @@ func (obj *dhcpv6ClientOptionsOptionsRequest) BootfileUrl() {
 	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.BOOTFILE_URL)
 }
 
+// getter for VendorInformation to set choice
+func (obj *dhcpv6ClientOptionsOptionsRequest) VendorInformation() {
+	obj.setChoice(Dhcpv6ClientOptionsOptionsRequestChoice.VENDOR_INFORMATION)
+}
+
 // 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

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 LabelRecordingDesired to set choice.
-	LabelRecordingDesired()
 	// getter for SeStyleDesired to set choice.
 	SeStyleDesired()
+	// getter for LabelRecordingDesired to set choice.
+	LabelRecordingDesired()
+	// getter for LocalProtectionDesired to set choice.
+	LocalProtectionDesired()
 }
 
 type FlowRSVPLspTunnelFlagChoiceEnum string
@@ -295,19 +295,19 @@ func (obj *flowRSVPLspTunnelFlag) Choice() FlowRSVPLspTunnelFlagChoiceEnum {
 	return FlowRSVPLspTunnelFlagChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for LocalProtectionDesired to set choice
-func (obj *flowRSVPLspTunnelFlag) LocalProtectionDesired() {
-	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LOCAL_PROTECTION_DESIRED)
+// getter for SeStyleDesired to set choice
+func (obj *flowRSVPLspTunnelFlag) SeStyleDesired() {
+	obj.setChoice(FlowRSVPLspTunnelFlagChoice.SE_STYLE_DESIRED)
 }
 
 // getter for 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)
+// getter for LocalProtectionDesired to set choice
+func (obj *flowRSVPLspTunnelFlag) LocalProtectionDesired() {
+	obj.setChoice(FlowRSVPLspTunnelFlagChoice.LOCAL_PROTECTION_DESIRED)
 }
 
 // description is TBD