You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2017/12/24 06:51:00 UTC
[cloudstack] branch master updated (a7b233c -> f8a31b0)
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 a7b233c Merge branch '4.10'
add 78bb741 CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
add 2aa70ee CLOUDSTACK-10013: Make Debian9 systemvmtemplates work with systemd
add bb96564 CLOUDSTACK-10013: Debian9 SystemVM appliance improvements
add 893f2af CLOUDSTACK-7853: Fix ping timeout edge case and refactor code
add d0005d8 CLOUDSTACK-9348: Improve Nio SSH handshake buffers
add 0102e85 CLOUDSTACK-10129: UX improvements and event timeline
add 9aa7d4e CLOUDSTACK-10013: SystemVM.iso refactoring and cleanups
add 8c53574 CLOUDSTACK-10013: Fix ipsec VPN configuration
add d943eb9 CLOUDSTACK-10010: Port marvin test from #2190 by @swill
add 551e11c CLOUDSTACK-10013: Make the generated VR/json files unique (ports #1470)
add 85aee8d CLOUDSTACK-10013: SystemVM codebase refactorings and improvements
add facc594 CLOUDSTACK-10193: Fix smoke tests failures with new systemvmtemplate
add 6fc389a CLOUDSTACK-10187: Don't delete vifs for VPCs with source nat
add 6ab46b3 CLOUDSTACK-9501: route is not available by default on CentOS7 (#1637)
add ce33032 CLOUDSTACK-9953: Resize root disk for VMware when full clone is enabled
add 15b11a3 CLOUDSTACK-10013: Fix VMware related issues and fix misc tests
add 60a216b CLOUDSTACK-10193: Use other64Linux for systemvms on VMware
add 3839239 CLOUDSTACK-10194: Use packer for building systemvmtemplates
add 0b43cd9 CLOUDSTACK-10013: Add systemvm 4.11 migration in 4.10->4.11 upgrade path
add 68b3b44 CLOUDSTACK-10001: Fix incorrect total host memory in responses
add 4338e0f CLOUDSTACK-9595: Fix another regression introduced in #1762
add d19629a CLOUDSTACK-10013: Fixes based on code review and test failures
new f8a31b0 Merge pull request #2211 from apache/debian9-systemvmtemplate
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:
.gitignore | 2 +
.travis.yml | 12 +-
LICENSE | 67 +-
.../tomcatconf/commands-simulator.properties.in | 21 -
.../consoleproxy/ConsoleProxyResource.java | 16 +-
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../api/command/user/event/ListEventsCmd.java | 7 +
.../cloudstack/api/response/EventResponse.java | 2 +-
client/pom.xml | 1 -
.../facade/AbstractConfigItemFacade.java | 21 +-
.../src/com/cloud/network/HAProxyConfigurator.java | 16 +-
.../virtualnetwork/VirtualRoutingResourceTest.java | 8 +-
developer/developer-prefill.sql | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 16 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 34 +-
.../resources/META-INF/db/schema-41000to41100.sql | 7 +
.../com/cloud/upgrade/dao/Upgrade41000to41100.java | 189 ++-
.../com/cloud/upgrade/dao/Upgrade4930to41000.java | 184 +--
.../schema/src/com/cloud/user/UserAccountVO.java | 4 +
engine/schema/src/com/cloud/user/UserVO.java | 4 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +
packaging/centos7/cloud.spec | 1 +
.../kvm/resource/LibvirtComputingResource.java | 12 +-
.../hypervisor/vmware/resource/VmwareResource.java | 42 +-
pom.xml | 44 +-
python/lib/cloudutils/utilities.py | 7 +-
scripts/util/keystore-cert-import | 4 +-
scripts/util/keystore-setup | 4 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 10 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 12 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 8 +-
.../com/cloud/network/IpAddressManagerImpl.java | 127 +-
.../cloud/network/router/CommandSetupHelper.java | 19 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 5 +
.../com/cloud/resource/ResourceManagerImpl.java | 2 +-
server/src/com/cloud/server/StatsCollector.java | 32 +-
.../secondary/SecondaryStorageVmManager.java | 4 +-
.../src/com/cloud/consoleproxy/ConsoleProxy.java | 41 +-
.../resource/NfsSecondaryStorageResource.java | 9 +-
.../storage/template/DownloadManagerImpl.java | 27 +-
.../storage/template/UploadManagerImpl.java | 60 +-
setup/dev/advanced.cfg | 2 +-
systemvm/{ => agent}/certs/localhost.crt | 0
systemvm/{ => agent}/certs/localhost.key | 0
systemvm/{ => agent}/certs/realhostip.crt | 0
systemvm/{ => agent}/certs/realhostip.csr | 0
systemvm/{ => agent}/certs/realhostip.key | 0
systemvm/{ => agent}/certs/realhostip.keystore | Bin
systemvm/{ => agent}/conf/agent.properties | 4 +-
systemvm/{ => agent}/conf/consoleproxy.properties | 4 +-
systemvm/{ => agent}/conf/environment.properties | 0
systemvm/agent/conf/log4j-cloud.xml | 131 ++
systemvm/{ => agent}/css/ajaxviewer.css | 74 +-
systemvm/{ => agent}/css/logger.css | 21 +-
systemvm/{ => agent}/images/back.gif | Bin
systemvm/{ => agent}/images/bright-green.png | Bin
systemvm/{ => agent}/images/cad.gif | Bin
systemvm/{ => agent}/images/cannotconnect.jpg | Bin
systemvm/{ => agent}/images/clr_button.gif | Bin
systemvm/{ => agent}/images/clr_button_hover.gif | Bin
systemvm/{ => agent}/images/dot.cur | Bin
systemvm/{ => agent}/images/gray-green.png | Bin
systemvm/{ => agent}/images/grid_headerbg.gif | Bin
systemvm/{ => agent}/images/left.png | Bin
systemvm/{ => agent}/images/minimize_button.gif | Bin
.../{ => agent}/images/minimize_button_hover.gif | Bin
systemvm/{ => agent}/images/notready.jpg | Bin
systemvm/{ => agent}/images/play_button.gif | Bin
systemvm/{ => agent}/images/play_button_hover.gif | Bin
systemvm/{ => agent}/images/right.png | Bin
systemvm/{ => agent}/images/right2.png | Bin
systemvm/{ => agent}/images/shrink_button.gif | Bin
.../{ => agent}/images/shrink_button_hover.gif | Bin
systemvm/{ => agent}/images/stop_button.gif | Bin
systemvm/{ => agent}/images/stop_button_hover.gif | Bin
systemvm/{ => agent}/images/winlog.png | Bin
systemvm/{ => agent}/js/ajaxkeys.js | 0
systemvm/{ => agent}/js/ajaxviewer.js | 395 +++--
systemvm/{ => agent}/js/cloud.logger.js | 135 +-
systemvm/{ => agent}/js/handler.js | 4 +-
systemvm/{ => agent}/js/jquery.flot.navigate.js | 58 +-
systemvm/{ => agent}/js/jquery.js | 0
systemvm/{ => agent}/scripts/_run.sh | 28 +-
systemvm/{ => agent}/scripts/config_auth.sh | 10 +-
systemvm/agent/scripts/config_ssl.sh | 143 ++
systemvm/{ => agent}/scripts/consoleproxy.sh | 4 +-
systemvm/{ => agent}/scripts/ipfirewall.sh | 5 +-
systemvm/{ => agent}/scripts/run-proxy.sh | 10 +-
systemvm/{ => agent}/scripts/run.sh | 8 +-
systemvm/{ => agent}/scripts/secstorage.sh | 4 +-
systemvm/{ => agent}/scripts/ssvm-check.sh | 10 +-
systemvm/{ => agent}/scripts/utils.sh | 0
systemvm/{ => agent}/ui/viewer-bad-sid.ftl | 4 +-
systemvm/{ => agent}/ui/viewer-connect-failed.ftl | 4 +-
systemvm/{ => agent}/ui/viewer-update.ftl | 3 +-
systemvm/{ => agent}/ui/viewer.ftl | 28 +-
systemvm/bindir/cloud-setup-console-proxy.in | 220 ---
systemvm/conf.dom0/agent.properties.in | 46 -
systemvm/conf.dom0/consoleproxy.properties.in | 23 -
systemvm/conf.dom0/log4j-cloud.xml.in | 111 --
systemvm/conf/agent.properties.ssvm | 21 -
systemvm/conf/log4j-cloud.xml | 112 --
.../config => debian}/etc/apache2/httpd.conf | 0
.../config => debian}/etc/apache2/vhost.template | 9 +-
.../debian/config => debian}/etc/cloud-nic.rules | 1 -
.../debian/config => debian}/etc/dnsmasq.conf.tmpl | 16 +-
.../config => debian}/etc/haproxy/haproxy.cfg | 9 +-
.../{patches/debian/vpn => debian}/etc/ipsec.conf | 0
.../debian/vpn => debian}/etc/ipsec.d/l2tp.conf | 12 +-
.../debian/vpn => debian}/etc/ipsec.secrets | 0
.../etc/iptables/iptables-consoleproxy | 12 +-
.../etc/iptables/iptables-dhcpsrvr | 2 +-
.../config => debian}/etc/iptables/iptables-elbvm | 3 +-
.../config => debian}/etc/iptables/iptables-ilbvm | 3 +-
.../config => debian}/etc/iptables/iptables-router | 2 +-
.../etc/iptables/iptables-secstorage | 12 +-
.../etc/iptables/iptables-vpcrouter | 2 +-
.../config => debian}/etc/iptables/rt_tables_init | 2 +-
.../debian/config => debian}/etc/iptables/rules | 3 +-
.../debian/config => debian}/etc/logrotate.conf | 1 -
.../config => debian}/etc/logrotate.d/apache2 | 0
.../debian/config => debian}/etc/logrotate.d/cloud | 0
.../config => debian}/etc/logrotate.d/conntrackd | 0
.../config => debian}/etc/logrotate.d/dnsmasq | 1 -
.../config => debian}/etc/logrotate.d/haproxy | 0
.../debian/config => debian}/etc/logrotate.d/ppp | 1 -
.../config => debian}/etc/logrotate.d/rsyslog | 0
.../etc/modprobe.d/aesni_intel.conf | 0
.../config => debian}/etc/modprobe.d/pcspkr.conf | 0
.../debian/vpn => debian}/etc/ppp/options.xl2tpd | 2 -
.../config => debian}/etc/profile.d/cloud.sh | 2 +-
.../debian/config => debian}/etc/rsyslog.conf | 0
.../debian/config => debian}/etc/ssh/sshd_config | 16 +-
.../debian/config => debian}/etc/sysctl.conf | 3 +-
.../etc/systemd/system/cloud-early-config.service | 18 +
.../systemd/system/cloud-password-server@.service | 12 +
.../etc/systemd/system/cloud-postinit.service | 14 +
systemvm/debian/etc/systemd/system/cloud.service | 13 +
.../debian/config => debian}/etc/vpcdnsmasq.conf | 22 +-
.../debian/vpn => debian}/etc/xl2tpd/xl2tpd.conf | 0
.../opt/cloud/bin/baremetal-vr.py | 320 ++--
.../opt/cloud/bin/baremetal_snat.sh | 3 +-
.../opt/cloud/bin/bumpup_priority.sh | 0
.../opt/cloud/bin/checkbatchs2svpn.sh | 0
.../config => debian}/opt/cloud/bin/checkrouter.sh | 0
.../config => debian}/opt/cloud/bin/checks2svpn.sh | 0
.../config => debian}/opt/cloud/bin/cloud-nic.sh | 2 +-
.../config => debian}/opt/cloud/bin/configure.py | 402 +++--
.../opt/cloud/bin/cs/CsAddress.py | 5 +-
.../config => debian}/opt/cloud/bin/cs/CsApp.py | 17 +-
.../config => debian}/opt/cloud/bin/cs/CsConfig.py | 0
.../opt/cloud/bin/cs/CsDatabag.py | 4 +-
.../config => debian}/opt/cloud/bin/cs/CsDhcp.py | 20 +-
.../config => debian}/opt/cloud/bin/cs/CsFile.py | 9 +-
.../opt/cloud/bin/cs/CsGuestNetwork.py | 2 +-
.../config => debian}/opt/cloud/bin/cs/CsHelper.py | 19 +-
.../opt/cloud/bin/cs/CsLoadBalancer.py | 0
.../opt/cloud/bin/cs/CsMonitor.py | 0
.../opt/cloud/bin/cs/CsNetfilter.py | 12 +-
.../opt/cloud/bin/cs/CsProcess.py | 0
.../opt/cloud/bin/cs/CsRedundant.py | 12 +-
.../config => debian}/opt/cloud/bin/cs/CsRoute.py | 9 +-
.../config => debian}/opt/cloud/bin/cs/CsRule.py | 2 +-
.../opt/cloud/bin/cs/CsStaticRoutes.py | 5 +-
.../config => debian}/opt/cloud/bin/cs/__init__.py | 0
.../config => debian}/opt/cloud/bin/cs_cmdline.py | 2 -
.../config => debian}/opt/cloud/bin/cs_dhcp.py | 5 +-
.../opt/cloud/bin/cs_firewallrules.py | 1 -
.../opt/cloud/bin/cs_forwardingrules.py | 2 -
.../opt/cloud/bin/cs_guestnetwork.py | 1 -
.../config => debian}/opt/cloud/bin/cs_ip.py | 5 +-
.../opt/cloud/bin/cs_loadbalancer.py | 1 -
.../opt/cloud/bin/cs_monitorservice.py | 1 -
.../opt/cloud/bin/cs_network_acl.py | 1 -
.../opt/cloud/bin/cs_remoteaccessvpn.py | 1 -
.../opt/cloud/bin/cs_site2sitevpn.py | 1 -
.../opt/cloud/bin/cs_staticroutes.py | 1 -
.../config => debian}/opt/cloud/bin/cs_vmdata.py | 2 -
.../config => debian}/opt/cloud/bin/cs_vmp.py | 2 +-
.../config => debian}/opt/cloud/bin/cs_vpnusers.py | 5 +-
.../config => debian}/opt/cloud/bin/dnsmasq.sh | 4 +-
.../config => debian}/opt/cloud/bin/edithosts.sh | 4 +-
.../opt/cloud/bin/getRouterAlerts.sh | 0
.../opt/cloud/bin/get_template_version.sh | 0
.../debian/config => debian}/opt/cloud/bin/ilb.sh | 34 +-
.../config => debian}/opt/cloud/bin/ipassoc.sh | 43 +-
.../config => debian}/opt/cloud/bin/ipsectunnel.sh | 66 +-
.../config => debian}/opt/cloud/bin/line_edit.py | 0
.../opt/cloud/bin/loadbalancer.sh | 80 +-
.../config => debian}/opt/cloud/bin/master.py | 2 +-
.../config => debian}/opt/cloud/bin/merge.py | 42 +-
.../opt/cloud/bin/monitor_service.sh | 3 -
.../config => debian}/opt/cloud/bin/netusage.sh | 23 +-
.../opt/cloud/bin/passwd_server_ip.py | 0
.../config => debian}/opt/cloud/bin/prepare_pxe.sh | 6 +-
.../opt/cloud/bin/savepassword.sh | 0
.../opt/cloud/bin/set_redundant.py | 7 +-
.../debian/opt/cloud/bin/setup/cloud-early-config | 231 +++
systemvm/debian/opt/cloud/bin/setup/common.sh | 794 ++++++++++
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 60 +
.../debian/opt/cloud/bin/setup/default.sh | 13 +-
systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh | 59 +
.../opt/cloud/bin/setup/elbvm.sh} | 54 +-
.../opt/cloud/bin/setup/ilbvm.sh} | 51 +-
.../debian/opt/cloud/bin/setup/patchsystemvm.sh | 61 +
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 85 ++
systemvm/debian/opt/cloud/bin/setup/router.sh | 95 ++
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 89 ++
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 120 ++
.../opt/cloud/bin/update_config.py | 17 +-
.../config => debian}/opt/cloud/bin/vmdata.py | 2 +-
.../config => debian}/opt/cloud/bin/vpc_func.sh | 2 +-
.../opt/cloud/bin/vpc_netusage.sh | 26 +-
.../config => debian}/opt/cloud/bin/vpc_snat.sh | 0
.../opt/cloud/bin/vpc_staticroute.sh | 5 +-
.../vpn => debian}/opt/cloud/bin/vpn_l2tp.sh | 26 +-
.../config => debian}/opt/cloud/bin/vr_cfg.sh | 0
.../opt/cloud/templates}/arping_gateways.sh.templ | 0
.../opt/cloud/templates}/check_bumpup.sh | 0
.../opt/cloud/templates/check_heartbeat.sh.templ | 8 +-
.../opt/cloud/templates/checkrouter.sh.templ | 2 +-
.../opt/cloud/templates/conntrackd.conf.templ | 419 ++++++
.../opt/cloud/templates/heartbeat.sh.templ | 0
.../opt/cloud/templates/keepalived.conf.templ | 12 +-
.../config => debian}/opt/cloud/testdata/README | 0
systemvm/debian/opt/cloud/testdata/acl0001.json | 54 +
.../opt/cloud/testdata/dhcp0001.json | 0
.../opt/cloud/testdata/gn0001.json | 0
.../opt/cloud/testdata/ips0001.json | 0
.../opt/cloud/testdata/ips0002.json | 0
.../opt/cloud/testdata/ips0003.json | 0
.../opt/cloud/testdata/s2s0001.json | 0
.../bin => debian/opt/cloud/testdata}/test.sh | 1 -
.../opt/cloud/testdata/vmp0001.json | 0
systemvm/debian/root/.ssh/authorized_keys | 1 +
.../config => debian}/root/clearUsageRules.sh | 2 +-
.../{patches/debian/config => debian}/root/func.sh | 0
.../config => debian}/root/monitorServices.py | 7 -
.../debian/config => debian}/root/reconfigLB.sh | 1 -
.../var/www/html/latest/.htaccess | 1 -
.../var/www/html/userdata/.htaccess | 0
.../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 --
.../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 --
.../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 --
.../SYSCONFDIR/init.d/cloud-console-proxy.in | 110 --
systemvm/libexec/console-proxy-runner.in | 90 --
systemvm/patches/debian/README | 34 -
systemvm/patches/debian/buildsystemvm.sh | 577 -------
systemvm/patches/debian/config.dat | 398 -----
systemvm/patches/debian/config/etc/chef/node.json | 5 -
systemvm/patches/debian/config/etc/chef/solo.rb | 21 -
systemvm/patches/debian/config/etc/default/cloud | 19 -
.../debian/config/etc/default/cloud-passwd-srvr | 19 -
systemvm/patches/debian/config/etc/init.d/cloud | 157 --
.../debian/config/etc/init.d/cloud-early-config | 1591 --------------------
.../debian/config/etc/init.d/cloud-passwd-srvr | 124 --
systemvm/patches/debian/config/etc/init.d/postinit | 178 ---
systemvm/patches/debian/config/etc/rc.local | 64 -
.../debian/config/opt/cloud/bin/passwd_server | 26 -
.../debian/config/opt/cloud/bin/passwd_server_ip | 31 -
.../debian/config/opt/cloud/bin/patchsystemvm.sh | 262 ----
.../debian/config/opt/cloud/bin/vpc_passwd_server | 32 -
.../debian/config/opt/cloud/templates/README | 2 -
.../opt/cloud/templates/arping_gateways.sh.templ | 29 -
.../opt/cloud/templates/conntrackd.conf.templ | 417 -----
.../debian/config/opt/cloud/testdata/acl0001.json | 54 -
.../debian/config/root/.ssh/authorized_keys | 1 -
.../config/root/redundant_router/backup.sh.templ | 39 -
.../root/redundant_router/check_heartbeat.sh.templ | 60 -
.../root/redundant_router/conntrackd.conf.templ | 401 -----
.../config/root/redundant_router/disable_pubip.sh | 23 -
.../config/root/redundant_router/fault.sh.templ | 37 -
.../root/redundant_router/heartbeat.sh.templ | 20 -
.../root/redundant_router/keepalived.conf.templ | 57 -
.../config/root/redundant_router/master.sh.templ | 60 -
.../root/redundant_router/primary-backup.sh.templ | 126 --
.../config/root/redundant_router/services.sh | 68 -
systemvm/patches/debian/convert.sh | 64 -
systemvm/patches/debian/qemuconvert.sh | 32 -
systemvm/patches/debian/systemvm.vmx | 37 -
systemvm/patches/debian/systemvm.xml | 53 -
systemvm/patches/debian/vhdconvert.sh | 40 -
systemvm/patches/debian/xe/xe-daemon | 65 -
systemvm/patches/debian/xe/xe-linux-distribution | 267 ----
systemvm/patches/debian/xe/xe-update-guest-attrs | 226 ---
systemvm/pom.xml | 27 +-
systemvm/scripts/config_ssl.sh | 218 ---
systemvm/scripts/run.bat | 18 -
...escriptor.xml => systemvm-agent-descriptor.xml} | 22 +-
systemvm/test/{python => }/TestCsAddress.py | 0
systemvm/test/{python => }/TestCsApp.py | 0
systemvm/test/{python => }/TestCsCmdLine.py | 0
systemvm/test/{python => }/TestCsConfig.py | 0
systemvm/test/{python => }/TestCsDatabag.py | 0
systemvm/test/{python => }/TestCsDhcp.py | 0
systemvm/test/{python => }/TestCsFile.py | 0
systemvm/test/{python => }/TestCsGuestNetwork.py | 3 +-
systemvm/test/{python => }/TestCsHelper.py | 0
systemvm/test/{python => }/TestCsInterface.py | 0
systemvm/test/{python => }/TestCsNetfilter.py | 0
systemvm/test/{python => }/TestCsProcess.py | 0
systemvm/test/{python => }/TestCsRedundant.py | 0
systemvm/test/{python => }/TestCsRoute.py | 5 +-
systemvm/test/{python => }/TestCsRule.py | 0
systemvm/test/{python => }/runtests.sh | 21 +-
systemvm/vm-script/vmops | 119 --
.../integration/component/test_browse_templates.py | 6 +-
test/integration/component/test_browse_volumes.py | 6 +-
test/integration/component/test_security_groups.py | 4 +-
test/integration/smoke/test_accounts.py | 22 +-
test/integration/smoke/test_affinity_groups.py | 10 +-
.../smoke/test_affinity_groups_projects.py | 11 +-
.../smoke/test_deploy_virtio_scsi_vm.py | 4 +-
test/integration/smoke/test_deploy_vm_iso.py | 8 +-
.../smoke/test_deploy_vm_root_resize.py | 56 +-
.../smoke/test_deploy_vm_with_userdata.py | 11 +-
...st_deploy_vms_with_varied_deploymentplanners.py | 9 +-
test/integration/smoke/test_host_maintenance.py | 6 +-
test/integration/smoke/test_hostha_kvm.py | 11 +-
test/integration/smoke/test_hosts.py | 170 ---
test/integration/smoke/test_internal_lb.py | 53 +-
test/integration/smoke/test_iso.py | 0
test/integration/smoke/test_list_ids_parameter.py | 80 +-
test/integration/smoke/test_loadbalance.py | 25 +-
test/integration/smoke/test_metrics_api.py | 4 +-
test/integration/smoke/test_multipleips_per_nic.py | 7 +-
.../smoke/test_nested_virtualization.py | 15 +-
test/integration/smoke/test_network.py | 41 +-
test/integration/smoke/test_network_acl.py | 9 +-
test/integration/smoke/test_nic_adapter_type.py | 6 +-
test/integration/smoke/test_password_server.py | 15 +-
test/integration/smoke/test_portforwardingrules.py | 6 +-
test/integration/smoke/test_privategw_acl.py | 76 +-
test/integration/smoke/test_projects.py | 7 +-
test/integration/smoke/test_reset_vm_on_reboot.py | 7 +-
test/integration/smoke/test_router_dhcphosts.py | 12 +-
test/integration/smoke/test_router_dns.py | 13 +-
test/integration/smoke/test_router_dnsservice.py | 27 +-
test/integration/smoke/test_routers.py | 30 +-
.../smoke/test_routers_iptables_default_policy.py | 15 +-
test/integration/smoke/test_routers_network_ops.py | 70 +-
test/integration/smoke/test_service_offerings.py | 11 +-
test/integration/smoke/test_snapshots.py | 65 +-
test/integration/smoke/test_ssvm.py | 237 +--
test/integration/smoke/test_templates.py | 22 +-
test/integration/smoke/test_usage.py | 22 +-
test/integration/smoke/test_vm_life_cycle.py | 0
test/integration/smoke/test_volumes.py | 2 +
test/integration/smoke/test_vpc_redundant.py | 91 +-
test/integration/smoke/test_vpc_router_nics.py | 30 +-
test/integration/smoke/test_vpc_vpn.py | 568 +++++--
tools/appliance/.ruby-version | 1 -
tools/appliance/.rvmrc | 24 -
tools/appliance/Gemfile | 25 -
tools/appliance/README.md | 105 +-
tools/appliance/build.sh | 362 +----
tools/appliance/builtin/http/kickstart.cfg | 91 ++
.../appliance/builtin/scripts/base.sh | 22 +-
.../appliance/builtin/scripts/cleanup.sh | 17 +-
tools/appliance/builtin/template.json | 53 +
tools/appliance/convert/Convert.class | Bin 984 -> 0 bytes
tools/appliance/convert/Convert.java | 36 -
tools/appliance/convert_ovf_vbox_to_esx.xslt | 42 -
tools/appliance/definitions/builtin/base.sh | 14 -
tools/appliance/definitions/builtin/cleanup.sh | 21 -
tools/appliance/definitions/builtin/definition.rb | 33 -
.../definitions/builtin/install-xs-tools.sh | 10 -
tools/appliance/definitions/builtin/ks.cfg | 35 -
tools/appliance/definitions/builtin/postinstall.sh | 54 -
tools/appliance/definitions/builtin/zerodisk.sh | 3 -
tools/appliance/definitions/debianbase/cleanup.sh | 49 -
.../appliance/definitions/debianbase/definition.rb | 80 -
tools/appliance/definitions/debianbase/zerodisk.sh | 43 -
tools/appliance/definitions/devcloud/base.sh | 12 -
tools/appliance/definitions/devcloud/cleanup.sh | 21 -
tools/appliance/definitions/devcloud/definition.rb | 45 -
.../appliance/definitions/devcloud/postinstall.sh | 60 -
tools/appliance/definitions/devcloud/preseed.cfg | 357 -----
tools/appliance/definitions/devcloud/zerodisk.sh | 11 -
.../systemvmtemplate/authorized_keys.sh | 29 -
.../systemvmtemplate/configure_login.sh | 78 -
.../definitions/systemvmtemplate/definition.rb | 101 --
.../definitions/systemvmtemplate/preseed.cfg | 134 --
.../definitions/systemvmtemplate/zerodisk.sh | 43 -
tools/appliance/shar_cloud_scripts.sh | 9 +-
.../http}/preseed.cfg | 69 +-
.../scripts}/apt_upgrade.sh | 27 +-
.../scripts/authorized_keys.sh} | 9 +-
.../scripts}/cleanup.sh | 36 +-
.../systemvmtemplate/scripts/configure_acpid.sh | 13 +-
.../scripts}/configure_conntrack.sh | 4 +
.../scripts}/configure_grub.sh | 16 +-
.../scripts}/configure_locale.sh | 0
.../scripts/configure_login.sh} | 35 +-
.../scripts}/configure_networking.sh | 24 +-
.../scripts}/configure_persistent_config.sh | 1 -
.../scripts}/configure_systemvm_services.sh | 57 +-
.../scripts/finalize.sh} | 63 +-
.../scripts}/install_systemvm_packages.sh | 66 +-
tools/appliance/systemvmtemplate/template.json | 82 +
tools/appliance/test.sh | 180 ---
tools/appliance/vbox_disk_clean.rb | 49 -
tools/appliance/vbox_vm_clean.rb | 77 -
tools/marvin/marvin/config/test_data.py | 60 +-
tools/marvin/marvin/lib/base.py | 7 +-
tools/marvin/marvin/lib/common.py | 47 +
tools/travis/before_install.sh | 2 +-
tools/travis/install.sh | 4 +
tools/vagrant/devcloud/Vagrantfile | 206 ---
tools/vagrant/devcloud/templates/tmpl/1/1/README | 1 -
tools/vagrant/devcloud/templates/tmpl/1/5/README | 2 -
tools/vagrant/systemvm/.gitignore | 52 -
tools/vagrant/systemvm/.ruby-version | 1 -
tools/vagrant/systemvm/.rvmrc | 24 -
tools/vagrant/systemvm/Gemfile | 20 -
tools/vagrant/systemvm/README.md | 30 -
tools/vagrant/systemvm/VBoxManage | 41 -
tools/vagrant/systemvm/Vagrantfile | 123 --
tools/vagrant/systemvm/test.sh | 213 ---
tools/vagrant/systemvm/vagrant.pub | 1 -
tools/whisker/LICENSE | 8 +-
tools/whisker/descriptor-for-packaging.xml | 8 +-
tools/whisker/descriptor.xml | 37 +-
ui/css/cloudstack3.css | 3 +-
ui/l10n/en.js | 2 +
ui/scripts/events.js | 20 +-
ui/scripts/instances.js | 275 ++--
ui/scripts/metrics.js | 13 +-
ui/scripts/network.js | 51 +-
ui/scripts/sharedFunctions.js | 2 +-
ui/scripts/storage.js | 30 +-
ui/scripts/system.js | 112 +-
ui/scripts/templates.js | 27 +
ui/scripts/ui/dialog.js | 2 +-
ui/scripts/ui/widgets/dataTable.js | 13 +-
ui/scripts/ui/widgets/multiEdit.js | 2 +-
.../src/main/java/com/cloud/utils/ReflectUtil.java | 21 +
utils/src/main/java/com/cloud/utils/nio/Link.java | 72 +-
.../main/java/com/cloud/utils/nio/NioClient.java | 2 +-
.../java/com/cloud/utils/nio/NioConnection.java | 2 +-
.../java/com/cloud/utils/time/InaccurateClock.java | 2 +-
.../utils/imagestore/ImageStoreUtil.java | 2 +-
443 files changed, 6168 insertions(+), 13129 deletions(-)
delete mode 100644 agent-simulator/tomcatconf/commands-simulator.properties.in
rename systemvm/{ => agent}/certs/localhost.crt (100%)
rename systemvm/{ => agent}/certs/localhost.key (100%)
rename systemvm/{ => agent}/certs/realhostip.crt (100%)
rename systemvm/{ => agent}/certs/realhostip.csr (100%)
rename systemvm/{ => agent}/certs/realhostip.key (100%)
rename systemvm/{ => agent}/certs/realhostip.keystore (100%)
rename systemvm/{ => agent}/conf/agent.properties (99%)
rename systemvm/{ => agent}/conf/consoleproxy.properties (99%)
rename systemvm/{ => agent}/conf/environment.properties (100%)
create mode 100644 systemvm/agent/conf/log4j-cloud.xml
rename systemvm/{ => agent}/css/ajaxviewer.css (80%)
rename systemvm/{ => agent}/css/logger.css (93%)
rename systemvm/{ => agent}/images/back.gif (100%)
rename systemvm/{ => agent}/images/bright-green.png (100%)
rename systemvm/{ => agent}/images/cad.gif (100%)
rename systemvm/{ => agent}/images/cannotconnect.jpg (100%)
rename systemvm/{ => agent}/images/clr_button.gif (100%)
rename systemvm/{ => agent}/images/clr_button_hover.gif (100%)
rename systemvm/{ => agent}/images/dot.cur (100%)
rename systemvm/{ => agent}/images/gray-green.png (100%)
rename systemvm/{ => agent}/images/grid_headerbg.gif (100%)
rename systemvm/{ => agent}/images/left.png (100%)
rename systemvm/{ => agent}/images/minimize_button.gif (100%)
rename systemvm/{ => agent}/images/minimize_button_hover.gif (100%)
rename systemvm/{ => agent}/images/notready.jpg (100%)
rename systemvm/{ => agent}/images/play_button.gif (100%)
rename systemvm/{ => agent}/images/play_button_hover.gif (100%)
rename systemvm/{ => agent}/images/right.png (100%)
rename systemvm/{ => agent}/images/right2.png (100%)
rename systemvm/{ => agent}/images/shrink_button.gif (100%)
rename systemvm/{ => agent}/images/shrink_button_hover.gif (100%)
rename systemvm/{ => agent}/images/stop_button.gif (100%)
rename systemvm/{ => agent}/images/stop_button_hover.gif (100%)
rename systemvm/{ => agent}/images/winlog.png (100%)
rename systemvm/{ => agent}/js/ajaxkeys.js (100%)
rename systemvm/{ => agent}/js/ajaxviewer.js (94%)
rename systemvm/{ => agent}/js/cloud.logger.js (91%)
rename systemvm/{ => agent}/js/handler.js (99%)
rename systemvm/{ => agent}/js/jquery.flot.navigate.js (96%)
rename systemvm/{ => agent}/js/jquery.js (100%)
rename systemvm/{ => agent}/scripts/_run.sh (89%)
rename systemvm/{ => agent}/scripts/config_auth.sh (97%)
create mode 100755 systemvm/agent/scripts/config_ssl.sh
rename systemvm/{ => agent}/scripts/consoleproxy.sh (99%)
rename systemvm/{ => agent}/scripts/ipfirewall.sh (99%)
rename systemvm/{ => agent}/scripts/run-proxy.sh (94%)
rename systemvm/{ => agent}/scripts/run.sh (99%)
rename systemvm/{ => agent}/scripts/secstorage.sh (99%)
rename systemvm/{ => agent}/scripts/ssvm-check.sh (97%)
rename systemvm/{ => agent}/scripts/utils.sh (100%)
rename systemvm/{ => agent}/ui/viewer-bad-sid.ftl (99%)
rename systemvm/{ => agent}/ui/viewer-connect-failed.ftl (99%)
rename systemvm/{ => agent}/ui/viewer-update.ftl (97%)
rename systemvm/{ => agent}/ui/viewer.ftl (84%)
delete mode 100755 systemvm/bindir/cloud-setup-console-proxy.in
delete mode 100644 systemvm/conf.dom0/agent.properties.in
delete mode 100644 systemvm/conf.dom0/consoleproxy.properties.in
delete mode 100644 systemvm/conf.dom0/log4j-cloud.xml.in
delete mode 100644 systemvm/conf/agent.properties.ssvm
delete mode 100644 systemvm/conf/log4j-cloud.xml
rename systemvm/{patches/debian/config => debian}/etc/apache2/httpd.conf (100%)
rename systemvm/{patches/debian/config => debian}/etc/apache2/vhost.template (97%)
rename systemvm/{patches/debian/config => debian}/etc/cloud-nic.rules (98%)
rename systemvm/{patches/debian/config => debian}/etc/dnsmasq.conf.tmpl (99%)
rename systemvm/{patches/debian/config => debian}/etc/haproxy/haproxy.cfg (90%)
rename systemvm/{patches/debian/vpn => debian}/etc/ipsec.conf (100%)
rename systemvm/{patches/debian/vpn => debian}/etc/ipsec.d/l2tp.conf (85%)
rename systemvm/{patches/debian/vpn => debian}/etc/ipsec.secrets (100%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/iptables-consoleproxy (84%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/iptables-dhcpsrvr (99%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/iptables-elbvm (99%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/iptables-ilbvm (99%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/iptables-router (99%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/iptables-secstorage (81%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/iptables-vpcrouter (99%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/rt_tables_init (99%)
rename systemvm/{patches/debian/config => debian}/etc/iptables/rules (99%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.conf (99%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.d/apache2 (100%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.d/cloud (100%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.d/conntrackd (100%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.d/dnsmasq (99%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.d/haproxy (100%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.d/ppp (98%)
rename systemvm/{patches/debian/config => debian}/etc/logrotate.d/rsyslog (100%)
rename systemvm/{patches/debian/config => debian}/etc/modprobe.d/aesni_intel.conf (100%)
rename systemvm/{patches/debian/config => debian}/etc/modprobe.d/pcspkr.conf (100%)
rename systemvm/{patches/debian/vpn => debian}/etc/ppp/options.xl2tpd (91%)
rename systemvm/{patches/debian/config => debian}/etc/profile.d/cloud.sh (99%)
rename systemvm/{patches/debian/config => debian}/etc/rsyslog.conf (100%)
rename systemvm/{patches/debian/config => debian}/etc/ssh/sshd_config (95%)
rename systemvm/{patches/debian/config => debian}/etc/sysctl.conf (95%)
create mode 100644 systemvm/debian/etc/systemd/system/cloud-early-config.service
create mode 100644 systemvm/debian/etc/systemd/system/cloud-password-server@.service
create mode 100644 systemvm/debian/etc/systemd/system/cloud-postinit.service
create mode 100644 systemvm/debian/etc/systemd/system/cloud.service
rename systemvm/{patches/debian/config => debian}/etc/vpcdnsmasq.conf (97%)
rename systemvm/{patches/debian/vpn => debian}/etc/xl2tpd/xl2tpd.conf (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/baremetal-vr.py (96%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/baremetal_snat.sh (98%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/bumpup_priority.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/checkbatchs2svpn.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/checkrouter.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/checks2svpn.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cloud-nic.sh (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/configure.py (79%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsAddress.py (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsApp.py (83%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsConfig.py (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsDatabag.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsDhcp.py (91%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsFile.py (98%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsGuestNetwork.py (96%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsHelper.py (91%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsLoadBalancer.py (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsMonitor.py (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsNetfilter.py (96%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsProcess.py (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsRedundant.py (98%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsRoute.py (93%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsRule.py (98%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/CsStaticRoutes.py (95%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs/__init__.py (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_cmdline.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_dhcp.py (89%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_firewallrules.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_forwardingrules.py (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_guestnetwork.py (98%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_ip.py (92%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_loadbalancer.py (97%)
copy systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_monitorservice.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_network_acl.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_remoteaccessvpn.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_site2sitevpn.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_staticroutes.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_vmdata.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_vmp.py (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/cs_vpnusers.py (94%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/dnsmasq.sh (98%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/edithosts.sh (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/getRouterAlerts.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/get_template_version.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/ilb.sh (93%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/ipassoc.sh (97%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/ipsectunnel.sh (83%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/line_edit.py (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/loadbalancer.sh (92%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/master.py (95%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/merge.py (90%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/monitor_service.sh (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/netusage.sh (92%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/passwd_server_ip.py (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/prepare_pxe.sh (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/savepassword.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/set_redundant.py (91%)
create mode 100755 systemvm/debian/opt/cloud/bin/setup/cloud-early-config
create mode 100755 systemvm/debian/opt/cloud/bin/setup/common.sh
create mode 100755 systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
copy tools/appliance/definitions/systemvmtemplate/build_time.sh => systemvm/debian/opt/cloud/bin/setup/default.sh (80%)
mode change 100644 => 100755
create mode 100755 systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh
rename systemvm/{patches/debian/config/root/redundant_router/enable_pubip.sh.templ => debian/opt/cloud/bin/setup/elbvm.sh} (51%)
mode change 100644 => 100755
rename systemvm/{patches/debian/config/root/redundant_router/checkrouter.sh.templ => debian/opt/cloud/bin/setup/ilbvm.sh} (56%)
create mode 100755 systemvm/debian/opt/cloud/bin/setup/patchsystemvm.sh
create mode 100755 systemvm/debian/opt/cloud/bin/setup/postinit.sh
create mode 100755 systemvm/debian/opt/cloud/bin/setup/router.sh
create mode 100755 systemvm/debian/opt/cloud/bin/setup/secstorage.sh
create mode 100755 systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/update_config.py (91%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/vmdata.py (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/vpc_func.sh (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/vpc_netusage.sh (93%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/vpc_snat.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/vpc_staticroute.sh (97%)
rename systemvm/{patches/debian/vpn => debian}/opt/cloud/bin/vpn_l2tp.sh (93%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/bin/vr_cfg.sh (100%)
rename systemvm/{patches/debian/config/root/redundant_router => debian/opt/cloud/templates}/arping_gateways.sh.templ (100%)
rename systemvm/{patches/debian/config/root/redundant_router => debian/opt/cloud/templates}/check_bumpup.sh (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/templates/check_heartbeat.sh.templ (94%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/templates/checkrouter.sh.templ (98%)
create mode 100644 systemvm/debian/opt/cloud/templates/conntrackd.conf.templ
rename systemvm/{patches/debian/config => debian}/opt/cloud/templates/heartbeat.sh.templ (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/templates/keepalived.conf.templ (91%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/README (100%)
create mode 100644 systemvm/debian/opt/cloud/testdata/acl0001.json
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/dhcp0001.json (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/gn0001.json (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/ips0001.json (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/ips0002.json (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/ips0003.json (100%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/s2s0001.json (100%)
rename systemvm/{patches/debian/config/opt/cloud/bin => debian/opt/cloud/testdata}/test.sh (99%)
rename systemvm/{patches/debian/config => debian}/opt/cloud/testdata/vmp0001.json (100%)
create mode 100644 systemvm/debian/root/.ssh/authorized_keys
rename systemvm/{patches/debian/config => debian}/root/clearUsageRules.sh (99%)
rename systemvm/{patches/debian/config => debian}/root/func.sh (100%)
rename systemvm/{patches/debian/config => debian}/root/monitorServices.py (99%)
rename systemvm/{patches/debian/config => debian}/root/reconfigLB.sh (99%)
rename systemvm/{patches/debian/config => debian}/var/www/html/latest/.htaccess (99%)
rename systemvm/{patches/debian/config => debian}/var/www/html/userdata/.htaccess (100%)
delete mode 100644 systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
delete mode 100644 systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
delete mode 100644 systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
delete mode 100755 systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
delete mode 100755 systemvm/libexec/console-proxy-runner.in
delete mode 100644 systemvm/patches/debian/README
delete mode 100755 systemvm/patches/debian/buildsystemvm.sh
delete mode 100644 systemvm/patches/debian/config.dat
delete mode 100644 systemvm/patches/debian/config/etc/chef/node.json
delete mode 100644 systemvm/patches/debian/config/etc/chef/solo.rb
delete mode 100644 systemvm/patches/debian/config/etc/default/cloud
delete mode 100644 systemvm/patches/debian/config/etc/default/cloud-passwd-srvr
delete mode 100755 systemvm/patches/debian/config/etc/init.d/cloud
delete mode 100755 systemvm/patches/debian/config/etc/init.d/cloud-early-config
delete mode 100755 systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
delete mode 100755 systemvm/patches/debian/config/etc/init.d/postinit
delete mode 100755 systemvm/patches/debian/config/etc/rc.local
delete mode 100755 systemvm/patches/debian/config/opt/cloud/bin/passwd_server
delete mode 100755 systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip
delete mode 100755 systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
delete mode 100755 systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
delete mode 100644 systemvm/patches/debian/config/opt/cloud/templates/README
delete mode 100644 systemvm/patches/debian/config/opt/cloud/templates/arping_gateways.sh.templ
delete mode 100644 systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ
delete mode 100644 systemvm/patches/debian/config/opt/cloud/testdata/acl0001.json
delete mode 100644 systemvm/patches/debian/config/root/.ssh/authorized_keys
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/backup.sh.templ
delete mode 100755 systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/disable_pubip.sh
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/fault.sh.templ
delete mode 100755 systemvm/patches/debian/config/root/redundant_router/heartbeat.sh.templ
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/master.sh.templ
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/primary-backup.sh.templ
delete mode 100644 systemvm/patches/debian/config/root/redundant_router/services.sh
delete mode 100755 systemvm/patches/debian/convert.sh
delete mode 100755 systemvm/patches/debian/qemuconvert.sh
delete mode 100644 systemvm/patches/debian/systemvm.vmx
delete mode 100644 systemvm/patches/debian/systemvm.xml
delete mode 100755 systemvm/patches/debian/vhdconvert.sh
delete mode 100644 systemvm/patches/debian/xe/xe-daemon
delete mode 100644 systemvm/patches/debian/xe/xe-linux-distribution
delete mode 100644 systemvm/patches/debian/xe/xe-update-guest-attrs
delete mode 100755 systemvm/scripts/config_ssl.sh
delete mode 100644 systemvm/scripts/run.bat
rename systemvm/{systemvm-descriptor.xml => systemvm-agent-descriptor.xml} (88%)
rename systemvm/test/{python => }/TestCsAddress.py (100%)
rename systemvm/test/{python => }/TestCsApp.py (100%)
rename systemvm/test/{python => }/TestCsCmdLine.py (100%)
rename systemvm/test/{python => }/TestCsConfig.py (100%)
rename systemvm/test/{python => }/TestCsDatabag.py (100%)
rename systemvm/test/{python => }/TestCsDhcp.py (100%)
copy systemvm/test/{python => }/TestCsFile.py (100%)
rename systemvm/test/{python => }/TestCsGuestNetwork.py (94%)
rename systemvm/test/{python => }/TestCsHelper.py (100%)
rename systemvm/test/{python => }/TestCsInterface.py (100%)
rename systemvm/test/{python => }/TestCsNetfilter.py (100%)
rename systemvm/test/{python => }/TestCsProcess.py (100%)
rename systemvm/test/{python => }/TestCsRedundant.py (100%)
rename systemvm/test/{python => }/TestCsRoute.py (87%)
rename systemvm/test/{python => }/TestCsRule.py (100%)
rename systemvm/test/{python => }/runtests.sh (64%)
delete mode 100644 systemvm/vm-script/vmops
mode change 100755 => 100644 test/integration/smoke/test_deploy_vm_root_resize.py
delete mode 100644 test/integration/smoke/test_hosts.py
mode change 100755 => 100644 test/integration/smoke/test_iso.py
mode change 100755 => 100644 test/integration/smoke/test_list_ids_parameter.py
mode change 100755 => 100644 test/integration/smoke/test_nested_virtualization.py
mode change 100755 => 100644 test/integration/smoke/test_vm_life_cycle.py
delete mode 100644 tools/appliance/.ruby-version
delete mode 100644 tools/appliance/.rvmrc
delete mode 100644 tools/appliance/Gemfile
create mode 100644 tools/appliance/builtin/http/kickstart.cfg
rename systemvm/test/python/TestCsFile.py => tools/appliance/builtin/scripts/base.sh (65%)
rename systemvm/patches/debian/config/opt/cloud/bin/cs_monitorservice.py => tools/appliance/builtin/scripts/cleanup.sh (74%)
mode change 100755 => 100644
create mode 100644 tools/appliance/builtin/template.json
delete mode 100644 tools/appliance/convert/Convert.class
delete mode 100644 tools/appliance/convert/Convert.java
delete mode 100644 tools/appliance/convert_ovf_vbox_to_esx.xslt
delete mode 100644 tools/appliance/definitions/builtin/base.sh
delete mode 100644 tools/appliance/definitions/builtin/cleanup.sh
delete mode 100644 tools/appliance/definitions/builtin/definition.rb
delete mode 100644 tools/appliance/definitions/builtin/install-xs-tools.sh
delete mode 100644 tools/appliance/definitions/builtin/ks.cfg
delete mode 100644 tools/appliance/definitions/builtin/postinstall.sh
delete mode 100644 tools/appliance/definitions/builtin/zerodisk.sh
delete mode 100644 tools/appliance/definitions/debianbase/cleanup.sh
delete mode 100644 tools/appliance/definitions/debianbase/definition.rb
delete mode 100644 tools/appliance/definitions/debianbase/zerodisk.sh
delete mode 100644 tools/appliance/definitions/devcloud/base.sh
delete mode 100644 tools/appliance/definitions/devcloud/cleanup.sh
delete mode 100644 tools/appliance/definitions/devcloud/definition.rb
delete mode 100644 tools/appliance/definitions/devcloud/postinstall.sh
delete mode 100644 tools/appliance/definitions/devcloud/preseed.cfg
delete mode 100644 tools/appliance/definitions/devcloud/zerodisk.sh
delete mode 100644 tools/appliance/definitions/systemvmtemplate/authorized_keys.sh
delete mode 100644 tools/appliance/definitions/systemvmtemplate/configure_login.sh
delete mode 100644 tools/appliance/definitions/systemvmtemplate/definition.rb
delete mode 100644 tools/appliance/definitions/systemvmtemplate/preseed.cfg
delete mode 100644 tools/appliance/definitions/systemvmtemplate/zerodisk.sh
rename tools/appliance/{definitions/debianbase => systemvmtemplate/http}/preseed.cfg (64%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/apt_upgrade.sh (70%)
rename tools/appliance/{definitions/systemvmtemplate/build_time.sh => systemvmtemplate/scripts/authorized_keys.sh} (87%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/cleanup.sh (56%)
rename systemvm/patches/debian/config/opt/cloud/templates/check_bumpup.sh => tools/appliance/systemvmtemplate/scripts/configure_acpid.sh (79%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/configure_conntrack.sh (95%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/configure_grub.sh (67%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/configure_locale.sh (100%)
rename tools/appliance/{definitions/systemvmtemplate/configure_acpid.sh => systemvmtemplate/scripts/configure_login.sh} (62%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/configure_networking.sh (85%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/configure_persistent_config.sh (99%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/configure_systemvm_services.sh (67%)
rename tools/appliance/{definitions/debianbase/configure_login.sh => systemvmtemplate/scripts/finalize.sh} (57%)
rename tools/appliance/{definitions/systemvmtemplate => systemvmtemplate/scripts}/install_systemvm_packages.sh (59%)
create mode 100644 tools/appliance/systemvmtemplate/template.json
delete mode 100644 tools/appliance/test.sh
delete mode 100755 tools/appliance/vbox_disk_clean.rb
delete mode 100755 tools/appliance/vbox_vm_clean.rb
delete mode 100644 tools/vagrant/devcloud/Vagrantfile
delete mode 100644 tools/vagrant/devcloud/templates/tmpl/1/1/README
delete mode 100644 tools/vagrant/devcloud/templates/tmpl/1/5/README
delete mode 100644 tools/vagrant/systemvm/.gitignore
delete mode 100644 tools/vagrant/systemvm/.ruby-version
delete mode 100644 tools/vagrant/systemvm/.rvmrc
delete mode 100644 tools/vagrant/systemvm/Gemfile
delete mode 100644 tools/vagrant/systemvm/README.md
delete mode 100755 tools/vagrant/systemvm/VBoxManage
delete mode 100644 tools/vagrant/systemvm/Vagrantfile
delete mode 100755 tools/vagrant/systemvm/test.sh
delete mode 100644 tools/vagrant/systemvm/vagrant.pub
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].
[cloudstack] 01/01: Merge pull request #2211 from
apache/debian9-systemvmtemplate
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f8a31b09c78ce6b3dcad9e52771554e404cd0285
Merge: a7b233c d19629a
Author: Rohit Yadav <ro...@apache.org>
AuthorDate: Sun Dec 24 12:20:54 2017 +0530
Merge pull request #2211 from apache/debian9-systemvmtemplate
CLOUDSTACK-10013: Migrate systemvmtemplate to Debian9
Signed-off-by: Rohit Yadav <ro...@apache.org>
.gitignore | 2 +
.travis.yml | 12 +-
LICENSE | 67 +-
.../tomcatconf/commands-simulator.properties.in | 21 -
.../consoleproxy/ConsoleProxyResource.java | 16 +-
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../api/command/user/event/ListEventsCmd.java | 7 +
.../cloudstack/api/response/EventResponse.java | 2 +-
client/pom.xml | 1 -
.../facade/AbstractConfigItemFacade.java | 21 +-
.../src/com/cloud/network/HAProxyConfigurator.java | 16 +-
.../virtualnetwork/VirtualRoutingResourceTest.java | 8 +-
developer/developer-prefill.sql | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 16 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 34 +-
.../resources/META-INF/db/schema-41000to41100.sql | 7 +
.../com/cloud/upgrade/dao/Upgrade41000to41100.java | 189 ++-
.../com/cloud/upgrade/dao/Upgrade4930to41000.java | 184 +--
.../schema/src/com/cloud/user/UserAccountVO.java | 4 +
engine/schema/src/com/cloud/user/UserVO.java | 4 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +
packaging/centos7/cloud.spec | 1 +
.../kvm/resource/LibvirtComputingResource.java | 12 +-
.../hypervisor/vmware/resource/VmwareResource.java | 42 +-
pom.xml | 44 +-
python/lib/cloudutils/utilities.py | 7 +-
scripts/util/keystore-cert-import | 4 +-
scripts/util/keystore-setup | 4 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 10 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 12 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 8 +-
.../com/cloud/network/IpAddressManagerImpl.java | 127 +-
.../cloud/network/router/CommandSetupHelper.java | 19 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 5 +
.../com/cloud/resource/ResourceManagerImpl.java | 2 +-
server/src/com/cloud/server/StatsCollector.java | 32 +-
.../secondary/SecondaryStorageVmManager.java | 4 +-
.../src/com/cloud/consoleproxy/ConsoleProxy.java | 41 +-
.../resource/NfsSecondaryStorageResource.java | 9 +-
.../storage/template/DownloadManagerImpl.java | 27 +-
.../storage/template/UploadManagerImpl.java | 60 +-
setup/dev/advanced.cfg | 2 +-
systemvm/{ => agent}/certs/localhost.crt | 0
systemvm/{ => agent}/certs/localhost.key | 0
systemvm/{ => agent}/certs/realhostip.crt | 0
systemvm/{ => agent}/certs/realhostip.csr | 0
systemvm/{ => agent}/certs/realhostip.key | 0
systemvm/{ => agent}/certs/realhostip.keystore | Bin
systemvm/{ => agent}/conf/agent.properties | 4 +-
systemvm/{ => agent}/conf/consoleproxy.properties | 4 +-
systemvm/{ => agent}/conf/environment.properties | 0
systemvm/agent/conf/log4j-cloud.xml | 131 ++
systemvm/{ => agent}/css/ajaxviewer.css | 74 +-
systemvm/{ => agent}/css/logger.css | 21 +-
systemvm/{ => agent}/images/back.gif | Bin
systemvm/{ => agent}/images/bright-green.png | Bin
systemvm/{ => agent}/images/cad.gif | Bin
systemvm/{ => agent}/images/cannotconnect.jpg | Bin
systemvm/{ => agent}/images/clr_button.gif | Bin
systemvm/{ => agent}/images/clr_button_hover.gif | Bin
systemvm/{ => agent}/images/dot.cur | Bin
systemvm/{ => agent}/images/gray-green.png | Bin
systemvm/{ => agent}/images/grid_headerbg.gif | Bin
systemvm/{ => agent}/images/left.png | Bin
systemvm/{ => agent}/images/minimize_button.gif | Bin
.../{ => agent}/images/minimize_button_hover.gif | Bin
systemvm/{ => agent}/images/notready.jpg | Bin
systemvm/{ => agent}/images/play_button.gif | Bin
systemvm/{ => agent}/images/play_button_hover.gif | Bin
systemvm/{ => agent}/images/right.png | Bin
systemvm/{ => agent}/images/right2.png | Bin
systemvm/{ => agent}/images/shrink_button.gif | Bin
.../{ => agent}/images/shrink_button_hover.gif | Bin
systemvm/{ => agent}/images/stop_button.gif | Bin
systemvm/{ => agent}/images/stop_button_hover.gif | Bin
systemvm/{ => agent}/images/winlog.png | Bin
systemvm/{ => agent}/js/ajaxkeys.js | 0
systemvm/{ => agent}/js/ajaxviewer.js | 395 +++--
systemvm/{ => agent}/js/cloud.logger.js | 135 +-
systemvm/{ => agent}/js/handler.js | 4 +-
systemvm/{ => agent}/js/jquery.flot.navigate.js | 58 +-
systemvm/{ => agent}/js/jquery.js | 0
systemvm/{ => agent}/scripts/_run.sh | 28 +-
systemvm/{ => agent}/scripts/config_auth.sh | 10 +-
systemvm/agent/scripts/config_ssl.sh | 143 ++
systemvm/{ => agent}/scripts/consoleproxy.sh | 4 +-
systemvm/{ => agent}/scripts/ipfirewall.sh | 5 +-
systemvm/{ => agent}/scripts/run-proxy.sh | 10 +-
systemvm/{ => agent}/scripts/run.sh | 8 +-
systemvm/{ => agent}/scripts/secstorage.sh | 4 +-
systemvm/{ => agent}/scripts/ssvm-check.sh | 10 +-
systemvm/{ => agent}/scripts/utils.sh | 0
systemvm/{ => agent}/ui/viewer-bad-sid.ftl | 4 +-
systemvm/{ => agent}/ui/viewer-connect-failed.ftl | 4 +-
systemvm/{ => agent}/ui/viewer-update.ftl | 3 +-
systemvm/{ => agent}/ui/viewer.ftl | 28 +-
systemvm/bindir/cloud-setup-console-proxy.in | 220 ---
systemvm/conf.dom0/agent.properties.in | 46 -
systemvm/conf.dom0/consoleproxy.properties.in | 23 -
systemvm/conf.dom0/log4j-cloud.xml.in | 111 --
systemvm/conf/agent.properties.ssvm | 21 -
systemvm/conf/log4j-cloud.xml | 112 --
.../config => debian}/etc/apache2/httpd.conf | 0
.../config => debian}/etc/apache2/vhost.template | 9 +-
.../debian/config => debian}/etc/cloud-nic.rules | 1 -
.../debian/config => debian}/etc/dnsmasq.conf.tmpl | 16 +-
.../config => debian}/etc/haproxy/haproxy.cfg | 9 +-
.../{patches/debian/vpn => debian}/etc/ipsec.conf | 0
.../debian/vpn => debian}/etc/ipsec.d/l2tp.conf | 12 +-
.../debian/vpn => debian}/etc/ipsec.secrets | 0
.../etc/iptables/iptables-consoleproxy | 12 +-
.../etc/iptables/iptables-dhcpsrvr | 2 +-
.../config => debian}/etc/iptables/iptables-elbvm | 3 +-
.../config => debian}/etc/iptables/iptables-ilbvm | 3 +-
.../config => debian}/etc/iptables/iptables-router | 2 +-
.../etc/iptables/iptables-secstorage | 12 +-
.../etc/iptables/iptables-vpcrouter | 2 +-
.../config => debian}/etc/iptables/rt_tables_init | 2 +-
.../debian/config => debian}/etc/iptables/rules | 3 +-
.../debian/config => debian}/etc/logrotate.conf | 1 -
.../config => debian}/etc/logrotate.d/apache2 | 0
.../debian/config => debian}/etc/logrotate.d/cloud | 0
.../config => debian}/etc/logrotate.d/conntrackd | 0
.../config => debian}/etc/logrotate.d/dnsmasq | 1 -
.../config => debian}/etc/logrotate.d/haproxy | 0
.../debian/config => debian}/etc/logrotate.d/ppp | 1 -
.../config => debian}/etc/logrotate.d/rsyslog | 0
.../etc/modprobe.d/aesni_intel.conf | 0
.../config => debian}/etc/modprobe.d/pcspkr.conf | 0
.../debian/vpn => debian}/etc/ppp/options.xl2tpd | 2 -
.../config => debian}/etc/profile.d/cloud.sh | 2 +-
.../debian/config => debian}/etc/rsyslog.conf | 0
.../debian/config => debian}/etc/ssh/sshd_config | 16 +-
.../debian/config => debian}/etc/sysctl.conf | 3 +-
.../etc/systemd/system/cloud-early-config.service | 18 +
.../systemd/system/cloud-password-server@.service | 12 +
.../etc/systemd/system/cloud-postinit.service | 14 +
systemvm/debian/etc/systemd/system/cloud.service | 13 +
.../debian/config => debian}/etc/vpcdnsmasq.conf | 22 +-
.../debian/vpn => debian}/etc/xl2tpd/xl2tpd.conf | 0
.../opt/cloud/bin/baremetal-vr.py | 320 ++--
.../opt/cloud/bin/baremetal_snat.sh | 3 +-
.../opt/cloud/bin/bumpup_priority.sh | 0
.../opt/cloud/bin/checkbatchs2svpn.sh | 0
.../config => debian}/opt/cloud/bin/checkrouter.sh | 0
.../config => debian}/opt/cloud/bin/checks2svpn.sh | 0
.../config => debian}/opt/cloud/bin/cloud-nic.sh | 2 +-
.../config => debian}/opt/cloud/bin/configure.py | 402 +++--
.../opt/cloud/bin/cs/CsAddress.py | 5 +-
.../config => debian}/opt/cloud/bin/cs/CsApp.py | 17 +-
.../config => debian}/opt/cloud/bin/cs/CsConfig.py | 0
.../opt/cloud/bin/cs/CsDatabag.py | 4 +-
.../config => debian}/opt/cloud/bin/cs/CsDhcp.py | 20 +-
.../config => debian}/opt/cloud/bin/cs/CsFile.py | 9 +-
.../opt/cloud/bin/cs/CsGuestNetwork.py | 2 +-
.../config => debian}/opt/cloud/bin/cs/CsHelper.py | 19 +-
.../opt/cloud/bin/cs/CsLoadBalancer.py | 0
.../opt/cloud/bin/cs/CsMonitor.py | 0
.../opt/cloud/bin/cs/CsNetfilter.py | 12 +-
.../opt/cloud/bin/cs/CsProcess.py | 0
.../opt/cloud/bin/cs/CsRedundant.py | 12 +-
.../config => debian}/opt/cloud/bin/cs/CsRoute.py | 9 +-
.../config => debian}/opt/cloud/bin/cs/CsRule.py | 2 +-
.../opt/cloud/bin/cs/CsStaticRoutes.py | 5 +-
.../config => debian}/opt/cloud/bin/cs/__init__.py | 0
.../config => debian}/opt/cloud/bin/cs_cmdline.py | 2 -
.../config => debian}/opt/cloud/bin/cs_dhcp.py | 5 +-
.../opt/cloud/bin/cs_firewallrules.py | 1 -
.../opt/cloud/bin/cs_forwardingrules.py | 2 -
.../opt/cloud/bin/cs_guestnetwork.py | 1 -
.../config => debian}/opt/cloud/bin/cs_ip.py | 5 +-
.../opt/cloud/bin/cs_loadbalancer.py | 1 -
.../opt/cloud/bin/cs_monitorservice.py | 1 -
.../opt/cloud/bin/cs_network_acl.py | 1 -
.../opt/cloud/bin/cs_remoteaccessvpn.py | 1 -
.../opt/cloud/bin/cs_site2sitevpn.py | 1 -
.../opt/cloud/bin/cs_staticroutes.py | 1 -
.../config => debian}/opt/cloud/bin/cs_vmdata.py | 2 -
.../config => debian}/opt/cloud/bin/cs_vmp.py | 2 +-
.../config => debian}/opt/cloud/bin/cs_vpnusers.py | 5 +-
.../config => debian}/opt/cloud/bin/dnsmasq.sh | 4 +-
.../config => debian}/opt/cloud/bin/edithosts.sh | 4 +-
.../opt/cloud/bin/getRouterAlerts.sh | 0
.../opt/cloud/bin/get_template_version.sh | 0
.../debian/config => debian}/opt/cloud/bin/ilb.sh | 34 +-
.../config => debian}/opt/cloud/bin/ipassoc.sh | 43 +-
.../config => debian}/opt/cloud/bin/ipsectunnel.sh | 66 +-
.../config => debian}/opt/cloud/bin/line_edit.py | 0
.../opt/cloud/bin/loadbalancer.sh | 80 +-
.../config => debian}/opt/cloud/bin/master.py | 2 +-
.../config => debian}/opt/cloud/bin/merge.py | 42 +-
.../opt/cloud/bin/monitor_service.sh | 3 -
.../config => debian}/opt/cloud/bin/netusage.sh | 23 +-
.../opt/cloud/bin/passwd_server_ip.py | 0
.../config => debian}/opt/cloud/bin/prepare_pxe.sh | 6 +-
.../opt/cloud/bin/savepassword.sh | 0
.../opt/cloud/bin/set_redundant.py | 7 +-
.../debian/opt/cloud/bin/setup/cloud-early-config | 231 +++
systemvm/debian/opt/cloud/bin/setup/common.sh | 794 ++++++++++
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 60 +
.../debian/opt/cloud/bin/setup/default.sh | 13 +-
systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh | 59 +
.../opt/cloud/bin/setup/elbvm.sh} | 54 +-
.../opt/cloud/bin/setup/ilbvm.sh} | 51 +-
.../debian/opt/cloud/bin/setup/patchsystemvm.sh | 61 +
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 85 ++
systemvm/debian/opt/cloud/bin/setup/router.sh | 95 ++
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 89 ++
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 120 ++
.../opt/cloud/bin/update_config.py | 17 +-
.../config => debian}/opt/cloud/bin/vmdata.py | 2 +-
.../config => debian}/opt/cloud/bin/vpc_func.sh | 2 +-
.../opt/cloud/bin/vpc_netusage.sh | 26 +-
.../config => debian}/opt/cloud/bin/vpc_snat.sh | 0
.../opt/cloud/bin/vpc_staticroute.sh | 5 +-
.../vpn => debian}/opt/cloud/bin/vpn_l2tp.sh | 26 +-
.../config => debian}/opt/cloud/bin/vr_cfg.sh | 0
.../opt/cloud/templates}/arping_gateways.sh.templ | 0
.../opt/cloud/templates}/check_bumpup.sh | 0
.../opt/cloud/templates/check_heartbeat.sh.templ | 8 +-
.../opt/cloud/templates/checkrouter.sh.templ | 2 +-
.../opt/cloud/templates/conntrackd.conf.templ | 419 ++++++
.../opt/cloud/templates/heartbeat.sh.templ | 0
.../opt/cloud/templates/keepalived.conf.templ | 12 +-
.../config => debian}/opt/cloud/testdata/README | 0
systemvm/debian/opt/cloud/testdata/acl0001.json | 54 +
.../opt/cloud/testdata/dhcp0001.json | 0
.../opt/cloud/testdata/gn0001.json | 0
.../opt/cloud/testdata/ips0001.json | 0
.../opt/cloud/testdata/ips0002.json | 0
.../opt/cloud/testdata/ips0003.json | 0
.../opt/cloud/testdata/s2s0001.json | 0
.../bin => debian/opt/cloud/testdata}/test.sh | 1 -
.../opt/cloud/testdata/vmp0001.json | 0
systemvm/debian/root/.ssh/authorized_keys | 1 +
.../config => debian}/root/clearUsageRules.sh | 2 +-
.../{patches/debian/config => debian}/root/func.sh | 0
.../config => debian}/root/monitorServices.py | 7 -
.../debian/config => debian}/root/reconfigLB.sh | 1 -
.../var/www/html/latest/.htaccess | 1 -
.../var/www/html/userdata/.htaccess | 0
.../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 --
.../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 --
.../SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in | 96 --
.../SYSCONFDIR/init.d/cloud-console-proxy.in | 110 --
systemvm/libexec/console-proxy-runner.in | 90 --
systemvm/patches/debian/README | 34 -
systemvm/patches/debian/buildsystemvm.sh | 577 -------
systemvm/patches/debian/config.dat | 398 -----
systemvm/patches/debian/config/etc/chef/node.json | 5 -
systemvm/patches/debian/config/etc/chef/solo.rb | 21 -
systemvm/patches/debian/config/etc/default/cloud | 19 -
.../debian/config/etc/default/cloud-passwd-srvr | 19 -
systemvm/patches/debian/config/etc/init.d/cloud | 157 --
.../debian/config/etc/init.d/cloud-early-config | 1591 --------------------
.../debian/config/etc/init.d/cloud-passwd-srvr | 124 --
systemvm/patches/debian/config/etc/init.d/postinit | 178 ---
systemvm/patches/debian/config/etc/rc.local | 64 -
.../debian/config/opt/cloud/bin/passwd_server | 26 -
.../debian/config/opt/cloud/bin/passwd_server_ip | 31 -
.../debian/config/opt/cloud/bin/patchsystemvm.sh | 262 ----
.../debian/config/opt/cloud/bin/vpc_passwd_server | 32 -
.../debian/config/opt/cloud/templates/README | 2 -
.../opt/cloud/templates/arping_gateways.sh.templ | 29 -
.../opt/cloud/templates/conntrackd.conf.templ | 417 -----
.../debian/config/opt/cloud/testdata/acl0001.json | 54 -
.../debian/config/root/.ssh/authorized_keys | 1 -
.../config/root/redundant_router/backup.sh.templ | 39 -
.../root/redundant_router/check_heartbeat.sh.templ | 60 -
.../root/redundant_router/conntrackd.conf.templ | 401 -----
.../config/root/redundant_router/disable_pubip.sh | 23 -
.../config/root/redundant_router/fault.sh.templ | 37 -
.../root/redundant_router/heartbeat.sh.templ | 20 -
.../root/redundant_router/keepalived.conf.templ | 57 -
.../config/root/redundant_router/master.sh.templ | 60 -
.../root/redundant_router/primary-backup.sh.templ | 126 --
.../config/root/redundant_router/services.sh | 68 -
systemvm/patches/debian/convert.sh | 64 -
systemvm/patches/debian/qemuconvert.sh | 32 -
systemvm/patches/debian/systemvm.vmx | 37 -
systemvm/patches/debian/systemvm.xml | 53 -
systemvm/patches/debian/vhdconvert.sh | 40 -
systemvm/patches/debian/xe/xe-daemon | 65 -
systemvm/patches/debian/xe/xe-linux-distribution | 267 ----
systemvm/patches/debian/xe/xe-update-guest-attrs | 226 ---
systemvm/pom.xml | 27 +-
systemvm/scripts/config_ssl.sh | 218 ---
systemvm/scripts/run.bat | 18 -
...escriptor.xml => systemvm-agent-descriptor.xml} | 22 +-
systemvm/test/{python => }/TestCsAddress.py | 0
systemvm/test/{python => }/TestCsApp.py | 0
systemvm/test/{python => }/TestCsCmdLine.py | 0
systemvm/test/{python => }/TestCsConfig.py | 0
systemvm/test/{python => }/TestCsDatabag.py | 0
systemvm/test/{python => }/TestCsDhcp.py | 0
systemvm/test/{python => }/TestCsFile.py | 0
systemvm/test/{python => }/TestCsGuestNetwork.py | 3 +-
systemvm/test/{python => }/TestCsHelper.py | 0
systemvm/test/{python => }/TestCsInterface.py | 0
systemvm/test/{python => }/TestCsNetfilter.py | 0
systemvm/test/{python => }/TestCsProcess.py | 0
systemvm/test/{python => }/TestCsRedundant.py | 0
systemvm/test/{python => }/TestCsRoute.py | 5 +-
systemvm/test/{python => }/TestCsRule.py | 0
systemvm/test/{python => }/runtests.sh | 21 +-
systemvm/vm-script/vmops | 119 --
.../integration/component/test_browse_templates.py | 6 +-
test/integration/component/test_browse_volumes.py | 6 +-
test/integration/component/test_security_groups.py | 4 +-
test/integration/smoke/test_accounts.py | 22 +-
test/integration/smoke/test_affinity_groups.py | 10 +-
.../smoke/test_affinity_groups_projects.py | 11 +-
.../smoke/test_deploy_virtio_scsi_vm.py | 4 +-
test/integration/smoke/test_deploy_vm_iso.py | 8 +-
.../smoke/test_deploy_vm_root_resize.py | 56 +-
.../smoke/test_deploy_vm_with_userdata.py | 11 +-
...st_deploy_vms_with_varied_deploymentplanners.py | 9 +-
test/integration/smoke/test_host_maintenance.py | 6 +-
test/integration/smoke/test_hostha_kvm.py | 11 +-
test/integration/smoke/test_hosts.py | 170 ---
test/integration/smoke/test_internal_lb.py | 53 +-
test/integration/smoke/test_iso.py | 0
test/integration/smoke/test_list_ids_parameter.py | 80 +-
test/integration/smoke/test_loadbalance.py | 25 +-
test/integration/smoke/test_metrics_api.py | 4 +-
test/integration/smoke/test_multipleips_per_nic.py | 7 +-
.../smoke/test_nested_virtualization.py | 15 +-
test/integration/smoke/test_network.py | 41 +-
test/integration/smoke/test_network_acl.py | 9 +-
test/integration/smoke/test_nic_adapter_type.py | 6 +-
test/integration/smoke/test_password_server.py | 15 +-
test/integration/smoke/test_portforwardingrules.py | 6 +-
test/integration/smoke/test_privategw_acl.py | 76 +-
test/integration/smoke/test_projects.py | 7 +-
test/integration/smoke/test_reset_vm_on_reboot.py | 7 +-
test/integration/smoke/test_router_dhcphosts.py | 12 +-
test/integration/smoke/test_router_dns.py | 13 +-
test/integration/smoke/test_router_dnsservice.py | 27 +-
test/integration/smoke/test_routers.py | 30 +-
.../smoke/test_routers_iptables_default_policy.py | 15 +-
test/integration/smoke/test_routers_network_ops.py | 70 +-
test/integration/smoke/test_service_offerings.py | 11 +-
test/integration/smoke/test_snapshots.py | 65 +-
test/integration/smoke/test_ssvm.py | 237 +--
test/integration/smoke/test_templates.py | 22 +-
test/integration/smoke/test_usage.py | 22 +-
test/integration/smoke/test_vm_life_cycle.py | 0
test/integration/smoke/test_volumes.py | 2 +
test/integration/smoke/test_vpc_redundant.py | 91 +-
test/integration/smoke/test_vpc_router_nics.py | 30 +-
test/integration/smoke/test_vpc_vpn.py | 568 +++++--
tools/appliance/.ruby-version | 1 -
tools/appliance/.rvmrc | 24 -
tools/appliance/Gemfile | 25 -
tools/appliance/README.md | 105 +-
tools/appliance/build.sh | 362 +----
tools/appliance/builtin/http/kickstart.cfg | 91 ++
.../appliance/builtin/scripts/base.sh | 22 +-
.../appliance/builtin/scripts/cleanup.sh | 17 +-
tools/appliance/builtin/template.json | 53 +
tools/appliance/convert/Convert.class | Bin 984 -> 0 bytes
tools/appliance/convert/Convert.java | 36 -
tools/appliance/convert_ovf_vbox_to_esx.xslt | 42 -
tools/appliance/definitions/builtin/base.sh | 14 -
tools/appliance/definitions/builtin/cleanup.sh | 21 -
tools/appliance/definitions/builtin/definition.rb | 33 -
.../definitions/builtin/install-xs-tools.sh | 10 -
tools/appliance/definitions/builtin/ks.cfg | 35 -
tools/appliance/definitions/builtin/postinstall.sh | 54 -
tools/appliance/definitions/builtin/zerodisk.sh | 3 -
tools/appliance/definitions/debianbase/cleanup.sh | 49 -
.../appliance/definitions/debianbase/definition.rb | 80 -
tools/appliance/definitions/debianbase/zerodisk.sh | 43 -
tools/appliance/definitions/devcloud/base.sh | 12 -
tools/appliance/definitions/devcloud/cleanup.sh | 21 -
tools/appliance/definitions/devcloud/definition.rb | 45 -
.../appliance/definitions/devcloud/postinstall.sh | 60 -
tools/appliance/definitions/devcloud/preseed.cfg | 357 -----
tools/appliance/definitions/devcloud/zerodisk.sh | 11 -
.../systemvmtemplate/authorized_keys.sh | 29 -
.../systemvmtemplate/configure_login.sh | 78 -
.../definitions/systemvmtemplate/definition.rb | 101 --
.../definitions/systemvmtemplate/preseed.cfg | 134 --
.../definitions/systemvmtemplate/zerodisk.sh | 43 -
tools/appliance/shar_cloud_scripts.sh | 9 +-
.../http}/preseed.cfg | 69 +-
.../scripts}/apt_upgrade.sh | 27 +-
.../scripts/authorized_keys.sh} | 9 +-
.../scripts}/cleanup.sh | 36 +-
.../systemvmtemplate/scripts/configure_acpid.sh | 13 +-
.../scripts}/configure_conntrack.sh | 4 +
.../scripts}/configure_grub.sh | 16 +-
.../scripts}/configure_locale.sh | 0
.../scripts/configure_login.sh} | 35 +-
.../scripts}/configure_networking.sh | 24 +-
.../scripts}/configure_persistent_config.sh | 1 -
.../scripts}/configure_systemvm_services.sh | 57 +-
.../scripts/finalize.sh} | 63 +-
.../scripts}/install_systemvm_packages.sh | 66 +-
tools/appliance/systemvmtemplate/template.json | 82 +
tools/appliance/test.sh | 180 ---
tools/appliance/vbox_disk_clean.rb | 49 -
tools/appliance/vbox_vm_clean.rb | 77 -
tools/marvin/marvin/config/test_data.py | 60 +-
tools/marvin/marvin/lib/base.py | 7 +-
tools/marvin/marvin/lib/common.py | 47 +
tools/travis/before_install.sh | 2 +-
tools/travis/install.sh | 4 +
tools/vagrant/devcloud/Vagrantfile | 206 ---
tools/vagrant/devcloud/templates/tmpl/1/1/README | 1 -
tools/vagrant/devcloud/templates/tmpl/1/5/README | 2 -
tools/vagrant/systemvm/.gitignore | 52 -
tools/vagrant/systemvm/.ruby-version | 1 -
tools/vagrant/systemvm/.rvmrc | 24 -
tools/vagrant/systemvm/Gemfile | 20 -
tools/vagrant/systemvm/README.md | 30 -
tools/vagrant/systemvm/VBoxManage | 41 -
tools/vagrant/systemvm/Vagrantfile | 123 --
tools/vagrant/systemvm/test.sh | 213 ---
tools/vagrant/systemvm/vagrant.pub | 1 -
tools/whisker/LICENSE | 8 +-
tools/whisker/descriptor-for-packaging.xml | 8 +-
tools/whisker/descriptor.xml | 37 +-
ui/css/cloudstack3.css | 3 +-
ui/l10n/en.js | 2 +
ui/scripts/events.js | 20 +-
ui/scripts/instances.js | 275 ++--
ui/scripts/metrics.js | 13 +-
ui/scripts/network.js | 51 +-
ui/scripts/sharedFunctions.js | 2 +-
ui/scripts/storage.js | 30 +-
ui/scripts/system.js | 112 +-
ui/scripts/templates.js | 27 +
ui/scripts/ui/dialog.js | 2 +-
ui/scripts/ui/widgets/dataTable.js | 13 +-
ui/scripts/ui/widgets/multiEdit.js | 2 +-
.../src/main/java/com/cloud/utils/ReflectUtil.java | 21 +
utils/src/main/java/com/cloud/utils/nio/Link.java | 72 +-
.../main/java/com/cloud/utils/nio/NioClient.java | 2 +-
.../java/com/cloud/utils/nio/NioConnection.java | 2 +-
.../java/com/cloud/utils/time/InaccurateClock.java | 2 +-
.../utils/imagestore/ImageStoreUtil.java | 2 +-
443 files changed, 6168 insertions(+), 13129 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.