x/vmware-nsx
Code Issues Proposed changes

Tempest: Use client result for Micro-Segmentation

Browse Source 
OO wrapper for neutron object has been removed in upstream Tempest.
Fix micro-segmentation scenario test to use results from client
directly instead of OO wrapper.

Change-Id: I9add4c48a49c7732b8e67ba6675c44c72db2f37a
This commit is contained in:
Tong Liu 2016-06-20 20:18:22 +00:00
parent 79de437e42
commit fec19fae9a
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vmware_nsx_tempest/tests/scenario/test_micro_segmentation_ops.py
View File

@ -18,6 +18,7 @@ from oslo_log import log as logging
from tempest import config from tempest import config
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
from tempest.scenario import manager from tempest.scenario import manager
from tempest import test from tempest import test
@ -109,7 +110,7 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
dict( dict(
direction='ingress', direction='ingress',
protocol='icmp', protocol='icmp',
remote_group_id=web_sg.id remote_group_id=web_sg['id']
), ),
dict( dict(
direction='ingress', direction='ingress',
@ -132,14 +133,14 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
dict( dict(
direction='ingress', direction='ingress',
protocol='icmp', protocol='icmp',
remote_group_id=app_sg.id remote_group_id=app_sg['id']
), ),
dict( dict(
direction='ingress', direction='ingress',
protocol='tcp', protocol='tcp',
port_range_min=22, port_range_min=22,
port_range_max=22, port_range_max=22,
remote_group_id=web_sg.id remote_group_id=web_sg['id']
) )
] ]
app_rulesets = common_ruleset + app_ruleset app_rulesets = common_ruleset + app_ruleset
@ -154,7 +155,12 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
**kwargs) **kwargs)
self.app_net = self._create_network(tenant_id=self.tenant_id) self.app_net = self._create_network(tenant_id=self.tenant_id)
self.app_subnet = self._create_subnet(network=self.app_net) self.app_subnet = self._create_subnet(network=self.app_net)
self.app_subnet.add_to_router(self.router.id) router_id = self.router['id']
self.routers_client.add_router_interface(
router_id, subnet_id=self.app_subnet['id'])
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.routers_client.remove_router_interface,
router_id, subnet_id=self.app_subnet['id'])
def _create_servers(self): def _create_servers(self):
web_server1_name = data_utils.rand_name('web-vm1') web_server1_name = data_utils.rand_name('web-vm1')
@ -181,7 +187,7 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
keypair = self.create_keypair() keypair = self.create_keypair()
self.keypairs[keypair['name']] = keypair self.keypairs[keypair['name']] = keypair
security_groups = [{'name': secgroup['name']}] security_groups = [{'name': secgroup['name']}]
network = {'uuid': network.id} network = {'uuid': network['id']}
server = self.create_server(name=name, networks=[network], server = self.create_server(name=name, networks=[network],
key_name=keypair['name'], key_name=keypair['name'],
security_groups=security_groups, security_groups=security_groups,
@ -200,7 +206,7 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
# test internal connectivity to the network ports on the network # test internal connectivity to the network ports on the network
network_ips = (p['fixed_ips'][0]['ip_address'] for p in network_ips = (p['fixed_ips'][0]['ip_address'] for p in
self._list_ports(tenant_id=server['tenant_id'], self._list_ports(tenant_id=server['tenant_id'],
network_id=network.id) network_id=network['id'])
if p['device_owner'].startswith('network')) if p['device_owner'].startswith('network'))
self._check_server_connectivity(floating_ip, self._check_server_connectivity(floating_ip,
server, server,
@ -213,7 +219,7 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
# test internal connectivity to the other VM on the same network # test internal connectivity to the other VM on the same network
compute_ips = (p['fixed_ips'][0]['ip_address'] for p in compute_ips = (p['fixed_ips'][0]['ip_address'] for p in
self._list_ports(tenant_id=server['tenant_id'], self._list_ports(tenant_id=server['tenant_id'],
network_id=network.id) network_id=network['id'])
if p['device_owner'].startswith('compute')) if p['device_owner'].startswith('compute'))
self._check_server_connectivity(floating_ip, self._check_server_connectivity(floating_ip,
server, server,
@ -222,7 +228,7 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
def _check_server_connectivity(self, floating_ip, server, address_list, def _check_server_connectivity(self, floating_ip, server, address_list,
should_connect=True): should_connect=True):
ip_address = floating_ip.floating_ip_address ip_address = floating_ip['floating_ip_address']
private_key = self._get_server_key(server) private_key = self._get_server_key(server)
ssh_source = self.get_remote_client(ip_address, ssh_source = self.get_remote_client(ip_address,
private_key=private_key) private_key=private_key)
@ -243,11 +249,11 @@ class TestMicroSegmentationOps(manager.NetworkScenarioTest):
raise raise
def _check_cross_network_connectivity(self, network, should_connect=False): def _check_cross_network_connectivity(self, network, should_connect=False):
if network.id == self.web_net.id: if network['id'] == self.web_net['id']:
net_id = self.app_net.id net_id = self.app_net['id']
floating_ip, server = self.web_server1_fip_tuple floating_ip, server = self.web_server1_fip_tuple
else: else:
net_id = self.web_net.id net_id = self.web_net['id']
floating_ip, server = self.app_server1_fip_tuple floating_ip, server = self.app_server1_fip_tuple
# test internal connectivity to the other VM on the same network # test internal connectivity to the other VM on the same network
remote_ips = (p['fixed_ips'][0]['ip_address'] for p in remote_ips = (p['fixed_ips'][0]['ip_address'] for p in