Code Review
/
sdnvpn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add tetcase suite overview"
[sdnvpn.git]
/
sdnvpn
/
test
/
functest
/
testcase_10.py
diff --git
a/sdnvpn/test/functest/testcase_10.py
b/sdnvpn/test/functest/testcase_10.py
index
cbad82d
..
6344a17
100644
(file)
--- a/
sdnvpn/test/functest/testcase_10.py
+++ b/
sdnvpn/test/functest/testcase_10.py
@@
-8,7
+8,6
@@
# http://www.apache.org/licenses/LICENSE-2.0
#
# http://www.apache.org/licenses/LICENSE-2.0
#
-import argparse
import logging
import re
import sys
import logging
import re
import sys
@@
-20,13
+19,6
@@
from sdnvpn.lib import config as sdnvpn_config
from sdnvpn.lib import utils as test_utils
from sdnvpn.lib.results import Results
from sdnvpn.lib import utils as test_utils
from sdnvpn.lib.results import Results
-parser = argparse.ArgumentParser()
-
-parser.add_argument("-r", "--report",
- help="Create json result file",
- action="store_true")
-
-args = parser.parse_args()
logger = logging.getLogger('__name__')
logger = logging.getLogger('__name__')
@@
-260,7
+252,8
@@
def main():
for thread in threads:
thread.join()
for thread in threads:
thread.join()
- test_utils.cleanup_nova(nova_client, instance_ids, image_ids)
+ test_utils.cleanup_nova(nova_client, instance_ids)
+ test_utils.cleanup_glance(glance_client, image_ids)
test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
interfaces, subnet_ids, router_ids,
network_ids)
test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids,
interfaces, subnet_ids, router_ids,
network_ids)