From 17617d1e30ecfb83358af32ff188de124e2209f7 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Wed, 17 Jan 2018 09:27:30 +0200 Subject: [PATCH] Fix VPN local endpoint structure NSX request format changed. Change-Id: I084c41bdb22eb681571c97060ba065181032fc97 --- vmware_nsxlib/tests/unit/v3/test_constants.py | 3 ++- vmware_nsxlib/tests/unit/v3/test_vpn_ipsec.py | 2 +- vmware_nsxlib/v3/vpn_ipsec.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vmware_nsxlib/tests/unit/v3/test_constants.py b/vmware_nsxlib/tests/unit/v3/test_constants.py index 1e5b85af..a5f925c8 100644 --- a/vmware_nsxlib/tests/unit/v3/test_constants.py +++ b/vmware_nsxlib/tests/unit/v3/test_constants.py @@ -481,7 +481,8 @@ FAKE_LEP = { "id": FAKE_LEP_ID, "display_name": "XXX", "local_id": "1.1.1.1", - "ipsec_vpn_service_id": "aca38a11-981b-46d8-9e2c-9bedc0d96794", + "ipsec_vpn_service_id": {"target_id": + "aca38a11-981b-46d8-9e2c-9bedc0d96794"}, "local_address": "1.1.1.1", "trust_ca_ids": [], "trust_crl_ids": [], diff --git a/vmware_nsxlib/tests/unit/v3/test_vpn_ipsec.py b/vmware_nsxlib/tests/unit/v3/test_vpn_ipsec.py index 9e0f2a78..9797bbc7 100644 --- a/vmware_nsxlib/tests/unit/v3/test_vpn_ipsec.py +++ b/vmware_nsxlib/tests/unit/v3/test_vpn_ipsec.py @@ -224,7 +224,7 @@ class TestLocalEndpoint(test_resources.BaseTestResource): 'local_address': local_address, 'local_id': local_id, 'description': description, - 'ipsec_vpn_service_id': ipsec_vpn_service_id + 'ipsec_vpn_service_id': {'target_id': ipsec_vpn_service_id} }, sort_keys=True), headers=self.default_headers()) diff --git a/vmware_nsxlib/v3/vpn_ipsec.py b/vmware_nsxlib/v3/vpn_ipsec.py index 3694928b..94401c39 100644 --- a/vmware_nsxlib/v3/vpn_ipsec.py +++ b/vmware_nsxlib/v3/vpn_ipsec.py @@ -316,7 +316,7 @@ class LocalEndpoint(utils.NsxLibApiBase): # mandatory parameters body = {'display_name': name, 'local_address': local_address, - 'ipsec_vpn_service_id': ipsec_vpn_service_id} + 'ipsec_vpn_service_id': {'target_id': ipsec_vpn_service_id}} # optional parameters if description: body['description'] = description @@ -346,7 +346,7 @@ class LocalEndpoint(utils.NsxLibApiBase): if local_address: body['local_address'] = local_address if ipsec_vpn_service_id: - body['ipsec_vpn_service_id'] = ipsec_vpn_service_id + body['ipsec_vpn_service_id'] = {'target_id': ipsec_vpn_service_id} if local_id: body['local_id'] = local_id if certificate_id: