X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=systest%2Ftestcases%2Fvim%2Ftest_vim.py;h=d622753cb3a48e8a96ed47d6510180fe9a15bbd7;hb=2c2374199270b5e71f419369a9a5e111ea0df375;hp=5ea7077e5cc4a8cac5f6ab5e11156c7bd44d2a0b;hpb=8f83069696a74f3fc9272a5c65d5e75e923e7ff9;p=osm%2Fdevops.git diff --git a/systest/testcases/vim/test_vim.py b/systest/testcases/vim/test_vim.py index 5ea7077e..d622753c 100644 --- a/systest/testcases/vim/test_vim.py +++ b/systest/testcases/vim/test_vim.py @@ -20,6 +20,7 @@ import time @pytest.mark.vim @pytest.mark.openstack +@pytest.mark.vmware class TestClass(object): def test_empty_vim(self,osm): @@ -42,9 +43,24 @@ class TestClass(object): resp=osm.get_api().vim.get('pytest') assert resp['name'] == 'pytest' assert resp['type'] == 'openstack' - assert resp['vim_url'] == os_access['os-url'] - assert resp['vim_url_admin'] == os_access['os-url'] - assert resp['vim_tenants'][0]['user'] == os_access['os-username'] - assert resp['vim_tenants'][0]['vim_tenant_name'] == os_access['os-project-name'] + assert resp['vim_url'] == os_access['vim-url'] + assert resp['vim_url_admin'] == os_access['vim-url'] + assert resp['vim_tenants'][0]['user'] == os_access['vim-username'] + assert resp['vim_tenants'][0]['vim_tenant_name'] == os_access['vim-tenant-name'] + + assert not osm.get_api().vim.delete('pytest') + + @pytest.mark.vmware + def test_add_vim_account_vmware(self,osm,vmware,cleanup_test_add_vim_account): + os_access=vmware.get_access() + assert not osm.get_api().vim.create('pytest',os_access) + + resp=osm.get_api().vim.get('pytest') + assert resp['name'] == 'pytest' + assert resp['type'] == 'vmware' + assert resp['vim_url'] == os_access['vim-url'] + assert resp['vim_url_admin'] == os_access['vim-url'] + assert resp['vim_tenants'][0]['user'] == os_access['vim-username'] + assert resp['vim_tenants'][0]['vim_tenant_name'] == os_access['vim-tenant-name'] assert not osm.get_api().vim.delete('pytest')