Updated Branches: refs/heads/marvin-refactor 41f2ac041 -> b2704abfc
Merge branch 'master' into marvin-refactor Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b2704abf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b2704abf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b2704abf Branch: refs/heads/marvin-refactor Commit: b2704abfc0ea286e5f494f3a15466a5f7b88f906 Parents: 069abf7 6b257bf Author: Prasanna Santhanam <[email protected]> Authored: Mon Mar 4 19:12:31 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Mon Mar 4 19:12:31 2013 +0530 ---------------------------------------------------------------------- agent/conf/agent.properties | 2 +- api/src/com/cloud/event/EventTypes.java | 1 + api/src/com/cloud/network/IpAddress.java | 3 + api/src/com/cloud/network/NetworkService.java | 15 +- api/src/com/cloud/network/rules/RulesService.java | 5 +- api/src/com/cloud/vm/Nic.java | 1 + api/src/com/cloud/vm/NicSecondaryIp.java | 36 ++ api/src/com/cloud/vm/UserVmService.java | 16 +- api/src/com/cloud/vm/VirtualMachine.java | 11 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../apache/cloudstack/api/ResponseGenerator.java | 7 + .../user/firewall/CreatePortForwardingRuleCmd.java | 19 +- .../api/command/user/nat/EnableStaticNatCmd.java | 12 +- .../api/command/user/vm/AddIpToVmNicCmd.java | 176 +++++++++ .../api/command/user/vm/ListNicsCmd.java | 133 +++++++ .../api/command/user/vm/RemoveIpFromVmNicCmd.java | 123 ++++++ .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 109 +++++ .../api/response/AddIpToVmNicResponse.java | 85 ++++ .../cloudstack/api/response/IPAddressResponse.java | 8 + .../cloudstack/api/response/NicResponse.java | 12 +- .../api/response/NicSecondaryIpResponse.java | 85 ++++ .../api/command/test/AddIpToVmNicTest.java | 132 ++++++ .../bridge/persist/dao/CloudStackUserDaoImpl.java | 2 + client/pom.xml | 5 - client/tomcatconf/commands.properties.in | 6 + client/tomcatconf/components.xml.in | 1 + core/src/com/cloud/vm/VMInstanceVO.java | 26 ++- debian/cloudstack-agent.install | 10 +- debian/cloudstack-common.install | 2 - debian/cloudstack-management.install | 6 +- debian/cloudstack-usage.install | 4 +- debian/control | 2 +- debian/rules | 104 +++--- docs/en-US/accessing-vms.xml | 4 +- docs/en-US/added-error-codes.xml | 2 +- ...change-console-proxy-ssl-certificate-domain.xml | 4 +- docs/en-US/citrix-xenserver-installation.xml | 8 +- docs/en-US/console-proxy.xml | 4 +- docs/en-US/create-bare-metal-template.xml | 1 - docs/en-US/creating-vms.xml | 2 +- docs/en-US/dedicated-ha-hosts.xml | 2 +- docs/en-US/deployment-architecture-overview.xml | 3 +- docs/en-US/shared-networks.xml | 3 +- docs/en-US/upload-existing-volume-to-vm.xml | 6 +- docs/en-US/using-vpn-with-mac.xml | 15 +- docs/en-US/using-vpn-with-windows.xml | 10 +- docs/en-US/zone-add.xml | 2 +- packaging/centos63/cloud-agent.rc | 4 +- packaging/centos63/cloud.spec | 5 +- packaging/debian/init/cloud-agent | 8 +- packaging/debian/init/cloud-usage | 2 +- packaging/debian/replace.properties | 26 +- .../BaremetalKickStartPxeResource.java | 2 +- .../BaremetalKickStartServiceImpl.java | 33 ++- .../PrepareKickstartPxeServerCommand.java | 31 +- plugins/hypervisors/kvm/pom.xml | 9 +- .../hypervisor/vmware/VmwareServerDiscoverer.java | 75 +++-- .../vmware/manager/VmwareManagerImpl.java | 42 ++- .../xen/resource/CitrixResourceBase.java | 172 ++++----- .../xen/resource/XenServer56FP1Resource.java | 11 +- pom.xml | 6 + .../ping/prepare_kickstart_kernel_initrd.py | 55 ++-- .../xenserver/Add-To-VCPUs-Params-Live.sh | 33 ++ scripts/vm/hypervisor/xenserver/vmops | 13 + server/src/com/cloud/api/ApiDBUtils.java | 10 + server/src/com/cloud/api/ApiResponseHelper.java | 56 +++ server/src/com/cloud/configuration/Config.java | 3 +- server/src/com/cloud/network/NetworkManager.java | 12 + .../src/com/cloud/network/NetworkManagerImpl.java | 76 ++++- server/src/com/cloud/network/NetworkModelImpl.java | 5 + .../src/com/cloud/network/NetworkServiceImpl.java | 170 ++++++++ server/src/com/cloud/network/addr/PublicIp.java | 34 +- server/src/com/cloud/network/dao/IPAddressDao.java | 7 +- .../com/cloud/network/dao/IPAddressDaoImpl.java | 17 +- server/src/com/cloud/network/dao/IPAddressVO.java | 16 +- .../router/VirtualNetworkApplianceManagerImpl.java | 3 +- .../com/cloud/network/rules/RulesManagerImpl.java | 113 ++++-- .../network/rules/dao/PortForwardingRulesDao.java | 2 + .../rules/dao/PortForwardingRulesDaoImpl.java | 8 + .../src/com/cloud/server/ManagementServerImpl.java | 4 + server/src/com/cloud/vm/ItWorkVO.java | 3 +- server/src/com/cloud/vm/NicVO.java | 11 + server/src/com/cloud/vm/UserVmManagerImpl.java | 94 ++++- server/src/com/cloud/vm/VirtualMachineManager.java | 12 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 307 +++++++++++++-- server/src/com/cloud/vm/dao/NicDao.java | 2 + server/src/com/cloud/vm/dao/NicDaoImpl.java | 12 +- server/src/com/cloud/vm/dao/NicSecondaryIpDao.java | 53 +++ .../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 138 +++++++ server/src/com/cloud/vm/dao/NicSecondaryIpVO.java | 160 ++++++++ .../com/cloud/network/MockNetworkManagerImpl.java | 47 +++ .../com/cloud/network/MockRulesManagerImpl.java | 19 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 17 +- .../cloud/vm/MockVirtualMachineManagerImpl.java | 15 + .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 73 ++++ setup/db/db/schema-410to420.sql | 21 + tools/appliance/build.sh | 19 +- tools/marvin/marvin/codegenerator.py | 49 ++- ui/scripts/system.js | 106 +++++- ui/scripts/zoneWizard.js | 16 +- 100 files changed, 2971 insertions(+), 492 deletions(-) ----------------------------------------------------------------------
