From 9cfab9b8156087f275947a9a957f32fc6f5a2355 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Fri, 19 Sep 2014 14:42:20 +0200 Subject: [PATCH 001/528] CID-1114591 Replace duplicated functionality with a call to super like the other state classes --- .../storage/download/DownloadActiveState.java | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/server/src/com/cloud/storage/download/DownloadActiveState.java b/server/src/com/cloud/storage/download/DownloadActiveState.java index 59709f26c04f..9a22eb859a2a 100644 --- a/server/src/com/cloud/storage/download/DownloadActiveState.java +++ b/server/src/com/cloud/storage/download/DownloadActiveState.java @@ -35,39 +35,35 @@ public String handleAnswer(DownloadAnswer answer) { s_logger.trace("handleAnswer, answer status=" + answer.getDownloadStatus() + ", curr state=" + getName()); } switch (answer.getDownloadStatus()) { - case DOWNLOAD_IN_PROGRESS: - getDownloadListener().scheduleStatusCheck(RequestType.GET_STATUS); - return Status.DOWNLOAD_IN_PROGRESS.toString(); - case DOWNLOADED: - getDownloadListener().cancelTimeoutTask(); - return Status.DOWNLOADED.toString(); - case NOT_DOWNLOADED: - getDownloadListener().scheduleStatusCheck(RequestType.GET_STATUS); - return Status.NOT_DOWNLOADED.toString(); - case DOWNLOAD_ERROR: - getDownloadListener().cancelStatusTask(); - getDownloadListener().cancelTimeoutTask(); - return Status.DOWNLOAD_ERROR.toString(); - case UNKNOWN: - getDownloadListener().cancelStatusTask(); - getDownloadListener().cancelTimeoutTask(); - return Status.DOWNLOAD_ERROR.toString(); - default: - return null; + case DOWNLOAD_IN_PROGRESS: + getDownloadListener().scheduleStatusCheck(RequestType.GET_STATUS); + return Status.DOWNLOAD_IN_PROGRESS.toString(); + case DOWNLOADED: + getDownloadListener().cancelTimeoutTask(); + return Status.DOWNLOADED.toString(); + case NOT_DOWNLOADED: + getDownloadListener().scheduleStatusCheck(RequestType.GET_STATUS); + return Status.NOT_DOWNLOADED.toString(); + case DOWNLOAD_ERROR: + getDownloadListener().cancelStatusTask(); + getDownloadListener().cancelTimeoutTask(); + return Status.DOWNLOAD_ERROR.toString(); + case UNKNOWN: + getDownloadListener().cancelStatusTask(); + getDownloadListener().cancelTimeoutTask(); + return Status.DOWNLOAD_ERROR.toString(); + default: + return null; } } @Override public void onEntry(String prevState, DownloadEvent event, Object evtObj) { - if (s_logger.isTraceEnabled()) { - getDownloadListener().log("onEntry, prev state= " + prevState + ", curr state=" + getName() + ", event=" + event, Level.TRACE); - } + super.onEntry(prevState, event, evtObj); if (event == DownloadEvent.DOWNLOAD_ANSWER) { - getDownloadListener().callback((DownloadAnswer)evtObj); getDownloadListener().setLastUpdated(); } - } @Override @@ -79,7 +75,7 @@ public String handleTimeout(long updateMs) { if (s_logger.isTraceEnabled()) { getDownloadListener().log("handleTimeout, updateMs=" + updateMs + ", curr state= " + getName(), Level.TRACE); } - String newState = this.getName(); + String newState = getName(); if (updateMs > 5 * DownloadListener.STATUS_POLL_INTERVAL) { newState = Status.DOWNLOAD_ERROR.toString(); getDownloadListener().log("timeout: transitioning to download error state, currstate=" + getName(), Level.DEBUG); From 2df41e857ec9d1398567c3dae3bd8a60f5a82759 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Fri, 19 Sep 2014 14:45:13 +0200 Subject: [PATCH 002/528] CID-1114592 Replaced duplicate code with a call to super --- .../storage/upload/UploadActiveState.java | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/server/src/com/cloud/storage/upload/UploadActiveState.java b/server/src/com/cloud/storage/upload/UploadActiveState.java index 53bbb754e91b..c5dcc4ed1590 100644 --- a/server/src/com/cloud/storage/upload/UploadActiveState.java +++ b/server/src/com/cloud/storage/upload/UploadActiveState.java @@ -45,26 +45,26 @@ public String handleAnswer(UploadAnswer answer) { s_logger.debug("handleAnswer, answer status=" + answer.getUploadStatus() + ", curr state=" + getName()); } switch (answer.getUploadStatus()) { - case UPLOAD_IN_PROGRESS: - getUploadListener().scheduleStatusCheck(RequestType.GET_STATUS); - return Status.UPLOAD_IN_PROGRESS.toString(); - case UPLOADED: - getUploadListener().scheduleImmediateStatusCheck(RequestType.PURGE); - getUploadListener().cancelTimeoutTask(); - return Status.UPLOADED.toString(); - case NOT_UPLOADED: - getUploadListener().scheduleStatusCheck(RequestType.GET_STATUS); - return Status.NOT_UPLOADED.toString(); - case UPLOAD_ERROR: - getUploadListener().cancelStatusTask(); - getUploadListener().cancelTimeoutTask(); - return Status.UPLOAD_ERROR.toString(); - case UNKNOWN: - getUploadListener().cancelStatusTask(); - getUploadListener().cancelTimeoutTask(); - return Status.UPLOAD_ERROR.toString(); - default: - return null; + case UPLOAD_IN_PROGRESS: + getUploadListener().scheduleStatusCheck(RequestType.GET_STATUS); + return Status.UPLOAD_IN_PROGRESS.toString(); + case UPLOADED: + getUploadListener().scheduleImmediateStatusCheck(RequestType.PURGE); + getUploadListener().cancelTimeoutTask(); + return Status.UPLOADED.toString(); + case NOT_UPLOADED: + getUploadListener().scheduleStatusCheck(RequestType.GET_STATUS); + return Status.NOT_UPLOADED.toString(); + case UPLOAD_ERROR: + getUploadListener().cancelStatusTask(); + getUploadListener().cancelTimeoutTask(); + return Status.UPLOAD_ERROR.toString(); + case UNKNOWN: + getUploadListener().cancelStatusTask(); + getUploadListener().cancelTimeoutTask(); + return Status.UPLOAD_ERROR.toString(); + default: + return null; } } @@ -73,7 +73,7 @@ public String handleTimeout(long updateMs) { if (s_logger.isTraceEnabled()) { getUploadListener().log("handleTimeout, updateMs=" + updateMs + ", curr state= " + getName(), Level.TRACE); } - String newState = this.getName(); + String newState = getName(); if (updateMs > 5 * UploadListener.STATUS_POLL_INTERVAL) { newState = Status.UPLOAD_ERROR.toString(); getUploadListener().log("timeout: transitioning to upload error state, currstate=" + getName(), Level.DEBUG); @@ -90,12 +90,9 @@ public String handleTimeout(long updateMs) { @Override public void onEntry(String prevState, UploadEvent event, Object evtObj) { - if (s_logger.isTraceEnabled()) { - getUploadListener().log("onEntry, prev state= " + prevState + ", curr state=" + getName() + ", event=" + event, Level.TRACE); - } + super.onEntry(prevState, event, evtObj); if (event == UploadEvent.UPLOAD_ANSWER) { - getUploadListener().updateDatabase((UploadAnswer)evtObj); getUploadListener().setLastUpdated(); } From 30611be15abd4cd8843c10ddb2d3b131aea2cda3 Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Tue, 16 Sep 2014 18:08:36 +0100 Subject: [PATCH 003/528] CLOUDSTACK-7561: UI: After creating a new account, the "Add Account" dialog remains open -Removed unused code that was causing javascript exception Signed-off-by: Brian Federle --- ui/scripts/accountsWizard.js | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/ui/scripts/accountsWizard.js b/ui/scripts/accountsWizard.js index f0221932706c..6b0dd19682fa 100644 --- a/ui/scripts/accountsWizard.js +++ b/ui/scripts/accountsWizard.js @@ -222,12 +222,6 @@ dataType: "json", type: "POST", async: false, - success: function(json) { - var count = json.ldapuserresponse.count; - args.response.success({ - data: count - }); - }, error: function(XMLHttpResponse) { args.response.error(parseXMLHttpResponse(XMLHttpResponse)); } @@ -238,12 +232,6 @@ dataType: "json", type: "POST", async: false, - success: function(json) { - var item = json.createaccountresponse.account; - args.response.success({ - data: item - }); - }, error: function(XMLHttpResponse) { args.response.error(parseXMLHttpResponse(XMLHttpResponse)); } @@ -255,12 +243,6 @@ dataType: "json", type: "POST", async: false, - success: function(json) { - var item = json.createaccountresponse.account; - args.response.success({ - data: item - }); - }, error: function(XMLHttpResponse) { args.response.error(parseXMLHttpResponse(XMLHttpResponse)); } @@ -268,4 +250,4 @@ } } }; -}(cloudStack, jQuery)); \ No newline at end of file +}(cloudStack, jQuery)); From dbb70fadc0767974a7a87b4c5491ba9517ea1804 Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Tue, 16 Sep 2014 18:15:58 +0100 Subject: [PATCH 004/528] CLOUDSTACK-7562: Details page for disk offerings only show details for write performance -Fixed all related typos Signed-off-by: Brian Federle --- ui/scripts/configuration.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 9b0086f66870..b6c94f833760 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1463,13 +1463,13 @@ label: 'label.network.rate' }, diskBytesReadRate: { - label: 'label.disk.bytes.write.rate' + label: 'label.disk.bytes.read.rate' }, diskBytesWriteRate: { label: 'label.disk.bytes.write.rate' }, diskIopsReadRate: { - label: 'label.disk.iops.write.rate' + label: 'label.disk.iops.read.rate' }, diskIopsWriteRate: { label: 'label.disk.iops.write.rate' @@ -2120,13 +2120,13 @@ } }, diskBytesReadRate: { - label: 'label.disk.bytes.write.rate' + label: 'label.disk.bytes.read.rate' }, diskBytesWriteRate: { label: 'label.disk.bytes.write.rate' }, diskIopsReadRate: { - label: 'label.disk.iops.write.rate' + label: 'label.disk.iops.read.rate' }, diskIopsWriteRate: { label: 'label.disk.iops.write.rate' From 7877f3f9603b967680cf9480cb6e51845a81ddd8 Mon Sep 17 00:00:00 2001 From: Sangeetha Hariharan Date: Fri, 19 Sep 2014 14:51:10 -0700 Subject: [PATCH 005/528] CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl related test cases. --- .../component/test_acl_isolatednetwork.py | 66 +++--- .../test_acl_isolatednetwork_delete.py | 20 +- .../component/test_acl_listsnapshot.py | 190 +++++++++--------- test/integration/component/test_acl_listvm.py | 190 +++++++++--------- .../component/test_acl_listvolume.py | 190 +++++++++--------- .../component/test_acl_sharednetwork.py | 56 +++--- ...cl_sharednetwork_deployVM-impersonation.py | 102 +++++----- 7 files changed, 407 insertions(+), 407 deletions(-) diff --git a/test/integration/component/test_acl_isolatednetwork.py b/test/integration/component/test_acl_isolatednetwork.py index 59119f15c6e4..b1e2575a0c34 100644 --- a/test/integration/component/test_acl_isolatednetwork.py +++ b/test/integration/component/test_acl_isolatednetwork.py @@ -357,7 +357,7 @@ def tearDown(cls): ## Test cases relating to createNetwork as admin user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_01_createNetwork_admin(self): """ @@ -380,7 +380,7 @@ def test_01_createNetwork_admin(self): "Admin User is not able to create a network for himself") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_02_createNetwork_admin_foruserinsamedomain(self): """ @@ -404,7 +404,7 @@ def test_02_createNetwork_admin_foruserinsamedomain(self): True, "Admin User is not able to create a network for other users in his domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_03_createNetwork_admin_foruserinotherdomain(self): """ @@ -430,7 +430,7 @@ def test_03_createNetwork_admin_foruserinotherdomain(self): ## Test cases relating to createNetwork as domain admin user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_04_createNetwork_domaindmin(self): """ @@ -453,7 +453,7 @@ def test_04_createNetwork_domaindmin(self): "Domain admin User is not able to create a network for himself") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_05_createNetwork_domaindmin_foruserinsamedomain(self): """ @@ -477,7 +477,7 @@ def test_05_createNetwork_domaindmin_foruserinsamedomain(self): True, "Domain admin User is not able to create a network for other users in his domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_06_createNetwork_domaindmin_foruserinsubdomain(self): """ @@ -501,7 +501,7 @@ def test_06_createNetwork_domaindmin_foruserinsubdomain(self): True, "Domain admin User is not able to create a network for other users in his sub domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_07_createNetwork_domaindmin_forcrossdomainuser(self): """ @@ -528,7 +528,7 @@ def test_07_createNetwork_domaindmin_forcrossdomainuser(self): ## Test cases relating to createNetwork as regular user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_08_createNetwork_user(self): """ @@ -551,7 +551,7 @@ def test_08_createNetwork_user(self): "User is not able to create a network for himself") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_09_createNetwork_user_foruserinsamedomain(self): """ @@ -577,7 +577,7 @@ def test_09_createNetwork_user_foruserinsamedomain(self): if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.UNABLE_TO_LIST_NETWORK_ACCOUNT): self.fail("Error message validation failed when when User tries to create network for other users in his domain ") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_10_createNetwork_user_foruserinotherdomain(self): """ @@ -606,7 +606,7 @@ def test_10_createNetwork_user_foruserinotherdomain(self): ## Test cases relating to Deploying VM in a network as admin user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_11_deployvm_admin(self): """ @@ -630,7 +630,7 @@ def test_11_deployvm_admin(self): "Admin User is not able to deploy VM in his own network") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_12_deployvm_admin_foruserinsamedomain(self): """ @@ -655,7 +655,7 @@ def test_12_deployvm_admin_foruserinsamedomain(self): True, "Admin User is not able to deploy VM for users in his domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_13_deployvm_admin_foruserinotherdomain(self): """ @@ -680,7 +680,7 @@ def test_13_deployvm_admin_foruserinotherdomain(self): True, "Admin User is not able to deploy VM for users users in other domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_13_1_deployvm_admin_foruserinotherdomain_crossnetwork(self): """ @@ -708,7 +708,7 @@ def test_13_1_deployvm_admin_foruserinotherdomain_crossnetwork(self): ## Test cases relating to deploying VM as domain admin user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_14_deployvm_domaindmin(self): """ @@ -732,7 +732,7 @@ def test_14_deployvm_domaindmin(self): "Domain admin User is not able to deploy VM for himself") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_15_deployvm_domaindmin_foruserinsamedomain(self): """ @@ -756,7 +756,7 @@ def test_15_deployvm_domaindmin_foruserinsamedomain(self): True, "Domain admin User is not able to deploy VM for other users in his domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_16_deployvm_domaindmin_foruserinsubdomain(self): """ @@ -780,7 +780,7 @@ def test_16_deployvm_domaindmin_foruserinsubdomain(self): True, "Domain admin User is not able to deploy vm for himself") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_17_deployvm_domaindmin_forcrossdomainuser(self): """ @@ -807,7 +807,7 @@ def test_17_deployvm_domaindmin_forcrossdomainuser(self): if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN): self.fail("Error message validation failed when Domain admin tries to deploy vm for users not in hos domain ") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_17_1_deployvm_domainadmin_foruserinotherdomain_crossnetwork(self): """ @@ -835,7 +835,7 @@ def test_17_1_deployvm_domainadmin_foruserinotherdomain_crossnetwork(self): ## Test cases relating to deploying VM as regular user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_18_deployvm_user(self): """ @@ -858,7 +858,7 @@ def test_18_deployvm_user(self): "User is not able to deploy vm for himself") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_19_deployvm_user_foruserinsamedomain(self): """ @@ -885,7 +885,7 @@ def test_19_deployvm_user_foruserinsamedomain(self): if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT): self.fail("Error message validation failed when Regular user tries to deploy vm for other users in his domain ") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_20_deployvm_user_foruserincrossdomain(self): """ @@ -912,7 +912,7 @@ def test_20_deployvm_user_foruserincrossdomain(self): if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT): self.fail("Error message validation failed when Regular user tries to deploy vm for users not in his domain ") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_20_1_deployvm_user_incrossnetwork(self): """ @@ -938,7 +938,7 @@ def test_20_1_deployvm_user_incrossnetwork(self): ## Test cases relating to restart Network as admin user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_21_restartNetwork_admin(self): """ @@ -954,7 +954,7 @@ def test_21_restartNetwork_admin(self): "Admin User is not able to restart network he owns") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_22_restartNetwork_admin_foruserinsamedomain(self): """ @@ -969,7 +969,7 @@ def test_22_restartNetwork_admin_foruserinsamedomain(self): True, "Admin User is not able to restart network owned by users his domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_23_restartNetwork_admin_foruserinotherdomain(self): """ @@ -986,7 +986,7 @@ def test_23_restartNetwork_admin_foruserinotherdomain(self): ## Test cases relating to restart Network as domain admin user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_24_restartNetwork_domaindmin(self): """ @@ -1002,7 +1002,7 @@ def test_24_restartNetwork_domaindmin(self): "Domain admin User is not able to restart network for himself") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_25_restartNetwork_domaindmin_foruserinsamedomain(self): """ @@ -1016,7 +1016,7 @@ def test_25_restartNetwork_domaindmin_foruserinsamedomain(self): True, "Domain admin User is not able to restart network for other users in his domain") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_26_restartNetwork_domaindmin_foruserinsubdomain(self): """ @@ -1030,7 +1030,7 @@ def test_26_restartNetwork_domaindmin_foruserinsubdomain(self): True, "Domain admin User is not able to restart network he owns") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_27_restartNetwork_domaindmin_forcrossdomainuser(self): """ @@ -1049,7 +1049,7 @@ def test_27_restartNetwork_domaindmin_forcrossdomainuser(self): ## Test cases relating restart network as regular user - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_28_restartNetwork_user(self): """ @@ -1064,7 +1064,7 @@ def test_28_restartNetwork_user(self): "User is not able to restart network he owns") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_29_restartNetwork_user_foruserinsamedomain(self): """ @@ -1081,7 +1081,7 @@ def test_29_restartNetwork_user_foruserinsamedomain(self): if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT): self.fail("Error message validation failed when Regular user tries to restart network for users in his domain ") - @attr(tags=[ "advanced"],required_hardware="false") + @attr("simulator_only",tags=[ "advanced"],required_hardware="false") def test_30_restartNetwork_user_foruserinotherdomain(self): """ diff --git a/test/integration/component/test_acl_isolatednetwork_delete.py b/test/integration/component/test_acl_isolatednetwork_delete.py index 3d09390c1ab9..9d34e88f0c0f 100644 --- a/test/integration/component/test_acl_isolatednetwork_delete.py +++ b/test/integration/component/test_acl_isolatednetwork_delete.py @@ -343,7 +343,7 @@ def tearDown(cls): ## Test cases relating to delete Network as admin user - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_admin(self): """ Validate that Admin should be able to delete network he owns @@ -359,7 +359,7 @@ def test_deleteNetwork_admin(self): "Admin User is not able to restart network he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_admin_foruserinsamedomain(self): """ @@ -375,7 +375,7 @@ def test_deleteNetwork_admin_foruserinsamedomain(self): None, "Admin User is not able to delete network owned by users his domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_admin_foruserinotherdomain(self): # Validate that Admin should be able to delete network for users in his sub domain @@ -391,7 +391,7 @@ def test_deleteNetwork_admin_foruserinotherdomain(self): ## Test cases relating to delete Network as domain admin user - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_domaindmin(self): """ Validate that Domain admin should be able to delete network for himslef @@ -407,7 +407,7 @@ def test_deleteNetwork_domaindmin(self): "Domain admin User is not able to delete a network he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_domaindmin_foruserinsamedomain(self): """ @@ -422,7 +422,7 @@ def test_deleteNetwork_domaindmin_foruserinsamedomain(self): None, "Domain admin User is not able to delete a network that is owned by user in the same domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_domaindmin_foruserinsubdomain(self): """ @@ -438,7 +438,7 @@ def test_deleteNetwork_domaindmin_foruserinsubdomain(self): None, "Domain admin User is not able to delete a network that is owned by user in the subdomain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_domaindmin_forcrossdomainuser(self): """ @@ -458,7 +458,7 @@ def test_deleteNetwork_domaindmin_forcrossdomainuser(self): ## Test cases relating deleting network as regular user - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_user(self): """ @@ -475,7 +475,7 @@ def test_deleteNetwork_user(self): "User is not able to delete a network he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_user_foruserinsamedomain(self): """ @@ -492,7 +492,7 @@ def test_deleteNetwork_user_foruserinsamedomain(self): if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT): self.fail("Regular user is allowed to delete network for users in his domain ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deleteNetwork_user_foruserinotherdomain(self): """ diff --git a/test/integration/component/test_acl_listsnapshot.py b/test/integration/component/test_acl_listsnapshot.py index ac8748d0b4f6..394072d9c64f 100644 --- a/test/integration/component/test_acl_listsnapshot.py +++ b/test/integration/component/test_acl_listsnapshot.py @@ -384,7 +384,7 @@ def tearDown(cls): ## Domain Admin - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_listall_true(self): """ Test listing of Snapshots by passing listall="true" parameter as domain admin @@ -417,7 +417,7 @@ def test_listSnapshot_as_domainadmin_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_listall_true_rec_true(self): """ Test listing of Snapshots by passing listall="true"i and isrecusriv="true" parameter as domain admin @@ -450,7 +450,7 @@ def test_listSnapshot_as_domainadmin_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_listall_true_rec_false(self): """ Test listing of Snapshots by passing listall="true" and isrecusriv="false" parameter as domain admin @@ -485,7 +485,7 @@ def test_listSnapshot_as_domainadmin_listall_true_rec_false(self): ## Domain Admin - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_listall_false(self): """ Test listing of Snapshots by passing listall="false" parameter as domain admin @@ -510,7 +510,7 @@ def test_listSnapshot_as_domainadmin_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_listall_false_rec_true(self): """ Test listing of Snapshots by passing listall="false" and isrecusrive="true" parameter as domain admin @@ -535,7 +535,7 @@ def test_listSnapshot_as_domainadmin_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_listall_false_rec_false(self): """ Test listing of Snapshots by passing listall="false" and isrecusrive="false" parameter as domain admin @@ -561,7 +561,7 @@ def test_listSnapshot_as_domainadmin_listall_false_rec_false(self): ## Domain Admin - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin(self): """ Test listing of Snapshots by passing no parameter as domain admin @@ -586,7 +586,7 @@ def test_listSnapshot_as_domainadmin(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_rec_true(self): """ Test listing of Snapshots by passing isrecusrive="true" parameter as domain admin @@ -611,7 +611,7 @@ def test_listSnapshot_as_domainadmin_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_true_rec_false(self): """ Test listing of Snapshots by passing isrecusrive="false" parameter as domain admin @@ -638,7 +638,7 @@ def test_listSnapshot_as_domainadmin_true_rec_false(self): ## Domain Admin - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_listall_true(self): """ Test listing of Snapshots by passing domainId and listall="true" parameter as domain admin @@ -665,7 +665,7 @@ def test_listSnapshot_as_domainadmin_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_listall_true_rec_true(self): """ Test listing of Snapshots by passing domainId ,listall="true" and isrecursive="true" parameter as domain admin @@ -693,7 +693,7 @@ def test_listSnapshot_as_domainadmin_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_listall_true_rec_false(self): """ Test listing of Snapshots by passing domainId ,listall="true" and isrecursive="false" parameter as domain admin @@ -723,7 +723,7 @@ def test_listSnapshot_as_domainadmin_domainid_listall_true_rec_false(self): ## Domain Admin - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_listall_false(self): """ Test listing of Snapshots by passing domainId ,listall="false" parameter as domain admin @@ -750,7 +750,7 @@ def test_listSnapshot_as_domainadmin_domainid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_listall_false_rec_true(self): """ Test listing of Snapshots by passing domainId ,listall="false" and isrecursive="true" parameter as domain admin @@ -778,7 +778,7 @@ def test_listSnapshot_as_domainadmin_domainid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_listall_false_rec_false(self): """ Test listing of Snapshots by passing domainId ,listall="false" and isrecursive="false" parameter as domain admin @@ -808,7 +808,7 @@ def test_listSnapshot_as_domainadmin_domainid_listall_false_rec_false(self): ## Domain Admin - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid(self): """ @@ -835,7 +835,7 @@ def test_listSnapshot_as_domainadmin_domainid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_rec_true(self): """ Test listing of Snapshots by passing domainId and isrecursive="true" parameter as domain admin @@ -863,7 +863,7 @@ def test_listSnapshot_as_domainadmin_domainid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_rec_false(self): """ Test listing of Snapshots by passing domainId and isrecursive="false" parameter as domain admin @@ -893,7 +893,7 @@ def test_listSnapshot_as_domainadmin_domainid_rec_false(self): ## Domain Admin - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true(self): """ Test listing of Snapshots by passing account ,domainId and listall="true" parameter as domain admin @@ -918,7 +918,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true_rec_true(self): """ Test listing of Snapshots by passing account ,domainId and listall="true" and isrecursive="true" parameter as domain admin @@ -943,7 +943,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true_rec_true(se True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true_rec_false(self): """ Test listing of Snapshots by passing account ,domainId , listall="true" and isrecursive="false" parameter as domain admin @@ -971,7 +971,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true_rec_false(s ## Domain Admin - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false(self): """ Test listing of Snapshots by passing account ,domainId and listall="false" parameter as domain admin @@ -996,7 +996,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false_rec_true(self): """ Test listing of Snapshots by passing account ,domainId and listall="false" and isrecursive="true" parameter as domain admin @@ -1021,7 +1021,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false_rec_true(s True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false_rec_false(self): """ Test listing of Snapshots by passing account ,domainId , listall="false" and isrecursive="false" parameter as domain admin @@ -1048,7 +1048,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false_rec_false( ## Domain Admin - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid(self): """ Test listing of Snapshots by passing account ,domainId parameter as domain admin @@ -1073,7 +1073,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_rec_true(self): """ Test listing of Snapshots by passing account ,domainId and isrecursive="true" parameter as domain admin @@ -1098,7 +1098,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_domainid_accountid_rec_false(self): """ Test listing of Snapshots by passing account ,domainId and isrecursive="false" parameter as domain admin @@ -1125,7 +1125,7 @@ def test_listSnapshot_as_domainadmin_domainid_accountid_rec_false(self): ## ROOT Admin - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_listall_true(self): """ Test listing of Snapshots by passing listall="true" parameter as admin @@ -1161,7 +1161,7 @@ def test_listSnapshot_as_rootadmin_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_listall_true_rec_true(self): """ Test listing of Snapshots by passing listall="true" and isrecusrive="true" parameter as admin @@ -1197,7 +1197,7 @@ def test_listSnapshot_as_rootadmin_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_listall_true_rec_false(self): """ Test listing of Snapshots by passing listall="true" and isrecusrive="false" parameter as admin @@ -1234,7 +1234,7 @@ def test_listSnapshot_as_rootadmin_listall_true_rec_false(self): ## ROOT Admin - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_listall_false(self): """ Test listing of Snapshots by passing listall="false" parameter as admin @@ -1259,7 +1259,7 @@ def test_listSnapshot_as_rootadmin_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_listall_false_rec_true(self): """ Test listing of Snapshots by passing listall="false" and isrecusrive="true" parameter as admin @@ -1285,7 +1285,7 @@ def test_listSnapshot_as_rootadmin_listall_false_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_listall_false_rec_false(self): """ Test listing of Snapshots by passing listall="false" and isrecusrive="false" parameter as admin @@ -1314,7 +1314,7 @@ def test_listSnapshot_as_rootadmin_listall_false_rec_false(self): ## ROOT Admin - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin(self): """ Test listing of Snapshots by passing no parameter as admin @@ -1340,7 +1340,7 @@ def test_listSnapshot_as_rootadmin(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_rec_true(self): """ Test listing of Snapshots by passing isrecusrive="true" parameter as admin @@ -1365,7 +1365,7 @@ def test_listSnapshot_as_rootadmin_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_rec_false(self): """ Test listing of Snapshots by passing isrecusrive="false" parameter as admin @@ -1392,7 +1392,7 @@ def test_listSnapshot_as_rootadmin_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_listall_true(self): """ Test listing of Snapshots by passing domainid and listall="true" parameter as admin @@ -1419,7 +1419,7 @@ def test_listSnapshot_as_rootadmin_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_listall_true_rec_true(self): """ Test listing of Snapshots by passing domainid , listall="true" and isrecusrive="true" parameter as admin @@ -1447,7 +1447,7 @@ def test_listSnapshot_as_rootadmin_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_listall_true_rec_false(self): """ Test listing of Snapshots by passing domainid, listall="true" and isrecusrive="false" parameter as admin @@ -1477,7 +1477,7 @@ def test_listSnapshot_as_rootadmin_domainid_listall_true_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_listall_false(self): """ Test listing of Snapshots by passing domainid, listall="false" parameter as admin @@ -1504,7 +1504,7 @@ def test_listSnapshot_as_rootadmin_domainid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_listall_false_rec_true(self): """ Test listing of Snapshots by passing domainid, listall="false" and isrecusrive="true" parameter as admin @@ -1532,7 +1532,7 @@ def test_listSnapshot_as_rootadmin_domainid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_listall_false_rec_false(self): """ Test listing of Snapshots by passing domainid, listall="false" and isrecusrive="false" parameter as admin @@ -1562,7 +1562,7 @@ def test_listSnapshot_as_rootadmin_domainid_listall_false_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid(self): """ Test listing of Snapshots by passing domainid parameter as admin @@ -1589,7 +1589,7 @@ def test_listSnapshot_as_rootadmin_domainid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_rec_true(self): """ Test listing of Snapshots by passing domainid and isrecusrive="true" parameter as admin @@ -1617,7 +1617,7 @@ def test_listSnapshot_as_rootadmin_domainid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_rec_false(self): """ Test listing of Snapshots by passing domainid and isrecusrive="false" parameter as admin @@ -1647,7 +1647,7 @@ def test_listSnapshot_as_rootadmin_domainid_rec_false(self): ## ROOT Admin - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true(self): """ Test listing of Snapshots by passing domainid,account ,listall = "true" parameter as admin @@ -1672,7 +1672,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true_rec_true(self): """ Test listing of Snapshots by passing domainid,account ,listall = "true" and isrecusrive="true" parameter as admin @@ -1697,7 +1697,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true_rec_true(self True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true_rec_false(self): """ Test listing of Snapshots by passing domainid,account ,listall = "true" and isrecusrive="false" parameter as admin @@ -1725,7 +1725,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true_rec_false(sel ## ROOT Admin - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false(self): """ Test listing of Snapshots by passing domainid,account ,listall = "false" parameter as admin @@ -1750,7 +1750,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false_rec_true(self): """ Test listing of Snapshots by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin @@ -1775,7 +1775,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false_rec_true(sel True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false_rec_false(self): """ Test listing of Snapshots by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin @@ -1803,7 +1803,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false_rec_false(se ## ROOT Admin - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid(self): """ Test listing of Snapshots by passing domainid,account parameter as admin @@ -1828,7 +1828,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_rec_true(self): """ Test listing of Snapshots by passing domainid,account and isrecusrive="true" parameter as admin @@ -1853,7 +1853,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_rootadmin_domainid_accountid_rec_false(self): """ Test listing of Snapshots by passing domainid,account and isrecusrive="false" parameter as admin @@ -1881,7 +1881,7 @@ def test_listSnapshot_as_rootadmin_domainid_accountid_rec_false(self): ## Regular User - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_listall_true(self): """ Test listing of Snapshots by passing listall="true" parameter as regular user @@ -1906,7 +1906,7 @@ def test_listSnapshot_as_regularuser_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_listall_true_rec_true(self): """ Test listing of Snapshots by passing listall="true" and isrecusrive="true" parameter as regular user @@ -1931,7 +1931,7 @@ def test_listSnapshot_as_regularuser_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_listall_true_rec_false(self): """ Test listing of Snapshots by passing listall="true" and isrecusrive="false" parameter as regular user @@ -1958,7 +1958,7 @@ def test_listSnapshot_as_regularuser_listall_true_rec_false(self): ## Regular User - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_listall_false(self): """ Test listing of Snapshots by passing domainid,account,listall="false" parameter as regular user @@ -1983,7 +1983,7 @@ def test_listSnapshot_as_regularuser_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_listall_false_rec_true(self): """ Test listing of Snapshots by passing listall="false" and isrecusrive="true" parameter as regular user @@ -2009,7 +2009,7 @@ def test_listSnapshot_as_regularuser_listall_false_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_listall_false_rec_false(self): """ Test listing of Snapshots by passing listall="false" and isrecusrive="false" parameter as regular user @@ -2038,7 +2038,7 @@ def test_listSnapshot_as_regularuser_listall_false_rec_false(self): ## Regular User - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser(self): """ Test listing of Snapshots by passing no parameter as regular user @@ -2064,7 +2064,7 @@ def test_listSnapshot_as_regularuser(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_rec_true(self): """ Test listing of Snapshots by passing isrecusrive="true" parameter as regular user @@ -2089,7 +2089,7 @@ def test_listSnapshot_as_regularuser_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_rec_false(self): """ Test listing of Snapshots by passing isrecusrive="false" parameter as regular user @@ -2116,7 +2116,7 @@ def test_listSnapshot_as_regularuser_rec_false(self): ## Regular User - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_listall_true(self): """ Test listing of Snapshots by passing domainid,listall="true" parameter as regular user @@ -2141,7 +2141,7 @@ def test_listSnapshot_as_regularuser_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_listall_true_rec_true(self): """ Test listing of Snapshots by passing domainid,listall="true" and isrecusrive="true" parameter as regular user @@ -2166,7 +2166,7 @@ def test_listSnapshot_as_regularuser_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_listall_true_rec_false(self): """ Test listing of Snapshots by passing domainid,listall="true" and isrecusrive="false" parameter as regular user @@ -2194,7 +2194,7 @@ def test_listSnapshot_as_regularuser_domainid_listall_true_rec_false(self): ## Regular User - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_listall_false(self): """ Test listing of Snapshots by passing domainid,listall="false" parameter as regular user @@ -2220,7 +2220,7 @@ def test_listSnapshot_as_regularuser_domainid_listall_false(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_listall_false_rec_true(self): """ Test listing of Snapshots by passing domainid,listall="false" and isrecusrive="true" parameter as regular user @@ -2247,7 +2247,7 @@ def test_listSnapshot_as_regularuser_domainid_listall_false_rec_true(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_listall_false_rec_false(self): """ Test listing of Snapshots by passing domainid,listall="false" and isrecusrive="false" parameter as regular user @@ -2275,7 +2275,7 @@ def test_listSnapshot_as_regularuser_domainid_listall_false_rec_false(self): ## Regular User - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid(self): """ Test listing of Snapshots by passing domainid parameter as regular user @@ -2301,7 +2301,7 @@ def test_listSnapshot_as_regularuser_domainid(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_true_rec_true(self): """ Test listing of Snapshots by passing domainid and isrecusrive="true" parameter as regular user @@ -2328,7 +2328,7 @@ def test_listSnapshot_as_regularuser_domainid_true_rec_true(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid__rec_false(self): """ Test listing of Snapshots by passing domainid,isrecusrive="false" parameter as regular user @@ -2356,7 +2356,7 @@ def test_listSnapshot_as_regularuser_domainid__rec_false(self): ## Regular User - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_listall_true(self): """ Test listing of Snapshots by passing domainid,account,listall="true" parameter as regular user @@ -2381,7 +2381,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_listall_true_rec_true(self): """ Test listing of Snapshots by passing domainid,account,listall="true" and isrecusrive="true" parameter as regular user @@ -2406,7 +2406,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_listall_true_rec_true(se True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_listall_true_rec_false(self): """ Test listing of Snapshots by passing domainid,account,listall="true" and isrecusrive="false" parameter as regular user @@ -2434,7 +2434,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_listall_true_rec_false(s ## Regular User - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_listall_false(self): """ Test listing of Snapshots by passing domainid,account,listall="false" parameter as regular user @@ -2460,7 +2460,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_listall_false(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_listall_false_rec_true(self): """ Test listing of Snapshots by passing domainid,account,listall="false" and isrecusrive="true" parameter as regular user @@ -2485,7 +2485,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_listall_false_rec_true(s True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_listall_false_rec_false(self): """ Test listing of Snapshots by passing domainid,account,listall="false" and isrecusrive="false" parameter as regular user @@ -2513,7 +2513,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_listall_false_rec_false( ## Regular User - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid(self): """ Test listing of Snapshots by passing domainid,account parameter as regular user @@ -2539,7 +2539,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_rec_true(self): """ Test listing of Snapshots by passing domainid,account and isrecusrive="true" parameter as regular user @@ -2565,7 +2565,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_domainid_accountid_rec_false(self): """ Test listing of Snapshots by passing domainid,account isrecusrive="false" parameter as regular user @@ -2592,7 +2592,7 @@ def test_listSnapshot_as_regularuser_domainid_accountid_rec_false(self): ## Cross Domain access check - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_cross_domainid_accountid(self): """ Regular User should not be allowed to list Snapshotss of other accounts in the same domain @@ -2607,7 +2607,7 @@ def test_listSnapshot_as_regularuser_cross_domainid_accountid(self): self.debug ("List as Regular User passing domainId and accountId of another account %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_regularuser_cross_domainid(self): """ Regular User should not be allowed to list Snapshotss of other accounts in other domains @@ -2622,7 +2622,7 @@ def test_listSnapshot_as_regularuser_cross_domainid(self): self.debug ("List as Regular User passing domainId of a domain that user does not belong to %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_cross_domainid_accountid(self): """ Domain admin should not be allowed to list Snapshotss of accounts in other domains @@ -2637,7 +2637,7 @@ def test_listSnapshot_as_domainadmin_cross_domainid_accountid(self): self.debug ("List as domain admin passing domainId and accountId of another account %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_as_domainadmin_cross_domainid(self): """ Domain admin should not be allowed to list Snapshotss from other domains @@ -2653,7 +2653,7 @@ def test_listSnapshot_as_domainadmin_cross_domainid(self): ## List test cases relating to filter - id - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_domainadmin_owns(self): """ Domain admin should be able to list Snapshots that he owns by passing uuid in "id" parameter @@ -2671,7 +2671,7 @@ def test_listSnapshot_by_id_as_domainadmin_owns(self): 1, "Domain Admin is not able to list Snapshotss that belongs to him") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_domainadmin_ownedbyusersindomain(self): """ Domain admin should be able to list Snapshots that is owned by any account in his domain by passing uuid in "id" parameter @@ -2689,7 +2689,7 @@ def test_listSnapshot_by_id_as_domainadmin_ownedbyusersindomain(self): 1, "Domain Admin is not able to list Snapshotss from his domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_domainadmin_ownedbyusersinsubdomain(self): """ Domain admin should be able to list Snapshots that is owned by any account in his sub-domain by passing uuid in "id" parameter @@ -2707,7 +2707,7 @@ def test_listSnapshot_by_id_as_domainadmin_ownedbyusersinsubdomain(self): 1, "Domain Admin is not able to list Snapshotss from his sub domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_domainadmin_ownedbyusersnotindomain(self): """ Domain admin should not be able to list Snapshots that is owned by account that is not in his domain by passing uuid in "id" parameter @@ -2721,7 +2721,7 @@ def test_listSnapshot_by_id_as_domainadmin_ownedbyusersnotindomain(self): None, "Domain Admin is able to list Snapshotss from other domains!!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_domainadmin_ownedbyusersinsubdomain2(self): """ Domain admin should be able to list Snapshots that is owned by account that is in his sub domains by passing uuid in "id" parameter @@ -2740,7 +2740,7 @@ def test_listSnapshot_by_id_as_domainadmin_ownedbyusersinsubdomain2(self): "Domain Admin is not able to list Snapshotss from his sub domains") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_rootadmin_owns(self): """ ROOT admin should be able to list Snapshots that is owned by account in his domains by passing uuid in "id" parameter @@ -2756,7 +2756,7 @@ def test_listSnapshot_by_id_as_rootadmin_owns(self): 1, "ROOT Admin not able to list Snapshotss that he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_rootadmin_Snapshotsownedbyothers(self): """ ROOT admin should be able to list Snapshots that is owned by any account iby passing uuid in "id" parameter @@ -2780,7 +2780,7 @@ def test_listSnapshot_by_id_as_rootadmin_Snapshotsownedbyothers(self): 1, "ROOT Admin not able to list Snapshotss from other domains") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_user_own(self): """ Regular user should be able to list Snapshots that is owned by him by passing uuid in "id" parameter @@ -2799,7 +2799,7 @@ def test_listSnapshot_by_id_as_user_own(self): 1, "Regular User is not able to list Snapshotss that he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_user_snapshotfromsamedomaindifferentaccount(self): """ Regular user should not be able to list Snapshots that is owned by different account in the same domain by passing uuid in "id" parameter @@ -2813,7 +2813,7 @@ def test_listSnapshot_by_id_as_user_snapshotfromsamedomaindifferentaccount(self) None, "Regular User is able to list Snapshotss from other accounts") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_listSnapshot_by_id_as_user_snapshotfromotherdomain(self): """ Regular user should not be able to list Snapshots that is owned by different account in the different domain by passing uuid in "id" parameter diff --git a/test/integration/component/test_acl_listvm.py b/test/integration/component/test_acl_listvm.py index 398f98af0599..de997183aa48 100644 --- a/test/integration/component/test_acl_listvm.py +++ b/test/integration/component/test_acl_listvm.py @@ -360,7 +360,7 @@ def tearDown(cls): ## Domain Admin - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_listall_true(self): """ # Test listing of Vms by passing listall="true" parameter as domain admin @@ -393,7 +393,7 @@ def test_listVM_as_domainadmin_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_listall_true_rec_true(self): """ # Test listing of Vms by passing listall="true"i and isrecusriv="true" parameter as domain admin @@ -426,7 +426,7 @@ def test_listVM_as_domainadmin_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_listall_true_rec_false(self): """ # Test listing of Vms by passing listall="true" and isrecusriv="false" parameter as domain admin @@ -461,7 +461,7 @@ def test_listVM_as_domainadmin_listall_true_rec_false(self): ## Domain Admin - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_listall_false(self): """ # Test listing of Vms by passing listall="false" parameter as domain admin @@ -486,7 +486,7 @@ def test_listVM_as_domainadmin_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_listall_false_rec_true(self): """ # Test listing of Vms by passing listall="false" and isrecusrive="true" parameter as domain admin @@ -511,7 +511,7 @@ def test_listVM_as_domainadmin_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_listall_false_rec_false(self): """ # Test listing of Vms by passing listall="false" and isrecusrive="false" parameter as domain admin @@ -537,7 +537,7 @@ def test_listVM_as_domainadmin_listall_false_rec_false(self): ## Domain Admin - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin(self): """ # Test listing of Vms by passing no parameter as domain admin @@ -562,7 +562,7 @@ def test_listVM_as_domainadmin(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_rec_true(self): """ # Test listing of Vms by passing isrecusrive="true" parameter as domain admin @@ -587,7 +587,7 @@ def test_listVM_as_domainadmin_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_true_rec_false(self): """ # Test listing of Vms by passing isrecusrive="false" parameter as domain admin @@ -614,7 +614,7 @@ def test_listVM_as_domainadmin_true_rec_false(self): ## Domain Admin - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_listall_true(self): """ # Test listing of Vms by passing domainId and listall="true" parameter as domain admin @@ -641,7 +641,7 @@ def test_listVM_as_domainadmin_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_listall_true_rec_true(self): """ # Test listing of Vms by passing domainId ,listall="true" and isrecursive="true" parameter as domain admin @@ -669,7 +669,7 @@ def test_listVM_as_domainadmin_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_listall_true_rec_false(self): """ # Test listing of Vms by passing domainId ,listall="true" and isrecursive="false" parameter as domain admin @@ -699,7 +699,7 @@ def test_listVM_as_domainadmin_domainid_listall_true_rec_false(self): ## Domain Admin - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_listall_false(self): """ # Test listing of Vms by passing domainId ,listall="false" parameter as domain admin @@ -726,7 +726,7 @@ def test_listVM_as_domainadmin_domainid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_listall_false_rec_true(self): """ # Test listing of Vms by passing domainId ,listall="false" and isrecursive="true" parameter as domain admin @@ -754,7 +754,7 @@ def test_listVM_as_domainadmin_domainid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_listall_false_rec_false(self): """ # Test listing of Vms by passing domainId ,listall="false" and isrecursive="false" parameter as domain admin @@ -784,7 +784,7 @@ def test_listVM_as_domainadmin_domainid_listall_false_rec_false(self): ## Domain Admin - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid(self): """ # Test listing of Vms by passing domainId parameter as domain admin @@ -811,7 +811,7 @@ def test_listVM_as_domainadmin_domainid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_rec_true(self): """ # Test listing of Vms by passing domainId and isrecursive="true" parameter as domain admin @@ -839,7 +839,7 @@ def test_listVM_as_domainadmin_domainid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_rec_false(self): """ # Test listing of Vms by passing domainId and isrecursive="false" parameter as domain admin @@ -869,7 +869,7 @@ def test_listVM_as_domainadmin_domainid_rec_false(self): ## Domain Admin - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_listall_true(self): """ # Test listing of Vms by passing account ,domainId and listall="true" parameter as domain admin @@ -894,7 +894,7 @@ def test_listVM_as_domainadmin_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_listall_true_rec_true(self): """ # Test listing of Vms by passing account ,domainId and listall="true" and isrecursive="true" parameter as domain admin @@ -919,7 +919,7 @@ def test_listVM_as_domainadmin_domainid_accountid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_listall_true_rec_false(self): """ # Test listing of Vms by passing account ,domainId , listall="true" and isrecursive="false" parameter as domain admin @@ -947,7 +947,7 @@ def test_listVM_as_domainadmin_domainid_accountid_listall_true_rec_false(self): ## Domain Admin - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_listall_false(self): """ # Test listing of Vms by passing account ,domainId and listall="false" parameter as domain admin @@ -972,7 +972,7 @@ def test_listVM_as_domainadmin_domainid_accountid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_listall_false_rec_true(self): """ # Test listing of Vms by passing account ,domainId and listall="false" and isrecursive="true" parameter as domain admin @@ -997,7 +997,7 @@ def test_listVM_as_domainadmin_domainid_accountid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_listall_false_rec_false(self): """ # Test listing of Vms by passing account ,domainId , listall="false" and isrecursive="false" parameter as domain admin @@ -1024,7 +1024,7 @@ def test_listVM_as_domainadmin_domainid_accountid_listall_false_rec_false(self): ## Domain Admin - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid(self): """ # Test listing of Vms by passing account ,domainId parameter as domain admin @@ -1049,7 +1049,7 @@ def test_listVM_as_domainadmin_domainid_accountid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_rec_true(self): """ # Test listing of Vms by passing account ,domainId and isrecursive="true" parameter as domain admin @@ -1074,7 +1074,7 @@ def test_listVM_as_domainadmin_domainid_accountid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_domainid_accountid_rec_false(self): """ # Test listing of Vms by passing account ,domainId and isrecursive="false" parameter as domain admin @@ -1101,7 +1101,7 @@ def test_listVM_as_domainadmin_domainid_accountid_rec_false(self): ## ROOT Admin - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_listall_true(self): """ # Test listing of Vms by passing listall="true" parameter as admin @@ -1137,7 +1137,7 @@ def test_listVM_as_rootadmin_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_listall_true_rec_true(self): """ # Test listing of Vms by passing listall="true" and isrecusrive="true" parameter as admin @@ -1173,7 +1173,7 @@ def test_listVM_as_rootadmin_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_listall_true_rec_false(self): """ # Test listing of Vms by passing listall="true" and isrecusrive="false" parameter as admin @@ -1210,7 +1210,7 @@ def test_listVM_as_rootadmin_listall_true_rec_false(self): ## ROOT Admin - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_listall_false(self): """ # Test listing of Vms by passing listall="false" parameter as admin @@ -1235,7 +1235,7 @@ def test_listVM_as_rootadmin_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_listall_false_rec_true(self): """ # Test listing of Vms by passing listall="false" and isrecusrive="true" parameter as admin @@ -1261,7 +1261,7 @@ def test_listVM_as_rootadmin_listall_false_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_listall_false_rec_false(self): """ # Test listing of Vms by passing listall="false" and isrecusrive="false" parameter as admin @@ -1290,7 +1290,7 @@ def test_listVM_as_rootadmin_listall_false_rec_false(self): ## ROOT Admin - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin(self): """ # Test listing of Vms by passing no parameter as admin @@ -1316,7 +1316,7 @@ def test_listVM_as_rootadmin(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_rec_true(self): """ # Test listing of Vms by passing isrecusrive="true" parameter as admin @@ -1341,7 +1341,7 @@ def test_listVM_as_rootadmin_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_rec_false(self): """ # Test listing of Vms by passing isrecusrive="false" parameter as admin @@ -1368,7 +1368,7 @@ def test_listVM_as_rootadmin_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_listall_true(self): """ # Test listing of Vms by passing domainid and listall="true" parameter as admin @@ -1395,7 +1395,7 @@ def test_listVM_as_rootadmin_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_listall_true_rec_true(self): """ # Test listing of Vms by passing domainid , listall="true" and isrecusrive="true" parameter as admin @@ -1423,7 +1423,7 @@ def test_listVM_as_rootadmin_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_listall_true_rec_false(self): """ # Test listing of Vms by passing domainid, listall="true" and isrecusrive="false" parameter as admin @@ -1453,7 +1453,7 @@ def test_listVM_as_rootadmin_domainid_listall_true_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_listall_false(self): """ # Test listing of Vms by passing domainid, listall="false" parameter as admin @@ -1480,7 +1480,7 @@ def test_listVM_as_rootadmin_domainid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_listall_false_rec_true(self): """ # Test listing of Vms by passing domainid, listall="false" and isrecusrive="true" parameter as admin @@ -1508,7 +1508,7 @@ def test_listVM_as_rootadmin_domainid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_listall_false_rec_false(self): """ @@ -1539,7 +1539,7 @@ def test_listVM_as_rootadmin_domainid_listall_false_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid(self): """ # Test listing of Vms by passing domainid parameter as admin @@ -1566,7 +1566,7 @@ def test_listVM_as_rootadmin_domainid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_rec_true(self): """ # Test listing of Vms by passing domainid and isrecusrive="true" parameter as admin @@ -1594,7 +1594,7 @@ def test_listVM_as_rootadmin_domainid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_rec_false(self): """ # Test listing of Vms by passing domainid and isrecusrive="false" parameter as admin @@ -1624,7 +1624,7 @@ def test_listVM_as_rootadmin_domainid_rec_false(self): ## ROOT Admin - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_listall_true(self): """ # Test listing of Vms by passing domainid,account ,listall = "true" parameter as admin @@ -1649,7 +1649,7 @@ def test_listVM_as_rootadmin_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_listall_true_rec_true(self): """ # Test listing of Vms by passing domainid,account ,listall = "true" and isrecusrive="true" parameter as admin @@ -1674,7 +1674,7 @@ def test_listVM_as_rootadmin_domainid_accountid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_listall_true_rec_false(self): """ # Test listing of Vms by passing domainid,account ,listall = "true" and isrecusrive="false" parameter as admin @@ -1702,7 +1702,7 @@ def test_listVM_as_rootadmin_domainid_accountid_listall_true_rec_false(self): ## ROOT Admin - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_listall_false(self): """ # Test listing of Vms by passing domainid,account ,listall = "false" parameter as admin @@ -1727,7 +1727,7 @@ def test_listVM_as_rootadmin_domainid_accountid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_listall_false_rec_true(self): """ # Test listing of Vms by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin @@ -1752,7 +1752,7 @@ def test_listVM_as_rootadmin_domainid_accountid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_listall_false_rec_false(self): """ # Test listing of Vms by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin @@ -1780,7 +1780,7 @@ def test_listVM_as_rootadmin_domainid_accountid_listall_false_rec_false(self): ## ROOT Admin - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid(self): """ # Test listing of Vms by passing domainid,account parameter as admin @@ -1805,7 +1805,7 @@ def test_listVM_as_rootadmin_domainid_accountid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_rec_true(self): """ # Test listing of Vms by passing domainid,account and isrecusrive="true" parameter as admin @@ -1830,7 +1830,7 @@ def test_listVM_as_rootadmin_domainid_accountid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_rootadmin_domainid_accountid_rec_false(self): """ # Test listing of Vms by passing domainid,account and isrecusrive="false" parameter as admin @@ -1858,7 +1858,7 @@ def test_listVM_as_rootadmin_domainid_accountid_rec_false(self): ## Regular User - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_listall_true(self): """ # Test listing of Vms by passing listall="true" parameter as regular user @@ -1883,7 +1883,7 @@ def test_listVM_as_regularuser_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_listall_true_rec_true(self): """ # Test listing of Vms by passing listall="true" and isrecusrive="true" parameter as regular user @@ -1908,7 +1908,7 @@ def test_listVM_as_regularuser_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_listall_true_rec_false(self): """ # Test listing of Vms by passing listall="true" and isrecusrive="false" parameter as regular user @@ -1935,7 +1935,7 @@ def test_listVM_as_regularuser_listall_true_rec_false(self): ## Regular User - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_listall_false(self): """ # Test listing of Vms by passing domainid,account,listall="false" parameter as regular user @@ -1960,7 +1960,7 @@ def test_listVM_as_regularuser_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_listall_false_rec_true(self): """ # Test listing of Vms by passing listall="false" and isrecusrive="true" parameter as regular user @@ -1986,7 +1986,7 @@ def test_listVM_as_regularuser_listall_false_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_listall_false_rec_false(self): """ # Test listing of Vms by passing listall="false" and isrecusrive="false" parameter as regular user @@ -2015,7 +2015,7 @@ def test_listVM_as_regularuser_listall_false_rec_false(self): ## Regular User - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser(self): """ # Test listing of Vms by passing no parameter as regular user @@ -2041,7 +2041,7 @@ def test_listVM_as_regularuser(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_rec_true(self): """ # Test listing of Vms by passing isrecusrive="true" parameter as regular user @@ -2066,7 +2066,7 @@ def test_listVM_as_regularuser_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_rec_false(self): """ # Test listing of Vms by passing isrecusrive="false" parameter as regular user @@ -2093,7 +2093,7 @@ def test_listVM_as_regularuser_rec_false(self): ## Regular User - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_listall_true(self): """ # Test listing of Vms by passing domainid,listall="true" parameter as regular user @@ -2118,7 +2118,7 @@ def test_listVM_as_regularuser_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_listall_true_rec_true(self): """ # Test listing of Vms by passing domainid,listall="true" and isrecusrive="true" parameter as regular user @@ -2143,7 +2143,7 @@ def test_listVM_as_regularuser_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_listall_true_rec_false(self): """ # Test listing of Vms by passing domainid,listall="true" and isrecusrive="false" parameter as regular user @@ -2171,7 +2171,7 @@ def test_listVM_as_regularuser_domainid_listall_true_rec_false(self): ## Regular User - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_listall_false(self): """ # Test listing of Vms by passing domainid,listall="false" parameter as regular user @@ -2197,7 +2197,7 @@ def test_listVM_as_regularuser_domainid_listall_false(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_listall_false_rec_true(self): """ # Test listing of Vms by passing domainid,listall="false" and isrecusrive="true" parameter as regular user @@ -2224,7 +2224,7 @@ def test_listVM_as_regularuser_domainid_listall_false_rec_true(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_listall_false_rec_false(self): """ # Test listing of Vms by passing domainid,listall="false" and isrecusrive="false" parameter as regular user @@ -2252,7 +2252,7 @@ def test_listVM_as_regularuser_domainid_listall_false_rec_false(self): ## Regular User - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid(self): """ # Test listing of Vms by passing domainid parameter as regular user @@ -2278,7 +2278,7 @@ def test_listVM_as_regularuser_domainid(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_true_rec_true(self): """ # Test listing of Vms by passing domainid and isrecusrive="true" parameter as regular user @@ -2305,7 +2305,7 @@ def test_listVM_as_regularuser_domainid_true_rec_true(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid__rec_false(self): """ # Test listing of Vms by passing domainid,isrecusrive="false" parameter as regular user @@ -2333,7 +2333,7 @@ def test_listVM_as_regularuser_domainid__rec_false(self): ## Regular User - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_listall_true(self): """ # Test listing of Vms by passing domainid,account,listall="true" parameter as regular user @@ -2358,7 +2358,7 @@ def test_listVM_as_regularuser_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_listall_true_rec_true(self): """ # Test listing of Vms by passing domainid,account,listall="true" and isrecusrive="true" parameter as regular user @@ -2383,7 +2383,7 @@ def test_listVM_as_regularuser_domainid_accountid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_listall_true_rec_false(self): """ # Test listing of Vms by passing domainid,account,listall="true" and isrecusrive="false" parameter as regular user @@ -2411,7 +2411,7 @@ def test_listVM_as_regularuser_domainid_accountid_listall_true_rec_false(self): ## Regular User - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_listall_false(self): """ # Test listing of Vms by passing domainid,account,listall="false" parameter as regular user @@ -2437,7 +2437,7 @@ def test_listVM_as_regularuser_domainid_accountid_listall_false(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_listall_false_rec_true(self): """ # Test listing of Vms by passing domainid,account,listall="false" and isrecusrive="true" parameter as regular user @@ -2462,7 +2462,7 @@ def test_listVM_as_regularuser_domainid_accountid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_listall_false_rec_false(self): """ # Test listing of Vms by passing domainid,account,listall="false" and isrecusrive="false" parameter as regular user @@ -2490,7 +2490,7 @@ def test_listVM_as_regularuser_domainid_accountid_listall_false_rec_false(self): ## Regular User - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid(self): """ # Test listing of Vms by passing domainid,account parameter as regular user @@ -2516,7 +2516,7 @@ def test_listVM_as_regularuser_domainid_accountid(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_rec_true(self): """ # Test listing of Vms by passing domainid,account and isrecusrive="true" parameter as regular user @@ -2542,7 +2542,7 @@ def test_listVM_as_regularuser_domainid_accountid_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_domainid_accountid_rec_false(self): """ # Test listing of Vms by passing domainid,account isrecusrive="false" parameter as regular user @@ -2569,7 +2569,7 @@ def test_listVM_as_regularuser_domainid_accountid_rec_false(self): ## Cross Domain access check - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_cross_domainid_accountid(self): """ # Regular User should not be allowed to list Vms of other accounts in the same domain @@ -2584,7 +2584,7 @@ def test_listVM_as_regularuser_cross_domainid_accountid(self): self.debug ("List as Regular User passing domainId and accountId of another account %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_regularuser_cross_domainid(self): """ # Regular User should not be allowed to list Vms of other accounts in other domains @@ -2599,7 +2599,7 @@ def test_listVM_as_regularuser_cross_domainid(self): self.debug ("List as Regular User passing domainId of a domain that user does not belong to %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_cross_domainid_accountid(self): """ # Domain admin should not be allowed to list Vms of accounts in other domains @@ -2614,7 +2614,7 @@ def test_listVM_as_domainadmin_cross_domainid_accountid(self): self.debug ("List as domain admin passing domainId and accountId of another account %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_as_domainadmin_cross_domainid(self): """ # Domain admin should not be allowed to list Vms from other domains @@ -2630,7 +2630,7 @@ def test_listVM_as_domainadmin_cross_domainid(self): ## List test cases relating to filter - id - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_domainadmin_owns(self): """ # Domain admin should be able to list Vm that he owns by passing uuid in "id" parameter @@ -2648,7 +2648,7 @@ def test_listVM_by_id_as_domainadmin_owns(self): 1, "Domain Admin is not able to list Vms that belongs to him") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_domainadmin_ownedbyusersindomain(self): """ # Domain admin should be able to list Vm that is owned by any account in his domain by passing uuid in "id" parameter @@ -2666,7 +2666,7 @@ def test_listVM_by_id_as_domainadmin_ownedbyusersindomain(self): 1, "Domain Admin is not able to list Vms from his domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_domainadmin_ownedbyusersinsubdomain(self): """ # Domain admin should be able to list Vm that is owned by any account in his sub-domain by passing uuid in "id" parameter @@ -2684,7 +2684,7 @@ def test_listVM_by_id_as_domainadmin_ownedbyusersinsubdomain(self): 1, "Domain Admin is not able to list Vms from his sub domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_domainadmin_ownedbyusersnotindomain(self): """ # Domain admin should not be able to list Vm that is owned by account that is not in his domain by passing uuid in "id" parameter @@ -2698,7 +2698,7 @@ def test_listVM_by_id_as_domainadmin_ownedbyusersnotindomain(self): None, "Domain Admin is able to list Vms from other domains!!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_domainadmin_ownedbyusersinsubdomain2(self): """ # Domain admin should be able to list Vm that is owned by account that is in his sub domains by passing uuid in "id" parameter @@ -2717,7 +2717,7 @@ def test_listVM_by_id_as_domainadmin_ownedbyusersinsubdomain2(self): "Domain Admin is not able to list Vms from his sub domains") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_rootadmin_owns(self): """ # Domain admin should be able to list Vm that is owned by account that is in his sub domains by passing uuid in "id" parameter @@ -2733,7 +2733,7 @@ def test_listVM_by_id_as_rootadmin_owns(self): 1, "ROOT Admin not able to list Vms that he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_rootadmin_Vmsownedbyothers(self): """ # ROOT admin should be able to list Vm that is owned by any account iby passing uuid in "id" parameter @@ -2757,7 +2757,7 @@ def test_listVM_by_id_as_rootadmin_Vmsownedbyothers(self): 1, "ROOT Admin not able to list Vms from other domains") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_user_own(self): """ # Regular user should be able to list Vm that is owned by him by passing uuid in "id" parameter @@ -2776,7 +2776,7 @@ def test_listVM_by_id_as_user_own(self): 1, "Regular User is not able to list Vms that he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_user_vmfromsamedomaindifferentaccount(self): """ # Regular user should not be able to list Vm that is owned by different account in the same domain by passing uuid in "id" parameter @@ -2790,7 +2790,7 @@ def test_listVM_by_id_as_user_vmfromsamedomaindifferentaccount(self): None, "Regular User is able to list Vms from other accounts") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVM_by_id_as_user_vmsfromotherdomain(self): """ # Regular user should not be able to list Vm that is owned by different account in the different domain by passing uuid in "id" parameter diff --git a/test/integration/component/test_acl_listvolume.py b/test/integration/component/test_acl_listvolume.py index e52758255150..65a1201571d6 100644 --- a/test/integration/component/test_acl_listvolume.py +++ b/test/integration/component/test_acl_listvolume.py @@ -374,7 +374,7 @@ def tearDown(cls): ## Domain Admin - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_listall_true(self): """ # Test listing of Volumes by passing listall="true" parameter as domain admin @@ -407,7 +407,7 @@ def test_listVolume_as_domainadmin_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_listall_true_rec_true(self): """ # Test listing of Volumes by passing listall="true"i and isrecusriv="true" parameter as domain admin @@ -440,7 +440,7 @@ def test_listVolume_as_domainadmin_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_listall_true_rec_false(self): """ # Test listing of Volumes by passing listall="true" and isrecusriv="false" parameter as domain admin @@ -475,7 +475,7 @@ def test_listVolume_as_domainadmin_listall_true_rec_false(self): ## Domain Admin - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_listall_false(self): """ # Test listing of Volumes by passing listall="false" parameter as domain admin @@ -500,7 +500,7 @@ def test_listVolume_as_domainadmin_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_listall_false_rec_true(self): """ # Test listing of Volumes by passing listall="false" and isrecusrive="true" parameter as domain admin @@ -525,7 +525,7 @@ def test_listVolume_as_domainadmin_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_listall_false_rec_false(self): """ # Test listing of Volumes by passing listall="false" and isrecusrive="false" parameter as domain admin @@ -551,7 +551,7 @@ def test_listVolume_as_domainadmin_listall_false_rec_false(self): ## Domain Admin - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin(self): """ # Test listing of Volumes by passing no parameter as domain admin @@ -576,7 +576,7 @@ def test_listVolume_as_domainadmin(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_rec_true(self): """ # Test listing of Volumes by passing isrecusrive="true" parameter as domain admin @@ -601,7 +601,7 @@ def test_listVolume_as_domainadmin_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_true_rec_false(self): """ # Test listing of Volumes by passing isrecusrive="false" parameter as domain admin @@ -628,7 +628,7 @@ def test_listVolume_as_domainadmin_true_rec_false(self): ## Domain Admin - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_listall_true(self): """ # Test listing of Volumes by passing domainId and listall="true" parameter as domain admin @@ -655,7 +655,7 @@ def test_listVolume_as_domainadmin_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_listall_true_rec_true(self): """ # Test listing of Volumes by passing domainId ,listall="true" and isrecursive="true" parameter as domain admin @@ -683,7 +683,7 @@ def test_listVolume_as_domainadmin_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_listall_true_rec_false(self): """ # Test listing of Volumes by passing domainId ,listall="true" and isrecursive="false" parameter as domain admin @@ -713,7 +713,7 @@ def test_listVolume_as_domainadmin_domainid_listall_true_rec_false(self): ## Domain Admin - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_listall_false(self): # Test listing of Volumes by passing domainId ,listall="false" parameter as domain admin # Validate that it returns all the Volumes in the domain passed @@ -738,7 +738,7 @@ def test_listVolume_as_domainadmin_domainid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_listall_false_rec_true(self): """ # Test listing of Volumes by passing domainId ,listall="false" and isrecursive="true" parameter as domain admin @@ -766,7 +766,7 @@ def test_listVolume_as_domainadmin_domainid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_listall_false_rec_false(self): """ # Test listing of Volumes by passing domainId ,listall="false" and isrecursive="false" parameter as domain admin @@ -796,7 +796,7 @@ def test_listVolume_as_domainadmin_domainid_listall_false_rec_false(self): ## Domain Admin - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid(self): """ # Test listing of Volumes by passing domainId parameter as domain admin @@ -822,7 +822,7 @@ def test_listVolume_as_domainadmin_domainid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_rec_true(self): """ # Test listing of Volumes by passing domainId and isrecursive="true" parameter as domain admin @@ -850,7 +850,7 @@ def test_listVolume_as_domainadmin_domainid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_rec_false(self): """ # Test listing of Volumes by passing domainId and isrecursive="false" parameter as domain admin @@ -880,7 +880,7 @@ def test_listVolume_as_domainadmin_domainid_rec_false(self): ## Domain Admin - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_listall_true(self): """ # Test listing of Volumes by passing account ,domainId and listall="true" parameter as domain admin @@ -905,7 +905,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_listall_true_rec_true(self): """ # Test listing of Volumes by passing account ,domainId and listall="true" and isrecursive="true" parameter as domain admin @@ -930,7 +930,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_listall_true_rec_true(self True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_listall_true_rec_false(self): """ # Test listing of Volumes by passing account ,domainId , listall="true" and isrecursive="false" parameter as domain admin @@ -958,7 +958,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_listall_true_rec_false(sel ## Domain Admin - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_listall_false(self): """ # Test listing of Volumes by passing account ,domainId and listall="false" parameter as domain admin @@ -983,7 +983,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_listall_false_rec_true(self): """ # Test listing of Volumes by passing account ,domainId and listall="false" and isrecursive="true" parameter as domain admin @@ -1008,7 +1008,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_listall_false_rec_true(sel True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_listall_false_rec_false(self): """ # Test listing of Volumes by passing account ,domainId , listall="false" and isrecursive="false" parameter as domain admin @@ -1035,7 +1035,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_listall_false_rec_false(se ## Domain Admin - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid(self): """ # Test listing of Volumes by passing account ,domainId parameter as domain admin @@ -1059,7 +1059,7 @@ def test_listVolume_as_domainadmin_domainid_accountid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_rec_true(self): """ # Test listing of Volumes by passing account ,domainId and isrecursive="true" parameter as domain admin @@ -1084,7 +1084,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_domainid_accountid_rec_false(self): """ # Test listing of Volumes by passing account ,domainId and isrecursive="false" parameter as domain admin @@ -1111,7 +1111,7 @@ def test_listVolume_as_domainadmin_domainid_accountid_rec_false(self): ## ROOT Admin - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_listall_true(self): """ # Test listing of Volumes by passing listall="true" parameter as admin @@ -1147,7 +1147,7 @@ def test_listVolume_as_rootadmin_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_listall_true_rec_true(self): """ # Test listing of Volumes by passing listall="true" and isrecusrive="true" parameter as admin @@ -1183,7 +1183,7 @@ def test_listVolume_as_rootadmin_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_listall_true_rec_false(self): """ # Test listing of Volumes by passing listall="true" and isrecusrive="false" parameter as admin @@ -1220,7 +1220,7 @@ def test_listVolume_as_rootadmin_listall_true_rec_false(self): ## ROOT Admin - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_listall_false(self): """ # Test listing of Volumes by passing listall="false" parameter as admin @@ -1245,7 +1245,7 @@ def test_listVolume_as_rootadmin_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_listall_false_rec_true(self): """ # Test listing of Volumes by passing listall="false" and isrecusrive="true" parameter as admin @@ -1271,7 +1271,7 @@ def test_listVolume_as_rootadmin_listall_false_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_listall_false_rec_false(self): """ # Test listing of Volumes by passing listall="false" and isrecusrive="false" parameter as admin @@ -1300,7 +1300,7 @@ def test_listVolume_as_rootadmin_listall_false_rec_false(self): ## ROOT Admin - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin(self): """ # Test listing of Volumes by passing no parameter as admin @@ -1326,7 +1326,7 @@ def test_listVolume_as_rootadmin(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_rec_true(self): """ # Test listing of Volumes by passing isrecusrive="true" parameter as admin @@ -1351,7 +1351,7 @@ def test_listVolume_as_rootadmin_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_rec_false(self): """ # Test listing of Volumes by passing isrecusrive="false" parameter as admin @@ -1378,7 +1378,7 @@ def test_listVolume_as_rootadmin_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_listall_true(self): """ # Test listing of Volumes by passing domainid and listall="true" parameter as admin @@ -1405,7 +1405,7 @@ def test_listVolume_as_rootadmin_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_listall_true_rec_true(self): """ # Test listing of Volumes by passing domainid , listall="true" and isrecusrive="true" parameter as admin @@ -1433,7 +1433,7 @@ def test_listVolume_as_rootadmin_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_listall_true_rec_false(self): """ # Test listing of Volumes by passing domainid, listall="true" and isrecusrive="false" parameter as admin @@ -1463,7 +1463,7 @@ def test_listVolume_as_rootadmin_domainid_listall_true_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_listall_false(self): """ # Test listing of Volumes by passing domainid, listall="false" parameter as admin @@ -1490,7 +1490,7 @@ def test_listVolume_as_rootadmin_domainid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_listall_false_rec_true(self): """ # Test listing of Volumes by passing domainid, listall="false" and isrecusrive="true" parameter as admin @@ -1518,7 +1518,7 @@ def test_listVolume_as_rootadmin_domainid_listall_false_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_listall_false_rec_false(self): """ # Test listing of Volumes by passing domainid, listall="false" and isrecusrive="false" parameter as admin @@ -1548,7 +1548,7 @@ def test_listVolume_as_rootadmin_domainid_listall_false_rec_false(self): ## ROOT Admin - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid(self): """ # Test listing of Volumes by passing domainid parameter as admin @@ -1575,7 +1575,7 @@ def test_listVolume_as_rootadmin_domainid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_rec_true(self): """ # Test listing of Volumes by passing domainid and isrecusrive="true" parameter as admin @@ -1603,7 +1603,7 @@ def test_listVolume_as_rootadmin_domainid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_rec_false(self): """ # Test listing of Volumes by passing domainid and isrecusrive="false" parameter as admin @@ -1633,7 +1633,7 @@ def test_listVolume_as_rootadmin_domainid_rec_false(self): ## ROOT Admin - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_listall_true(self): """ # Test listing of Volumes by passing domainid,account ,listall = "true" parameter as admin @@ -1658,7 +1658,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_listall_true_rec_true(self): """ # Test listing of Volumes by passing domainid,account ,listall = "true" and isrecusrive="true" parameter as admin @@ -1683,7 +1683,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_listall_true_rec_false(self): """ # Test listing of Volumes by passing domainid,account ,listall = "true" and isrecusrive="false" parameter as admin @@ -1711,7 +1711,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_listall_true_rec_false(self) ## ROOT Admin - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_listall_false(self): """ # Test listing of Volumes by passing domainid,account ,listall = "false" parameter as admin @@ -1736,7 +1736,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_listall_false_rec_true(self): """ # Test listing of Volumes by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin @@ -1761,7 +1761,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_listall_false_rec_true(self) True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_listall_false_rec_false(self): """ # Test listing of Volumes by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin @@ -1789,7 +1789,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_listall_false_rec_false(self ## ROOT Admin - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid(self): """ # Test listing of Volumes by passing domainid,account parameter as admin @@ -1814,7 +1814,7 @@ def test_listVolume_as_rootadmin_domainid_accountid(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_rec_true(self): """ # Test listing of Volumes by passing domainid,account and isrecusrive="true" parameter as admin @@ -1839,7 +1839,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_rootadmin_domainid_accountid_rec_false(self): """ # Test listing of Volumes by passing domainid,account and isrecusrive="false" parameter as admin @@ -1867,7 +1867,7 @@ def test_listVolume_as_rootadmin_domainid_accountid_rec_false(self): ## Regular User - Test cases with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_listall_true(self): """ # Test listing of Volumes by passing listall="true" parameter as regular user @@ -1892,7 +1892,7 @@ def test_listVolume_as_regularuser_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_listall_true_rec_true(self): """ # Test listing of Volumes by passing listall="true" and isrecusrive="true" parameter as regular user @@ -1917,7 +1917,7 @@ def test_listVolume_as_regularuser_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_listall_true_rec_false(self): """ # Test listing of Volumes by passing listall="true" and isrecusrive="false" parameter as regular user @@ -1944,7 +1944,7 @@ def test_listVolume_as_regularuser_listall_true_rec_false(self): ## Regular User - Test cases with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_listall_false(self): """ # Test listing of Volumes by passing domainid,account,listall="false" parameter as regular user @@ -1969,7 +1969,7 @@ def test_listVolume_as_regularuser_listall_false(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_listall_false_rec_true(self): """ # Test listing of Volumes by passing listall="false" and isrecusrive="true" parameter as regular user @@ -1995,7 +1995,7 @@ def test_listVolume_as_regularuser_listall_false_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_listall_false_rec_false(self): """ # Test listing of Volumes by passing listall="false" and isrecusrive="false" parameter as regular user @@ -2024,7 +2024,7 @@ def test_listVolume_as_regularuser_listall_false_rec_false(self): ## Regular User - Test cases without passing listall paramter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser(self): """ # Test listing of Volumes by passing no parameter as regular user @@ -2050,7 +2050,7 @@ def test_listVolume_as_regularuser(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_rec_true(self): """ # Test listing of Volumes by passing isrecusrive="true" parameter as regular user @@ -2075,7 +2075,7 @@ def test_listVolume_as_regularuser_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_rec_false(self): """ # Test listing of Volumes by passing isrecusrive="false" parameter as regular user @@ -2102,7 +2102,7 @@ def test_listVolume_as_regularuser_rec_false(self): ## Regular User - Test cases when domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_listall_true(self): """ # Test listing of Volumes by passing domainid,listall="true" parameter as regular user @@ -2127,7 +2127,7 @@ def test_listVolume_as_regularuser_domainid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_listall_true_rec_true(self): """ # Test listing of Volumes by passing domainid,listall="true" and isrecusrive="true" parameter as regular user @@ -2152,7 +2152,7 @@ def test_listVolume_as_regularuser_domainid_listall_true_rec_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_listall_true_rec_false(self): """ # Test listing of Volumes by passing domainid,listall="true" and isrecusrive="false" parameter as regular user @@ -2180,7 +2180,7 @@ def test_listVolume_as_regularuser_domainid_listall_true_rec_false(self): ## Regular User - Test cases when domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_listall_false(self): """ # Test listing of Volumes by passing domainid,listall="false" parameter as regular user @@ -2206,7 +2206,7 @@ def test_listVolume_as_regularuser_domainid_listall_false(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_listall_false_rec_true(self): """ # Test listing of Volumes by passing domainid,listall="false" and isrecusrive="true" parameter as regular user @@ -2233,7 +2233,7 @@ def test_listVolume_as_regularuser_domainid_listall_false_rec_true(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_listall_false_rec_false(self): """ # Test listing of Volumes by passing domainid,listall="false" and isrecusrive="false" parameter as regular user @@ -2261,7 +2261,7 @@ def test_listVolume_as_regularuser_domainid_listall_false_rec_false(self): ## Regular User - Test cases when domainId is passed with no listall parameter - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid(self): """ # Test listing of Volumes by passing domainid parameter as regular user @@ -2287,7 +2287,7 @@ def test_listVolume_as_regularuser_domainid(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_true_rec_true(self): """ # Test listing of Volumes by passing domainid and isrecusrive="true" parameter as regular user @@ -2314,7 +2314,7 @@ def test_listVolume_as_regularuser_domainid_true_rec_true(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid__rec_false(self): """ # Test listing of Volumes by passing domainid,isrecusrive="false" parameter as regular user @@ -2342,7 +2342,7 @@ def test_listVolume_as_regularuser_domainid__rec_false(self): ## Regular User - Test cases when account and domainId is passed with listall =true - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_listall_true(self): """ # Test listing of Volumes by passing domainid,account,listall="true" parameter as regular user @@ -2367,7 +2367,7 @@ def test_listVolume_as_regularuser_domainid_accountid_listall_true(self): True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_listall_true_rec_true(self): """ # Test listing of Volumes by passing domainid,account,listall="true" and isrecusrive="true" parameter as regular user @@ -2392,7 +2392,7 @@ def test_listVolume_as_regularuser_domainid_accountid_listall_true_rec_true(self True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_listall_true_rec_false(self): """ # Test listing of Volumes by passing domainid,account,listall="true" and isrecusrive="false" parameter as regular user @@ -2420,7 +2420,7 @@ def test_listVolume_as_regularuser_domainid_accountid_listall_true_rec_false(sel ## Regular User - Test cases when account and domainId is passed with listall=false - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_listall_false(self): """ # Test listing of Volumes by passing domainid,account,listall="false" parameter as regular user @@ -2446,7 +2446,7 @@ def test_listVolume_as_regularuser_domainid_accountid_listall_false(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_listall_false_rec_true(self): # Test listing of Volumes by passing domainid,account,listall="false" and isrecusrive="true" parameter as regular user # Validate that it returns all the Volumes of the account the user belongs to @@ -2469,7 +2469,7 @@ def test_listVolume_as_regularuser_domainid_accountid_listall_false_rec_true(sel True, "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_listall_false_rec_false(self): """ # Test listing of Volumes by passing domainid,account,listall="false" and isrecusrive="false" parameter as regular user @@ -2497,7 +2497,7 @@ def test_listVolume_as_regularuser_domainid_accountid_listall_false_rec_false(se ## Regular User - Test cases when account and domainId is passed with listall not passed - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid(self): """ # Test listing of Volumes by passing domainid,account parameter as regular user @@ -2523,7 +2523,7 @@ def test_listVolume_as_regularuser_domainid_accountid(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_rec_true(self): """ # Test listing of Volumes by passing domainid,account and isrecusrive="true" parameter as regular user @@ -2549,7 +2549,7 @@ def test_listVolume_as_regularuser_domainid_accountid_rec_true(self): "Account access check failed!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_domainid_accountid_rec_false(self): """ # Test listing of Volumes by passing domainid,account isrecusrive="false" parameter as regular user @@ -2576,7 +2576,7 @@ def test_listVolume_as_regularuser_domainid_accountid_rec_false(self): ## Cross Domain access check - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_cross_domainid_accountid(self): """ # Regular User should not be allowed to list Volumes of other accounts in the same domain @@ -2590,7 +2590,7 @@ def test_listVolume_as_regularuser_cross_domainid_accountid(self): except Exception as e: self.debug ("List as Regular User passing domainId and accountId of another account %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_regularuser_cross_domainid(self): """ # Regular User should not be allowed to list Volumes of other accounts in other domains @@ -2605,7 +2605,7 @@ def test_listVolume_as_regularuser_cross_domainid(self): self.debug ("List as Regular User passing domainId of a domain that user does not belong to %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_cross_domainid_accountid(self): """ # Domain admin should not be allowed to list Volumes of accounts in other domains @@ -2620,7 +2620,7 @@ def test_listVolume_as_domainadmin_cross_domainid_accountid(self): self.debug ("List as domain admin passing domainId and accountId of another account %s" %e) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_as_domainadmin_cross_domainid(self): """ # Domain admin should not be allowed to list Volumes from other domains @@ -2636,7 +2636,7 @@ def test_listVolume_as_domainadmin_cross_domainid(self): ## List test cases relating to filter - id - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_domainadmin_owns(self): """ # Domain admin should be able to list Volumes that he owns by passing uuid in "id" parameter @@ -2654,7 +2654,7 @@ def test_listVolume_by_id_as_domainadmin_owns(self): 1, "Domain Admin is not able to list Volumes that belongs to him") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_domainadmin_ownedbyusersindomain(self): """ # Domain admin should be able to list Volumes that is owned by any account in his domain by passing uuid in "id" parameter @@ -2672,7 +2672,7 @@ def test_listVolume_by_id_as_domainadmin_ownedbyusersindomain(self): 1, "Domain Admin is not able to list Volumes from his domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_domainadmin_ownedbyusersinsubdomain(self): """ # Domain admin should be able to list Volumes that is owned by any account in his sub-domain by passing uuid in "id" parameter @@ -2690,7 +2690,7 @@ def test_listVolume_by_id_as_domainadmin_ownedbyusersinsubdomain(self): 1, "Domain Admin is not able to list Volumes from his sub domain") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_domainadmin_ownedbyusersnotindomain(self): """ # Domain admin should not be able to list Volumes that is owned by account that is not in his domain by passing uuid in "id" parameter @@ -2704,7 +2704,7 @@ def test_listVolume_by_id_as_domainadmin_ownedbyusersnotindomain(self): None, "Domain Admin is able to list Volumes from other domains!!!") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_domainadmin_ownedbyusersinsubdomain2(self): """ # Domain admin should be able to list Volumes that is owned by account that is in his sub domains by passing uuid in "id" parameter @@ -2723,7 +2723,7 @@ def test_listVolume_by_id_as_domainadmin_ownedbyusersinsubdomain2(self): "Domain Admin is not able to list Volumes from his sub domains") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_rootadmin_owns(self): """ # ROOT admin should be able to list Volumes that is owned by accounts in his domain by passing uuid in "id" parameter @@ -2739,7 +2739,7 @@ def test_listVolume_by_id_as_rootadmin_owns(self): 1, "ROOT Admin not able to list Volumes that he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_rootadmin_Volumesownedbyothers(self): """ # ROOT admin should be able to list Volumes that is owned by any account by passing uuid in "id" parameter @@ -2763,7 +2763,7 @@ def test_listVolume_by_id_as_rootadmin_Volumesownedbyothers(self): 1, "ROOT Admin not able to list Volumes from other domains") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_user_own(self): """ # Regular user should be able to list Volumes that is owned by him by passing uuid in "id" parameter @@ -2782,7 +2782,7 @@ def test_listVolume_by_id_as_user_own(self): 1, "Regular User is not able to list Volumes that he owns") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_user_volumefromsamedomaindifferentaccount(self): """ # Regular user should not be able to list Volumes that is owned by different account in the same domain by passing uuid in "id" parameter @@ -2796,7 +2796,7 @@ def test_listVolume_by_id_as_user_volumefromsamedomaindifferentaccount(self): None, "Regular User is able to list Volumes from other accounts") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only", tags=["advanced"],required_hardware="false") def test_listVolume_by_id_as_user_volumefromotherdomain(self): """ # Regular user should not be able to list Volumes that is owned by different account in the different domain by passing uuid in "id" parameter diff --git a/test/integration/component/test_acl_sharednetwork.py b/test/integration/component/test_acl_sharednetwork.py index 5d57f301ba50..b74405e79a4f 100644 --- a/test/integration/component/test_acl_sharednetwork.py +++ b/test/integration/component/test_acl_sharednetwork.py @@ -343,7 +343,7 @@ def tearDown(cls): ## Test cases relating to deploying Virtual Machine in shared network with scope=all - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_all_domainuser(self): """ Validate that regular user in a domain is allowed to deploy VM in a shared network created with scope="all" @@ -369,7 +369,7 @@ def test_deployVM_in_sharedNetwork_scope_all_domainuser(self): "User in a domain under ROOT failed to deploy VM in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_all_domainadminuser(self): """ Validate that regular user in "ROOT" domain is allowed to deploy VM in a shared network created with scope="all" @@ -396,7 +396,7 @@ def test_deployVM_in_sharedNetwork_scope_all_domainadminuser(self): "Admin User in a domain under ROOT failed to deploy VM in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_all_subdomainuser(self): """ Validate that regular user in any subdomain is allowed to deploy VM in a shared network created with scope="all" @@ -421,7 +421,7 @@ def test_deployVM_in_sharedNetwork_scope_all_subdomainuser(self): True, "User in a domain under ROOT failed to deploy VM in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_all_subdomainadminuser(self): """ Validate that regular user in a subdomain under ROOT is allowed to deploy VM in a shared network created with scope="all" @@ -447,7 +447,7 @@ def test_deployVM_in_sharedNetwork_scope_all_subdomainadminuser(self): "Admin User in a domain under ROOT failed to deploy VM in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_all_ROOTuser(self): """ Validate that regular user in ROOT domain is allowed to deploy VM in a shared network created with scope="all" @@ -472,7 +472,7 @@ def test_deployVM_in_sharedNetwork_scope_all_ROOTuser(self): True, "User in ROOT domain failed to deploy VM in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_all_ROOTadmin(self): """ Validate that admin user in ROOT domain is allowed to deploy VM in a shared network created with scope="all" @@ -498,7 +498,7 @@ def test_deployVM_in_sharedNetwork_scope_all_ROOTadmin(self): ## Test cases relating to deploying Virtual Machine in shared network with scope=Domain and no subdomain access - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_domainuser(self): """ Validate that regular user in a domain is allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -525,7 +525,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_domainuser(sel "User in a domain that has a shared network with no subdomain access failed to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_domainadminuser(self): """ Validate that admin user in a domain is allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -551,7 +551,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_domainadminuse True, "Admin User in a domain that has a shared network with no subdomain access failed to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_subdomainuser(self): """ Validate that regular user in a subdomain is NOT allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -578,7 +578,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_subdomainuser( if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NOT_AVAILABLE_IN_DOMAIN): self.fail("Error message validation failed when Subdomain user tries to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_subdomainadminuser(self): """ Validate that admin user in a subdomain is NOT allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -607,7 +607,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_subdomainadmin - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_parentdomainuser(self): """ Validate that user in the parent domain is NOT allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -635,7 +635,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_parentdomainus self.fail("Error message validation failed when Parent domain user tries to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_parentdomainadminuser(self): """ Validate that admin user in the parent domain is NOT allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -664,7 +664,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_parentdomainad - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_ROOTuser(self): """ Validate that user in ROOT domain is NOT allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -693,7 +693,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_ROOTuser(self) - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_ROOTadmin(self): """ Validate that admin in ROOT domain is NOT allowed to deploy VM in a shared network created with scope="domain" and no subdomain access @@ -724,7 +724,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_nosubdomainaccess_ROOTadmin(self ## Test cases relating to deploying Virtual Machine in shared network with scope=Domain and with subdomain access - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_domainuser(self): """ Validate that regular user in a domain is allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for the domain @@ -751,7 +751,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_domainuser(s "User in a domain that has a shared network with subdomain access failed to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_domainadminuser(self): """ Validate that admin user in a domain is allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for the domain @@ -777,7 +777,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_domainadminu True, "Admin User in a domain that has a shared network with subdomain access failed to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_subdomainuser(self): """ Validate that regular user in a subdomain is allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for the parent domain @@ -802,7 +802,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_subdomainuse True, "User in a subdomain that has a shared network with subdomain access failed to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_subdomainadminuser(self): """ Validate that an admin user in a subdomain is allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for the parent domain @@ -827,7 +827,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_subdomainadm True, "Admin User in a subdomain that has a shared network with subdomain access failed to deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_parentdomainuser(self): """ Validate that regular user in a parent domain is NOT allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for the domain @@ -855,7 +855,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_parentdomain self.fail("Error message validation failed when Parent domain's user tries to deploy VM in a shared network with scope=domain with subdomain access ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_parentdomainadminuser(self): """ Validate that admin user in a parent domain is NOT allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for any domain @@ -884,7 +884,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_parentdomain - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_ROOTuser(self): """ Validate that regular user in ROOT domain is NOT allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for any domain @@ -912,7 +912,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_ROOTuser(sel self.fail("Error message validation failed when ROOT domain's user tries to deploy VM in a shared network with scope=domain with subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_ROOTadmin(self): """ Validate that admin user in ROOT domain is NOT allowed to deploy VM in a shared network created with scope="domain" and with subdomain access for any domain @@ -943,7 +943,7 @@ def test_deployVM_in_sharedNetwork_scope_domain_withsubdomainaccess_ROOTadmin(se ## Test cases relating to deploying Virtual Machine in shared network with scope=account - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_account_domainuser(self): """ Validate that any other user in same domain is NOT allowed to deploy VM in a shared network created with scope="account" for an account @@ -972,7 +972,7 @@ def test_deployVM_in_sharedNetwork_scope_account_domainuser(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_account_domainadminuser(self): """ Validate that an admin user under the same domain but belonging to a different account is allowed to deploy VM in a shared network created with scope="account" for an account @@ -1000,7 +1000,7 @@ def test_deployVM_in_sharedNetwork_scope_account_domainadminuser(self): self.fail("Error message validation failed when User from same domain but different account tries to deploy VM in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_account_user(self): """ Validate that regular user in the account is allowed to deploy VM in a shared network created with scope="account" for an account @@ -1026,7 +1026,7 @@ def test_deployVM_in_sharedNetwork_scope_account_user(self): True, "User in the account that has a shared network with scope=account failed to deploy a VM in this shared network") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_account_differentdomain(self): """ Validate that regular user from a domain different from that of the account is NOT allowed to deploy VM in a shared network created with scope="account" for an account @@ -1055,7 +1055,7 @@ def test_deployVM_in_sharedNetwork_scope_account_differentdomain(self): - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_account_ROOTuser(self): """ Validate that user in ROOT domain is NOT allowed to deploy VM in a shared network created with scope="account" for an account @@ -1083,7 +1083,7 @@ def test_deployVM_in_sharedNetwork_scope_account_ROOTuser(self): self.fail("Error message validation failed when ROOT domain's user tries to deploy VM in a shared network with scope=account ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_scope_account_ROOTadmin(self): """ Validate that admin user in ROOT domain is NOT allowed to deploy VM in a shared network created with scope="account" for an account diff --git a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py index a05a2d89bb4d..09347bac6be8 100644 --- a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py +++ b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py @@ -342,7 +342,7 @@ def tearDown(cls): ## Test cases relating to deploying Virtual Machine as ROOT admin for other users in shared network with scope=all - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainuser(self): """ Valiate that ROOT admin is able to deploy a VM for other users in a shared network with scope=all @@ -371,7 +371,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainuser(self): "ROOT admin is not able to deploy a VM for other users in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainadminuser(self): """ Valiate that ROOT admin is able to deploy a VM for a domain admin users in a shared network with scope=all @@ -400,7 +400,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_domainadminuser(self): "ROOT admin is not able to deploy a VM for a domain admin users in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainuser(self): """ Valiate that ROOT admin is able to deploy a VM for any user in a subdomain in a shared network with scope=all @@ -426,7 +426,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainuser(self): True, "ROOT admin is not able to deploy a VM for any user in a subdomain in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainadminuser(self): """ Valiate that ROOT admin is able to deploy a VM for admin user in a domain in a shared network with scope=all @@ -453,7 +453,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_subdomainadminuser(self): True, "ROOT admin is not able to deploy a VM for admin user in a domain in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_all_ROOTuser(self): """ Valiate that ROOT admin is able to deploy a VM for user in ROOT domain in a shared network with scope=all @@ -482,7 +482,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_all_ROOTuser(self): ## Test cases relating to deploying Virtual Machine as ROOT admin for other users in shared network with scope=Domain and no subdomain access - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domainuser(self): """ Valiate that ROOT admin is able to deploy a VM for domain user in a shared network with scope=domain with no subdomain access @@ -511,7 +511,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domai "ROOT admin is not able to deploy a VM for domain user in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domainadminuser(self): """ Valiate that ROOT admin is able to deploy a VM for domain admin user in a shared network with scope=domain with no subdomain access @@ -539,7 +539,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_domai True, "ROOT admin is not able to deploy a VM for domain admin user in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdomainuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for sub domain user in a shared network with scope=domain with no subdomain access @@ -570,7 +570,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdo self.fail("Error message validation failed when ROOT admin tries to deploy a VM for sub domain user in a shared network with scope=domain with no subdomain access ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdomainadminuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for sub domain admin user in a shared network with scope=domain with no subdomain access @@ -600,7 +600,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_subdo self.fail("Error message validation failed when ROOT admin tries to deploy a VM for sub domain admin user in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_parentdomainuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for parent domain user in a shared network with scope=domain with no subdomain access @@ -630,7 +630,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_paren self.fail("Error message validation failed when ROOT admin tries to deploy a VM for parent domain user in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_parentdomainadminuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with no subdomain access @@ -661,7 +661,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_paren - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_ROOTuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with no subdomain access @@ -692,7 +692,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_nosubdomainaccess_ROOTu ## Test cases relating to deploying Virtual Machine as ROOT admin for other users in shared network with scope=Domain and with subdomain access - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_domainuser(self): """ Valiate that ROOT admin is able to deploy a VM for domain user in a shared network with scope=domain with subdomain access @@ -721,7 +721,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_dom "ROOT admin is NOT able to deploy a VM for domain user in a shared network with scope=domain with subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_domainadminuser(self): """ Valiate that ROOT admin is able to deploy a VM for domain admin user in a shared network with scope=domain with subdomain access @@ -749,7 +749,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_dom True, "ROOT admin is not able to deploy a VM for domain admin user in a shared network with scope=domain with subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_subdomainuser(self): """ Valiate that ROOT admin is able to deploy a VM for subdomain user in a shared network with scope=domain with subdomain access @@ -776,7 +776,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_sub True, "ROOT admin is not able to deploy a VM for subdomain user in a shared network with scope=domain with subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_subdomainadminuser(self): """ Valiate that ROOT admin is able to deploy a VM for subdomain admin user in a shared network with scope=domain with subdomain access @@ -803,7 +803,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_sub True, "ROOT admin is not able to deploy a VM for subdomain admin user in a shared network with scope=domain with subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_parentdomainuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for parent domain user in a shared network with scope=domain with subdomain access @@ -832,7 +832,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_par if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NOT_AVAILABLE_IN_DOMAIN): self.fail("Error message validation failed when ROOT admin tries to deploy a VM for parent domain user in a shared network with scope=domain with subdomain access ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_parentdomainadminuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=domain with subdomain access @@ -862,7 +862,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_par self.fail("Error message validation failed when ROOT admin tries to deploy a VM for parent domain admin user in a shared network with scope=domain with subdomain access ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_ROOTuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=domain with subdomain access @@ -894,7 +894,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_domain_withsubdomainaccess_ROO ## Test cases relating to deploying Virtual Machine as ROOT admin for other users in shared network with scope=account - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for user in the same domain but in a different account in a shared network with scope=account @@ -924,7 +924,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainuser(self): self.fail("Error message validation failed when ROOT admin tries to deploy a VM for user in the same domain but in a different account in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainadminuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for admin user in the same domain but in a different account in a shared network with scope=account @@ -953,7 +953,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_domainadminuser(self): if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.UNABLE_TO_USE_NETWORK): self.fail("Error message validation failed when ROOT admin tries to deploy a VM for admin user in the same domain but in a different account in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_user(self): """ Valiate that ROOT admin is able to deploy a VM for regular user in a shared network with scope=account @@ -981,7 +981,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_user(self): True, "ROOT admin is not able to deploy a VM for regular user in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_differentdomain(self): """ Valiate that ROOT admin is NOT able to deploy a VM for a admin user in a shared network with scope=account which the admin user does not have access to @@ -1011,7 +1011,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_differentdomain(self): self.fail("Error message validation failed when ROOT admin tries to deploy a VM for a admin user in a shared network with scope=account which the admin user does not have access to ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_admin_scope_account_ROOTuser(self): """ Valiate that ROOT admin is NOT able to deploy a VM for a user in ROOT domain in a shared network with scope=account which the user does not have access to @@ -1042,7 +1042,7 @@ def test_deployVM_in_sharedNetwork_as_admin_scope_account_ROOTuser(self): ## Test cases relating to deploying Virtual Machine as Domain admin for other users in shared network with scope=all - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainuser(self): """ Valiate that Domain admin is able to deploy a VM for a domain user in a shared network with scope=all @@ -1070,7 +1070,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainuser(self): "Domain admin is not able to deploy a VM for a domain user in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainadminuser(self): """ Valiate that Domain admin is able to deploy a VM for a domain admin user in a shared network with scope=all @@ -1098,7 +1098,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_domainadminuser(self "Domain admin is not able to deploy a VM for a domain admin user in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainuser(self): """ Valiate that Domain admin is able to deploy a VM for a sub domain user in a shared network with scope=all @@ -1124,7 +1124,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainuser(self): True, "Domain admin is not able to deploy a VM for a sub domain user in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainadminuser(self): """ Valiate that Domain admin is able to deploy a VM for a sub domain admin user in a shared network with scope=all @@ -1150,7 +1150,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_subdomainadminuser(s True, "Domain admin is not able to deploy a VM for a sub domain admin user in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_ROOTuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=all @@ -1179,7 +1179,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_ROOTuser(self): self.fail("Error message validation failed when Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_crossdomainuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for user in other domain in a shared network with scope=all @@ -1209,7 +1209,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_all_crossdomainuser(self ## Test cases relating to deploying Virtual Machine as Domain admin for other users in shared network with scope=Domain and no subdomain access - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_domainuser(self): """ Valiate that Domain admin is able to deploy a VM for domain user in a shared network with scope=Domain and no subdomain access @@ -1237,7 +1237,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess "Domain admin is not able to deploy a VM for domain user in a shared network with scope=Domain and no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_domainadminuser(self): """ Valiate that Domain admin is able to deploy a VM for domain admin user in a shared network with scope=Domain and no subdomain access @@ -1265,7 +1265,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess True, "Admin User in a domain that has a shared network with no subdomain access failed to Deploy VM in a shared network with scope=domain with no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_subdomainuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for sub domain user in a shared network with scope=Domain and no subdomain access @@ -1295,7 +1295,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess self.fail("Error message validation failed when Domain admin tries to deploy a VM for sub domain user in a shared network with scope=Domain and no subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_subdomainadminuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for sub domain admin user in a shared network with scope=Domain and no subdomain access @@ -1325,7 +1325,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess self.fail("Error message validation failed when Domain admin tries to deploy a VM for sub domain admin user in a shared network with scope=Domain and no subdomain access ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_parentdomainuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for parent domain user in a shared network with scope=Domain and no subdomain access @@ -1355,7 +1355,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess self.fail("Error message validation failed when Domain admin tries to deploy a VM for parent domain user in a shared network with scope=Domain and no subdomain access ") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_parentdomainadminuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for parent domain admin user in a shared network with scope=Domain and no subdomain access @@ -1386,7 +1386,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess_ROOTuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=Domain and no subdomain access @@ -1418,7 +1418,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_nosubdomainaccess ## Test cases relating to deploying Virtual Machine as Domain admin for other users in shared network with scope=Domain and with subdomain access - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_domainuser(self): """ Valiate that Domain admin is able to deploy a VM for regular user in domain in a shared network with scope=Domain and subdomain access @@ -1446,7 +1446,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce "Domain admin is not able to deploy a VM for regular user in domain in a shared network with scope=Domain and subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_domainadminuser(self): """ Valiate that Domain admin is able to deploy a VM for admin user in domain in a shared network with scope=Domain and subdomain access @@ -1473,7 +1473,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce True, "Domain admin is not able to deploy a VM for admin user in domain in a shared network with scope=Domain and subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_subdomainuser(self): """ Valiate that Domain admin is able to deploy a VM for regular user in subdomain in a shared network with scope=Domain and subdomain access @@ -1499,7 +1499,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce True, "Domain admin is not able to deploy a VM for regular user in subdomain in a shared network with scope=Domain and subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_subdomainadminuser(self): """ Valiate that Domain admin is able to deploy a VM for admin user in subdomain in a shared network with scope=Domain and subdomain access @@ -1525,7 +1525,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce True, "Domain admin is not able to deploy a VM for admin user in subdomain in a shared network with scope=Domain and subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_parentdomainuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for regular user in parent domain in a shared network with scope=Domain and subdomain access @@ -1553,7 +1553,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NOT_AVAILABLE_IN_DOMAIN): self.fail("Error message validation failed when Domain admin tries to deploy a VM for regular user in parent domain in a shared network with scope=Domain and subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_parentdomainadminuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for admin user in parent domain in a shared network with scope=Domain and subdomain access @@ -1583,7 +1583,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce self.fail("Error message validation failed when Domain admin tries to deploy a VM for admin user in parent domain in a shared network with scope=Domain and subdomain access") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainaccess_ROOTuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for user in ROOT domain in a shared network with scope=Domain and subdomain access @@ -1614,7 +1614,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_domain_withsubdomainacce ## Test cases relating to deploying Virtual Machine as Domain admin for other users in shared network with scope=account - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for user in the same domain but belonging to a different account in a shared network with scope=account @@ -1643,7 +1643,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainuser(self) self.fail("Error message validation failed when Domain admin tries to deploy a VM for user in the same domain but belonging to a different account in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainadminuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for an admin user in the same domain but belonging to a different account in a shared network with scope=account @@ -1672,7 +1672,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_domainadminuser( self.fail("Error message validation failed when Domain admin tries to deploy a VM for user in the same domain but belonging to a different account in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_user(self): """ Valiate that Domain admin is able to deploy a VM for an regular user in a shared network with scope=account @@ -1699,7 +1699,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_user(self): True, "Domain admin is not able to deploy a VM for an regular user in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_differentdomain(self): """ Valiate that Domain admin is able NOT able to deploy a VM for an regular user from a differnt domain in a shared network with scope=account @@ -1728,7 +1728,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_differentdomain( self.fail("Error message validation failed when Domain admin tries to deploy a VM for an regular user from a differnt domain in a shared network with scope=account") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_ROOTuser(self): """ Valiate that Domain admin is NOT able to deploy a VM for an regular user in ROOT domain in a shared network with scope=account @@ -1758,7 +1758,7 @@ def test_deployVM_in_sharedNetwork_as_domainadmin_scope_account_ROOTuser(self): ## Test cases relating to deploying Virtual Machine as Regular user for other users in shared network with scope=all - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_regularuser_scope_all_anotherusersamedomain(self): """ Valiate that regular user is able NOT able to deploy a VM for another user in the same domain in a shared network with scope=all @@ -1787,7 +1787,7 @@ def test_deployVM_in_sharedNetwork_as_regularuser_scope_all_anotherusersamedomai self.fail("Error message validation failed when Regular user tries to deploy a VM for another user in the same domain in a shared network with scope=all") - @attr(tags=["advanced"],required_hardware="false") + @attr("simulator_only",tags=["advanced"],required_hardware="false") def test_deployVM_in_sharedNetwork_as_regularuser_scope_all_crossdomain(self): """ Valiate that regular user is able NOT able to deploy a VM for another user in a different domain in a shared network with scope=all From 082aed3d33109903208014432eebbe3e69737d4e Mon Sep 17 00:00:00 2001 From: Nitin Mehta Date: Fri, 19 Sep 2014 13:40:17 -0700 Subject: [PATCH 006/528] CLOUDSTACK-7588: [Vmware] Creating templates (with same names) from volumes get deleted from CS. Fix it by changing the unique name generation to the standard one used by registertemplate. Also cleaned up vmtemplatevo which had too many constructors. --- .../src/com/cloud/storage/VMTemplateVO.java | 38 ++----------------- .../cloud/template/TemplateManagerImpl.java | 9 ++--- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/engine/schema/src/com/cloud/storage/VMTemplateVO.java b/engine/schema/src/com/cloud/storage/VMTemplateVO.java index 9a77cbf873aa..d44de221a871 100755 --- a/engine/schema/src/com/cloud/storage/VMTemplateVO.java +++ b/engine/schema/src/com/cloud/storage/VMTemplateVO.java @@ -159,10 +159,8 @@ public VMTemplateVO() { uuid = UUID.randomUUID().toString(); } - /** - * Proper constructor for a new vm template. - */ - public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, + //FIXME - Remove unwanted constructors. + private VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, HypervisorType hyperType, Map details) { this(id, @@ -250,8 +248,8 @@ public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, state = State.Active; } - // Has an extra attribute - isExtractable - public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, + //FIXME - Remove unwanted constructors. Made them private for now + private VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, String url, Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, HypervisorType hyperType, Map details) { this(id, @@ -278,34 +276,6 @@ public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, state = State.Active; } - public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, boolean isExtractable, TemplateType type, - String url, Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, - boolean bootable, HypervisorType hyperType, String templateTag, Map details) { - this(id, - uniqueName, - name, - format, - isPublic, - featured, - isExtractable, - type, - url, - created, - requiresHvm, - bits, - accountId, - cksum, - displayText, - enablePassword, - guestOSId, - bootable, - hyperType, - details); - this.templateTag = templateTag; - uuid = UUID.randomUUID().toString(); - state = State.Active; - } - @Override public boolean getEnablePassword() { return enablePassword; diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 06ca5e0209e6..247ed0037119 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -1605,7 +1604,6 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t throw new InvalidParameterValueException("GuestOS with ID: " + guestOSId + " does not exist."); } - String uniqueName = Long.valueOf((userId == null) ? 1 : userId).toString() + UUID.nameUUIDFromBytes(name.getBytes()).toString(); Long nextTemplateId = _tmpltDao.getNextInSequence(Long.class, "id"); String description = cmd.getDisplayText(); boolean isExtractable = false; @@ -1630,10 +1628,9 @@ public VMTemplateVO createPrivateTemplateRecord(CreateTemplateCmd cmd, Account t s_logger.debug("Adding template tag: " + templateTag); } } - privateTemplate = - new VMTemplateVO(nextTemplateId, uniqueName, name, ImageFormat.RAW, isPublic, featured, isExtractable, TemplateType.USER, null, null, requiresHvmValue, - bitsValue, templateOwner.getId(), null, description, passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails()); - privateTemplate.setDynamicallyScalable(isDynamicScalingEnabled); + privateTemplate = new VMTemplateVO(nextTemplateId, name, ImageFormat.RAW, isPublic, featured, isExtractable, + TemplateType.USER, null, requiresHvmValue, bitsValue, templateOwner.getId(), null, description, + passwordEnabledValue, guestOS.getId(), true, hyperType, templateTag, cmd.getDetails(), false, isDynamicScalingEnabled); if (sourceTemplateId != null) { if (s_logger.isDebugEnabled()) { From dd4f6bcaf3a380e52c987e4a400fce09fb180006 Mon Sep 17 00:00:00 2001 From: punith-cloudbyte Date: Wed, 17 Sep 2014 17:53:47 +0530 Subject: [PATCH 007/528] IOPS null issue CLOUDSTACK-7570 Signed-off-by: Mike Tutkowski --- engine/schema/src/com/cloud/service/ServiceOfferingVO.java | 4 +++- engine/schema/src/com/cloud/storage/DiskOfferingVO.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java index df68fb8ed049..805765b1e7fb 100755 --- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java +++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java @@ -177,7 +177,9 @@ public ServiceOfferingVO(ServiceOfferingVO offering) { offering.getSystemUse(), true, offering.isCustomizedIops()== null ? false:offering.isCustomizedIops(), - offering.getDomainId()); + offering.getDomainId(), + offering.getMinIops(), + offering.getMaxIops()); cpu = offering.getCpu(); ramSize = offering.getRamSize(); speed = offering.getSpeed(); diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java index 152fa2c797c3..74f65ab94e55 100755 --- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java +++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java @@ -214,7 +214,7 @@ public DiskOfferingVO(String name, String displayText, Storage.ProvisioningType } public DiskOfferingVO(long id, String name, String displayText, Storage.ProvisioningType provisioningType, boolean mirrored, String tags, boolean recreatable, - boolean useLocalStorage, boolean systemUse, boolean customized, boolean customizedIops, Long domainId) { + boolean useLocalStorage, boolean systemUse, boolean customized, boolean customizedIops, Long domainId, Long minIops, Long maxIops) { this.id = id; type = Type.Service; this.name = name; @@ -229,6 +229,8 @@ public DiskOfferingVO(long id, String name, String displayText, Storage.Provisio this.domainId = domainId; uuid = UUID.randomUUID().toString(); state = State.Active; + this.minIops = minIops; + this.maxIops = maxIops; } @Override From 7cdb67dcf1ec4158ec0ab4c2fa868cc63121bbb5 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Fri, 19 Sep 2014 15:12:09 -0700 Subject: [PATCH 008/528] CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state after management server restarts. --- .../jobs/impl/AsyncJobManagerImpl.java | 57 ++++++------------- .../framework/jobs/impl/SyncQueueManager.java | 2 + .../jobs/impl/SyncQueueManagerImpl.java | 13 ++++- 3 files changed, 32 insertions(+), 40 deletions(-) diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java index 7d374da31425..4c4d3c21f726 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java @@ -835,24 +835,6 @@ private long getMsid() { return ManagementServerNode.getManagementServerId(); } - private void cleanupPendingJobs(List l) { - for (SyncQueueItemVO item : l) { - if (s_logger.isInfoEnabled()) { - s_logger.info("Discard left-over queue item: " + item.toString()); - } - - String contentType = item.getContentType(); - if (contentType != null && contentType.equalsIgnoreCase(SyncQueueItem.AsyncJobContentType)) { - Long jobId = item.getContentId(); - if (jobId != null) { - s_logger.warn("Mark job as failed as its correspoding queue-item has been discarded. job id: " + jobId); - completeAsyncJob(jobId, JobInfo.Status.FAILED, 0, "Execution was cancelled because of server shutdown"); - } - } - _queueMgr.purgeItem(item.getId()); - } - } - @DB protected List wakeupByJoinedJobCompletion(long joinedJobId) { SearchCriteria joinJobSC = JoinJobSearch.create("joinJobId", joinedJobId); @@ -967,6 +949,22 @@ public boolean configure(String name, Map params) throws Configu return true; } + private void cleanupLeftOverJobs(final long msid) { + try { + Transaction.execute(new TransactionCallbackNoReturn() { + @Override + public void doInTransactionWithoutResult(TransactionStatus status) { + // purge sync queue item running on this ms node + _queueMgr.cleanupActiveQueueItems(msid, true); + // reset job status for all jobs running on this ms node + _jobDao.resetJobProcess(msid, ApiErrorCode.INTERNAL_ERROR.getHttpCode(), "job cancelled because of management server restart or shutdown"); + } + }); + } catch (Throwable e) { + s_logger.warn("Unexpected exception in cleaning up left over jobs for mamagement server node " + msid, e); + } + } + @Override public void onManagementNodeJoined(List nodeList, long selfNodeId) { } @@ -974,18 +972,7 @@ public void onManagementNodeJoined(List nodeList @Override public void onManagementNodeLeft(List nodeList, long selfNodeId) { for (final ManagementServerHost msHost : nodeList) { - try { - Transaction.execute(new TransactionCallbackNoReturn() { - @Override - public void doInTransactionWithoutResult(TransactionStatus status) { - List items = _queueMgr.getActiveQueueItems(msHost.getId(), true); - cleanupPendingJobs(items); - _jobDao.resetJobProcess(msHost.getId(), ApiErrorCode.INTERNAL_ERROR.getHttpCode(), "job cancelled because of management server restart"); - } - }); - } catch (Throwable e) { - s_logger.warn("Unexpected exception ", e); - } + cleanupLeftOverJobs(msHost.getId()); } } @@ -995,15 +982,7 @@ public void onManagementNodeIsolated() { @Override public boolean start() { - try { - _jobDao.cleanupPseduoJobs(getMsid()); - - List l = _queueMgr.getActiveQueueItems(getMsid(), false); - cleanupPendingJobs(l); - _jobDao.resetJobProcess(getMsid(), ApiErrorCode.INTERNAL_ERROR.getHttpCode(), "job cancelled because of management server restart"); - } catch (Throwable e) { - s_logger.error("Unexpected exception " + e.getMessage(), e); - } + cleanupLeftOverJobs(getMsid()); _heartbeatScheduler.scheduleAtFixedRate(getHeartbeatTask(), HEARTBEAT_INTERVAL, HEARTBEAT_INTERVAL, TimeUnit.MILLISECONDS); _heartbeatScheduler.scheduleAtFixedRate(getGCTask(), GC_INTERVAL, GC_INTERVAL, TimeUnit.MILLISECONDS); diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java index b521ffe5df18..32d84647a2d4 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java @@ -36,4 +36,6 @@ public interface SyncQueueManager extends Manager { public List getBlockedQueueItems(long thresholdMs, boolean exclusive); void purgeAsyncJobQueueItemId(long asyncJobId); + + public void cleanupActiveQueueItems(Long msid, boolean exclusive); } diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java index 5160e05db77e..1cfec4dba414 100644 --- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java +++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java @@ -26,7 +26,6 @@ import org.apache.cloudstack.framework.jobs.dao.SyncQueueDao; import org.apache.cloudstack.framework.jobs.dao.SyncQueueItemDao; - import com.cloud.utils.DateUtil; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; @@ -260,4 +259,16 @@ public void purgeAsyncJobQueueItemId(long asyncJobId) { purgeItem(itemId); } } + + @Override + public void cleanupActiveQueueItems(Long msid, boolean exclusive) { + List l = getActiveQueueItems(msid, false); + for (SyncQueueItemVO item : l) { + if (s_logger.isInfoEnabled()) { + s_logger.info("Discard left-over queue item: " + item.toString()); + } + purgeItem(item.getId()); + } + } + } From 5350e61187d5b2f9fdc997dcc9fea34ff68148f7 Mon Sep 17 00:00:00 2001 From: Devdeep Singh Date: Fri, 19 Sep 2014 16:56:05 +0530 Subject: [PATCH 009/528] CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier commit as part of cleaning up vmsync changes, checkvirtualmachine command was updated to return the power state of the vm. The change was missed for Hyper-V. This caused migration to fail on cloudstack even though it used to succeed on the hypervisor. Updated the hyper-v agent code to return the cloudstack equivalent power state for check virtual machine answer. --- .../HypervResource/HypervResourceController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs index 6c6ec56f4242..76f56d9b644e 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs @@ -873,7 +873,7 @@ public JContainer CheckVirtualMachineCommand([FromBody]dynamic cmd) string details = null; bool result = false; string vmName = cmd.vmName; - string state = null; + string powerState = null; // TODO: Look up the VM, convert Hyper-V state to CloudStack version. var sys = wmiCallsV2.GetComputerSystem(vmName); @@ -884,7 +884,7 @@ public JContainer CheckVirtualMachineCommand([FromBody]dynamic cmd) } else { - state = EnabledState.ToCloudStackState(sys.EnabledState); // TODO: V2 changes? + powerState = EnabledState.ToCloudStackPowerState(sys.EnabledState); result = true; } @@ -892,7 +892,7 @@ public JContainer CheckVirtualMachineCommand([FromBody]dynamic cmd) { result = result, details = details, - state = state, + powerstate = powerState, contextMap = contextMap }; return ReturnCloudStackTypedJArray(ansContent, CloudStackTypes.CheckVirtualMachineAnswer); From fe2e9a1c5dbab2de09e11854f73060341294deff Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Sun, 21 Sep 2014 14:40:09 -0400 Subject: [PATCH 010/528] CLOUDSTACK-401: add missing file format in docs.js --- ui/scripts/docs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js index 8ef9f24cf1ec..2712f8596642 100755 --- a/ui/scripts/docs.js +++ b/ui/scripts/docs.js @@ -658,7 +658,7 @@ cloudStack.docs = { externalLink: '' }, helpPrimaryStorageProtocol: { - desc: 'For XenServer, choose NFS, iSCSI, or PreSetup. For KVM, choose NFS or SharedMountPoint. For vSphere, choose VMFS (iSCSI or FiberChannel) or NFS. For Hyper-V, choose SMB/CIFS', + desc: 'For XenServer, choose NFS, iSCSI, or PreSetup. For KVM, choose NFS, SharedMountPoint, RDB, CLVM or Gluster. For vSphere, choose VMFS (iSCSI or FiberChannel) or NFS. For Hyper-V, choose SMB/CIFS. For LXC, choose NFS or SharedMountPoint. For OVM, choose NFS or ocfs2.', externalLink: '' }, helpPrimaryStorageServer: { @@ -1232,7 +1232,7 @@ cloudStack.docs = { externalLink: '' }, helpUploadVolumeFormat: { - desc: 'The disk image format of the volume. XenServer is VHD, VMware is OVA, and KVM is QCOW2. Hyper-V is VHD.', + desc: 'The disk image format of the volume. XenServer is VHD, VMware is OVA, and KVM is QCOW2. Hyper-V is VHD or VHDX. OVM is RAW.', externalLink: '' }, helpUploadVolumeURL: { From 29b3df3433e7f420d1939a2f01cc8d5281f34e53 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Sun, 21 Sep 2014 15:56:47 -0400 Subject: [PATCH 011/528] CLOUDSTACK-1632 --- .../user/securitygroup/AuthorizeSecurityGroupEgressCmd.java | 2 +- .../user/securitygroup/AuthorizeSecurityGroupIngressCmd.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java index 9909bf30855c..f7339e997d6b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java @@ -97,7 +97,7 @@ public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd { // This @ACL will not work, since we don't have a way to convert this parameter to the entity like securityGroupId. //@ACL(accessType = AccessType.OperateEntry) - @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupName parameter") + @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupId parameter") private String securityGroupName; ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java index 3549d5139dda..a80738629333 100644 --- a/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupIngressCmd.java @@ -97,7 +97,7 @@ public class AuthorizeSecurityGroupIngressCmd extends BaseAsyncCmd { // This @ACL will not work, since we don't have a way to convert this parameter to the entity like securityGroupId. //@ACL(accessType = AccessType.OperateEntry) - @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupName parameter") + @Parameter(name=ApiConstants.SECURITY_GROUP_NAME, type=CommandType.STRING, description="The name of the security group. Mutually exclusive with securityGroupId parameter") private String securityGroupName; ///////////////////////////////////////////////////// From 8ed2d198bd5c7c573f5dd8bc0336eeb1431ec45a Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Sun, 21 Sep 2014 15:16:31 -0400 Subject: [PATCH 012/528] generateAPI doc: version 4.4.1, year:2014, add back button on main pages --- tools/apidoc/generateadmincommands.xsl | 4 ++-- tools/apidoc/generatecommand.xsl | 2 +- tools/apidoc/generatedomainadmincommands.xsl | 4 ++-- tools/apidoc/generatetoc.xsl | 2 +- tools/apidoc/generatetoc_footer.xsl | 2 +- tools/apidoc/generatetoc_header.xsl | 5 +++-- tools/apidoc/generateusercommands.xsl | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl index 9abec10a4fb2..21ebc12a2d40 100644 --- a/tools/apidoc/generateadmincommands.xsl +++ b/tools/apidoc/generateadmincommands.xsl @@ -57,7 +57,7 @@ version="1.0"> - Apache CloudStack v4.2.0 Root Admin API Reference + Apache CloudStack v4.4.1 Root Admin API Reference

@@ -150,7 +150,7 @@ version="1.0"> diff --git a/tools/apidoc/generatecommand.xsl b/tools/apidoc/generatecommand.xsl index 965a3a334d1c..c3a50092d2d3 100644 --- a/tools/apidoc/generatecommand.xsl +++ b/tools/apidoc/generatecommand.xsl @@ -179,7 +179,7 @@ version="1.0">
  • Contacts
    • -

    Copyright © 2013 The Apache Software Foundation, Licensed under the +

    Copyright © 2014 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.

    diff --git a/tools/apidoc/generatedomainadmincommands.xsl b/tools/apidoc/generatedomainadmincommands.xsl index 7238f05369f5..68c663e70014 100644 --- a/tools/apidoc/generatedomainadmincommands.xsl +++ b/tools/apidoc/generatedomainadmincommands.xsl @@ -60,7 +60,7 @@ version="1.0"> - Apache CloudStack v4.2.0 Domain Admin API Reference + Apache CloudStack v4.4.1 Domain Admin API Reference

    @@ -144,7 +144,7 @@ version="1.0">