Fix for Fwaasv2 and mac learning api cases
Change-Id: Iba2ce91262b143179c427744a880bf680f2f294b
This commit is contained in:
parent
03ae3c4325
commit
a0eab99359
|
@ -12,6 +12,8 @@
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
import time
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
@ -21,6 +23,7 @@ from tempest.lib import decorators
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
|
||||||
|
from vmware_nsx_tempest_plugin.common import constants
|
||||||
from vmware_nsx_tempest_plugin.lib import feature_manager
|
from vmware_nsx_tempest_plugin.lib import feature_manager
|
||||||
from vmware_nsx_tempest_plugin.services import nsx_client
|
from vmware_nsx_tempest_plugin.services import nsx_client
|
||||||
|
|
||||||
|
@ -180,10 +183,12 @@ class TestFwaasV2Ops(feature_manager.FeatureManager):
|
||||||
self._wait_firewall_ready(fw_group["firewall_group"]["id"])
|
self._wait_firewall_ready(fw_group["firewall_group"]["id"])
|
||||||
show_group = self.show_firewall_group(fw_group["firewall_group"]["id"])
|
show_group = self.show_firewall_group(fw_group["firewall_group"]["id"])
|
||||||
self.assertEqual(show_group.get('firewall_group')['ports'], ports)
|
self.assertEqual(show_group.get('firewall_group')['ports'], ports)
|
||||||
|
fw_group = show_group
|
||||||
if group_delete is True:
|
if group_delete is True:
|
||||||
# Update firewall group
|
# Update firewall group
|
||||||
self.update_firewall_group(fw_group["firewall_group"]["id"],
|
self.update_firewall_group(fw_group["firewall_group"]["id"],
|
||||||
ports=[])
|
ports=[])
|
||||||
|
time.sleep(constants.NSXP_BACKEND_SMALL_TIME_INTERVAL)
|
||||||
# Check updated values of firewall group
|
# Check updated values of firewall group
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
show_group.get('firewall_group')['name'],
|
show_group.get('firewall_group')['name'],
|
||||||
|
|
|
@ -160,6 +160,8 @@ class NSXv3MacLearningTest(base.BaseNetworkTest):
|
||||||
mac_lrn_port = self._create_mac_learn_enabled_port(self.network)
|
mac_lrn_port = self._create_mac_learn_enabled_port(self.network)
|
||||||
vanilla_name = data_utils.rand_name('vanilla_port-')
|
vanilla_name = data_utils.rand_name('vanilla_port-')
|
||||||
vanilla_port = self.create_port(self.network, name=vanilla_name)
|
vanilla_port = self.create_port(self.network, name=vanilla_name)
|
||||||
|
if CONF.network.backend == 'nsxp':
|
||||||
|
time.sleep(constants.NSXP_BACKEND_SMALL_TIME_INTERVAL)
|
||||||
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
|
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
|
||||||
self._delete_port, mac_lrn_port)
|
self._delete_port, mac_lrn_port)
|
||||||
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
|
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
|
||||||
|
|
Loading…
Reference in New Issue