Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NSX-T Segment Profile Template support #1120

Merged
merged 34 commits into from
Nov 7, 2023
Merged

NSX-T Segment Profile Template support #1120

merged 34 commits into from
Nov 7, 2023

Conversation

Didainius
Copy link
Collaborator

@Didainius Didainius commented Sep 20, 2023 •
edited

Segment profiles

Segment profiles include layer 2 configuration details for segments and segment ports. There are several types of segment profiles: IP discovery, MAC discovery, SpoofGuard, quality of service (QoS), and segment security. When you create a segment profile template, you can include only one segment profile of each type. For more details on each type of segment profile, see Segment Profiles in NSX Administration Guide.

About

https://docs.vmware.com/en/VMware-Cloud-Director/10.5/VMware-Cloud-Director-Service-Provider-Admin-Guide/GUID-60F90A6D-1DC6-4C21-A404-B002E71417EF.html

PR Layout

Total of 9 data sources and 4 resources, that can be split in 3 layers:

NSX-T Segment Profile Data Sources

  • vcd_nsxt_segment_ip_discovery_profile
  • vcd_nsxt_segment_mac_discovery_profile
  • vcd_nsxt_segment_spoof_guard_profile
  • vcd_nsxt_segment_qos_profile
  • vcd_nsxt_segment_security_profile

Segment Profile Templates (resource and data source)

Segment Profile Templates are composed of Segment Profiles

  • vcd_nsxt_segment_profile_template

Segment Profile configurations (resource and data source)

The following resources can set default segment profiles at different layers of VCD infrastructure. Each of the lower-level resource can override the higher-level resource

  • vcd_nsxt_global_default_segment_profile_template (global default for VCD)
  • vcd_org_vdc_nsxt_network_profile (default for particular VDC)
  • vcd_nsxt_network_segment_profile (default segment profile for individual segment)

Deprecations

This PR deprecates edge_cluster_id field in vcd_org_vdc (and makes it Computed in addition to being Optional) in favor of separate resource vcd_org_vdc_nsxt_network_profile because it uses a Network Profile endpoint and now VDC default Segment Profile Templates are also configured using that same endpoint. This will give a more granular management.

@Didainius
Initial code
e7db592 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Progress
7100576 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
WIP
bd75328 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
WIP
d02269c 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Add all segment profile fields to data sources
9ba64aa 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Add segment profile documentation pages
6eb94df 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Polish and self review Segment Profile Datasources
7085271 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Polish and review segment_profile_template
d328a7a 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Polish and review global default segment profile template
f549f96 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Polish and review VDC Network Profiles
84db192 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Polish vdc network profiles
817c74a 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Add changelog
0c7deff 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Reverse some changes
9f335a7 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Self review
230ab9a 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
bump govcd
6056f29 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Improve changelog
4797db3 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
fix hcl
a1873b9 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
fix hcl
f608858 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Fix test tags
777de9d 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Improve test
fc926eb 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Self review
94640c9 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius Didainius mentioned this pull request Oct 2, 2023
Merged
@Didainius
Bump sdk
339b396 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Improve Org VDC Network segment profile template
9ca77bf 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Remove unneeded check in test
3cf3a59 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Self review
5c0ed3c 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius Didainius marked this pull request as ready for review October 4, 2023 08:25
dataclouder
dataclouder reviewed Oct 8, 2023
View reviewed changes
Copy link
Collaborator

@dataclouder dataclouder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First pass. There is a lot to examine yet, but I wanted to start giving you a heads up on my findings so dar

website/docs/r/nsxt_global_default_segment_profile_template.html.markdown Outdated Show resolved Hide resolved
website/docs/r/nsxt_global_default_segment_profile_template.html.markdown Outdated Show resolved Hide resolved
vcd/config_test.go Outdated Show resolved Hide resolved
vcd/remove_leftovers_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_global_default_segment_profile_template.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_ip_discovery_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_mac_discovery_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_qos_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_segment_security_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_spoof_guard_profile.go Outdated Show resolved Hide resolved
@Didainius
Fix datasource and resource behavior for non existing entities
0870343 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
dataclouder
dataclouder reviewed Oct 9, 2023
View reviewed changes
Copy link
Collaborator

@dataclouder dataclouder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second pass

vcd/resource_vcd_org_vdc_network_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_ip_discovery_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_ip_discovery_profile.go Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_ip_discovery_profile.html.markdown Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_mac_discovery_profile.html.markdown Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_qos_profile.html.markdown Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_security_profile.html.markdown Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_spoof_guard_profile.html.markdown Outdated Show resolved Hide resolved
@Didainius
Address comments
65eac7a 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Bump govcd
42ed1c0 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Address comments
4f9adb9 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
bump sdk, merge main
4713b1c 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
lvirbalas
lvirbalas requested changes Oct 16, 2023
View reviewed changes
Copy link
Collaborator

@lvirbalas lvirbalas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, massive PR! Please find some polishing comments in-line.

vcd/datasource_vcd_nsxt_segment_ip_discovery_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_segment_ip_discovery_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_segment_ip_discovery_profile.go Outdated Show resolved Hide resolved
vcd/datasource_vcd_nsxt_segment_qos_profile.go Show resolved Hide resolved
website/docs/d/nsxt_global_default_segment_profile_template.html.markdown Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_mac_discovery_profile.html.markdown Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_qos_profile.html.markdown Outdated Show resolved Hide resolved
website/docs/d/nsxt_segment_security_profile.html.markdown Outdated Show resolved Hide resolved
website/docs/r/nsxt_global_default_segment_profile_template.html.markdown Outdated Show resolved Hide resolved
website/docs/r/org_vdc_nsxt_network_profile.html.markdown Show resolved Hide resolved
adambarreiro
adambarreiro reviewed Oct 17, 2023
View reviewed changes
Copy link
Collaborator

@adambarreiro adambarreiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First scan, I may have slipped things so I'm going for the second 😅

vcd/datasource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile.go Outdated Show resolved Hide resolved
vcd/resource_vcd_nsxt_network_segment_profile_test.go Outdated Show resolved Hide resolved
website/vcd.erb Outdated Show resolved Hide resolved
@Didainius
Merge main, bump dk
5c62cff 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Address comments
6ad91f9 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
adambarreiro
adambarreiro approved these changes Oct 23, 2023
View reviewed changes
Copy link
Collaborator

@adambarreiro adambarreiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second pass, looks good to me. Also ran all nsxt tests on 10.5.0, all good!

@Didainius
Bump sdk
0a6b0a2 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius
Merge main, bump govcd
7ba2616 
Signed-off-by: Dainius Serplis <dserplis@vmware.com>
@Didainius Didainius merged commit dff899e into vmware:main Nov 7, 2023
3 checks passed
@Didainius Didainius deleted the nsxt-segment-profile-templates branch November 7, 2023 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lvirbalas lvirbalas lvirbalas approved these changes

@adambarreiro adambarreiro adambarreiro approved these changes

@dataclouder dataclouder dataclouder approved these changes

@adezxc adezxc adezxc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Didainius @adambarreiro @lvirbalas @dataclouder @adezxc