831 Commits

Author SHA1 Message Date
prachi
05440f0905 Bug 9921 - template tags
Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11
2011-08-25 12:03:59 -07:00
Nitin
ece07d7d7f bug 11076: Improve logging - dont login the password in the logs.
status 11076: resolved fixed
2011-08-25 16:15:48 +05:30
Nitin
5923fe950b bug 11077: Improve logging - put in the hostid and hostname on which the vm launches.
status 11077: resolved fixed
2011-08-25 16:06:09 +05:30
Naredula Janardhana Reddy
9feb05ac13 bug 10617: This is Intermediate commit for Egress rules implementation in security groups.
previous commit: c9fda641673df7701f44963ef27e1d488f121219 ( this under bug 1067, typing error)
        changes: 1) partially implemented  listing of egress rules along with ingress rules.
                 2) partially implemneted egress rules for KVM
2011-08-25 12:18:33 +05:30
Kelven Yang
1061738924 bug 11230, 11229: merge fix from 2.2.10 branch, fix Eclipse project settings for premium-move 2011-08-24 15:18:08 -07:00
frank
b3478c377e Full opensource 2011-08-23 19:52:19 -07:00
Alex Huang
5c12f07462 Added environment variables to not control pool master 2011-08-23 15:49:45 -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
Alex Huang
3ed2385582 bug 11212: disable vlan network when vm fails to start. It is still possible for it leak. For example, if the VM object wasn't constructed and we already failed but those cases are less likely and it's not absolutely necessary to disable vlan. 2011-08-23 11:29:29 -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
frank
cbbf80cee3 Use class.getSimpleName in ResourceListener 2011-08-19 17:06:58 -07:00
frank
7091a8f00a Introduce new resource life cycle listener
add files
2011-08-19 17:06:23 -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
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
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
08a1809a49 bug 11133: field size should be declared in VO object explicitly if it's greater than 255
status 11133: resolved fixed
2011-08-16 14:38:49 -07:00
alena
52318703fd bug 11133: field size should be declared in VO object explicitly if it's greater than 255
status 11133: resolved fixed
2011-08-16 14:38:32 -07:00
Naredula Janardhana Reddy
b9183c0840 bug 10561: merging code from 2.2.10 to master 2011-08-16 14:20:51 +05:30
alena
d72200bbfc If one of the static nat rules failed to apply on the backend, the end result should be false 2011-08-15 10:18:44 -07:00
anthony
02aec3b3ef revert pool vm sync to host vm sync in startupcommand in 2.2.10.
then XenServer upgrade is supported in 2.2.10
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
Nitin
5ef0c96e70 bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 14:30:34 +05:30
Nitin
f1d13729af bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 12:21:02 +05:30
Chiradeep Vittal
51af0db682 mass merge 2.2.10 2011-08-11 16:41:52 -07:00
alena
278f2a401f bug 10561: intermediate checkin for enable/disableStaticNat.
1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR.
2011-08-11 10:19:22 -07:00
Edison Su
501048952d Revert "bug 11064: add setfirewallrule for kvm"
This reverts commit 8b52313bd9fceceb3c4c5ff2b849652cbd37258c.
2011-08-11 09:45:14 -07:00
Edison Su
58862d702c Revert "bug 11064: add setfirewallrule for kvm"
This reverts commit c9f36c07c22dfe3073efc1dfc0cae290fc6e880a.
2011-08-10 17:59:13 -07:00
anthony
3a2790abdc bug 10504: what is happening is, MS use vdi-copy to create template from volume, then get physical size from XAPI, the physical size might be wrong , SR-SCAN is needed before getting physical size to make XenServer pick the new physical size.
status 10504: resolved fixed
2011-08-10 17:46:48 -07:00
anthony
5639b5eab8 bug 10504: what is happening is, MS use vdi-copy to create template from volume, then get physical size from XAPI, the physical size might be wrong , SR-SCAN is needed before getting physical size to make XenServer pick the new physical size.
status 10504: resolved fixed
2011-08-10 17:45:46 -07:00
anthony
94ff9fe2c1 bug 10504: what is happening is, MS use vdi-copy to create template from volume, then get physical size from XAPI, the physical size might be wrong , SR-SCAN is needed before getting physical size to make XenServer pick the new physical size.
status 10504: resolved fixed
2011-08-10 17:41:19 -07:00
Edison Su
5a34c9259b bug 11064: add setfirewallrule for kvm 2011-08-10 16:18:23 -07:00
Edison Su
790af4dcb3 bug 11064: add setfirewallrule for kvm 2011-08-10 16:18:03 -07:00
Edison Su
fde6e7d801 bug 11064: add setfirewallrule for kvm 2011-08-10 16:17:00 -07:00
alena
fe3dd44bec ICMP protocol is supported in createFirewallRule command only; throw an error if specified in createPF/StaticNat/LB rule 2011-08-10 12:56:25 -07:00
alena
32b53351ff Fixed response processing in createFirewallRule command 2011-08-10 11:36:34 -07:00
Naredula Janardhana Reddy
f5011189c8 bug 10561: code cleanup 2011-08-10 18:15:07 +05:30
Naredula Janardhana Reddy
a9eb14c42e bug 10561: backend added for CreateFirewallRule and deleteFirewallRule 2011-08-10 17:06:42 +05:30
Abhinandan Prateek
f24e14d2d9 bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules 2011-08-10 10:43:26 +05:30
anthony
bfe3fd2a8f bug 11046: fixed a typo, otherwise Other PV doesn't work
status 11046: resolved fixed
2011-08-09 19:58:10 -07:00
anthony
e5e85d05e9 bug 10695: add XCP 1.0 support
status 10695: resolved fixed

Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
2011-08-09 19:51:32 -07:00
anthony
33b3e02c17 bug 10695: add XCP 1.0 support
status 10695: resolved fixed
2011-08-09 19:49:12 -07:00
frank
f377ac1cf7 Use class.getSimpleName in ResourceListener 2011-08-09 15:56:17 -07:00
alena
6b9603bc4c 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

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:56 -07:00
Abhinandan Prateek
cd94e6ac25 bug 10731: reverting changes for source cidr for portforwading and loadbalancing rules 2011-08-09 16:05:20 +05:30
Chiradeep Vittal
179368ea32 get lb working on advanced mode again 2011-08-09 01:02:58 -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
c5a999757a get ELB working on 2.2.8 2011-08-08 17:58:35 -07:00