cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [58/59] [abbrv] git commit: updated refs/heads/disk-cache to bbae6f8
Date Wed, 25 Sep 2013 10:29:53 GMT
Merge branch 'master' into disk-cache


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc91ea51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc91ea51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc91ea51

Branch: refs/heads/disk-cache
Commit: fc91ea51c99d4b9c557bb8641d7239ccf8546b35
Parents: c3569db 5ada5e8
Author: Wido den Hollander <wido@42on.com>
Authored: Tue Sep 24 18:39:24 2013 +0200
Committer: Wido den Hollander <wido@42on.com>
Committed: Tue Sep 24 18:39:24 2013 +0200

----------------------------------------------------------------------
 INSTALL.md                                      |   39 +-
 agent/bindir/cloudstack-agent-upgrade.in        |   63 +
 agent/bindir/libvirtqemuhook.in                 |   53 +
 .../consoleproxy/ConsoleProxyResource.java      |   25 +-
 api/src/com/cloud/agent/api/to/IpAddressTO.java |   10 +-
 api/src/com/cloud/agent/api/to/NetworkTO.java   |    4 +
 api/src/com/cloud/event/ActionEvents.java       |   31 +
 api/src/com/cloud/network/NetworkService.java   |   12 +-
 api/src/com/cloud/network/Networks.java         |    5 +-
 api/src/com/cloud/network/vpc/PrivateIp.java    |    2 +-
 .../cloud/network/vpc/StaticRouteProfile.java   |    2 +-
 api/src/com/cloud/network/vpc/VpcGateway.java   |    2 +-
 api/src/com/cloud/network/vpc/VpcService.java   |    3 +-
 .../admin/vpc/CreatePrivateGatewayCmd.java      |   19 +-
 .../command/user/network/UpdateNetworkCmd.java  |   22 +-
 .../api/response/PrivateGatewayResponse.java    |    8 +-
 .../apache/cloudstack/context/CallContext.java  |   26 +
 api/test/com/cloud/network/NetworksTest.java    |   54 +-
 awsapi/pom.xml                                  |  301 ++--
 client/pom.xml                                  |  183 ++-
 .../agent/api/MigrateWithStorageAnswer.java     |    3 -
 .../api/MigrateWithStorageCompleteAnswer.java   |    2 -
 core/src/com/cloud/agent/api/RebootCommand.java |    1 -
 .../api/routing/HealthCheckLBConfigAnswer.java  |    1 -
 .../api/routing/HealthCheckLBConfigCommand.java |    1 -
 .../agent/api/routing/SetNetworkACLCommand.java |    2 -
 .../cloud/agent/api/storage/UploadCommand.java  |   23 +-
 .../virtualnetwork/VirtualRoutingResource.java  |  430 +++--
 core/src/com/cloud/agent/transport/Request.java |   47 +-
 .../cloud/exception/UsageServerException.java   |   19 +-
 .../src/com/cloud/storage/JavaStorageLayer.java |    6 +-
 .../storage/resource/StoragePoolResource.java   |    2 -
 .../storage/template/FtpTemplateUploader.java   |  381 +++--
 .../template/HttpTemplateDownloader.java        |  643 ++++----
 .../template/LocalTemplateDownloader.java       |   57 +-
 .../storage/template/RawImageProcessor.java     |    3 +-
 .../storage/template/S3TemplateDownloader.java  |   28 +-
 .../storage/template/ScpTemplateDownloader.java |    4 +-
 .../storage/template/TemplateUploader.java      |    3 -
 .../storage/command/DownloadCommand.java        |   47 +-
 .../agent/test/BackupSnapshotCommandTest.java   |    1 -
 debian/cloudstack-agent.postinst                |   10 +-
 debian/rules                                    |    2 +
 deps/install-non-oss.sh                         |    5 +
 developer/pom.xml                               |    1 -
 docs/en-US/Release_Notes.xml                    |  353 ++--
 .../configuration/ConfigurationManager.java     |  104 +-
 .../cloud/network/rules/FirewallManager.java    |   32 +-
 .../orchestration/NetworkOrchestrator.java      |    4 +
 .../test/resource/provisioningContext.xml       |    4 +-
 .../src/com/cloud/network/dao/NetworkDao.java   |    2 +-
 .../com/cloud/network/dao/NetworkDaoImpl.java   |    7 +-
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |   12 +-
 .../src/com/cloud/network/vpc/dao/VpcDao.java   |    4 +-
 .../com/cloud/network/vpc/dao/VpcDaoImpl.java   |   10 +-
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |  148 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |  213 ++-
 .../service/src/main/webapp/WEB-INF/beans.xml   |    4 +-
 engine/service/src/main/webapp/WEB-INF/web.xml  |    9 +-
 engine/storage/integration-test/pom.xml         |    3 +-
 .../storage/volume/VolumeServiceImpl.java       |   21 +-
 .../src/com/cloud/cluster/ClusterManager.java   |    2 +
 .../com/cloud/cluster/ClusterManagerImpl.java   |    4 +
 .../cloudstack/framework/config/ConfigKey.java  |    3 +-
 .../framework/jobs/impl/AsyncJobMonitor.java    |   35 +-
 maven-standard/pom.xml                          |   48 +
 packaging/centos63/cloud.spec                   |   21 +-
 packaging/centos63/package.sh                   |   62 +-
 patches/cloudpatch-descriptor.xml               |   59 -
 patches/pom.xml                                 |   84 -
 patches/systemvm/debian/README                  |   34 -
 patches/systemvm/debian/buildsystemvm.sh        |  567 -------
 patches/systemvm/debian/config.dat              |  398 -----
 .../debian/config/etc/apache2/httpd.conf        |    2 -
 .../debian/config/etc/apache2/ports.conf        |   23 -
 .../config/etc/apache2/sites-available/default  |   41 -
 .../etc/apache2/sites-available/default-ssl     |  172 --
 .../debian/config/etc/apache2/vhostexample.conf |  238 ---
 .../systemvm/debian/config/etc/cloud-nic.rules  |    2 -
 .../debian/config/etc/cron.daily/cloud-cleanup  |   27 -
 .../systemvm/debian/config/etc/default/cloud    |   19 -
 .../debian/config/etc/default/cloud-passwd-srvr |   19 -
 .../debian/config/etc/dnsmasq.conf.tmpl         |  636 --------
 .../debian/config/etc/haproxy/haproxy.cfg       |   26 -
 patches/systemvm/debian/config/etc/init.d/cloud |  153 --
 .../debian/config/etc/init.d/cloud-early-config | 1428 -----------------
 .../debian/config/etc/init.d/cloud-passwd-srvr  |  124 --
 .../systemvm/debian/config/etc/init.d/postinit  |  178 --
 .../config/etc/iptables/iptables-consoleproxy   |   38 -
 .../debian/config/etc/iptables/iptables-elbvm   |   34 -
 .../debian/config/etc/iptables/iptables-ilbvm   |   33 -
 .../debian/config/etc/iptables/iptables-router  |   55 -
 .../config/etc/iptables/iptables-secstorage     |   36 -
 .../config/etc/iptables/iptables-vpcrouter      |   42 -
 .../debian/config/etc/iptables/rt_tables_init   |   29 -
 .../systemvm/debian/config/etc/iptables/rules   |   42 -
 .../systemvm/debian/config/etc/logrotate.conf   |   25 -
 .../debian/config/etc/logrotate.d/apache2       |   13 -
 .../debian/config/etc/logrotate.d/dnsmasq       |   13 -
 .../debian/config/etc/logrotate.d/haproxy       |   10 -
 .../systemvm/debian/config/etc/logrotate.d/ppp  |    9 -
 .../debian/config/etc/logrotate.d/rsyslog       |   37 -
 .../debian/config/etc/modprobe.d/aesni_intel    |    1 -
 .../debian/config/etc/profile.d/cloud.sh        |   22 -
 patches/systemvm/debian/config/etc/rc.local     |   18 -
 patches/systemvm/debian/config/etc/rsyslog.conf |  106 --
 .../systemvm/debian/config/etc/ssh/sshd_config  |  130 --
 patches/systemvm/debian/config/etc/sysctl.conf  |   49 -
 .../systemvm/debian/config/etc/vpcdnsmasq.conf  |  462 ------
 .../config/opt/cloud/bin/checkbatchs2svpn.sh    |   25 -
 .../debian/config/opt/cloud/bin/checks2svpn.sh  |   46 -
 .../debian/config/opt/cloud/bin/cloud-nic.sh    |   80 -
 .../opt/cloud/bin/get_template_version.sh       |   46 -
 .../systemvm/debian/config/opt/cloud/bin/ilb.sh |  211 ---
 .../debian/config/opt/cloud/bin/ipassoc.sh      |  443 -----
 .../debian/config/opt/cloud/bin/ipsectunnel.sh  |  298 ----
 .../debian/config/opt/cloud/bin/netusage.sh     |  155 --
 .../debian/config/opt/cloud/bin/passwd_server   |   23 -
 .../config/opt/cloud/bin/passwd_server_ip       |   32 -
 .../config/opt/cloud/bin/patchsystemvm.sh       |  279 ----
 .../config/opt/cloud/bin/serve_password.sh      |  103 --
 .../debian/config/opt/cloud/bin/vmdata.py       |  204 ---
 .../debian/config/opt/cloud/bin/vpc_acl.sh      |  233 ---
 .../debian/config/opt/cloud/bin/vpc_func.sh     |   68 -
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh  |  294 ----
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh  |  223 ---
 .../config/opt/cloud/bin/vpc_loadbalancer.sh    |  224 ---
 .../debian/config/opt/cloud/bin/vpc_netusage.sh |  158 --
 .../config/opt/cloud/bin/vpc_passwd_server      |   32 -
 .../config/opt/cloud/bin/vpc_portforwarding.sh  |  126 --
 .../config/opt/cloud/bin/vpc_privateGateway.sh  |   98 --
 .../config/opt/cloud/bin/vpc_privategw_acl.sh   |  224 ---
 .../debian/config/opt/cloud/bin/vpc_snat.sh     |  102 --
 .../config/opt/cloud/bin/vpc_staticnat.sh       |  124 --
 .../config/opt/cloud/bin/vpc_staticroute.sh     |  134 --
 .../debian/config/root/.ssh/authorized_keys     |    1 -
 .../debian/config/root/bumpup_priority.sh       |   19 -
 .../debian/config/root/clearUsageRules.sh       |   39 -
 .../debian/config/root/createIpAlias.sh         |  100 --
 .../debian/config/root/deleteIpAlias.sh         |   60 -
 patches/systemvm/debian/config/root/dnsmasq.sh  |  130 --
 .../systemvm/debian/config/root/edithosts.sh    |  234 ---
 patches/systemvm/debian/config/root/firewall.sh |  357 -----
 .../debian/config/root/firewallRule_egress.sh   |  187 ---
 .../debian/config/root/firewall_rule.sh         |  202 ---
 patches/systemvm/debian/config/root/func.sh     |  143 --
 .../systemvm/debian/config/root/loadbalancer.sh |  320 ----
 .../systemvm/debian/config/root/reconfigLB.sh   |   44 -
 .../redundant_router/arping_gateways.sh.templ   |   29 -
 .../root/redundant_router/backup.sh.templ       |   39 -
 .../root/redundant_router/check_bumpup.sh       |   19 -
 .../redundant_router/check_heartbeat.sh.templ   |   37 -
 .../root/redundant_router/checkrouter.sh.templ  |   56 -
 .../root/redundant_router/conntrackd.conf.templ |  401 -----
 .../root/redundant_router/disable_pubip.sh      |   23 -
 .../root/redundant_router/enable_pubip.sh.templ |   37 -
 .../config/root/redundant_router/fault.sh.templ |   33 -
 .../root/redundant_router/heartbeat.sh.templ    |   20 -
 .../root/redundant_router/keepalived.conf.templ |   57 -
 .../root/redundant_router/master.sh.templ       |   60 -
 .../redundant_router/primary-backup.sh.templ    |  126 --
 .../config/root/redundant_router/services.sh    |   68 -
 .../systemvm/debian/config/root/savepassword.sh |   58 -
 patches/systemvm/debian/config/root/userdata.py |   92 --
 patches/systemvm/debian/config/root/userdata.sh |  165 --
 .../debian/config/var/www/html/latest/.htaccess |    5 -
 .../config/var/www/html/userdata/.htaccess      |    1 -
 patches/systemvm/debian/convert.sh              |   64 -
 patches/systemvm/debian/qemuconvert.sh          |   32 -
 patches/systemvm/debian/systemvm.vmx            |   37 -
 patches/systemvm/debian/systemvm.xml            |   53 -
 patches/systemvm/debian/vhdconvert.sh           |   40 -
 patches/systemvm/debian/vpn/etc/ipsec.conf      |    9 -
 .../systemvm/debian/vpn/etc/ipsec.d/l2tp.conf   |   33 -
 patches/systemvm/debian/vpn/etc/ipsec.secrets   |    2 -
 .../systemvm/debian/vpn/etc/ppp/options.xl2tpd  |   14 -
 .../systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf  |    6 -
 .../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh    |  178 --
 .../debian/vpn/opt/cloud/bin/vpn_l2tp.sh        |  192 ---
 patches/systemvm/debian/xe/xe-daemon            |   65 -
 .../systemvm/debian/xe/xe-linux-distribution    |  267 ---
 .../systemvm/debian/xe/xe-update-guest-attrs    |  226 ---
 .../networkservice/BaremetaNetworkGuru.java     |    2 +-
 .../kvm/resource/BridgeVifDriver.java           |   44 +-
 .../kvm/resource/LibvirtComputingResource.java  |   20 +-
 .../hypervisor/kvm/resource/OvsVifDriver.java   |   28 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |    2 +-
 .../cloud/ovm/hypervisor/OvmResourceBase.java   | 1121 ++++++-------
 plugins/hypervisors/simulator/pom.xml           |    1 -
 plugins/hypervisors/ucs/pom.xml                 |    2 -
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |    3 +
 .../vmware/manager/VmwareManager.java           |    1 +
 .../vmware/manager/VmwareManagerImpl.java       |   51 +-
 .../manager/VmwareStorageManagerImpl.java       |   99 +-
 .../vmware/resource/VmwareContextFactory.java   |    6 +
 .../vmware/resource/VmwareResource.java         |  163 +-
 .../VmwareSecondaryStorageResourceHandler.java  |    1 +
 .../resource/VmwareStorageProcessor.java        |   28 +-
 .../vmware/VmwareDatacenterApiUnitTest.java     |    6 +
 plugins/hypervisors/xen/pom.xml                 |    1 +
 .../xen/resource/CitrixResourceBase.java        |   10 +-
 .../guru/BigSwitchVnsGuestNetworkGuru.java      |    2 +-
 .../cloud/network/element/CiscoVnmcElement.java |   29 +-
 plugins/network-elements/dns-notifier/pom.xml   |    1 -
 .../cloud/network/resource/F5BigIpResource.java |    5 +-
 .../network/resource/JuniperSrxResource.java    |    7 +-
 .../network/resource/NetscalerResource.java     |    2 +-
 .../cloud/network/element/NiciraNvpElement.java |   43 +-
 .../network/guru/NiciraNvpGuestNetworkGuru.java |   69 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |  601 +++----
 plugins/pom.xml                                 |   12 +-
 .../solidfire/test/resource/storageContext.xml  |    2 +-
 pom.xml                                         |   83 +-
 python/lib/cloudutils/networkConfig.py          |    5 +
 scripts/vm/network/security_group.py            |   21 +-
 server/src/com/cloud/api/ApiResponseHelper.java |    2 +-
 .../com/cloud/api/query/QueryManagerImpl.java   |    2 +-
 server/src/com/cloud/configuration/Config.java  |    1 +
 .../configuration/ConfigurationManagerImpl.java |   17 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |   24 +-
 .../com/cloud/event/ActionEventInterceptor.java |   98 +-
 .../src/com/cloud/event/ActionEventUtils.java   |   16 +-
 .../ha/ManagementIPSystemVMInvestigator.java    |   15 -
 .../com/cloud/ha/UserVmDomRInvestigator.java    |   15 -
 .../network/ExternalDeviceUsageManagerImpl.java |   64 +-
 .../ExternalFirewallDeviceManagerImpl.java      |  125 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java  |   72 +-
 .../com/cloud/network/IpAddressManagerImpl.java |   12 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   35 +-
 .../network/firewall/FirewallManagerImpl.java   |   16 +-
 .../network/guru/DirectPodBasedNetworkGuru.java |   18 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |   49 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |   38 +-
 .../cloud/network/guru/PrivateNetworkGuru.java  |   40 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |   22 +-
 .../network/vpc/PrivateGatewayProfile.java      |    4 +-
 .../com/cloud/network/vpc/PrivateIpAddress.java |   12 +-
 .../com/cloud/network/vpc/VpcManagerImpl.java   |   94 +-
 .../com/cloud/server/ManagementServerImpl.java  |   27 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |    9 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   19 +-
 .../cloud/network/CreatePrivateNetworkTest.java |   26 +-
 .../cloud/network/MockFirewallManagerImpl.java  |   17 -
 .../cloud/vpc/MockConfigurationManagerImpl.java |   22 -
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    2 +-
 .../com/cloud/vpc/dao/MockNetworkDaoImpl.java   |    2 +-
 .../test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |    4 +-
 .../server/bindir/cloud-setup-console-proxy.in  |  220 ---
 .../console-proxy/server/certs/localhost.crt    |   22 -
 .../console-proxy/server/certs/localhost.key    |   27 -
 .../console-proxy/server/certs/realhostip.crt   |   31 -
 .../console-proxy/server/certs/realhostip.csr   |   15 -
 .../console-proxy/server/certs/realhostip.key   |   24 -
 .../server/certs/realhostip.keystore            |  Bin 8690 -> 0 bytes
 .../server/conf.dom0/agent.properties.in        |   46 -
 .../server/conf.dom0/consoleproxy.properties.in |   23 -
 .../server/conf.dom0/log4j-cloud.xml.in         |  101 --
 .../console-proxy/server/conf/agent.properties  |    2 -
 .../server/conf/consoleproxy.properties         |   23 -
 .../server/conf/environment.properties          |    2 -
 .../console-proxy/server/conf/log4j-cloud.xml   |  102 --
 .../console-proxy/server/css/ajaxviewer.css     |  144 --
 services/console-proxy/server/css/logger.css    |  139 --
 .../rc.d/init.d/cloud-console-proxy.in          |   98 --
 .../rc.d/init.d/cloud-console-proxy.in          |   98 --
 .../rc.d/init.d/cloud-console-proxy.in          |   98 --
 .../SYSCONFDIR/init.d/cloud-console-proxy.in    |  112 --
 services/console-proxy/server/images/back.gif   |  Bin 149 -> 0 bytes
 .../server/images/bright-green.png              |  Bin 3903 -> 0 bytes
 services/console-proxy/server/images/cad.gif    |  Bin 918 -> 0 bytes
 .../server/images/cannotconnect.jpg             |  Bin 1810 -> 0 bytes
 .../console-proxy/server/images/clr_button.gif  |  Bin 1274 -> 0 bytes
 .../server/images/clr_button_hover.gif          |  Bin 437 -> 0 bytes
 services/console-proxy/server/images/dot.cur    |  Bin 326 -> 0 bytes
 .../console-proxy/server/images/gray-green.png  |  Bin 3833 -> 0 bytes
 .../server/images/grid_headerbg.gif             |  Bin 196 -> 0 bytes
 services/console-proxy/server/images/left.png   |  Bin 3024 -> 0 bytes
 .../server/images/minimize_button.gif           |  Bin 634 -> 0 bytes
 .../server/images/minimize_button_hover.gif     |  Bin 227 -> 0 bytes
 .../console-proxy/server/images/notready.jpg    |  Bin 1827 -> 0 bytes
 .../console-proxy/server/images/play_button.gif |  Bin 657 -> 0 bytes
 .../server/images/play_button_hover.gif         |  Bin 243 -> 0 bytes
 services/console-proxy/server/images/right.png  |  Bin 3131 -> 0 bytes
 services/console-proxy/server/images/right2.png |  Bin 3156 -> 0 bytes
 .../server/images/shrink_button.gif             |  Bin 655 -> 0 bytes
 .../server/images/shrink_button_hover.gif       |  Bin 243 -> 0 bytes
 .../console-proxy/server/images/stop_button.gif |  Bin 649 -> 0 bytes
 .../server/images/stop_button_hover.gif         |  Bin 231 -> 0 bytes
 services/console-proxy/server/images/winlog.png |  Bin 2629 -> 0 bytes
 services/console-proxy/server/js/ajaxkeys.js    |  343 ----
 services/console-proxy/server/js/ajaxviewer.js  | 1383 ----------------
 .../console-proxy/server/js/cloud.logger.js     |  338 ----
 services/console-proxy/server/js/handler.js     |   72 -
 services/console-proxy/server/js/jquery.js      |   19 -
 .../server/libexec/console-proxy-runner.in      |   90 --
 services/console-proxy/server/pom.xml           |  243 +--
 services/console-proxy/server/scripts/_run.sh   |   64 -
 .../console-proxy/server/scripts/config_auth.sh |   69 -
 .../console-proxy/server/scripts/config_ssl.sh  |  183 ---
 .../server/scripts/consoleproxy.sh              |   33 -
 .../console-proxy/server/scripts/ipfirewall.sh  |   50 -
 .../console-proxy/server/scripts/run-proxy.sh   |   48 -
 services/console-proxy/server/scripts/run.bat   |   18 -
 services/console-proxy/server/scripts/run.sh    |   45 -
 .../console-proxy/server/scripts/secstorage.sh  |   33 -
 .../server/systemvm-descriptor.xml              |  122 --
 .../console-proxy/server/ui/viewer-bad-sid.ftl  |   29 -
 .../server/ui/viewer-connect-failed.ftl         |   29 -
 .../console-proxy/server/ui/viewer-update.ftl   |   24 -
 services/console-proxy/server/ui/viewer.ftl     |   60 -
 services/console-proxy/server/vm-script/vmops   |  119 --
 services/secondary-storage/pom.xml              |    7 -
 setup/bindir/cloud-sysvmadm.in                  |  102 +-
 setup/db/db/schema-410to420.sql                 |    2 +-
 systemvm/bindir/cloud-setup-console-proxy.in    |  220 +++
 systemvm/certs/localhost.crt                    |   22 +
 systemvm/certs/localhost.key                    |   27 +
 systemvm/certs/realhostip.crt                   |   31 +
 systemvm/certs/realhostip.csr                   |   15 +
 systemvm/certs/realhostip.key                   |   24 +
 systemvm/certs/realhostip.keystore              |  Bin 0 -> 8690 bytes
 systemvm/cloudpatch-descriptor.xml              |   59 +
 systemvm/conf.dom0/agent.properties.in          |   46 +
 systemvm/conf.dom0/consoleproxy.properties.in   |   23 +
 systemvm/conf.dom0/log4j-cloud.xml.in           |  101 ++
 systemvm/conf/agent.properties                  |    2 +
 systemvm/conf/consoleproxy.properties           |   23 +
 systemvm/conf/environment.properties            |    2 +
 systemvm/conf/log4j-cloud.xml                   |  102 ++
 systemvm/css/ajaxviewer.css                     |  144 ++
 systemvm/css/logger.css                         |  139 ++
 .../rc.d/init.d/cloud-console-proxy.in          |   98 ++
 .../rc.d/init.d/cloud-console-proxy.in          |   98 ++
 .../rc.d/init.d/cloud-console-proxy.in          |   98 ++
 .../SYSCONFDIR/init.d/cloud-console-proxy.in    |  112 ++
 systemvm/images/back.gif                        |  Bin 0 -> 149 bytes
 systemvm/images/bright-green.png                |  Bin 0 -> 3903 bytes
 systemvm/images/cad.gif                         |  Bin 0 -> 918 bytes
 systemvm/images/cannotconnect.jpg               |  Bin 0 -> 1810 bytes
 systemvm/images/clr_button.gif                  |  Bin 0 -> 1274 bytes
 systemvm/images/clr_button_hover.gif            |  Bin 0 -> 437 bytes
 systemvm/images/dot.cur                         |  Bin 0 -> 326 bytes
 systemvm/images/gray-green.png                  |  Bin 0 -> 3833 bytes
 systemvm/images/grid_headerbg.gif               |  Bin 0 -> 196 bytes
 systemvm/images/left.png                        |  Bin 0 -> 3024 bytes
 systemvm/images/minimize_button.gif             |  Bin 0 -> 634 bytes
 systemvm/images/minimize_button_hover.gif       |  Bin 0 -> 227 bytes
 systemvm/images/notready.jpg                    |  Bin 0 -> 1827 bytes
 systemvm/images/play_button.gif                 |  Bin 0 -> 657 bytes
 systemvm/images/play_button_hover.gif           |  Bin 0 -> 243 bytes
 systemvm/images/right.png                       |  Bin 0 -> 3131 bytes
 systemvm/images/right2.png                      |  Bin 0 -> 3156 bytes
 systemvm/images/shrink_button.gif               |  Bin 0 -> 655 bytes
 systemvm/images/shrink_button_hover.gif         |  Bin 0 -> 243 bytes
 systemvm/images/stop_button.gif                 |  Bin 0 -> 649 bytes
 systemvm/images/stop_button_hover.gif           |  Bin 0 -> 231 bytes
 systemvm/images/winlog.png                      |  Bin 0 -> 2629 bytes
 systemvm/js/ajaxkeys.js                         |  343 ++++
 systemvm/js/ajaxviewer.js                       | 1383 ++++++++++++++++
 systemvm/js/cloud.logger.js                     |  338 ++++
 systemvm/js/handler.js                          |   72 +
 systemvm/js/jquery.js                           |   19 +
 systemvm/libexec/console-proxy-runner.in        |   90 ++
 systemvm/patches/debian/README                  |   34 +
 systemvm/patches/debian/buildsystemvm.sh        |  567 +++++++
 systemvm/patches/debian/config.dat              |  398 +++++
 .../debian/config/etc/apache2/httpd.conf        |    2 +
 .../debian/config/etc/apache2/ports.conf        |   23 +
 .../config/etc/apache2/sites-available/default  |   41 +
 .../etc/apache2/sites-available/default-ssl     |  172 ++
 .../debian/config/etc/apache2/vhostexample.conf |  238 +++
 .../patches/debian/config/etc/cloud-nic.rules   |    2 +
 .../debian/config/etc/cron.daily/cloud-cleanup  |   27 +
 .../patches/debian/config/etc/default/cloud     |   19 +
 .../debian/config/etc/default/cloud-passwd-srvr |   19 +
 .../patches/debian/config/etc/dnsmasq.conf.tmpl |  636 ++++++++
 .../debian/config/etc/haproxy/haproxy.cfg       |   26 +
 systemvm/patches/debian/config/etc/init.d/cloud |  153 ++
 .../debian/config/etc/init.d/cloud-early-config | 1428 +++++++++++++++++
 .../debian/config/etc/init.d/cloud-passwd-srvr  |  124 ++
 .../patches/debian/config/etc/init.d/postinit   |  178 ++
 .../config/etc/iptables/iptables-consoleproxy   |   38 +
 .../debian/config/etc/iptables/iptables-elbvm   |   34 +
 .../debian/config/etc/iptables/iptables-ilbvm   |   33 +
 .../debian/config/etc/iptables/iptables-router  |   55 +
 .../config/etc/iptables/iptables-secstorage     |   36 +
 .../config/etc/iptables/iptables-vpcrouter      |   42 +
 .../debian/config/etc/iptables/rt_tables_init   |   29 +
 .../patches/debian/config/etc/iptables/rules    |   42 +
 .../patches/debian/config/etc/logrotate.conf    |   25 +
 .../debian/config/etc/logrotate.d/apache2       |   13 +
 .../debian/config/etc/logrotate.d/dnsmasq       |   13 +
 .../debian/config/etc/logrotate.d/haproxy       |   10 +
 .../patches/debian/config/etc/logrotate.d/ppp   |    9 +
 .../debian/config/etc/logrotate.d/rsyslog       |   37 +
 .../debian/config/etc/modprobe.d/aesni_intel    |    1 +
 .../debian/config/etc/profile.d/cloud.sh        |   22 +
 systemvm/patches/debian/config/etc/rc.local     |   18 +
 systemvm/patches/debian/config/etc/rsyslog.conf |  106 ++
 .../patches/debian/config/etc/ssh/sshd_config   |  130 ++
 systemvm/patches/debian/config/etc/sysctl.conf  |   49 +
 .../patches/debian/config/etc/vpcdnsmasq.conf   |  462 ++++++
 .../config/opt/cloud/bin/checkbatchs2svpn.sh    |   25 +
 .../debian/config/opt/cloud/bin/checks2svpn.sh  |   46 +
 .../debian/config/opt/cloud/bin/cloud-nic.sh    |   80 +
 .../opt/cloud/bin/get_template_version.sh       |   46 +
 .../patches/debian/config/opt/cloud/bin/ilb.sh  |  211 +++
 .../debian/config/opt/cloud/bin/ipassoc.sh      |  443 +++++
 .../debian/config/opt/cloud/bin/ipsectunnel.sh  |  298 ++++
 .../debian/config/opt/cloud/bin/netusage.sh     |  155 ++
 .../debian/config/opt/cloud/bin/passwd_server   |   23 +
 .../config/opt/cloud/bin/passwd_server_ip       |   32 +
 .../config/opt/cloud/bin/patchsystemvm.sh       |  279 ++++
 .../config/opt/cloud/bin/serve_password.sh      |  103 ++
 .../debian/config/opt/cloud/bin/vmdata.py       |  204 +++
 .../debian/config/opt/cloud/bin/vpc_acl.sh      |  233 +++
 .../debian/config/opt/cloud/bin/vpc_func.sh     |   68 +
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh  |  294 ++++
 .../debian/config/opt/cloud/bin/vpc_ipassoc.sh  |  223 +++
 .../config/opt/cloud/bin/vpc_loadbalancer.sh    |  224 +++
 .../debian/config/opt/cloud/bin/vpc_netusage.sh |  158 ++
 .../config/opt/cloud/bin/vpc_passwd_server      |   32 +
 .../config/opt/cloud/bin/vpc_portforwarding.sh  |  126 ++
 .../config/opt/cloud/bin/vpc_privateGateway.sh  |   98 ++
 .../config/opt/cloud/bin/vpc_privategw_acl.sh   |  224 +++
 .../debian/config/opt/cloud/bin/vpc_snat.sh     |  102 ++
 .../config/opt/cloud/bin/vpc_staticnat.sh       |  124 ++
 .../config/opt/cloud/bin/vpc_staticroute.sh     |  134 ++
 .../debian/config/root/.ssh/authorized_keys     |    1 +
 .../debian/config/root/bumpup_priority.sh       |   19 +
 .../debian/config/root/clearUsageRules.sh       |   39 +
 .../patches/debian/config/root/createIpAlias.sh |  100 ++
 .../patches/debian/config/root/deleteIpAlias.sh |   60 +
 systemvm/patches/debian/config/root/dnsmasq.sh  |  130 ++
 .../patches/debian/config/root/edithosts.sh     |  234 +++
 systemvm/patches/debian/config/root/firewall.sh |  357 +++++
 .../debian/config/root/firewallRule_egress.sh   |  187 +++
 .../patches/debian/config/root/firewall_rule.sh |  202 +++
 systemvm/patches/debian/config/root/func.sh     |  143 ++
 .../patches/debian/config/root/loadbalancer.sh  |  320 ++++
 .../patches/debian/config/root/reconfigLB.sh    |   44 +
 .../redundant_router/arping_gateways.sh.templ   |   29 +
 .../root/redundant_router/backup.sh.templ       |   39 +
 .../root/redundant_router/check_bumpup.sh       |   19 +
 .../redundant_router/check_heartbeat.sh.templ   |   37 +
 .../root/redundant_router/checkrouter.sh.templ  |   56 +
 .../root/redundant_router/conntrackd.conf.templ |  401 +++++
 .../root/redundant_router/disable_pubip.sh      |   23 +
 .../root/redundant_router/enable_pubip.sh.templ |   37 +
 .../config/root/redundant_router/fault.sh.templ |   33 +
 .../root/redundant_router/heartbeat.sh.templ    |   20 +
 .../root/redundant_router/keepalived.conf.templ |   57 +
 .../root/redundant_router/master.sh.templ       |   60 +
 .../redundant_router/primary-backup.sh.templ    |  126 ++
 .../config/root/redundant_router/services.sh    |   68 +
 .../patches/debian/config/root/savepassword.sh  |   58 +
 systemvm/patches/debian/config/root/userdata.py |   92 ++
 systemvm/patches/debian/config/root/userdata.sh |  165 ++
 .../debian/config/var/www/html/latest/.htaccess |    5 +
 .../config/var/www/html/userdata/.htaccess      |    1 +
 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/vpn/etc/ipsec.conf      |    9 +
 .../patches/debian/vpn/etc/ipsec.d/l2tp.conf    |   33 +
 systemvm/patches/debian/vpn/etc/ipsec.secrets   |    2 +
 .../patches/debian/vpn/etc/ppp/options.xl2tpd   |   14 +
 .../patches/debian/vpn/etc/xl2tpd/xl2tpd.conf   |    6 +
 .../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh    |  178 ++
 .../debian/vpn/opt/cloud/bin/vpn_l2tp.sh        |  192 +++
 systemvm/patches/debian/xe/xe-daemon            |   65 +
 .../patches/debian/xe/xe-linux-distribution     |  267 +++
 .../patches/debian/xe/xe-update-guest-attrs     |  226 +++
 systemvm/pom.xml                                |  261 +++
 systemvm/scripts/_run.sh                        |   64 +
 systemvm/scripts/config_auth.sh                 |   69 +
 systemvm/scripts/config_ssl.sh                  |  183 +++
 systemvm/scripts/consoleproxy.sh                |   33 +
 systemvm/scripts/ipfirewall.sh                  |   50 +
 systemvm/scripts/run-proxy.sh                   |   48 +
 systemvm/scripts/run.bat                        |   18 +
 systemvm/scripts/run.sh                         |   45 +
 systemvm/scripts/secstorage.sh                  |   33 +
 systemvm/systemvm-descriptor.xml                |  116 ++
 systemvm/ui/viewer-bad-sid.ftl                  |   29 +
 systemvm/ui/viewer-connect-failed.ftl           |   29 +
 systemvm/ui/viewer-update.ftl                   |   24 +
 systemvm/ui/viewer.ftl                          |   60 +
 systemvm/vm-script/vmops                        |  119 ++
 .../component/test_egress_fw_rules.py           |   38 +-
 .../component/test_ip_reservation.py            |  316 ++++
 .../component/test_reset_ssh_keypair.py         | 1517 ++++++++++++++++++
 .../component/test_vpc_network_lbrules.py       |   30 +
 .../smoke/test_reset_vm_on_reboot.py            |  219 +++
 test/pom.xml                                    |    7 +-
 tools/appliance/build.sh                        |    6 +-
 tools/devcloud-kvm/pom.xml                      |    1 -
 tools/devcloud/devcloud-advanced.cfg            |    4 +-
 tools/devcloud/devcloud-advancedsg.cfg          |    4 +-
 tools/devcloud/pom.xml                          |    1 -
 tools/marvin/marvin/integration/lib/base.py     |    7 +-
 tools/marvin/pom.xml                            |    1 -
 tools/pom.xml                                   |    1 -
 ui/scripts/autoscaler.js                        |    2 +-
 ui/scripts/instances.js                         |   38 +-
 ui/scripts/network.js                           |   75 +-
 ui/scripts/sharedFunctions.js                   |   46 +-
 ui/scripts/templates.js                         |    9 +-
 ui/scripts/ui/core.js                           |    6 +-
 ui/scripts/ui/widgets/detailView.js             |    8 +-
 ui/scripts/ui/widgets/notifications.js          |    2 +-
 ui/scripts/zoneWizard.js                        |   20 +-
 utils/src/com/cloud/utils/NumbersUtil.java      |   10 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |  469 +++---
 utils/test/com/cloud/utils/NumbersUtilTest.java |   34 +
 .../vmware/mo/CustomFieldConstants.java         |    2 +
 .../vmware/mo/HypervisorHostHelper.java         |   20 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |   17 +-
 520 files changed, 25002 insertions(+), 22108 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc91ea51/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------


Mime
View raw message