61 Commits

Author SHA1 Message Date
frank
18f87c2108 Merge branch 'cvm' into 2.2.y
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
Chiradeep Vittal
924961d898 merge nectarine 2011-08-08 21:45:37 -07:00
alena
06d007337a bug 10561: intermidiate checkin for FirewallRuleFeature
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
2011-08-08 20:59:40 -07:00
Chiradeep Vittal
8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
frank
c6fba0fd42 Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
alena
8d47c53735 Revert "bug 10435: removed vpn feature"
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2011-08-02 18:12:57 -07:00
frank
37fc68bcd3 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:47:09 -07:00
frank
1381c58fa1 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:32:12 -07:00
Chiradeep Vittal
b829cde18f track ip to vm mapping 2011-07-27 12:00:08 -07:00
Chiradeep Vittal
cd8e069f80 Acquire an ip and launch an ELB vm 2011-07-27 12:00:07 -07:00
alena
74f34a0e0c bug 10435: removed vpn feature
status 10435: resolved fixed
2011-06-24 09:18:46 -07:00
Alex Huang
dc605655a0 removed useless manager declarations 2011-06-20 16:20:48 -07:00
Alex Huang
44d15d38b0 bug 10222: fixed issue with associate ip introduced more than one nic. The problem is that associate ip automatically creates a nic but doesn't have sufficient information to properly creates so it uses what it knows for sure is the naming pattern to do it. However, we changed the naming pattern and it broke. I fixed it by passing all of the information in the ipaddressTO object. 2011-06-11 13:45:00 -07:00
alena
55692fd7cf bug 9127: intermediate checkin for agent load balancer 2011-05-24 18:45:00 -07:00
Alex Huang
5ce631e9d7 Separated resource management and agent management code. It's not all done but at least we make a first step 2011-05-16 10:55:18 -07:00
Abhinandan Prateek
d752a94838 bug 8115: Source IP filtering in Virtual Router
Passing the additional source cidrs paramter to the xapi.
2011-05-12 13:37:43 +05:30
anthony
2d52813ff2 fixed build /start management server 2011-05-05 16:12:19 -07:00
prachi
86b386e8c0 Merging changes from zonesfeature branch for Bug 8026 - discern proper cluster/pod/zone for added host (and refactor AgentManagerImpl)
- CreateZone API creates a zoneToken, inserts in DB and returns it in the
response

- UpdateZone API takes in 'details' map that is loaded to data_center_details
2011-04-28 23:08:58 -07:00
Frank
ef10dab968 Intrdouce adapter to template manager
small fix
2011-04-27 14:04:37 -07:00
Frank
504eb25c37 Intrdouce adapter to template manager. 2011-04-27 14:04:37 -07:00
Kelven Yang
e69774e13a Add console proxy management state, support certificate upload, all done except UI 2011-04-21 18:46:37 -07:00
Kelven Yang
1b9cbd9166 bug 9223, 9224: persist runid to form cluster session, based on cluster session and DB condition to issue isolation notification for self-fencing 2011-04-13 15:13:54 -07:00
Alex Huang
2230c24ab3 check in changes from 2.2.4 2011-04-05 11:01:35 -07:00
Alex Huang
075fba5899 stackmaid is now taskmanager 2011-04-05 10:17:22 -07:00
alena
e9a10c53dc bug 8831: added 2 new parameters to create/listNetworks api: "isdedicatedtodomain" and "dedicateddomainid" 2011-03-22 10:17:08 -07:00
Alex Huang
d7e0f8dcc1 db upgrade 2011-03-19 10:33:13 -07:00
Alex Huang
d3ecf719ce looks like everything is working except for snapshots 2011-03-18 09:14:05 -07:00
Alex Huang
8bec1e0b9f added the concept of system integrity checking before a system starts 2011-03-16 17:59:34 -07:00
Frank
6c819c1491 Merge branch 'bareMetal'
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/offering/ServiceOffering.java
	api/src/com/cloud/vm/UserVmService.java
	client/tomcatconf/components.xml.in
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/service/ServiceOfferingVO.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-03-08 14:18:11 -08:00
Frank
20a7d95c06 Bug 8208 - bare metal provisioning
make an individual package and move to premium
2011-03-08 10:45:50 -08:00
Edison Su
53eb46dc2a Add local storage support for kvm 2011-03-01 19:51:43 -05:00
Alex Huang
378a0da0df more unittest support 2011-02-25 11:58:12 -08:00
Frank
f82dec999d Bug 8208 - bare metal provisioning
complete createVirtualMachine method
2011-02-24 14:07:10 -08:00
Kelven Yang
8695e7250c Update template and storage manager to allow hypervisor based command delegation 2011-02-18 11:37:50 -08:00
Frank
24e4c885e2 load cluster managers 2011-01-28 18:06:57 -08:00
abhishek
5d18c4c527 bug 8242: introducing the concept of work queue for storage; introducing storage states as opposed to using host states; using row locks as opposed to db table locks
status 8242: resolved fixed
2011-01-28 13:43:36 -08:00
anthony
96d9776c20 remove preallocatedLun 2011-01-28 12:36:31 -08:00
Edison Su
fc97034000 refactor vmstatelistener 2011-01-26 11:01:43 -05:00
Frank
276e37115b open vswitch - Implement gre tunnel based network that doesn't use vlan
it allows cross zone communication and no 4096 limitation introduced by vlan
2011-01-21 17:32:02 -08:00
Ragnar B. Johannsson
83b3580c32 Merge branch 'master' of git.cloud.com:/var/lib/git/cloudstack-oss
Conflicts:
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/vm/UserVmVO.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2011-01-12 17:06:08 +00:00
Ragnar B. Johannsson
3e59707dd2 Added user_vm_details table and corresponding access objects.
Moved saved encrypted passwds for getVMPassword API cmd to this new table.
Removed SSH keypair id from UserVm - only public key is needed.
2011-01-12 16:32:36 +00:00
Frank
c6683c2eab bug 7722: open vswitch -
refine ovs plugin, create a separate plugin instead of messing with vmops
refine gre tunnel, maintains tunnel in database instead of plugin
fix an arp issue cause by overlap vlan range
2011-01-11 02:55:36 -08:00
Frank
c94b6acadf bug 7722: open vswitch - works at VM start time, need fullsync() and flow clean in next 2011-01-08 16:22:59 -08:00
Frank
5c01c42ba7 fix bug 7722, code complete basic architecture 2011-01-08 16:20:39 -08:00
Alex Huang
6dc922408d unit test working 2011-01-07 13:42:43 -08:00
Alex Huang
e496a99c1c added processing for events 2011-01-07 13:42:43 -08:00
Ragnar B. Johannsson
32c68e1583 API cmds for SSH-keys manipulation and VM passwds retrieval.
These include five new API cmds as well as changes to deployVirtualMachine to
specify an optional name of an SSH key to pass to the VM when starting. When
an SSH key is specified with a password-enabled template the newly created
password is encrypted with the SSH public key and can be retrieved via the
getVMPassword cmd. It is then the user's responsibility to decrypt retrieved
passwords with the correct SSH private key.
2011-01-06 13:34:07 +00:00
Kelven Yang
6ebdafd4c3 Add vmware cluster will automatically bring in all hosts under the cluster 2011-01-04 04:12:47 -08:00
Alex Huang
544fa7ff1b remote access vpn, user ip address changes 2010-12-29 09:32:54 -08:00
kishan
a7626fc991 bug 7504: Added usage events 2010-12-22 12:28:05 +05:30