Commit Graph

3608 Commits

Author SHA1 Message Date
alena e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions.
status 11236: resolved fixed
2011-08-24 14:48:35 -07:00
frank 85f18ff256 fix build, add test rpm back 2011-08-24 13:24:51 -07:00
Edison Su 9a6fc7de45 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 11:05:45 -07:00
alena 9544d42908 bug 11060: use lockTable instead of rowLock when createDomR/createDhcp
status 11060: resolved fixed
2011-08-24 11:01:23 -07:00
Edison Su 9a65935809 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 10:48:10 -07:00
Nitin 4b6d072490 bug 10972: Improve logging - put in the hostid and hostname on which the vm launches.
status 10972: resolved fixed
2011-08-24 18:04:46 +05:30
root 01044c5b2d removing spurious debug statement 2011-08-24 16:47:29 +05:30
Abhinandan Prateek bd439831ad bug 11181: batching the select statements 2011-08-24 16:34:28 +05:30
Naredula Janardhana Reddy 470ffcb652 bug 11191:
Added global config to enable/disable rp_filter for domR.
   previous commit: d966906374d4a0cb8fa57326a1f7625c871f64fd

   Test Case-1 :
      1) Set network.disable.rpfilter  global config to true
      2) Restart the domR
      3) check the settings reflected in proc filesystem
           - for public interface like eth2,eth3 : /proc/sys/net/ipv4/conf/eth2/rp_filter should have 0 , and rest other interfaces should have value of 1
   Test Case-2 :
      1) set network.disable.rpfilter global config to false
      2) Restart the domR
      3) check the settings reflected in proc filesystem
           - for public interface like eth2,eth3 : /proc/sys/net/ipv4/conf/eth2/rp_filter should have 1 , and rest other interfaces should also have value of 1
2011-08-24 13:32:07 +05:30
Naredula Janardhana Reddy 145a4aad37 bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces) 2011-08-24 13:30:23 +05:30
frank b3478c377e Full opensource 2011-08-23 19:52:19 -07:00
Sheng Yang fb6fb03175 bug 11214: Don't try to start the running router again
It's very like caused by StartRouterCmd sent to the running router. I can
reproduce it by issue a StartRouterCmd to a running redundant router. And this
patch should the following exception:

Exception: com.cloud.exception.ResourceUnavailableException: Resource
[VirtualNetworkApplianceManagerImpl$$EnhancerByCGLIB$$565b4d45:0] is
unreachable: There are already two redundant routers with IP 10.91.32.126, they
are r-5-VM(5) and r-4-VM(4)

status 11214: resolved fixed
2011-08-23 18:20:34 -07:00
Sheng Yang 2888247b74 Add more debug info 2011-08-23 17:59:54 -07:00
Kelven Yang 4f8a52f94c Move VMware/Premium Secondary storage VM to opensource 2011-08-23 14:43:39 -07:00
alena d3eb9db7fa bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response
status 11204: resolved fixed

Conflicts:

	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
2011-08-23 12:05:53 -07:00
prachi 40d348ff8b Bug 11213 - UserConcentratedPod returning wrong list of pods
Changes:
- Needed to add parentheses to the query to get correct results.
2011-08-23 11:53:48 -07:00
alena c9e60d703d Fixed listNetwork by id 2011-08-23 01:03:40 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y'
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
alena c2732850f4 bug 11202: added "networkRate" param to service offering api responses 2011-08-22 13:35:43 -07:00
alena 0b061529b1 bug 11202: added "networkRate" param to service offering api responses 2011-08-22 13:34:47 -07:00
alena 31a022c720 Added networkRate parameter to createServiceOffering api command
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2011-08-22 12:05:34 -07:00
alena 033765f93f Added networkRate parameter to createServiceOffering api command 2011-08-22 12:02:08 -07:00
alena 0998b04098 Fixed security issue in listNetworks
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2011-08-22 10:51:44 -07:00
alena 20a518f3ac Fixed security issue in listNetworks 2011-08-22 10:50:30 -07:00
prachi 8755044ea9 Merge Bug 11186 from 2.2.8mango
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created

Changes:
- We should not check for the cluster 'allocation_state' while starting an
    existing VM provided it has storage already allocated. But if volumes are
    deleted and new storage needs to be allocated, then we will not allow the
VM
    start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:12:15 -07:00
prachi 3d4767c94c Merge Bug 11186 from 2.2.8mango
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created

Changes:
 - We should not check for the cluster 'allocation_state' while starting an
existing VM provided it has storage already allocated. But if volumes are
deleted and new storage needs to be allocated, then we will not allow the VM
start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:02:09 -07:00
anthony 7084c270d3 reversed funtion parameter 2011-08-19 18:48:49 -07:00
anthony 2e2e550cc4 reversed funtion parameter 2011-08-19 18:41:59 -07:00
frank b607e4aa1c Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y 2011-08-19 17:29:57 -07:00
frank 32ee2dbe2c Remove baremetal specific parameters from AddHostCmd 2011-08-19 17:12:23 -07:00
frank cbbf80cee3 Use class.getSimpleName in ResourceListener 2011-08-19 17:06:58 -07:00
frank 016700737c Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- reconfigure OCFS2 nodes when delete host
2011-08-19 17:06:48 -07:00
frank 7350d12fff Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- use cluster name as OCFS2 cluster name
2011-08-19 17:06:35 -07:00
frank 0f109dd037 Introduce new resource life cycle listener 2011-08-19 17:06:12 -07:00
Edison Su 7a7662b01b fix typo 2011-08-19 16:15:52 -07:00
Edison Su eb72d340e2 fix typo 2011-08-19 16:15:17 -07:00
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
Edison Su 56244c7c47 release the check 2011-08-19 16:07:55 -07:00
Edison Su de25a63ba8 release the check 2011-08-19 16:06:13 -07:00
Edison Su 5696543359 disable attach volume to a vm if volume state is not in allocated or ready state 2011-08-19 14:27:13 -07:00
Edison Su 1c49481305 disable attach volume to a vm if volume state is not in allocated or ready state 2011-08-19 14:26:47 -07:00
Edison Su eada883b5e bug 11183: put volume state into "Creating" state if it's created from snapshot.
status 11183: resolved fixed
2011-08-19 13:46:51 -07:00
Edison Su 8bbed3caea bug 11183: put volume state into "Creating" state if it's created from snapshot.
status 11183: resolved fixed
2011-08-19 13:45:35 -07:00
Abhinandan Prateek 8d4c7208a4 bug 11094: delinking api layer objects from dao layer 2011-08-19 15:23:49 +05:30
Abhinandan Prateek 601708c3e6 bug 11094: delinking api layer objects from dao layer 2011-08-19 15:21:03 +05:30
Sheng Yang 843e41752f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:23 -07:00
Sheng Yang a961dd913f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:13 -07:00
Naredula Janardhana Reddy 4369b0ba96 bug 1067:
- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules.
2011-08-19 11:10:16 +05:30
alena 2c1df02ba1 Removed unused imports 2011-08-18 15:02:04 -07:00
Edison Su df6bee4061 add template for simulator 2011-08-18 11:37:50 -07:00
Edison Su ea102aa045 add host guid in migrate command 2011-08-18 11:03:40 -07:00
Edison Su 1bc7631bf2 finally, test framework works now 2011-08-18 10:51:31 -07:00
Kelven Yang 6349b63942 Use row lock instead of global lock when creating a new domain 2011-08-18 10:42:12 -07:00
Kelven Yang 9c47f6bd94 Use row lock instead of global lock when creating a new domain 2011-08-18 10:41:49 -07:00
alena 0afa6f052f bug 11167: no need to lock account when create security group to ensure that the group name is unique for account. If group already exists in the db, and we try to persist it again, mysql constraint (groupName, accountId) will fail and exception will be thrown.
status 11167: resolved fixed
2011-08-18 10:16:37 -07:00
alena 0cdb67fdc7 bug 11167: no need to lock account when create security group to ensure that the group name is unique for account. If group already exists in the db, and we try to persist it again, mysql constraint (groupName, accountId) will fail and exception will be thrown.
status 11167: resolved fixed
2011-08-18 10:16:20 -07:00
frank 035001bd19 Fix baremetal planner reply to non-baremetal VM when migration 2011-08-18 10:14:40 -07:00
frank 523a32edaa Fix baremetal planner reply to non-baremetal VM when migration 2011-08-18 10:14:16 -07:00
Abhinandan Prateek c2a769d993 fixed execptions while adding second host 2011-08-18 16:28:19 +05:30
Abhinandan Prateek 2df6e5cc69 fixed execptions while adding second host 2011-08-18 16:26:00 +05:30
Kelven Yang fdedbbc00e bug 10834: when VMware host is down, don't try to restat VMs on other host. VMware prohibits VM relocation when host is down 2011-08-17 18:11:55 -07:00
Kelven Yang 97e95fce82 bug 10834: when VMware host is down, don't try to restat VMs on other host. VMware prohibits VM relocation when host is down 2011-08-17 18:09:31 -07:00
alena d726b26180 Defined missing length field for VO classes 2011-08-17 15:13:28 -07:00
alena c82a373327 Defined missing length field for VO classes 2011-08-17 15:10:07 -07:00
alena 441d9d765c bug 11154: host can go in Maintenance state only after all vms are migrated from it
status 11154: resolved fixed
2011-08-17 12:04:11 -07:00
alena 6291554576 bug 11154: host can go in Maintenance state only after all vms are migrated from it
status 11154: resolved fixed
2011-08-17 12:03:53 -07:00
Murali Reddy b87c5ba331 bug 11148: VMs that got stopped during Host Maintenance have host_id associated with them
status 11148: resolved fixed

enabled vm stop, if the host is last valid host in cluster
2011-08-17 18:14:31 +05:30
Murali Reddy 37512883f1 bug 11148: VMs that got stopped during Host Maintenance have host_id associated with them
status 11148: resolved fixed

enabled vm stop, if the host is last valid host in cluster
2011-08-17 18:11:23 +05:30
Kelven Yang a9c67d23fa bug 11099: Let VM sync to cooperate with migration process 2011-08-16 15:23:01 -07:00
Sheng Yang 9366290423 Fix NPE when a router is fail to start
Also enforce the check for restartNetworkCommand
2011-08-16 11:43:47 -07:00
Sheng Yang b10f560be5 Fix NPE when a router is fail to start
Also enforce the check for restartNetworkCommand
2011-08-16 11:43:36 -07:00
Edison Su 449a12870b finally, test framework works now 2011-08-16 10:30:52 -07:00
Edison Su ed7214c710 add host guid in migrate command 2011-08-16 10:30:52 -07:00
Edison Su 48342ff6e2 remove unnecessary transcation 2011-08-16 10:30:52 -07:00
Edison Su 0be1510496 add template for simulator 2011-08-16 10:30:51 -07:00
alena 356728ae19 Fixed spelling mistake 2011-08-16 09:52:00 -07:00
Kelven Yang 5fc66d1c61 re-enable HA logic on VM state synchronization for VMware 2011-08-15 17:00:43 -07:00
alena 11d06f3d6a Added missing license headers 2011-08-15 14:24:46 -07:00
alena 5fd0ff5610 Added missing license headers 2011-08-15 14:24:28 -07:00
alena dfb37faa01 bug 10567: In Basic zone, throw an exception with Pod scope when vm failed to be added to the network - so we retry to start it in a different pod 2011-08-15 11:28:14 -07:00
alena 8f3e83d2bc bug 10567: In Basic zone, throw an exception with Pod scope when vm failed to be added to the network - so we retry to start it in a different pod 2011-08-15 11:20:45 -07:00
alena 812a1f3f7b Fixed the bug in allocator where cluster was added to avoid set as pod 2011-08-15 10:44:07 -07:00
alena 3945eec0df Fixed the bug in allocator where cluster was added to avoid set as pod 2011-08-15 10:43:59 -07:00
alena 6f436b6b0b Improved logging in 229 to 2210 upgrade 2011-08-15 10:21:20 -07:00
Sheng Yang d1721669ea bug 11122: Fix router startup
The new created router got hostId = 0.

status 11122: resolved fixed
2011-08-15 10:21:20 -07:00
alena 73fe2cbb89 Fixed db upgrade issue for 229-2210 firewall rules 2011-08-15 10:20:34 -07:00
Sheng Yang 23674a5386 bug 11105: Fix router with disconnected host
We keep the stopped router there, but continue with the ones we can use.

status bug 11105: resolved fixed
2011-08-15 10:20:34 -07:00
alena 05713a20e8 bug 11114: when release static nat as a part of vm expunge, do searchIncludingRemoved in nics table as the nics are marked as Removed before static nat is released
status 11114: resolved fixed
2011-08-15 10:18:45 -07:00
alena 47e8d2b29c Fixed error message 2011-08-15 10:18:44 -07:00
alena c8cf17f6da Revert "fix NPE when listvolume if vm got destroyed"
This reverts commit 9bdaa9d967a6390cc1655ce7344d5af474890e4c.
2011-08-15 10:18:44 -07:00
alena d8a9612ef7 Remove firewall rule along with pf/staticNat/lb rule if the pf/staticNat/lb failed to create due to network rule conflict 2011-08-15 10:18:44 -07:00
Edison Su ec978f0716 fix NPE when listvolume if vm got destroyed 2011-08-15 10:18:10 -07:00
alena 891f02f4d4 Resend firewall rules on domR restart 2011-08-15 10:18:10 -07:00
Naredula Janardhana Reddy c63f9fbca2 bug 10561: allowing to create a firewall rule with sameport range but different protocols 2011-08-15 10:18:10 -07:00
alena 803255b0ba bug 11029: db upgrade from 2.2.9 to 2.2.10 includes firewall_rule upgrade now
status 11029: resolved fixed

Commit also includes the following:

* map firewall rule to pf/lb/staticNat/vpn when the firewall rule is created as a part of pf/lb/staticNat/vpn rule creation
* when delete firewall rules, also delete related firewall rule
2011-08-15 10:18:09 -07:00
Sheng Yang bb6c2d48f5 bug 11122: Fix router startup
The new created router got hostId = 0.

status 11122: resolved fixed

Conflicts:

	server/src/com/cloud/network/element/VirtualRouterElement.java
2011-08-13 00:21:35 -07:00
Sheng Yang 08a2f30785 bug 11122: Fix router startup
The new created router got hostId = 0.

status 11122: resolved fixed
2011-08-13 00:15:53 -07:00
Sheng Yang fbd9e2159d bug 11105: Fix router with disconnected host
We keep the stopped router there, but continue with the ones we can use.

status bug 11105: resolved fixed
2011-08-12 19:16:07 -07:00
Sheng Yang ee90c51a77 bug 11105: Fix router with disconnected host
We keep the stopped router there, but continue with the ones we can use.

status bug 11105: resolved fixed
2011-08-12 19:15:52 -07:00
alena 287a695664 Revert "fix NPE when listvolume if vm got destroyed"
This reverts commit d028454ab46f1e901e2517dd64a0b8a9780c9968.
2011-08-12 17:32:20 -07:00