From ceaa440a49d10157d3742383a52783571c8e30ed Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Sat, 2 Feb 2019 14:32:57 +0800 Subject: [PATCH 1/2] Fix port dhcp ip_version type --- openstack/networking/v2/extensions/extradhcpopts/results.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openstack/networking/v2/extensions/extradhcpopts/results.go b/openstack/networking/v2/extensions/extradhcpopts/results.go index 8e3132ea4..0eadbbc4c 100644 --- a/openstack/networking/v2/extensions/extradhcpopts/results.go +++ b/openstack/networking/v2/extensions/extradhcpopts/results.go @@ -16,5 +16,5 @@ type ExtraDHCPOpt struct { // IPVersion is the IP protocol version of a single DHCP option. // Valid value is 4 or 6. Default is 4. - IPVersion int `json:"ip_version"` + IPVersion string `json:"ip_version"` } From 2a59c12dd82778703804387fef55fe3dd6dcd2da Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Sat, 2 Feb 2019 14:55:00 +0800 Subject: [PATCH 2/2] fix acc tests --- openstack/networking/v2/ports/testing/fixtures.go | 8 ++++---- openstack/networking/v2/ports/testing/requests_test.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openstack/networking/v2/ports/testing/fixtures.go b/openstack/networking/v2/ports/testing/fixtures.go index cfce9b091..91e6ca68d 100644 --- a/openstack/networking/v2/ports/testing/fixtures.go +++ b/openstack/networking/v2/ports/testing/fixtures.go @@ -573,12 +573,12 @@ const GetWithExtraDHCPOptsResponse = ` { "opt_name": "option1", "opt_value": "value1", - "ip_version": 4 + "ip_version": "4" }, { "opt_name": "option2", "opt_value": "value2", - "ip_version": 4 + "ip_version": "4" } ], "admin_state_up": true, @@ -633,7 +633,7 @@ const CreateWithExtraDHCPOptsResponse = ` { "opt_name": "option1", "opt_value": "value1", - "ip_version": 4 + "ip_version": "4" } ], "admin_state_up": true, @@ -690,7 +690,7 @@ const UpdateWithExtraDHCPOptsResponse = ` { "opt_name": "option2", "opt_value": "value2", - "ip_version": 4 + "ip_version": "4" } ], "admin_state_up": true, diff --git a/openstack/networking/v2/ports/testing/requests_test.go b/openstack/networking/v2/ports/testing/requests_test.go index 30f403525..a606f6636 100644 --- a/openstack/networking/v2/ports/testing/requests_test.go +++ b/openstack/networking/v2/ports/testing/requests_test.go @@ -645,10 +645,10 @@ func TestGetWithExtraDHCPOpts(t *testing.T) { th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].OptName, "option1") th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].OptValue, "value1") - th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].IPVersion, 4) + th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].IPVersion, "4") th.AssertDeepEquals(t, s.ExtraDHCPOpts[1].OptName, "option2") th.AssertDeepEquals(t, s.ExtraDHCPOpts[1].OptValue, "value2") - th.AssertDeepEquals(t, s.ExtraDHCPOpts[1].IPVersion, 4) + th.AssertDeepEquals(t, s.ExtraDHCPOpts[1].IPVersion, "4") } func TestCreateWithExtraDHCPOpts(t *testing.T) { @@ -711,7 +711,7 @@ func TestCreateWithExtraDHCPOpts(t *testing.T) { th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].OptName, "option1") th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].OptValue, "value1") - th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].IPVersion, 4) + th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].IPVersion, "4") } func TestUpdateWithExtraDHCPOpts(t *testing.T) { @@ -775,5 +775,5 @@ func TestUpdateWithExtraDHCPOpts(t *testing.T) { th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].OptName, "option2") th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].OptValue, "value2") - th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].IPVersion, 4) + th.AssertDeepEquals(t, s.ExtraDHCPOpts[0].IPVersion, "4") }