x
/
vmware-nsx
Code Issues Proposed changes

Update following tempest changes 

Commit 909891d61318cdf9d6b98f0d5e15b60ffadebfb3 removed the test cases
tempest so we blow them away here.

Commit 3fd5f0e8cc994a8662244873cc339523aa47198a removed the base router
class

Change-Id: I574d63b49603ec554f2aee5f99605b3fb84d7f1f
This commit is contained in:
Gary Kotton 2017-04-18 18:38:48 +03:00
parent 135f6bf0ff
commit 71ce341bf8
6 changed files with 6 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
vmware_nsx_tempest/lib/heat.py
View File

@ -1,244 +0,0 @@
# Copyright 2017 VMware Inc
# All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import os
import re
import yaml
from oslo_log import log as logging
from tempest.api.orchestration import base
from tempest.common.utils import data_utils
from tempest import config
from tempest.scenario import manager
from vmware_nsx_tempest.services import nsxv3_client
from vmware_nsx_tempest.services import nsxv_client
CONF = config.CONF
LOG = logging.getLogger(__name__)
class HeatSmokeTest(base.BaseOrchestrationTest,
manager.NetworkScenarioTest):
"""
Deploy and Test Neutron Resources using HEAT.
"""
@classmethod
def setup_clients(cls):
super(HeatSmokeTest, cls).setup_clients()
cls.routers_client = cls.os.routers_client
cls.backend = CONF.network.backend
if cls.backend == 'nsxv3':
cls.filename = 'nsxt_neutron_smoke'
cls.nsx = nsxv3_client.NSXV3Client(CONF.nsxv3.nsx_manager,
CONF.nsxv3.nsx_user,
CONF.nsxv3.nsx_password)
elif cls.backend == 'nsxv':
cls.filename = 'nsxv_neutron_smoke'
manager_ip = re.search(r"(\d{1,3}\.){3}\d{1,3}",
CONF.nsxv.manager_uri).group(0)
cls.vsm = nsxv_client.VSMClient(
manager_ip, CONF.nsxv.user, CONF.nsxv.password)
@classmethod
def setup_credentials(cls):
cls.set_network_resources()
super(HeatSmokeTest, cls).setup_credentials()
@classmethod
def read_template(cls, name, ext='yaml'):
loc = ["tests", "templates", "%s.%s" % (name, ext)]
dir_path = os.path.dirname(__file__).split('/')
dir_path.pop()
dir_path = '/'.join(dir_path)
filepath = os.path.join(dir_path, *loc)
if os.path.isfile(filepath):
with open(filepath, "r") as f:
content = f.read()
return content
else:
raise IOError
@classmethod
def load_template(cls, name, ext='yaml'):
loc = ["tests", "templates", "%s.%s" % (name, ext)]
dir_path = os.path.dirname(__file__).split('/')
dir_path.pop()
dir_path = '/'.join(dir_path)
filepath = os.path.join(dir_path, *loc)
if os.path.isfile(filepath):
with open(filepath, "r") as f:
return yaml.safe_load(f)
else:
raise IOError
@classmethod
def resource_setup(cls):
super(HeatSmokeTest, cls).resource_setup()
cls.stack_name = data_utils.rand_name('heat')
try:
cls.neutron_basic_template = cls.load_template(
cls.filename)
template = cls.read_template(cls.filename)
except IOError as e:
LOG.exception(("file %(rsp)s not found %(rsp1)s") %
{'rsp': cls.filename, 'rsp1': e})
cls.stack_identifier = cls.create_stack(cls.stack_name, template)
cls.client.wait_for_stack_status(cls.stack_identifier,
'CREATE_COMPLETE')
cls.stack_id = cls.stack_identifier.split('/')[1]
cls.resources = (cls.client.list_resources(cls.stack_identifier)
['resources'])
cls.test_resources = {}
for resource in cls.resources:
cls.test_resources[resource['logical_resource_id']] = resource
def _resource_list_check(self, resource):
# sorts out the resources and returns resource id
if resource == 'networks':
body = self.networks_client.list_networks()
component = 'OS::Neutron::Net'
elif resource == 'routers':
body = self.routers_client.list_routers()
component = 'OS::Neutron::Router'
elif resource == 'servers':
body = self.servers_client.list_servers()
component = 'OS::Nova::Server'
resource_list_id = [res_list['id'] for res_list in body[resource]]
test_resource_list_id = []
for _, resource in self.test_resources.items():
if resource['resource_type'] == component:
test_resource_list_id.append(resource['physical_resource_id'])
for resource_id in test_resource_list_id:
self.assertIn(resource_id, resource_list_id)
return test_resource_list_id
def _check_server_connectivity(self, floating_ip, address_list,
should_connect=True):
# checks server connectivity
private_key = self.get_stack_output(self.stack_identifier,
'private_key')
ssh_source = self.get_remote_client(floating_ip,
private_key=private_key)
for remote_ip in address_list:
if should_connect:
msg = ("Timed out waiting for %s to become "
"reachable") % remote_ip
else:
msg = "ip address %s is reachable" % remote_ip
try:
self.assertTrue(self._check_remote_connectivity
(ssh_source, remote_ip, should_connect),
msg)
except Exception:
LOG.exception(("Unable to access %(dest)s via ssh to "
"floating-ip %(src)s") %
{'dest': remote_ip, 'src': floating_ip})
raise
def check_created_resources(self):
"""Verifies created resources from template ."""
for resource in self.resources:
msg = 'resource %s not create successfully' \
% resource['logical_resource_id']
self.assertEqual('CREATE_COMPLETE', resource['resource_status'],
msg)
self.assertIsInstance(resource, dict)
def check_created_network(self):
"""Verifies created neutron networks."""
network_id_list = self._resource_list_check(resource='networks')
for network_id in network_id_list:
body = self.networks_client.show_network(network_id)
self.assertEqual('True', str(body['network']
['admin_state_up']))
msg = 'newtwork %s not found' % body['network']['name']
if self.backend == 'nsxv3':
self.assertIsNotNone(self.nsx.get_logical_switch(
body['network']['name'], body['network']['id']), msg)
elif self.backend == 'nsxv':
self.assertIsNotNone(self.vsm.get_logical_switch(network_id),
msg)
def check_created_router(self):
"""Verifies created router."""
router_id_list = self._resource_list_check(resource='routers')
for router_id in router_id_list:
body = self.routers_client.show_router(router_id)
self.assertEqual('True', str(body['router']['admin_state_up']))
if self.backend == 'nsxv3':
msg = 'router %s not found' % body['router']['name']
self.assertIsNotNone(self.nsx.get_logical_router(
body['router']['name'], body['router']['id']), msg)
elif self.backend == 'nsxv':
if (body['router']['router_type']) != 'shared':
router_edge_name = "%s-%s" % (
body['router']['name'], body['router']['id'])
exc_edge = self.vsm.get_edge(router_edge_name)
msg = 'exc edge %s not found' % body['router']['name']
self.assertTrue(exc_edge is not None, msg)
def check_created_server(self):
"""Verifies created sever."""
server_id_list = self._resource_list_check(resource='servers')
for server_id in server_id_list:
server = self.servers_client.show_server(server_id)['server']
msg = 'server %s not active ' % (server)
self.assertEqual('ACTIVE', str(server['status']), msg)
def check_topo1_same_network_connectivity(self):
"""Verifies same network connnectivity for Topology 1 """
address_list = []
topo1_server1_floatingip = self.get_stack_output(
self.stack_identifier, 'topo1_server1_floatingip')
server4_private_ip = self.get_stack_output(
self.stack_identifier, 'topo1_server4_private_ip')
address_list.append(server4_private_ip)
LOG.info(" floating ip :%(rsp)s and private ip list : %(rsp1)s" %
{"rsp": topo1_server1_floatingip, "rsp1": address_list})
self._check_server_connectivity(topo1_server1_floatingip, address_list,
should_connect=True)
def check_topo1_cross_network_connectivity(self):
"""Verifies cross network connnectivity for Topology 1 """
address_list = []
topo1_server1_floatingip = self.get_stack_output(
self.stack_identifier, 'topo1_server1_floatingip')
server2_private_ip = self.get_stack_output(self.stack_identifier,
'topo1_server2_private_ip')
server3_private_ip = self.get_stack_output(self.stack_identifier,
'topo1_server3_private_ip')
address_list.append(server2_private_ip)
address_list.append(server3_private_ip)
LOG.info("floating ip :%(rsp)s and private ip list : %(rsp1)s" %
{"rsp": topo1_server1_floatingip, "rsp1": address_list})
self._check_server_connectivity(topo1_server1_floatingip, address_list,
should_connect=True)
def check_topo1_external_connectivity(self):
"""Verifies external network connnectivity for Topology 1 """
address_list = []
topo1_server1_floatingip = self.get_stack_output(
self.stack_identifier, 'topo1_server1_floatingip')
external_network = self.external_network[0]
address_list.append(external_network)
LOG.info("floating ip :%(rsp)s and external ip : %(rsp1)s" %
{"rsp": topo1_server1_floatingip, "rsp1": address_list})
self._check_server_connectivity(topo1_server1_floatingip,
address_list, should_connect=True)

4
vmware_nsx_tempest/tests/nsxv/api/test_router_sizes.py
View File

@ -18,7 +18,7 @@ import time
from oslo_log import log as logging
from tempest.api.network import base_routers as base
from tempest.api.network import base
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
@ -31,7 +31,7 @@ LOG = logging.getLogger(__name__)
ROUTER_SIZE = ('compact', 'large', 'xlarge', 'quadlarge')
class RouterSizeBaseTest(base.BaseRouterTest):
class RouterSizeBaseTest(base.BaseAdminNetworkTest):
"""Base class to test creating routers with different router sizes:
NSX-v allows exclusive router to be created with one of ROUTER_SIZE.

4
vmware_nsx_tempest/tests/nsxv/api/test_router_types.py
View File

@ -15,7 +15,7 @@
import re
from tempest.api.network import base_routers as base
from tempest.api.network import base
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
@ -26,7 +26,7 @@ from vmware_nsx_tempest.services import nsxv_client
CONF = config.CONF
class ExcRouterTest(base.BaseRouterTest):
class ExcRouterTest(base.BaseAdminNetworkTest):
"""
Test class for exclusive router type, which is 1:1 mapping of
NSX-v service edge. Tests will skipped if the router-type

58
vmware_nsx_tempest/tests/nsxv/scenario/test_neutron_resources_heat_nsxv.py
View File

@ -1,58 +0,0 @@
# Copyright 2017 VMware Inc
# All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from tempest.lib import decorators
from vmware_nsx_tempest.lib import heat
class HeatTest(heat.HeatSmokeTest):
"""
Deploy and Test Neutron Resources using HEAT.
The script loads the neutron resources from template and fully
validates successful deployment of all resources from the template.
"""
@decorators.idempotent_id('fcc70627-dee0-466a-a59c-ae844a7ec59d')
def test_topo1_created_resources(self):
"""Verifies created resources from template ."""
self.check_created_resources()
@decorators.idempotent_id('ed1e9058-88b6-417e-bfa1-12531fa16cd0')
def test_topo1_created_network(self):
"""Verifies created neutron networks."""
self.check_created_network()
@decorators.idempotent_id('58a1f904-18c6-43b3-8d7b-c1246b65ac1b')
def test_topo1_created_router(self):
"""Verifies created router."""
self.check_created_router()
@decorators.idempotent_id('dece79ae-03e8-4d77-9484-5552a1f23412')
def test_topo1_created_server(self):
"""Verifies created sever."""
self.check_created_server()
@decorators.idempotent_id('6e6cc35c-d58c-490c-ad88-f085c260bc73')
def test_topo1_same_network(self):
"""Verifies same network connnectivity for Topology 1 """
self.check_topo1_same_network_connectivity()
@decorators.idempotent_id('1ae85f38-c78a-43ca-9b39-278131907681')
def test_topo1_cross_network(self):
"""Verifies cross network connnectivity for Topology 1 """
self.check_topo1_cross_network_connectivity()

4
vmware_nsx_tempest/tests/nsxv3/api/test_nsx_routers.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from tempest.api.network import base_routers as base
from tempest.api.network import base
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
@ -23,7 +23,7 @@ from vmware_nsx_tempest.services import nsxv3_client
CONF = config.CONF
class NSXv3RoutersTest(base.BaseRouterTest):
class NSXv3RoutersTest(base.BaseAdminNetworkTest):
"""Test L3 Router and realization on NSX backend
When test L3 Router feature, we need to test both REST API

58
vmware_nsx_tempest/tests/nsxv3/scenario/test_neutron_resources_heat_nsxt.py
View File

@ -1,58 +0,0 @@
# Copyright 2017 VMware Inc
# All Rights Reserved
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from tempest.lib import decorators
from vmware_nsx_tempest.lib import heat
class HeatTest(heat.HeatSmokeTest):
"""
Deploy and Test Neutron Resources using HEAT.
The script loads the neutron resources from template and fully
validates successful deployment of all resources from the template.
"""
@decorators.idempotent_id('cb772c73-5948-4bd3-91d1-d85af2577362')
def test_topo1_created_resources(self):
"""Verifies created resources from template ."""
self.check_created_resources()
@decorators.idempotent_id('4f4cb71e-404f-4810-8898-5d6d70650016')
def test_topo1_created_network(self):
"""Verifies created neutron networks."""
self.check_created_network()
@decorators.idempotent_id('7e6452de-62c1-4daf-a031-013889b1d4ba')
def test_topo1_created_router(self):
"""Verifies created router."""
self.check_created_router()
@decorators.idempotent_id('24a3c0f8-3482-47fe-8c80-561a264a66d0')
def test_topo1_created_server(self):
"""Verifies created sever."""
self.check_created_server()
@decorators.idempotent_id('1fc3b998-d730-4f90-8ad2-bc4f2eeb7157')
def test_topo1_same_network(self):
"""Verifies same network connnectivity for Topology 1 """
self.check_topo1_same_network_connectivity()
@decorators.idempotent_id('aec9b109-2501-41de-9a24-444ced8b2668')
def test_topo1_cross_network(self):
"""Verifies cross network connnectivity for Topology 1 """
self.check_topo1_cross_network_connectivity()