From d7c002982af52715bada0e9150c1ee1df90b726a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Ko=C5=A1ir?= Date: Mon, 5 Nov 2018 10:13:20 +0100 Subject: [PATCH] Refarctor Nuage fixture Refactor Nuage fixture so we have an option to reuse it with different test configuration --- cfme/fixtures/nuage.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cfme/fixtures/nuage.py b/cfme/fixtures/nuage.py index 9ea422634f..7845287bf6 100644 --- a/cfme/fixtures/nuage.py +++ b/cfme/fixtures/nuage.py @@ -5,10 +5,8 @@ from cfme.utils.log import logger -@pytest.fixture -def with_nuage_sandbox(networks_provider): - nuage = networks_provider.mgmt - sandbox = box = {} +def create_basic_sandbox(nuage): + box = {} # Create empty enterprise aka 'sandbox'. enterprise = box['enterprise'] = nuage.create_enterprise() @@ -45,9 +43,18 @@ def with_nuage_sandbox(networks_provider): box['l2_group'] = box['l2_domain'].create_child( nuage.vspk.NUPolicyGroup(name=random_name()))[0] + return box + + +@pytest.fixture +def with_nuage_sandbox(networks_provider): + nuage = networks_provider.mgmt + sandbox = create_basic_sandbox(nuage) + # Let integration test do whatever it needs to do. yield sandbox # Destroy the sandbox. + enterprise = sandbox['enterprise'] nuage.delete_enterprise(enterprise) logger.info('Destroyed sandbox enterprise {} ({})'.format(enterprise.name, enterprise.id))