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 1708838 CLOUDSTACK-10268: Fix and enhance package script (#2433) add 19d6578 CLOUDSTACK-10303 : Refactor test data to nuage_test_data.py runnable against simulator (#2483) add 74db647 CLOUDSTACK-10321: CPU Cap for KVM (#2482) add ab0bce2 CLOUDSTACK-10296: Find time different from last timestamp (#2458) add 30175d6 CLOUDSTACK-10132: Extend support for management servers LB for agents (#2469) new 8ef1317 Merge branch '4.11' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: agent/conf/agent.properties | 11 + agent/src/main/java/com/cloud/agent/Agent.java | 119 +- .../src/main/java/com/cloud/agent/AgentShell.java | 58 +- .../src/main/java/com/cloud/agent/IAgentShell.java | 45 +- .../test/java/com/cloud/agent/AgentShellTest.java | 8 +- .../com/cloud/agent/api/to/VirtualMachineTO.java | 10 + .../cloudstack/config/ApiServiceConfiguration.java | 4 +- client/pom.xml | 5 + .../java/com/cloud/agent/api/ReadyCommand.java | 31 +- .../java/com/cloud/agent/api/StartupCommand.java | 9 + .../cloudstack/agent/lb/SetupMSListAnswer.java} | 9 +- .../cloudstack/agent/lb/SetupMSListCommand.java} | 32 +- engine/orchestration/pom.xml | 5 + .../com/cloud/agent/manager/AgentManagerImpl.java | 25 +- .../storage/endpoint/DefaultEndPointSelector.java | 4 +- framework/{direct-download => agent-lb}/pom.xml | 9 +- .../cloudstack/agent/lb/IndirectAgentLB.java | 53 + .../agent/lb/IndirectAgentLBAlgorithm.java | 45 + framework/pom.xml | 3 +- .../kvm/resource/LibvirtComputingResource.java | 28 + .../hypervisor/kvm/resource/LibvirtVMDef.java | 27 + .../kvm/resource/LibvirtComputingResourceTest.java | 39 + .../cloud/agent/manager/MockStorageManager.java | 6 + .../agent/manager/MockStorageManagerImpl.java | 91 +- .../cloud/agent/manager/SimulatorManagerImpl.java | 17 +- .../cloud/resource/SimulatorStorageProcessor.java | 2 +- .../network/lb/ElasticLoadBalancerManagerImpl.java | 2 +- server/pom.xml | 5 + .../configuration/ConfigurationManagerImpl.java | 5 + .../consoleproxy/ConsoleProxyManagerImpl.java | 6 +- .../main/java/com/cloud/hypervisor/KVMGuru.java | 50 + .../kvm/discoverer/LibvirtServerDiscoverer.java | 6 +- .../network/element/ConfigDriveNetworkElement.java | 13 +- .../router/VirtualNetworkApplianceManagerImpl.java | 4 +- .../com/cloud/server/ConfigurationServerImpl.java | 4 +- .../core/spring-server-core-managers-context.xml | 2 + .../agent/lb/IndirectAgentLBServiceImpl.java | 231 +++ .../IndirectAgentLBRoundRobinAlgorithm.java | 59 + .../algorithm/IndirectAgentLBShuffleAlgorithm.java | 31 +- .../algorithm/IndirectAgentLBStaticAlgorithm.java} | 25 +- .../src/test/resources/createNetworkOffering.xml | 1 + server/src/test/resources/testContext.xml | 7 +- server/test/com/cloud/hypervisor/KVMGuruTest.java | 99 + .../agent/lb/IndirectAgentLBServiceImplTest.java | 208 ++ .../IndirectAgentLBRoundRobinAlgorithmTest.java | 76 + .../IndirectAgentLBShuffleAlgorithmTest.java | 60 + .../IndirectAgentLBStaticAlgorithmTest.java | 49 + .../SecondaryStorageManagerImpl.java | 9 +- systemvm/debian/opt/cloud/bin/checkrouter.sh | 7 + .../opt/cloud/templates/check_heartbeat.sh.templ | 78 +- .../plugins/nuagevsp/libVSD}/__init__.py | 4 + test/integration/plugins/nuagevsp/libVSD/client.py | 135 ++ .../integration/plugins/nuagevsp/libVSD/helpers.py | 602 ++++++ test/integration/plugins/nuagevsp/nuageTestCase.py | 319 ++- .../plugins/nuagevsp/nuage_test_data.py | 2177 ++++---------------- .../plugins/nuagevsp/test_nuage_configdrive.py | 173 +- .../plugins/nuagevsp/test_nuage_extra_dhcp.py | 26 +- .../plugins/nuagevsp/test_nuage_internal_dns.py | 400 +--- .../nuagevsp/test_nuage_network_migration.py | 24 - .../plugins/nuagevsp/test_nuage_password_reset.py | 11 +- .../test_nuage_public_sharednetwork_userdata.py | 13 +- .../plugins/nuagevsp/test_nuage_source_nat.py | 19 +- .../plugins/nuagevsp/test_nuage_static_nat.py | 19 +- .../plugins/nuagevsp/test_nuage_vpc_internal_lb.py | 250 +-- .../nuagevsp/test_nuage_vsp_domain_template.py | 4 + .../nuagevsp/test_nuage_vsp_mngd_subnets.py | 157 +- test/integration/smoke/test_service_offerings.py | 169 +- tools/marvin/marvin/config/test_data.py | 876 ++------ tools/marvin/setup.py | 2 +- .../src/main/java/com/cloud/utils/StringUtils.java | 8 +- .../test/java/com/cloud/utils/StringUtilsTest.java | 11 +- 71 files changed, 3575 insertions(+), 3556 deletions(-) copy core/src/{main/java/org/apache/cloudstack/ca/SetupCertificateAnswer.java => org/apache/cloudstack/agent/lb/SetupMSListAnswer.java} (85%) copy core/src/{main/java/org/apache/cloudstack/agent/directdownload/CheckUrlCommand.java => org/apache/cloudstack/agent/lb/SetupMSListCommand.java} (59%) copy framework/{direct-download => agent-lb}/pom.xml (86%) create mode 100644 framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLB.java create mode 100644 framework/agent-lb/src/org/apache/cloudstack/agent/lb/IndirectAgentLBAlgorithm.java mode change 100755 => 100644 plugins/hypervisors/simulator/src/main/java/com/cloud/resource/SimulatorStorageProcessor.java create mode 100644 server/src/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java create mode 100644 server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithm.java copy utils/src/main/java/com/cloud/utils/ListUtils.java => server/src/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithm.java (52%) copy server/src/{main/java/com/cloud/storage/download/DownloadInProgressState.java => org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithm.java} (58%) create mode 100644 server/test/com/cloud/hypervisor/KVMGuruTest.java create mode 100644 server/test/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImplTest.java create mode 100644 server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBRoundRobinAlgorithmTest.java create mode 100644 server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBShuffleAlgorithmTest.java create mode 100644 server/test/org/apache/cloudstack/agent/lb/algorithm/IndirectAgentLBStaticAlgorithmTest.java copy test/{selenium/common => integration/plugins/nuagevsp/libVSD}/__init__.py (86%) create mode 100644 test/integration/plugins/nuagevsp/libVSD/client.py create mode 100644 test/integration/plugins/nuagevsp/libVSD/helpers.py -- To stop receiving notification emails like this one, please contact ro...@apache.org.