This is an automated email from the ASF dual-hosted git repository.
rafael pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit 1fa4f10 Merge remote-tracking branch 'origin/4.11'
omit f430f41 ca: Fixes #2877 mgmt server cert should have all addrs of
default nic (#2879)
omit 5313c04 Merge remote-tracking branch 'origin/4.11'
omit 5db65a6 kvm: Fixes #2868 libvirt resize notify failure (#2878)
omit b6302d4 Merge remote-tracking branch 'origin/4.11'
omit 0c943ab CertUtils: export private key to pem format correctly (#2875)
omit 769a008 tools: Remove deprecated buildw and wix plugin (#2849)
omit 8c0b9d6 systemvm: baremetal-vr: reduce memory usage (#2866)
omit fe10e68 Merge pull request #2743 from
nuagenetworks/bugfix/marvin_config_drive
omit c2f4b36 packaging: Fixes #2857 don't overwrite agent logrotate config
(#2860)
omit 1f9811d Merge remote-tracking branch 'origin/4.11'
omit d53fc94 CLOUDSTACK-10365: Change the "getXXX" boolean method names to
"isXXX" (#2847)
omit 6f1c555 agent: Fixes #2858 agent LB not working (#2859)
omit cca2505 Handle review comments
omit 9c14059 Merge remote-tracking branch 'origin/4.11'
omit 70dbfa7 systemvm: export $TYPE before patching ssvm/cpvm (#2855)
omit 8da2513 api: Make networkofferingid required in migrateNetwork (#2852)
omit b728e23 Marvin: Register template
omit 41fcf43 Fix config drive test for Shared Network
omit b0490c5 fixed test_nuage_extra_dhcp test failures due to refactoring
omit 6041582 CLOUDSTACK-10380: Refactoring of test_configdrive
omit 8d7a1d6 get new vr after NetworkRestartWithCleanup
omit 02e2825 CLOUDSTACK-10380: Fix startvm giving another password after
password reset.
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/master (fcc87d9)
\
O -- O -- O (1fa4f10)
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:
agent/src/main/java/com/cloud/agent/Agent.java | 2 +-
api/src/main/java/com/cloud/agent/api/to/S3TO.java | 2 +-
.../main/java/com/cloud/offering/DiskOffering.java | 4 +-
.../java/com/cloud/offering/NetworkOffering.java | 30 +-
.../java/com/cloud/offering/ServiceOffering.java | 8 +-
api/src/main/java/com/cloud/storage/GuestOS.java | 2 +-
.../com/cloud/template/VirtualMachineTemplate.java | 4 +-
api/src/main/java/com/cloud/vm/DiskProfile.java | 2 +-
.../command/admin/network/MigrateNetworkCmd.java | 5 +-
.../command/user/address/AssociateIPAddrCmd.java | 2 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 2 +-
client/pom.xml | 254 +++
.../storage/template/S3TemplateDownloader.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 8 +-
.../engine/orchestration/NetworkOrchestrator.java | 16 +-
.../engine/orchestration/VolumeOrchestrator.java | 10 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 8 +-
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 6 +-
.../java/com/cloud/network/vpc/PrivateIpVO.java | 2 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 30 +-
.../offerings/dao/NetworkOfferingDaoImpl.java | 2 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 12 +-
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 10 +-
.../java/com/cloud/storage/DiskOfferingVO.java | 4 +-
.../src/main/java/com/cloud/storage/GuestOSVO.java | 2 +-
.../main/java/com/cloud/storage/VMTemplateVO.java | 4 +-
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41110to41120.java | 12 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 12 +-
.../resourcedetail/ResourceDetailsDao.java | 2 -
.../resourcedetail/ResourceDetailsDaoBase.java | 14 +-
.../storage/image/store/TemplateObject.java | 8 +-
.../storage/image/TemplateEntityImpl.java | 4 +-
.../cloudstack/quota/vo/ServiceOfferingVO.java | 10 +-
packaging/centos63/cloud.spec | 2 +-
packaging/centos7/cloud.spec | 2 +-
.../cloudstack/ca/provider/RootCAProvider.java | 2 +-
.../cloud/network/lb/LoadBalanceRuleHandler.java | 2 +-
.../network/contrail/management/ContrailGuru.java | 2 +-
.../contrail/management/ManagementNetworkGuru.java | 2 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 2 +-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 2 +-
.../com/cloud/network/element/NuageVspElement.java | 4 +-
.../network/guru/NuageVspGuestNetworkGuru.java | 4 +-
.../java/com/cloud/util/NuageVspEntityBuilder.java | 6 +-
.../cloud/network/element/NuageVspElementTest.java | 8 +-
.../network/guru/NuageVspGuestNetworkGuruTest.java | 8 +-
.../com/cloud/util/NuageVspEntityBuilderTest.java | 2 +-
.../opendaylight/OpendaylightGuestNetworkGuru.java | 2 +-
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 2 +-
.../network/guru/VxlanGuestNetworkGuruTest.java | 2 +-
pom.xml | 11 +
scripts/installer/windows/Setup_Databases.wxs | 39 +
scripts/installer/windows/WixInstallerDialog.wxs | 76 +
scripts/installer/windows/acs.wxs | 307 +++
scripts/installer/windows/acs_license.rtf | 157 ++
scripts/installer/windows/client.wxs | 2329 ++++++++++++++++++++
scripts/installer/windows/dependencies.wxs | 28 +
scripts/installer/windows/en-us.wxl | 43 +
scripts/installer/windows/optionstheme.xml | 69 +
scripts/installer/windows/optionstheme_en-us.wxl | 57 +
scripts/installer/windows/start.bat | 12 +
scripts/storage/qcow2/resizevolume.sh | 3 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 30 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 4 +-
.../deploy/DeploymentPlanningManagerImpl.java | 6 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 2 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 4 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 6 +-
.../java/com/cloud/network/NetworkModelImpl.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 26 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../network/element/VirtualRouterElement.java | 19 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 2 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 2 +-
.../network/guru/ExternalGuestNetworkGuru.java | 2 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 8 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 2 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 4 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 2 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 2 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 6 +-
.../cloud/network/router/CommandSetupHelper.java | 6 +-
.../cloud/network/router/NetworkHelperImpl.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 12 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 12 +-
.../com/cloud/network/vpc/PrivateIpAddress.java | 2 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 6 +-
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 4 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 8 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 8 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 63 +-
.../network/topology/BasicNetworkVisitor.java | 2 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 8 +-
.../SecondaryStorageManagerImpl.java | 4 +-
systemvm/debian/opt/cloud/bin/baremetal-vr.py | 2 +-
.../debian/opt/cloud/bin/setup/cloud-early-config | 6 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 2 +-
test/integration/component/test_configdrive.py | 2161 +++++++++---------
test/integration/plugins/nuagevsp/nuageTestCase.py | 126 +-
test/integration/plugins/nuagevsp/nuage_lib.py | 53 +-
.../plugins/nuagevsp/test_nuage_configdrive.py | 2088 +++++++++++-------
.../plugins/nuagevsp/test_nuage_extra_dhcp.py | 49 +-
.../plugins/nuagevsp/test_nuage_internal_dns.py | 46 +-
.../nuagevsp/test_nuage_network_migration.py | 18 +-
.../plugins/nuagevsp/test_nuage_password_reset.py | 19 +-
.../plugins/nuagevsp/test_nuage_source_nat.py | 20 +-
.../plugins/nuagevsp/test_nuage_static_nat.py | 26 +-
.../plugins/nuagevsp/test_nuage_vpc_internal_lb.py | 130 +-
.../plugins/nuagevsp/test_nuage_vpc_network.py | 6 +-
.../nuagevsp/test_nuage_vsp_domain_template.py | 18 +-
.../nuagevsp/test_nuage_vsp_mngd_subnets.py | 12 +-
.../scripts/configure_systemvm_services.sh | 2 +-
tools/marvin/marvin/lib/base.py | 11 +-
tools/marvin/marvin/lib/common.py | 6 +-
tools/marvin/setup.py | 6 +-
tools/wix-cloudstack-maven-plugin/pom.xml | 84 +
.../java/org/apache/cloudstack/wix/HeatMojo.java | 144 ++
.../main/java/com/cloud/utils/net/NetUtils.java | 21 -
.../cloudstack/utils/security/CertUtils.java | 4 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 5 -
125 files changed, 6496 insertions(+), 2529 deletions(-)
create mode 100644 scripts/installer/windows/Setup_Databases.wxs
create mode 100644 scripts/installer/windows/WixInstallerDialog.wxs
create mode 100644 scripts/installer/windows/acs.wxs
create mode 100644 scripts/installer/windows/acs_license.rtf
create mode 100644 scripts/installer/windows/client.wxs
create mode 100644 scripts/installer/windows/dependencies.wxs
create mode 100644 scripts/installer/windows/en-us.wxl
create mode 100644 scripts/installer/windows/optionstheme.xml
create mode 100644 scripts/installer/windows/optionstheme_en-us.wxl
create mode 100644 scripts/installer/windows/start.bat
create mode 100644 tools/wix-cloudstack-maven-plugin/pom.xml
create mode 100644
tools/wix-cloudstack-maven-plugin/src/main/java/org/apache/cloudstack/wix/HeatMojo.java
