Fix issues with security tests

Updated tests with right audit records
Remove test cases that have defects in mad-hatter

Change-Id: I8e2811f724cb2413f8f10fd88b2a7ff352f148b7
Reviewed-on: http://review.couchbase.org/118942
Reviewed-by: Balakumaran G <balakumaran.gopal@couchbase.com>
Tested-by: Balakumaran G <balakumaran.gopal@couchbase.com>

Author: ritamcouchbase

conf/failover/py-newfailover.conf

@@ -21,7 +21,7 @@ failover.failovertests.FailoverTests:
     test_failover_normal,replicas=1,num_failed_nodes=1,items=200000,vbuckets=1024,total_vbuckets=1024,stopGracefulFailover=True,graceful=True,GROUP=P0;GRACEFUL
     #test_failover_then_add_back,replicas=2,num_failed_nodes=1,items=100000,standard_buckets=1,recoveryType=full,deltaRecoveryBuckets=default,graceful=True,GROUP=P1;GRACEFUL
     #test_failover_then_add_back,replicas=2,num_failed_nodes=2,items=100000,standard_buckets=1,recoveryType=delta:full,graceful=True,GROUP=P2;GRACEFUL
-    test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=full,graceful=True,GROUP=P0;GRACEFUL
+    #test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=full,graceful=True,GROUP=P0;GRACEFUL
     test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=delta,graceful=True,GROUP=P0;GRACEFUL
     test_failover_then_add_back,replicas=1,num_failed_nodes=1,items=100000,numViews=5,compact=True,withViewsOps=True,createIndexesDuringFailover=True,sasl_buckets=1,upr_check=False,recoveryType=delta,graceful=True,GROUP=P1;GRACEFUL
     test_failover_stop_server,replicas=1,graceful=False,num_failed_nodes=1,load_ratio=10,GROUP=P1
@@ -30,4 +30,4 @@ failover.failovertests.FailoverTests:
     test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,load_ratio=1,failoverMaster=True,GROUP=P1
     test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,load_ratio=1,GROUP=P1
     test_failover_stop_server,replicas=2,graceful=False,num_failed_nodes=2,items=20000,GROUP=P0
-    test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,items=100000,compact=True,load_ratio=1,GROUP=P1
+    test_failover_stop_server,replicas=3,graceful=False,num_failed_nodes=3,items=100000,compact=True,load_ratio=1,GROUP=P2

conf/py-epeng-basic-ops.conf

@@ -11,4 +11,4 @@ epengine.basic_ops.basic_ops:
     test_diag_eval_curl,disable_diag_eval_non_local=True
     test_diag_eval_curl,disable_diag_eval_non_local=False
     test_compression_active_and_off,items=10000,compression_mode=active
-    do_get_random_key
+    #do_get_random_key - Existing bug

conf/security/py-rbac-extended.conf

@@ -5,7 +5,6 @@ security.rbacTest.rbacTest:
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default],role_map=bucket_view_admin
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin,role_map=admin
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin:bucket_admin[default],role_map=admin
-    test_role_permission_validate_multiple,user_id=ritam:password,user_role=cluster_admin:bucket_admin[default]:views_admin[default]:replication_admin,role_map=cluster_view_admin
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default]:replication_admin,role_map=bucket_view_replication_admin
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=ro_admin:replication_admin,role_map=replication_admin_no_access
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=replication_admin:views_admin[default],role_map=view_replication_admin

conf/security/py-rbac.conf

@@ -26,7 +26,7 @@ security.rbacTest.rbacTest:
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin,role_map=admin,GROUP=P0;INTUSER
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=admin:cluster_admin:bucket_admin[default],role_map=admin,GROUP=P0;INTUSER
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=cluster_admin:bucket_admin[default]:views_admin[default]:replication_admin,role_map=cluster_view_admin,GROUP=P1;INTUSER
-    test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default]:replication_admin,role_map=bucket_view_replication_admin,GROUP=P0;INTUSER
+    test_role_permission_validate_multiple,user_id=ritam:password,user_role=bucket_admin[default]:views_admin[default]:replication_admin,role_map=bucket_view_replication_admin,GROUP=P1;INTUSER
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=ro_admin:replication_admin,role_map=replication_admin_no_access,GROUP=P0;INTUSER
     test_role_permission_validate_multiple,user_id=ritam:password,user_role=replication_admin:views_admin[default],role_map=view_replication_admin,GROUP=P0;INTUSER
 
@@ -48,7 +48,7 @@ security.rbacTest.rbacTest:
 
 
     test_add_remove_users,user_id=ritam:password?dave:password,user_role=admin:ro_admin,role_map=admin,GROUP=P0;INTUSER
-    test_add_remove_user_check_permission,user_id=ritam:password?dave:password,user_role=admin:ro_admin,role_map=admin,GROUP=P0;INTUSER
+    test_add_remove_user_check_permission,user_id=ritam:password?dave:password,user_role=admin:ro_admin,role_map=admin,GROUP=P1;INTUSER
     test_add_remove_users,user_id=ritam:password?dave:password,user_role=bucket_admin[default],role_map=bucket_admin,GROUP=P0;INTUSER
     test_add_remove_user_check_permission,user_id=ritam:password?dave:password,user_role=bucket_admin[default],role_map=bucket_admin,GROUP=P1;INTUSER
     test_add_remove_some_user_check_permission,user_id=ritam:password?dave:password,user_role=bucket_admin[default],role_map=bucket_admin,GROUP=P1;INTUSER

conf/tunable-mem/py-newrebalance-in-out.conf

@@ -6,7 +6,7 @@ rebalance.rebalanceinout.RebalanceInOutTests:
     test_incremental_rebalance_out_in_with_mutation,,replicas=2,value_size=2048,GROUP=IN_OUT;P1
     test_incremental_rebalance_out_in_with_mutation,,init_num_nodes=3,items=0,GROUP=IN_OUT;P0
     test_incremental_rebalance_out_in_with_mutation,,replicas=3,init_num_nodes=3,GROUP=IN_OUT;P2
-    test_rebalance_in_out_at_once_persistence_stopped,items=100000,num_nodes_with_stopped_persistence=1,num_items_without_persistence=1000,nodes_out=0,GROUP=IN_OUT;P0;FROM_2_0
+    #test_rebalance_in_out_at_once_persistence_stopped,items=100000,num_nodes_with_stopped_persistence=1,num_items_without_persistence=1000,nodes_out=0,GROUP=IN_OUT;P0;FROM_2_0
 #MB-7386   test_rebalance_in_out_at_once_persistence_stopped,items=1000,num_nodes_with_stopped_persistence=3,num_items_without_persistence=1000,sasl_buckets=1,standard_buckets=1,nodes_init=3,nodes_in=2,nodes_out=1,GROUP=IN_OUT;P1;FROM_2_0
 #MB-7386   test_rebalance_in_out_at_once_persistence_stopped,items=0,num_nodes_with_stopped_persistence=4,num_items_without_persistence=1000,sasl_buckets=1,standard_buckets=1,nodes_init=3,nodes_in=1,nodes_out=2,GROUP=IN_OUT;P2;FROM_2_0
     test_rebalance_in_out_at_once,default_bucket=True,standard_buckets=1,sasl_buckets=1,replicas=1,nodes_init=3,nodes_in=1,nodes_out=1,items=700000,max_verify=50000,GROUP=IN_OUT;P0;PERFORMANCE

pytests/security/rbacTest.py

@@ -62,7 +62,8 @@ def setUp(self):
                 RbacBase().create_user_source(testuser, 'builtin', self.master)
                 self.sleep(10)
         self.ldap_server = ServerInfo(self.ldapHost, self.ldapPort, 'root', 'couchbase')
-        self.ipAddress = self.getLocalIPAddress()
+        #self.ipAddress = self.getLocalIPAddress()
+        self.ipAddress = '127.0.0.1'
 
 
     def tearDown(self):
@@ -358,15 +359,15 @@ def test_role_assignment_audit(self):
             source = 'local'
         else:
             source = 'external'
-        expectedResults = {"full_name":"'RitamSharma'","roles":["admin"],"identity:source":source,"identity:user":userid[0],
-                           "real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],
-                            "ip":self.ipAddress, "port":123456}
+        expectedResults = {"roles":["admin"],"identity:source":source,"identity:user":userid[0],
+                           "real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],"reason":"updated",
+                            "ip":self.ipAddress, "port":123456,"full_name":"'RitamSharma'"}
         if ops == 'edit':
             payload = "name=" + user_name + "&roles=" + 'admin,cluster_admin'
             status, content, header =  rbacmain(self.master, self.auth_type)._set_user_roles(user_name=userid[0],payload=payload)
-            expectedResults = {"full_name":"'RitamSharma'","roles":["admin","cluster_admin"],"identity:source":source,"identity:user":userid[0],
-                           "real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],
-                            "ip":self.ipAddress, "port":123456}
+            expectedResults = {"roles":["admin","cluster_admin"],"identity:source":source,"identity:user":userid[0],
+                           "real_userid:source":"ns_server","real_userid:user":"Administrator","groups": [],"reason":"updated",
+                            "ip":self.ipAddress, "port":123456,"full_name":"'RitamSharma'"}
         elif ops == 'remove':
             status, content, header = rbacmain(self.master,self.auth_type)._delete_user(userid[0])
             expectedResults = {"identity:source":source,"identity:user":userid[0],