Skip to content

Commit 7877f3f

Browse files
author
Sangeetha Hariharan
committed
CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl related test cases.
1 parent dbb70fa commit 7877f3f

File tree

7 files changed

+407
-407
lines changed

7 files changed

+407
-407
lines changed

‎test/integration/component/test_acl_isolatednetwork.py‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def tearDown(cls):
357357

358358
## Test cases relating to createNetwork as admin user
359359

360-
@attr(tags=[ "advanced"],required_hardware="false")
360+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
361361
def test_01_createNetwork_admin(self):
362362

363363
"""
@@ -380,7 +380,7 @@ def test_01_createNetwork_admin(self):
380380
"Admin User is not able to create a network for himself")
381381

382382

383-
@attr(tags=[ "advanced"],required_hardware="false")
383+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
384384
def test_02_createNetwork_admin_foruserinsamedomain(self):
385385

386386
"""
@@ -404,7 +404,7 @@ def test_02_createNetwork_admin_foruserinsamedomain(self):
404404
True,
405405
"Admin User is not able to create a network for other users in his domain")
406406

407-
@attr(tags=[ "advanced"],required_hardware="false")
407+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
408408
def test_03_createNetwork_admin_foruserinotherdomain(self):
409409

410410
"""
@@ -430,7 +430,7 @@ def test_03_createNetwork_admin_foruserinotherdomain(self):
430430

431431
## Test cases relating to createNetwork as domain admin user
432432

433-
@attr(tags=[ "advanced"],required_hardware="false")
433+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
434434
def test_04_createNetwork_domaindmin(self):
435435

436436
"""
@@ -453,7 +453,7 @@ def test_04_createNetwork_domaindmin(self):
453453
"Domain admin User is not able to create a network for himself")
454454

455455

456-
@attr(tags=[ "advanced"],required_hardware="false")
456+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
457457
def test_05_createNetwork_domaindmin_foruserinsamedomain(self):
458458

459459
"""
@@ -477,7 +477,7 @@ def test_05_createNetwork_domaindmin_foruserinsamedomain(self):
477477
True,
478478
"Domain admin User is not able to create a network for other users in his domain")
479479

480-
@attr(tags=[ "advanced"],required_hardware="false")
480+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
481481
def test_06_createNetwork_domaindmin_foruserinsubdomain(self):
482482

483483
"""
@@ -501,7 +501,7 @@ def test_06_createNetwork_domaindmin_foruserinsubdomain(self):
501501
True,
502502
"Domain admin User is not able to create a network for other users in his sub domain")
503503

504-
@attr(tags=[ "advanced"],required_hardware="false")
504+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
505505
def test_07_createNetwork_domaindmin_forcrossdomainuser(self):
506506

507507
"""
@@ -528,7 +528,7 @@ def test_07_createNetwork_domaindmin_forcrossdomainuser(self):
528528

529529
## Test cases relating to createNetwork as regular user
530530

531-
@attr(tags=[ "advanced"],required_hardware="false")
531+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
532532
def test_08_createNetwork_user(self):
533533

534534
"""
@@ -551,7 +551,7 @@ def test_08_createNetwork_user(self):
551551
"User is not able to create a network for himself")
552552

553553

554-
@attr(tags=[ "advanced"],required_hardware="false")
554+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
555555
def test_09_createNetwork_user_foruserinsamedomain(self):
556556

557557
"""
@@ -577,7 +577,7 @@ def test_09_createNetwork_user_foruserinsamedomain(self):
577577
if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.UNABLE_TO_LIST_NETWORK_ACCOUNT):
578578
self.fail("Error message validation failed when when User tries to create network for other users in his domain ")
579579

580-
@attr(tags=[ "advanced"],required_hardware="false")
580+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
581581
def test_10_createNetwork_user_foruserinotherdomain(self):
582582

583583
"""
@@ -606,7 +606,7 @@ def test_10_createNetwork_user_foruserinotherdomain(self):
606606

607607
## Test cases relating to Deploying VM in a network as admin user
608608

609-
@attr(tags=[ "advanced"],required_hardware="false")
609+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
610610
def test_11_deployvm_admin(self):
611611

612612
"""
@@ -630,7 +630,7 @@ def test_11_deployvm_admin(self):
630630
"Admin User is not able to deploy VM in his own network")
631631

632632

633-
@attr(tags=[ "advanced"],required_hardware="false")
633+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
634634
def test_12_deployvm_admin_foruserinsamedomain(self):
635635

636636
"""
@@ -655,7 +655,7 @@ def test_12_deployvm_admin_foruserinsamedomain(self):
655655
True,
656656
"Admin User is not able to deploy VM for users in his domain")
657657

658-
@attr(tags=[ "advanced"],required_hardware="false")
658+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
659659
def test_13_deployvm_admin_foruserinotherdomain(self):
660660

661661
"""
@@ -680,7 +680,7 @@ def test_13_deployvm_admin_foruserinotherdomain(self):
680680
True,
681681
"Admin User is not able to deploy VM for users users in other domain")
682682

683-
@attr(tags=[ "advanced"],required_hardware="false")
683+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
684684
def test_13_1_deployvm_admin_foruserinotherdomain_crossnetwork(self):
685685

686686
"""
@@ -708,7 +708,7 @@ def test_13_1_deployvm_admin_foruserinotherdomain_crossnetwork(self):
708708

709709
## Test cases relating to deploying VM as domain admin user
710710

711-
@attr(tags=[ "advanced"],required_hardware="false")
711+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
712712
def test_14_deployvm_domaindmin(self):
713713

714714
"""
@@ -732,7 +732,7 @@ def test_14_deployvm_domaindmin(self):
732732
"Domain admin User is not able to deploy VM for himself")
733733

734734

735-
@attr(tags=[ "advanced"],required_hardware="false")
735+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
736736
def test_15_deployvm_domaindmin_foruserinsamedomain(self):
737737

738738
"""
@@ -756,7 +756,7 @@ def test_15_deployvm_domaindmin_foruserinsamedomain(self):
756756
True,
757757
"Domain admin User is not able to deploy VM for other users in his domain")
758758

759-
@attr(tags=[ "advanced"],required_hardware="false")
759+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
760760
def test_16_deployvm_domaindmin_foruserinsubdomain(self):
761761

762762
"""
@@ -780,7 +780,7 @@ def test_16_deployvm_domaindmin_foruserinsubdomain(self):
780780
True,
781781
"Domain admin User is not able to deploy vm for himself")
782782

783-
@attr(tags=[ "advanced"],required_hardware="false")
783+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
784784
def test_17_deployvm_domaindmin_forcrossdomainuser(self):
785785

786786
"""
@@ -807,7 +807,7 @@ def test_17_deployvm_domaindmin_forcrossdomainuser(self):
807807
if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN):
808808
self.fail("Error message validation failed when Domain admin tries to deploy vm for users not in hos domain ")
809809

810-
@attr(tags=[ "advanced"],required_hardware="false")
810+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
811811
def test_17_1_deployvm_domainadmin_foruserinotherdomain_crossnetwork(self):
812812

813813
"""
@@ -835,7 +835,7 @@ def test_17_1_deployvm_domainadmin_foruserinotherdomain_crossnetwork(self):
835835

836836
## Test cases relating to deploying VM as regular user
837837

838-
@attr(tags=[ "advanced"],required_hardware="false")
838+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
839839
def test_18_deployvm_user(self):
840840

841841
"""
@@ -858,7 +858,7 @@ def test_18_deployvm_user(self):
858858
"User is not able to deploy vm for himself")
859859

860860

861-
@attr(tags=[ "advanced"],required_hardware="false")
861+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
862862
def test_19_deployvm_user_foruserinsamedomain(self):
863863

864864
"""
@@ -885,7 +885,7 @@ def test_19_deployvm_user_foruserinsamedomain(self):
885885
if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
886886
self.fail("Error message validation failed when Regular user tries to deploy vm for other users in his domain ")
887887

888-
@attr(tags=[ "advanced"],required_hardware="false")
888+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
889889
def test_20_deployvm_user_foruserincrossdomain(self):
890890

891891
"""
@@ -912,7 +912,7 @@ def test_20_deployvm_user_foruserincrossdomain(self):
912912
if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
913913
self.fail("Error message validation failed when Regular user tries to deploy vm for users not in his domain ")
914914

915-
@attr(tags=[ "advanced"],required_hardware="false")
915+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
916916
def test_20_1_deployvm_user_incrossnetwork(self):
917917

918918
"""
@@ -938,7 +938,7 @@ def test_20_1_deployvm_user_incrossnetwork(self):
938938

939939
## Test cases relating to restart Network as admin user
940940

941-
@attr(tags=[ "advanced"],required_hardware="false")
941+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
942942
def test_21_restartNetwork_admin(self):
943943

944944
"""
@@ -954,7 +954,7 @@ def test_21_restartNetwork_admin(self):
954954
"Admin User is not able to restart network he owns")
955955

956956

957-
@attr(tags=[ "advanced"],required_hardware="false")
957+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
958958
def test_22_restartNetwork_admin_foruserinsamedomain(self):
959959

960960
"""
@@ -969,7 +969,7 @@ def test_22_restartNetwork_admin_foruserinsamedomain(self):
969969
True,
970970
"Admin User is not able to restart network owned by users his domain")
971971

972-
@attr(tags=[ "advanced"],required_hardware="false")
972+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
973973
def test_23_restartNetwork_admin_foruserinotherdomain(self):
974974

975975
"""
@@ -986,7 +986,7 @@ def test_23_restartNetwork_admin_foruserinotherdomain(self):
986986

987987
## Test cases relating to restart Network as domain admin user
988988

989-
@attr(tags=[ "advanced"],required_hardware="false")
989+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
990990
def test_24_restartNetwork_domaindmin(self):
991991

992992
"""
@@ -1002,7 +1002,7 @@ def test_24_restartNetwork_domaindmin(self):
10021002
"Domain admin User is not able to restart network for himself")
10031003

10041004

1005-
@attr(tags=[ "advanced"],required_hardware="false")
1005+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
10061006
def test_25_restartNetwork_domaindmin_foruserinsamedomain(self):
10071007

10081008
"""
@@ -1016,7 +1016,7 @@ def test_25_restartNetwork_domaindmin_foruserinsamedomain(self):
10161016
True,
10171017
"Domain admin User is not able to restart network for other users in his domain")
10181018

1019-
@attr(tags=[ "advanced"],required_hardware="false")
1019+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
10201020
def test_26_restartNetwork_domaindmin_foruserinsubdomain(self):
10211021

10221022
"""
@@ -1030,7 +1030,7 @@ def test_26_restartNetwork_domaindmin_foruserinsubdomain(self):
10301030
True,
10311031
"Domain admin User is not able to restart network he owns")
10321032

1033-
@attr(tags=[ "advanced"],required_hardware="false")
1033+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
10341034
def test_27_restartNetwork_domaindmin_forcrossdomainuser(self):
10351035

10361036
"""
@@ -1049,7 +1049,7 @@ def test_27_restartNetwork_domaindmin_forcrossdomainuser(self):
10491049

10501050
## Test cases relating restart network as regular user
10511051

1052-
@attr(tags=[ "advanced"],required_hardware="false")
1052+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
10531053
def test_28_restartNetwork_user(self):
10541054

10551055
"""
@@ -1064,7 +1064,7 @@ def test_28_restartNetwork_user(self):
10641064
"User is not able to restart network he owns")
10651065

10661066

1067-
@attr(tags=[ "advanced"],required_hardware="false")
1067+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
10681068
def test_29_restartNetwork_user_foruserinsamedomain(self):
10691069

10701070
"""
@@ -1081,7 +1081,7 @@ def test_29_restartNetwork_user_foruserinsamedomain(self):
10811081
if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
10821082
self.fail("Error message validation failed when Regular user tries to restart network for users in his domain ")
10831083

1084-
@attr(tags=[ "advanced"],required_hardware="false")
1084+
@attr("simulator_only",tags=[ "advanced"],required_hardware="false")
10851085
def test_30_restartNetwork_user_foruserinotherdomain(self):
10861086

10871087
"""

‎test/integration/component/test_acl_isolatednetwork_delete.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def tearDown(cls):
343343

344344
## Test cases relating to delete Network as admin user
345345

346-
@attr(tags=["advanced"],required_hardware="false")
346+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
347347
def test_deleteNetwork_admin(self):
348348
"""
349349
Validate that Admin should be able to delete network he owns
@@ -359,7 +359,7 @@ def test_deleteNetwork_admin(self):
359359
"Admin User is not able to restart network he owns")
360360

361361

362-
@attr(tags=["advanced"],required_hardware="false")
362+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
363363
def test_deleteNetwork_admin_foruserinsamedomain(self):
364364

365365
"""
@@ -375,7 +375,7 @@ def test_deleteNetwork_admin_foruserinsamedomain(self):
375375
None,
376376
"Admin User is not able to delete network owned by users his domain")
377377

378-
@attr(tags=["advanced"],required_hardware="false")
378+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
379379
def test_deleteNetwork_admin_foruserinotherdomain(self):
380380

381381
# 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):
391391

392392
## Test cases relating to delete Network as domain admin user
393393

394-
@attr(tags=["advanced"],required_hardware="false")
394+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
395395
def test_deleteNetwork_domaindmin(self):
396396
"""
397397
Validate that Domain admin should be able to delete network for himslef
@@ -407,7 +407,7 @@ def test_deleteNetwork_domaindmin(self):
407407
"Domain admin User is not able to delete a network he owns")
408408

409409

410-
@attr(tags=["advanced"],required_hardware="false")
410+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
411411
def test_deleteNetwork_domaindmin_foruserinsamedomain(self):
412412

413413
"""
@@ -422,7 +422,7 @@ def test_deleteNetwork_domaindmin_foruserinsamedomain(self):
422422
None,
423423
"Domain admin User is not able to delete a network that is owned by user in the same domain")
424424

425-
@attr(tags=["advanced"],required_hardware="false")
425+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
426426
def test_deleteNetwork_domaindmin_foruserinsubdomain(self):
427427

428428
"""
@@ -438,7 +438,7 @@ def test_deleteNetwork_domaindmin_foruserinsubdomain(self):
438438
None,
439439
"Domain admin User is not able to delete a network that is owned by user in the subdomain")
440440

441-
@attr(tags=["advanced"],required_hardware="false")
441+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
442442
def test_deleteNetwork_domaindmin_forcrossdomainuser(self):
443443

444444
"""
@@ -458,7 +458,7 @@ def test_deleteNetwork_domaindmin_forcrossdomainuser(self):
458458

459459
## Test cases relating deleting network as regular user
460460

461-
@attr(tags=["advanced"],required_hardware="false")
461+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
462462
def test_deleteNetwork_user(self):
463463

464464
"""
@@ -475,7 +475,7 @@ def test_deleteNetwork_user(self):
475475
"User is not able to delete a network he owns")
476476

477477

478-
@attr(tags=["advanced"],required_hardware="false")
478+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
479479
def test_deleteNetwork_user_foruserinsamedomain(self):
480480

481481
"""
@@ -492,7 +492,7 @@ def test_deleteNetwork_user_foruserinsamedomain(self):
492492
if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
493493
self.fail("Regular user is allowed to delete network for users in his domain ")
494494

495-
@attr(tags=["advanced"],required_hardware="false")
495+
@attr("simulator_only",tags=["advanced"],required_hardware="false")
496496
def test_deleteNetwork_user_foruserinotherdomain(self):
497497

498498
"""

0 commit comments

Comments
 (0)