diff options
| -rw-r--r-- | sdnvpn/lib/config.py | 4 | ||||
| -rw-r--r-- | sdnvpn/lib/utils.py | 9 | ||||
| -rw-r--r-- | sdnvpn/test/functest/config.yaml | 1 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 5 |
4 files changed, 16 insertions, 3 deletions
diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py index 4fd40ed..52e328d 100644 --- a/sdnvpn/lib/config.py +++ b/sdnvpn/lib/config.py @@ -47,6 +47,10 @@ class CommonConfig(object): self.ubuntu_image_path = '{0}/{1}'.format( CONST.dir_functest_data, "ubuntu-16.04-server-cloudimg-amd64-disk1.img") + self.custom_flavor_name = 'm1.custom' + self.custom_flavor_ram = 1024 + self.custom_flavor_disk = 10 + self.custom_flavor_vcpus = 1 class TestcaseConfig(object): diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index a047269..27fd5b3 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -28,6 +28,13 @@ ODL_USER = 'admin' ODL_PASS = 'admin' +def create_custom_flavor(): + return os_utils.get_or_create_flavor(common_config.custom_flavor_name, + common_config.custom_flavor_ram, + common_config.custom_flavor_disk, + common_config.custom_flavor_vcpus) + + def create_net(neutron_client, name): logger.debug("Creating network %s", name) net_id = os_utils.create_neutron_net(neutron_client, name) @@ -417,7 +424,7 @@ def wait_for_cloud_init(instance): logger.error("Cloud init failed to run. Reason: %s", instance_log) break - if re.search(r"Cloud-init v. .+ finished at" in instance_log): + if re.search(r"Cloud-init v. .+ finished at", instance_log): success = True break time.sleep(sleep_time) diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml index 4359f2f..6480c4c 100644 --- a/sdnvpn/test/functest/config.yaml +++ b/sdnvpn/test/functest/config.yaml @@ -84,7 +84,6 @@ testcases: quagga_router_name: sdnvpn-3-2-quagga-router quagga_instance_name: sdnvpn-3-2-quagga quagga_instance_ip: 10.10.11.5 - quagga_instance_flavor: m1.small instance_1_name: sdnvpn-3-1 instance_1_ip: 10.10.10.5 import_targets: '31:31' diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 8a8aa30..cc0f6b0 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -199,6 +199,9 @@ def main(): controller_ext_ip, fake_fip['fip_addr'], ext_net_mask) + + test_utils.create_custom_flavor() + quagga_vm = test_utils.create_instance( nova_client, TESTCASE_CONFIG.quagga_instance_name, @@ -206,7 +209,7 @@ def main(): quagga_net_id, sg_id, fixed_ip=TESTCASE_CONFIG.quagga_instance_ip, - flavor=TESTCASE_CONFIG.quagga_instance_flavor, + flavor=COMMON_CONFIG.custom_flavor_name, userdata=quagga_bootstrap_script, compute_node=quagga_compute_node) |