This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from d10cdb4 Merge remote-tracking branch 'origin/4.15'
add 9581824 cloudstack: make code more inclusive
No new revisions were added by this update.
Summary of changes:
CONTRIBUTING.md | 42 +--
ISSUE_TEMPLATE.md | 4 +-
PULL_REQUEST_TEMPLATE.md | 2 +-
README.md | 2 +-
.../com/cloud/network/router/VirtualRouter.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../user/resource/ListResourceLimitsCmd.java | 8 +-
.../org/apache/cloudstack/query/QueryService.java | 4 +-
client/conf/db.properties.in | 12 +-
.../com/cloud/agent/api/CheckRouterAnswer.java | 4 +-
.../resources/META-INF/db/schema-41510to41600.sql | 11 +
.../storage/test/EndpointSelectorTest.java | 14 +-
.../storage/test/SnapshotTestWithFakeData.java | 16 +-
.../main/java/com/cloud/utils/db/Merovingian2.java | 8 +-
.../java/com/cloud/utils/db/TransactionLegacy.java | 32 +-
.../java/com/cloud/utils/db/Merovingian2Test.java | 24 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 2 +-
.../acl/ProjectRoleBasedApiAccessChecker.java | 2 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 2 +-
.../java/com/cloud/utils/db/StaticStrategy.java | 34 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 8 +-
.../main/java/com/cloud/ovm/object/OvmHost.java | 6 +-
.../src/main/java/com/cloud/ovm/object/Test.java | 4 -
.../scripts/vm/hypervisor/ovm/OvmFaultConstants.py | 2 +-
.../scripts/vm/hypervisor/ovm/OvmHostModule.py | 8 +-
.../com/cloud/hypervisor/ovm3/objects/Cluster.java | 2 +-
.../com/cloud/hypervisor/ovm3/objects/Linux.java | 6 +-
.../com/cloud/hypervisor/ovm3/objects/Pool.java | 10 +-
.../ovm3/resources/Ovm3HypervisorResource.java | 4 +-
.../ovm3/resources/helpers/Ovm3Configuration.java | 20 +-
.../resources/helpers/Ovm3HypervisorSupport.java | 44 +--
.../ovm3/resources/helpers/Ovm3StoragePool.java | 22 +-
.../cloud/hypervisor/ovm3/objects/LinuxTest.java | 4 +-
.../cloud/hypervisor/ovm3/objects/PoolTest.java | 6 +-
.../resources/helpers/Ovm3ConfigurationTest.java | 4 +-
.../helpers/Ovm3HypervisorSupportTest.java | 4 +-
.../scripts/{clean_master.sh => clean_primary.sh} | 0
.../scripts/{clean_slave.sh => clean_secondary.sh} | 0
.../test/resources/scripts/create_pool_cluster.py | 2 +-
.../ovm3/src/test/resources/scripts/info.py | 8 +-
.../ovm3/src/test/resources/scripts/password.py | 2 +-
.../ovm3/src/test/resources/scripts/repo_pool.py | 18 +-
.../ovm3/src/test/resources/scripts/simple_pool.py | 18 +-
.../com/cloud/agent/manager/MockVmManagerImpl.java | 6 +-
.../kubernetes/cluster/KubernetesCluster.java | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 35 +-
.../kubernetes/cluster/KubernetesClusterVO.java | 18 +-
.../KubernetesClusterActionWorker.java | 20 +-
.../KubernetesClusterScaleWorker.java | 6 +-
.../KubernetesClusterStartWorker.java | 184 +++++------
.../KubernetesClusterUpgradeWorker.java | 4 +-
.../cluster/utils/KubernetesClusterUtil.java | 16 +-
.../cluster/CreateKubernetesClusterCmd.java | 14 +-
.../api/response/KubernetesClusterResponse.java | 13 +
.../KubernetesSupportedVersionResponse.java | 2 +-
...k8s-master-add.yml => k8s-control-node-add.yml} | 0
.../conf/{k8s-master.yml => k8s-control-node.yml} | 0
.../main/resources/script/upgrade-kubernetes.sh | 10 +-
.../cloud/agent/api/GetControllerDataAnswer.java | 12 +-
.../cloud/agent/api/GetControllerHostsAnswer.java | 20 +-
.../cloud/network/bigswitch/BigSwitchBcfApi.java | 12 +-
.../cloud/network/bigswitch/BigSwitchBcfUtils.java | 18 +-
.../network/bigswitch/ControlClusterData.java | 20 +-
.../cloud/network/bigswitch/ControllerData.java | 10 +-
.../network/resource/BigSwitchBcfResource.java | 2 +-
.../cloud/network/bigswitch/BigSwitchApiTest.java | 18 +-
.../contrail/management/ServiceManagerImpl.java | 2 +-
.../network/contrail/model/ModelObject.java | 2 +-
.../contrail/model/ServiceInstanceModel.java | 2 +-
.../contrail/management/NetworkProviderTest.java | 8 +-
.../contrail/management/PublicNetworkTest.java | 8 +-
python/lib/cloud_utils.py | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 6 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 4 +-
.../configuration/ConfigurationManagerImpl.java | 6 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 2 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 2 +-
.../network/element/VirtualRouterElement.java | 10 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 46 +--
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 16 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 4 +-
...erListener.java => LockControllerListener.java} | 10 +-
.../com/cloud/server/ManagementServerImpl.java | 18 +-
.../java/com/cloud/user/AccountManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 17 +-
.../core/spring-server-core-managers-context.xml | 2 +-
.../system/spring-server-system-context.xml | 2 +-
.../network/element/VirtualRouterElementTest.java | 14 +-
.../VirtualNetworkApplianceManagerImplTest.java | 2 +-
systemvm/agent/noVNC/vendor/pako/lib/zlib/trees.js | 18 +-
systemvm/debian/opt/cloud/bin/checkrouter.sh | 4 +-
.../cloud/bin/{master.py => configure_router.py} | 14 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 12 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 8 +-
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 26 +-
systemvm/debian/opt/cloud/bin/ipassoc.sh | 8 +-
.../opt/cloud/templates/check_heartbeat.sh.templ | 2 +-
.../opt/cloud/templates/checkrouter.sh.templ | 4 +-
.../opt/cloud/templates/keepalived.conf.templ | 6 +-
.../component/maint/test_redundant_router.py | 352 ++++++++++-----------
.../test_redundant_router_deployment_planning.py | 24 +-
.../maint/test_redundant_router_network_rules.py | 92 +++---
.../component/test_acl_isolatednetwork.py | 146 ++++-----
.../component/test_acl_isolatednetwork_delete.py | 40 +--
.../integration/component/test_acl_listsnapshot.py | 48 +--
test/integration/component/test_acl_listvm.py | 38 +--
test/integration/component/test_acl_listvolume.py | 38 +--
...est_acl_sharednetwork_deployVM-impersonation.py | 6 +-
.../component/test_add_remove_network.py | 2 +-
test/integration/component/test_affinity_groups.py | 2 +-
test/integration/component/test_egress_fw_rules.py | 52 +--
test/integration/component/test_ip_reservation.py | 24 +-
.../test_multiple_subnets_in_isolated_network.py | 2 +-
...est_multiple_subnets_in_isolated_network_rvr.py | 2 +-
.../component/test_multiple_subnets_in_vpc.py | 2 +-
.../component/test_multiple_subnets_in_vpc_rvr.py | 2 +-
.../component/test_persistent_networks.py | 4 +-
test/integration/component/test_public_ip.py | 8 +-
.../component/test_redundant_router_cleanups.py | 78 ++---
.../component/test_redundant_router_services.py | 6 +-
.../component/test_redundant_router_upgrades.py | 8 +-
test/integration/component/test_volumes.py | 2 +-
test/integration/plugins/test_nicira_controller.py | 54 ++--
test/integration/smoke/test_kubernetes_clusters.py | 30 +-
test/integration/smoke/test_privategw_acl.py | 6 +-
test/integration/smoke/test_routers_network_ops.py | 18 +-
test/integration/smoke/test_vpc_redundant.py | 16 +-
tools/apidoc/generatecommand.xsl | 4 +-
tools/apidoc/generatecommands.xsl | 4 +-
tools/apidoc/generatetoc_footer.xsl | 2 +-
tools/apidoc/generatetoc_header.xsl | 2 +-
tools/apidoc/includes/main.css | 6 +-
tools/build/build_asf.sh | 4 +-
tools/build/setnextversion.sh | 4 +-
tools/devcloud4/advanced/README.md | 2 +-
tools/devcloud4/basic/README.md | 2 +-
tools/docker/README.md | 2 +-
tools/docker/systemtpl.sh | 12 +-
tools/marvin/marvin/cloudstackTestClient.py | 6 +-
tools/marvin/marvin/codes.py | 2 +-
tools/marvin/marvin/configGenerator.py | 2 +-
tools/ngui/static/js/lib/angular.js | 18 +-
ui/Dockerfile | 2 +-
ui/public/locales/ar.json | 4 +-
ui/public/locales/ca.json | 4 +-
ui/public/locales/de_DE.json | 6 +-
ui/public/locales/en.json | 4 +-
ui/public/locales/es.json | 4 +-
ui/public/locales/hu.json | 4 +-
ui/public/locales/it_IT.json | 4 +-
ui/public/locales/ko_KR.json | 4 +-
ui/public/locales/nl_NL.json | 4 +-
ui/public/locales/pl.json | 4 +-
ui/public/locales/ru_RU.json | 4 +-
ui/src/permission.js | 4 +-
ui/src/store/modules/app.js | 2 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 12 +-
ui/vue.config.js | 2 +-
161 files changed, 1221 insertions(+), 1188 deletions(-)
rename plugins/hypervisors/ovm3/src/test/resources/scripts/{clean_master.sh =>
clean_primary.sh} (100%)
rename plugins/hypervisors/ovm3/src/test/resources/scripts/{clean_slave.sh =>
clean_secondary.sh} (100%)
rename
plugins/integrations/kubernetes-service/src/main/resources/conf/{k8s-master-add.yml
=> k8s-control-node-add.yml} (100%)
rename
plugins/integrations/kubernetes-service/src/main/resources/conf/{k8s-master.yml
=> k8s-control-node.yml} (100%)
rename server/src/main/java/com/cloud/server/{LockMasterListener.java =>
LockControllerListener.java} (83%)
rename systemvm/debian/opt/cloud/bin/{master.py => configure_router.py} (87%)
