Add group_type attribue to policy group #857
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@annakhm note that in the API, group_type is a list with a maximum of one member. |
annakhm
reviewed
Mar 27, 2023
| @@ -184,6 +184,7 @@ The following arguments are supported: | |||
| * `distinguished_name` (Required for an `identity_group`) LDAP distinguished name (DN). A valid fully qualified distinguished name should be provided here. This value is valid only if it matches to exactly 1 LDAP object on the LDAP server. | |||
| * `domain_base_distinguished_name` (Required for an `identity_group`) Identity (Directory) domain base distinguished name. This is the base distinguished name for the domain where this identity group resides. (e.g. dc=example,dc=com) | |||
| * `sid` (Optional) Identity (Directory) Group SID (security identifier). A security identifier (SID) is a unique value of variable length used to identify a trustee. This field is only populated for Microsoft Active Directory identity store. | |||
| * `group_type` - (Optional) Group type can be specified during create and update of a group. Empty group type indicates a 'generic' group, ie group can be one of IPAddress, ANTERA. | |||
annakhm
reviewed
Mar 28, 2023
nsxt/resource_nsxt_policy_group.go
Outdated
| obj := model.Group{ | ||
| DisplayName: &displayName, | ||
| Description: &description, | ||
| Tags: tags, | ||
| Expression: expressionData, | ||
| ExtendedExpression: extendedExpressionList, | ||
| GroupType: groupTypes, |
There was a problem hiding this comment.
I believe version check is needed here since GroupType support was added recently in NSX
annakhm
reviewed
Mar 29, 2023
nsxt/resource_nsxt_policy_group.go
Outdated
| @@ -844,12 +855,18 @@ func resourceNsxtPolicyGroupCreate(d *schema.ResourceData, m interface{}) error | |||
| description := d.Get("description").(string) | |||
| tags := getPolicyTagsFromSchema(d) | |||
|
|
|||
| var groupTypes []string | |||
| groupType := d.Get("group_type").(string) | |||
| if groupType != "" && nsxVersionHigherOrEqual("3.2.0") { | |||
There was a problem hiding this comment.
I don't think this version check would work with NSX version <3.2, since empty list of group_types would still be sent to the platform, and NSX would not recognize this property. The version check needs to define whether GroupType is set in the struct.
ksamoray
force-pushed
the
issue_855
branch
3 times, most recently
from
2913f2a to
2d9d998
Compare
annakhm
reviewed
Apr 3, 2023
nsxt/resource_nsxt_policy_group.go
Outdated
| obj := model.Group{ | ||
| DisplayName: &displayName, | ||
| Description: &description, | ||
| Tags: tags, | ||
| Expression: expressionData, | ||
| ExtendedExpression: extendedExpressionList, | ||
| GroupType: groupTypes, |
There was a problem hiding this comment.
In Update code path Group type is still set regardless of version
annakhm
reviewed
Apr 5, 2023
| testResourceName := "nsxt_policy_group.test" | ||
|
|
||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, |
There was a problem hiding this comment.
Can we add a version check here?
Fixes: vmware#855 Signed-off-by: Kobi Samoray <ksamoray@vmware.com>
annakhm
approved these changes
Apr 10, 2023
|
/test-all |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #855