cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [52/55] [abbrv] git commit: updated refs/heads/cisco-vnmc-api-integration to f38be48
Date Mon, 08 Apr 2013 13:14:02 GMT
Merge branch 'master' into cisco-vnmc-api-integration


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

Branch: refs/heads/cisco-vnmc-api-integration
Commit: 67f11d46ad8c13f371fe94c57fb287cb9d6005d1
Parents: 3422cee c9c68e1
Author: Koushik Das <koushik.das@citrix.com>
Authored: Mon Apr 8 15:11:10 2013 +0530
Committer: Koushik Das <koushik.das@citrix.com>
Committed: Mon Apr 8 15:11:10 2013 +0530

----------------------------------------------------------------------
 .gitignore                                         |    8 +
 CHANGES                                            |    2 +-
 INSTALL.md                                         |    4 +-
 LICENSE                                            |   66 +-
 README.md                                          |   10 +-
 README.tools.md                                    |    2 +-
 agent/conf/agent.properties                        |    9 +
 api/src/com/cloud/agent/api/Command.java           |    2 +
 api/src/com/cloud/agent/api/RebootCommand.java     |    1 +
 api/src/com/cloud/agent/api/ScaleVmCommand.java    |    6 +-
 api/src/com/cloud/agent/api/StopCommand.java       |    7 +-
 .../routing/GlobalLoadBalancerConfigAnswer.java    |   27 +
 .../routing/GlobalLoadBalancerConfigCommand.java   |  100 +
 .../agent/api/routing/SiteLoadBalancerConfig.java  |  121 +
 api/src/com/cloud/async/AsyncJob.java              |    7 +-
 api/src/com/cloud/configuration/Resource.java      |    7 +-
 api/src/com/cloud/event/EventTypes.java            |   12 +
 api/src/com/cloud/hypervisor/Hypervisor.java       |    3 +
 api/src/com/cloud/network/Network.java             |    5 +-
 api/src/com/cloud/network/NetworkModel.java        |    4 +
 api/src/com/cloud/network/Networks.java            |    1 +
 api/src/com/cloud/network/PhysicalNetwork.java     |    3 +-
 api/src/com/cloud/network/RemoteAccessVpn.java     |    4 +-
 .../com/cloud/network/lb/LoadBalancingRule.java    |    8 +
 api/src/com/cloud/network/vpc/Vpc.java             |   43 +-
 api/src/com/cloud/network/vpc/VpcOffering.java     |   21 +-
 .../cloud/network/vpc/VpcProvisioningService.java  |   46 +
 api/src/com/cloud/network/vpc/VpcService.java      |   95 +-
 .../cloud/network/vpn/RemoteAccessVpnService.java  |    2 +-
 .../cloud/region/ha/GlobalLoadBalancerRule.java    |   89 +
 .../region/ha/GlobalLoadBalancingRulesService.java |   47 +
 api/src/com/cloud/server/ResourceTag.java          |    3 +-
 .../cloud/storage/DataStoreProviderApiService.java |   28 +
 api/src/com/cloud/storage/Storage.java             |    3 +-
 api/src/com/cloud/storage/StoragePool.java         |    2 +-
 api/src/com/cloud/storage/VolumeApiService.java    |    5 +-
 api/src/com/cloud/vm/UserVmService.java            |   16 +-
 api/src/com/cloud/vm/VirtualMachine.java           |    2 +-
 .../org/apache/cloudstack/api/ApiConstants.java    |    8 +
 .../org/apache/cloudstack/api/BaseAsyncCmd.java    |    1 +
 api/src/org/apache/cloudstack/api/BaseCmd.java     |    5 +-
 .../apache/cloudstack/api/ResponseGenerator.java   |   39 +-
 .../command/admin/account/CreateAccountCmd.java    |    2 +-
 .../admin/storage/CreateStoragePoolCmd.java        |    8 +-
 .../admin/storage/ListStorageProvidersCmd.java     |   72 +
 .../api/command/admin/user/CreateUserCmd.java      |    2 +-
 .../api/command/admin/user/UpdateUserCmd.java      |    2 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |    4 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |    2 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |    2 +-
 .../api/command/user/network/UpdateNetworkCmd.java |    9 +-
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |  128 +
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |  179 ++
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |  108 +
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |   92 +
 .../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java  |  125 +
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |   96 +
 .../user/resource/UpdateResourceCountCmd.java      |    6 +-
 .../user/resource/UpdateResourceLimitCmd.java      |    6 +-
 .../api/command/user/vm/ListNicsCmd.java           |    2 +-
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |  110 +
 .../api/command/user/volume/ResizeVolumeCmd.java   |    3 +-
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |    2 +-
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |    2 +-
 .../cloudstack/api/response/AccountResponse.java   |   54 +-
 .../api/response/GlobalLoadBalancerResponse.java   |  125 +
 .../api/response/RemoteAccessVpnResponse.java      |    7 +
 .../api/response/ResourceCountResponse.java        |    2 +-
 .../api/response/ResourceLimitResponse.java        |    2 +-
 .../cloudstack/api/response/ServiceResponse.java   |    9 +-
 .../api/response/StoragePoolResponse.java          |   17 +
 .../api/response/StorageProviderResponse.java      |   62 +
 .../network/ExternalNetworkDeviceManager.java      |    3 +-
 api/src/org/apache/cloudstack/region/Region.java   |   49 +
 .../api/agent/test/BackupSnapshotCommandTest.java  |    2 +-
 .../api/agent/test/SnapshotCommandTest.java        |    2 +-
 .../api/command/test/ScaleVMCmdTest.java           |  122 +
 .../agent/api/test/ResizeVolumeCommandTest.java    |    2 +-
 awsapi-setup/setup/cloud-setup-bridge              |    2 +-
 awsapi/conf/applicationContext.xml.in              |   24 +-
 .../util/EncryptionSecretKeyCheckerUtil.java       |    2 +-
 .../WEB-INF/classes/resources/messages.properties  |   13 +
 client/pom.xml                                     |  115 +-
 client/tomcatconf/applicationContext.xml.in        |  718 +++++-
 client/tomcatconf/commands.properties.in           |   10 +
 client/tomcatconf/componentContext.xml.in          |  426 ++--
 client/tomcatconf/db-enc.properties.in             |   68 -
 client/tomcatconf/log4j-cloud.xml.in               |   15 +
 client/tomcatconf/nonossComponentContext.xml.in    |  484 ++--
 client/tomcatconf/server-ssl.xml.in                |    4 +-
 client/tomcatconf/server.xml.in                    |  231 --
 client/tomcatconf/simulatorComponentContext.xml.in |  220 ++
 client/tomcatconf/tomcat6-ssl.conf.in              |    2 +-
 core/src/com/cloud/vm/VMInstanceVO.java            |    2 +-
 debian/cloudstack-agent.install                    |    4 +-
 debian/cloudstack-common.install                   |    1 +
 debian/cloudstack-management.install               |    1 -
 debian/cloudstack-management.postinst              |   36 +-
 debian/control                                     |    4 +-
 debian/rules                                       |   20 +-
 developer/developer-prefill.sql                    |    2 +-
 docs/en-US/Book_Info.xml                           |   39 +-
 docs/en-US/Book_Info_Release_Notes_4-0.xml         |    7 +-
 docs/en-US/Installation_Guide.xml                  |   75 +-
 docs/en-US/Release_Notes.xml                       | 2011 +--------------
 docs/en-US/about-password-encryption.xml           |    2 +-
 docs/en-US/about-regions.xml                       |   49 +
 docs/en-US/about-zones.xml                         |   10 +-
 docs/en-US/add-clusters-vsphere.xml                |  103 +-
 docs/en-US/added-API-commands-4-1.xml              |    7 +-
 docs/en-US/api-calls.xml                           |    3 +-
 docs/en-US/api-reference.xml                       |    2 +-
 docs/en-US/api-throttling.xml                      |   67 +
 docs/en-US/aws-ec2-user-setup.xml                  |    2 +-
 docs/en-US/building-with-maven-steps.xml           |    2 +-
 docs/en-US/castor-with-cs.xml                      |    3 +-
 docs/en-US/changed-apicommands-4.1.xml             |   16 +-
 docs/en-US/choosing-a-hypervisor.xml               |  136 +
 docs/en-US/cloud-infrastructure-concepts.xml       |    3 +-
 docs/en-US/cloudmonkey.xml                         |    4 +-
 docs/en-US/configure-package-repository.xml        |    2 +-
 docs/en-US/extracting-source.xml                   |    4 +-
 docs/en-US/feature-overview.xml                    |    4 +-
 docs/en-US/getting-release.xml                     |    3 +-
 .../en-US/guest-nw-usage-with-traffic-sentinel.xml |    7 +-
 docs/en-US/images/add-cluster.png                  |  Bin 46302 -> 35697 bytes
 docs/en-US/images/dvswitch-config.png              |  Bin 0 -> 41955 bytes
 docs/en-US/images/dvswitchconfig.png               |  Bin 0 -> 38642 bytes
 docs/en-US/images/region-overview.png              |  Bin 0 -> 22835 bytes
 docs/en-US/ip-forwarding-firewalling.xml           |    8 +-
 .../en-US/management-server-install-multi-node.xml |    3 +-
 docs/en-US/management-server-lb.xml                |    7 +-
 docs/en-US/provisioning-steps-overview.xml         |   13 +-
 docs/en-US/provisioning-steps.xml                  |    3 +-
 docs/en-US/region-add.xml                          |  128 +
 docs/en-US/response-formats.xml                    |    2 +
 docs/en-US/sys-reliability-and-ha.xml              |    4 +-
 docs/en-US/vmware-cluster-config-dvswitch.xml      |  192 ++
 docs/en-US/vmware-install.xml                      |  515 +++--
 docs/publican-cloudstack/en-US/Feedback.xml        |   56 +-
 engine/api/pom.xml                                 |    4 +
 .../engine/datacenter/entity/api/HostEntity.java   |   89 +-
 .../datacenter/entity/api/StorageEntity.java       |    1 +
 .../rest/service/api/ClusterRestService.java       |  172 +-
 .../rest/service/api/NetworkRestService.java       |  124 +-
 .../engine/rest/service/api/PodRestService.java    |  158 +-
 .../service/api/VirtualMachineRestService.java     |  112 +-
 .../engine/rest/service/api/VolumeRestService.java |  152 +-
 .../engine/rest/service/api/ZoneRestService.java   |  174 +-
 .../subsystem/api/storage/DataStoreLifeCycle.java  |    6 +-
 .../subsystem/api/storage/DataStoreProvider.java   |   13 +-
 .../api/storage/DataStoreProviderManager.java      |    6 +-
 .../subsystem/api/storage/DataStoreStatus.java     |   23 -
 .../api/storage/ImageDataStoreProvider.java        |   24 +
 .../api/storage/PrimaryDataStoreParameters.java    |  220 ++
 .../api/storage/PrimaryDataStoreProvider.java      |    4 +
 .../storage/datastore/db/StoragePoolVO.java        |   12 +-
 .../org/apache/cloudstack/compute/ComputeGuru.java |   68 +-
 .../engine/cloud/entity/api/VMEntityManager.java   |   50 +-
 .../cloud/entity/api/VirtualMachineEntityImpl.java |  444 ++--
 .../engine/cloud/entity/api/db/VMComputeTagVO.java |  102 +-
 .../engine/cloud/entity/api/db/VMEntityVO.java     |    2 +-
 .../engine/cloud/entity/api/db/VMNetworkMapVO.java |  110 +-
 .../cloud/entity/api/db/VMReservationVO.java       |  222 +-
 .../cloud/entity/api/db/VMRootDiskTagVO.java       |  102 +-
 .../cloud/entity/api/db/VolumeReservationVO.java   |  168 +-
 .../cloud/entity/api/db/dao/VMComputeTagDao.java   |   30 +-
 .../entity/api/db/dao/VMComputeTagDaoImpl.java     |  146 +-
 .../cloud/entity/api/db/dao/VMNetworkMapDao.java   |   30 +-
 .../entity/api/db/dao/VMNetworkMapDaoImpl.java     |  138 +-
 .../cloud/entity/api/db/dao/VMReservationDao.java  |   36 +-
 .../entity/api/db/dao/VMReservationDaoImpl.java    |  190 +-
 .../cloud/entity/api/db/dao/VMRootDiskTagDao.java  |   30 +-
 .../entity/api/db/dao/VMRootDiskTagDaoImpl.java    |  144 +-
 .../entity/api/db/dao/VolumeReservationDao.java    |   30 +-
 .../api/db/dao/VolumeReservationDaoImpl.java       |  104 +-
 .../datacenter/entity/api/ClusterEntityImpl.java   |  386 ++--
 .../entity/api/DataCenterResourceManager.java      |   68 +-
 .../entity/api/DataCenterResourceManagerImpl.java  |  226 +-
 .../datacenter/entity/api/HostEntityImpl.java      |  398 ++--
 .../datacenter/entity/api/PodEntityImpl.java       |  422 ++--
 .../datacenter/entity/api/ZoneEntityImpl.java      |  402 ++--
 .../datacenter/entity/api/db/EngineCluster.java    |   46 +-
 .../datacenter/entity/api/db/EngineDataCenter.java |   46 +-
 .../entity/api/db/EngineDataCenterVO.java          |  210 +-
 .../datacenter/entity/api/db/EngineHost.java       |   48 +-
 .../datacenter/entity/api/db/EngineHostPodVO.java  |  170 +-
 .../engine/datacenter/entity/api/db/EnginePod.java |   46 +-
 .../entity/api/db/dao/EngineHostDao.java           |    2 +-
 .../entity/api/db/dao/EngineHostPodDao.java        |   20 +-
 .../entity/api/db/dao/EngineHostPodDaoImpl.java    |  142 +-
 .../service/api/ProvisioningServiceImpl.java       |  340 ++--
 .../engine/provisioning/test/ProvisioningTest.java |  242 +-
 .../image/manager/ImageDataStoreManagerImpl.java   |   14 +-
 .../image/store/AncientImageDataStoreProvider.java |   47 +-
 .../image/store/DefaultImageDataStoreImpl.java     |    2 +-
 .../image/store/DefaultImageDataStoreProvider.java |   35 +-
 .../lifecycle/DefaultImageDataStoreLifeCycle.java  |   11 +-
 .../storage/allocator/StorageAllocatorTest.java    |    4 +-
 .../cloudstack/storage/test/volumeServiceTest.java |   12 +-
 .../snapshot/strategy/AncientSnapshotStrategy.java |  608 +++++
 .../snapshot/strategy/AncientSnasphotStrategy.java |  608 -----
 .../ClusterScopeStoragePoolAllocator.java          |    1 +
 .../GarbageCollectingStoragePoolAllocator.java     |    2 +-
 .../allocator/LocalStoragePoolAllocator.java       |    9 +-
 .../allocator/ZoneWideStoragePoolAllocator.java    |    3 +-
 .../datastore/PrimaryDataStoreEntityImpl.java      |    8 +-
 .../datastore/PrimaryDataStoreProviderManager.java |    4 +-
 .../provider/DataStoreProviderManagerImpl.java     |  108 +-
 .../datastore/provider/ImageDataStoreProvider.java |   25 -
 .../provider/PrimaryDataStoreProvider.java         |   23 -
 .../image/datastore/ImageDataStoreHelper.java      |    4 +-
 .../storage/image/db/ImageDataStoreVO.java         |   12 +-
 .../volume/datastore/PrimaryDataStoreHelper.java   |  172 ++-
 .../storage/datastore/DefaultPrimaryDataStore.java |    8 +-
 .../driver/AncientPrimaryDataStoreDriverImpl.java  |  362 ---
 .../AncientPrimaryDataStoreLifeCycleImpl.java      |  963 -------
 .../DefaultPrimaryDataStoreLifeCycleImpl.java      |   18 +-
 ...DefaultPrimaryDataStoreProviderManagerImpl.java |   16 +-
 .../AncientPrimaryDataStoreProviderImpl.java       |   78 -
 .../DefaultPrimaryDatastoreProviderImpl.java       |   32 +-
 .../storage/volume/test/ConfiguratorTest.java      |    2 +-
 framework/rest/pom.xml                             |    4 +
 .../jackson/CSJacksonAnnotationIntrospector.java   |  120 +-
 .../ws/jackson/CSJacksonAnnotationModule.java      |   94 +-
 .../framework/ws/jackson/UriSerializer.java        |  116 +-
 .../framework/ws/jackson/UrisSerializer.java       |  142 +-
 .../cloudstack/framework/ws/jackson/Url.java       |  106 +-
 .../ws/jackson/CSJacksonAnnotationTest.java        |  166 +-
 packaging/centos63/cloud-agent.rc                  |    3 +-
 packaging/centos63/cloud.spec                      |  179 +-
 packaging/centos63/package.sh                      |  110 +-
 packaging/debian/init/cloud-management             |   15 +-
 packaging/debian/replace.properties                |    4 +-
 .../debian/config/etc/init.d/cloud-early-config    |   23 +-
 patches/systemvm/debian/config/root/edithosts.sh   |    3 +-
 plugins/alert-handlers/syslog-alerts/pom.xml       |   40 +
 .../cloudstack/syslog/AlertsSyslogAppender.java    |  336 +++
 .../syslog/AlertsSyslogAppenderTest.java           |   61 +
 .../api/response/ApiDiscoveryResponse.java         |    4 +
 .../api/response/ApiResponseResponse.java          |   15 +-
 .../discovery/ApiDiscoveryServiceImpl.java         |  167 +-
 .../resources/security_group_agent/setup.py        |    2 +-
 .../baremetal/manager/AddBaremetalHostCmd.java     |   48 +-
 .../baremetal/manager/BareMetalDiscoverer.java     |    2 +-
 .../manager/BareMetalTemplateAdapter.java          |   15 +-
 .../cloud/baremetal/manager/BaremetalManager.java  |    2 +-
 .../manager/BaremetalPlannerSelector.java          |   78 +-
 .../AddBaremetalKickStartPxeCmd.java               |   28 +-
 .../networkservice/BareMetalResourceBase.java      |   28 +-
 .../networkservice/BaremetaNetworkGuru.java        |  208 +-
 .../BaremetalKickStartPxeResource.java             |  322 ++--
 .../BaremetalKickStartServiceImpl.java             |  398 ++--
 .../BaremetalPxeKickStartResponse.java             |   32 +-
 .../networkservice/BaremetalPxeManagerImpl.java    |    6 +-
 .../networkservice/BaremetalUserdataElement.java   |  256 +-
 .../PrepareKickstartPxeServerCommand.java          |   92 +-
 .../networkservice/SecurityGroupHttpClient.java    |   76 +-
 plugins/hypervisors/kvm/pom.xml                    |  131 +-
 .../hypervisor/kvm/resource/DirectVifDriver.java   |   65 +
 .../kvm/resource/LibvirtComputingResource.java     |  304 ++-
 .../hypervisor/kvm/resource/LibvirtConnection.java |   52 +-
 .../kvm/resource/LibvirtDomainXMLParser.java       |   25 +-
 .../kvm/resource/LibvirtStorageVolumeDef.java      |    6 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   86 +-
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java    |   14 +-
 .../hypervisor/kvm/storage/KVMStoragePool.java     |    4 +-
 .../kvm/storage/KVMStoragePoolManager.java         |   13 +-
 .../kvm/storage/LibvirtStorageAdaptor.java         |  252 ++-
 .../hypervisor/kvm/storage/LibvirtStoragePool.java |   12 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java     |    2 +-
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |  352 +++
 .../cloudstack/utils/qemu/QemuImgException.java    |   25 +
 .../apache/cloudstack/utils/qemu/QemuImgFile.java  |   72 +
 .../kvm/resource/LibvirtComputingResourceTest.java |   14 +-
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   14 +
 .../cloudstack/utils/qemu/QemuImgFileTest.java     |   62 +
 .../apache/cloudstack/utils/qemu/QemuImgTest.java  |  289 +++
 .../agent/manager/MockStorageManagerImpl.java      |   36 +-
 .../src/com/cloud/ucs/database/UcsBladeDao.java    |   16 +-
 .../com/cloud/ucs/database/UcsBladeDaoImpl.java    |   22 +-
 .../ucs/src/com/cloud/ucs/database/UcsBladeVO.java |  140 +-
 .../src/com/cloud/ucs/database/UcsManagerDao.java  |   32 +-
 .../com/cloud/ucs/database/UcsManagerDaoImpl.java  |   21 +-
 .../src/com/cloud/ucs/database/UcsManagerVO.java   |  140 +-
 .../com/cloud/ucs/manager/AddUcsManagerCmd.java    |  198 +-
 .../ucs/manager/AssociateUcsProfileToBladeCmd.java |  156 +-
 .../src/com/cloud/ucs/manager/ListUcsBladeCmd.java |  174 +-
 .../com/cloud/ucs/manager/ListUcsManagerCmd.java   |  114 +-
 .../com/cloud/ucs/manager/ListUcsProfileCmd.java   |  114 +-
 .../src/com/cloud/ucs/manager/StringTemplate.java  |   46 +-
 .../com/cloud/ucs/manager/UcsBladeResponse.java    |  168 +-
 .../ucs/src/com/cloud/ucs/manager/UcsCommands.java |  168 +-
 .../src/com/cloud/ucs/manager/UcsHttpClient.java   |   68 +-
 .../ucs/src/com/cloud/ucs/manager/UcsManager.java  |   32 +-
 .../src/com/cloud/ucs/manager/UcsManagerImpl.java  |  554 ++--
 .../com/cloud/ucs/manager/UcsManagerResponse.java  |  102 +-
 .../com/cloud/ucs/manager/UcsProfileResponse.java  |   38 +-
 .../src/com/cloud/ucs/structure/ComputeBlade.java  |  332 ++--
 .../src/com/cloud/ucs/structure/UcsProfile.java    |   76 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |   14 +-
 .../vmware/manager/VmwareManagerImpl.java          |    8 +-
 .../network/element/CiscoNexusVSMElement.java      |    4 +-
 .../xen/resource/CitrixResourceBase.java           |   94 +-
 .../xen/resource/XenServer56FP1Resource.java       |   11 +-
 .../xen/resource/CitrixResourceBaseTest.java       |  148 ++
 .../api/commands/DeleteBigSwitchVnsDeviceCmd.java  |    4 +-
 .../api/commands/ListBigSwitchVnsDevicesCmd.java   |    8 +-
 .../api/response/BigSwitchVnsDeviceResponse.java   |    4 +
 .../com/cloud/network/BigSwitchVnsDeviceVO.java    |    4 +-
 .../com/cloud/network/bigswitch/Attachment.java    |   38 -
 .../cloud/network/bigswitch/AttachmentData.java    |   50 +
 .../cloud/network/bigswitch/BigSwitchVnsApi.java   |   39 +-
 .../network/bigswitch/ControlClusterStatus.java    |    4 +
 .../src/com/cloud/network/bigswitch/Network.java   |   74 -
 .../com/cloud/network/bigswitch/NetworkData.java   |   86 +
 .../src/com/cloud/network/bigswitch/Port.java      |   56 -
 .../src/com/cloud/network/bigswitch/PortData.java  |   68 +
 .../cloud/network/element/BigSwitchVnsElement.java |   14 +-
 .../network/guru/BigSwitchVnsGuestNetworkGuru.java |    4 +-
 .../network/resource/BigSwitchVnsResource.java     |   40 +-
 .../cloud/network/bigswitch/BigSwitchApiTest.java  |   18 +-
 .../network/resource/BigSwitchVnsResourceTest.java |   44 +-
 .../dns-notifier/resources/components-example.xml  |    8 +
 .../cloudstack/network/element/DnsNotifier.java    |  244 +-
 .../element/F5ExternalLoadBalancerElement.java     |   46 +-
 plugins/network-elements/midokura-midonet/pom.xml  |   30 -
 .../network/element/MidokuraMidonetElement.java    |  131 -
 .../guru/MidokuraMidonetGuestNetworkGuru.java      |   48 -
 plugins/network-elements/midonet/pom.xml           |   66 +
 .../com/cloud/network/element/MidoNetElement.java  | 1685 ++++++++++++
 .../cloud/network/element/SimpleFirewallRule.java  |  210 ++
 .../network/guru/MidoNetGuestNetworkGuru.java      |  170 ++
 .../network/guru/MidoNetPublicNetworkGuru.java     |  241 ++
 .../cloud/network/resource/MidoNetVifDriver.java   |  179 ++
 .../cloud/network/element/MidoNetElementTest.java  |  178 ++
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |   41 +-
 .../cloud/network/element/NetscalerElement.java    |  155 +-
 .../cloud/network/resource/NetscalerResource.java  |  687 +++++-
 plugins/pom.xml                                    |    6 +-
 plugins/storage/volume/default/pom.xml             |   56 +
 .../CloudStackPrimaryDataStoreDriverImpl.java      |  362 +++
 .../CloudStackPrimaryDataStoreLifeCycleImpl.java   |  544 ++++
 .../CloudStackPrimaryDataStoreProviderImpl.java    |   80 +
 .../apache/cloudstack/storage/test/VolumeTest.java |    2 +-
 .../cloud/server/auth/LDAPUserAuthenticator.java   |    5 +-
 .../cloud/server/auth/MD5UserAuthenticator.java    |    4 +
 .../server/auth/PlainTextUserAuthenticator.java    |   32 +-
 .../server/auth/SHA256SaltedUserAuthenticator.java |    3 +
 pom.xml                                            |   84 +-
 python/lib/cloudutils/serviceConfigServer.py       |    4 +-
 python/lib/cloudutils/utilities.py                 |    2 +-
 scripts/storage/secondary/cloud-install-sys-tmplt  |    6 +-
 .../xenserver/Add-To-VCPUs-Params-Live.sh          |   33 +
 scripts/vm/hypervisor/xenserver/vmops              |   13 +
 server/conf/cloudstack-limits.conf.in              |    4 +-
 server/conf/cloudstack-sudoers.in                  |    2 +-
 server/pom.xml                                     |   11 +
 .../com/cloud/upgrade/databaseCreatorContext.xml   |   52 +
 .../com/cloud/agent/manager/AgentManagerImpl.java  |    2 +-
 .../src/com/cloud/agent/manager/AgentMonitor.java  |   35 +-
 .../cloud/agent/manager/AgentMonitorService.java   |    2 +-
 .../cloud/agent/manager/ClusteredAgentAttache.java |   13 +-
 server/src/com/cloud/alert/AlertManagerImpl.java   |    3 +-
 server/src/com/cloud/api/ApiDBUtils.java           |   77 +-
 server/src/com/cloud/api/ApiDispatcher.java        |    5 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |  143 +-
 server/src/com/cloud/api/ApiServer.java            |  188 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |   18 +
 .../api/query/dao/StoragePoolJoinDaoImpl.java      |    1 +
 .../src/com/cloud/api/query/vo/AccountJoinVO.java  |   54 +
 .../src/com/cloud/api/query/vo/ProjectJoinVO.java  |    2 +-
 .../com/cloud/api/query/vo/StoragePoolJoinVO.java  |   19 +
 .../cloud/api/response/ApiResponseSerializer.java  |   32 +-
 .../api/response/EmptyFieldExclusionStrategy.java  |   40 +
 .../src/com/cloud/async/AsyncJobManagerImpl.java   |  494 ++--
 server/src/com/cloud/async/SyncQueueManager.java   |   16 +-
 .../src/com/cloud/async/SyncQueueManagerImpl.java  |   22 +-
 server/src/com/cloud/async/dao/SyncQueueDao.java   |    2 +-
 .../src/com/cloud/async/dao/SyncQueueItemDao.java  |    4 +-
 .../src/com/cloud/cluster/ClusterManagerImpl.java  |    4 +-
 server/src/com/cloud/configuration/Config.java     |   20 +-
 .../configuration/ConfigurationManagerImpl.java    |   25 +-
 .../configuration/DefaultInterceptorLibrary.java   |   33 -
 .../AgentBasedConsoleProxyManager.java             |    4 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   12 +-
 .../deploy/AbstractDeployPlannerSelector.java      |  168 +-
 .../com/cloud/deploy/DeployPlannerSelector.java    |   48 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   26 +-
 .../cloud/deploy/HypervisorVmPlannerSelector.java  |  108 +-
 .../com/cloud/event/ActionEventInterceptor.java    |   52 +-
 server/src/com/cloud/event/ActionEventUtils.java   |  114 -
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |   20 +-
 .../src/com/cloud/ha/UserVmDomRInvestigator.java   |    6 +-
 server/src/com/cloud/host/dao/HostDao.java         |    4 +-
 server/src/com/cloud/hypervisor/LXCGuru.java       |   58 +
 .../dao/HypervisorCapabilitiesDaoImpl.java         |   15 +-
 .../kvm/discoverer/KvmServerDiscoverer.java        |  371 +---
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |  393 +++
 .../kvm/discoverer/LxcServerDiscoverer.java        |   33 +
 .../network/ExternalFirewallDeviceManagerImpl.java |   48 +-
 .../network/ExternalLoadBalancerDeviceManager.java |    4 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |   97 +-
 server/src/com/cloud/network/NetworkManager.java   |    8 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |  231 ++-
 server/src/com/cloud/network/NetworkModelImpl.java |   55 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   50 +-
 .../com/cloud/network/SshKeysDistriMonitor.java    |    3 +-
 .../src/com/cloud/network/as/AutoScaleManager.java |   32 +-
 .../as/dao/AutoScalePolicyConditionMapDao.java     |   32 +-
 .../as/dao/AutoScalePolicyConditionMapDaoImpl.java |   38 +-
 .../cloud/network/as/dao/AutoScalePolicyDao.java   |   32 +-
 .../network/as/dao/AutoScalePolicyDaoImpl.java     |   38 +-
 .../cloud/network/as/dao/AutoScaleVmGroupDao.java  |   32 +-
 .../network/as/dao/AutoScaleVmGroupDaoImpl.java    |   38 +-
 .../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java   |   38 +-
 .../network/as/dao/AutoScaleVmProfileDao.java      |   32 +-
 .../network/as/dao/AutoScaleVmProfileDaoImpl.java  |   38 +-
 .../network/dao/ExternalLoadBalancerDeviceDao.java |   11 +-
 .../dao/ExternalLoadBalancerDeviceDaoImpl.java     |   25 +-
 .../network/dao/ExternalLoadBalancerDeviceVO.java  |   51 +-
 .../com/cloud/network/dao/RemoteAccessVpnVO.java   |   29 +-
 .../network/element/VpcVirtualRouterElement.java   |   25 +-
 .../com/cloud/network/guru/DirectNetworkGuru.java  |   92 +-
 .../network/guru/DirectPodBasedNetworkGuru.java    |   38 +-
 .../network/lb/LoadBalancingRulesManager.java      |    1 +
 .../network/lb/LoadBalancingRulesManagerImpl.java  |  176 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |   54 +-
 .../router/VpcVirtualNetworkApplianceManager.java  |    6 +
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   15 +-
 .../network/security/dao/SecurityGroupDaoImpl.java |   22 +-
 server/src/com/cloud/network/vpc/VpcManager.java   |   84 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |   77 +-
 .../src/com/cloud/network/vpc/VpcOfferingVO.java   |    1 -
 server/src/com/cloud/network/vpc/VpcVO.java        |    7 -
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |   30 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |   24 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |   97 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    2 +-
 .../src/com/cloud/server/ManagementServerImpl.java |  270 ++-
 server/src/com/cloud/server/StatsCollector.java    |   17 +-
 server/src/com/cloud/storage/StorageManager.java   |    2 +-
 .../src/com/cloud/storage/StorageManagerImpl.java  |  121 +-
 .../com/cloud/storage/StoragePoolAutomation.java   |   26 +
 .../cloud/storage/StoragePoolAutomationImpl.java   |  456 ++++
 server/src/com/cloud/storage/VolumeManager.java    |    3 +-
 .../src/com/cloud/storage/VolumeManagerImpl.java   |  113 +-
 server/src/com/cloud/storage/dao/SnapshotDao.java  |   12 +-
 .../src/com/cloud/storage/dao/SnapshotDaoImpl.java |   65 +-
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |   10 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   20 +-
 server/src/com/cloud/storage/dao/VolumeDao.java    |   66 +-
 .../src/com/cloud/storage/dao/VolumeDaoImpl.java   |   48 +-
 .../cloud/storage/download/DownloadListener.java   |   62 +-
 .../storage/download/DownloadMonitorImpl.java      |   56 +-
 .../secondary/SecondaryStorageManagerImpl.java     |    9 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   70 +-
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |    8 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |   32 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   47 +-
 server/src/com/cloud/upgrade/DatabaseCreator.java  |    7 +
 .../src/com/cloud/upgrade/dao/Upgrade30xBase.java  |  622 +++---
 .../src/com/cloud/upgrade/dao/Upgrade40to41.java   |   40 +-
 .../src/com/cloud/upgrade/dao/Upgrade410to420.java |  155 ++-
 server/src/com/cloud/user/AccountManagerImpl.java  |   27 +-
 server/src/com/cloud/vm/ItWorkVO.java              |    3 +-
 server/src/com/cloud/vm/NicVO.java                 |    6 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |  129 +-
 server/src/com/cloud/vm/VirtualMachineManager.java |   12 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  356 +++-
 server/src/com/cloud/vm/dao/NicDao.java            |    4 +
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |   17 +
 server/src/com/cloud/vm/dao/UserVmDaoImpl.java     |  824 +++---
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |    8 +-
 server/src/com/cloud/vm/snapshot/VMSnapshotVO.java |  224 --
 .../cloudstack/region/RegionServiceProvider.java   |   25 +
 .../src/org/apache/cloudstack/region/RegionVO.java |   19 +
 .../region/gslb/GlobalLoadBalancerDaoImpl.java     |   58 +
 .../gslb/GlobalLoadBalancerLbRuleMapDao.java       |   30 +
 .../gslb/GlobalLoadBalancerLbRuleMapDaoImpl.java   |   63 +
 .../region/gslb/GlobalLoadBalancerLbRuleMapVO.java |   83 +
 .../region/gslb/GlobalLoadBalancerRuleDao.java     |   28 +
 .../region/gslb/GlobalLoadBalancerRuleVO.java      |  183 ++
 .../gslb/GlobalLoadBalancingRulesServiceImpl.java  |  590 +++++
 .../region/gslb/GslbServiceProvider.java           |   36 +
 .../test/com/cloud/async/TestSyncQueueManager.java |  306 ++--
 .../com/cloud/network/MockNetworkManagerImpl.java  |    8 +
 .../com/cloud/network/MockNetworkModelImpl.java    |   15 +-
 .../SecurityGroupManagerTestConfiguration.java     |  316 ++--
 .../network/security/SecurityGroupQueueTest.java   |    2 +-
 .../ResourceLimitManagerImplTest.java              |   18 +-
 .../snapshot/SnapshotDaoTestConfiguration.java     |  144 +-
 .../dao/StoragePoolDaoTestConfiguration.java       |  106 +-
 .../test/com/cloud/vm/MockUserVmManagerImpl.java   |   17 +-
 .../cloud/vm/MockVirtualMachineManagerImpl.java    |   17 +
 server/test/com/cloud/vm/UserVmManagerTest.java    |  192 ++-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |  208 ++
 .../cloud/vm/snapshot/VMSnapshotManagerTest.java   |  372 ++--
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   14 +
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |   15 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java    |    8 +
 server/test/com/cloud/vpc/MockVpcManagerImpl.java  |  106 +-
 .../vpc/MockVpcVirtualNetworkApplianceManager.java |    6 +
 server/test/com/cloud/vpc/VpcApiUnitTest.java      |   37 +-
 .../test/com/cloud/vpc/VpcTestConfiguration.java   |  462 ++--
 .../networkoffering/ChildTestConfiguration.java    |  333 +++
 .../networkoffering/CreateNetworkOfferingTest.java |  184 ++
 .../GlobalLoadBalancingRulesServiceImplTest.java   |  974 +++++++
 .../test/resources/CloneSettingDaoTestContext.xml  |   20 +-
 .../resources/SecurityGroupManagerTestContext.xml  |   19 +-
 server/test/resources/SnapshotDaoTestContext.xml   |   20 +-
 .../test/resources/StoragePoolDaoTestContext.xml   |   20 +-
 server/test/resources/VpcApiUnitTestContext.xml    |   20 +-
 server/test/resources/VpcTestContext.xml           |   21 +-
 server/test/resources/createNetworkOffering.xml    |   46 +
 server/test/resources/testContext.xml              |   27 +-
 services/console-proxy/server/pom.xml              |   12 +
 setup/bindir/cloud-setup-databases.in              |    2 +-
 setup/bindir/cloud-setup-encryption.in             |    2 +-
 setup/db/create-schema.sql                         |   82 +-
 setup/db/db/schema-40to410.sql                     |   40 +-
 setup/db/db/schema-410to420-cleanup.sql            |    7 +
 setup/db/db/schema-410to420.sql                    |  211 ++-
 setup/db/templates.simulator.sql                   |    8 +-
 setup/dev/advanced.cfg                             |  195 ++
 setup/dev/basic.cfg                                |  178 ++
 .../integration/component/test_vm_passwdenabled.py |  242 ++
 test/integration/smoke/test_ScaleVm.py             |  221 ++
 test/integration/smoke/test_vm_life_cycle.py       |  332 +--
 tools/apidoc/gen_toc.py                            |    1 +
 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 +
 .../definitions/systemvmtemplate/postinstall.sh    |    4 +-
 .../definitions/systemvmtemplate64/postinstall.sh  |    4 +-
 tools/cli/cloudmonkey/cloudmonkey.py               |   45 +-
 tools/cli/cloudmonkey/config.py                    |    6 +-
 tools/cli/cloudmonkey/requester.py                 |   63 +-
 tools/marvin/marvin/TestCaseExecuteEngine.py       |   13 +-
 tools/marvin/marvin/cloudstackTestClient.py        |    7 +-
 tools/marvin/marvin/codegenerator.py               |  241 ++-
 tools/marvin/marvin/deployAndRun.py                |   40 +-
 tools/marvin/marvin/integration/lib/base.py        |    2 +
 tools/marvin/marvin/marvinPlugin.py                |    4 +-
 tools/marvin/marvin/remoteSSHClient.py             |    9 +-
 .../marvin/sandbox/demo/simulator/simulator.cfg    |  196 --
 .../sandbox/demo/simulator/simulator_setup.py      |    2 +-
 tools/marvin/marvin/setup.py                       |   52 -
 tools/marvin/marvin/testSetupSuccess.py            |    9 +-
 tools/marvin/pom.xml                               |  165 +-
 tools/marvin/setup.py                              |   59 +-
 tools/waf/javadir.py                               |   38 -
 tools/waf/mkisofs.py                               |   84 -
 tools/waf/tar.py                                   |   79 -
 tools/waf/tomcat.py                                |   57 -
 tools/waf/usermgmt.py                              |  140 -
 tools/whisker/LICENSE                              |   64 -
 tools/whisker/descriptor-for-packaging.xml         |   24 -
 tools/whisker/descriptor.xml                       |   24 -
 ui/css/cloudstack3.css                             |   22 +-
 ui/dictionary.jsp                                  |   15 +-
 ui/scripts/accounts.js                             |  173 +-
 ui/scripts/cloud.core.callbacks.js                 |   18 +
 ui/scripts/cloudStack.js                           |   34 +-
 ui/scripts/domains.js                              |   92 +
 ui/scripts/events.js                               |    2 -
 ui/scripts/globalSettings.js                       |   60 +
 ui/scripts/instanceWizard.js                       |   60 +-
 ui/scripts/instances.js                            |   48 +-
 ui/scripts/projects.js                             |   20 +-
 ui/scripts/regions.js                              |  308 ++-
 ui/scripts/sharedFunctions.js                      |    1 +
 ui/scripts/storage.js                              |    8 +-
 ui/scripts/system.js                               |  681 +++++-
 ui/scripts/templates.js                            |    4 +
 ui/scripts/ui-custom/instanceWizard.js             |    8 +-
 ui/scripts/ui-custom/login.js                      |   12 +
 ui/scripts/ui-custom/regions.js                    |   34 +-
 ui/scripts/ui/dialog.js                            |   46 +-
 ui/scripts/ui/widgets/detailView.js                |   11 +-
 ui/scripts/ui/widgets/listView.js                  |   32 +-
 ui/scripts/vpc.js                                  |   87 +
 ui/scripts/zoneWizard.js                           |   54 +-
 usage/resources/usageApplicationContext.xml        |   17 +-
 usage/src/com/cloud/usage/UsageServer.java         |   17 +-
 utils/src/com/cloud/utils/UriUtils.java            |   33 +
 .../src/com/cloud/utils/component/AdapterBase.java |    4 +-
 .../src/com/cloud/utils/component/AdapterList.java |   34 +
 .../utils/component/AnnotationInterceptor.java     |   36 -
 .../cloud/utils/component/ComponentContext.java    |   32 +-
 .../ComponentInstantiationPostProcessor.java       |  152 ++
 .../component/ComponentMethodInterceptable.java    |   24 +
 .../component/ComponentMethodInterceptor.java      |   27 +
 .../utils/component/ComponentMethodProxyCache.java |   90 -
 .../utils/component/ComponentNamingPolicy.java     |   63 +
 .../cloud/utils/component/InterceptorLibrary.java  |   25 -
 .../src/com/cloud/utils/component/ManagerBase.java |    2 +-
 .../utils/component/MatchAnyMethodPointcut.java    |   27 -
 .../utils/component/SpringComponentScanUtils.java  |   82 +-
 .../utils/crypt/EncryptionSecretKeyChanger.java    |    2 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java    |    2 +-
 utils/src/com/cloud/utils/db/DatabaseCallback.java |   84 -
 .../com/cloud/utils/db/DatabaseCallbackFilter.java |   58 -
 utils/src/com/cloud/utils/db/GenericDaoBase.java   |   29 +-
 .../cloud/utils/db/TransactionContextBuilder.java  |   70 +-
 utils/src/com/cloud/utils/script/Script.java       |   21 +-
 utils/src/com/cloud/utils/xmlobject/XmlObject.java |  354 ++--
 .../com/cloud/utils/xmlobject/XmlObjectParser.java |  214 +-
 .../utils/log/CglibThrowableRendererTest.java      |    2 +-
 .../com/cloud/utils/xmlobject/TestXmlObject.java   |   66 +-
 .../com/cloud/utils/xmlobject/TestXmlObject2.java  |   74 +-
 utils/test/resources/testContext.xml               |   20 +-
 615 files changed, 33204 insertions(+), 19406 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/api/src/com/cloud/network/Network.java
----------------------------------------------------------------------
diff --cc api/src/com/cloud/network/Network.java
index de452ac,c0b0117..ffe70d1
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@@ -136,9 -136,7 +136,8 @@@ public interface Network extends Contro
          public static final Provider VPCVirtualRouter = new Provider("VpcVirtualRouter", false);
          public static final Provider None = new Provider("None", false);
          // NiciraNvp is not an "External" provider, otherwise we get in trouble with NetworkServiceImpl.providersConfiguredForExternalNetworking 
-         public static final Provider NiciraNvp = new Provider("NiciraNvp", false);  
-         public static final Provider MidokuraMidonet = new Provider("MidokuraMidonet", true);
+         public static final Provider NiciraNvp = new Provider("NiciraNvp", false);
 +        public static final Provider CiscoVnmc = new Provider("CiscoVnmc", true);
  
          private String name;
          private boolean isExternal;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
index 485d04d,aeed81d..29ce2e3
--- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
+++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
@@@ -43,9 -43,7 +43,8 @@@ public interface ExternalNetworkDeviceM
          public static final NetworkDevice F5BigIpLoadBalancer = new NetworkDevice("F5BigIpLoadBalancer", Network.Provider.F5BigIp.getName());
          public static final NetworkDevice JuniperSRXFirewall = new NetworkDevice("JuniperSRXFirewall", Network.Provider.JuniperSRX.getName());
          public static final NetworkDevice NiciraNvp = new NetworkDevice("NiciraNvp", Network.Provider.NiciraNvp.getName());
-         public static final NetworkDevice MidokuraMidonet = new NetworkDevice("MidokuraMidonet", Network.Provider.MidokuraMidonet.getName());
 +        public static final NetworkDevice CiscoVnmc = new NetworkDevice("CiscoVnmc", Network.Provider.CiscoVnmc.getName());
-         
+ 
          public NetworkDevice(String deviceName, String ntwkServiceprovider) {
              _name = deviceName;
              _provider = ntwkServiceprovider;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/client/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --cc client/tomcatconf/nonossComponentContext.xml.in
index 5f543fb,187446c..de7b54f
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@@ -120,224 -130,209 +130,216 @@@
    <bean id="CiscoNexus1000vVSM" class="com.cloud.network.element.CiscoNexusVSMElement">
      <property name="name" value="CiscoNexus1000vVSM"/>
    </bean>
-   <bean id="CiscoVNMC" class="com.cloud.network.element.CiscoVnmcElement">
-     <property name="name" value="CiscoVNMC"/>
-   </bean>
-   <!--
-      Adapters
-   -->
-   <bean id="FirstFitRouting" class="com.cloud.agent.manager.allocator.impl.FirstFitRoutingAllocator">
-     <property name="name" value="FirstFitRouting"/>
-   </bean>
-   
-   <bean id="hypervisorTemplateAdapter" class="com.cloud.template.HypervisorTemplateAdapter">
-     <property name="name" value="HypervisorAdapter"/>
-   </bean>
    
    <!--
-     Storage pool allocators
-   -->
-   <bean id="LocalStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.LocalStoragePoolAllocator">
-     <property name="name" value="LocalStorage"/>
-   </bean>
-   <!--
-   <bean id="FirstFitStoragePoolAllocator" class="org.apache.cloudstack.storage.allocator.FirstFitStoragePoolAllocator">
-     <property name="name" value="Storage"/>
-   </bean>
++    Cisco VNMC support components
 +  -->
-   <bean id="UserConcentratedAllocator" class="com.cloud.agent.manager.allocator.impl.UserConcentratedAllocator">
-     <property name="name" value="User First"/>
-   </bean>
- 
-   <bean id="ConsoleProxyAllocator" class="com.cloud.consoleproxy.ConsoleProxyBalanceAllocator">
-     <property name="name" value="Balance"/>
-   </bean>
- 
-   <bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
- 
-   <bean id="ExteralIpAddressAllocator" class="com.cloud.network.ExteralIpAddressAllocator">
-     <property name="name" value="Basic"/>
-   </bean>
- 
-   <bean id="BareMetalTemplateAdapter" class="com.cloud.baremetal.manager.BareMetalTemplateAdapter" >
-     <property name="name" value="BareMetalTemplateAdapter"/>
++  <bean id="CiscoVNMC" class="com.cloud.network.element.CiscoVnmcElement">
++    <property name="name" value="CiscoVNMC"/>
 +  </bean>
- 
++  
 +  <!--
-     Authenticators
-   -->
-   <bean id="MD5UserAuthenticator" class="com.cloud.server.auth.MD5UserAuthenticator">
-     <property name="name" value="MD5"/>
+     BigSwitch support components
+   -->  
+   <bean id="bigSwitchVnsDaoImpl" class="com.cloud.network.dao.BigSwitchVnsDaoImpl" />
+   <bean id="bigSwitchVnsElement" class="com.cloud.network.element.BigSwitchVnsElement">
+     <property name="name" value="BigSwitchVnsElement"/>
    </bean>
  
-   <bean id="LDAPUserAuthenticator" class="com.cloud.server.auth.LDAPUserAuthenticator">
-     <property name="name" value="LDAP"/>
-   </bean>
  
    <!--
-     Investigators
+     Midonet support components
    -->
-   <bean id="CheckOnAgentInvestigator" class="com.cloud.ha.CheckOnAgentInvestigator">
-     <property name="name" value="SimpleInvestigator"/>
+   <bean id="MidoNetGuestNetworkGuru" class="com.cloud.network.guru.MidoNetGuestNetworkGuru">
+     <property name="name" value="MidoNetGuestNetworkGuru"/>
    </bean>
- 
-   <bean id="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator">
-     <property name="name" value="XenServerInvestigator"/>
-   </bean>
-   
-   <bean id="UserVmDomRInvestigator" class="com.cloud.ha.UserVmDomRInvestigator">
-     <property name="name" value="PingInvestigator"/>
+   <bean id="MidoNetElement" class="com.cloud.network.element.MidoNetElement">
+     <property name="name" value="MidoNetElement"/>
    </bean>
  
-   <bean id="ManagementIPSystemVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator">
-     <property name="name" value="ManagementIPSysVMInvestigator"/>
-   </bean>
  
-   <bean id="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator">
-     <property name="name" value="VMwareInvestigator"/>
-   </bean>
+ <!--
  
-   <!--
-     Fencers
-   -->
-   <bean id="XenServerFencer" class="com.cloud.ha.XenServerFencer">
-     <property name="name" value="XenServerFenceBuilder"/>
-   </bean>
-   <bean id="KVMFencer" class="com.cloud.ha.KVMFencer">
-     <property name="name" value="KVMFenceBuilder"/>
-   </bean>
-   <bean id="OvmFencer" class="com.cloud.ovm.hypervisor.OvmFencer">
-     <property name="name" value="OvmFenceBuilder"/>
+   Deployment configurations of various adapters
+     
+   It determines whether or not a adapter is activated or how it is loaded in order in its managing provider,
+      
+ --> 
+ 
+   <!-- Security adapters -->
+   <bean id="userAuthenticators" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="SHA256SaltedUserAuthenticator"/>
+           <ref bean="MD5UserAuthenticator"/>
+           <ref bean="LDAPUserAuthenticator"/>
+           <ref bean="PlainTextUserAuthenticator"/>
+       </list>
+     </property>
    </bean>
-   <bean id="VmwareFencer" class="com.cloud.ha.VmwareFencer">
-     <property name="name" value="VMwareFenceBuilder"/>
+   <bean id="userPasswordEncoders" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="SHA256SaltedUserAuthenticator"/>
+           <ref bean="MD5UserAuthenticator"/>
+           <ref bean="LDAPUserAuthenticator"/>
+           <ref bean="PlainTextUserAuthenticator"/>
+       </list>
+     </property>
    </bean>
  
-   <!--
-     Discovers
-   -->
-   <bean id="XcpServerDiscoverer" class="com.cloud.hypervisor.xen.discoverer.XcpServerDiscoverer">
-     <property name="name" value="XCP Agent"/>
+   <bean id="securityCheckers" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="domainChecker"/>
+       </list>
+     </property>
    </bean>
  
-   <bean id="SecondaryStorageDiscoverer" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer">
-     <property name="name" value="SecondaryStorage"/>
+   <!-- Resource discoverers -->
+   <bean id="resourceDiscoverers" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="XcpServerDiscoverer"/>
+           <ref bean="SecondaryStorageDiscoverer"/>
+           <ref bean="KvmServerDiscoverer"/>
+ <!--          
+           <ref bean="BareMetalDiscoverer"/>
+ -->
+           <ref bean="OvmDiscoverer"/>
+           <ref bean="vmwareServerDiscoverer"/>
+       </list>
+     </property>
    </bean>
  
-   <bean id="KvmServerDiscoverer" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer">
-     <property name="name" value="KVM Agent"/>
+   <!-- HA adapters -->
+   <bean id="haInvestigators" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="CheckOnAgentInvestigator"/>
+           <ref bean="XenServerInvestigator"/>
+           <ref bean="VmwareInvestigator"/>
+           <ref bean="UserVmDomRInvestigator"/>
+           <ref bean="ManagementIPSystemVMInvestigator"/>
+       </list>
+     </property>
    </bean>
  
-   <bean id="BareMetalDiscoverer" class="com.cloud.baremetal.manager.BareMetalDiscoverer">
-     <property name="name" value="Bare Metal Agent"/>
+   <bean id="haFenceBuilders" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="XenServerFencer"/>
+           <ref bean="KVMFencer"/>
+           <ref bean="OvmFencer"/>
+           <ref bean="VmwareFencer"/>
+       </list>
+     </property>
    </bean>
  
- 
-   <bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer">
-     <property name="name" value="SCVMMServer"/>
+   <!-- Deployment/allocation adapters -->
+   <bean id="deploymentPlanners" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="FirstFitPlanner" />
+           <ref bean="UserDispersingPlanner" />
+           <ref bean="UserConcentratedPodPlanner" />
+           
+ <!--
+           <ref bean="BareMetalPlanner" />
+ -->
+       </list>
+     </property>
    </bean>
  
-   <bean id="OvmDiscoverer" class="com.cloud.ovm.hypervisor.OvmDiscoverer">
-     <property name="name" value="Ovm Discover"/>
+   <bean id="podAllocators" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="UserConcentratedAllocator"/>
+       </list>
+     </property>
    </bean>
    
-   <bean id="vmwareServerDiscoverer" class="com.cloud.hypervisor.vmware.VmwareServerDiscoverer">
-     <property name="name" value="VMware Discover"/>
-   </bean>
- 
-   <!--
-     Deployment planners
-   -->
-   <bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner">
-     <property name="name" value="First Fit"/>
+   <bean id="hostAllocators" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="FirstFitRouting"/>
+       </list>
+     </property>
    </bean>
  
-   <bean id="UserDispersingPlanner" class="com.cloud.deploy.UserDispersingPlanner">
-     <property name="name" value="UserDispersing"/>
-   </bean>
-   
-   <bean id="UserConcentratedPodPlanner" class="com.cloud.deploy.UserConcentratedPodPlanner">
-     <property name="name" value="UserConcentratedPod"/>
+   <bean id="storagePoolAllocators" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="LocalStoragePoolAllocator"/>
+           <ref bean="clusterScopeStoragePoolAllocator"/>
+           <ref bean="zoneWideStoragePoolAllocator"/>
+           <ref bean="garbageCollectingStoragePoolAllocator"/>
+       </list>
+     </property>
    </bean>
  
-   <bean id="BareMetalPlanner" class="com.cloud.baremetal.manager.BareMetalPlanner">
-     <property name="name" value="BareMetal Fit"/>
-   </bean>
-     
-   <!--
-     Network Gurus
-   -->
-   <bean id="StorageNetworkGuru" class="com.cloud.network.guru.StorageNetworkGuru">
-     <property name="name" value="StorageNetworkGuru"/>
-   </bean>
-   <bean id="ExternalGuestNetworkGuru" class="com.cloud.network.guru.ExternalGuestNetworkGuru">
-     <property name="name" value="ExternalGuestNetworkGuru"/>
-   </bean>
-   <bean id="PublicNetworkGuru" class="com.cloud.network.guru.PublicNetworkGuru">
-     <property name="name" value="PublicNetworkGuru"/>
-   </bean>
-   <bean id="PodBasedNetworkGuru" class="com.cloud.network.guru.PodBasedNetworkGuru">
-     <property name="name" value="PodBasedNetworkGuru"/>
-   </bean>
-   <bean id="ControlNetworkGuru" class="com.cloud.network.guru.ControlNetworkGuru">
-     <property name="name" value="ControlNetworkGuru"/>
-   </bean>
-   <bean id="DirectNetworkGuru" class="com.cloud.network.guru.DirectNetworkGuru">
-     <property name="name" value="DirectNetworkGuru"/>
-   </bean>
-   <bean id="DirectPodBasedNetworkGuru" class="com.cloud.network.guru.DirectPodBasedNetworkGuru">
-     <property name="name" value="DirectPodBasedNetworkGuru"/>
-   </bean>
-   <bean id="OvsGuestNetworkGuru" class="com.cloud.network.guru.OvsGuestNetworkGuru">
-     <property name="name" value="OvsGuestNetworkGuru"/>
-   </bean>
-   <bean id="PrivateNetworkGuru" class="com.cloud.network.guru.PrivateNetworkGuru">
-     <property name="name" value="PrivateNetworkGuru"/>
-   </bean>
-   <bean id="NiciraNvpGuestNetworkGuru" class="com.cloud.network.guru.NiciraNvpGuestNetworkGuru">
-     <property name="name" value="NiciraNvpGuestNetworkGuru"/>
-   </bean>
-  
-   <!--
-    Hypervisor Gurus
-   -->
-   <bean id="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru">
-     <property name="name" value="XenServerGuru"/>
-   </bean>
-   
-   <bean id="KVMGuru" class="com.cloud.hypervisor.KVMGuru">
-     <property name="name" value="KVMGuru"/>
-   </bean>
-   
-   <bean id="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru">
-     <property name="name" value="OvmGuru"/>
-   </bean>
-   
-   <bean id="VMwareGuru" class="com.cloud.hypervisor.guru.VMwareGuru">
-     <property name="name" value="VMwareGuru"/>
-   </bean>
-   
-   <bean id="BaremetalGuru" class="com.cloud.baremetal.manager.BareMetalGuru">
-     <property name="name" value="BaremetalGuru"/>
+   <!-- Networking adapters -->
+   <bean id="ipDeployers" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="elasticLoadBalancerElement"/>
+           <ref bean="VirtualRouter"/>
+           <ref bean="VpcVirtualRouter"/>
+       </list>
+     </property>
    </bean>
  
-   <bean id="BaremetalPlannerSelector" class="com.cloud.baremetal.manager.BaremetalPlannerSelector">
-     <property name="name" value="BaremetalPlannerSelector"/>
+   <bean id="dhcpProviders" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="VirtualRouter"/>
+           <ref bean="VpcVirtualRouter"/>
+ <!--          
+           <ref bean="BareMetalDhcp"/>
+ -->    
+       </list>
+     </property>
    </bean>
  
-   <bean id="HypervisorPlannerSelector" class="com.cloud.deploy.HypervisorVmPlannerSelector">
-     <property name="name" value="HypervisorPlannerSelector"/>
+   <bean id="networkGurus" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="StorageNetworkGuru"/>
+           <ref bean="ExternalGuestNetworkGuru"/>
+           <ref bean="PublicNetworkGuru"/>
+           <ref bean="PodBasedNetworkGuru"/>
+           <ref bean="DirectPodBasedNetworkGuru"/>
+           <ref bean="ControlNetworkGuru"/>
+           <ref bean="DirectNetworkGuru"/>
+           <ref bean="OvsGuestNetworkGuru"/>
+           <ref bean="PrivateNetworkGuru"/>
+           <ref bean="NiciraNvpGuestNetworkGuru"/>
+           <ref bean="MidoNetGuestNetworkGuru"/>
+       </list>
+     </property>
    </bean>
- 
-   <!--
-     DAO with customized configuration
-   -->
-   <bean id="configurationDaoImpl" class="com.cloud.configuration.dao.ConfigurationDaoImpl">
-     <property name="configParams">
-       <map>
-         <entry key="premium" value="true" />
-       </map>
-     </property>  
+   
+   <bean id="networkElements" class="com.cloud.utils.component.AdapterList">
+     <property name="Adapters">
+       <list>
+           <ref bean="JuniperSRX"/>
+           <ref bean="Netscaler"/>
+           <ref bean="F5BigIP"/>
+           <ref bean="CiscoNexus1000vVSM"/>
+           <ref bean="NiciraNvp" />
+           <ref bean="MidoNetElement" />
+           <ref bean="bigSwitchVnsElement"/>
+           <ref bean="VirtualRouter"/>
+           <ref bean="Ovs"/>
+           <ref bean="SecurityGroupProvider"/>
+           <ref bean="VpcVirtualRouter"/>
+ <!--
+           <ref bean="BareMetalDhcp"/>
+           <ref bean="BareMetalPxe"/>
+           <ref bean="BareMetalUserdata"/>
+ -->    
+       </list>
+     </property>
    </bean>
  
  </beans>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/plugins/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67f11d46/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-410to420.sql
index a556ed3,ab9df05..dae4763
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@@ -202,36 -202,206 +202,239 @@@ CREATE VIEW `cloud`.`event_view` A
              left join
          `cloud`.`event` eve ON event.start_id = eve.id;
  
+ ALTER TABLE `cloud`.`region` ADD COLUMN `gslb_service_enabled` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT 'Is GSLB service enalbed in the Region';
+ 
+ ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `is_gslb_provider` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is acting as gslb service provider in the zone';
+ 
+ ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `gslb_site_publicip` varchar(255)  DEFAULT NULL COMMENT 'GSLB service Provider site public ip';
+ 
+ ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `gslb_site_privateip` varchar(255) DEFAULT NULL COMMENT 'GSLB service Provider site private ip';
+ 
+ CREATE TABLE `cloud`.`global_load_balancing_rules` (
+   `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
+   `uuid` varchar(40),
+   `account_id` bigint unsigned NOT NULL COMMENT 'account id',
+   `domain_id` bigint unsigned NOT NULL COMMENT 'domain id',
+   `region_id`  int unsigned NOT NULL,
+   `name` varchar(255) NOT NULL,
+   `description` varchar(4096) NULL COMMENT 'description',
+   `state` char(32) NOT NULL COMMENT 'current state of this rule',
+   `algorithm` varchar(255) NOT NULL COMMENT 'load balancing algorithm used to distribbute traffic across zones',
+   `persistence` varchar(255) NOT NULL COMMENT 'session persistence used across the zone',
+   `service_type` varchar(255) NOT NULL COMMENT 'GSLB service type (tcp/udp)',
+   `gslb_domain_name` varchar(255) NOT NULL COMMENT 'DNS name for the GSLB service that is used to provide a FQDN for the GSLB service',
+   PRIMARY KEY  (`id`),
+   CONSTRAINT `fk_global_load_balancing_rules_account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE,
+   CONSTRAINT `fk_global_load_balancing_rules_region_id` FOREIGN KEY(`region_id`) REFERENCES `region`(`id`) ON DELETE CASCADE
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ 
+ CREATE TABLE `cloud`.`global_load_balancer_lb_rule_map` (
+   `id` bigint unsigned NOT NULL auto_increment,
+   `gslb_rule_id` bigint unsigned NOT NULL,
+   `lb_rule_id` bigint unsigned NOT NULL,
+   `revoke` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 is when rule is set for Revoke',
+   PRIMARY KEY  (`id`),
+   UNIQUE KEY (`gslb_rule_id`, `lb_rule_id`),
+   CONSTRAINT `fk_gslb_rule_id` FOREIGN KEY(`gslb_rule_id`) REFERENCES `global_load_balancing_rules`(`id`) ON DELETE CASCADE,
+   CONSTRAINT `fk_lb_rule_id` FOREIGN KEY(`lb_rule_id`) REFERENCES `load_balancing_rules`(`id`) ON DELETE CASCADE
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ 
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.cpus', '40', 'The default maximum number of cpu cores that can be used for an account');
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.memory', '40960', 'The default maximum memory (in MiB) that can be used for an account');
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.primary.storage', '200', 'The default maximum primary storage space (in GiB) that can be used for an account');
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.secondary.storage', '400', 'The default maximum secondary storage space (in GiB) that can be used for an account');
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.cpus', '40', 'The default maximum number of cpu cores that can be used for a project');
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.memory', '40960', 'The default maximum memory (in MiB) that can be used for a project');
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.primary.storage', '200', 'The default maximum primary storage space (in GiB) that can be used for a project');
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.secondary.storage', '400', 'The default maximum secondary storage space (in GiB) that can be used for a project');
+ 
+ DROP VIEW IF EXISTS `cloud`.`account_view`;
+ CREATE VIEW `cloud`.`account_view` AS
+     select
+         account.id,
+         account.uuid,
+         account.account_name,
+         account.type,
+         account.state,
+         account.removed,
+         account.cleanup_needed,
+         account.network_domain,
+         domain.id domain_id,
+         domain.uuid domain_uuid,
+         domain.name domain_name,
+         domain.path domain_path,
+         data_center.id data_center_id,
+         data_center.uuid data_center_uuid,
+         data_center.name data_center_name,
+         account_netstats_view.bytesReceived,
+         account_netstats_view.bytesSent,
+         vmlimit.max vmLimit,
+         vmcount.count vmTotal,
+         runningvm.vmcount runningVms,
+         stoppedvm.vmcount stoppedVms,
+         iplimit.max ipLimit,
+         ipcount.count ipTotal,
+         free_ip_view.free_ip ipFree,
+         volumelimit.max volumeLimit,
+         volumecount.count volumeTotal,
+         snapshotlimit.max snapshotLimit,
+         snapshotcount.count snapshotTotal,
+         templatelimit.max templateLimit,
+         templatecount.count templateTotal,
+         vpclimit.max vpcLimit,
+         vpccount.count vpcTotal,
+         projectlimit.max projectLimit,
+         projectcount.count projectTotal,
+         networklimit.max networkLimit,
+         networkcount.count networkTotal,
+         cpulimit.max cpuLimit,
+         cpucount.count cpuTotal,
+         memorylimit.max memoryLimit,
+         memorycount.count memoryTotal,
+         primary_storage_limit.max primaryStorageLimit,
+         primary_storage_count.count primaryStorageTotal,
+         secondary_storage_limit.max secondaryStorageLimit,
+         secondary_storage_count.count secondaryStorageTotal,
+         async_job.id job_id,
+         async_job.uuid job_uuid,
+         async_job.job_status job_status,
+         async_job.account_id job_account_id
+     from
+         `cloud`.`free_ip_view`,
+         `cloud`.`account`
+             inner join
+         `cloud`.`domain` ON account.domain_id = domain.id
+             left join
+         `cloud`.`data_center` ON account.default_zone_id = data_center.id
+             left join
+         `cloud`.`account_netstats_view` ON account.id = account_netstats_view.account_id
+             left join
+         `cloud`.`resource_limit` vmlimit ON account.id = vmlimit.account_id
+             and vmlimit.type = 'user_vm'
+             left join
+         `cloud`.`resource_count` vmcount ON account.id = vmcount.account_id
+             and vmcount.type = 'user_vm'
+             left join
+         `cloud`.`account_vmstats_view` runningvm ON account.id = runningvm.account_id
+             and runningvm.state = 'Running'
+             left join
+         `cloud`.`account_vmstats_view` stoppedvm ON account.id = stoppedvm.account_id
+            and stoppedvm.state = 'Stopped'
+             left join
+         `cloud`.`resource_limit` iplimit ON account.id = iplimit.account_id
+             and iplimit.type = 'public_ip'
+             left join
+         `cloud`.`resource_count` ipcount ON account.id = ipcount.account_id
+             and ipcount.type = 'public_ip'
+             left join
+         `cloud`.`resource_limit` volumelimit ON account.id = volumelimit.account_id
+             and volumelimit.type = 'volume'
+             left join
+         `cloud`.`resource_count` volumecount ON account.id = volumecount.account_id
+             and volumecount.type = 'volume'
+             left join
+         `cloud`.`resource_limit` snapshotlimit ON account.id = snapshotlimit.account_id
+             and snapshotlimit.type = 'snapshot'
+             left join
+         `cloud`.`resource_count` snapshotcount ON account.id = snapshotcount.account_id
+             and snapshotcount.type = 'snapshot'
+             left join
+         `cloud`.`resource_limit` templatelimit ON account.id = templatelimit.account_id
+             and templatelimit.type = 'template'
+             left join
+         `cloud`.`resource_count` templatecount ON account.id = templatecount.account_id
+             and templatecount.type = 'template'
+             left join
+         `cloud`.`resource_limit` vpclimit ON account.id = vpclimit.account_id
+             and vpclimit.type = 'vpc'
+             left join
+         `cloud`.`resource_count` vpccount ON account.id = vpccount.account_id
+             and vpccount.type = 'vpc'
+             left join
+         `cloud`.`resource_limit` projectlimit ON account.id = projectlimit.account_id
+             and projectlimit.type = 'project'
+             left join
+         `cloud`.`resource_count` projectcount ON account.id = projectcount.account_id
+             and projectcount.type = 'project'
+             left join
+         `cloud`.`resource_limit` networklimit ON account.id = networklimit.account_id
+             and networklimit.type = 'network'
+             left join
+         `cloud`.`resource_count` networkcount ON account.id = networkcount.account_id
+             and networkcount.type = 'network'
+             left join
+         `cloud`.`resource_limit` cpulimit ON account.id = cpulimit.account_id
+             and cpulimit.type = 'cpu'
+             left join
+         `cloud`.`resource_count` cpucount ON account.id = cpucount.account_id
+             and cpucount.type = 'cpu'
+             left join
+         `cloud`.`resource_limit` memorylimit ON account.id = memorylimit.account_id
+             and memorylimit.type = 'memory'
+             left join
+         `cloud`.`resource_count` memorycount ON account.id = memorycount.account_id
+             and memorycount.type = 'memory'
+             left join
+         `cloud`.`resource_limit` primary_storage_limit ON account.id = primary_storage_limit.account_id
+             and primary_storage_limit.type = 'primary_storage'
+             left join
+         `cloud`.`resource_count` primary_storage_count ON account.id = primary_storage_count.account_id
+             and primary_storage_count.type = 'primary_storage'
+             left join
+         `cloud`.`resource_limit` secondary_storage_limit ON account.id = secondary_storage_limit.account_id
+             and secondary_storage_limit.type = 'secondary_storage'
+             left join
+         `cloud`.`resource_count` secondary_storage_count ON account.id = secondary_storage_count.account_id
+             and secondary_storage_count.type = 'secondary_storage'
+             left join
+         `cloud`.`async_job` ON async_job.instance_id = account.id
+             and async_job.instance_type = 'Account'
+             and async_job.job_status = 0;
+ 
+ ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id';
+ ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `uuid` varchar(40) UNIQUE;
+ 
+ -- START: support for LXC
+  
+ INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('LXC', 'default', 50, 1);
+ ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `lxc_network_label` varchar(255) DEFAULT 'cloudbr0' COMMENT 'The network name label of the physical device dedicated to this traffic on a LXC host';
+  
+ UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC' WHERE name='hypervisor.list';
+  
+ INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
+      VALUES (10, 'routing-10', 'SystemVM Template (LXC)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2', '2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (LXC)', 'QCOW2', 15, 0, 1, 'LXC');
+ 
+ -- END: support for LXC
++
 +CREATE TABLE `cloud`.`external_cisco_vnmc_devices` (
 +  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
 +  `uuid` varchar(255) UNIQUE,
 +  `physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which cisco vnmc device is added',
 +  `provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this cisco vnmc device',
 +  `device_name` varchar(255) NOT NULL COMMENT 'name of the cisco vnmc device',
 +  `host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external cisco vnmc device',
 +  PRIMARY KEY (`id`),
 +  CONSTRAINT `fk_external_cisco_vnmc_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
 +  CONSTRAINT `fk_external_cisco_vnmc_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +
 +CREATE TABLE `cloud`.`external_cisco_asa1000v_devices` (
 +  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
 +  `uuid` varchar(255) UNIQUE,
 +  `physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which cisco asa1kv device is added',
 +  `management_ip` varchar(255) UNIQUE NOT NULL COMMENT 'mgmt. ip of cisco asa1kv device',
 +  `in_port_profile` varchar(255) NOT NULL COMMENT 'inside port profile name of cisco asa1kv device',
 +  `cluster_id` bigint unsigned NOT NULL COMMENT 'id of the Vmware cluster to which cisco asa1kv device is attached (cisco n1kv switch)',
 +  PRIMARY KEY (`id`),
 +  CONSTRAINT `fk_external_cisco_asa1000v_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE,
 +  CONSTRAINT `fk_external_cisco_asa1000v_devices__cluster_id` FOREIGN KEY (`cluster_id`) REFERENCES `cluster`(`id`) ON DELETE CASCADE
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 +
 +CREATE TABLE `cloud`.`network_asa1000v_map` (
 +  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
 +  `network_id` bigint unsigned NOT NULL UNIQUE COMMENT 'id of guest network',
 +  `asa1000v_id` bigint unsigned NOT NULL UNIQUE COMMENT 'id of asa1000v device',
 +  PRIMARY KEY (`id`),
 +  CONSTRAINT `fk_network_asa1000v_map__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE,
 +  CONSTRAINT `fk_network_asa1000v_map__asa1000v_id` FOREIGN KEY (`asa1000v_id`) REFERENCES `external_cisco_asa1000v_devices`(`id`) ON DELETE CASCADE
 +) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- 


Mime
View raw message