Commit Graph

61 Commits

Author SHA1 Message Date
Murali Reddy 73e6efdecd - changes to publish UUID instead of id's in the event message
- action, usage events will publish resource name, resource UUID in the
  message
2013-01-27 03:07:26 +05:30
Murali Reddy ffd55c4ee1 Merge branch 'master' into events-framework
Conflicts:
	client/tomcatconf/components.xml.in
2013-01-25 14:26:41 +05:30
Koushik Das 070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
Murali Reddy 28738e4e22 Merge branch 'master' into events-framework
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
2013-01-18 12:07:19 +05:30
Murali Reddy 053831b0aa Merge branch 'master' into events-framework
Conflicts:
	api/src/com/cloud/network/Network.java
	plugins/pom.xml
	server/pom.xml
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
2013-01-17 23:56:37 +05:30
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
Chiradeep Vittal 5a830c4db0 Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.
NetworkManager's exclusive focus is now
 - handling plugins during orchestration, and
 - to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
Min Chen 98b022a430 Remove IdentityProxy from plugin response classes.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-19 13:09:02 -08:00
Rohit Yadav e398b1e47a api: Refactor command and response classes to org.apache.cloudstack.api.*
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 19:23:24 -08:00
Rohit Yadav af28c06998 api: move and group all under command, org.apache.cloudstack.command.*
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 18:30:54 -08:00
Rohit Yadav 8773fc2a55 api_refactor: refactor volume apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:20:48 -08:00
Rohit Yadav add1b9b055 api_refactor: refactor register apis
- Split register apis across template, iso and ssh pkgs
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:54:19 -08:00
Rohit Yadav 3e0b2164be api_refactor: refactor template apis
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:05:44 -08:00
Rohit Yadav e0b4430070 api_refactor: refactor iso apis
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:01:29 -08:00
Rohit Yadav 6fc3bc3760 api_refactor: refactor vpn and vm apis
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
Murali Reddy 9c40bb4f1b moving usage event persiste code to single place so as to make it easier to use it for to publish to external systems 2012-09-17 01:01:55 +05:30
Edison Su 7a0a9231c3 Move KVM related code into plugins/hypervisor/kvm, a new jar file is
created: cloud-kvm.jar
2012-07-30 14:55:47 -07:00
kishan 9611a017e9 bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
Chip Childers 8f71a2927f License header updates for the server folder. 2012-07-02 08:58:10 -04:00
Murali reddy 550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
Alena Prokharchyk 2d1a6b0b35 bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts
status 14615: resolved fixed
2012-04-06 11:30:48 -07:00
Alena Prokharchyk c0130a5c41 Code cleanup for createVlanRange api 2012-04-04 15:03:04 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Vijayendra Bhamidipati 005ba5e2b5 Bug 13127: API error text refer to database ids instead of uuids
Description:

	Adding overloaded addProxyObject() function to CloudException
	and RuntimeCloudException classes and using this function
	to stuff exceptions with IDs, to reduce code footprint.
2012-03-15 16:27:52 -07:00
Vijayendra Bhamidipati 768d7a2a26 Bug 13127: API error text refer to database ids instead of uuids
Description:

1)	Moved RuntimeCloudException from api/ to utils/.

	Added simple constructor to RuntimeCloudException.

	Modified all classes that extended RuntimeException
	to extend RuntimeCloudException. These classes
	are listed below:

		ServerApiException
		CloudAuthenticationException
		CloudExecutionException
		AsyncCommandQueued
		HypervisorVersionChangedException
		RuntimeCloudException

2)	Added overloaded constructed to CloudException.
	Modified all classes that extend Exception to extend CloudException instead.
	These classes are listed below:

		ConcurrentOperationException
                ConflictingNetworkSettingsException
                ConnectionException
                DiscoveryException
                InsufficientCapacityException
                ManagementServerException
                ResourceUnavailableException
                VirtualMachineMigrationException
                AgentControlChannelException
                OperationTimedoutException.java
                UnsupportedVersionException.java
                UsageServerException.java
                UnableDeleteHostException.java
                AgentAuthnException.java
                HttpCallException.java
                ActiveFencingException.java
                ClusterInvalidSessionException.java
                GreTunnelException.java
                OvsVlanExhaustedException.java
2012-02-27 17:54:53 -08:00
U-CITRITE\vijayendra1 698c1ebe12 Bug 13127: API error text refer to database ids instead of uuids
Description:

1)	Adding two new classes, CloudException and RunTimeCloudException.
	The former extends Exception and the latter RunTimeException.
	These will be used by classes that formerly directly extended
	Exception and RuntimeException. These two classes have an attribute
	of type IdentityProxy to enable exceptions fill in db ids in separate
	attribute fields rather than in a string. Doing so will allow the
	serialization module (GSON for JSON and other for XML) to kick in
	and convert this db id to a uuid in ApiServer.java just before the
	JSON/XML responses are sent out.

2)	Moving IdentityProxy.java from api/ to utils/ since
	both CloudException and RuntimeCloudException refer to it.

3)	Changing references to IdentityProxy class from api/ to utils/.

4)	While rebasing to master, a new file was added, merging
	api/src/com/cloud/api/response/IsoVmResponse.java to this diff.
2012-02-27 17:54:50 -08:00
frank a1fa313902 Bug 13568 - secondary storage VM's static route for nfs server breaks things!
status 13568: resolved fixed
reviewed-by: Sheng Yang
2012-02-17 16:24:32 -08:00
Alena Prokharchyk 83400cd15f bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
frank f449cd7350 Bug 12771 - management-server.log displays ipmi related credentials in plain text
status 12771: resolved fixed
2012-01-09 14:42:01 -08:00
kishan 5dc4a70b90 Bug 12850: Allow accounts in child domains to create Vms in zones owned by parent domain
Status 12850: resolved fixed
Reviewed-By: Abhi
2012-01-09 19:32:26 +05:30
Alena Prokharchyk ceb0a918a1 createTemplate/createSnapshot for project - allow to execute for Projects in Active state only 2011-12-19 16:20:40 -08:00
Alena Prokharchyk bba8e941ce bug 10804: Another fix for defaultNetwork feature - get the default Dhcp server IP from the domR's nic in vm's default network instead of getting it from the "gateway" field of the vm itself 2011-12-05 14:53:46 -08:00
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
frank 6a7d99fc77 Bug 12219 - Cant add baremetal host
status 12219: resolved fixed
2011-11-29 11:46:46 -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
Kelven Yang 277c60e4f6 bug 11814: Allow template to have details info in key/value pairs. 2011-11-15 15:01:46 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Kelven Yang 2b6f3d458e UUID support for XML responses 2011-11-04 17:38:22 -07:00
alena 3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -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
frank 56d3d04db4 Baremetal: bypass HA, only track VM status 2011-11-01 15:14:16 -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
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
alena d315e57b0e Renamed "type" to "guestType" 2011-10-27 16:51:42 -07:00
frank cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
frank cfebd04df0 Bug 11805 - Cant add baremetal host
status 11805: resolved fixed
2011-10-25 15:18:55 -07:00
frank 30f95e638a Bug 11522 - New agent manager
1. get rid of host allocation state
2. remove Updating status from agent status
2011-10-24 16:49:32 -07:00
Edison Su 92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
alena c00058adc2 Added type (Shared/Isolated) to the networkOffering/networks 2011-10-13 17:33:41 -07:00