Merge branch 'macsec' of https://github.com/open-traffic-generator/sn…

…appi into macsec
open-traffic-generator · Jan 22, 2025 · 6c765bd · 6c765bd
2 parents 501e5e3 + fc34600
commit 6c765bd
Show file tree

Hide file tree

Showing 32 changed files with 26,116 additions and 24,656 deletions.
diff --git a/gosnappi/bgp_attributes_community.go b/gosnappi/bgp_attributes_community.go
@@ -278,14 +278,14 @@ type BgpAttributesCommunity interface {
 	Choice() BgpAttributesCommunityChoiceEnum
 	// setChoice assigns BgpAttributesCommunityChoiceEnum provided by user to BgpAttributesCommunity
 	setChoice(value BgpAttributesCommunityChoiceEnum) BgpAttributesCommunity
-	// getter for NoAdvertised to set choice.
-	NoAdvertised()
-	// getter for NoExportSubconfed to set choice.
-	NoExportSubconfed()
 	// getter for NoExport to set choice.
 	NoExport()
+	// getter for NoAdvertised to set choice.
+	NoAdvertised()
 	// getter for LlgrStale to set choice.
 	LlgrStale()
+	// getter for NoExportSubconfed to set choice.
+	NoExportSubconfed()
 	// getter for NoLlgr to set choice.
 	NoLlgr()
 	// CustomCommunity returns BgpAttributesCustomCommunity, set in BgpAttributesCommunity.
@@ -322,26 +322,26 @@ func (obj *bgpAttributesCommunity) Choice() BgpAttributesCommunityChoiceEnum {
 	return BgpAttributesCommunityChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for NoAdvertised to set choice
-func (obj *bgpAttributesCommunity) NoAdvertised() {
-	obj.setChoice(BgpAttributesCommunityChoice.NO_ADVERTISED)
-}
-
-// getter for NoExportSubconfed to set choice
-func (obj *bgpAttributesCommunity) NoExportSubconfed() {
-	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT_SUBCONFED)
-}
-
 // getter for NoExport to set choice
 func (obj *bgpAttributesCommunity) NoExport() {
 	obj.setChoice(BgpAttributesCommunityChoice.NO_EXPORT)
 }
 
+// getter for NoAdvertised to set choice
+func (obj *bgpAttributesCommunity) NoAdvertised() {
+	obj.setChoice(BgpAttributesCommunityChoice.NO_ADVERTISED)
+}
+
 // getter for LlgrStale to set choice
 func (obj *bgpAttributesCommunity) LlgrStale() {
 	obj.setChoice(BgpAttributesCommunityChoice.LLGR_STALE)
 }
 
+// getter for NoExportSubconfed to set choice
+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)

diff --git 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 PushIpv6 to set choice.
-	PushIpv6()
-	// getter for Unknown to set choice.
-	Unknown()
-	// getter for PushIpv4AndIpv6 to set choice.
-	PushIpv4AndIpv6()
 	// getter for PushIpv4 to set choice.
 	PushIpv4()
 	// getter for DonotPush to set choice.
 	DonotPush()
+	// getter for PushIpv4AndIpv6 to set choice.
+	PushIpv4AndIpv6()
+	// getter for PushIpv6 to set choice.
+	PushIpv6()
+	// getter for Unknown to set choice.
+	Unknown()
 }
 
 type BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum string
@@ -305,29 +305,29 @@ func (obj *bgpAttributesSrPolicyExplicitNullPolicy) Choice() BgpAttributesSrPoli
 	return BgpAttributesSrPolicyExplicitNullPolicyChoiceEnum(obj.obj.Choice.Enum().String())
 }
 
-// getter for PushIpv6 to set choice
-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)
 }
 
 // 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 PushIpv6 to set choice
+func (obj *bgpAttributesSrPolicyExplicitNullPolicy) PushIpv6() {
+	obj.setChoice(BgpAttributesSrPolicyExplicitNullPolicyChoice.PUSH_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.

diff --git a/gosnappi/device.go b/gosnappi/device.go
@@ -25,7 +25,7 @@ type device struct {
 	rsvpHolder          DeviceRsvp
 	dhcpServerHolder    DeviceDhcpServer
 	ospfv2Holder        DeviceOspfv2Router
-	macsecHolder        DeviceMacsec
+	macsecHolder        DeviceMacsecDevice
 }
 
 func NewDevice() Device {
@@ -352,12 +352,12 @@ type Device interface {
 	SetOspfv2(value DeviceOspfv2Router) Device
 	// HasOspfv2 checks if Ospfv2 has been set in Device
 	HasOspfv2() bool
-	// Macsec returns DeviceMacsec, set in Device.
-	// DeviceMacsec is a container of properties for a MACsec capable device.
-	Macsec() DeviceMacsec
-	// SetMacsec assigns DeviceMacsec provided by user to Device.
-	// DeviceMacsec is a container of properties for a MACsec capable device.
-	SetMacsec(value DeviceMacsec) Device
+	// Macsec returns DeviceMacsecDevice, set in Device.
+	// DeviceMacsecDevice is a container of properties for a MACsec capable device.
+	Macsec() DeviceMacsecDevice
+	// SetMacsec assigns DeviceMacsecDevice provided by user to Device.
+	// DeviceMacsecDevice is a container of properties for a MACsec capable device.
+	SetMacsec(value DeviceMacsecDevice) Device
 	// HasMacsec checks if Macsec has been set in Device
 	HasMacsec() bool
 	setNil()
@@ -808,27 +808,27 @@ func (obj *device) SetOspfv2(value DeviceOspfv2Router) Device {
 	return obj
 }
 
-// Configuration of MACsec interfaces.
-// Macsec returns a DeviceMacsec
-func (obj *device) Macsec() DeviceMacsec {
+// Configuration of MACsec device.
+// Macsec returns a DeviceMacsecDevice
+func (obj *device) Macsec() DeviceMacsecDevice {
 	if obj.obj.Macsec == nil {
-		obj.obj.Macsec = NewDeviceMacsec().msg()
+		obj.obj.Macsec = NewDeviceMacsecDevice().msg()
 	}
 	if obj.macsecHolder == nil {
-		obj.macsecHolder = &deviceMacsec{obj: obj.obj.Macsec}
+		obj.macsecHolder = &deviceMacsecDevice{obj: obj.obj.Macsec}
 	}
 	return obj.macsecHolder
 }
 
-// Configuration of MACsec interfaces.
-// Macsec returns a DeviceMacsec
+// Configuration of MACsec device.
+// Macsec returns a DeviceMacsecDevice
 func (obj *device) HasMacsec() bool {
 	return obj.obj.Macsec != nil
 }
 
-// Configuration of MACsec interfaces.
-// SetMacsec sets the DeviceMacsec value in the Device object
-func (obj *device) SetMacsec(value DeviceMacsec) Device {
+// Configuration of MACsec device.
+// SetMacsec sets the DeviceMacsecDevice value in the Device object
+func (obj *device) SetMacsec(value DeviceMacsecDevice) Device {
 
 	obj.macsecHolder = nil
 	obj.obj.Macsec = value.msg()