Add some test case in test_post_execute.py

1.add some test case in test_post_execute.py.
2.rename test_execute.py to test_prepare_execute.py and
add clearup handle in test function.

Change-Id: I1ed27ce6f0a5ba8bbd56544ae8d53e14f7daa9ea
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>

2 files changed, 0 insertions, 117 deletions

diff --git a/tests/post/test_keystoneauth.py b/tests/post/test_keystoneauth.py
deleted file mode 100644
index 1b208952..00000000
--- a/tests/post/test_keystoneauth.py
+++ /dev/null
@@ -1,20 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 ZTE Corp and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-import pytest
-
-from deploy.post.keystoneauth import Keystoneauth
-
-
-@pytest.mark.parametrize('openrc, expected', [
-    ('/etc/kolla/admin-openrc.sh', '/etc/kolla/admin-openrc.sh'),
-    (None, '/etc/kolla/admin-openrc.sh')])
-def test_create_Keystoneauth_instance_(openrc, expected):
-    KeystoneClient = Keystoneauth(openrc)
-    assert KeystoneClient.openrc == expected
diff --git a/tests/post/test_post_execute.py b/tests/post/test_post_execute.py
deleted file mode 100644
index 38a67c0e..00000000
--- a/tests/post/test_post_execute.py
+++ /dev/null
@@ -1,97 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 ZTE Corp and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-import pytest
-
-from deploy.post.execute import (
-    _config_external_network,
-    _config_icmp_security_group_rule,
-    _config_ssh_security_group_rule
-)
-
-
-@pytest.mark.parametrize('ext_name, physnet, expected', [
-    ('EXTERNAL', 'ens8',
-     {
-         'network': {
-             'name': 'EXTERNAL',
-             'admin_state_up': True,
-             'shared': False,
-             'provider:network_type': 'flat',
-             'provider:physical_network': 'ens8',
-             'router:external': True
-         }
-     }),
-    ('EXTERNAL', 'ens3',
-     {
-         'network': {
-             'name': 'EXTERNAL',
-             'admin_state_up': True,
-             'shared': False,
-             'provider:network_type': 'flat',
-             'provider:physical_network': 'ens3',
-             'router:external': True
-         }
-     })])
-def test__config_external_network(ext_name, physnet, expected):
-    assert _config_external_network(ext_name, physnet) == expected
-
-
-@pytest.mark.parametrize('security_group_id, expected', [
-    ('0x1111',
-     {
-         'security_group_rule': {
-             'direction': 'ingress',
-             'ethertype': 'IPv4',
-             'protocol': 'icmp',
-             'remote_ip_prefix': '0.0.0.0/0',
-             'security_group_id': '0x1111'
-         }
-     }),
-    ('0xaaaa',
-     {
-         'security_group_rule': {
-             'direction': 'ingress',
-             'ethertype': 'IPv4',
-             'protocol': 'icmp',
-             'remote_ip_prefix': '0.0.0.0/0',
-             'security_group_id': '0xaaaa'
-         }
-     })])
-def test__config_icmp_security_group_rule(security_group_id, expected):
-    assert _config_icmp_security_group_rule(security_group_id) == expected
-
-
-@pytest.mark.parametrize('security_group_id, expected', [
-    ('0x1111',
-     {
-         'security_group_rule': {
-             'direction': 'ingress',
-             'ethertype': 'IPv4',
-             'protocol': 'tcp',
-             'port_range_min': 22,
-             'port_range_max': 22,
-             'remote_ip_prefix': '0.0.0.0/0',
-             'security_group_id': '0x1111'
-         }
-     }),
-    ('0xaaaa',
-     {
-         'security_group_rule': {
-             'direction': 'ingress',
-             'ethertype': 'IPv4',
-             'protocol': 'tcp',
-             'port_range_min': 22,
-             'port_range_max': 22,
-             'remote_ip_prefix': '0.0.0.0/0',
-             'security_group_id': '0xaaaa'
-         }
-     })])
-def test__config_ssh_security_group_rule(security_group_id, expected):
-    assert _config_ssh_security_group_rule(security_group_id) == expected