Commit Graph

1054 Commits

Author SHA1 Message Date
alena ee9fbf10b6 Method signature change 2011-08-24 14:56:37 -07:00
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
alena 9544d42908 bug 11060: use lockTable instead of rowLock when createDomR/createDhcp
status 11060: resolved fixed
2011-08-24 11:01:23 -07:00
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
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
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 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
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
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
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
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
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
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
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
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 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
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
Sheng Yang 12a49668d7 Add alert and log for redundant router state change 2011-08-11 23:37:17 -07:00
Sheng Yang 932f8a7144 Add alert and log for redundant router state change 2011-08-11 23:37:01 -07:00
Sheng Yang 29cc88571f Redundant router script fix, also fix CheckRouterTask 2011-08-11 17:57:12 -07:00
Sheng Yang 23e6b96c98 Redundant router script fix, also fix CheckRouterTask 2011-08-11 17:57:00 -07:00
Chiradeep Vittal d7f332d16b do not release ip for advanced networking / regular LB usage 2011-08-11 17:42:50 -07:00
Chiradeep Vittal 51af0db682 mass merge 2.2.10 2011-08-11 16:41:52 -07:00
alena 5080e8ba33 No need to apply static nat for ip which is not static nat enabled 2011-08-11 16:00:16 -07:00
Sheng Yang b63b3fcf05 Skip the null Host for CheckRouterTask 2011-08-11 14:29:49 -07:00
alena 10034bc196 Fixed rule validation for static nat rules 2011-08-11 14:03:49 -07:00
Sheng Yang 576aec60e0 Skip the null Host for CheckRouterTask 2011-08-11 13:22:47 -07:00
Sheng Yang d6e99567ce Skip the null Host for CheckRouterTask 2011-08-11 13:22:31 -07:00
Sheng Yang 333510db0e Fix redundant router switch back to single router
The existed redundant router network didn't change.
2011-08-11 12:49:44 -07:00
Sheng Yang 0f0d705ae0 Fix redundant router switch back to single router
The existed redundant router network didn't change.
2011-08-11 12:49:26 -07:00
Sheng Yang f28291cedb Fix redundant router switch back to single router
The existed redundant router network didn't change.
2011-08-11 12:48:56 -07:00
alena 477e5d6389 bug 10561: reapply static nat on the backend as a part of domR restart and network restart 2011-08-11 11:19:09 -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
Chiradeep Vittal 17a8234140 should be able to apply firewall rules to static natted ips 2011-08-10 22:53:07 -07:00
Chiradeep Vittal b33f08053c bug 11072: one more 2011-08-10 22:04:21 -07:00
Chiradeep Vittal 375da4da1a bug 11072: icky icky icky 2011-08-10 20:40:13 -07:00
alena e874109839 bug 11071: when elb service is enabled, don't check supported protocols as the provider is NULL in data_center table
status 11071: resolved fixed
2011-08-10 19:25:04 -07:00
alena 0805dbd3fb Fixed rule validation for ICMP protocol 2011-08-10 19:11:26 -07:00
alena 13a9c1d589 Fixed capability check in rule validation 2011-08-10 18:23:13 -07:00
Sheng Yang 76a8738227 Fix existed single router network after enable redundant router feature 2011-08-10 18:08:20 -07:00
Sheng Yang 81a6de4eb7 Fix existed single router network after enable redundant router feature 2011-08-10 18:08:05 -07:00
Sheng Yang 8c70e06572 Fix existed single router network after enable redundant router feature 2011-08-10 18:07:42 -07:00
alena 3c29f00de1 bug 11013: Basic zone setup - pass domRs from other pods to addVirtualMachineToNetwork() method only when network.dns.basiczone.updates is set to "all"
status 11013: resolved fixed
2011-08-10 16:03:48 -07:00
Sheng Yang 94f93a60c3 Clean up restart Network 2011-08-10 15:02:58 -07:00
Sheng Yang a9fd65b9c3 Clean up restart Network 2011-08-10 15:02:48 -07:00
Sheng Yang 18f2df44a1 Clean up restart Network 2011-08-10 15:02:08 -07:00
Sheng Yang 9569a7bbee Clean up VirtualRouterElement.restart() 2011-08-10 13:24:00 -07:00
Sheng Yang 16119d5cac Clean up VirtualRouterElement.restart() 2011-08-10 13:23:52 -07:00
Sheng Yang bcf5058eda Clean up VirtualRouterElement.restart() 2011-08-10 13:23:30 -07:00
alena 956445960a Throw ResourceUnavailableException when rules/ips fail to apply on the backend 2011-08-10 12:56:25 -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
Sheng Yang e1de9f5bec bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release
status 11021: resolved fixed
2011-08-10 12:52:19 -07:00
Sheng Yang 2d958c5d23 bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release
status 11021: resolved fixed
2011-08-10 12:52:10 -07:00
Sheng Yang 58a13c0d5a bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release
status 11021: resolved fixed
2011-08-10 12:51:43 -07:00
Sheng Yang 39452967b9 bug 11045: Fix exception exit of CheckRouterTask
Catch all the exception and come back to work.

status 11045: resolved fixed
2011-08-10 12:06:13 -07:00
Sheng Yang 87041202c0 bug 11045: Fix exception exit of CheckRouterTask
Catch all the exception and come back to work.

status 11045: resolved fixed
2011-08-10 12:05:44 -07:00
Sheng Yang 6e0eeb132e bug 11045: Fix exception exit of CheckRouterTask
Catch all the exception and come back to work.

status 11045: resolved fixed
2011-08-10 12:05:22 -07:00
alena 32b53351ff Fixed response processing in createFirewallRule command 2011-08-10 11:36:34 -07:00
Abhinandan Prateek 949ad3f4c4 bug 10561: readding source cidr changes to firewall rules 2011-08-10 13:55:37 +05:30
Abhinandan Prateek 9bba09857e bug 10561: readding source cidr changes to firewall rules 2011-08-10 13:52:42 +05:30
Sheng Yang 5f31d5008e bug 10640: Update redundant virtual router allocation algorithm
Try to put routers to two different primary storages with two hosts, not the same
host.
2011-08-09 18:25:47 -07:00
Sheng Yang c76bfbaf15 bug 10640: Update redundant virtual router allocation algorithm
Try to put routers to two different primary storages with two hosts, not the same
host.
2011-08-09 18:25:36 -07:00
Sheng Yang 501dc0d9f4 bug 10640: Update redundant virtual router allocation algorithm
Try to put routers to two different primary storages with two hosts, not the same
host.
2011-08-09 18:21:28 -07:00
keshav 1761024fda Changed RuleTO classes to carry the source VLAN tag. Added guest network gateway to NetworkElementCommand. 2011-08-09 16:38:24 -07:00
Sheng Yang f85880c2a6 Revert "Catch domr creation exception"
This reverts commit 6d55408e1f0e1c98fe2a9d4cf51babc6a3308a14.
2011-08-09 15:58:10 -07:00
Sheng Yang 15cad8ba8e Revert "Catch domr creation exception"
This reverts commit 2eff1d0eb9e39e4a8d702bb9867b9e95bb276b3e.
2011-08-09 15:57:46 -07:00
alena 56d5054e39 Revert "bug 10561: Allowing ICMP traffic through static NAT"
This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97.

Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-09 15:51:57 -07:00
alena 4c4bff1c1e Fixed restarNetwork for networks of type Direct - was broken with checkin bfdb4d2d989ed00adcbbf5455731cc2980afcb7b 2011-08-09 15:51:57 -07:00
alena 2fef12e3ac Fixed the bug when domR was re-created as a part of implement() method in network gurus with sourceNatIp address belonging to incorrect user (System user instead of network owner).
Conflicts:

	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
2011-08-09 15:51:57 -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
Sheng Yang f558f74863 Catch domr creation exception 2011-08-09 15:03:27 -07:00
Sheng Yang bfaa56d471 Catch domr creation exception 2011-08-09 15:03:04 -07:00
Sheng Yang 8249c072ee Add more detail log for startVirtualRouter 2011-08-09 11:16:33 -07:00
Sheng Yang 071a67dcb8 Change router to FAULT state if anything goes wrong on fail-over 2011-08-09 11:09:44 -07:00
Sheng Yang 980c4b9120 Change router to FAULT state if anything goes wrong on fail-over 2011-08-09 11:09:20 -07:00
Abhinandan Prateek 311afeae23 bug 10731: reverting back source cidr changes for loadbalancer and portforwarding 2011-08-09 16:01:48 +05:30
Chiradeep Vittal 179368ea32 get lb working on advanced mode again 2011-08-09 01:02:58 -07:00
Chiradeep Vittal 64efcf0443 Merge branch '2.2.8' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.8 2011-08-08 22:42:10 -07:00
Chiradeep Vittal 301bf049d1 fix compile issues 2011-08-08 22:03:08 -07:00
Chiradeep Vittal 924961d898 merge nectarine 2011-08-08 21:45:37 -07:00
alena ae9ba8996a Fixed restarNetwork for networks of type Direct - was broken with checkin bfdb4d2d989ed00adcbbf5455731cc2980afcb7b 2011-08-08 21:33:34 -07:00
alena c5502fb8aa Fixed the bug when domR was re-created as a part of implement() method in network gurus with sourceNatIp address belonging to incorrect user (System user instead of network owner). 2011-08-08 21:17:24 -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
Naredula Janardhana Reddy 12cadca538 Revert "bug 10561: Allowing ICMP traffic through static NAT"
This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97.
2011-08-08 17:59:05 -07:00
Chiradeep Vittal c5a999757a get ELB working on 2.2.8 2011-08-08 17:58:35 -07:00
Chiradeep Vittal 8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
frank 6aaf3d5ae0 Merge branch 'cvm'
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.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/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
Naredula Janardhana Reddy 9e9ae52dbf Revert "bug 10561: Allowing ICMP traffic through static NAT"
This reverts commit 5e74e24bb359456967866cb2c6cc0f6f73570f97.
2011-08-09 00:08:07 +05:30
Chiradeep Vittal b4a6f2103a ensure that we pick an idle elb vm in the same pod as the ip 2011-08-05 17:46:42 -07:00
frank c6fba0fd42 Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
Chiradeep Vittal ec7c9a2f7e bug 10998: maintain lb id in map table
status 10998: resolved fixed
2011-08-05 17:37:11 -07:00
keshav b8c9205000 Changed findOrCreateDhcpServers() to check if start IP is null before retrieving an IP address object 2011-08-05 17:03:20 -07:00
keshav 0165f915b6 Changed findOrCreateDhcpServers() to check if start IP is null before retrieving an IP address object 2011-08-05 16:54:03 -07:00
Chiradeep Vittal bb313a61f0 bug 10659: reuse unused elb vms if they are not gceed already 2011-08-05 15:17:58 -07:00
Chiradeep Vittal 0e5cf4831d remove accidental commit 2011-08-05 14:11:19 -07:00
Chiradeep Vittal 5552b650ff Merge branch 'guru' into 2.2.8.nectarine 2011-08-05 12:27:47 -07:00
Chiradeep Vittal ac8b833fb0 Ensure lb vm enables only those services that are necessary. ensure default route 2011-08-05 12:16:55 -07:00
Sheng Yang ee62361250 Fix missing lock releasing in VirtualNetworkApplianceManagerImpl.java 2011-08-05 12:15:20 -07:00
Sheng Yang 7a3edd74d5 Fix missing lock releasing in VirtualNetworkApplianceManagerImpl.java 2011-08-05 12:14:42 -07:00
Sheng Yang 12bd2180a1 bug 10991: Determine existing redundant router using both state and host id
Seems in some condition, when a router is stopped, it's host_id != null.

status 10991: resolved fixed
2011-08-05 11:37:13 -07:00
Sheng Yang 7638f8e7a7 bug 10991: Determine existing redundant router using both state and host id
Seems in some condition, when a router is stopped, it's host_id != null.

status 10991: resolved fixed
2011-08-05 11:36:35 -07:00
Abhinandan Prateek dae2f4d958 bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 12:07:59 +05:30
Abhinandan Prateek 0f2a9b6a69 bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 12:02:54 +05:30
Abhinandan Prateek c460a1b80b bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 11:58:48 +05:30
Chiradeep Vittal 0c408d8da5 handle elb vm restart 2011-08-04 22:05:48 -07:00
Chiradeep Vittal 61fd6a79c8 ensure elb vm is managed by elb manager 2011-08-04 17:02:27 -07:00
Chiradeep Vittal e936a52f10 merge changes from parent branch 2011-08-04 12:39:25 -07:00
alena 3d0758691f bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
status 10954: resolved fixed

Conflicts:

	setup/db/db/schema-228to229.sql
2011-08-04 10:01:06 -07:00
alena dfd0d7730e bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
status 10954: resolved fixed
2011-08-03 20:47:44 -07:00
alena 527c3b024f bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod
status 10954: resolved fixed
2011-08-03 20:46:33 -07:00
Chiradeep Vittal e5c4bf4e28 bug 10659: manage elb vms independently of virtualnetworkappliance. 2011-08-03 18:55:01 -07:00
Sheng Yang fc57860390 Send CheckRouter command only when router is running 2011-08-03 16:57:59 -07:00
Sheng Yang a46c2cb650 Send CheckRouter command only when router is running 2011-08-03 16:57:43 -07:00
keshav 34a0c44f4f Added a new table for inline load balancer deployments, to store mappings between public IPs and NICs. 2011-08-03 16:10:20 -07:00
Naredula Janardhana Reddy 46427fef91 bug 10561: Allowing ICMP traffic through static NAT 2011-08-03 21:15:02 +05:30
Naredula Janardhana Reddy 954d8673c7 bug 10561: Allowing ICMP traffic through static NAT 2011-08-03 18:13:09 +05:30
Abhinandan Prateek f6303c13fb bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:42:29 +05:30
Abhinandan Prateek cd78c5cb9b bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:32:28 +05:30
Abhinandan Prateek 6dd519ddd4 bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:16:08 +05:30
Abhinandan Prateek 7e727be42c bug 10748: use external dnses if set thru global config (dhcp otpion 6) 2011-08-03 12:34:02 +05:30
Chiradeep Vittal 8ccfdc08de handle release of ip on deletion of loadbalancer rule 2011-08-02 20:31:37 -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
alena e0033c5d9d bug 10869: always allocate first ip address from the range for the dhcp server.
status 10869: resolved fixed

Here is the flow (design is approved by Will Chan):

1) If user specifies custom ip address, and this ip is not the first ip in the range, the dhcp server gets the ip.
2) If user specifies custom ip address, and this ip is the first ip in the range, the dhcp server will get the random ip address from the range.
2) If user doesn't specify custom ip address, we always try to allocate first ip address from the range for the dhcp server; if this ip is already allocated, the dhcp server will get the random ip from the range.

This will work for:

* domR's Guest network
* dhcp's Direct network
2011-08-02 17:42:12 -07:00
alena 64eeb8d79b bug 10869: always allocate first ip address from the range for the dhcp server.
status 10869: resolved fixed

Here is the flow (design is approved by Will Chan):

1) If user specifies custom ip address, and this ip is not the first ip in the range, the dhcp server gets the ip.
2) If user specifies custom ip address, and this ip is the first ip in the range, the dhcp server will get the random ip address from the range.
2) If user doesn't specify custom ip address, we always try to allocate first ip address from the range for the dhcp server; if this ip is already allocated, the dhcp server will get the random ip from the range.

This will work for:

* domR's Guest network
* dhcp's Direct network
2011-08-02 17:41:03 -07:00
Chiradeep Vittal e725c8ffeb Ensure gc is slower, make some configs visible 2011-08-02 17:16:57 -07:00
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
Chiradeep Vittal fd1dbe9683 bug 10884: do not lock if not necessary 2011-08-02 13:51:26 -07:00