x
/
fuel-plugin-contrail
Code Issues Proposed changes

Fix network and policy fixtures finalization 

Change-Id: I2ca434049b9b700c25c5c829de152bc505972459
This commit is contained in:
Georgy Dyuldin 2017-01-20 15:28:03 +03:00
parent 2a5aba34e6
commit d6817eaaf6
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin_test/vapor/vapor/fixtures/networks.py
View File

@ -1,3 +1,4 @@
from pycontrail import exceptions
import pycontrail.types as types
import pytest
from stepler.third_party import utils
@ -40,8 +41,13 @@ def contrail_network(contrail_api_client):
network_name, = utils.generate_ids()
net = types.VirtualNetwork(network_name)
contrail_api_client.virtual_network_create(net)
yield net
contrail_api_client.virtual_network_delete(id=net.uuid)
try:
contrail_api_client.virtual_network_delete(id=net.uuid)
except exceptions.NoIdError:
pass
@pytest.fixture

8
plugin_test/vapor/vapor/fixtures/policies.py
View File

@ -1,3 +1,4 @@
from pycontrail import exceptions
import pycontrail.types as types
import pytest
from stepler.third_party import utils
@ -28,5 +29,10 @@ def contrail_network_policy(contrail_api_client, contrail_current_project):
policy = types.NetworkPolicy(
policy_name, parent_obj=contrail_current_project)
contrail_api_client.network_policy_create(policy)
yield policy
contrail_api_client.network_policy_delete(id=policy.uuid)
try:
contrail_api_client.network_policy_delete(id=policy.uuid)
except exceptions.NoIdError:
pass