Commit Graph

4316 Commits

Author SHA1 Message Date
Sheng Yang c5292de0ae NaaS: Restrict the combination that provider can support 2011-11-30 14:53:50 -08:00
Alena Prokharchyk dc9efbb46e return only domains in Active state to the API 2011-11-30 13:56:37 -08:00
Alena Prokharchyk c4e96d9857 This commit reverts 19cdf95e8b29678767e3aa4c87da73fa60dd4a34.
We don't allow domainSuffix and networkOffering upgrade for Shared networks as it requires network restart
2011-11-30 11:47:17 -08:00
frank 83b7b6a412 Add ResourceState as a searching condition of ListHostCmd 2011-11-30 11:42:38 -08:00
Alena Prokharchyk a3d8291698 bug 12242: fixed api doc for createLoadBalancerRule command
status 12242: resolved fixed
2011-11-30 10:54:35 -08:00
Alena Prokharchyk 554946fe8b Allow networkDomain update for Shared networks 2011-11-30 10:34:58 -08:00
Naredula Janardhana Reddy e4b5a62402 bug 10796: merging code from branch 2011-11-30 15:03:43 +05:30
prachi 0769a3b3f3 API Server changes needed to read a properties file present within a jar provided in classpath. 2011-11-29 18:02:19 -08:00
frank 6a7d99fc77 Bug 12219 - Cant add baremetal host
status 12219: resolved fixed
2011-11-29 11:46:46 -08:00
Alena Prokharchyk 7ea6082f22 PhysicalNetworkId is not required in listNetworkServiceProvider call 2011-11-29 10:47:03 -08:00
Alena Prokharchyk 6e3cbaab6f SecurityGroupProvider is added automatically in Disabled state during the zone creation 2011-11-29 10:13:02 -08:00
Alena Prokharchyk c2448b7bd4 list Providers by name and state 2011-11-29 09:59:43 -08:00
Abhinandan Prateek 660891b405 bug 8962: adding a check for disabled accounts 2011-11-29 12:40:58 +05:30
Abhinandan Prateek a560d6f055 bug 11910: no need to do full sync as first thing after connect 2011-11-29 11:23:21 +05:30
kishan 31172a4205 bug 12198: Empty password for system user meed not be encrypted 2011-11-29 08:45:23 +05:30
Alena Prokharchyk 5423f744b3 Fixed multiple bugs in registerTemplate/registerIso:
1) throw exception when try to register template/iso when there are no zones in the system
2) don't add the template to template_zone_ref when the zone is removed
3) Don't try to download the template when template failed to persist in the DB
2011-11-28 16:50:54 -08:00
Alena Prokharchyk abfbac7928 Moved listAccount/listDomains/listDomainChildren methods from ManagementServer to Account/Domain managers 2011-11-28 15:32:12 -08:00
Alena Prokharchyk 8f91856822 bug 11859: Added Usage param to @Implementation in API docs. Usage would explain what parameters combinations are valid for specific cases
status 11859: resolved fixed
2011-11-28 14:40:13 -08:00
Alena Prokharchyk 628ca6c6d7 bug 11018: removed private_netmask from vm_instance table
status 11018: resolved fixed
2011-11-28 14:15:14 -08:00
Alena Prokharchyk afb56d2112 bug 11492: check volume resource limit when deployVm
status 11492: resolved fixed
2011-11-28 13:38:32 -08:00
Alena Prokharchyk ecd7004f15 bug 11978: don't allow passing -, + and spaces for instance.name config param
status 11978: resolved fixed
2011-11-28 11:52:46 -08:00
Alena Prokharchyk 102f460458 Fixed updateConfiguration - updateHostDetails used to swallow the exceptions 2011-11-28 11:52:45 -08:00
Kelven Yang c3eba2933e bug 11973: Escape VM name to prevent from XSS attack. Reviewed-by: Alex huang 2011-11-28 11:38:31 -08:00
Kelven Yang a7ac3d577a Limit the ID valid range to be either numeric -1L for special usage or in range that it hits a DB record 2011-11-28 11:36:47 -08:00
Alena Prokharchyk 586febd4c1 bug 11965: check the user state on the Services layer, not in the VmManager as VmManager can be called not only from the API, but also by internal methods - HA for instance - and in this case we shouldn't care about the account state
11965 status: resolved fixed

Also fixed gson serialization error in account response
2011-11-28 10:05:19 -08:00
kishan 4e8a0a65f8 bug 12187, 12188: Encrypt system, admin user passwords. Use configDao for ssl.keystore. Set configuration init to null instead of false.
status 12187, 12188: resolved fixed
reviewed-by: Abhi
2011-11-28 18:21:20 +05:30
Abhinandan Prateek 88f9b1ab7c bug 8962: review changes incorporated 2011-11-25 15:03:45 +05:30
Alena Prokharchyk 34b24895eb bug 12176: fixed NPE in resource limit calculation for snapshots
status 12176: resolved fixed
2011-11-24 10:33:11 -08:00
Alena Prokharchyk fc2b95d9c3 Fixed NPE in listIso API 2011-11-24 10:27:00 -08:00
Abhinandan Prateek 655a9805f3 bug 11966: added findNonDisabledAccount 2011-11-24 13:43:12 +05:30
Abhinandan Prateek 16e342836e bug 11966: chnaged the findActiveAccount method to return only the accounts which are active 2011-11-24 13:12:28 +05:30
Abhinandan Prateek d90e19ae28 bug 11825: removing the trace as from the message the origin of problem can be easily traced. 2011-11-24 11:15:51 +05:30
prachi 8134cfb4c8 Bug 11131 - Allocators: when vm fails to deploy in DataCenter, we should never retry in the same DC again as the DC is already in Avoid set
Changes:
- Added check in planner to verfiy that the datacenter is not in avoid set. If found in avoid set, planner does not proceed.
2011-11-23 17:40:20 -08:00
Sheng Yang f14e536cea NaaS: Make CloudZonesNetworkElement implement UserDataServiceProvider 2011-11-23 16:18:28 -08:00
Sheng Yang 539477f5e1 NaaS: Make ExternalDhcpElement implements DhcpServiceProvider 2011-11-23 16:18:21 -08:00
prachi 5eba3d9326 Removing whitespace from tags while storing the Host tags. 2011-11-23 14:21:36 -08:00
prachi f56c3d7bc5 Bug 11126 - Give ability to define tags post storage addition
Changes:
- Enabled updating storage tags
- All existing tags are wiped out and new ones provided are stored.
- Note that, if tags are updated on the storage, no changes are done to the deployment of already running VMs that were deployed prior to tag addition.
- Also added some validation to host tags update API.
2011-11-23 14:21:34 -08:00
frank 275a5ffa3c Fix wrong usage of SearchCriteria2 in AgentMonitor 2011-11-23 11:05:39 -08:00
Nitin Mehta cdd94c1b9a bug 11811: Introduce a global config to disable extraction altogether for all users except root admin. Make changes so that volumes are based out of ISO. Take care of upgrade as well for this global config.
Reviewed by : Kishan.
2011-11-24 00:12:24 +05:30
Nitin Mehta e034e3d7a3 Revert "bug 11811: Changing permissions for extraction of volumes based out of isos."
This reverts commit 9ed2be7ecda7c0bad05aec8e0213e95507ad9be6.
2011-11-23 18:38:37 +05:30
Abhinandan Prateek da20d33e27 bug 11910: full sync will only stop unknown VMs on agent 2011-11-23 16:48:12 +05:30
Murali Reddy beb38c8310 making devices enabled independent of config commands
adding default device capacity when admin does not specify a vlaue
fixed bug in device allocation logic
2011-11-22 19:52:07 -08:00
Alena Prokharchyk aa78c9bfb9 vm Expunge: check that securityGroup-Vm mappings exists before locking the row in userVm table 2011-11-22 16:24:08 -08:00
Alena Prokharchyk c66842b640 bug 11812: added domainId parameter to "login" api doc
status 11812: resolved fixed
2011-11-22 15:34:07 -08:00
Alena Prokharchyk 38b25f3466 bug 11289: return only Free ip addresses as available Ips as a part of listAccounts
status 11289: resolved fixed
2011-11-22 15:25:45 -08:00
Alena Prokharchyk f111d8377e bug 11702: removed obsolete ipaddress parameter from userVm response
status 11792: resolved fixed
2011-11-22 14:29:13 -08:00
Alena Prokharchyk 1ce1f520f1 bug 11406: don't return hypervisor type in API response 2011-11-22 14:13:07 -08:00
Alena Prokharchyk 683b5635e3 bug 11674: fixed listVolumes by zoneId for regularUsers/domainAdmins
status 11674: resolved fixed
2011-11-22 13:55:03 -08:00
prachi a8ffd0ea06 Added unique constraint on providername <-> physical network mapping. 2011-11-22 13:11:02 -08:00
Alena Prokharchyk 74f217e1d0 Introduced new parameter to listNetworkOfferings API - sourceNatEnabled (Boolean). 2011-11-22 10:54:29 -08:00
Alena Prokharchyk e014426889 Added global flag defining if the regular user is allowed to create a project 2011-11-22 10:04:32 -08:00
Abhinandan Prateek 488ac8238e bug 11311: lis host takes in a additional parameter to fine tune the details, the default behavious is still unchanged. 2011-11-22 16:26:52 +05:30
Murali Reddy f302533474 changes response object name for F5/Netscaler/SRX to be lower case 2011-11-21 18:28:51 -08:00
Alena Prokharchyk 45b058a89d Project "Owner" is called project "Admin" 2011-11-21 18:01:44 -08:00
Alena Prokharchyk 85d9de58d6 bug 12127: fixed releasing non-source nat ips
status 12127: resolved fixed
2011-11-21 17:53:40 -08:00
Alena Prokharchyk 4f54b5e9d3 Fixed error message 2011-11-21 17:53:40 -08:00
prachi 0dc7fb48a1 Bug 11962 - MigrateVirtualMachine fails with AgentUnavailableException when the targeted host for migration is under Maintenance
Bug 11964 - You are allowed to migrate a virtual machine on to the host that it already exists o

Changes:
Validations were missing in th MigrateVmCmd API, since from UI the validations are always done while listing hosts for migration as first step.
2011-11-21 17:12:36 -08:00
Murali Reddy 54f4ebf08c changes for SRX add/config commands for UI integration 2011-11-21 16:57:41 -08:00
Alena Prokharchyk 00f6738e24 bug 12105: don't generate corresponding firewall rule for the pf/staticNat/lb rule in revoke state
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/user/MockAccountManagerImpl.java
	server/test/com/cloud/vm/MockUserVmManagerImpl.java
2011-11-21 16:34:55 -08:00
prachi 6dc4ae47db Bug 12103: Adding host without labelling guest network fails
We do not set the default network labels as 'cloud-private' anymore. Instead it is set to the values set in global config variable. This should avoid the host connect failures requiring the network labels to be setup.
2011-11-21 14:46:02 -08:00
Murali Reddy c9b2031fa9 changes in add/configure API commands for F5 & Netscaler for UI integration 2011-11-21 13:31:54 -08:00
Alena Prokharchyk d67bef8e78 Owner of the network is system if the network is shared to Domain 2011-11-21 11:52:40 -08:00
Nitin Mehta ec3a00a230 bug 10281: Template/ISO APIs should throw an exception in failure case for the events to be registered as failure.
Reviewed by : Kishan.

status 10281: resolved fixed
2011-11-21 18:58:06 +05:30
Nitin Mehta 57aa7dec91 bug 11811: Changing permissions for extraction of volumes based out of isos.
As per the new design following would be done.
(a) any ISO-derived disk can be extracted
(b) there will be a global config to disable  extraction of ISO based volumes.
That way people concerned about (a) can just use (b) to fix it.
Reviewed by : Kishan.

status 11811: resolved fixed
2011-11-21 16:58:09 +05:30
prachi 4531c9d6f7 Bug 12082 - Not able to deploy Vms with Host tags.
After recent changes of AgentManager, HostDao was wrongly referring to getState() instead of getResourceState().
Fixed this to refer to getResourceState(). This should fix the IndexOutOfBounds error.
2011-11-18 19:03:12 -08:00
Kelven Yang 061ff36434 bug 11814: TemplateResponse now returns template details info 2011-11-18 16:40:32 -08:00
Kelven Yang a59658177d bug 11814: connect template and instance details data when sending command to resource 2011-11-18 16:40:31 -08:00
Alena Prokharchyk bc544d31e7 listPublicIpAddresses by associatedNetworkId 2011-11-18 15:57:01 -08:00
Alena Prokharchyk 1871de3048 bug 11853: better error message when try to add VPN user with duplicated user name
status 11853: resolved fixed
2011-11-18 15:49:18 -08:00
frank dd9465c592 Bug 12078 - pxe config file not being sent down (edit)
fix in acton
2011-11-18 15:39:22 -08:00
Alena Prokharchyk 5ea4133d7b createNetworkOffering: verify that individual services can be enabled for each provider specified for the network offering 2011-11-18 14:46:10 -08:00
Alex Huang c6dc4f8435 merge changes 2011-11-18 14:29:01 -08:00
Alex Huang 84d5f0514e Changed network tags to network name as we no longer need to send the entire network tags down to the resource. 2011-11-18 14:28:16 -08:00
frank 5d6653224b directly search ssvm in host table when sending SecStorageFirewallCfgCommand 2011-11-18 13:59:17 -08:00
Alena Prokharchyk 71ff88f211 bug 12067: set 'extractable' field default value to 0 as a part of 2.2.13 to 2.2.14 db upgrade
status 12067: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
	setup/db/create-schema.sql
2011-11-18 13:44:59 -08:00
prachi b8b08555e6 Removing garbled characters. 2011-11-18 13:35:48 -08:00
prachi 0ebca4cdf8 AddNetworkServiceProvider should check if the services specified are provided by the provider to be added. 2011-11-18 13:07:50 -08:00
Murali Reddy eee79d56a3 permit adding external devices when service provider is in disabled state 2011-11-18 11:10:08 -08:00
Abhinandan Prateek 489847fcb7 bug 11867: split the host details into [all, capacity, events, stats, min] 2011-11-18 18:07:05 +05:30
Nitin Mehta fc261e70f7 bug 11996: Improve logging and catch throwable to make it robust.
status 11996: resolved fixed
2011-11-18 12:22:50 +05:30
Abhinandan Prateek 8d61329fdc fixing a typo 2011-11-18 11:30:58 +05:30
Alena Prokharchyk 2917bc686b Fixed the typo 2011-11-17 20:11:37 -08:00
prachi 313e6ca284 Bug 8791 user dispersing allocator
Changes:
- Added a two new deployment planners  'UserDispersingPlanner' and 'UserConcentratedPodPlanner' to the DeploymentPlanners
- Planner can be chosen by setting the global config variable 'vm.allocation.algorithm' to either of the following values:
('random', 'firstfit', 'userdispersing', 'userconcentratedpod')
- By default, the value is 'random'. When the value is 'random', FirstFitPlanner is invoked as before that shuffles the resource lists.
- Now Admin can choose whether the deployment heuristic should be applied starting at cluster or pod level. This can be done by using the
global config variable 'apply.allocation.algorithm.to.pods' which is false by default. Thus by default as earlier, planner starts at clusters directly.

'UserConcentratedPodPlanner' changes:
- Earlier to 3.0, FirstFitPlanner used to reorder the clusters in case this heuristic was chosen.
- Now this is done by a separate planner and is applied only when 'vm.allocation.algorithm' is set to this planner
- It reorders the capacity based clusters/pods such that those pods having more number of Running Vms for the given account are tried first.
- Note that this userconcentration is applied only to pods and clusters. Not to hosts or storagepools within a cluster.

'UserDispersingPlanner' changes:
- 'UserDispersingPlanner' reorders the capacity ordered pods and clusters based on number of 'Running' VMs for the given account in ascending order. Aim is to choose thodes pods/clusters first which have less number of Running VMs for the given account
- Admin can provide weights to capacity and user dispersion so that both parameters get considered in reordering the pods/clusters. This can be done by setting
the global config parameter 'vm.user.dispersion.weight'. Default value is 1. Thus if this planner is chosen, by default, ordering will be done only by number of Running Vms, unless the weight is changed.
- HostAlllocators and StoragePoolAllocators also reorder the hosts and pools by ascending order of number of Running VMS/ Ready Volumes respectively for the given account. Thus try to choose that host or pool within a cluster with less number of VMs for the account.
2011-11-17 18:29:39 -08:00
Alena Prokharchyk d0cdc451db bug 11193: throw insufficientCapacityException when run out of link local ip addresses
status 11193: resolved fixed
2011-11-17 17:35:04 -08:00
Murali Reddy 4bdcddf96c fixed bug in addSrxFirewallCmd API 2011-11-17 17:22:14 -08:00
Alena Prokharchyk 337c07c0d1 Default gateway service to sourceNat service in the API 2011-11-17 16:28:10 -08:00
Alena Prokharchyk 0a10e32d69 Fixed test client 2011-11-17 16:25:54 -08:00
Sheng Yang 7724bac41b NaaS: Separate DNS service from DHCP service of virtual router
If virtual router provide DHCP but not DNS service, the DHCP response would
contained DNS server address rather than domr itself's address. Then user VM
would use specified DNS server directly.
2011-11-17 16:19:03 -08:00
Alena Prokharchyk 5571afa471 Virtual router elements: prepare nics only when VirtualRouter is a provider for at least one service in the network 2011-11-17 14:33:22 -08:00
Alena Prokharchyk 0bb325ac12 Call implement() and shutdown() methods for providers only when the provider serves a service for the network 2011-11-17 13:53:53 -08:00
Sheng Yang cb6c1424ef NaaS: Add virtual router state check for virtual router element 2011-11-17 13:42:29 -08:00
prachi b0cdb86d9e Merging listSupportedNetworkServices and listSupportedNetworkServiceProviders.
listSupportedNetworkServiceProviders returs list of services with providers and capabilities of each service.
It supports 2 parameters:
-service : list providers and capabilities of this service
-provider: list services of this provider
- if none is specified, lists all services supported
2011-11-17 12:54:31 -08:00
Sheng Yang cdd8d741ca NaaS: Add redundant router capability to virtual router 2011-11-17 11:33:04 -08:00
Abhi 9086a39bda bug 11910: avoid Starting to Running state changes during full sync, as the VM startup process does not like it 2011-11-17 14:32:56 +05:30
Murali Reddy 37908d2669 fixing bug in provider verify logic of SRX element 2011-11-16 18:23:09 -08:00
Alena Prokharchyk 1fadde2082 Fixed bug in list domain level networks 2011-11-16 15:07:24 -08:00
Alena Prokharchyk 790b33bdfc More validation to network and network offering creation/upgrade 2011-11-16 14:53:38 -08:00
Murali Reddy cbc72f3ef7 adding service capabities to network offering response 2011-11-16 13:43:09 -08:00
Alena Prokharchyk 450b19532a Fixed unit test 2011-11-16 13:20:53 -08:00
Sheng Yang d4b1732ff4 NaaS: Fix redundant virtual router 2011-11-16 11:30:09 -08:00
Alena Prokharchyk 339e72d414 Introduced "supportedServices" parameter to createNetworkOffering API. This parameter replaces old parameters: dhcpService, gatewayService, etc. 2011-11-16 11:17:07 -08:00
Murali Reddy 75121bd762 bug 11817 : NAAS external networking device support
- added pluggable (service) API's for managing F5 and SRX devices
2011-11-16 10:53:22 -08:00
Murali Reddy f347158beb NAAS:fixed provider network element mapping for F5 & netscaler and permit device add when provider in disabled state 2011-11-15 17:29:18 -08:00
Sheng Yang 3aef381b37 NaaS: Add service provider to server-setup.xml 2011-11-15 17:09:55 -08:00
Edison Su b2a5e26c06 bug 10792: add default system wide firewall rule
status 10792: resolved fixed
2011-11-15 16:51:30 -08:00
Alena Prokharchyk 03eb3c9037 Removed unused imports 2011-11-15 16:42:26 -08:00
Kelven Yang 16530b532f Make XML serializer support all fields within the class tree 2011-11-15 15:01:47 -08:00
Kelven Yang 277c60e4f6 bug 11814: Allow template to have details info in key/value pairs. 2011-11-15 15:01:46 -08:00
Murali Reddy 0b05badaaa bug 11817: NAAS external network device support
-made Netscaler, SRX, F5 network elements as pluggable service
   -added abstract load balancer device manager ExternaLoadBalancerDeviceManager
   -made both F5 and Netscaler pluggable service to extend ExternaLoadBalancerDeviceManager
   -added abstract firewall device manager ExternalFirewallDeviceManager
   -made SRX pluugable service to extende ExternalFirewallDeviceManager
   -added API's to configure and manage netscaler devices
2011-11-15 12:18:59 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
prachi d7ae15beea - Fixed missing UUId in listNetworkServiceProviders API
- BroadcastDomainRange will be 'POD' for 'basic' zone and 'ZONE' for an advance zone.
2011-11-14 17:39:09 -08:00
Alena Prokharchyk f157148ea1 aclType is Domain for Guest network in Basic zone 2011-11-14 11:24:17 -08:00
Alena Prokharchyk 87f5150e38 Basic zone is fixed and works with new NaaS now 2011-11-14 10:46:05 -08:00
Alena Prokharchyk f4136bfd9e Basic zone 2011-11-14 10:46:04 -08:00
Alena Prokharchyk f9b31e895a Fixed unittest 2011-11-11 14:32:25 -08:00
Alena Prokharchyk 2b04d0f6ff Fixed test client 2011-11-11 14:32:25 -08:00
prachi 20e53ce90f - fixing updateProvider to throw error when the underlying element is not ready
- not use includingRemoved while listing networks
- Processing checkNetworkCommand dummy method to avoid failures connecting to Vmware and hyperv resource
2011-11-11 14:20:46 -08:00
Alex Huang ddbcd01f56 fixed up unit test 2011-11-11 14:15:13 -08:00
Alena Prokharchyk 9ca379fc61 Changes to updateNetwork command:
* update network with new networkOfferingId only after the network is shutdown
* fixed NPE happenining when updateNetwork with the networkOffering w/o soucrceNat service in Advance zone
2011-11-11 14:06:42 -08:00
Sheng Yang cdfac9a5e1 NaaS: Fix UUID of virtual router providers 2011-11-11 13:42:19 -08:00
prachi da846e9c08 Adding UUID to new entities and API commands. PhysicalNetwork, PhysicalNetworkTrafficType, PhysicalNetworkServiceProviders changed. 2011-11-11 13:23:23 -08:00
Alena Prokharchyk daec18b4ae All default network offerings come as Enabled by default 2011-11-11 11:56:10 -08:00
Alena Prokharchyk 08160fa882 Fixed responsename for VirtualRouter element 2011-11-11 11:03:01 -08:00
Naredula Janardhana Reddy f1b99f4f07 Revert "bug 10617: merging code from branch bug10617"
This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
2011-11-11 20:23:26 +05:30
Abhinandan Prateek b793ce6c33 bug 11987: changing virtualmachineimpl to reoccuring listener
reviewed-by: nitin
2011-11-11 19:24:09 +05:30
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account -
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
2011-11-10 18:34:56 -08:00
Sheng Yang 7adedca8a3 NaaS: Update listVirtualRouterElements to accept nspid as parameter
Also fix VirtualRouterProviderResponse by adding objectName.
2011-11-10 17:26:11 -08:00
frank 66645ec478 Bug 11933 - Unable to add Primary Storage (OCFS2) to a OVM Cluster
Don't allow character beyond [A-Z0-9] in OCFS2 cluster name
it is not allowed by OCFS2 configure script

reviewed-by: edison
2011-11-10 17:07:06 -08:00
Sheng Yang 8b9b2d0f1a Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
Conflicts:
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
2011-11-10 16:40:54 -08:00
Sheng Yang bde1f6d2de Merge branch 'networkasservice'
Conflicts:
	api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
	api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	setup/db/create-schema.sql
2011-11-10 16:36:08 -08:00
Alena Prokharchyk 88cdd9f2cf removed unused fields from networkVO 2011-11-10 16:28:42 -08:00
Edison Su 6d5c27c1e3 bug 11981: upgrade snapshot version number from 2.1 to 2.2 if it's a root volume
status 11981: resolved fixed
Reviewed-by: Anthony
2011-11-10 16:22:37 -08:00
Alena Prokharchyk a1e247ad03 Renamed the field in NetworkOfferingVO 2011-11-10 16:13:31 -08:00
Alex Huang 3ecceedf34 Changed to use resource manager 2011-11-10 15:50:08 -08:00
Alex Huang d6c22c42fe Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-11-10 15:26:39 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Murali Reddy 122b62066a bug 11817: NAAS: device allocation logic
- adding a allocation state to device
 - change device allocation logic based on network offering  and device state
2011-11-10 09:55:23 -08:00
Naredula Janardhana Reddy 02adbd4bd3 bug 10617: merging code from branch bug10617 2011-11-10 15:23:48 +05:30
Abhinandan Prateek a2499c9e69 bug 11910: during full sync ignoring VMs which have been into starting state shortly
reviewed-by: kishan
2011-11-10 12:00:10 +05:30
Sheng Yang 4ea3aaeb18 NaaS: Add checking for gateway service in update network offering 2011-11-09 19:14:16 -08:00
Sheng Yang 5c1773dd26 NaaS: Add response for VirtualRouterProvider 2011-11-09 18:52:34 -08:00
Murali Reddy 53a636518f NAAS: changing sharedsourcenat capability to sourceNat service and changin serviceCapablityList parameter to one level map 2011-11-09 18:44:18 -08:00
Sheng Yang 47114af94b NaaS: Add redundant capability for Gateway service 2011-11-09 17:09:46 -08:00
Sheng Yang bc86800d30 NaaS: Remove Redundant Virtual Router element
Would use capability instead.
2011-11-09 17:09:38 -08:00
Sheng Yang d6d878c250 NaaS: Refactor capability map of network offering 2011-11-09 17:09:30 -08:00
Sheng Yang c3c6e4f57a NaaS: Remove unused code 2011-11-09 17:09:23 -08:00
Sheng Yang 9b8f96c06d NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER 2011-11-09 17:09:17 -08:00
Alena Prokharchyk 79e13ec3f7 Added support for listing networks based on the supported services information 2011-11-09 16:41:15 -08:00
Alena Prokharchyk 0228bca0c2 Use type instead of guestType in network API response (just the way it was done in 2.2.x) 2011-11-09 15:29:13 -08:00
Sheng Yang 29fbb8fa5a NaaS: Add check for domr start up command
DomR may only responsible for a part of them, determined by the service DomR
provided.
2011-11-09 15:24:43 -08:00