x/vmware-nsx
Code Issues Proposed changes

TVD: Add NSX-v CI exclusions

Browse Source 
+ some fixing needed for the TVD-V CI to pass

Change-Id: Ie482643b69e07f37fbac27f8db29a04b812d36c7
This commit is contained in:
Adit Sarfaty 2017-12-31 10:37:53 +02:00
parent 84da10cf22
commit 442f3dcdf9
2 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
devstack/nsx_v/tvd_devstackgaterc Normal file
View File

@ -0,0 +1,46 @@
# 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.
# This file is sourced by the NSX-TVD-V CI to run selective set of tests
# based on the features that are ready to be tested.
# Note that the TVD plugin enabled a lot of extensions that the NSX-V plugin does not support
# so those tests should be skipped.
# Begin list of exclusions.
r="^(?!.*"
# unsupported NSX-V tests
r="$r(?:tempest\.api\.network\.test_ports\.PortsTestJSON\.test_create_update_port_with_second_ip.*)"
r="$r|(?:tempest\.api\.network\.test_floating_ips\.FloatingIPTestJSON\.test_create_update_floatingip_with_port_multiple_ip_address.*)"
r="$r|(?:tempest\.api\.network\.test_routers\.RoutersTest\.test_update_delete_extra_route.*)"
# unsupported TVD tests
r="$r|(?:tempest\.api\.network\.test_networks\.NetworksTest\.test_show_network_fields.*)"
r="$r|(?:tempest\.api\.network\.test_extra_dhcp_options\.ExtraDHCPOptionsTestJSON\.test_update.*)"
r="$r|(?:tempest\.api\.network\.test_extensions\.ExtensionsTestJSON\..*)"
r="$r|(?:tempest\.api\.network\.test_allowed_address_pair\.AllowedAddressPairTestJSON\.test_update.*)"
r="$r|(?:tempest\.api\.network\.admin\.test_routers_dvr\.RoutersTestDVR\..*)"
r="$r|(?:tempest\.api\.network\.admin\.test_l3_agent_scheduler\.L3AgentSchedulerTestJSON\..*)"
r="$r|(?:tempest\.api\.network\.admin.\test_metering_extensions.*)"
# End list of exclusions.
r="$r)"
# only run tempest.api.network tests
r="$r(tempest\.api\.network).*$"
export DEVSTACK_GATE_TEMPEST_REGEX="$r"

16
vmware_nsx/plugins/nsx/plugin.py
View File

@ -268,22 +268,6 @@ class NsxTVDPlugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
p = self._get_plugin_from_project(context, tenant_id)
return p.create_network(context, network)
def _create_bulk(self, resource, context, request_items):
objects = []
collection = "%ss" % resource
items = request_items[collection]
try:
with db_api.context_manager.writer.using(context):
for item in items:
obj_creator = getattr(self, 'create_%s' % resource)
objects.append(obj_creator(context, item))
except Exception:
with excutils.save_and_reraise_exception():
LOG.error("An exception occurred while creating "
"the %(resource)s:%(item)s",
{'resource': resource, 'item': item})
return objects
@db_api.retry_if_session_inactive()
def create_network_bulk(self, context, networks):
#Implement create bulk so that the plugin calculation will be done once