Commit Graph

4139 Commits

Author SHA1 Message Date
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
Sheng Yang 0876cbeda7 NaaS: Rename VirtualRouterProviderType 2011-11-09 15:24:28 -08:00
Sheng Yang c09b2b94b3 NaaS: Add ElbVm to Virtual Router Provider 2011-11-09 15:23:33 -08:00
Sheng Yang be72d81529 NaaS: Make element.prepare() contain only prepare, not DHCP or userdata apply 2011-11-09 15:23:25 -08:00
Sheng Yang 8616705293 NaaS: Add getPhysicalNetworkId() 2011-11-09 15:23:13 -08:00
Sheng Yang b569a11e45 NaaS: Add DHCP and userdata service provider 2011-11-09 15:23:06 -08:00
Sheng Yang 58568db1d0 NaaS: Use provider() instead of explicit isRedundant flag 2011-11-09 15:23:01 -08:00
Sheng Yang b85744859f NaaS: Set new added virtual router element enabled by default 2011-11-09 13:56:35 -08:00
Alena Prokharchyk 3c3cf26f64 Fixed API doc problem 2011-11-09 13:27:35 -08:00
Alena Prokharchyk 8d128fa737 bug 11573: made network wait timeout configurable
status 11573: resolved fixed
reviewed-by: Alex Huang

Conflicts:

	setup/db/db/schema-2212to2213.sql
2011-11-09 13:14:27 -08:00
Murali Reddy aaf3b99228 NAAS: fixing NPE in createnetworkoffering with out service capabilities specified 2011-11-09 11:51:04 -08:00
Edison Su 44218ef07c bug 11919: if volume is dettached, instance id is null
status 11919: resolved fixed
Reviewed-by: frank
2011-11-09 10:43:32 -08:00
Alena Prokharchyk 9ae3dffee4 bug 11924: don't return ISO entries where removed != null
status 11924: resolved fixed
reviewed by: Will Chan

Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2011-11-09 09:42:31 -08:00
Alex Huang 0353133369 Added ways to acquired ip to network guru 2011-11-09 09:37:22 -08:00
kishan e331e1c80f bug 10285: Throw exception when loadbalancer API fails
status 10285: resolved fixed
2011-11-09 18:52:55 +05:30
Naredula Janardhana Reddy 00ea2a5995 bug 11590:
reviewed-by: Abhi

Summary of Changes:
 while adding a primary address to the domR interface, previous primaray addresses(ip) are removed and added as with 32-bit netmask.
   This is to avoid two same ip's with different netmask attached to the interface.
2011-11-09 16:44:47 +05:30
Nitin e2e7da3ff4 bug 11428: Under VMware with current version, for snapshot related related operations,
1) if snapshot is originally created from root volume, allow only CreateTemplateCommand from snapshot 2) if snapshot is originally created from data volume, allow only CreateVolumeCommand from snapshot Reviewed by - Kishan
status 11428: resolved fixed
2011-11-09 16:33:09 +05:30
kishan 507bc20c03 bug 11938: Removed unique constraint on usage_network_offering table.
status 11938: resolved fixed
reviewed-by: Abhi
2011-11-09 16:28:22 +05:30
kishan 2a620fa5ed bug 10286: When router API fails, throw error instead of returning null
status 10286: resolved fixed
2011-11-09 15:02:43 +05:30
Alena Prokharchyk 50cf9cb8fb Removed unused code 2011-11-08 15:54:56 -08:00
Alena Prokharchyk 3aff7f00ff Re-create serviceProvider map when network is updated 2011-11-08 14:55:06 -08:00
Alena Prokharchyk 9c09c35fa5 Fixed incorrect exception method 2011-11-08 14:55:06 -08:00
Murali Reddy db991dd8f6 NAAS : adding support for service capabilities to be specified as part of network offering 2011-11-08 13:01:44 -08:00
Alena Prokharchyk eac54e3ad4 Don't allow to upgrade networkOfferingId and networkDomain for Shared network offerings 2011-11-08 12:33:28 -08:00
Alena Prokharchyk 5e6fedb7ff Removed unused code 2011-11-08 10:36:29 -08:00
kishan 606779b300 bug 11851: When Add VPN user fails, remove the user entry from db instead of leaving in Add state.
status 11851: resolved fixed
reviewed-by: Abhi
2011-11-08 15:56:16 +05:30
Alena 0785b64306 bug 11923: don't expose command name in the exception response when command is not available
status 11923: resolved fixed
reviewed-by: Will Chan
2011-11-07 18:00:33 -08:00
Kelven Yang 9489d6ffeb 1) Fix a serialization problem in command inherits AsyncCreateCommand.
2) Deal with special IDs (i.e. -1) in UUID translation
2011-11-07 18:00:14 -08:00
alena 3a845d2d75 Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created) 2011-11-07 16:16:03 -08:00
prachi 810f9e4034 While creating Zone, adding default VirtualRouter provider and instance to the default Physical Network.
Also adding default trafficTypes to through server-setup.xml
2011-11-07 14:43:41 -08:00
frank d6db4a686e Bug 11313 - Add an account param/detail/map in the XXXAccount API calls
status 11313: resolved fixed
2011-11-07 14:24:36 -08:00
alena b55211d4da Removed unused methods 2011-11-07 11:27:28 -08:00
alena 104ed0a2a2 Direct network guru takes care of only sourceNatDisabled networks in Advance zone 2011-11-07 10:54:19 -08:00
alena 6dcc1691a1 Added missing guest type to the network response 2011-11-07 10:53:28 -08:00
alena 2ef551874a Fixed Direct Account specific network creation 2011-11-07 10:53:28 -08:00
alena 17a7b7cda4 listNetworkOfferings: added an ability to filter based on the Services supported 2011-11-07 10:53:28 -08:00
alena 7aab227b37 Added one more default network offering - with guestType=Isolated and with DNS/DHCP/USERDATA services supported 2011-11-07 10:50:42 -08:00
Nitin 62e89dc132 bug 11778: Make sure that there exist no PF/LB rules before enabling static nat on an ip and vice versa. Reviewed by - Jana
status 11778: resolved fixed
2011-11-07 17:11:15 +05:30
prachi dce0bfd558 Fixing VirtualRouterElement and RVR to not use forceShutdown 2011-11-04 18:06:35 -07:00
prachi 5f93665a30 - Send network labels to hypervisor recource during processConnect
- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations
2011-11-04 17:57:05 -07:00
Sheng Yang 1f387b298d NaaS: Fix NPEs 2011-11-04 17:47:13 -07:00
Kelven Yang 2b6f3d458e UUID support for XML responses 2011-11-04 17:38:22 -07:00
anthony 92f4a88c68 Swift : list template in secondry storage as well 2011-11-04 16:40:42 -07:00
Sheng Yang 3051dc2621 NaaS: Discard DhcpElement
VirtualRouterElement would do all the job. The difference would be public
network enabled or not.
2011-11-04 14:13:55 -07:00
Chiradeep Vittal c37ecc2ebd bug 11336: better message 2011-11-04 11:35:57 -07:00
Chiradeep Vittal 81a9e05b39 bug 11336: limit the number of outstanding messages sent to a host to conserve memory 2011-11-04 11:35:57 -07:00
kishan f40dcbd82e bug 11851: While adding new Vpn user, exisitng users state will remain as Active and still be re-added
status 11851: resolved fixed
2011-11-04 13:58:14 +05:30
Sheng Yang 3e4b83db86 Fix NPE in finalizeStart()
The command can be only failure Answer, rather than CheckSshAnswer or
GetDomRVersionAnswer, then casting may fail.
2011-11-03 18:21:19 -07:00
Sheng Yang 4a4abac141 NaaS: Fix virtual router element id filling
The physical network ID can be null in basic mode
2011-11-03 18:21:14 -07:00
Murali Reddy f58eab684f bug 11817: NAAS: extenal LB/firewall device support
- guest network to device mapping using first fit allocation when there are multiple instance of provider in a physical network
2011-11-03 18:04:51 -07:00
alena 5d47d024c1 Only ROOT/Domain admins and users belonging to the project can list project users 2011-11-03 17:59:59 -07:00
alena 809ad8ce23 Fixed listProjects for regular user 2011-11-03 17:28:42 -07:00
Kelven Yang f9144e1bf0 Throw exception instead of returning null 2011-11-03 17:08:24 -07:00
Kelven Yang d9c41df1a1 Make console proxy support UUID 2011-11-03 16:24:08 -07:00
frank 0ad145cc94 Bug 11808 - Allow additional non-default virtual networks
when isDefault is null, for virtual network set defaut to true, false for direct network
2011-11-03 15:11:39 -07:00
Sheng Yang 3de3fc69d2 NaaS: Implement shutdownProviderInstances for virtual router 2011-11-03 13:44:26 -07:00
alena 1fe3bc066b Allow disassociating sourceNat ip address when SourceNat service is not supported by corresponding network any longer (can be disabled during the network offering upgrade) 2011-11-03 11:45:45 -07:00
Murali Reddy 7b51782163 bug 11817: NAAS: extenal LB/firewall device support
-introducing the notion of capacity of LB device
 -managing network to device mapping
2011-11-03 11:19:55 -07:00
alena 6882cf8fd5 Cleaned up unused code that was commented out 2011-11-03 11:06:47 -07:00
frank 92edf56ccc Bug 7883 - Add support to allow admins to sort templates, isos, offerings...
status 7883: resolved fixed
2011-11-03 10:54:00 -07:00
alena 9e753c2157 specifyVlan is true for Shared (Direct) network offering 2011-11-03 10:53:19 -07:00
alena 9e5a733a34 Fixed NPE in updateNetwork - userCaller wasn't passed in to restartNetworkElements call 2011-11-03 10:53:19 -07:00
Kelven Yang f5d56b3d5d Fix problems caused by merging 2011-11-03 10:35:25 -07:00
Kelven Yang 7e9b210d5c bug 6745: Fix problems in Async create commands 2011-11-03 07:34:02 -07:00
Kelven Yang 79e39c20fb Fixes on merged result 2011-11-03 07:34:01 -07:00
Kelven Yang 924e556c95 bug 6745: Using UUID instead of integers - for all commands 2011-11-03 07:34:00 -07:00
Kelven Yang 8d8775b533 bug 6745: Using UUID instead of integers - for Async Jobs 2011-11-03 07:33:58 -07:00
Kelven Yang 6f14bdc361 bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
Kelven Yang fa2dd8e93a bug 6745: Using UUID instead of integers - for VM instances 2011-11-03 07:33:56 -07:00
Abhinandan Prateek fab2d1f880 bug 11678: added vm.destory.forcestop config var to set force when destroying a vm 2011-11-03 15:51:02 +05:30
Abhinandan Prateek 267b12d015 bug 11709: saving encrypted password in db
status 11709: resolved fixed
2011-11-03 15:40:20 +05:30
Sheng Yang 4a960f2912 NaaS: Update VirtualRouterElement on StaticNat and PortForwarding services 2011-11-02 19:26:42 -07:00
Sheng Yang 29b19db152 NaaS: Fix createNetworkOffering with multiply service providers 2011-11-02 19:08:49 -07:00
Sheng Yang b646f07f9c NaaS: Add back service offering ID for network offering
It would be used to adjust service offering of virtual router
2011-11-02 19:08:37 -07:00
anthony b4f8c85f20 Swift: add Swift Manager 2011-11-02 18:45:55 -07:00
Edison Su 6841e265d3 bug 10330: finally merge Rommer's CLVM patch
status 10330: resolved fixed
2011-11-02 18:03:58 -07:00
alena 3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00
alena f42c9e434f Basic zone: the System Guest network offering can be created from any Shared Guest network offering.
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
2011-11-02 15:44:53 -07:00
Sheng Yang 3fc9b149e4 NaaS: Add portforwarding and staticnat service provider
Make them service rather than capability of firewall. Now firewall only means
open/close the port.
2011-11-02 15:18:39 -07:00
frank b643a9a4be Bug 11808 - Allow additional non-default virtual networks
completed Java code change, need UI change in line with
2011-11-02 14:36:45 -07:00
alena 4ce2bf2f89 SourceNat service is supported for Isolated network offerings only 2011-11-02 11:52:23 -07:00
kishan 765e46d3a7 bug 11770: throw error when account is not found in default root domain
status 11770: resolved fixed
2011-11-02 15:11:47 +05:30
anthony 09d89b3dc3 add more logs 2011-11-01 19:34:39 -07:00
frank 086e7cf7b8 Bug 11646 - OVM - volume > download volume failed for both ROOT and DATA volumes
return volume name instead of full path to ingratiate mgmt server's bad name convention
2011-11-01 18:14:38 -07:00
prachi 6aa743165a Changes to support Enable/ Disable services of a service provider added to physical network:
- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider.
2011-11-01 18:03:55 -07:00
alena 2250dff349 1) Removed tags from the network object
2) Get hypervisor tags from the physical network instead.
2011-11-01 17:42:06 -07:00
Alex Huang da78937d30 Removed some useless methods 2011-11-01 16:57:22 -07:00
frank 45b41e4603 Disable baremetal fullsync
*    Disable sync until we find a way that only tracks status but not does action
   *
   *    The scenario is: Baremetal will reboot host when creating template. Given most
   *    servers take a long time to boot up, there would be a period that mgmt server finds
   *    the host is stopped through fullsync. Then mgmt server updates database with marking the host as
   *    stopped, after that, the host comes up and full sync then indicates it's running. Because
   *    in database the host is already stopped, mgmt server sends out a stop command.
   *    As a result, creating image gets never happened.
2011-11-01 16:46:19 -07:00
alena 9560e92015 physicalNetworkId is optional in createNetwork api. Works as follows:
* can be specified for Shared network only
* if not specified for the Shared networks, try to locate it based on the zoneId and tags. If tags is not null, pick up first physicalNetwork from the zone that has matching tags. If tags is null, and there are none/more than 1 physical netwroks in the zone, error out.
2011-11-01 15:49:39 -07:00
frank 56d3d04db4 Baremetal: bypass HA, only track VM status 2011-11-01 15:14:16 -07:00
alena caefd11d2c Network offering upgrade is allowed for Isolated networks only 2011-11-01 13:13:01 -07:00
alena be21a5e37c Don't allow enabling securityGroup service for Isolated networks 2011-11-01 13:09:14 -07:00
alena 346a6fe80a Fixed NPE. 2011-11-01 12:07:32 -07:00
alena 80dc2c0b1a Don't send security group commands to the backend when 1) securtiy group service is disabled in the network offering and 2) security group service provider is supported on the physical network 2011-11-01 12:07:32 -07:00
kishan a4e5e4de45 bug 11796: Catch all exceptions in network usage task and never exit the thread
status 11796: resolved fixed
2011-11-01 20:36:29 +05:30
kishan b1f78bca25 bug 5822, 10783: Use encryption/decryption for queries which use sql directly
status 5822, 10783: resolved fixed
2011-11-01 19:30:00 +05:30
kishan b40742fdae 30 premium upgrade should extend regular upgrade 2011-11-01 18:51:04 +05:30
kishan 18ef8ca3b4 bug 11173: Added usage for VPN users
status 11173: resolved fixed
2011-11-01 17:01:48 +05:30
Sheng Yang a43364f0a4 NaaS: Rename virtual_router_elements to virtual_router_provider 2011-10-31 15:59:53 -07:00
Sheng Yang cd3fbf0548 NaaS: Create AddVirtualRouterElementCmd
As DhcpElement/VirtualRouterElement/RedundantVirtualRouterElement is decided to
be the service provider of the physical network, this API should be called to
add a new element, with correlated network service provider ID.

Then e.g. ConfigureVirtualRouterElementCmd should be called to configure and
enable the element.
2011-10-31 15:59:44 -07:00
Sheng Yang 00bb63ac67 NaaS: Remove separate configuration fields for virtual router elements
The fields are duplicated with network offerings.
2011-10-31 15:59:36 -07:00
Sheng Yang 928fc64ebc NaaS: Enable VirtualRouterElement to deal with service separately 2011-10-31 15:59:31 -07:00
frank 09fc1be631 revert wrong fix of 24bcb4ddf210fbd4ca6032bb5aa6bd02f7480a73 that built-in templates can not be found
The root cause is we didn't return SSVM in connecting status when doing template sync
2011-10-31 15:26:44 -07:00
anthony 46dac852fa Merge branch 'swift'
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
anthony 2f1e5504fb Revert "handle empty snapshot correctly"
This reverts commit 99f985783e960d1ef8712c8ff724862f688b461e.
2011-10-31 14:30:09 -07:00
prachi 549c7d2ef9 Added NetworkElement API's isReady() and shutdownProviderInstances() called by NetworkMgr while enabling/shutdown the service provider. 2011-10-31 13:09:54 -07:00
anthony 42a3f0041a handle empty snapshot correctly 2011-10-31 11:42:58 -07:00
anthony 9a668416f8 Swift: List ISO fix 2011-10-31 11:10:28 -07:00
prachi 818df189c5 changes to Create Vlan & Public IPs 2011-10-31 09:53:25 -07:00
Murali Reddy e449067a4a Bug 9831: Implement resourceCount periodic task that would check if the count in resource_count table matches actual resource count
status 9831: resolved fixed

   added a periodic task that does recalculation of counts. By default interval is set to 0, which will be interpreted as not to run task
2011-10-31 18:26:21 +05:30
kishan 284ee3909e bug 9842: Added task to update user stats agg bytes in sync with aggregation range
status 9842: resolved fixed
2011-10-31 17:15:36 +05:30
kishan f34ec52031 Removed unused variable trafficSentinelHostname 2011-10-31 17:13:15 +05:30
Nitin bbbfdd52ec bug 10848: Minor fixes. 2011-10-31 17:00:11 +05:30
Abhinandan Prateek abb37acbdd bug 8962: added usage related and resource count related code, changed the API name as suggested. Incorporated relevant review comments 2011-10-31 16:35:42 +05:30
Abhinandan Prateek 932e3c3a65 bug 11311: incremental checkin 2011-10-31 12:27:17 +05:30
Abhinandan Prateek 07e44e3a23 bug 11311: change list vm call to provide less info 2011-10-30 16:25:57 +05:30
root a572205e3c Revert "bug 11311: vm summary command initial impl"
This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534.
2011-10-30 15:13:58 +05:30
Nitin 2b370ab535 bug 10657: Introducing cluster level global thresholds for cpu and ram so that these resources do not go beyond these thresholds. The reason for this is because, if the admn needs to provide maintenance, they don't have to add new machines or have ones on standby if the entire zone/pod/cluster is at 100% allocated capacity. Also introducing pool level global thresholds for allocated storage. There are other changes like DB upgrade and introduction of transaction. 2011-10-29 16:51:37 +05:30
anthony 4a3deefd02 Swift : template sync fix 2011-10-28 16:49:24 -07:00
anthony 2b039530c0 Swift : list Template 2011-10-28 16:07:31 -07:00
frank fec9cc86af allow multiple clusters for baremetal 2011-10-28 13:47:21 -07:00
frank 1ef620121a Use constant string instead of hard coding in baremetal parameters passing
Conflicts:

	server/src/com/cloud/baremetal/BareMetalDiscoverer.java
2011-10-28 11:07:28 -07:00
Nitin 0d1f89f507 bug 10530: Add vmid in the logs 2011-10-28 23:36:07 +05:30
Nitin 5ffbf711fe bug 11739: Fix typo 2011-10-28 23:33:52 +05:30
alena 7b982efeaa Fixed Advance zone creation with security group enabled 2011-10-28 10:24:37 -07:00
alena 6445bf4c49 Added services/capabilities to the SecurityGroupElement 2011-10-28 09:52:40 -07:00
Abhinandan Prateek f456462443 bug 11311: vm summary command initial impl 2011-10-28 14:07:19 +05:30
Abhinandan Prateek 3cb1426a6c bug 10588: sending cluster sync only for xen 2011-10-28 11:39:22 +05:30
frank d1084bb383 fix unable to find built-in template 2011-10-27 19:19:19 -07:00
alena b413a625f4 1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command
2) Added deleteProjectInviation command. Can be executed by project admin only
2011-10-27 18:32:00 -07:00
frank eb0fdc2925 allow multiple clusters for baremetal planner
fix build
2011-10-27 17:46:54 -07:00
prachi 1583211352 Fixing build after removing physicalNetworkId from createvlanIpRangeCmd 2011-10-27 17:42:42 -07:00
frank c81477a25c allow multiple clusters for baremetal planner
Conflicts:

	server/src/com/cloud/deploy/BareMetalPlanner.java
2011-10-27 17:39:14 -07:00
prachi 6d5601a84d Added commands and framework for PhysicalNetwork trafficTypes 2011-10-27 17:32:15 -07:00
alena d315e57b0e Renamed "type" to "guestType" 2011-10-27 16:51:42 -07:00
alena fe0b685e95 Security group is a service now 2011-10-27 16:49:20 -07:00
alena 71b53a3432 Made isSharedSourceNatService a capability of SoureNatService 2011-10-27 16:49:20 -07:00
Sheng Yang 02ada73d89 NaaS: Make applyIp() as a function of FirewallServiceProvider 2011-10-27 16:45:40 -07:00