cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [10/13] git commit: updated refs/heads/4.9-systemdubuntupkging to 917e288
Date Wed, 24 Aug 2016 06:57:34 GMT
Merge pull request #1649 from shapeblue/4.9-upgraderolescriptfix

CLOUDSTACK-9463: Fix dynamic-roles migrate script for old formatThe old commands.properties
format included the full class name such as:

createAccount=com.cloud.api.commands.CreateAccountCmd;1

The migration script did not consider this format and fails. With this fix
the migration script will process both the formats, including processing a
commands.properties file with mixed format, for example:

    $ cat commands.properties
    ### Account commands
    createAccount=1
    deleteAccount=2
    markDefaultZoneForAccount=com.cloud.api.commands.MarkDefaultZoneForAccountCmd;3

    $ python scripts/util/migrate-dynamicroles.py -d -f commands.properties
    Apache CloudStack Role Permission Migration Tool
    (c) Apache CloudStack Authors and the ASF, under the Apache License, Version 2.0

    Running this migration tool will remove any default-role permissions from cloud.role_permissions.
Do you want to continue? [y/N]y
    The commands.properties file has been deprecated and moved at: commands.properties.deprecated
    Running SQL query: DELETE FROM `cloud`.`role_permissions` WHERE `role_id` in (1,2,3,4);
    Running SQL query: INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`,
`permission`, `sort_order`) values (UUID(), 1, '*', 'ALLOW', 0);
    Running SQL query: INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`,
`permission`, `sort_order`) values (UUID(), 2, 'deleteAccount', 'ALLOW', 0);
    Running SQL query: INSERT INTO `cloud`.`role_permissions` (`uuid`, `role_id`, `rule`,
`permission`, `sort_order`) values (UUID(), 2, 'markDefaultZoneForAccount', 'ALLOW', 1);
    Static role permissions from commands.properties have been migrated into the db
    Running SQL query: UPDATE `cloud`.`configuration` SET value='true' where name='dynamic.apichecker.enabled'
    Dynamic role based API checker has been enabled!

/cc @jburwell @karuturi @PaulAngus

Since we don't have any upgrade/marvin tests for this, the changes have been verified with
above test as the script works against a commands.properties. A manual verification by anyone
else would be required to validate the changes.

* pr/1649:
  CLOUDSTACK-9463: Fix dynamic-roles migrate script for old format

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc0e2a6b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc0e2a6b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc0e2a6b

Branch: refs/heads/4.9-systemdubuntupkging
Commit: cc0e2a6b0649807629ff48c4c22c05b81907db7f
Parents: 1060dc4 f699fd4
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Mon Aug 22 16:35:51 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Aug 22 16:35:51 2016 +0530

----------------------------------------------------------------------
 scripts/util/migrate-dynamicroles.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



Mime
View raw message