openstack
/
ec2api-tempest-plugin
Code Issues Proposed changes

Fix "test_create_delete_vpn_connection" and cancel skipping "test_tag_vpn_connection", "test_tag_vpn_gateway" 

Change-Id: I4099975ee86bd4e1ce576dcafc102626833e6971
This commit is contained in:
Dmitry_Eremeev 2020-02-14 13:59:16 +03:00
parent baf2d803e2
commit a9d30b2f6d
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ec2api_tempest_plugin/api/test_tags.py
View File

@ -456,12 +456,9 @@ class TagTest(base.EC2TestCase):
self._test_tag_resource(cgw_id, 'customer-gateway', describe_func) self._test_tag_resource(cgw_id, 'customer-gateway', describe_func)
@base.skip_without_vpc()
@base.skip_without_network_feature('vpnaas')
@decorators.idempotent_id('a0437171-81a1-4871-9b71-c7629b25c337') @decorators.idempotent_id('a0437171-81a1-4871-9b71-c7629b25c337')
@testtools.skip(
"Temporarily skipped to merge fix"
" encoding/decoding in paging of"
" universal describer class"
)
def test_tag_vpn_gateway(self): def test_tag_vpn_gateway(self):
data = self.client.create_vpn_gateway(Type='ipsec.1') data = self.client.create_vpn_gateway(Type='ipsec.1')
vgw_id = data['VpnGateway']['VpnGatewayId'] vgw_id = data['VpnGateway']['VpnGatewayId']
@ -476,12 +473,9 @@ class TagTest(base.EC2TestCase):
self._test_tag_resource(vgw_id, 'vpn-gateway', describe_func) self._test_tag_resource(vgw_id, 'vpn-gateway', describe_func)
@base.skip_without_vpc()
@base.skip_without_network_feature('vpnaas')
@decorators.idempotent_id('ecd343b4-f448-4990-880d-02a68febc9cf') @decorators.idempotent_id('ecd343b4-f448-4990-880d-02a68febc9cf')
@testtools.skip(
"Temporarily skipped to merge fix"
" encoding/decoding in paging of"
" universal describer class"
)
def test_tag_vpn_connection(self): def test_tag_vpn_connection(self):
data = self.client.create_customer_gateway( data = self.client.create_customer_gateway(
Type='ipsec.1', PublicIp='198.51.100.77', BgpAsn=65000) Type='ipsec.1', PublicIp='198.51.100.77', BgpAsn=65000)

9
ec2api_tempest_plugin/api/test_vpn_connections.py
View File

@ -20,8 +20,6 @@ from tempest.lib import decorators
from ec2api_tempest_plugin import base from ec2api_tempest_plugin import base
from ec2api_tempest_plugin import config from ec2api_tempest_plugin import config
import testtools
CONF = config.CONF CONF = config.CONF
@ -55,11 +53,6 @@ class VpnConnectionTest(base.EC2TestCase):
cls.get_vpn_gateway_waiter().wait_available(cls.vgw_id) cls.get_vpn_gateway_waiter().wait_available(cls.vgw_id)
@decorators.idempotent_id('57426aab-cf2d-4114-a11d-2bd6642ac606') @decorators.idempotent_id('57426aab-cf2d-4114-a11d-2bd6642ac606')
@testtools.skip(
"Temporarily skipped to merge fix"
" encoding/decoding in paging of"
" universal describer class"
)
def test_create_delete_vpn_connection(self): def test_create_delete_vpn_connection(self):
data = self.client.create_vpn_connection( data = self.client.create_vpn_connection(
CustomerGatewayId=self.cgw_id, VpnGatewayId=self.vgw_id, CustomerGatewayId=self.cgw_id, VpnGatewayId=self.vgw_id,
@ -68,7 +61,7 @@ class VpnConnectionTest(base.EC2TestCase):
vpn_clean = self.addResourceCleanUp( vpn_clean = self.addResourceCleanUp(
self.client.delete_vpn_connection, VpnConnectionId=vpn_id) self.client.delete_vpn_connection, VpnConnectionId=vpn_id)
vpn_config = etree.fromstring( vpn_config = etree.fromstring(
data['VpnConnection']['CustomerGatewayConfiguration']) data['VpnConnection']['CustomerGatewayConfiguration'].encode())
psks = vpn_config.xpath( psks = vpn_config.xpath(
'/vpn_connection/ipsec_tunnel/ike/pre_shared_key') '/vpn_connection/ipsec_tunnel/ike/pre_shared_key')
self.assertNotEmpty(psks) self.assertNotEmpty(psks)