New functionality for handling vApp network NAT #316
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
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # govcd/vapp_network_test.go
vbauzys
requested review from
Didainius,
lvirbalas and
dataclouder
and removed request for
Didainius and
lvirbalas
dataclouder
suggested changes
Jun 10, 2020
govcd/vapp_network.go
Outdated
|
|
||
| util.Logger.Printf("[TRACE] Looking for networks: %s --- %d", id, len(vapp.VApp.NetworkConfigSection.NetworkConfig)) | ||
| for _, vappNetwork := range vapp.VApp.NetworkConfigSection.NetworkConfig { | ||
| // break early for disconnected network interfaces. They don't have all information |
There was a problem hiding this comment.
should it be "empty" instead of "disconnected"?
There was a problem hiding this comment.
from UI perspective they are disconected
There was a problem hiding this comment.
I am OK with using UI names in Terraform, but in the SDK we should follow the API.
# Conflicts: # CHANGELOG.md # govcd/vapp_network.go # govcd/vapp_network_test.go # types/v56/types.go
dataclouder
suggested changes
Jun 11, 2020
govcd/vapp_network.go
Outdated
|
|
||
| util.Logger.Printf("[TRACE] Looking for networks: %s --- %d", id, len(vapp.VApp.NetworkConfigSection.NetworkConfig)) | ||
| for _, vappNetwork := range vapp.VApp.NetworkConfigSection.NetworkConfig { | ||
| // break early for disconnected network interfaces. They don't have all information |
There was a problem hiding this comment.
I am OK with using UI names in Terraform, but in the SDK we should follow the API.
lvirbalas
reviewed
Jun 16, 2020
# Conflicts: # govcd/common_test.go # govcd/lb_test.go # govcd/vm_test.go
Didainius
reviewed
Jun 22, 2020
dataclouder
suggested changes
Jun 22, 2020
govcd/vapp_network.go
Outdated
| return nil | ||
| } | ||
|
|
||
| // RemoveAllNetworkFirewallRules removes all network all firewall rules from a vApp network. |
There was a problem hiding this comment.
Suggested change
| // RemoveAllNetworkFirewallRules removes all network all firewall rules from a vApp network. | |
| // RemoveAllNetworkFirewallRules removes all network firewall rules from a vApp network. |
| check.Assert(result.Configuration.Features.NatService.NatRule[1].OneToOneVMRule.MappingMode, Equals, "manual") | ||
| check.Assert(result.Configuration.Features.NatService.NatRule[1].OneToOneVMRule.VAppScopedVMID, Equals, vm2.VM.VAppScopedLocalID) | ||
| check.Assert(result.Configuration.Features.NatService.NatRule[1].OneToOneVMRule.VMNicID, Equals, 0) | ||
| check.Assert(*result.Configuration.Features.NatService.NatRule[1].OneToOneVMRule.ExternalIPAddress, Equals, "192.168.100.1") |
There was a problem hiding this comment.
We should check that the pointer is not nil before comparing its value
Didainius
approved these changes
Jun 23, 2020
lvirbalas
approved these changes
Jun 23, 2020
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.
Add function needed for implementing vApp network NAT rules resource:
This PR is derived from #308 so shows that PR code too.