Updated Branches: refs/heads/add_remove_nics 4d369994d -> ea7fbd6b4
Merge branch 'master' into add_remove_nics Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ea7fbd6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ea7fbd6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ea7fbd6b Branch: refs/heads/add_remove_nics Commit: ea7fbd6b4ffa9e09015641e062dafe35f98b7851 Parents: 4d36999 17c419c Author: Marcus Sorensen <[email protected]> Authored: Fri Jan 25 22:23:42 2013 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Fri Jan 25 22:23:42 2013 -0700 ---------------------------------------------------------------------- agent/conf/agent.properties | 11 + api/src/com/cloud/dao/EntityManager.java | 9 + api/src/com/cloud/resource/ResourceService.java | 5 +- api/src/com/cloud/server/ManagementService.java | 28 +- .../cloud/storage/snapshot/SnapshotService.java | 2 +- .../api/BaseListAccountResourcesCmd.java | 2 +- .../admin/network/CreateNetworkOfferingCmd.java | 4 +- .../api/command/admin/swift/ListSwiftsCmd.java | 10 +- .../api/command/user/iso/AttachIsoCmd.java | 2 +- .../api/command/user/iso/DetachIsoCmd.java | 2 +- .../user/offering/ListDiskOfferingsCmd.java | 13 +- .../user/offering/ListServiceOfferingsCmd.java | 17 +- .../user/snapshot/ListSnapshotPoliciesCmd.java | 7 +- .../api/command/user/template/CopyTemplateCmd.java | 2 +- .../command/user/template/DeleteTemplateCmd.java | 4 +- .../command/user/template/ExtractTemplateCmd.java | 4 +- .../api/command/user/vpc/ListVPCsCmd.java | 17 - .../api/command/user/zone/ListZonesByCmd.java | 13 +- .../cloudstack/api/response/ZoneResponse.java | 6 +- .../org/apache/cloudstack/query/QueryService.java | 12 + .../WEB-INF/classes/resources/messages.properties | 4 +- docs/en-US/host-add-xenserver-kvm-ovm.xml | 5 + ...hypervisor-host-install-network-openvswitch.xml | 116 + docs/en-US/hypervisor-host-install-network.xml | 3 +- docs/en-US/hypervisor-kvm-install-flow.xml | 3 +- docs/en-US/hypervisor-kvm-requirements.xml | 7 +- docs/en-US/offerings.xml | 32 +- docs/en-US/plugin-niciranvp-features.xml | 8 +- docs/en-US/plugin-niciranvp-preparations.xml | 4 +- docs/en-US/plugin-niciranvp-ui.xml | 26 + docs/en-US/plugin-niciranvp-usage.xml | 1 + docs/en-US/sys-offering-sysvm.xml | 75 + plugins/api/discovery/pom.xml | 64 +- .../api/response/ApiDiscoveryResponse.java | 16 + .../discovery/ApiDiscoveryServiceImpl.java | 14 +- .../cloudstack/discovery/ApiDiscoveryTest.java | 87 + .../hypervisor/kvm/resource/BridgeVifDriver.java | 20 +- .../kvm/resource/LibvirtComputingResource.java | 197 ++- .../hypervisor/kvm/resource/LibvirtVMDef.java | 37 + .../hypervisor/kvm/resource/OvsVifDriver.java | 189 ++ .../kvm/storage/KVMStoragePoolManager.java | 4 + scripts/vm/hypervisor/kvm/rundomrpre.sh | 2 +- server/pom.xml | 1 + server/src/com/cloud/api/ApiDBUtils.java | 41 + server/src/com/cloud/api/ApiDispatcher.java | 19 +- server/src/com/cloud/api/ApiResponseHelper.java | 145 +- server/src/com/cloud/api/ApiServer.java | 6 + server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 20 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 469 ++++- .../com/cloud/api/query/ViewResponseHelper.java | 30 + .../com/cloud/api/query/dao/DataCenterJoinDao.java | 30 + .../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 109 + .../cloud/api/query/dao/DiskOfferingJoinDao.java | 29 + .../api/query/dao/DiskOfferingJoinDaoImpl.java | 101 + .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- .../api/query/dao/ServiceOfferingJoinDao.java | 30 + .../api/query/dao/ServiceOfferingJoinDaoImpl.java | 91 + .../com/cloud/api/query/vo/DataCenterJoinVO.java | 284 +++ .../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 233 ++ .../cloud/api/query/vo/ServiceOfferingJoinVO.java | 311 +++ .../configuration/DefaultComponentLibrary.java | 6 + server/src/com/cloud/dao/EntityManagerImpl.java | 7 + .../src/com/cloud/network/NetworkServiceImpl.java | 24 - .../com/cloud/resource/ResourceManagerImpl.java | 5 +- .../com/cloud/server/ConfigurationServerImpl.java | 3 +- .../src/com/cloud/server/ManagementServerImpl.java | 524 +---- .../com/cloud/storage/dao/SnapshotPolicyDao.java | 3 + .../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 30 +- .../storage/snapshot/SnapshotManagerImpl.java | 96 +- .../src/com/cloud/storage/swift/SwiftManager.java | 3 +- .../com/cloud/storage/swift/SwiftManagerImpl.java | 7 +- .../cloud/resource/MockResourceManagerImpl.java | 2 +- setup/db/create-schema-view.sql | 1845 +++++++++------ setup/db/create-schema.sql | 1 + setup/db/db/schema-40to410.sql | 1844 +++++++++------ tools/cli/cloudmonkey/cloudmonkey.py | 42 +- tools/cli/cloudmonkey/common.py | 4 +- tools/cli/setup.py | 2 +- tools/devcloud-kvm/pom.xml | 10 +- tools/devcloud/devcloud.sql | 2 +- tools/devcloud/devcloud_internal-mgt.cfg | 121 + tools/devcloud/pom.xml | 10 +- ui/css/cloudstack3.css | 12 + ui/index.jsp | 2 +- ui/scripts/accounts.js | 8 +- ui/scripts/configuration.js | 14 +- ui/scripts/instanceWizard.js | 69 +- ui/scripts/projects.js | 2 +- ui/scripts/system.js | 7 + ui/scripts/ui-custom/instanceWizard.js | 27 +- utils/src/com/cloud/utils/IteratorUtil.java | 10 + utils/src/com/cloud/utils/ReflectUtil.java | 48 +- utils/src/com/cloud/utils/db/GenericDao.java | 3 + utils/src/com/cloud/utils/db/GenericDaoBase.java | 8 + utils/src/com/cloud/utils/script/Script.java | 90 +- 95 files changed, 5350 insertions(+), 2576 deletions(-) ----------------------------------------------------------------------
