etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,189 Commits 333 Branches 325 Tags 946 MiB
Commit Graph

616 Commits

Author SHA1 Message Date
Kelven Yang b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Kelven Yang cea8f3bf37 Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation 2012-11-07 15:03:22 -08:00
Kelven Yang aab02e2743 Add Spring annotation to major components 2012-11-07 14:53:39 -08:00
Sheng Yang fe8a2992a2 Elimiate mystery guestIp in IpAddressTO 
Nobody can explain why it's there...

Also fix wrong return result of several empty network element callbacks
 2012-09-12 15:42:48 -07:00
Alena Prokharchyk d0c526fdcd Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code) 2012-09-11 17:03:11 -07:00
Fang Wang 6fd7da8f56 Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton. 2012-09-11 17:03:11 -07:00
Fang Wang 4b8fb79ef6 Fix the output of instance-id and vm-id to UUID 2012-09-10 18:02:34 -07:00
Fang Wang 663e250334 Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00
Sheng Yang 86427559cb CS-16269: Fix savePassword on one stopped RvR 2012-09-05 13:46:44 -07:00
Jayapal eb4a3cf6c8 bug CS-15398: fix for basic zone dns issue in multiple pods 2012-08-29 14:33:27 +05:30
Alena Prokharchyk 38e26f8dbd IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to 
Reviewed-by: Sheng Yang
 2012-08-27 16:26:32 -07:00
Alena Prokharchyk fbdc7fc59f CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network 
Reviewed-by: Sheng Yang
 2012-08-27 13:46:36 -07:00
Alena Prokharchyk 3ada5e4a46 VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2012-08-22 11:53:59 -07:00
Jayapal a5248f1cfc Fix for dns issue in multiple pods 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-22 16:48:41 +05:30
kishan b42a813ff1 bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh 
status CS-16112: resolved fixed

Conflicts:
	patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
 2012-08-22 12:00:02 +05:30
Alena Prokharchyk 2bf5c99bc6 CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-08-21 15:31:07 -07:00
Alena Prokharchyk 7d0ad98c93 More logging to lock operations on the network 2012-08-21 15:25:17 -07:00
Alena Prokharchyk 14dd3f07d7 Fixed line endings in VirtualNetworkApplianceManagerImpl 2012-08-21 15:24:44 -07:00
Edison Su 481aae1ebc add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
Sheng Yang 1cfcefd2fb CS-16043: Using network based router rather than account for RVR detection 2012-08-17 16:52:06 -07:00
Sheng Yang ea6f3eb6f9 CS-14253: Apply IP when firewall rule is in place 2012-08-17 16:52:06 -07:00
kishan 691be5c60e bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic 
status CS-15577: resolved fixed
 2012-08-17 17:07:13 +05:30
Alena Prokharchyk e74969fdec VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-08-13 11:55:34 -07:00
Sheng Yang a4431b5740 S2S VPN: Use coma instead of semicolon for separating cidr list 2012-08-10 16:20:52 -07:00
Alena Prokharchyk 057d6ccbb8 Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
Sheng Yang 2641b5d6b8 S2S VPN: Fix multiply remote side guest networks 2012-08-07 18:39:45 -07:00
Alena Prokharchyk a83c753354 VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 2012-08-07 11:24:04 -07:00
Sheng Yang 6e7b4bc07b S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:32:18 -07:00
Sheng Yang 1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
 2012-08-03 14:23:45 -07:00
Alena Prokharchyk 6eba8a818a VPC: applyStaticRoutes - don't exclude static routes in Revoke state 2012-08-03 14:15:50 -07:00
Alena Prokharchyk 39485a4a56 VPC: CS-15821 - corrected mac address format for vpc private network 2012-08-02 18:07:15 -07:00
Alena Prokharchyk 7cceaae912 VPC: moved vpc related code from NetworkManager to VpcManager 
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-01 18:45:06 -07:00
Alena Prokharchyk ebe53a91d7 VPC: reduced visability for some vpc related methods 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-01 18:33:12 -07:00
Alena Prokharchyk e0c85c0d41 VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands 2012-08-01 18:19:03 -07:00
Sheng Yang 8eee8f342e S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-27 16:28:06 -07:00
Alena Prokharchyk 190329286c VPC: 
1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message

Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-27 13:55:39 -07:00
Alena Prokharchyk 110903a91a VPC: added vif info to ipassoc command 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-27 13:53:41 -07:00
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
kishan 468f2720eb bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:13:18 +05:30
Alena Prokharchyk 119e4e7443 VPC: CS-15681 - execute VPC related methods only when router is a vpc router 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-24 16:12:13 -07:00
Sheng Yang a00456bc57 CS-15676: Fix NPE when stop non-VPC router 2012-07-24 11:43:30 -07:00
Sheng Yang 1920c2a735 CS-15534: Mark VPN connection as Disconnected when rebootRouter 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-23 21:14:49 -07:00
Sheng Yang 6cb10ce993 S2S VPN: Add check for router status before apply vpn 2012-07-23 19:53:39 -07:00
Alena Prokharchyk 46cd99f01e VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones 2012-07-23 16:38:14 -07:00
Sheng Yang 7d68e33323 S2S VPN: Use source NAT ip address for VPN gateway 
Conflicts:

	api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-23 14:44:05 -07:00
Alena Prokharchyk 394f55d9e3 More logging to the VirtualRouter manager 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 966c1b0ad8 VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-07-20 17:12:34 -07:00
Alena Prokharchyk cf895d34d2 CS-15622: always get router info from the DB 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 5a64d4fbb1 VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-20 17:12:34 -07:00