Updated Branches: refs/heads/master 829acf6e2 -> ca4309283
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ca430928 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ca430928 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ca430928 Branch: refs/heads/master Commit: ca4309283059864d307778fab7f5df2a8858768a Parents: 5611723 829acf6 Author: David Nalley <[email protected]> Authored: Sat Jul 14 11:50:03 2012 -0400 Committer: David Nalley <[email protected]> Committed: Sat Jul 14 11:50:03 2012 -0400 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/to/NicTO.java | 11 + .../com/cloud/agent/api/to/VirtualMachineTO.java | 11 + api/src/com/cloud/api/ApiConstants.java | 4 + api/src/com/cloud/host/Host.java | 3 +- api/src/com/cloud/network/Network.java | 2 + api/src/com/cloud/network/Networks.java | 1 + api/src/com/cloud/network/PhysicalNetwork.java | 3 +- build/build-cloud-plugins.xml | 10 +- build/build-devcloud.xml | 24 +- build/package.xml | 1 + client/tomcatconf/components.xml.in | 7 +- .../tomcatconf/nicira-nvp_commands.properties.in | 12 + cloud.spec | 1 + .../xen/resource/CitrixResourceBase.java | 12 +- .../network/lb/ElasticLoadBalancerManagerImpl.java | 9 + plugins/network-elements/nicira-nvp/.classpath | 12 + plugins/network-elements/nicira-nvp/.project | 17 + .../nicira-nvp/README.NiciraIntegration | 68 ++ plugins/network-elements/nicira-nvp/build.xml | 129 ++++ .../cloud/agent/api/CreateLogicalSwitchAnswer.java | 20 + .../agent/api/CreateLogicalSwitchCommand.java | 38 ++ .../agent/api/CreateLogicalSwitchPortAnswer.java | 20 + .../agent/api/CreateLogicalSwitchPortCommand.java | 42 ++ .../cloud/agent/api/DeleteLogicalSwitchAnswer.java | 14 + .../agent/api/DeleteLogicalSwitchCommand.java | 19 + .../agent/api/DeleteLogicalSwitchPortAnswer.java | 14 + .../agent/api/DeleteLogicalSwitchPortCommand.java | 25 + .../cloud/agent/api/StartupNiciraNvpCommand.java | 11 + .../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 110 ++++ .../api/commands/DeleteNiciraNvpDeviceCmd.java | 76 +++ .../commands/ListNiciraNvpDeviceNetworksCmd.java | 85 +++ .../api/commands/ListNiciraNvpDevicesCmd.java | 90 +++ .../api/response/NiciraNvpDeviceResponse.java | 37 ++ .../src/com/cloud/network/NiciraNvpDeviceVO.java | 79 +++ .../com/cloud/network/NiciraNvpNicMappingVO.java | 65 ++ .../src/com/cloud/network/dao/NiciraNvpDao.java | 16 + .../com/cloud/network/dao/NiciraNvpDaoImpl.java | 32 + .../cloud/network/dao/NiciraNvpNicMappingDao.java | 13 + .../network/dao/NiciraNvpNicMappingDaoImpl.java | 30 + .../cloud/network/element/NiciraNvpElement.java | 502 +++++++++++++++ .../network/element/NiciraNvpElementService.java | 28 + .../network/guru/NiciraNvpGuestNetworkGuru.java | 257 ++++++++ .../src/com/cloud/network/nicira/Attachment.java | 22 + .../com/cloud/network/nicira/LogicalSwitch.java | 99 +++ .../cloud/network/nicira/LogicalSwitchPort.java | 118 ++++ .../src/com/cloud/network/nicira/NiciraNvpApi.java | 413 ++++++++++++ .../network/nicira/NiciraNvpApiException.java | 20 + .../com/cloud/network/nicira/NiciraNvpList.java | 25 + .../src/com/cloud/network/nicira/NiciraNvpTag.java | 47 ++ .../cloud/network/nicira/TransportZoneBinding.java | 47 ++ .../com/cloud/network/nicira/VifAttachment.java | 43 ++ .../cloud/network/resource/NiciraNvpResource.java | 240 +++++++ .../cloud/network/guru/OvsGuestNetworkGuru.java | 28 + .../manager/allocator/impl/FirstFitAllocator.java | 14 + .../AgentBasedConsoleProxyManager.java | 8 + .../consoleproxy/ConsoleProxyManagerImpl.java | 8 + server/src/com/cloud/host/dao/HostDaoImpl.java | 4 +- .../com/cloud/hypervisor/HypervisorGuruBase.java | 15 + .../network/ExternalNetworkDeviceManager.java | 2 + .../src/com/cloud/network/NetworkManagerImpl.java | 5 +- .../network/guru/ExternalGuestNetworkGuru.java | 30 +- .../com/cloud/network/guru/GuestNetworkGuru.java | 53 ++- .../router/VirtualNetworkApplianceManagerImpl.java | 13 + server/src/com/cloud/server/StatsCollector.java | 1 + server/src/com/cloud/storage/StorageManager.java | 2 +- .../src/com/cloud/storage/StorageManagerImpl.java | 30 +- .../secondary/SecondaryStorageManagerImpl.java | 8 + .../com/cloud/tags/TaggedResourceManagerImpl.java | 10 +- server/src/com/cloud/user/AccountManagerImpl.java | 5 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 6 + server/src/com/cloud/vm/VirtualMachineGuru.java | 2 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 11 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 6 + setup/db/create-schema.sql | 23 + tools/devcloud/devcloudsetup.sh | 29 +- ui/css/cloudstack3.css | 143 ++++ ui/scripts/network.js | 82 +++- ui/scripts/ui-custom/enableStaticNAT.js | 34 + ui/scripts/ui-custom/zoneWizard.js | 13 +- ui/scripts/ui/widgets/detailView.js | 14 +- ui/scripts/ui/widgets/listView.js | 10 +- ui/scripts/ui/widgets/multiEdit.js | 27 +- wscript_configure | 2 +- 83 files changed, 3609 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
