Code Review
/
sdnvpn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix instance boot when metadata exists
[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
..
5a88603
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__')
@@
-150,11
+142,11
@@
def main():
instance_ids.extend([vm_1.id, vm_3.id])
# Wait for VMs to get ips.
instance_ids.extend([vm_1.id, vm_3.id])
# Wait for VMs to get ips.
- instances_up = test_utils.wait_for_instances_up(vm_
1, vm_2,
-
vm_3)
+ instances_up = test_utils.wait_for_instances_up(vm_
2)
+
instances_dhcp_up = test_utils.wait_for_instances_get_dhcp(vm_1,
vm_3)
- if
not instances_up
:
- logger.error("One or more instances
is
down")
+ if
(not instances_up or not instances_dhcp_up)
:
+ logger.error("One or more instances
are
down")
# TODO: Handle this appropriately
# Create monitor threads to monitor traffic between vm_1, vm_2 and vm_3
m = Manager()
# TODO: Handle this appropriately
# Create monitor threads to monitor traffic between vm_1, vm_2 and vm_3
m = Manager()
@@
-216,9
+208,10
@@
def main():
compute_node=av_zone_1,
userdata=u4)
instance_ids.append(vm_4.id)
compute_node=av_zone_1,
userdata=u4)
instance_ids.append(vm_4.id)
+
# Wait for VMs to get ips.
# Wait for VMs to get ips.
- instances_
up = test_utils.wait_for_instances_u
p(vm_4)
- if not instances_up:
+ instances_
dhcp_up = test_utils.wait_for_instances_get_dhc
p(vm_4)
+ if not instances_
dhcp_
up:
logger.error("Instance vm_4 failed to start.")
# TODO: Handle this appropriately
# Create and start a new monitor thread for vm_4
logger.error("Instance vm_4 failed to start.")
# TODO: Handle this appropriately
# Create and start a new monitor thread for vm_4