diff options
| -rwxr-xr-x | testcases/VIM/OpenStack/CI/libraries/check_os.sh | 17 | ||||
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml | 8 | ||||
| -rw-r--r-- | testcases/vIMS/CI/vIMS.py | 8 |
3 files changed, 27 insertions, 6 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/check_os.sh b/testcases/VIM/OpenStack/CI/libraries/check_os.sh index 3cc0ee103..88c760766 100755 --- a/testcases/VIM/OpenStack/CI/libraries/check_os.sh +++ b/testcases/VIM/OpenStack/CI/libraries/check_os.sh @@ -71,4 +71,21 @@ do done echo "OpenStack services are OK." + +echo "Checking External network..." +networks=($(neutron net-list | tail -n +4 | head -n -1 | awk '{print $2}')) +is_external=False +for net in "${networks[@]}" +do + is_external=$(neutron net-show $net|grep "router:external"|awk '{print $4}') + if [ $is_external == "True" ]; then + echo "External network found: $net" + break + fi +done +if [ $is_external == "False" ]; then + echo "ERROR: There are no external networks in the deployment." + exit 1 +fi + exit 0 diff --git a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml b/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml index 4523cbce5..540ba9f75 100644 --- a/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml +++ b/testcases/VIM/OpenStack/CI/libraries/os_defaults.yaml @@ -10,7 +10,7 @@ apex: networks: ['internal', 'external'] routers: [] security_groups: ['default'] - tenants: ['admin', 'services'] + tenants: ['admin', 'services', 'service'] users: ['heat', 'heat-cfn', 'cinder', 'nova', 'swift', 'glance', 'neutron', 'admin'] compass: images: [] @@ -21,11 +21,11 @@ compass: users: ['heat', 'cinder', 'nova', 'glance', 'neutron', 'admin', 'ceilometer', 'demo', 'keystone'] joid: images: [] - networks: [] + networks: ['ext-net'] routers: [] security_groups: ['default'] - tenants: ['admin', 'service'] - users: ['admin', 'glance', 'nova', 'quantum', 'heat-cfn_heat', 'ceilometer', 'cinder_cinderv2', 'swift'] + tenants: ['admin', 'services'] + users: ['admin', 'glance', 'nova', 'quantum_nova', 'quantum', 'heat-cfn_heat', 'ceilometer', 'cinder_cinderv2', 'swift'] common: networks: ['functest-net'] routers: ['functest-router'] diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py index a729e233e..94679f02a 100644 --- a/testcases/vIMS/CI/vIMS.py +++ b/testcases/vIMS/CI/vIMS.py @@ -216,8 +216,12 @@ def main(): logger.error("Error : Failed to create %s tenant" % TENANT_NAME) exit(-1) - role_name = "admin" - role_id = functest_utils.get_role_id(keystone, role_name) + roles_name = ["admin", "Admin"] + role_id = '' + for role_name in roles_name: + if role_id == '': + role_id = functest_utils.get_role_id(keystone, role_name) + if role_id == '': logger.error("Error : Failed to get id for %s role" % role_name) |