This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard b87c4be7df2 4.21/main Health Check, please don't merge this!
add 7ad68aafa58 Enable defining a network as redundant during restart
through the UI (#7405)
add 9bbd32a8ef0 Add DaanHoogland to the list of contributors
add 74af9b98757 API key pair restructure (#9504)
add d8f748ad0e8 Update .asf.yaml
add faaf7669c59 Update isolation methods description for physical network
(#12759)
add bfc9cb34983 4.21/main Health Check, please don't merge this!
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b87c4be7df2)
\
N -- N -- N refs/heads/healthcheck-main (bfc9cb34983)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 3 +-
.../main/java/com/cloud/user/AccountService.java | 38 +-
.../cloud/user/ApiKeyPairState.java} | 5 +-
api/src/main/java/com/cloud/user/User.java | 8 -
api/src/main/java/com/cloud/user/UserAccount.java | 4 -
.../java/org/apache/cloudstack/acl/APIChecker.java | 6 +-
.../cloudstack/acl/RolePermissionEntity.java | 2 +-
.../org/apache/cloudstack/acl/RoleService.java | 21 +
.../main/java/org/apache/cloudstack/acl/Rule.java | 6 +-
.../apikeypair/ApiKeyPair.java} | 35 +-
.../acl/apikeypair/ApiKeyPairPermission.java} | 6 +-
.../acl/apikeypair/ApiKeyPairService.java | 10 +-
.../org/apache/cloudstack/api/ApiConstants.java | 10 +-
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 1 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 3 +
.../apache/cloudstack/api/ResponseGenerator.java | 8 +
.../admin/network/CreatePhysicalNetworkCmd.java | 2 +-
.../command/admin/storage/AddImageStoreS3CMD.java | 6 +-
.../api/command/admin/user/DeleteUserKeysCmd.java | 81 ++++
.../api/command/admin/user/GetUserKeysCmd.java | 36 +-
.../command/admin/user/ListUserKeyRulesCmd.java | 68 +++
.../api/command/admin/user/ListUserKeysCmd.java | 101 ++++
.../api/command/admin/user/RegisterUserKeyCmd.java | 93 ----
.../command/admin/user/RegisterUserKeysCmd.java | 209 +++++++++
.../api/command/admin/user/UpdateUserCmd.java | 12 +-
.../api/response/ApiKeyPairResponse.java | 285 ++++++++++++
.../cloudstack/api/response/UserResponse.java | 4 +-
.../org/apache/cloudstack/query/QueryService.java | 2 +
.../java/org/apache/cloudstack/acl/RuleTest.java | 141 +++++-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 2 +-
.../main/java/com/cloud/user/UserAccountVO.java | 26 --
.../src/main/java/com/cloud/user/UserVO.java | 30 --
.../java/com/cloud/user/dao/UserAccountDao.java | 2 -
.../com/cloud/user/dao/UserAccountDaoImpl.java | 17 -
.../src/main/java/com/cloud/user/dao/UserDao.java | 7 -
.../main/java/com/cloud/user/dao/UserDaoImpl.java | 11 -
...rmissionVO.java => ApiKeyPairPermissionVO.java} | 34 +-
.../org/apache/cloudstack/acl/ApiKeyPairVO.java | 244 ++++++++++
.../cloudstack/acl/RolePermissionBaseVO.java | 6 +
.../{ProjectRoleDao.java => ApiKeyPairDao.java} | 21 +-
.../cloudstack/acl/dao/ApiKeyPairDaoImpl.java | 92 ++++
...tRoleDao.java => ApiKeyPairPermissionsDao.java} | 13 +-
.../acl/dao/ApiKeyPairPermissionsDaoImpl.java | 71 +++
.../datastore/db/ImageStoreDetailsDaoImpl.java | 2 +-
.../spring-engine-schema-core-daos-context.xml | 2 +
.../resources/META-INF/db/schema-42210to42300.sql | 49 ++
.../META-INF/db/views/cloud.user_view.sql | 2 -
.../storage/image/datastore/ImageStoreHelper.java | 2 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 69 +--
.../acl/DynamicRoleBasedAPIAccessCheckerTest.java | 66 +++
.../acl/ProjectRoleBasedApiAccessChecker.java | 10 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 14 +-
plugins/api/discovery/pom.xml | 6 +
.../api/command/user/discovery/ListApisCmd.java | 2 +-
.../cloudstack/discovery/ApiDiscoveryService.java | 3 +-
.../discovery/ApiDiscoveryServiceImpl.java | 62 ++-
.../cloudstack/discovery/ApiDiscoveryTest.java | 14 +-
.../ratelimit/ApiRateLimitServiceImpl.java | 14 +-
.../api/response/QuotaResponseBuilderImpl.java | 2 +-
.../api/response/QuotaResponseBuilderImplTest.java | 6 +-
.../manager/BaremetalVlanManagerImpl.java | 5 +-
.../cluster/KubernetesClusterManagerImpl.java | 9 +-
.../contrail/management/MockAccountManager.java | 73 ++-
.../tungsten/service/TungstenServiceImpl.java | 9 +-
.../tungsten/service/TungstenElementTest.java | 5 +
.../datastore/driver/S3ImageStoreDriverImpl.java | 2 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 17 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 94 ++++
server/src/main/java/com/cloud/api/ApiServer.java | 54 ++-
server/src/main/java/com/cloud/api/ApiServlet.java | 4 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 48 +-
.../cloud/api/query/dao/UserAccountJoinDao.java | 3 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 12 +-
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 16 -
.../java/com/cloud/network/NetworkServiceImpl.java | 11 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 14 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 16 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 12 +-
.../com/cloud/server/ManagementServerImpl.java | 20 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 16 +-
.../main/java/com/cloud/user/AccountManager.java | 10 +-
.../java/com/cloud/user/AccountManagerImpl.java | 507 +++++++++++++++++----
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 13 +-
.../cloudstack/acl/ApiKeyPairManagerImpl.java | 87 ++++
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 104 +++--
.../core/spring-server-core-managers-context.xml | 6 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 42 +-
.../com/cloud/user/AccountManagerImplTest.java | 467 +++++++++++++++++--
.../java/com/cloud/vm/UserVmManagerImplTest.java | 20 +-
.../apache/cloudstack/acl/RoleManagerImplTest.java | 56 ++-
test/integration/smoke/test_accounts.py | 2 +-
tools/marvin/marvin/cloudstackTestClient.py | 33 +-
tools/marvin/marvin/lib/base.py | 1 +
ui/public/config.json | 1 +
ui/src/config/section/network.js | 6 +-
95 files changed, 3188 insertions(+), 714 deletions(-)
copy api/src/main/java/{org/apache/cloudstack/acl/InfrastructureEntity.java =>
com/cloud/user/ApiKeyPairState.java} (90%)
copy api/src/main/java/org/apache/cloudstack/{gui/theme/GuiThemeJoin.java =>
acl/apikeypair/ApiKeyPair.java} (72%)
copy api/src/main/java/{com/cloud/deploy/HAPlanner.java =>
org/apache/cloudstack/acl/apikeypair/ApiKeyPairPermission.java} (80%)
copy
engine/schema/src/main/java/org/apache/cloudstack/region/PortableIpRangeDao.java
=>
api/src/main/java/org/apache/cloudstack/acl/apikeypair/ApiKeyPairService.java
(76%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserKeysCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUserKeyRulesCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUserKeysCmd.java
delete mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeysCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/ApiKeyPairResponse.java
copy
engine/schema/src/main/java/org/apache/cloudstack/acl/{RolePermissionVO.java =>
ApiKeyPairPermissionVO.java} (61%)
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/acl/ApiKeyPairVO.java
copy
engine/schema/src/main/java/org/apache/cloudstack/acl/dao/{ProjectRoleDao.java
=> ApiKeyPairDao.java} (59%)
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ApiKeyPairDaoImpl.java
copy
engine/schema/src/main/java/org/apache/cloudstack/acl/dao/{ProjectRoleDao.java
=> ApiKeyPairPermissionsDao.java} (74%)
create mode 100644
engine/schema/src/main/java/org/apache/cloudstack/acl/dao/ApiKeyPairPermissionsDaoImpl.java
create mode 100644
server/src/main/java/org/apache/cloudstack/acl/ApiKeyPairManagerImpl.java
