Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12539-12540,12544,12555,12580,12583,12599,12609,12611,12615,12645,12653,12663,12744,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12555,12580,12583,12599,12609,12611,12615,12645,12653,12663,12744,13126-13127,13211
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/BRAN-4.3:12423-12426
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-core/bin/db_opsview 2013-08-15 14:35:56 UTC (rev 13244)
@@ -1234,6 +1234,7 @@
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130219hsteh', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130424alerts', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130521notmeth', 'install', NOW());
+ INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130612accesses', 'install', NOW());
INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130814surv', 'install', NOW());
EOF
@@ -1244,10 +1245,10 @@
# Configuration items should be held in a separate import db
populate_db() {
eval mysql $user_parms $db <<-EOF || die "Cannot populate"
- # These are all the access points available in Opsview. More to come
- # These are fixed access too, so these are the only ones available
- # Not in initial_opsview.sql because this is a code specification
- # Case-sensitive
+ # These are all the access points available in Opsview. More to come.
+ # These are fixed access too, so these are the only ones available.
+ # Not in initial_opsview.sql because this is a code specification.
+ # Case-sensitive.
INSERT INTO access (id, name) VALUES (1, "VIEWALL");
INSERT INTO access (id, name) VALUES (2, "VIEWSOME");
INSERT INTO access (id, name) VALUES (3, "ACTIONALL");
@@ -1270,6 +1271,9 @@
INSERT INTO access (id, name) VALUES (21, "TESTALL");
INSERT INTO access (id, name) VALUES (22, "TESTSOME");
INSERT INTO access (id, name) VALUES (23, "CONFIGUREPROFILES");
+ INSERT INTO access (id, name) VALUES (27, "CONFIGUREROLES");
+ INSERT INTO access (id, name) VALUES (28, "CONFIGURECONTACTS");
+ INSERT INTO access (id, name) VALUES (29, "CONFIGUREHOSTGROUPS");
# Role information is in initial_opsview.sql
Property changes on: trunk/opsview-core/bin/nagconfgen.pl
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0/opsview-core/bin/nagconfgen.pl:6365-6370
/branches/DEV-extra-notification-data/opsview-core/bin/nagconfgen.pl:6734-6746
/branches/DEV-odw-calculations/opsview-core/bin/nagconfgen.pl:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/bin/nagconfgen.pl:9778
/branches/DEV-snmp-multi/opsview-core/bin/nagconfgen.pl:7324-7376
/branches/US187/opsview-core/bin/nagconfgen.pl:9403-9479
/branches/US198b/opsview-core/bin/nagconfgen.pl:8875-8994
/branches/US310/opsview-core/bin/nagconfgen.pl:9851-9873
/branches/US539/opsview-core/bin/nagconfgen.pl:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/bin/nagconfgen.pl:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/bin/nagconfgen.pl:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12539-12540,12544,12555,12580,12583,12599,12609,12611,12615,12645,12653,12663,12744
/branches/enterprise/DEV-professional/opsview-core/bin-protected/nagconfgen.pl:13211
/branches/nagvis-iframe/opsview-core/bin/nagconfgen.pl:9764-9786
/branches/opsview2runtime/opsview-core/bin/nagconfgen.pl:10960-11258
/branches/opsview2runtime_xs/opsview-core/bin/nagconfgen.pl:11279-11303
/branches/us168/opsview-core/bin/nagconfgen.pl:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2/opsview-core/bin/nagconfgen.pl:10944,11017
/commercial/branches/BRAN-4.3/opsview-core/bin/nagconfgen.pl:12423-12426
/commercial/branches/US306-slaves/opsview-core/bin/nagconfgen.pl:9804-9823
/commercial/branches/US307-network-map/opsview-core/bin/nagconfgen.pl:9685-9837
+ /branches/DEV-capside/release-3.9.0/opsview-core/bin/nagconfgen.pl:6365-6370
/branches/DEV-extra-notification-data/opsview-core/bin/nagconfgen.pl:6734-6746
/branches/DEV-odw-calculations/opsview-core/bin/nagconfgen.pl:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/bin/nagconfgen.pl:9778
/branches/DEV-snmp-multi/opsview-core/bin/nagconfgen.pl:7324-7376
/branches/US187/opsview-core/bin/nagconfgen.pl:9403-9479
/branches/US198b/opsview-core/bin/nagconfgen.pl:8875-8994
/branches/US310/opsview-core/bin/nagconfgen.pl:9851-9873
/branches/US539/opsview-core/bin/nagconfgen.pl:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/bin/nagconfgen.pl:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/bin/nagconfgen.pl:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,11920,12075-12076,12096,12189,12207,12232,12266,12288,12322,12334,12355,12372,12401-12406,12428,12491,12523,12539-12540,12544,12555,12580,12583,12599,12609,12611,12615,12645,12653,12663,12744
/branches/enterprise/DEV-professional/opsview-core/bin-protected/nagconfgen.pl:13211
/branches/nagvis-iframe/opsview-core/bin/nagconfgen.pl:9764-9786
/branches/opsview2runtime/opsview-core/bin/nagconfgen.pl:10960-11258
/branches/opsview2runtime_xs/opsview-core/bin/nagconfgen.pl:11279-11303
/branches/us168/opsview-core/bin/nagconfgen.pl:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2/opsview-core/bin/nagconfgen.pl:10944,11017
/commercial/branches/BRAN-4.3/opsview-core/bin/nagconfgen.pl:12423-12426
/commercial/branches/US306-slaves/opsview-core/bin/nagconfgen.pl:9804-9823
/commercial/branches/US307-network-map/opsview-core/bin/nagconfgen.pl:9685-9837
Modified: trunk/opsview-core/import/initial_opsview.sql
===================================================================
--- trunk/opsview-core/import/initial_opsview.sql 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-core/import/initial_opsview.sql 2013-08-15 14:35:56 UTC (rev 13244)
@@ -285,6 +285,9 @@
INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (10,20);
INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (10,21);
INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (10,23);
+INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (10,27);
+INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (10,28);
+INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (10,29);
INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (11,1);
INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (11,4);
INSERT INTO `roles_access` (`roleid`, `accessid`) VALUES (11,6);
Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl 2013-08-15 14:35:56 UTC (rev 13244)
@@ -4761,6 +4761,43 @@
$db->updated;
}
+unless ( $db->is_installed( '20130612accesses', "New accesses", 'all' ) ) {
+
+ $dbh->do( q[ INSERT INTO access (id,name) VALUES (27,'CONFIGUREROLES') ] );
+
+ # Add CONFIGUREROLES access to any role that has the CONFIGUREVIEW access.
+ $dbh->do(
+ q[
+ INSERT IGNORE INTO roles_access (roleid, accessid)
+ SELECT roleid, 27 FROM roles_access WHERE accessid = 12
+ ]
+ );
+
+ $dbh->do( q[ INSERT INTO access (id,name) VALUES (28,'CONFIGURECONTACTS') ]
+ );
+
+ # Add CONFIGURECONTACTS access to any role that has the CONFIGUREVIEW access.
+ $dbh->do(
+ q[
+ INSERT IGNORE INTO roles_access (roleid, accessid)
+ SELECT roleid, 28 FROM roles_access WHERE accessid = 12
+ ]
+ );
+
+ $dbh->do(
+ q[ INSERT INTO access (id,name) VALUES (29,'CONFIGUREHOSTGROUPS') ]
+ );
+
+ # Add CONFIGUREHOSTGROUPS access to any role that has the CONFIGUREVIEW access.
+ $dbh->do(
+ q[
+ INSERT IGNORE INTO roles_access (roleid, accessid)
+ SELECT roleid, 29 FROM roles_access WHERE accessid = 12
+ ]
+ );
+
+}
+
# end of updates
if ( $postupdate->{regenerate_hostgroups_lft_rgt} ) {
$db->print( "Regenerating host group information" );
Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-core/t/var/opsview.test.db 2013-08-15 14:35:56 UTC (rev 13244)
@@ -28,6 +28,9 @@
INSERT INTO `access` VALUES (7,'CONFIGUREHOSTS');
INSERT INTO `access` VALUES (15,'CONFIGUREKEYWORDS');
INSERT INTO `access` VALUES (23,'CONFIGUREPROFILES');
+INSERT INTO `access` VALUES (27,'CONFIGUREROLES');
+INSERT INTO `access` VALUES (28,'CONFIGURECONTACTS');
+INSERT INTO `access` VALUES (29,'CONFIGUREHOSTGROUPS');
INSERT INTO `access` VALUES (13,'CONFIGURESAVE');
INSERT INTO `access` VALUES (12,'CONFIGUREVIEW');
INSERT INTO `access` VALUES (16,'DOWNTIMEALL');
@@ -1944,6 +1947,9 @@
INSERT INTO `roles_access` VALUES (10,20);
INSERT INTO `roles_access` VALUES (10,21);
INSERT INTO `roles_access` VALUES (10,23);
+INSERT INTO `roles_access` VALUES (10,27);
+INSERT INTO `roles_access` VALUES (10,28);
+INSERT INTO `roles_access` VALUES (10,29);
INSERT INTO `roles_access` VALUES (11,1);
INSERT INTO `roles_access` VALUES (11,4);
INSERT INTO `roles_access` VALUES (11,6);
@@ -1974,10 +1980,16 @@
INSERT INTO `roles_access` VALUES (16,19);
INSERT INTO `roles_access` VALUES (16,20);
INSERT INTO `roles_access` VALUES (16,23);
+INSERT INTO `roles_access` VALUES (16,27);
+INSERT INTO `roles_access` VALUES (16,28);
+INSERT INTO `roles_access` VALUES (16,29);
INSERT INTO `roles_access` VALUES (17,7);
INSERT INTO `roles_access` VALUES (17,12);
INSERT INTO `roles_access` VALUES (17,15);
INSERT INTO `roles_access` VALUES (17,23);
+INSERT INTO `roles_access` VALUES (17,27);
+INSERT INTO `roles_access` VALUES (17,28);
+INSERT INTO `roles_access` VALUES (17,29);
INSERT INTO `roles_access` VALUES (18,2);
INSERT INTO `roles_access` VALUES (18,4);
INSERT INTO `roles_access` VALUES (18,6);
Modified: trunk/opsview-web/t/650-api2-role.t
===================================================================
--- trunk/opsview-web/t/650-api2-role.t 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-web/t/650-api2-role.t 2013-08-15 14:35:56 UTC (rev 13244)
@@ -80,6 +80,14 @@
'name' => 'ADMINACCESS'
},
{
+ 'ref' => '/rest/config/access/28',
+ 'name' => 'CONFIGURECONTACTS'
+ },
+ {
+ 'ref' => '/rest/config/access/29',
+ 'name' => 'CONFIGUREHOSTGROUPS'
+ },
+ {
'ref' => '/rest/config/access/7',
'name' => 'CONFIGUREHOSTS'
},
@@ -92,10 +100,18 @@
'name' => 'CONFIGUREPROFILES'
},
{
+ 'ref' => '/rest/config/access/27',
+ 'name' => 'CONFIGUREROLES'
+ },
+ {
'ref' => '/rest/config/access/13',
'name' => 'CONFIGURESAVE'
},
{
+ 'ref' => '/rest/config/access/26',
+ 'name' => 'CONFIGURETENANCY'
+ },
+ {
'ref' => '/rest/config/access/12',
'name' => 'CONFIGUREVIEW'
},
Modified: trunk/opsview-web/t/650-api2-version.t
===================================================================
--- trunk/opsview-web/t/650-api2-version.t 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-web/t/650-api2-version.t 2013-08-15 14:35:56 UTC (rev 13244)
@@ -136,23 +136,26 @@
realm => "local",
language => "",
access_list => {
- ACTIONALL => 1,
- ADMINACCESS => 1,
- CONFIGUREHOSTS => 1,
- CONFIGUREKEYWORDS => 1,
- CONFIGURESAVE => 1,
- CONFIGUREPROFILES => 1,
- CONFIGUREVIEW => 1,
- DOWNTIMEALL => 1,
- NOTIFYSOME => 1,
- PASSWORDSAVE => 1,
- RELOADACCESS => 1,
- REPORTADMIN => 1,
- REPORTUSER => 1,
- RRDGRAPHS => 1,
- TESTALL => 1,
- TESTCHANGE => 1,
- VIEWALL => 1,
+ ACTIONALL => 1,
+ ADMINACCESS => 1,
+ CONFIGURECONTACTS => 1,
+ CONFIGUREHOSTGROUPS => 1,
+ CONFIGUREHOSTS => 1,
+ CONFIGUREKEYWORDS => 1,
+ CONFIGUREROLES => 1,
+ CONFIGURESAVE => 1,
+ CONFIGUREPROFILES => 1,
+ CONFIGUREVIEW => 1,
+ DOWNTIMEALL => 1,
+ NOTIFYSOME => 1,
+ PASSWORDSAVE => 1,
+ RELOADACCESS => 1,
+ REPORTADMIN => 1,
+ REPORTUSER => 1,
+ RRDGRAPHS => 1,
+ TESTALL => 1,
+ TESTCHANGE => 1,
+ VIEWALL => 1,
},
};
is_deeply( $data->{user_data}, $expected, "Got user data too" );
Modified: trunk/opsview-web/t/710adminroles.t
===================================================================
--- trunk/opsview-web/t/710adminroles.t 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-web/t/710adminroles.t 2013-08-15 14:35:56 UTC (rev 13244)
@@ -41,28 +41,34 @@
$mech->form_name( "main_form" );
is( $mech->value("name"), "View all, change none" );
is( $mech->value("description"), "Read only user" );
-is( $mech->value( 'accesses', 1 ), undef );
-is( $mech->value( 'accesses', 2 ), undef );
-is( $mech->value( 'accesses', 3 ), undef );
-is( $mech->value( 'accesses', 4 ), undef );
-is( $mech->value( 'accesses', 5 ), undef );
-is( $mech->value( 'accesses', 6 ), undef );
-is( $mech->value( 'accesses', 7 ), undef );
-is( $mech->value( 'accesses', 8 ), undef );
-is( $mech->value( 'accesses', 9 ), undef );
-is( $mech->value( 'accesses', 11 ), 6 )
- ; # This is NOTIFYSOME for the view all, change none user
-is( $mech->value( 'accesses', 12 ), 14, "PASSWORDSAVE" );
-is( $mech->value( 'accesses', 13 ), undef );
-is( $mech->value( 'accesses', 14 ), undef );
-is( $mech->value( 'accesses', 15 ), undef );
-is( $mech->value( 'accesses', 16 ), undef );
-is( $mech->value( 'accesses', 17 ), undef );
-is( $mech->value( 'accesses', 18 ), undef );
-is( $mech->value( 'accesses', 19 ), undef );
-is( $mech->value( 'accesses', 20 ), 1 );
-is( $mech->value( 'accesses', 21 ), undef );
-is( $mech->value( 'accesses', 22 ), undef );
+is( $mech->value( 'accesses', 1 ), undef, 'ACTIONALL' );
+is( $mech->value( 'accesses', 2 ), undef, 'ACTIONSOME' );
+is( $mech->value( 'accesses', 3 ), undef, 'ADMINACCESS' );
+is( $mech->value( 'accesses', 4 ), undef, 'CONFIGURECONTACTS' );
+is( $mech->value( 'accesses', 5 ), undef, 'CONFIGUREHOSTGROUPS' );
+is( $mech->value( 'accesses', 6 ), undef, 'CONFIGUREHOSTS' );
+is( $mech->value( 'accesses', 7 ), undef, 'CONFIGUREKEYWORDS' );
+is( $mech->value( 'accesses', 8 ), undef, 'CONFIGURENETFLOW' );
+is( $mech->value( 'accesses', 9 ), undef, 'CONFIGUREPROFILES' );
+is( $mech->value( 'accesses', 10 ), undef, 'CONFIGUREROLES' );
+is( $mech->value( 'accesses', 11 ), undef, 'CONFIGURESAVE' );
+is( $mech->value( 'accesses', 12 ), undef, 'CONFIGURETENANCY' );
+is( $mech->value( 'accesses', 13 ), undef, 'CONFIGUREVIEW' );
+is( $mech->value( 'accesses', 14 ), undef, 'DOWNTIMEALL' );
+is( $mech->value( 'accesses', 15 ), undef, 'DOWNTIMESOME' );
+is( $mech->value( 'accesses', 16 ), undef, 'NETFLOW' );
+is( $mech->value( 'accesses', 17 ), 6, 'NOTIFYSOME' );
+is( $mech->value( 'accesses', 18 ), 14, 'PASSWORDSAVE' );
+is( $mech->value( 'accesses', 19 ), undef, 'RELOADACCESS' );
+is( $mech->value( 'accesses', 20 ), undef, 'REPORTADMIN' );
+is( $mech->value( 'accesses', 21 ), undef, 'REPORTUSER' );
+is( $mech->value( 'accesses', 22 ), undef, 'RRDGRAPHS' );
+is( $mech->value( 'accesses', 23 ), undef, 'TESTALL' );
+is( $mech->value( 'accesses', 24 ), undef, 'TESTCHANGE' );
+is( $mech->value( 'accesses', 25 ), undef, 'TESTSOME' );
+is( $mech->value( 'accesses', 26 ), 1, 'VIEWALL' );
+is( $mech->value( 'accesses', 27 ), undef, 'VIEWPORTACCESS' );
+is( $mech->value( 'accesses', 28 ), undef, 'VIEWSOME' );
$mech->field( "name", "badrobot" );
$mech->field( "description", "New role info" );
@@ -79,28 +85,34 @@
is( $mech->value("name"), "badrobot" );
is( $mech->value("description"), "New role info" );
-is( $mech->value( 'accesses', 1 ), undef );
-is( $mech->value( 'accesses', 2 ), undef );
-is( $mech->value( 'accesses', 3 ), undef );
-is( $mech->value( 'accesses', 4 ), 7 );
-is( $mech->value( 'accesses', 5 ), undef );
-is( $mech->value( 'accesses', 6 ), undef );
-is( $mech->value( 'accesses', 7 ), undef );
-is( $mech->value( 'accesses', 8 ), undef );
-is( $mech->value( 'accesses', 9 ), undef );
-is( $mech->value( 'accesses', 10 ), undef );
-is( $mech->value( 'accesses', 11 ), undef );
-is( $mech->value( 'accesses', 12 ), 14, "PASSWORDSAVE" );
-is( $mech->value( 'accesses', 13 ), undef );
-is( $mech->value( 'accesses', 14 ), undef );
-is( $mech->value( 'accesses', 15 ), undef );
-is( $mech->value( 'accesses', 16 ), undef );
-is( $mech->value( 'accesses', 17 ), undef );
-is( $mech->value( 'accesses', 18 ), undef );
-is( $mech->value( 'accesses', 19 ), undef );
-is( $mech->value( 'accesses', 20 ), 1 );
-is( $mech->value( 'accesses', 21 ), 10 );
-is( $mech->value( 'accesses', 22 ), undef );
+is( $mech->value( 'accesses', 1 ), undef, 'ACTIONALL' );
+is( $mech->value( 'accesses', 2 ), undef, 'ACTIONSOME' );
+is( $mech->value( 'accesses', 3 ), undef, 'ADMINACCESS' );
+is( $mech->value( 'accesses', 4 ), undef, 'CONFIGURECONTACTS' );
+is( $mech->value( 'accesses', 5 ), undef, 'CONFIGUREHOSTGROUPS' );
+is( $mech->value( 'accesses', 6 ), 7, 'CONFIGUREHOSTS' );
+is( $mech->value( 'accesses', 7 ), undef, 'CONFIGUREKEYWORDS' );
+is( $mech->value( 'accesses', 8 ), undef, 'CONFIGURENETFLOW' );
+is( $mech->value( 'accesses', 9 ), undef, 'CONFIGUREPROFILES' );
+is( $mech->value( 'accesses', 10 ), undef, 'CONFIGUREROLES' );
+is( $mech->value( 'accesses', 11 ), undef, 'CONFIGURESAVE' );
+is( $mech->value( 'accesses', 12 ), undef, 'CONFIGURETENANCY' );
+is( $mech->value( 'accesses', 13 ), undef, 'CONFIGUREVIEW' );
+is( $mech->value( 'accesses', 14 ), undef, 'DOWNTIMEALL' );
+is( $mech->value( 'accesses', 15 ), undef, 'DOWNTIMESOME' );
+is( $mech->value( 'accesses', 16 ), undef, 'NETFLOW' );
+is( $mech->value( 'accesses', 17 ), undef, 'NOTIFYSOME' );
+is( $mech->value( 'accesses', 18 ), 14, 'PASSWORDSAVE' );
+is( $mech->value( 'accesses', 19 ), undef, 'RELOADACCESS' );
+is( $mech->value( 'accesses', 20 ), undef, 'REPORTADMIN' );
+is( $mech->value( 'accesses', 21 ), undef, 'REPORTUSER' );
+is( $mech->value( 'accesses', 22 ), undef, 'RRDGRAPHS' );
+is( $mech->value( 'accesses', 23 ), undef, 'TESTALL' );
+is( $mech->value( 'accesses', 24 ), undef, 'TESTCHANGE' );
+is( $mech->value( 'accesses', 25 ), undef, 'TESTSOME' );
+is( $mech->value( 'accesses', 26 ), 1, 'VIEWALL' );
+is( $mech->value( 'accesses', 27 ), 10, 'VIEWPORTACCESS' );
+is( $mech->value( 'accesses', 28 ), undef, 'VIEWSOME' );
# Proves that all accesses can be disabled
$mech->untick( "accesses", 7 );
@@ -111,28 +123,34 @@
$mech->get_ok( "/admin/role/edit/13" );
$mech->form_name( "main_form" );
-is( $mech->value( 'accesses', 1 ), undef );
-is( $mech->value( 'accesses', 2 ), undef );
-is( $mech->value( 'accesses', 3 ), undef );
-is( $mech->value( 'accesses', 4 ), undef );
-is( $mech->value( 'accesses', 5 ), undef );
-is( $mech->value( 'accesses', 6 ), undef );
-is( $mech->value( 'accesses', 7 ), undef );
-is( $mech->value( 'accesses', 8 ), undef );
-is( $mech->value( 'accesses', 9 ), undef );
-is( $mech->value( 'accesses', 10 ), undef );
-is( $mech->value( 'accesses', 11 ), undef );
-is( $mech->value( 'accesses', 12 ), undef );
-is( $mech->value( 'accesses', 13 ), undef );
-is( $mech->value( 'accesses', 14 ), undef );
-is( $mech->value( 'accesses', 15 ), undef );
-is( $mech->value( 'accesses', 16 ), undef );
-is( $mech->value( 'accesses', 17 ), undef );
-is( $mech->value( 'accesses', 18 ), undef );
-is( $mech->value( 'accesses', 19 ), undef );
-is( $mech->value( 'accesses', 20 ), undef );
-is( $mech->value( 'accesses', 21 ), undef );
-is( $mech->value( 'accesses', 22 ), undef );
+is( $mech->value( 'accesses', 1 ), undef, 'ACTIONALL' );
+is( $mech->value( 'accesses', 2 ), undef, 'ACTIONSOME' );
+is( $mech->value( 'accesses', 3 ), undef, 'ADMINACCESS' );
+is( $mech->value( 'accesses', 4 ), undef, 'CONFIGURECONTACTS' );
+is( $mech->value( 'accesses', 5 ), undef, 'CONFIGUREHOSTGROUPS' );
+is( $mech->value( 'accesses', 6 ), undef, 'CONFIGUREHOSTS' );
+is( $mech->value( 'accesses', 7 ), undef, 'CONFIGUREKEYWORDS' );
+is( $mech->value( 'accesses', 8 ), undef, 'CONFIGURENETFLOW' );
+is( $mech->value( 'accesses', 9 ), undef, 'CONFIGUREPROFILES' );
+is( $mech->value( 'accesses', 10 ), undef, 'CONFIGUREROLES' );
+is( $mech->value( 'accesses', 11 ), undef, 'CONFIGURESAVE' );
+is( $mech->value( 'accesses', 12 ), undef, 'CONFIGURETENANCY' );
+is( $mech->value( 'accesses', 13 ), undef, 'CONFIGUREVIEW' );
+is( $mech->value( 'accesses', 14 ), undef, 'DOWNTIMEALL' );
+is( $mech->value( 'accesses', 15 ), undef, 'DOWNTIMESOME' );
+is( $mech->value( 'accesses', 16 ), undef, 'NETFLOW' );
+is( $mech->value( 'accesses', 17 ), undef, 'NOTIFYSOME' );
+is( $mech->value( 'accesses', 18 ), undef, 'PASSWORDSAVE' );
+is( $mech->value( 'accesses', 19 ), undef, 'RELOADACCESS' );
+is( $mech->value( 'accesses', 20 ), undef, 'REPORTADMIN' );
+is( $mech->value( 'accesses', 21 ), undef, 'REPORTUSER' );
+is( $mech->value( 'accesses', 22 ), undef, 'RRDGRAPHS' );
+is( $mech->value( 'accesses', 23 ), undef, 'TESTALL' );
+is( $mech->value( 'accesses', 24 ), undef, 'TESTCHANGE' );
+is( $mech->value( 'accesses', 25 ), undef, 'TESTSOME' );
+is( $mech->value( 'accesses', 26 ), undef, 'VIEWALL' );
+is( $mech->value( 'accesses', 27 ), undef, 'VIEWPORTACCESS' );
+is( $mech->value( 'accesses', 28 ), undef, 'VIEWSOME' );
is( $mech->value( 'accesses', 16 ), undef );
$mech->get_ok( "/admin/role" );
@@ -154,28 +172,34 @@
$mech->form_name( "main_form" );
is( $mech->value("name"), "new role" );
is( $mech->value("description"), "A new auto role" );
-is( $mech->value( 'accesses', 1 ), undef );
-is( $mech->value( 'accesses', 2 ), undef );
-is( $mech->value( 'accesses', 3 ), undef );
-is( $mech->value( 'accesses', 4 ), 7 );
-is( $mech->value( 'accesses', 5 ), undef );
-is( $mech->value( 'accesses', 6 ), undef );
-is( $mech->value( 'accesses', 7 ), undef );
-is( $mech->value( 'accesses', 8 ), undef );
-is( $mech->value( 'accesses', 9 ), undef );
-is( $mech->value( 'accesses', 10 ), undef );
-is( $mech->value( 'accesses', 11 ), undef );
-is( $mech->value( 'accesses', 12 ), undef );
-is( $mech->value( 'accesses', 13 ), undef );
-is( $mech->value( 'accesses', 14 ), undef );
-is( $mech->value( 'accesses', 15 ), undef );
-is( $mech->value( 'accesses', 16 ), undef );
-is( $mech->value( 'accesses', 17 ), undef );
-is( $mech->value( 'accesses', 18 ), undef );
-is( $mech->value( 'accesses', 19 ), undef );
-is( $mech->value( 'accesses', 20 ), undef );
-is( $mech->value( 'accesses', 21 ), undef );
-is( $mech->value( 'accesses', 22 ), undef );
+is( $mech->value( 'accesses', 1 ), undef, 'ACTIONALL' );
+is( $mech->value( 'accesses', 2 ), undef, 'ACTIONSOME' );
+is( $mech->value( 'accesses', 3 ), undef, 'ADMINACCESS' );
+is( $mech->value( 'accesses', 4 ), undef, 'CONFIGURECONTACTS' );
+is( $mech->value( 'accesses', 5 ), undef, 'CONFIGUREHOSTGROUPS' );
+is( $mech->value( 'accesses', 6 ), 7, 'CONFIGUREHOSTS' );
+is( $mech->value( 'accesses', 7 ), undef, 'CONFIGUREKEYWORDS' );
+is( $mech->value( 'accesses', 8 ), undef, 'CONFIGURENETFLOW' );
+is( $mech->value( 'accesses', 9 ), undef, 'CONFIGUREPROFILES' );
+is( $mech->value( 'accesses', 10 ), undef, 'CONFIGUREROLES' );
+is( $mech->value( 'accesses', 11 ), undef, 'CONFIGURESAVE' );
+is( $mech->value( 'accesses', 12 ), undef, 'CONFIGURETENANCY' );
+is( $mech->value( 'accesses', 13 ), undef, 'CONFIGUREVIEW' );
+is( $mech->value( 'accesses', 14 ), undef, 'DOWNTIMEALL' );
+is( $mech->value( 'accesses', 15 ), undef, 'DOWNTIMESOME' );
+is( $mech->value( 'accesses', 16 ), undef, 'NETFLOW' );
+is( $mech->value( 'accesses', 17 ), undef, 'NOTIFYSOME' );
+is( $mech->value( 'accesses', 18 ), undef, 'PASSWORDSAVE' );
+is( $mech->value( 'accesses', 19 ), undef, 'RELOADACCESS' );
+is( $mech->value( 'accesses', 20 ), undef, 'REPORTADMIN' );
+is( $mech->value( 'accesses', 21 ), undef, 'REPORTUSER' );
+is( $mech->value( 'accesses', 22 ), undef, 'RRDGRAPHS' );
+is( $mech->value( 'accesses', 23 ), undef, 'TESTALL' );
+is( $mech->value( 'accesses', 24 ), undef, 'TESTCHANGE' );
+is( $mech->value( 'accesses', 25 ), undef, 'TESTSOME' );
+is( $mech->value( 'accesses', 26 ), undef, 'VIEWALL' );
+is( $mech->value( 'accesses', 27 ), undef, 'VIEWPORTACCESS' );
+is( $mech->value( 'accesses', 28 ), undef, 'VIEWSOME' );
$mech->get_ok( "/admin/role/clone/12" );
$mech->form_name( "main_form" );
@@ -187,28 +211,34 @@
$mech->form_name( "main_form" );
is( $mech->value("name"), "clonedrole" );
is( $mech->value("description"), "Restricted operator" );
-is( $mech->value( 'accesses', 1 ), undef );
-is( $mech->value( 'accesses', 2 ), 4, "ACTIONSOME" );
-is( $mech->value( 'accesses', 3 ), undef );
-is( $mech->value( 'accesses', 4 ), 7, "CONFIGUREHOSTS" );
-is( $mech->value( 'accesses', 5 ), undef );
-is( $mech->value( 'accesses', 6 ), undef );
-is( $mech->value( 'accesses', 7 ), 13, "CONFIGURESAVE" );
-is( $mech->value( 'accesses', 8 ), undef );
-is( $mech->value( 'accesses', 9 ), undef );
-is( $mech->value( 'accesses', 10 ), 17, "DOWNTIMESOME" );
-is( $mech->value( 'accesses', 11 ), 6, "NOTIFYSOME" );
-is( $mech->value( 'accesses', 12 ), 14, "PASSWORDSAVE" );
-is( $mech->value( 'accesses', 13 ), undef );
-is( $mech->value( 'accesses', 14 ), undef );
-is( $mech->value( 'accesses', 15 ), undef );
-is( $mech->value( 'accesses', 16 ), undef );
-is( $mech->value( 'accesses', 17 ), undef );
-is( $mech->value( 'accesses', 18 ), undef );
-is( $mech->value( 'accesses', 19 ), 22, "TESTSOME" );
-is( $mech->value( 'accesses', 20 ), undef );
-is( $mech->value( 'accesses', 21 ), undef );
-is( $mech->value( 'accesses', 22 ), 2, "VIEWSOME" );
+is( $mech->value( 'accesses', 1 ), undef, 'ACTIONALL' );
+is( $mech->value( 'accesses', 2 ), 4, 'ACTIONSOME' );
+is( $mech->value( 'accesses', 3 ), undef, 'ADMINACCESS' );
+is( $mech->value( 'accesses', 4 ), undef, 'CONFIGURECONTACTS' );
+is( $mech->value( 'accesses', 5 ), undef, 'CONFIGUREHOSTGROUPS' );
+is( $mech->value( 'accesses', 6 ), 7, 'CONFIGUREHOSTS' );
+is( $mech->value( 'accesses', 7 ), undef, 'CONFIGUREKEYWORDS' );
+is( $mech->value( 'accesses', 8 ), undef, 'CONFIGURENETFLOW' );
+is( $mech->value( 'accesses', 9 ), undef, 'CONFIGUREPROFILES' );
+is( $mech->value( 'accesses', 10 ), undef, 'CONFIGUREROLES' );
+is( $mech->value( 'accesses', 11 ), 13, 'CONFIGURESAVE' );
+is( $mech->value( 'accesses', 12 ), undef, 'CONFIGURETENANCY' );
+is( $mech->value( 'accesses', 13 ), undef, 'CONFIGUREVIEW' );
+is( $mech->value( 'accesses', 14 ), undef, 'DOWNTIMEALL' );
+is( $mech->value( 'accesses', 15 ), 17, 'DOWNTIMESOME' );
+is( $mech->value( 'accesses', 16 ), undef, 'NETFLOW' );
+is( $mech->value( 'accesses', 17 ), 6, 'NOTIFYSOME' );
+is( $mech->value( 'accesses', 18 ), 14, 'PASSWORDSAVE' );
+is( $mech->value( 'accesses', 19 ), undef, 'RELOADACCESS' );
+is( $mech->value( 'accesses', 20 ), undef, 'REPORTADMIN' );
+is( $mech->value( 'accesses', 21 ), undef, 'REPORTUSER' );
+is( $mech->value( 'accesses', 22 ), undef, 'RRDGRAPHS' );
+is( $mech->value( 'accesses', 23 ), undef, 'TESTALL' );
+is( $mech->value( 'accesses', 24 ), undef, 'TESTCHANGE' );
+is( $mech->value( 'accesses', 25 ), 22, 'TESTSOME' );
+is( $mech->value( 'accesses', 26 ), undef, 'VIEWALL' );
+is( $mech->value( 'accesses', 27 ), undef, 'VIEWPORTACCESS' );
+is( $mech->value( 'accesses', 28 ), 2, 'VIEWSOME' );
is( $mech->value( "hostgroups", 1 ), undef );
is( $mech->value( "hostgroups", 2 ), undef );
Modified: trunk/opsview-web/t/800login.t
===================================================================
--- trunk/opsview-web/t/800login.t 2013-08-15 08:03:23 UTC (rev 13243)
+++ trunk/opsview-web/t/800login.t 2013-08-15 14:35:56 UTC (rev 13244)
@@ -85,7 +85,7 @@
is( $info->{uid}, "admin", "Got right username" );
is(
$info->{tokens},
- "OPSVIEW_ADMIN,ACTIONALL,ADMINACCESS,CONFIGUREHOSTS,CONFIGUREKEYWORDS,CONFIGUREPROFILES,CONFIGURESAVE,CONFIGUREVIEW,DOWNTIMEALL,NOTIFYSOME,PASSWORDSAVE,RELOADACCESS,REPORTADMIN,REPORTUSER,RRDGRAPHS,TESTALL,TESTCHANGE,VIEWALL",
+ "OPSVIEW_ADMIN,ACTIONALL,ADMINACCESS,CONFIGURECONTACTS,CONFIGUREHOSTGROUPS,CONFIGUREHOSTS,CONFIGUREKEYWORDS,CONFIGUREPROFILES,CONFIGUREROLES,CONFIGURESAVE,CONFIGUREVIEW,DOWNTIMEALL,NOTIFYSOME,PASSWORDSAVE,RELOADACCESS,REPORTADMIN,REPORTUSER,RRDGRAPHS,TESTALL,TESTCHANGE,VIEWALL",
"Got all tokens"
);
