NAT rule support IDs and external or Org networks #282

vbauzys · 2019-07-15T12:43:49Z

Ref: terraform-providers/terraform-provider-vcd#244
Ref: https://github.com/terraform-providers/terraform-provider-vcd/pull/224
Depends on: vmware/go-vcloud-director#216

Uses nat rule Id's for handling rules. Also network_name and network_type used to handle which network to use. Old way left to be intact (allows only creating rule for first external network)

Signed-off-by: Vaidotas Bauzys <[email protected]>

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # vcd/resource_vcd_org_vdc.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

…roviders/terraform-provider-vcd into vdc-metadata

Signed-off-by: Vaidotas Bauzys <[email protected]>

…vider-vcd

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # CHANGELOG.md # go.mod # go.sum # vendor/github.com/vmware/go-vcloud-director/v2/govcd/edgegateway.go # vendor/modules.txt

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius

Round 1

CHANGELOG.md

vcd/resource_vcd_dnat.go

Didainius · 2019-07-17T06:39:17Z

vcd/resource_vcd_dnat.go

+			if externalNetwork != nil && externalNetwork != (&govcd.ExternalNetwork{}) {
+				d.Set("network_type", "ext")
+			} else {
+				return fmt.Errorf("issue to find network")


A bit more context would help - network name, network type

vcd/resource_vcd_dnat.go

vcd/resource_vcd_dnat_test.go

website/docs/r/snat.html.markdown

website/docs/r/dnat.html.markdown

website/docs/r/snat.html.markdown

vcd/resource_vcd_snat.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder

Some changes needed. Testing ...

vcd/resource_vcd_dnat.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

CHANGELOG.md

vcd/resource_vcd_dnat.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

website/docs/r/snat.html.markdown

website/docs/r/dnat.html.markdown

website/docs/r/snat.html.markdown

vcd/resource_vcd_dnat.go

vcd/resource_vcd_snat_test.go

Signed-off-by: Vaidotas Bauzys <[email protected]>

vbauzys · 2019-07-19T13:06:59Z

Bump to tagged version of govcd

Didainius · 2019-07-19T15:24:41Z

I have ext and org networks with the same name.
This test fails in such case:

$ go test -tags functional -v -run "TestAccVcdDNAT_WithExtNetw" .
Connecting to https://192.168.1.109/api
as user administrator@System
Checking resources to create for test suite...
Skipping catalog creation - found preconfigured one: my-catalog
Catalog found successfully
Skipping catalog item creation - found preconfigured one: photon-os
Catalog item found successfully
=== RUN   TestAccVcdDNAT_WithExtNetw
--- FAIL: TestAccVcdDNAT_WithExtNetw (39.59s)
    testing.go:561: Step 1, expected error:

        Check failed: Check 3/8 error: vcd_dnat.TestAccVcdDNAT_WithExtNetw: Attribute 'network_type' expected "ext", got "org"

        To match:

        After applying this step and refreshing, the plan was not empty:


FAIL

If I remove the network in org - tests start passing. This probably hints at incorrect lookup (at least in update case)

vbauzys · 2019-07-22T04:07:49Z

TestAccVcdDNAT_WithExtNetw

Well. Resource allows to change network type ext or org - so when I read/refresh I need to check which type it is. Now firstly search for org when for ext network if not found. I think it's ok - if anyone see value, so only one additional approach I see is throw error with complain that org and ext networks with same name exists.

Didainius · 2019-07-22T06:38:40Z

TestAccVcdDNAT_WithExtNetw

Well. Resource allows to change network type ext or org - so when I read/refresh I need to check which type it is. Now firstly search for org when for ext network if not found. I think it's ok - if anyone see value, so only one additional approach I see is throw error with complain that org and ext networks with same name exists.

Could we lookup the network based on it's type? If it was an ext then it should find and try to use ext?

vbauzys · 2019-07-22T06:48:53Z

TestAccVcdDNAT_WithExtNetw

Well. Resource allows to change network type ext or org - so when I read/refresh I need to check which type it is. Now firstly search for org when for ext network if not found. I think it's ok - if anyone see value, so only one additional approach I see is throw error with complain that org and ext networks with same name exists.

Could we lookup the network based on it's type? If it was an ext then it should find and try to use ext?
e.g.
With terraform we created rule id 6565 org with name1. Using UI we changed rule 6565 tu use ext with name2. And in your case you have also created create network org with name name2. So type can be changed too.

Signed-off-by: Vaidotas Bauzys <[email protected]>

vcd/resource_vcd_dnat.go

Didainius · 2019-07-22T10:02:42Z

vcd/resource_vcd_dnat.go

+			found = true
+		}
+		if orgVdcNetwork != nil && extNetwErr == nil {
+			return fmt.Errorf("find external network or org VCD network with same name: %s", natRule.GatewayNatRule.Interface.Name)


Suggested change

return fmt.Errorf("find external network or org VCD network with same name: %s", natRule.GatewayNatRule.Interface.Name)

return fmt.Errorf("found external network or org VCD network with same name: %s", natRule.GatewayNatRule.Interface.Name)

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius

LGTM. Having duplicate networks now fails as I would expect. Test suite works.

lvirbalas

LGTM

dataclouder

LGTM

vbauzys added 13 commits June 20, 2019 12:37

Adding meta data creation with update support

18db1f2

Signed-off-by: Vaidotas Bauzys <[email protected]>

Merge branch 'master' into vdc-metadata

72722b6

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # vcd/resource_vcd_org_vdc.go

Add metadata functionality

cd550d4

Signed-off-by: Vaidotas Bauzys <[email protected]>

Address comments

6eb7ea7

Signed-off-by: Vaidotas Bauzys <[email protected]>

Change func names

1ff0368

Signed-off-by: Vaidotas Bauzys <[email protected]>

Fix naming

55009eb

Signed-off-by: Vaidotas Bauzys <[email protected]>

Improve error message

bd71e0b

Signed-off-by: Vaidotas Bauzys <[email protected]>

git push origin masterMerge branch 'master' of github.com:terraform-p…

71df2ab

…roviders/terraform-provider-vcd into vdc-metadata

bump govcd version to PR

6dd5640

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add implementation for support network type and handling IDs.

6828239

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add missing file

6585559

Signed-off-by: Vaidotas Bauzys <[email protected]>

Merge branch 'master' of github.com:terraform-providers/terraform-pro…

e247d25

…vider-vcd

Merge branch 'master' into nat_extNet_support

6e8b128

Signed-off-by: Vaidotas Bauzys <[email protected]> # Conflicts: # CHANGELOG.md # go.mod # go.sum # vendor/github.com/vmware/go-vcloud-director/v2/govcd/edgegateway.go # vendor/modules.txt

vbauzys requested review from lvirbalas, dataclouder and Didainius July 15, 2019 12:43

vbauzys self-assigned this Jul 15, 2019

ghost added size/XL dependencies documentation labels Jul 15, 2019

Improve changelog

e2f9b15

Signed-off-by: Vaidotas Bauzys <[email protected]>

vbauzys changed the title ~~Nat ext net support~~ NAT rule support IDs and external or Org networks Jul 15, 2019

Fix

2607d2c

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius reviewed Jul 17, 2019

View reviewed changes

vbauzys added 2 commits July 17, 2019 11:49

Improve comments

4df154d

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add update unit tests

b1bf437

Signed-off-by: Vaidotas Bauzys <[email protected]>

ghost added size/XXL and removed size/XL labels Jul 17, 2019

vbauzys added 2 commits July 18, 2019 13:08

bump govcd to latest version

a8b5121

Signed-off-by: Vaidotas Bauzys <[email protected]>

Changes according latest govcd changes

24c4dc4

Signed-off-by: Vaidotas Bauzys <[email protected]>

dataclouder suggested changes Jul 19, 2019

View reviewed changes

vcd/resource_vcd_dnat.go Outdated Show resolved Hide resolved

vcd/resource_vcd_dnat.go Outdated Show resolved Hide resolved

vcd/resource_vcd_dnat.go Outdated Show resolved Hide resolved

vbauzys added 3 commits July 19, 2019 10:56

Add improvements

3ee3b67

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add comment fix

668ccb1

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add improvements in comments

89028b2

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas requested changes Jul 19, 2019

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

vcd/resource_vcd_dnat.go Show resolved Hide resolved

vbauzys added 2 commits July 19, 2019 13:25

Add comment fix

72a10b4

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add comment fix

103a0f5

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius reviewed Jul 19, 2019

View reviewed changes

vbauzys added 2 commits July 19, 2019 15:38

Removed comments

43cba68

Signed-off-by: Vaidotas Bauzys <[email protected]>

Bump govcd version

6d2d64a

Signed-off-by: Vaidotas Bauzys <[email protected]>

vbauzys added 2 commits July 22, 2019 12:09

Change test timeout from 90m to 120m

05b96e6

Signed-off-by: Vaidotas Bauzys <[email protected]>

Add check for case when two diff type netw has same name

300c845

Signed-off-by: Vaidotas Bauzys <[email protected]>

lvirbalas reviewed Jul 22, 2019

View reviewed changes

vcd/resource_vcd_dnat.go Show resolved Hide resolved

Didainius reviewed Jul 22, 2019

View reviewed changes

Add comment fix

0a4bd77

Signed-off-by: Vaidotas Bauzys <[email protected]>

Didainius approved these changes Jul 22, 2019

View reviewed changes

lvirbalas approved these changes Jul 22, 2019

View reviewed changes

dataclouder approved these changes Jul 22, 2019

View reviewed changes

vbauzys merged commit e184043 into vmware:master Jul 22, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NAT rule support IDs and external or Org networks #282

NAT rule support IDs and external or Org networks #282

vbauzys commented Jul 15, 2019

Didainius left a comment

Didainius Jul 17, 2019

vbauzys Jul 17, 2019

dataclouder left a comment

vbauzys commented Jul 19, 2019

Didainius commented Jul 19, 2019 •

edited

Loading

vbauzys commented Jul 22, 2019 •

edited

Loading

Didainius commented Jul 22, 2019

vbauzys commented Jul 22, 2019

Didainius Jul 22, 2019

vbauzys Jul 22, 2019

Didainius left a comment

lvirbalas left a comment

dataclouder left a comment

	return fmt.Errorf("find external network or org VCD network with same name: %s", natRule.GatewayNatRule.Interface.Name)
	return fmt.Errorf("found external network or org VCD network with same name: %s", natRule.GatewayNatRule.Interface.Name)

NAT rule support IDs and external or Org networks #282

NAT rule support IDs and external or Org networks #282

Conversation

vbauzys commented Jul 15, 2019

Didainius left a comment

Choose a reason for hiding this comment

Didainius Jul 17, 2019

Choose a reason for hiding this comment

vbauzys Jul 17, 2019

Choose a reason for hiding this comment

dataclouder left a comment

Choose a reason for hiding this comment

vbauzys commented Jul 19, 2019

Didainius commented Jul 19, 2019 • edited Loading

vbauzys commented Jul 22, 2019 • edited Loading

Didainius commented Jul 22, 2019

vbauzys commented Jul 22, 2019

Didainius Jul 22, 2019

Choose a reason for hiding this comment

vbauzys Jul 22, 2019

Choose a reason for hiding this comment

Didainius left a comment

Choose a reason for hiding this comment

lvirbalas left a comment

Choose a reason for hiding this comment

dataclouder left a comment

Choose a reason for hiding this comment

Didainius commented Jul 19, 2019 •

edited

Loading

vbauzys commented Jul 22, 2019 •

edited

Loading