etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,499 Commits 324 Branches 325 Tags 795 MiB
Commit Graph

26499 Commits

Author SHA1 Message Date
Ian Southam 267bc52579 Mistake no I set no priority! 2015-03-16 11:39:54 +01:00
Ian Southam 2b0c4c85a9 Fixed up get_dns for normal isolated vrs 2015-03-16 11:39:53 +01:00
Ian Southam bf6e3fa8b2 Fixed CsAddress destroying the VIP address on a redundant router 
Taken quite a bit of code out of CsRedundant
Fixed public IP in keepalived when there is no guest network
 2015-03-16 11:39:53 +01:00
Ian Southam 6d34f1f797 Set to EQUAL and noprempt - let keppalived decide who is boss 
Also removed bump as we really do not need this
 2015-03-16 11:39:53 +01:00
Ian Southam 3b1dd68ae9 Remove vpc_router_svcs because they will be the same as any other router (soon) 
One question is apache2
 2015-03-16 11:39:52 +01:00
wilderrodrigues 88129adac1 Implement the new VPC restart 
- behaves just like network restart: if clean up is checked, all routers destroyed; if 1 router is gone and no
    clean up, only 1 new router created.
 2015-03-16 11:39:52 +01:00
Ian Southam 9bec4b64e7 This change breaks stuff 
This id is used to define the groups and will prevent the two vrrp instances from talking to each other
Result = MASTER MASTER
 2015-03-16 11:39:52 +01:00
wilderrodrigues b7a142800d Adding the router priority when the control interface is created 
Adding some logging to the check heartbeat script
 2015-03-16 11:39:52 +01:00
Ian Southam e95a6498b5 No bump for now 2015-03-16 11:39:51 +01:00
Ian Southam f5ef75ee7e Vrrp will fail if your own code keeps killing it off 2015-03-16 11:39:51 +01:00
wilderrodrigues ae53d5ede1 Fix router priuority using the same logic as the one for the state 
Fix the router state. do not show UNKNOW, but MASTER or BACKUP depending on the type of router
Implement the virtual_router_id to be passed as a boot parameter to the router
  - it is needed for the keepalived configuration
 2015-03-16 11:39:51 +01:00
wilderrodrigues a5d6f90f66 Implementing redundant router arguments to add redundant_state 
Implementing the arguments on the python side
 2015-03-16 11:39:51 +01:00
Ian Southam 279f1a2741 Lots of changes to do with redundancy 2015-03-16 11:39:50 +01:00
wilderrodrigues 62d586e2af Reverting the changes on CsAddress done in commit 374946e07748dd3ad659381c7d88e5e4140e4eeb 2015-03-16 11:39:50 +01:00
wilderrodrigues bd7799401b Removing guest interfaces form the VRRP list 
Removing the not is_redundant from the check that put interfaces UP.
  - it now checks only "not is_public"
 2015-03-16 11:39:50 +01:00
wilderrodrigues da53a5502e Fix restarting VPC 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 be81d2ffa4 Fixing guest network interfaces on redundant routers 
- The interfaces were messed up because part of the code was still taking inot account a non-redundant path.
 2015-03-16 11:39:49 +01:00
Ian Southam fb094ecafd get_dns via guest network returns blank dns servers 
fixed and added unit test
 2015-03-16 11:39:49 +01:00
wilderrodrigues 84ba06b87d Fix: the update_config.py was not parsing the incoming guest net configuration properly 
Added comments to the CitrixResourceBase class: do not destroy the cd-rom
 2015-03-16 11:39:49 +01:00
wilderrodrigues 2bb79b8115 Adding some info to the update_config.py 2015-03-16 11:39:49 +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
wilderrodrigues eee891be3e Fixing getRouters() to make it call the super method. 
- after calling super, if we have routers available, do not call the subclass method.
 2015-03-16 11:39:18 +01:00
wilderrodrigues 460204fa9f Fixing CsDhcp.py 
Fixing assign IPv4 on GuestNetworkGuru.java
Fixing getRouters() on VpcVirtualRouterElement.java
Fixing Fixing paths on keepalived.conf.templ

Refactor on the other files
 2015-03-16 11:39:17 +01:00
wilderrodrigues ddbc565bc4 Log an error when removing keepalived.strikes file and it doesn't exit. 2015-03-16 11:39:17 +01:00
wilderrodrigues 40eb579115 TK-3135 fixes for VPC restart 
* removed the "is redundant" flag form the addVpcRouterToGuestNetwork() method
* removed the "is redundant" flag from the removeVpcRouterFromGuestNetwork() method
* changed the path of the master.py file in the keepalived.conf.temp file
* the call to routerDao.addRouterToGuestNetwork() in the VpcRouterDeploymentDefinition is not needed. That step will be performed once a VM is created
  - In addition, when restarting a VPC the routers will have the guest net configured, if any exists.

* Pushing the POM.xml as well, to use the old Jetty for now. Could not fix the logging problem. Will replace the POM with master version after VPC is done.
 2015-03-16 11:39:17 +01:00
wilderrodrigues 35151961be Fixing call on AclIP class. Instead of self.fw = fw we have to do self.fw = fw.get_fw() 
Fixing the master.py path in the keepalived.conf.templ
 2015-03-16 11:39:16 +01:00
wilderrodrigues 33b0ce816b Make sure we can plug the nic in 2 routers with the same mac address 
The still some work to do on the prepareNetworkElementCommand() method.
 2015-03-16 11:39:16 +01:00
wilderrodrigues 66d8b1f13d Fixing Site2Site VPN and private gateway on VpcVirtualRouterElement 
Fixing Finalize methods in the VpcVirtualNetworkApplianceManager

Making use ot eh RouterControlHelper instead of duplicating methods in the VirtualNetworkApplianceManager

[witp] - redundant vpc virtual routers have the same mac address, have to fix that.
 2015-03-16 11:39:16 +01:00
wilderrodrigues 381c0e1c69 Fixing the priority in the setup guest network command 
Fixing the deploy router in VPC method

formatting some classes
 2015-03-16 11:39:16 +01:00
wilderrodrigues 84bf46dc2f Java: Fixing the redundant flag for the router control nic and the guest network command; 
Python: fix the redundant setup in the CsRedundant class
 2015-03-16 11:39:15 +01:00
wilderrodrigues cfbdbd421d Extracting local variable and formatting the code. 2015-03-16 11:39:15 +01:00
wilderrodrigues 3b6f247d40 Fix problem with reading invalid key form the dictionary 
I did in the same way Ian did for other files, but we have to find a better way to fix it.
 2015-03-16 11:39:15 +01:00
wilderrodrigues 64ab2bf8da Fix createSetupGuestNetworkCommand() method in order to pass the value of the getIsRedundantRouter() method instead of false. 2015-03-16 11:39:15 +01:00
wilderrodrigues 370fe518f2 Fixing delete_leases function. 
It was refering a non-existing variable.
 2015-03-16 11:39:14 +01:00
Ian Southam 636dfd6217 New unit test 
Some stupid typos
pep8
 2015-03-16 11:39:14 +01:00
wilderrodrigues 8f9f39fa39 [TK-3119] Fix NPEs and improve exception handling + error messages 2015-03-16 11:39:14 +01:00
Ian Southam 406af7e855 Sorting out redundancy 
some new unit testing
stupid bug in CsCmdLine refactor
 2015-03-16 11:39:14 +01:00
wilderrodrigues 014b47f6e6 [TK-3113] fixed CloudRuntimeException: NO EVENT PUBLISH CAN BE WRAPPED WITHIN DB TRANSACTION! 2015-03-16 11:39:14 +01:00
wilderrodrigues a51690be4b Formatting the class: it was a mess! 
[wip]- will fix the "com.cloud.utils.exception.CloudRuntimeException: NO EVENT PUBLISH CAN BE WRAPPED WITHIN DB TRANSACTION!" problem.
 2015-03-16 11:39:13 +01:00
wilderrodrigues ce3c8c755a [TK-3101] Fix VPCVirtualRouterElement 
There were more places were the amount of routers is checked.
    Not throwing exception when routers > 1

[wip] - we need to refactor VpcViortualRouterElement in order to cope with methods returning true only for the sake of it.
 2015-03-16 11:38:18 +01:00
Ian Southam bdda01d269 Countless bug fixes, mostly do do with VR redundancy 
Also added some new unit tests and adjusted the code to make them work
 2015-03-16 11:38:18 +01:00
wilderrodrigues 553bf21b37 [TK-3101] Fix VPCVirtualRouterElement 
Iterating through the routers list and adding them to the guest networks
Not throwing exception when routers > 1
 2015-03-16 11:38:18 +01:00
Ian Southam 24c8de3c13 Some convenience methods 2015-03-16 11:38:17 +01:00
Ian Southam 8a6a407114 Dhcp refactor 
Loads of tiny bugs squashed and some big ones
Tested with domR needs VPC testing now
TODO:  Unit tests CsDhcp
 2015-03-16 11:38:17 +01:00
Ian Southam 31266d354f Broken code during guest network merge 2015-03-16 11:38:17 +01:00
Hugo Trippaers 75dda0b5b2 Fix imports 2015-03-16 11:38:17 +01:00
Ian Southam 40eb8423b9 Fixed hostname on router 2015-03-16 11:38:16 +01:00
Ian Southam d89c1e28ab Forgot to add append method 2015-03-16 11:38:16 +01:00
Ian Southam ec09f04b88 Small bug 2015-03-16 11:38:16 +01:00