Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							9b9b49e10b 
							
						 
					 
					
						
						
							
							Merge branch '4.8' into 4.9  
						
						
						
						
					 
					
						2016-10-21 10:14:16 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							93ac134f1e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9533: gateway of public IP is not handled correctly when parsing the  
						
						... 
						
						
						
						cmd_line.json to create ips.json databag
using 'gateway' in cmd_line for the public ip gateway while creating ips.json databag 
						
						
					 
					
						2016-10-06 16:41:29 +05:30 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							052a9af023 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9515: internal LB vm is not handled when parsing cmd_line.json,  
						
						... 
						
						
						
						resulting in internal LB vm not come up
parsing cmd_line to create 'ips' data bag, never handled internal lb vm, but still
worked due to another bug. support for internal lb vm is added with this fix 
						
						
					 
					
						2016-10-05 15:11:00 +05:30 
						 
				 
			
				
					
						
							
							
								Ronald van Zantvoort 
							
						 
					 
					
						
						
						
						
							
						
						
							ed820bebe5 
							
						 
					 
					
						
						
							
							VR merge.py ipalias fix & dhcpconfig stub notification  
						
						
						
						
					 
					
						2016-06-07 13:03:09 +02:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							f4f9b3ab4e 
							
						 
					 
					
						
						
							
							Handle private gateways more reliably  
						
						
						
						
					 
					
						2016-04-10 20:06:44 +02:00 
						 
				 
			
				
					
						
							
							
								Wilder Rodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							a17fa48de1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9075 - Adds VPC static routes test  
						
						... 
						
						
						
						- Adds redundant VPC tests
   - Adds support to Static Routes on VPC private gatways
   - Removes the route configuration in case static route is deleted. 
						
						
					 
					
						2015-12-02 10:36:52 +01:00 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							f661ac0a2a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8690:Added remote access vpn and vpn users configuration  
						
						
						
						
					 
					
						2015-09-09 10:50:50 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							90137acda2 
							
						 
					 
					
						
						
							
							VR type in shared network is dhcpsrvr. Ips are being removed due to this issue  
						
						... 
						
						
						
						Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>
This closes  #627  
						
						
					 
					
						2015-07-28 13:43:09 +02:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							279f1a2741 
							
						 
					 
					
						
						
							
							Lots of changes to do with redundancy  
						
						
						
						
					 
					
						2015-03-16 11:39:50 +01:00 
						 
				 
			
				
					
						
							
							
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							0be56a5ff6 
							
						 
					 
					
						
						
							
							Fixing the timout )ssh hanging) on the CsApp.py file  
						
						... 
						
						
						
						Adding kill_all() method on the CsProcess.py file (not being used yet)
Changing a bit the logic in the merge.py
The changes in the logic might be reverted, but they are causing no harm now. 
						
						
					 
					
						2015-03-16 11:39:50 +01:00 
						 
				 
			
				
					
						
							
							
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							edd839ab10 
							
						 
					 
					
						
						
							
							Fix: allow multiple VIFs per Mac Address  
						
						... 
						
						
						
						Fix: RTNETLINK errors
     - Management Server health check trying to create already existing interface
     - Changes on update_config.py, cs_guestnetwork.py, merger.py
Fix: replace RRouTER_LOG in the CsRedundant.py per log file location
Fix: Guest Net address association during Router restart
     - Changes on NicProfileHelper, NicProfileHelperImpl
Fix: aggregationExecution() method on VirtualNetworkApplianceManagerImpl
     - Do not send an AggregationControlCommand to a non-configured router
Some classes have been formatted. 
						
						
					 
					
						2015-03-16 11:39:48 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							84624091fd 
							
						 
					 
					
						
						
							
							Load balancer config  
						
						
						
						
					 
					
						2015-03-16 11:38:16 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							7d0df32560 
							
						 
					 
					
						
						
							
							Lots of fixes from the testing  
						
						... 
						
						
						
						firewallrules implemented sperately from networkacl (ugly but best that can be done ATM)
Some refactoring in CsDHCP as it made no sense to do it that way anymore
processmonitoring implemented
Domain not correctly sourced in VR 
						
						
					 
					
						2015-03-16 11:38:15 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							0496ba7a00 
							
						 
					 
					
						
						
							
							firewallrules (VR) and metworkacl (VPC) did not as I believe they shgould get combined  
						
						... 
						
						
						
						in the underlying java code
Have split them out again.
Omce tested this will need some refactorinfg because it is currently PFU 
						
						
					 
					
						2015-03-16 11:38:15 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							5c4d221c34 
							
						 
					 
					
						
						
							
							Let's stick to CamelCase for now  
						
						
						
						
					 
					
						2015-03-16 11:38:12 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a2e7f30542 
							
						 
					 
					
						
						
							
							Fix license headers  
						
						
						
						
					 
					
						2015-03-16 11:38:08 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9385f071d7 
							
						 
					 
					
						
						
							
							Fix PEP8 compliance  
						
						
						
						
					 
					
						2015-03-16 11:38:07 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							0afe0153a7 
							
						 
					 
					
						
						
							
							Fix tab characters  
						
						
						
						
					 
					
						2015-03-16 11:38:06 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							2f8352bf96 
							
						 
					 
					
						
						
							
							Daft mistake that left more data getting merged than we would have liked  
						
						
						
						
					 
					
						2015-03-16 11:38:06 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							01acd3d8ec 
							
						 
					 
					
						
						
							
							VR interfaces need the proper network type in ips  
						
						
						
						
					 
					
						2015-03-16 11:38:05 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							b95d8257a4 
							
						 
					 
					
						
						
							
							Merge operation for site2site vpn  
						
						
						
						
					 
					
						2015-03-16 11:35:28 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							8c5dba31d0 
							
						 
					 
					
						
						
							
							Fix the forwardingrule databag  
						
						
						
						
					 
					
						2015-03-16 11:35:24 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							f273fd4659 
							
						 
					 
					
						
						
							
							Add the static nat rules to the merge procedure  
						
						
						
						
					 
					
						2015-03-16 11:35:23 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							b45c71ee31 
							
						 
					 
					
						
						
							
							Acl code linked in  
						
						... 
						
						
						
						Dhcp code
Test file for dhcp entry 
						
						
					 
					
						2015-03-16 11:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							e323d63867 
							
						 
					 
					
						
						
							
							Merge vmmetadata, reuse the code from the existing script to parse it.  
						
						
						
						
					 
					
						2015-03-16 11:35:20 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							3ea63ced68 
							
						 
					 
					
						
						
							
							Added merge for network_acl type message  
						
						
						
						
					 
					
						2015-03-16 11:35:19 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							fff3964332 
							
						 
					 
					
						
						
							
							Add catchall for unknown types  
						
						
						
						
					 
					
						2015-03-16 11:35:19 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							680454dfdf 
							
						 
					 
					
						
						
							
							Some bug fixes  
						
						... 
						
						
						
						Some more tests
store vmpassword functionally working
Tests for store password 
						
						
					 
					
						2015-03-16 11:35:18 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							4c5f4a1f9f 
							
						 
					 
					
						
						
							
							Added vmpassword type (does nothing yet)  
						
						... 
						
						
						
						Fixed tests to use /var/cache/cloud
Added some test files but will remove them when tests are properly completed
Fixed a bug in configure that did not deal well with databags with empty dev sections 
						
						
					 
					
						2015-03-16 11:35:17 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							6a016d5b54 
							
						 
					 
					
						
						
							
							Small fixes  
						
						
						
						
					 
					
						2015-03-16 11:35:17 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							58919dcf50 
							
						 
					 
					
						
						
							
							Change the location for the temporary json files to /var/cache/cloud  
						
						
						
						
					 
					
						2015-03-16 11:35:16 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							05702ecd1a 
							
						 
					 
					
						
						
							
							Added guest network configuration  
						
						... 
						
						
						
						Added iptables config (adds but no deletes yet)
Apache config (VPC GN)
DNSMasq config (VPX GN) 
						
						
					 
					
						2015-03-16 11:35:10 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							666dc16e58 
							
						 
					 
					
						
						
							
							Moved bag location to /et/cloudstack  
						
						... 
						
						
						
						Updated test script to also process command line
Added connmark stuff to merge 
						
						
					 
					
						2015-03-16 11:35:09 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							c7c1f3202e 
							
						 
					 
					
						
						
							
							Plan B  
						
						... 
						
						
						
						Replace chef with a python script
configure.py will read the bags and (hopefully) create the desired state
At this stage this is ipassociation
This code should work for both VR and VPCrs
TODO:
iptables
ip route throw (present in VR but not in VPCr
Determine default route
Unit tests 
						
						
					 
					
						2015-03-16 11:35:08 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							3811b8dc90 
							
						 
					 
					
						
						
							
							Split Databag in to separate class as I would now need this  
						
						
						
						
					 
					
						2015-03-16 11:35:06 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							3077eb925b 
							
						 
					 
					
						
						
							
							Include the guestnetwork code  
						
						... 
						
						
						
						This takes the guestnetwork object and also creates an ip object 
						
						
					 
					
						2015-03-16 11:35:06 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							9355dd7133 
							
						 
					 
					
						
						
							
							Corrected a hole in my logic  
						
						
						
						
					 
					
						2015-03-16 11:35:05 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							0bf7d54722 
							
						 
					 
					
						
						
							
							1.  Completed provider for ip rules (fwmark)  
						
						... 
						
						
						
						2.  Added merge routine for guestnetwork config messages
3.  Updated test script 
						
						
					 
					
						2015-03-16 11:35:05 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							0027db6cd1 
							
						 
					 
					
						
						
							
							Switch ip associations to new model and update the recipes  
						
						
						
						
					 
					
						2015-03-16 11:35:04 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							bcb760e1e2 
							
						 
					 
					
						
						
							
							Can now read the ips out of the cmdline databag (if present)  
						
						
						
						
					 
					
						2015-03-16 11:35:03 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							018b56385c 
							
						 
					 
					
						
						
							
							Added cs_ip module  
						
						... 
						
						
						
						Corrected syntax error in merge.py 
						
						
					 
					
						2015-03-16 11:35:02 +01:00 
						 
				 
			
				
					
						
							
							
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							a357e12943 
							
						 
					 
					
						
						
							
							Add the Python bits  
						
						
						
						
					 
					
						2015-03-16 11:35:02 +01:00