Repository: cloudstack Updated Branches: refs/heads/master a2d85c8ca -> 65608e994
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65608e99/tools/marvin/marvin/cloudstackException.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackException.py b/tools/marvin/marvin/cloudstackException.py index 331ae91..2738cfb 100644 --- a/tools/marvin/marvin/cloudstackException.py +++ b/tools/marvin/marvin/cloudstackException.py @@ -71,6 +71,7 @@ class CloudstackAclException(): NO_PERMISSION_TO_OPERATE_ACCOUNT = "does not have permission to operate with resource Acct" UNABLE_TO_LIST_NETWORK_ACCOUNT = "Can't create/list resources for account" NO_PERMISSION_TO_ACCESS_ACCOUNT = "does not have permission to access resource Acct" + NOT_AVAILABLE_IN_DOMAIN = "not available in domain" @staticmethod def verifyMsginException(e,message): http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65608e99/tools/marvin/marvin/config/test_data.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 4133aba..9b2aee7 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -1215,10 +1215,18 @@ test_data = { "name" : "d11b", "displayname" : "d11b", }, + "vmD111" : { + "name" : "d111", + "displayname" : "d111", + }, "vmD111A" : { "name" : "d111a", "displayname" : "d111a", }, + "vmD111B" : { + "name" : "d111b", + "displayname" : "d111b", + }, "vmD12A" : { "name" : "d12a", "displayname" : "d12a",
